diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2016-06-30 13:41:02 -0700 |
|---|---|---|
| committer | Ivan Podogov <ginkage@google.com> | 2016-12-02 11:58:02 +0000 |
| commit | 528811c980ec9c5f66dedadbb6c5b5c4710f1d1e (patch) | |
| tree | 9619f10112b8115c8ff3780a8ef4d30292a2cb8c /src | |
| parent | fcc931291148e99f8f023f79283a2d770868db30 (diff) | |
| download | android_packages_apps_PackageInstaller-528811c980ec9c5f66dedadbb6c5b5c4710f1d1e.tar.gz android_packages_apps_PackageInstaller-528811c980ec9c5f66dedadbb6c5b5c4710f1d1e.tar.bz2 android_packages_apps_PackageInstaller-528811c980ec9c5f66dedadbb6c5b5c4710f1d1e.zip | |
Add Bluetooth toggle prompts - package installer
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.
bug:28715749
Change-Id: I3783fa99f3fca881a4b60ea1e7c0f68098302ae4
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) { |