Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev (cfd4e87a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/manageapplications/ManageApplications.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -126,6 +126,8 @@ import com.android.settings.notification.app.AppNotificationSettings;
		import com.android.settings.widget.LoadingViewController;
		import com.android.settings.wifi.AppStateChangeWifiStateBridge;
		import com.android.settings.wifi.ChangeWifiStateDetails;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.RestrictedLockUtilsInternal;
		import com.android.settingslib.applications.AppIconCacheManager;
		import com.android.settingslib.applications.AppUtils;
		import com.android.settingslib.applications.ApplicationsState;
		@@ -776,7 +778,18 @@ public class ManageApplications extends InstrumentedFragment
		mShowSystem = !mShowSystem;
		mApplications.rebuild();
		} else if (i == R.id.reset_app_preferences) {
		final boolean appsControlDisallowedBySystem =
		RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
		UserManager.DISALLOW_APPS_CONTROL, UserHandle.myUserId());
		final RestrictedLockUtils.EnforcedAdmin appsControlDisallowedAdmin =
		RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getActivity(),
		UserManager.DISALLOW_APPS_CONTROL, UserHandle.myUserId());
		if (appsControlDisallowedAdmin != null && !appsControlDisallowedBySystem) {
		RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
		getActivity(), appsControlDisallowedAdmin);
		} else {
		mResetAppsHelper.buildResetDialog();
		}
		return true;
		} else if (i == R.id.advanced) {
		if (mListType == LIST_TYPE_NOTIFICATION) {