Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev am: 0c9c09c

am: ed6bdaa

* commit 'ed6bdaaf380939779bb06dc51af88098c3c3aac1':
  Regenerate ApplicationInfo if package suspend state is changed.

Change-Id: Id8238d5ec73cc8f922913b3640d1984911df2bfb
This commit is contained in:
Rubin Xu
2016-04-25 10:23:59 +00:00
committed by android-build-merger

View File

@@ -85,6 +85,7 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;
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 @@ public class PackageParser {
return true;
}
}
boolean suspended = (p.applicationInfo.flags & FLAG_SUSPENDED) != 0;
if (state.suspended != suspended) {
return true;
}
if (!state.installed || state.hidden) {
return true;
}