From 30ee6ab320cc66575d6d09a654051ab8632a7a79 Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Wed, 8 Jun 2016 22:32:07 -0700 Subject: [PATCH] Don't send user to permissions screen if none requested bug:29105157 Change-Id: I90ef18f41deae9a7cf28192bd47f16c3af262c29 --- .../android/settings/applications/InstalledAppDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 0025b209244..0964abe48ac 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -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 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); }