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 am: f8f6e5af75

Browse Source 
am: 91bb146dd0

Change-Id: Ibb8f601122bd57972eb8b03051c166e699b3d220
This commit is contained in:
android-build-team Robot
2018-05-03 11:19:22 -07:00
committed by android-build-merger
parent ed78622233 91bb146dd0
commit c9af40a45a
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,
// 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.pkgPrivateFlags |=
pkgPrivateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED;