Merge "Prevent start if package is frozen" into rvc-dev am: 08f6ca3915 am: 4146fcc183 am: dfb425311b

Change-Id: I0232d4afbb42ffc540ce2cb5ddd4419de9ea88c4

services/core/java/com/android/server/am/ProcessList.java

@@ -2334,6 +2334,19 @@ public final class ProcessList {
             if (sb == null) sb = new StringBuilder();
             sb.append("seq=" + app.startSeq + ",expected=" + expectedStartSeq + ";");
         }
+        try {
+            AppGlobals.getPackageManager().checkPackageStartable(app.info.packageName, app.userId);
+        } catch (RemoteException e) {
+            // unexpected; ignore
+        } catch (SecurityException e) {
+            if (mService.mConstants.FLAG_PROCESS_START_ASYNC) {
+                if (sb == null) sb = new StringBuilder();
+                sb.append("Package is frozen;");
+            } else {
+                // we're not being started async and so should throw to the caller.
+                throw e;
+            }
+        }
         return sb == null ? null : sb.toString();
     }