From b8f2e8f69f4dcd685e5fa27bd64f343842b2d350 Mon Sep 17 00:00:00 2001
From: Wilson Sung <wilsonsung@google.com>
Date: Tue, 5 Dec 2023 03:08:10 +0000
Subject: [PATCH] Remove uwb app

Bug: 312143882
Change-Id: I3807a60097cae74fb40c726620ef602ebe60e23d
---
 legacy/zuma/vendor/uwb_vendor_app.te          |  4 ---
 tracking_denials/certs/com_qorvo_uwb.x509.pem | 29 -------------------
 tracking_denials/keys.conf                    |  3 --
 tracking_denials/mac_permissions.xml          |  3 --
 tracking_denials/seapp_contexts               |  3 --
 5 files changed, 42 deletions(-)
 delete mode 100644 legacy/zuma/vendor/uwb_vendor_app.te
 delete mode 100644 tracking_denials/certs/com_qorvo_uwb.x509.pem

diff --git a/legacy/zuma/vendor/uwb_vendor_app.te b/legacy/zuma/vendor/uwb_vendor_app.te
deleted file mode 100644
index d249d36..0000000
--- a/legacy/zuma/vendor/uwb_vendor_app.te
+++ /dev/null
@@ -1,4 +0,0 @@
-type uwb_vendor_app, domain;
-
-app_domain(uwb_vendor_app)
-
diff --git a/tracking_denials/certs/com_qorvo_uwb.x509.pem b/tracking_denials/certs/com_qorvo_uwb.x509.pem
deleted file mode 100644
index 0e7c9ed..0000000
--- a/tracking_denials/certs/com_qorvo_uwb.x509.pem
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-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
-lHV8gmlwBAuAx9ITcTJr
------END CERTIFICATE-----
diff --git a/tracking_denials/keys.conf b/tracking_denials/keys.conf
index 92b931b..56f6721 100644
--- a/tracking_denials/keys.conf
+++ b/tracking_denials/keys.conf
@@ -10,8 +10,5 @@ ALL : device/google/zumapro-sepolicy/tracking_denials/certs/camera_fishfood.x509
 [@CAMERASERVICES]
 ALL : device/google/zumapro-sepolicy/tracking_denials/certs/com_google_android_apps_camera_services.x509.pem
 
-[@UWB]
-ALL : device/google/zumapro-sepolicy/tracking_denials/certs/com_qorvo_uwb.x509.pem
-
 [@EUICCSUPPORTPIXEL]
 ALL : device/google/zumapro-sepolicy/tracking_denials/certs/EuiccSupportPixel.x509.pem
diff --git a/tracking_denials/mac_permissions.xml b/tracking_denials/mac_permissions.xml
index d469c3b..c0c0cc9 100644
--- a/tracking_denials/mac_permissions.xml
+++ b/tracking_denials/mac_permissions.xml
@@ -33,9 +33,6 @@
     <signer signature="@CAMERASERVICES" >
       <seinfo value="CameraServices" />
     </signer>
-    <signer signature="@UWB" >
-        <seinfo value="uwb" />
-    </signer>
     <signer signature="@EUICCSUPPORTPIXEL" >
         <seinfo value="EuiccSupportPixel" />
     </signer>
diff --git a/tracking_denials/seapp_contexts b/tracking_denials/seapp_contexts
index 0b048df..7c87136 100644
--- a/tracking_denials/seapp_contexts
+++ b/tracking_denials/seapp_contexts
@@ -7,8 +7,5 @@ user=_app seinfo=platform name=com.android.ramdump domain=ramdump_app type=app_d
 # Domain for connectivity monitor
 user=_app isPrivApp=true seinfo=platform name=com.google.android.connectivitymonitor domain=con_monitor_app type=app_data_file levelFrom=all
 
-# Qorvo UWB system app
-user=_app isPrivApp=true seinfo=uwb name=com.qorvo.uwb.vendorservice domain=uwb_vendor_app type=uwb_vendor_data_file levelFrom=all
-
 # CccDkTimeSyncService
 user=_app isPrivApp=true name=com.google.pixel.digitalkey.timesync domain=vendor_cccdktimesync_app type=app_data_file levelFrom=all