Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I3f56acd12a4ab98bd5595c25098b544c14fbf25c
Change-Id: I6b0f21720bd011203fe2f908d924a91d873c9c04

vendor/file.te

@@ -1,2 +1 @@
-type sysfs_modem_state, sysfs_type, fs_type;
 type sysfs_gps, sysfs_type, fs_type;

vendor/file_contexts

@@ -14,7 +14,6 @@
 /vendor/bin/hw/spad                 u:object_r:spad_exec:s0
 
 /vendor/bin/hw/android.hardware.gnss-service                   u:object_r:hal_gnss_default_exec:s0
-/vendor/bin/hw/android.hardware.gnss-service.pixel             u:object_r:hal_gnss_pixel_exec:s0
 
 # gnss/gps data/log files
 /data/vendor/gps(/.*)?              u:object_r:vendor_gps_file:s0

vendor/genfs_contexts

@@ -54,7 +54,4 @@ genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-7/7-0069/power_supply/main-c
 genfscon sysfs /devices/platform/gnssif/wakeup                                                                       u:object_r:sysfs_wakeup:s0
 
 # gps coredump node
-genfscon sysfs /devices/platform/gnssif/coredump                                                                     u:object_r:sysfs_gps:s0
-
-# modem state
-genfscon sysfs /devices/platform/cpif/modem_state       u:object_r:sysfs_modem_state:s0
+genfscon sysfs /devices/platform/gnssif/coredump                                                                     u:object_r:sysfs_gps:s0

vendor/gnssd.te

@@ -25,3 +25,12 @@ get_prop(gnssd, bootanim_system_prop)
 
 allow gnssd sysfs_soc:file r_file_perms;
 allow gnssd sysfs_gps:file rw_file_perms;
+
+# Allow gnssd to set GPS property
+set_prop(gnssd, vendor_gps_prop)
+
+# Read RIL property
+get_prop(gnssd, vendor_rild_prop)
+
+# Read modme state
+allow gnssd sysfs_modem_state:file r_file_perms;

vendor/hal_contexthub_default.te

@@ -0,0 +1,6 @@
+#
+# Context hub multiclient HAL common selinux policies
+#
+# Allow binder call to PixelGnss PPS function.
+binder_call(hal_contexthub_default, hal_gnss_pixel)
+

vendor/hal_gnss_default.te

@@ -7,3 +7,6 @@ allow hal_gnss_default sysfs_gps:file rw_file_perms;
 
 #Read GPS property
 get_prop(hal_gnss_default, vendor_gps_prop)
+
+# Binder call to pixel-gnss
+binder_call(hal_gnss_default, hal_gnss_pixel)

vendor/hal_gnss_pixel.te

@@ -1,13 +0,0 @@
-type hal_gnss_pixel, domain;
-hal_server_domain(hal_gnss_pixel, hal_gnss)
-
-type hal_gnss_pixel_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(hal_gnss_pixel)
-
-#IPC between pixel and vendor HAL
-binder_call(hal_gnss_pixel, hal_gnss_default)
-binder_call(hal_gnss_default, hal_gnss_pixel)
-
-#Read modem state /sys/bus/platform/devices/cpif/modem_state
-allow hal_gnss_pixel sysfs_modem_state:file r_file_perms;
-allow hal_gnss_pixel sysfs_gps:file rw_file_perms;

vendor/service_contexts

@@ -1 +0,0 @@
-android.hardware.gnss.IGnss/vendor                                 u:object_r:hal_gnss_service:s0