Snap for 6091187 from b65c7fa0d652407c06945d6c1d3ea50a39fad483 to qt-qpr2-release

Change-Id: Icdcb6c4021c8bb6c7cacd992dd0f38fafaf9a737

2 files changed, 8 insertions, 21 deletions

diff --git a/src/com/android/packageinstaller/permission/service/PermissionSearchIndexablesProvider.java b/src/com/android/packageinstaller/permission/service/PermissionSearchIndexablesProvider.java
index 4be2b1a3..59647446 100644
--- a/src/com/android/packageinstaller/permission/service/PermissionSearchIndexablesProvider.java
+++ b/src/com/android/packageinstaller/permission/service/PermissionSearchIndexablesProvider.java
@@ -42,8 +42,6 @@ public class PermissionSearchIndexablesProvider extends BaseSearchIndexablesProv
 
     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 @@ public class PermissionSearchIndexablesProvider extends BaseSearchIndexablesProv
                     .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;
     }
 
diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivityTrampoline.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivityTrampoline.java
index 570782b5..b12be7bd 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivityTrampoline.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivityTrampoline.java
@@ -45,19 +45,14 @@ public class ManagePermissionsActivityTrampoline extends Activity {
 
         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);