From bcae40d94b5a97ab320f831904a9ba1f2b4a030b Mon Sep 17 00:00:00 2001
From: Yan Zhu <yanzhuyan@google.com>
Date: Mon, 17 Aug 2020 15:19:36 -0700
Subject: Move floatingcardslauncher code out of AOSP

Bug: 165034482
Test: build and flash
Change-Id: I7f5445f56deb432a41b497180f1a5285c0633ad7
---
 data/etc/car/Android.bp                            |  7 ------
 .../car/com.android.car.floatingcardslauncher.xml  | 25 ----------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 data/etc/car/com.android.car.floatingcardslauncher.xml

diff --git a/data/etc/car/Android.bp b/data/etc/car/Android.bp
index d0e688d3efc1..e122e0026aac 100644
--- a/data/etc/car/Android.bp
+++ b/data/etc/car/Android.bp
@@ -143,13 +143,6 @@ prebuilt_etc {
     system_ext_specific: true,
 }
 
-prebuilt_etc {
-    name: "allowed_privapp_com.android.car.floatingcardslauncher",
-    sub_dir: "permissions",
-    src: "com.android.car.floatingcardslauncher.xml",
-    filename_from_src: true,
-}
-
 prebuilt_etc {
     name: "allowed_privapp_com.android.car.ui.paintbooth",
     sub_dir: "permissions",
diff --git a/data/etc/car/com.android.car.floatingcardslauncher.xml b/data/etc/car/com.android.car.floatingcardslauncher.xml
deleted file mode 100644
index 2755fee4eb55..000000000000
--- a/data/etc/car/com.android.car.floatingcardslauncher.xml
+++ /dev/null
@@ -1,25 +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.floatingcardslauncher">
-        <permission name="android.permission.ACTIVITY_EMBEDDING"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-    </privapp-permissions>
-</permissions>
-- 
cgit v1.2.3-59-g8ed1b