Merge "Only call fixSdPermissions when appropriate" into jb-dev

Author: kruton

services/java/com/android/server/pm/PackageManagerService.java

@@ -6523,8 +6523,9 @@ class AsecInstallArgs extends InstallArgs {
             setCachePath(subStr1);
         }
 
-        AsecInstallArgs(String cid) {
-            super(null, null, isAsecExternal(cid) ? PackageManager.INSTALL_EXTERNAL : 0, null, null);
+        AsecInstallArgs(String cid, boolean isForwardLocked) {
+            super(null, null, (isAsecExternal(cid) ? PackageManager.INSTALL_EXTERNAL : 0)
+                    | (isForwardLocked ? PackageManager.INSTALL_FORWARD_LOCK : 0), null, null);
             this.cid = cid;
             setCachePath(PackageHelper.getSdDir(cid));
         }
@@ -6730,11 +6731,7 @@ boolean matchContainer(String app) {
         }
 
         String getPackageName() {
-            int idx = cid.lastIndexOf("-");
-            if (idx == -1) {
-                return cid;
-            }
-            return cid.substring(0, idx);
+            return getAsecPackageName(cid);
         }
 
         boolean doPostDeleteLI(boolean delete) {
@@ -6765,7 +6762,6 @@ int doPreCopy() {
         @Override
         int doPostCopy(int uid) {
             if (isFwdLocked()) {
-                PackageHelper.fixSdPermissions(cid, uid, RES_FILE_NAME);
                 if (uid < Process.FIRST_APPLICATION_UID
                         || !PackageHelper.fixSdPermissions(cid, uid, RES_FILE_NAME)) {
                     Slog.e(TAG, "Failed to finalize " + cid);
@@ -6778,6 +6774,14 @@ int doPostCopy(int uid) {
         }
     };
 
+    static String getAsecPackageName(String packageCid) {
+        int idx = packageCid.lastIndexOf("-");
+        if (idx == -1) {
+            return packageCid;
+        }
+        return packageCid.substring(0, idx);
+    }
+
     // Utility method used to create code paths based on package name and available index.
     private static String getNextCodePath(String oldCodePath, String prefix, String suffix) {
         String idxStr = "";
@@ -8699,10 +8703,9 @@ private void updateExternalMediaStatusInner(boolean isMounted, boolean reportSta
             // reader
             synchronized (mPackages) {
                 for (String cid : list) {
-                    AsecInstallArgs args = new AsecInstallArgs(cid);
                     if (DEBUG_SD_INSTALL)
                         Log.i(TAG, "Processing container " + cid);
-                    String pkgName = args.getPackageName();
+                    String pkgName = getAsecPackageName(cid);
                     if (pkgName == null) {
                         if (DEBUG_SD_INSTALL)
                             Log.i(TAG, "Container : " + cid + " stale");
@@ -8711,24 +8714,31 @@ private void updateExternalMediaStatusInner(boolean isMounted, boolean reportSta
                     }
                     if (DEBUG_SD_INSTALL)
                         Log.i(TAG, "Looking for pkg : " + pkgName);
-                    PackageSetting ps = mSettings.mPackages.get(pkgName);
+
+                    final PackageSetting ps = mSettings.mPackages.get(pkgName);
+                    if (ps == null) {
+                        Log.i(TAG, "Deleting container with no matching settings " + cid);
+                        removeCids.add(cid);
+                        continue;
+                    }
+
+                    final AsecInstallArgs args = new AsecInstallArgs(cid, isForwardLocked(ps));
                     // The package status is changed only if the code path
                     // matches between settings and the container id.
-                    if (ps != null && ps.codePathString != null
-                            && ps.codePathString.equals(args.getCodePath())) {
-                        if (DEBUG_SD_INSTALL)
+                    if (ps.codePathString != null && ps.codePathString.equals(args.getCodePath())) {
+                        if (DEBUG_SD_INSTALL) {
                             Log.i(TAG, "Container : " + cid + " corresponds to pkg : " + pkgName
                                     + " at code path: " + ps.codePathString);
+                        }
+
                         // We do have a valid package installed on sdcard
                         processCids.put(args, ps.codePathString);
-                        int uid = ps.appId;
+                        final int uid = ps.appId;
                         if (uid != -1) {
                             uidList[num++] = uid;
                         }
                     } else {
-                        // Stale container on sdcard. Just delete
-                        if (DEBUG_SD_INSTALL)
-                            Log.i(TAG, "Container : " + cid + " stale");
+                        Log.i(TAG, "Deleting stale container for " + cid);
                         removeCids.add(cid);
                     }
                 }
@@ -8812,6 +8822,9 @@ private void loadMediaPackages(HashMap<AsecInstallArgs, String> processCids, int
                 if (args.isExternal()) {
                     parseFlags |= PackageParser.PARSE_ON_SDCARD;
                 }
+                if (args.isFwdLocked()) {
+                    parseFlags |= PackageParser.PARSE_FORWARD_LOCK;
+                }
 
                 doGc = true;
                 synchronized (mInstallLock) {