Snap for 12770256 from db9f7e0d38 to 25Q1-release

Change-Id: I85393c3de41fee214d075d98dae2ca217abd1b23

interrupts/init.interrupts.rc

@@ -13,4 +13,4 @@ on init
     # Keep the buffer size small. This size is practically enough for debug purpose.
     # Having low size helps because this entire buffer gets dumped in bugreport.
     # Having a large size can impact bugreport size and time it takes to pack/unpack.
-    write /sys/kernel/tracing/instances/irq_gia_google/buffer_size_kb 512
+    write /sys/kernel/tracing/instances/irq_gia_google/buffer_size_kb 64

modem/modem_svc_sit/compatibility_matrix.xml

@@ -0,0 +1,11 @@
+<compatibility-matrix version="1.0" type="framework">
+    <!-- Optional since older devices will not register any services. -->
+    <hal format="aidl" optional="true">
+        <name>com.google.pixel.shared_modem_platform</name>
+        <version>3</version>
+        <interface>
+            <name>ISharedModemPlatform</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>

modem/modem_svc_sit/sepolicy/attributes

@@ -0,0 +1 @@
+hal_attribute(shared_modem_platform)

modem/modem_svc_sit/sepolicy/file_contexts

@@ -0,0 +1,2 @@
+# modem_svc_sit
+/vendor/bin/shared_modem_platform   u:object_r:modem_svc_sit_exec:s0

modem/modem_svc_sit/sepolicy/hal_shared_modem_platform.te

@@ -0,0 +1,8 @@
+# Allow binder connection from client to server
+binder_call(hal_shared_modem_platform_client, hal_shared_modem_platform_server)
+
+# Allow client to find the service, server to register the service
+hal_attribute_service(hal_shared_modem_platform, hal_shared_modem_platform_service)
+
+# Allow binder communication from server to service_manager
+binder_use(hal_shared_modem_platform_server)

modem/modem_svc_sit/sepolicy/modem_svc_sit.te

@@ -0,0 +1,2 @@
+# Modem SVC will register the default instance of the AIDL ISharedModemPlatform hal.
+hal_server_domain(modem_svc_sit, hal_shared_modem_platform)

modem/modem_svc_sit/sepolicy/service.te

@@ -0,0 +1,2 @@
+# define hal_shared_modem_platform_service
+type hal_shared_modem_platform_service, hal_service_type, service_manager_type;

modem/modem_svc_sit/sepolicy/service_contexts

@@ -0,0 +1,2 @@
+# Bind Shared Modem Platform AIDL service name to the SELinux type.
+com.google.pixel.shared_modem_platform.ISharedModemPlatform/default u:object_r:hal_shared_modem_platform_service:s0

modem/modem_svc_sit/shared_modem_platform.mk

@@ -0,0 +1,14 @@
+# This file is not included in `modem.mk` since this is included at the
+# beginning of each `device.mk` file, and so will be called before
+# `SHARED_MODEM_PLATFORM_VENDOR` is defined later in the file.
+# This file supoorts Whitechapel(gs101), Whitechapel Pro(gs201), Zuma, Zuma Pro.
+# This file doesn't support devices which AP is after Zuma Pro.
+# For device after Zuma Pro please use gs-common/modem/shared_modem_platform/shared_modem_platform.mk
+SOONG_CONFIG_NAMESPACES += shared_modem_platform
+SOONG_CONFIG_shared_modem_platform += \
+       vendor
+SOONG_CONFIG_shared_modem_platform_vendor := $(SHARED_MODEM_PLATFORM_VENDOR)
+
+PRODUCT_PACKAGES += shared_modem_platform
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/modem/modem_svc_sit/compatibility_matrix.xml
+BOARD_SEPOLICY_DIRS += device/google/gs-common/modem/modem_svc_sit/sepolicy

modem/shared_modem_platform/sepolicy/file_contexts

@@ -0,0 +1,2 @@
+# shared_modem_platform
+/vendor/bin/shared_modem_platform   u:object_r:shared_modem_platform_exec:s0

modem/shared_modem_platform/sepolicy/shared_modem_platform.te

@@ -0,0 +1,2 @@
+# Shared modem platform will register the default instance of the AIDL ISharedModemPlatform hal.
+hal_server_domain(shared_modem_platform, hal_shared_modem_platform)

modem/shared_modem_platform/shared_modem_platform.mk

@@ -1,6 +1,8 @@
 # This file is not included in `modem.mk` since this is included at the
 # beginning of each `device.mk` file, and so will be called before
 # `SHARED_MODEM_PLATFORM_VENDOR` is defined later in the file.
+# This file supports support devices which AP is after zumapro(not include).
+# For device before zumapro(include) please use gs-common/modem/modem_svc_sit/shared_modem_platform.mk
 SOONG_CONFIG_NAMESPACES += shared_modem_platform
 SOONG_CONFIG_shared_modem_platform += \
        vendor
@@ -8,4 +10,4 @@ SOONG_CONFIG_shared_modem_platform_vendor := $(SHARED_MODEM_PLATFORM_VENDOR)
 
 PRODUCT_PACKAGES += shared_modem_platform
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/modem/shared_modem_platform/compatibility_matrix.xml
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/modem/shared_modem_platform/sepolicy
+BOARD_SEPOLICY_DIRS += device/google/gs-common/modem/shared_modem_platform/sepolicy

performance/experiments/amm/Android.bp

@@ -1,10 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-prebuilt_etc {
-    name: "pixel-amm-experiment.rc",
-    src: "pixel-amm-experiment.rc",
-    vendor: true,
-    sub_dir: "init",
-}

performance/experiments/amm/amm.mk

@@ -1 +0,0 @@
-PRODUCT_PACKAGES += pixel-amm-experiment.rc

performance/experiments/amm/pixel-amm-experiment.rc

@@ -1,21 +0,0 @@
-# Activate DISABLE_AMM hint.
-service pixel-amm-experiment-activate /vendor/bin/sendhint -m DISABLE_AMM
-    disabled
-    oneshot
-
-# Deactivate DISABLE_AMM hint.
-service pixel-amm-experiment-deactivate /vendor/bin/sendhint -m DISABLE_AMM -e 0
-    disabled
-    oneshot
-
-# AMM experiment (go/pixel-perf-amm-experiment).
-on property:vendor.perf.allow_experiments=1 && \
-    property:vendor.pixel.system.phenotype.Perf__amm_experiment=true
-    setprop vendor.powerhal.amm_enabled false
-    start pixel-amm-experiment-activate
-
-# Rampdown of the experiment.
-on property:vendor.perf.allow_experiments=1 && \
-    property:vendor.pixel.system.phenotype.Perf__amm_experiment=""
-    setprop vendor.powerhal.amm_enabled ""
-    start pixel-amm-experiment-deactivate

performance/experiments/experiments.mk

@@ -4,4 +4,3 @@ PRODUCT_PACKAGES += pixel-experiments-recovery.sh
 
 include device/google/gs-common/performance/experiments/kswapd/kswapd.mk
 include device/google/gs-common/performance/experiments/apf/apf.mk
-include device/google/gs-common/performance/experiments/amm/amm.mk

storage/storage.mk

@@ -1,4 +1,6 @@
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/storage/sepolicy
+BOARD_VENDOR_SEPOLICY_DIRS += \
+	device/google/gs-common/storage/sepolicy \
+	device/google/gs-common/storage/sepolicy/tracking_denials
 
 PRODUCT_PACKAGES += dump_storage