summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2019-02-05 09:28:02 -0800
committerJoel Galenson <jgalenson@google.com>2019-02-21 16:15:35 -0800
commit731b520823fa7d6f0a50617a8d5b66f788fe2a4e (patch)
tree7bbca14dc21d557d92b9cb16d364dd42ae51ee4d
parent391094fa53d07d7192b32368ee62f9f3722c48b5 (diff)
downloadandroid_packages_apps_PackageInstaller-731b520823fa7d6f0a50617a8d5b66f788fe2a4e.tar.gz
android_packages_apps_PackageInstaller-731b520823fa7d6f0a50617a8d5b66f788fe2a4e.tar.bz2
android_packages_apps_PackageInstaller-731b520823fa7d6f0a50617a8d5b66f788fe2a4e.zip
Show dialog when trying to change location provider permission.
GMS Core is the location provider on the device and so the permission cannot be disabled. Instead of having clicks on it go to a disabled tri-state screen, restore the P behavior of popping up a dialog that can redirect users to the Location setting. Fixes: 123902223 Test: Click on GMS Core location on four different screens and get this dialog. Test: Click on other permissions and get the normal tri-state. Change-Id: Ic4ec22dea46405d4800010dec437822965f351ec
-rw-r--r--AndroidManifest.xml4
-rw-r--r--src/com/android/packageinstaller/permission/ui/AppPermissionActivity.java9
-rw-r--r--src/com/android/packageinstaller/permission/ui/LocationProviderInterceptDialog.java72
3 files changed, 85 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6d401305..4d22a50b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -133,6 +133,10 @@
android:excludeFromRecents="true"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" />
+ <activity android:name="com.android.packageinstaller.permission.ui.LocationProviderInterceptDialog"
+ android:excludeFromRecents="true"
+ android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" />
+
<activity android:name="com.android.packageinstaller.permission.ui.ReviewAccessibilityServicesActivity"
android:excludeFromRecents="true"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" >
diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionActivity.java b/src/com/android/packageinstaller/permission/ui/AppPermissionActivity.java
index f2a87b50..e00c4c52 100644
--- a/src/com/android/packageinstaller/permission/ui/AppPermissionActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/AppPermissionActivity.java
@@ -64,6 +64,15 @@ public final class AppPermissionActivity extends FragmentActivity {
return;
}
+ if (LocationUtils.isLocationGroupAndProvider(this, permissionName,
+ packageName)) {
+ Intent intent = new Intent(this, LocationProviderInterceptDialog.class);
+ intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName);
+ startActivity(intent);
+ finish();
+ return;
+ }
+
if (LocationUtils.isLocationGroupAndControllerExtraPackage(
this, permissionName, packageName)) {
// Redirect to location controller extra package settings.
diff --git a/src/com/android/packageinstaller/permission/ui/LocationProviderInterceptDialog.java b/src/com/android/packageinstaller/permission/ui/LocationProviderInterceptDialog.java
new file mode 100644
index 00000000..c0b7e6ac
--- /dev/null
+++ b/src/com/android/packageinstaller/permission/ui/LocationProviderInterceptDialog.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.packageinstaller.permission.ui;
+
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+
+import com.android.packageinstaller.permission.utils.Utils;
+import com.android.permissioncontroller.R;
+
+/**
+ * A dialog saying that you cannot change the location provider's location permission.
+ */
+public final class LocationProviderInterceptDialog extends FragmentActivity {
+ private static final String LOG_TAG = LocationProviderInterceptDialog.class.getSimpleName();
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ String packageName = getIntent().getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+ if (packageName == null) {
+ Log.i(LOG_TAG, "Missing mandatory argument EXTRA_PACKAGE_NAME");
+ finish();
+ return;
+ }
+
+ new AlertDialog.Builder(this)
+ .setIcon(R.drawable.ic_dialog_alert_material)
+ .setTitle(android.R.string.dialog_alert_title)
+ .setMessage(getString(R.string.location_warning,
+ Utils.getAppLabel(getPackageInfo(packageName).applicationInfo, this)))
+ .setNegativeButton(R.string.ok, null)
+ .setPositiveButton(R.string.location_settings, (dialog, which) ->
+ startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)))
+ .setOnDismissListener((dialog) -> finish())
+ .show();
+ }
+
+ private @Nullable PackageInfo getPackageInfo(@NonNull String packageName) {
+ try {
+ return getPackageManager().getPackageInfo(packageName, PackageManager.GET_PERMISSIONS);
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.i(LOG_TAG, "No package: " + packageName, e);
+ finish();
+ return null;
+ }
+ }
+}