commit fdf4a82762bc7c7308ed4e6ab9d532ec112008c7
author Ye Wen <ywen@google.com> Tue Jan 06 13:08:53 2015 -0800
committer Divya Sharma <c_shard@codeaurora.org> Tue Mar 10 03:33:42 2015 -0700
tree d635539a131ab6b7249e73e674a0509fd2dec4c3
parent 9c601804e96baa861e762c31869b572a0d18046f

Unify "app_parts" path obtaining in MmsProvider

MmsProvider uses different ways to get "app_parts" directory path in
generating part "_data" path and in checking "_data" path prefix. System
may have a bug of not returning consistent path using different calls
with Context. This fix makes sure we use exactly the same API to get
"app_parts" directory path.

b/18838864

Change-Id: I5da55763c337ca310fe3eaf2f940ed6be1bea125

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 66cd167..a311788 100644
--- a/src/com/android/providers/telephony/MmsProvider.java
+++ b/src/com/android/providers/telephony/MmsProvider.java
@@ -63,6 +63,8 @@
     static final String TABLE_DRM  = "drm";
     static final String TABLE_WORDS = "words";
 
+    // The name of parts directory. The full dir is "app_parts".
+    private static final String PARTS_DIR_NAME = "parts";
 
     @Override
     public boolean onCreate() {
@@ -427,7 +429,7 @@
 
                 // Generate the '_data' field of the part with default
                 // permission settings.
-                String path = getContext().getDir("parts", 0).getPath()
+                String path = getContext().getDir(PARTS_DIR_NAME, 0).getPath()
                         + "/PART_" + System.currentTimeMillis() + contentLocation;
 
                 if (DownloadDrmHelper.isDrmConvertNeeded(contentType)) {
@@ -493,7 +495,7 @@
             db.delete(table, Rate.SENT_TIME + "<=" + oneHourAgo, null);
             db.insert(table, null, values);
         } else if (table.equals(TABLE_DRM)) {
-            String path = getContext().getDir("parts", 0).getPath()
+            String path = getContext().getDir(PARTS_DIR_NAME, 0).getPath()
                     + "/PART_" + System.currentTimeMillis();
             finalValues = new ContentValues(1);
             finalValues.put("_data", path);
@@ -739,7 +741,7 @@
                 break;
 
             case MMS_PART_RESET_FILE_PERMISSION:
-                String path = getContext().getDir("parts", 0).getPath() + '/' +
+                String path = getContext().getDir(PARTS_DIR_NAME, 0).getPath() + '/' +
                         uri.getPathSegments().get(1);
                 // Reset the file permission back to read for everyone but me.
                 int result = FileUtils.setPermissions(path, 0644, -1, -1);
@@ -834,10 +836,17 @@
         try {
             File filePath = new File(path);
             if (!filePath.getCanonicalPath()
-                    .startsWith(getContext().getApplicationInfo().dataDir + "/app_parts/")) {
+                    .startsWith(getContext().getDir(PARTS_DIR_NAME, 0).getPath())) {
+                Log.e(TAG, "openFile: path "
+                        + filePath.getCanonicalPath()
+                        + " does not start with "
+                        + getContext().getDir(PARTS_DIR_NAME, 0).getPath());
+                // Don't care return value
+                filePath.delete();
                 return null;
             }
         } catch (IOException e) {
+            Log.e(TAG, "openFile: create path failed " + e, e);
             return null;
         }