From 9290d7c45b7690097e2c075dfba4be6f89253e31 Mon Sep 17 00:00:00 2001
From: Andrew Chant <achant@google.com>
Date: Sat, 11 Feb 2023 01:27:19 +0000
Subject: [PATCH] Revert "update error on ROM 9588633"

This reverts commit 8c2f12f39d7644a50938599bf3107f2566bf5ea6.

Reason for revert: Broke the zuma build
Bug: 268566583

device/google/zuma-sepolicy/tracking_denials/systemui_app.te:6:ERROR 'unknown type hal_googlebattery' at token ';' on line 100380:
dontaudit systemui_app hal_googlebattery:binder { call };
dontaudit systemui_app default_android_service:service_manager { find };
checkpolicy:  error(s) encountered while parsing configuration

Change-Id: I1286020227bdd73c14833489613237f82573d02f
---
 tracking_denials/hal_wireless_charger.te |  2 --
 tracking_denials/priv_app.te             |  4 +---
 tracking_denials/systemui_app.te         | 25 ------------------------
 tracking_denials/vendor_init.te          |  3 ---
 4 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 tracking_denials/hal_wireless_charger.te
 delete mode 100644 tracking_denials/systemui_app.te

diff --git a/tracking_denials/hal_wireless_charger.te b/tracking_denials/hal_wireless_charger.te
deleted file mode 100644
index be39812f..00000000
--- a/tracking_denials/hal_wireless_charger.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# b/268566583
-dontaudit hal_wireless_charger systemui_app:binder { call };
diff --git a/tracking_denials/priv_app.te b/tracking_denials/priv_app.te
index 564edee1..630eccc5 100644
--- a/tracking_denials/priv_app.te
+++ b/tracking_denials/priv_app.te
@@ -20,6 +20,4 @@ dontaudit priv_app privapp_data_file:file { unlink };
 # b/264490074
 userdebug_or_eng(`
   permissive priv_app;
-')# b/268572216
-dontaudit priv_app privapp_data_file:dir { add_name };
-dontaudit priv_app privapp_data_file:dir { remove_name };
+')
\ No newline at end of file
diff --git a/tracking_denials/systemui_app.te b/tracking_denials/systemui_app.te
deleted file mode 100644
index 43f39ad8..00000000
--- a/tracking_denials/systemui_app.te
+++ /dev/null
@@ -1,25 +0,0 @@
-# b/268572197
-dontaudit systemui_app cameraserver_service:service_manager { find };
-dontaudit systemui_app color_display_service:service_manager { find };
-dontaudit systemui_app default_android_service:service_manager { find };
-dontaudit systemui_app hal_googlebattery:binder { call };
-dontaudit systemui_app hal_googlebattery_service:service_manager { find };
-dontaudit systemui_app hal_wireless_charger:binder { call };
-dontaudit systemui_app hal_wireless_charger:binder { transfer };
-dontaudit systemui_app hal_wireless_charger_service:service_manager { find };
-dontaudit systemui_app keyguard_config_prop:file { getattr };
-dontaudit systemui_app keyguard_config_prop:file { map };
-dontaudit systemui_app keyguard_config_prop:file { open };
-dontaudit systemui_app keyguard_config_prop:file { read };
-dontaudit systemui_app mediaextractor_service:service_manager { find };
-dontaudit systemui_app mediametrics_service:service_manager { find };
-dontaudit systemui_app mediaserver_service:service_manager { find };
-dontaudit systemui_app network_score_service:service_manager { find };
-dontaudit systemui_app overlay_service:service_manager { find };
-dontaudit systemui_app qemu_hw_prop:file { getattr };
-dontaudit systemui_app qemu_hw_prop:file { map };
-dontaudit systemui_app qemu_hw_prop:file { open };
-dontaudit systemui_app radio_service:service_manager { find };
-dontaudit systemui_app touch_context_service:service_manager { find };
-dontaudit systemui_app twoshay:binder { call };
-dontaudit systemui_app vr_manager_service:service_manager { find };
diff --git a/tracking_denials/vendor_init.te b/tracking_denials/vendor_init.te
index 1abb861c..fd95ad0d 100644
--- a/tracking_denials/vendor_init.te
+++ b/tracking_denials/vendor_init.te
@@ -13,6 +13,3 @@ userdebug_or_eng(`
 # b/267843409
 dontaudit vendor_init default_prop:property_service { set };
 dontaudit vendor_init vendor_camera_debug_prop:property_service { set };
-# b/268572164
-dontaudit vendor_init vendor_ssrdump_prop:property_service { set };
-dontaudit vendor_init vendor_usb_config_prop:property_service { set };