commit b65c7fa0d652407c06945d6c1d3ea50a39fad483
author Nate Myren <ntmyren@google.com> Thu Dec 19 10:18:06 2019 -0800
committer Nate Myren <ntmyren@google.com> Thu Dec 19 18:24:51 2019 +0000
tree 80f23ed94cd8ed9d025ea14a8513eb13cd773c39
parent 5538e7c238c7f66c9b379d218f71afeb20fe1f08

Remove permission usage from settings search

Remove the ability to find the permission dashboard by searching
settings, and remove the code to handle that intent in the
ManagePermissionActivityTrampoline.

Fixes: 146560886

Test: Go to settings-> search "permission". The "permission dashboard"
should not be in the options

Change-Id: Ib9fc8ab635ed648bc05dcdb23f3d086062bee84c

src/com/android/packageinstaller/permission/service/PermissionSearchIndexablesProvider.java

diff --git a/src/com/android/packageinstaller/permission/service/PermissionSearchIndexablesProvider.java b/src/com/android/packageinstaller/permission/service/PermissionSearchIndexablesProvider.java
index 4be2b1a..5964744 100644
--- a/src/com/android/packageinstaller/permission/service/PermissionSearchIndexablesProvider.java
+++ b/src/com/android/packageinstaller/permission/service/PermissionSearchIndexablesProvider.java
@@ -42,8 +42,6 @@
 
     public static final String ACTION_MANAGE_PERMISSION_APPS =
             "com.android.permissioncontroller.settingssearch.action.MANAGE_PERMISSION_APPS";
-    public static final String ACTION_REVIEW_PERMISSION_USAGE =
-            "com.android.permissioncontroller.settingssearch.action.REVIEW_PERMISSION_USAGE";
 
     @Override
     public Cursor queryRawData(String[] projection) {
@@ -67,12 +65,6 @@
                     .add(COLUMN_INTENT_ACTION, ACTION_MANAGE_PERMISSION_APPS);
         }
 
-        cursor.newRow().add(COLUMN_RANK, 0)
-                .add(COLUMN_TITLE, context.getString(R.string.permission_usage_title))
-                .add(COLUMN_KEYWORDS, context.getString(R.string.permission_search_keyword))
-                .add(COLUMN_KEY, createRawDataKey("permissions usage", context))
-                .add(COLUMN_INTENT_ACTION, ACTION_REVIEW_PERMISSION_USAGE);
-
         return cursor;
     }
 

src/com/android/packageinstaller/permission/ui/ManagePermissionsActivityTrampoline.java

diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivityTrampoline.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivityTrampoline.java
index 570782b..b12be7b 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivityTrampoline.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivityTrampoline.java
@@ -45,19 +45,14 @@
 
         Intent newIntent = new Intent(this, ManagePermissionsActivity.class)
                 .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-        switch (action) {
-            case PermissionSearchIndexablesProvider.ACTION_REVIEW_PERMISSION_USAGE:
-                newIntent.setAction(Intent.ACTION_REVIEW_PERMISSION_USAGE);
-                break;
-            case PermissionSearchIndexablesProvider.ACTION_MANAGE_PERMISSION_APPS:
-                newIntent
-                        .setAction(Intent.ACTION_MANAGE_PERMISSION_APPS)
-                        .putExtra(Intent.EXTRA_PERMISSION_NAME,
-                                PermissionSearchIndexablesProvider.getOriginalKey(intent));
-                break;
-            default:
-                finish();
-                return;
+        if (action.equals(PermissionSearchIndexablesProvider.ACTION_MANAGE_PERMISSION_APPS)) {
+            newIntent
+                    .setAction(Intent.ACTION_MANAGE_PERMISSION_APPS)
+                    .putExtra(Intent.EXTRA_PERMISSION_NAME,
+                            PermissionSearchIndexablesProvider.getOriginalKey(intent));
+        } else {
+            finish();
+            return;
         }
 
         startActivity(newIntent);