From 8bb255379818d819589fb8ee63927042a4464da2 Mon Sep 17 00:00:00 2001 From: Shijian Li Date: Mon, 9 Jan 2017 15:20:49 +0000 Subject: Add refresh logic for individually controlled permission in onResume. Test: Manually test with a testing apk. Bug: 34157556 Change-Id: I78ffbfa2fbbff14fb05242d7979cd226b1725ba7 --- .../permission/ui/wear/AppPermissionsFragmentWear.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java b/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java index d2d1f718..31615676 100644 --- a/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java +++ b/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java @@ -137,9 +137,13 @@ public final class AppPermissionsFragmentWear extends PreferenceFragment { // Also refresh the UI for (final AppPermissionGroup group : mAppPermissions.getPermissionGroups()) { - Preference pref = findPreference(group.getName()); - if (pref instanceof SwitchPreference) { - ((SwitchPreference) pref).setChecked(group.areRuntimePermissionsGranted()); + if (Utils.areGroupPermissionsIndividuallyControlled(getContext(), group.getName())) { + for (PermissionInfo perm : getPermissionInfosFromGroup(group)) { + setPreferenceCheckedIfPresent(perm.name, + group.areRuntimePermissionsGranted(new String[]{ perm.name })); + } + } else { + setPreferenceCheckedIfPresent(group.getName(), group.areRuntimePermissionsGranted()); } } } @@ -304,4 +308,11 @@ public final class AppPermissionsFragmentWear extends PreferenceFragment { } return permInfos; } + + private void setPreferenceCheckedIfPresent(String preferenceKey, boolean checked) { + Preference pref = findPreference(preferenceKey); + if (pref instanceof SwitchPreference) { + ((SwitchPreference) pref).setChecked(checked); + } + } } -- cgit v1.2.3