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

Merge "Settings app should be available to restricted user"

Browse Source
This commit is contained in:
Fyodor Kupolov
2015-03-02 19:13:57 +00:00
committed by Android (Google) Code Review
parent d3a747f52a b0fc28cba5
commit e3b81e47cc
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/users/AppRestrictionsFragment.java
View File

@@ -317,10 +317,6 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
return getPreferenceScreen(); return getPreferenceScreen();
} }
protected void clearSelectedApps() {
mSelectedPackages.clear();
}
private void applyUserAppsStates() { private void applyUserAppsStates() {
final int userId = mUser.getIdentifier(); final int userId = mUser.getIdentifier();
if (!mUserManager.getUserInfo(userId).isRestricted() && userId != UserHandle.myUserId()) { if (!mUserManager.getUserInfo(userId).isRestricted() && userId != UserHandle.myUserId()) {
@@ -643,6 +639,8 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
final boolean hasSettings = resolveInfoListHasPackage(receivers, packageName); final boolean hasSettings = resolveInfoListHasPackage(receivers, packageName);
if (isSettingsApp) { if (isSettingsApp) {
addLocationAppRestrictionsPreference(app, p); addLocationAppRestrictionsPreference(app, p);
// Settings app should be available to restricted user
mSelectedPackages.put(packageName, true);
continue; continue;
} }
PackageInfo pi = null; PackageInfo pi = null;
@@ -687,7 +685,8 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
p.setChecked(mSelectedPackages.get(packageName)); p.setChecked(mSelectedPackages.get(packageName));
} }
p.setOrder(MAX_APP_RESTRICTIONS * (mAppList.getPreferenceCount() + 2)); p.setOrder(MAX_APP_RESTRICTIONS * (mAppList.getPreferenceCount() + 2));
addToAppList(p, packageName); mSelectedPackages.put(packageName, p.isChecked());
mAppList.addPreference(p);
} }
mAppListChanged = true; mAppListChanged = true;
// If this is the first time for a new profile, install/uninstall default apps for profile // If this is the first time for a new profile, install/uninstall default apps for profile
@@ -736,11 +735,6 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
p.setPersistent(false); p.setPersistent(false);
p.setOnPreferenceClickListener(this); p.setOnPreferenceClickListener(this);
p.setOrder(MAX_APP_RESTRICTIONS); p.setOrder(MAX_APP_RESTRICTIONS);
addToAppList(p, packageName);
}
private void addToAppList(AppRestrictionsPreference p, String packageName) {
mSelectedPackages.put(packageName, p.isChecked());
mAppList.addPreference(p); mAppList.addPreference(p);
} }