commit 0c9c09ccff72c9a017e6c7da3aef8738eea5f176
author Rubin Xu <rubinxu@google.com> Mon Apr 25 10:12:01 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 25 10:12:02 2016 +0000
tree 7a817e8b77ad91d7b6e3e1725b8aee06c191350c
parent f48f390a60694df6f4b72bd0ac462dd19c5e1191
parent bf67c9c1164bffa1dbaaaf72233e8ab5a1d2fd67

Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev

core/java/android/content/pm/PackageParser.java

diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 4613800..f42a340 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -85,6 +85,7 @@
 import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_AND_PIPABLE;
 import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
+import static android.content.pm.ApplicationInfo.FLAG_SUSPENDED;
 import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_RESIZEABLE_ACTIVITIES;
 import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST;
 import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME;
@@ -5288,6 +5289,10 @@
                 return true;
             }
         }
+        boolean suspended = (p.applicationInfo.flags & FLAG_SUSPENDED) != 0;
+        if (state.suspended != suspended) {
+            return true;
+        }
         if (!state.installed || state.hidden) {
             return true;
         }