From 18ba31be97c716fc0068148ad0952f41a0eb6f24 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Mon, 20 May 2019 08:53:37 -0700 Subject: [PATCH 1/5] Grandfather bg location perm on upgrade Test: Upgraded and checked location bg perm Bug: 132175290 Change-Id: I3ba8b7b2cd04a5cc12b31343108b8feacb258f71 --- .../RuntimePermissionsUpgradeController.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/com/android/packageinstaller/permission/service/RuntimePermissionsUpgradeController.java b/src/com/android/packageinstaller/permission/service/RuntimePermissionsUpgradeController.java index a7cae3ba8..cf668c5ed 100644 --- a/src/com/android/packageinstaller/permission/service/RuntimePermissionsUpgradeController.java +++ b/src/com/android/packageinstaller/permission/service/RuntimePermissionsUpgradeController.java @@ -38,7 +38,7 @@ class RuntimePermissionsUpgradeController { private static final String LOG_TAG = RuntimePermissionsUpgradeController.class.getSimpleName(); // The latest version of the runtime permissions database - private static final int LATEST_VERSION = 3; + private static final int LATEST_VERSION = 4; private RuntimePermissionsUpgradeController() { /* do nothing - hide constructor */ @@ -163,6 +163,28 @@ class RuntimePermissionsUpgradeController { currentVersion = 3; } + if (currentVersion == 3) { + Log.i(LOG_TAG, "Grandfathering location background permissions"); + + for (int i = 0; i < appCount; i++) { + final PackageInfo app = apps.get(i); + if (app.requestedPermissions == null) { + continue; + } + + for (String requestedPermission : app.requestedPermissions) { + if (requestedPermission.equals( + Manifest.permission.ACCESS_BACKGROUND_LOCATION)) { + context.getPackageManager().addWhitelistedRestrictedPermission( + app.packageName, Manifest.permission.ACCESS_BACKGROUND_LOCATION, + PackageManager.FLAG_PERMISSION_WHITELIST_UPGRADE); + break; + } + } + } + currentVersion = 4; + } + // XXX: Add new upgrade steps above this point. return currentVersion; -- GitLab From 95f5f74f019f8d846ac6aa9c3b88caf6480d90f9 Mon Sep 17 00:00:00 2001 From: Hai Zhang Date: Tue, 21 May 2019 12:14:49 -0700 Subject: [PATCH 2/5] Resolve most remaining STOPSHIP comments for role. Bug: 132909319 Test: presubmit Change-Id: Ic310d68337fd2117b2c36d0ab14148b408a444f5 --- res/values/strings.xml | 2 -- res/values/themes.xml | 1 - res/xml/roles.xml | 13 ++++++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index c03934daa..7a161a9a7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -740,7 +740,6 @@ Default apps - @@ -777,7 +776,6 @@ Special app access - diff --git a/res/values/themes.xml b/res/values/themes.xml index 1f064bda4..bf78249c6 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -56,7 +56,6 @@ parent="@android:style/Theme.DeviceDefault.Settings"> -