Merge 10952656

Merged-In: I9356b4a7581fd56e0905e2e69f93bc41cb1ac3ca
Change-Id: I08dbe6e19be27bc944766d6ac5c7bb3679215a22
diff --git a/vendor/device.te b/bluejay/device.te
similarity index 100%
rename from vendor/device.te
rename to bluejay/device.te
diff --git a/vendor/file_contexts b/bluejay/file_contexts
similarity index 100%
rename from vendor/file_contexts
rename to bluejay/file_contexts
diff --git a/bluejay/genfs_contexts b/bluejay/genfs_contexts
index 6b11056..b01c716 100644
--- a/bluejay/genfs_contexts
+++ b/bluejay/genfs_contexts
@@ -1,4 +1,8 @@
 # Haptics
+genfscon sysfs /devices/platform/10970000.hsi2c/i2c-0/i2c-cs40l26a      u:object_r:sysfs_vibrator:s0
+genfscon sysfs /devices/platform/10970000.hsi2c/i2c-1/i2c-cs40l26a      u:object_r:sysfs_vibrator:s0
+genfscon sysfs /devices/platform/10970000.hsi2c/i2c-2/i2c-cs40l26a      u:object_r:sysfs_vibrator:s0
+genfscon sysfs /devices/platform/10970000.hsi2c/i2c-3/i2c-cs40l26a      u:object_r:sysfs_vibrator:s0
 genfscon sysfs /devices/platform/10970000.hsi2c/i2c-4/i2c-cs40l26a      u:object_r:sysfs_vibrator:s0
 genfscon sysfs /devices/platform/10970000.hsi2c/i2c-5/i2c-cs40l26a      u:object_r:sysfs_vibrator:s0
 genfscon sysfs /devices/platform/10970000.hsi2c/i2c-6/i2c-cs40l26a      u:object_r:sysfs_vibrator:s0
diff --git a/bluejay/grilservice_app.te b/bluejay/grilservice_app.te
new file mode 100644
index 0000000..ad0a779
--- /dev/null
+++ b/bluejay/grilservice_app.te
@@ -0,0 +1 @@
+allow grilservice_app hal_bluetooth_coexistence_service:service_manager find;
diff --git a/vendor/ufs_firmware_update.te b/bluejay/ufs_firmware_update.te
similarity index 100%
rename from vendor/ufs_firmware_update.te
rename to bluejay/ufs_firmware_update.te
diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map
index 5aa59ad..69858d8 100644
--- a/tracking_denials/bug_map
+++ b/tracking_denials/bug_map
@@ -1,14 +1,4 @@
 derive_sdk mediaprovider_app dir b/264600240
-dump_pixel_metrics sysfs file b/268147280
-dump_ramdump radio_vendor_data_file file b/270247129
-dump_ramdump vendor_camera_data_file file b/270633115
-dump_stm sysfs_spi dir b/268147400
-dump_storage radio_vendor_data_file file b/269218359
-dump_storage vendor_slog_file file b/269218359
-dump_trusty modem_efs_file file b/277529247
-dumpstate app_zygote process b/238263942
-dumpstate system_data_file dir b/261932945
-hal_dumpstate_default dump_ramdump process b/270247072
 hal_power_default hal_power_default capability b/240632681
 hal_vibrator_default sysfs file b/264483668
 incidentd debugfs_wakeup_sources file b/238263518
diff --git a/tracking_denials/dump_gsc.te b/tracking_denials/dump_gsc.te
deleted file mode 100644
index 1eb7ccf..0000000
--- a/tracking_denials/dump_gsc.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# b/265886512
-dontaudit dump_gsc radio_vendor_data_file:file { read };
-dontaudit dump_gsc radio_vendor_data_file:file { write };