PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2

Browse Source 
Change-Id: I334933880d8a192e7d031cfa039c406a56a753c0
This commit is contained in:
Automerger Merge Worker
2020-03-16 12:21:28 +00:00
parent 9c6921cfb7 6d6e0f45b2
commit c9e4a2934f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
View File

@@ -396,7 +396,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
// We don't allow uninstalling DO/PO on *any* users if it's a system app, because
// "uninstall" is actually "downgrade to the system version + disable", and "downgrade"
// will clear data on all users.
if (Utils.isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) {
if (isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) {
if (Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mPackageInfo.packageName)) {
enabled = false;
}