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

Fix Settings crash when click uninstall button

Browse Source 
am: 2d709131ba

Change-Id: I1e6228b5e4ecf10aa58bd41d2d8019b3d727b935
This commit is contained in:
Raff Tsai
2019-09-06 01:47:19 -07:00
committed by android-build-merger
parent 3b0a921326 2d709131ba
commit 6f8797f86c
2 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
@Override
public int getAvailabilityStatus() {
// TODO(b/37313605): Re-enable once this controller supports instant apps
return isInstantApp() || isSystemModule() ? DISABLED_FOR_USER : AVAILABLE;
return mFinishing || isInstantApp() || isSystemModule() ? DISABLED_FOR_USER : AVAILABLE;
}
@Override
@@ -189,7 +189,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
@Override
public void onResume() {
if (isAvailable() && !mFinishing) {
if (isAvailable()) {
mAppsControlDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
mActivity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(