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

Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev

Browse Source 
am: 3e5318496e

Change-Id: I9f04ac2bda5816997e86aa6aee683df3bbfcb74d
This commit is contained in:
Svet Ganov
2016-06-09 22:53:40 +00:00
committed by android-build-merger
parent 483ca13e0b 3e5318496e
commit 650cc723d1
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -1207,6 +1207,8 @@ public class InstalledAppDetails extends AppInfoBase
if (requestedPermissionCount == 0) { if (requestedPermissionCount == 0) {
summary = res.getString( summary = res.getString(
R.string.runtime_permissions_summary_no_permissions_requested); R.string.runtime_permissions_summary_no_permissions_requested);
mPermissionsPreference.setOnPreferenceClickListener(null);
mPermissionsPreference.setEnabled(false);
} else { } else {
final ArrayList<CharSequence> list = new ArrayList<>(grantedGroupLabels); final ArrayList<CharSequence> list = new ArrayList<>(grantedGroupLabels);
if (additionalGrantedPermissionCount > 0) { if (additionalGrantedPermissionCount > 0) {
@@ -1221,6 +1223,8 @@ public class InstalledAppDetails extends AppInfoBase
} else { } else {
summary = ListFormatter.getInstance().format(list); summary = ListFormatter.getInstance().format(list);
} }
mPermissionsPreference.setOnPreferenceClickListener(InstalledAppDetails.this);
mPermissionsPreference.setEnabled(true);
} }
mPermissionsPreference.setSummary(summary); mPermissionsPreference.setSummary(summary);
} }