From f6bdb755f06cb29360573512a12a6c35becb967c Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Fri, 26 Feb 2021 04:03:23 +0000
Subject: [PATCH] Revert "Configure privapp perms for car activity resolver"

Revert submission 13664195-activityresolvermaster

Reason for revert: Broken tests in presubmit: b/181232374
Reverted Changes:
If7e5d48ce:Configure privapp perms for car activity resolver
I5b4862fca:Use car-specific activity resolver

Bug: 181232374
Bug: 173543124

Change-Id: I195722cb326dd16b8fcc75014d5d399b6cfba16a
---
 data/etc/car/Android.bp                       |  7 -------
 .../car/com.android.car.activityresolver.xml  | 21 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 data/etc/car/com.android.car.activityresolver.xml

diff --git a/data/etc/car/Android.bp b/data/etc/car/Android.bp
index 2f41b9084f40d..f6d76855ca687 100644
--- a/data/etc/car/Android.bp
+++ b/data/etc/car/Android.bp
@@ -173,10 +173,3 @@ prebuilt_etc {
     src: "com.android.car.shell.xml",
     filename_from_src: true,
 }
-
-prebuilt_etc {
-    name: "allowed_privapp_com.android.car.activityresolver",
-    sub_dir: "permissions",
-    src: "com.android.car.activityresolver.xml",
-    filename_from_src: true,
-}
diff --git a/data/etc/car/com.android.car.activityresolver.xml b/data/etc/car/com.android.car.activityresolver.xml
deleted file mode 100644
index d48bc15b16787..0000000000000
--- a/data/etc/car/com.android.car.activityresolver.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2021 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.
-  -->
-<permissions>
-    <privapp-permissions package="com.android.car.activityresolver">
-        <permission name="android.permission.MANAGE_USERS"/>
-    </privapp-permissions>
-</permissions>