summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Tate <ctate@android.com>2014-01-22 01:42:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-01-22 01:42:50 +0000
commit9fc157a4767f54d1cff53dc9489638b67aec2da3 (patch)
treefa5ccf5c5156e7afc003edfc3c91ddedafb55314
parentc9a60b0f77525244ac4f970258703b8dc62ee140 (diff)
parent719b3b807509d998eeb2aabd582d30b99947673d (diff)
downloadframeworks_base-9fc157a4767f54d1cff53dc9489638b67aec2da3.zip
frameworks_base-9fc157a4767f54d1cff53dc9489638b67aec2da3.tar.gz
frameworks_base-9fc157a4767f54d1cff53dc9489638b67aec2da3.tar.bz2
Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"
-rwxr-xr-xservices/java/com/android/server/pm/PackageManagerService.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index 5761f6c..7e244b9 100755
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -3657,6 +3657,12 @@ public class PackageManagerService extends IPackageManager.Stub {
// An updated system app will not have the PARSE_IS_SYSTEM flag set
// initially
parseFlags |= PackageParser.PARSE_IS_SYSTEM;
+
+ // An updated privileged app will not have the PARSE_IS_PRIVILEGED
+ // flag set initially
+ if ((updatedPkg.pkgFlags & ApplicationInfo.FLAG_PRIVILEGED) != 0) {
+ parseFlags |= PackageParser.PARSE_IS_PRIVILEGED;
+ }
}
// Verify certificates against what was last scanned
if (!collectCertificatesLI(pp, ps, pkg, scanFile, parseFlags)) {