Merge "Fix repeating apps on pause/resume" into jb-mr2-dev

This commit is contained in:
Amith Yamasani
2013-04-23 17:13:46 +00:00
committed by Android (Google) Code Review
5 changed files with 130 additions and 32 deletions

View File

@@ -257,10 +257,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
KEY_TOGGLE_INSTALL_APPLICATIONS);
mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
boolean isSideloadingAllowed =
!um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
// Side loading of apps.
mToggleAppInstallation.setEnabled(isSideloadingAllowed);
mToggleAppInstallation.setEnabled(mIsPrimary);
// Package verification, only visible to primary user and if enabled
mToggleVerifyApps = (CheckBoxPreference) findPreference(KEY_TOGGLE_VERIFY_APPLICATIONS);