commit da40d6a30ce5937dea02ad5ca95197568fccc93e
author Amith Yamasani <yamasani@google.com> Tue Apr 14 13:37:12 2015 -0700
committer Amith Yamasani <yamasani@google.com> Tue Apr 14 13:37:12 2015 -0700
tree 1e139a0e300b88231ec6b0347556bdde42273cc7
parent 1dc7f477509318ff1af0e8e43e310943946cdaef

Canonicalize file paths before comparing

Fix for MMS attachment sending errors.

Bug: 20205459
Change-Id: I30ed77ba33fc0a11f9d78c589f7d60d1019830ce

src/com/android/providers/telephony/MmsProvider.java

diff --git a/src/com/android/providers/telephony/MmsProvider.java b/src/com/android/providers/telephony/MmsProvider.java
index 710fa43..bd31cc1 100644
--- a/src/com/android/providers/telephony/MmsProvider.java
+++ b/src/com/android/providers/telephony/MmsProvider.java
@@ -859,11 +859,11 @@
         try {
             File filePath = new File(path);
             if (!filePath.getCanonicalPath()
-                    .startsWith(getContext().getDir(PARTS_DIR_NAME, 0).getPath())) {
+                    .startsWith(getContext().getDir(PARTS_DIR_NAME, 0).getCanonicalPath())) {
                 Log.e(TAG, "openFile: path "
                         + filePath.getCanonicalPath()
                         + " does not start with "
-                        + getContext().getDir(PARTS_DIR_NAME, 0).getPath());
+                        + getContext().getDir(PARTS_DIR_NAME, 0).getCanonicalPath());
                 // Don't care return value
                 filePath.delete();
                 return null;