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
This commit is contained in:
Svetoslav Ganov
2016-06-09 22:45:49 +00:00
committed by Android (Google) Code Review
parent b43b49c643 30ee6ab320
commit 3e5318496e
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) {
summary = res.getString(
R.string.runtime_permissions_summary_no_permissions_requested);
mPermissionsPreference.setOnPreferenceClickListener(null);
mPermissionsPreference.setEnabled(false);
} else {
final ArrayList<CharSequence> list = new ArrayList<>(grantedGroupLabels);
if (additionalGrantedPermissionCount > 0) {
@@ -1221,6 +1223,8 @@ public class InstalledAppDetails extends AppInfoBase
} else {
summary = ListFormatter.getInstance().format(list);
}
mPermissionsPreference.setOnPreferenceClickListener(InstalledAppDetails.this);
mPermissionsPreference.setEnabled(true);
}
mPermissionsPreference.setSummary(summary);
}