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

am: 650cc723d1

Change-Id: I7c2309f8ccc006cf0b37e5dce6bb75bef927b747
This commit is contained in:
Svetoslav Ganov
2016-06-09 22:58:26 +00:00
committed by android-build-merger

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);
}