diff options
| author | Ivan Podogov <ginkage@google.com> | 2016-12-13 15:55:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-13 15:55:26 +0000 |
| commit | da068af11f21504da022530831d1b7b263790988 (patch) | |
| tree | 7eae0ed156e26ede4835c0b315112fde341a9749 | |
| parent | f5ac6f29a39af297176385c1eb9d132edd438204 (diff) | |
| parent | 528811c980ec9c5f66dedadbb6c5b5c4710f1d1e (diff) | |
| download | android_packages_apps_PackageInstaller-da068af11f21504da022530831d1b7b263790988.tar.gz android_packages_apps_PackageInstaller-da068af11f21504da022530831d1b7b263790988.tar.bz2 android_packages_apps_PackageInstaller-da068af11f21504da022530831d1b7b263790988.zip | |
Merge "Add Bluetooth toggle prompts - package installer" into cw-f-dev
| -rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissions.java | 4 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/television/AllAppPermissionsFragment.java | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissions.java b/src/com/android/packageinstaller/permission/model/AppPermissions.java index e455ef13..38f35f96 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissions.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissions.java @@ -83,7 +83,9 @@ public final class AppPermissions { } public boolean isReviewRequired() { - if (!Build.PERMISSIONS_REVIEW_REQUIRED) { + if (!mContext.getResources().getBoolean( + com.android.internal.R.bool.config_permissionReviewRequired) + && !Build.PERMISSIONS_REVIEW_REQUIRED) { return false; } final int groupCount = mGroups.size(); diff --git a/src/com/android/packageinstaller/permission/ui/television/AllAppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/television/AllAppPermissionsFragment.java index 0f8cb5b1..d3f3e407 100644 --- a/src/com/android/packageinstaller/permission/ui/television/AllAppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/television/AllAppPermissionsFragment.java @@ -288,8 +288,10 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader { return Utils.applyTint(context, icon, android.R.attr.colorControlNormal); } - private static boolean isMutableGranularPermission(String name) { - if (!Build.PERMISSIONS_REVIEW_REQUIRED) { + private boolean isMutableGranularPermission(String name) { + if (!getResources().getBoolean( + com.android.internal.R.bool.config_permissionReviewRequired) + && !Build.PERMISSIONS_REVIEW_REQUIRED) { return false; } switch (name) { |