Fix some problems with ASECs

On devices that had external storage, permissions weren't set correctly
on non-forward-locked applications. Also, moving forward locked
applications didn't work since DefaultContainerService wasn't able to
read it.

Fixed some faulty unit tests as well.

Bug: 6427212
Change-Id: I5c1f0bf5278549069c78939f0708c4c43a7d4006

1 files changed, 9 insertions, 2 deletions

diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
index 3eec18c..c709e40 100644
--- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
+++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
@@ -311,6 +311,14 @@ public class DefaultContainerService extends IntentService {
             return null;
         }
 
+        try {
+            Libcore.os.chmod(resFile.getAbsolutePath(), 0640);
+        } catch (ErrnoException e) {
+            Slog.e(TAG, "Could not chown APK: " + e.getMessage());
+            PackageHelper.destroySdDir(newCid);
+            return null;
+        }
+
         if (isForwardLocked) {
             File publicZipFile = new File(newCachePath, publicResFileName);
             try {
@@ -326,10 +334,9 @@ public class DefaultContainerService extends IntentService {
             }
 
             try {
-                Libcore.os.chmod(resFile.getAbsolutePath(), 0640);
                 Libcore.os.chmod(publicZipFile.getAbsolutePath(), 0644);
             } catch (ErrnoException e) {
-                Slog.e(TAG, "Could not chown APK or resource file: " + e.getMessage());
+                Slog.e(TAG, "Could not chown public resource file: " + e.getMessage());
                 PackageHelper.destroySdDir(newCid);
                 return null;
             }