Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Resets system flags when updating PackageSettings" into pi-dev

Browse Source 
am: f8f6e5af75

Change-Id: I8832fc1d11afe9593bf229ef0575b8e8d962d2db
This commit is contained in:
android-build-team Robot
2018-05-03 11:03:52 -07:00
committed by android-build-merger
parent aa0d1fefe3 f8f6e5af75
commit 91bb146dd0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/pm/Settings.java
View File

@@ -844,7 +844,12 @@ public final class Settings {
} }
// If what we are scanning is a system (and possibly privileged) package, // If what we are scanning is a system (and possibly privileged) package,
// then make it so, regardless of whether it was previously installed only // then make it so, regardless of whether it was previously installed only
// in the data partition. // in the data partition. Reset first.
pkgSetting.pkgFlags &= ~ApplicationInfo.FLAG_SYSTEM;
pkgSetting.pkgPrivateFlags &= ~(ApplicationInfo.PRIVATE_FLAG_PRIVILEGED
| ApplicationInfo.PRIVATE_FLAG_OEM
| ApplicationInfo.PRIVATE_FLAG_VENDOR
| ApplicationInfo.PRIVATE_FLAG_PRODUCT);
pkgSetting.pkgFlags |= pkgFlags & ApplicationInfo.FLAG_SYSTEM; pkgSetting.pkgFlags |= pkgFlags & ApplicationInfo.FLAG_SYSTEM;
pkgSetting.pkgPrivateFlags |= pkgSetting.pkgPrivateFlags |=
pkgPrivateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED; pkgPrivateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED;