diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2016-12-13 16:02:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-13 16:02:29 +0000 |
| commit | d8f70e096c175e2f1923e7e1263643c6c3feee75 (patch) | |
| tree | 287044eb2321c55ac0c991d69cf461b546082fca /src | |
| parent | d3053b27bf5280b868995ddf23ba7ad96fc7554b (diff) | |
| parent | 528811c980ec9c5f66dedadbb6c5b5c4710f1d1e (diff) | |
| download | android_packages_apps_PackageInstaller-d8f70e096c175e2f1923e7e1263643c6c3feee75.tar.gz android_packages_apps_PackageInstaller-d8f70e096c175e2f1923e7e1263643c6c3feee75.tar.bz2 android_packages_apps_PackageInstaller-d8f70e096c175e2f1923e7e1263643c6c3feee75.zip | |
Add Bluetooth toggle prompts - package installer
am: 528811c980
Change-Id: If422232abd3b6b5059b32c2d1297ccd751f1167e
Diffstat (limited to 'src')
| -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) { |