From 25aa649c3e29720466aa467fbed2a317fa78379d Mon Sep 17 00:00:00 2001
From: Dan Harms <danharms@google.com>
Date: Wed, 20 Jan 2021 12:27:36 -0800
Subject: [PATCH] Remove bundled CompanionDeviceSupport permissions

Bug: 160037666
Test: Compiles
Change-Id: I955916f97815fb55a4e701f69a01a975e0d0c205
Merged-In: Ib96198a39c18a0b9c3cf64c0c58c89b1a5b62c19
---
 data/etc/car/Android.bp                       |  7 ------
 ...com.android.car.companiondevicesupport.xml | 24 -------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 data/etc/car/com.android.car.companiondevicesupport.xml

diff --git a/data/etc/car/Android.bp b/data/etc/car/Android.bp
index 3c990abaec871..458ac128b196c 100644
--- a/data/etc/car/Android.bp
+++ b/data/etc/car/Android.bp
@@ -128,13 +128,6 @@ prebuilt_etc {
     filename_from_src: true,
 }
 
-prebuilt_etc {
-    name: "privapp_whitelist_com.android.car.companiondevicesupport",
-    sub_dir: "permissions",
-    src: "com.android.car.companiondevicesupport.xml",
-    filename_from_src: true,
-}
-
 prebuilt_etc {
     name: "privapp_whitelist_com.google.android.car.kitchensink",
     sub_dir: "permissions",
diff --git a/data/etc/car/com.android.car.companiondevicesupport.xml b/data/etc/car/com.android.car.companiondevicesupport.xml
deleted file mode 100644
index 2067bab20d3d5..0000000000000
--- a/data/etc/car/com.android.car.companiondevicesupport.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ 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
-  -->
-<permissions>
-    <privapp-permissions package="com.android.car.companiondevicesupport">
-      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-      <permission name="android.permission.MANAGE_USERS"/>
-      <permission name="android.permission.PROVIDE_TRUST_AGENT"/>
-      <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-    </privapp-permissions>
-</permissions>