diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-01-21 12:26:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-21 12:26:30 +0000 |
commit | 55b8f5a43975b8df8b31d62281fbc0b38b19bd02 (patch) | |
tree | 993c3fb636c50f1877acfe5c1cc5545b60e6de45 /src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java | |
parent | d0cd095d9831bd637f5b529b46e6217bfb76b0be (diff) | |
parent | 49a28f7e9a17e914c4a3135e45c4eec1852e558a (diff) | |
download | android_packages_apps_PackageInstaller-55b8f5a43975b8df8b31d62281fbc0b38b19bd02.tar.gz android_packages_apps_PackageInstaller-55b8f5a43975b8df8b31d62281fbc0b38b19bd02.tar.bz2 android_packages_apps_PackageInstaller-55b8f5a43975b8df8b31d62281fbc0b38b19bd02.zip |
Merge "Add a padlock to options when disabled by admin."
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java index f56cba70..d4dfca1e 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java @@ -53,10 +53,13 @@ import com.android.packageinstaller.permission.ui.OverlayTouchActivity; import com.android.packageinstaller.permission.utils.LocationUtils; import com.android.packageinstaller.permission.utils.SafetyNetLogger; import com.android.packageinstaller.permission.utils.Utils; +import com.android.settingslib.RestrictedLockUtils; import java.util.ArrayList; import java.util.List; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + public final class AppPermissionsFragment extends SettingsWithHeader implements OnPreferenceChangeListener { @@ -216,7 +219,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader boolean isPlatform = group.getDeclaringPackage().equals(Utils.OS_PKG); - SwitchPreference preference = new SwitchPreference(context); + RestrictedSwitchPreference preference = new RestrictedSwitchPreference(context); preference.setOnPreferenceChangeListener(this); preference.setKey(group.getName()); Drawable icon = Utils.loadDrawable(context.getPackageManager(), @@ -226,9 +229,15 @@ public final class AppPermissionsFragment extends SettingsWithHeader preference.setTitle(group.getLabel()); if (group.isPolicyFixed()) { preference.setSummary(getString(R.string.permission_summary_enforced_by_policy)); + EnforcedAdmin admin = + RestrictedLockUtils.getProfileOrDeviceOwnerOnCallingUser(context); + if (admin != null) { + preference.setDisabledByAdmin(admin); + } else { + preference.setEnabled(false); + } } preference.setPersistent(false); - preference.setEnabled(!group.isPolicyFixed()); preference.setChecked(group.areRuntimePermissionsGranted()); if (isPlatform) { |