zuma: Initialize for Evolution X 9.x

Signed-off-by: AnierinB <anierin@evolution-x.org>

Android.bp

@@ -41,14 +41,3 @@ sh_binary {
     vendor: true,
     sub_dir: "hw",
 }
-
-// Filesystem: Copy efs/efs_backup/modem_userdata to /data partition
-// so that they can be accessed under 16K mode. By default, these partitions
-// are 4K F2FS , which can't be mounted under 16K mode.
-// (b/293313353)
-sh_binary {
-    name: "copy_efs_files_to_data",
-    src: "copy_efs_files_to_data.sh",
-    vendor: true,
-}
-

Android.mk

@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2011 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# WARNING: Everything listed here will be built on ALL platforms,
+# including x86, the universal, and the SDK.  Modules must be uniquely
+# named (liblights.panda), and must build everywhere, or limit themselves
+# to only building on ARM if they include assembly. Individual makefiles
+# are responsible for having their own logic, for fine-grained control.
+
+LOCAL_PATH := $(call my-dir)
+
+# if some modules are built directly from this directory (not subdirectories),
+# their rules should be written here.
+
+ifeq ($(USES_DEVICE_GOOGLE_ZUMA),true)
+  include $(call first-makefiles-under,$(LOCAL_PATH))
+endif

BoardConfig-16k-common.mk

@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2024 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-ifneq ($(wildcard $(TARGET_KERNEL_DIR)/16kb/),)
-
-ifeq ($(TARGET_BOOTS_16K),true)
-# Configures the 16kb kernel directory.
-TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
-
-else ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true)
-# Configures the 16kb kernel and modules for OTA updates.
-TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb
-BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4
-
-BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_kernel_boot.modules.load)
-BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/system_dlkm.modules.load)
-BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_dlkm.modules.load)
-BOARD_KERNEL_MODULES_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(TARGET_KERNEL_DIR_16K)/$(notdir $(module)))
-BOARD_PREBUILT_DTBOIMAGE_16KB := $(TARGET_KERNEL_DIR_16K)/dtbo.img
-
-# The 16kb mode does not use these modules.
-BOARD_KERNEL_MODULES_16K := $(filter-out %/aoc_unit_test_dev.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_16K := $(filter-out %/gnssif.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_16K := $(filter-out %/gnss_spi.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_16K := $(filter-out %/mali_kutf.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_16K := $(filter-out %/mali_kutf_clk_rate_trace_test_portal.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_16K := $(filter-out %/rt6160_regulator.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_16K := $(filter-out %/sec_touch.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_16K := $(filter-out %/sscoredump_sample_test.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_16K := $(filter-out %/sscoredump_test.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_16K := $(filter-out %/zram.ko,$(BOARD_KERNEL_MODULES_16K))
-BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module)))
-
-BOARD_16K_OTA_USE_INCREMENTAL := true
-BOARD_16K_OTA_MOVE_VENDOR := true
-endif
-
-endif

BoardConfig-common.mk

@@ -16,8 +16,8 @@
 include build/make/target/board/BoardConfigMainlineCommon.mk
 include build/make/target/board/BoardConfigPixelCommon.mk
 
-# Include settings for 16k developer option, if enabled
-include device/google/zuma/BoardConfig-16k-common.mk
+# Should be uncommented after fixing vndk-sp violation is fixed.
+PRODUCT_FULL_TREBLE_OVERRIDE := true
 
 # HACK : To fix up after bring up multimedia devices.
 TARGET_SOC := zuma
@@ -30,31 +30,18 @@ TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-2a
 TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_VARIANT := cortex-a55
+TARGET_CPU_VARIANT_RUNTIME := cortex-a55
 
 BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10870000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
 BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
 BOARD_KERNEL_CMDLINE += cgroup_disable=memory
-BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all rcutree.enable_rcu_lazy
+BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all
 BOARD_KERNEL_CMDLINE += swiotlb=1024
 BOARD_KERNEL_CMDLINE += cgroup.memory=nokmem
 BOARD_KERNEL_CMDLINE += sysctl.kernel.sched_pelt_multiplier=4
-
-# Normal (non-_fullmte) builds should disable kasan
 ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT)))
 BOARD_KERNEL_CMDLINE += kasan=off
 endif
-
-# Enable a limited subset of MTE for "normal" (non-_fullmte) eng builds.
-# Don't touch any settings for _fullmte builds. They are set somewhere else.
-ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT)))
-ifeq ($(TARGET_BUILD_VARIANT),eng)
-BOARD_KERNEL_CMDLINE += bootloader.pixel.MTE_FORCE_ON
-ifeq ($(filter memtag_heap,$(SANITIZE_TARGET)),)
-SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap)
-endif
-endif
-endif
-
 BOARD_BOOTCONFIG += androidboot.boot_devices=13200000.ufs
 
 TARGET_NO_BOOTLOADER := true
@@ -78,7 +65,7 @@ TARGET_RECOVERY_FSTAB_GENRULE := gen_fstab.zuma-sw-encrypt
 TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
 TARGET_RECOVERY_UI_LIB := \
-	//hardware/google/pixel/recovery:librecovery_ui_pixel \
+	librecovery_ui_pixel \
 	libfstab
 
 AB_OTA_UPDATER := true
@@ -218,17 +205,6 @@ BOARD_USE_BLOB_ALLOCATOR := false
 BOARD_SUPPORT_MFC_ENC_BT2020 := true
 BOARD_SUPPORT_FLEXIBLE_P010 := true
 BOARD_SUPPORT_MFC_VERSION := 1660
-$(call soong_config_set,video_codec,target_soc_name,$(TARGET_SOC_NAME))
-$(call soong_config_set_bool,video_codec,board_use_codec2_hidl_1_2,$(BOARD_USE_CODEC2_HIDL_1_2))
-$(call soong_config_set_bool,video_codec,board_use_csc_filter,$(BOARD_USE_CSC_FILTER))
-$(call soong_config_set_bool,video_codec,board_use_dec_sw_csc,$(BOARD_USE_DEC_SW_CSC))
-$(call soong_config_set_bool,video_codec,board_use_enc_sw_csc,$(BOARD_USE_ENC_SW_CSC))
-$(call soong_config_set_bool,video_codec,board_support_mfc_enc_rgb,$(BOARD_SUPPORT_MFC_ENC_RGB))
-$(call soong_config_set_bool,video_codec,board_use_blob_allocator,$(BOARD_USE_BLOB_ALLOCATOR))
-$(call soong_config_set_bool,video_codec,board_support_mfc_enc_bt2020,$(BOARD_SUPPORT_MFC_ENC_BT2020))
-$(call soong_config_set_bool,video_codec,board_support_flexible_p010,$(BOARD_SUPPORT_FLEXIBLE_P010))
-$(call soong_config_set_bool,video_codec,board_use_codec2_aidl,$(if $(BOARD_USE_CODEC2_AIDL),true,false))
-$(call soong_config_set,video_codec,board_support_mfc_version,$(BOARD_SUPPORT_MFC_VERSION))
 ########################
 
 BOARD_SUPER_PARTITION_SIZE := 8531214336
@@ -301,8 +277,6 @@ BOARD_USES_EXYNOS_AFBC_FEATURE := true
 
 BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_zuma
 BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin
-$(call soong_config_set,acryl,libacryl_g2d_hdr_plugin,//hardware/google/graphics/zuma/libacryl_plugins:libacryl_hdr_plugin)
-$(call soong_config_set,acryl,libacryl_c_include,hardware/google/graphics/$(TARGET_BOARD_PLATFORM)/libcap)
 
 # HWCServices
 BOARD_USES_HWC_SERVICES := true
@@ -416,19 +390,11 @@ KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko)
 BOARD_SYSTEM_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/system_dlkm.modules.blocklist
 BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist
 
-# Prebuilt kernel modules that are *not* listed in vendor_kernel_boot.modules.load
-BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES = fips140.ko
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k)))
-
-# Kernel modules that are listed in vendor_kernel_boot.modules.load
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load))
-ifndef BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load))
+ifndef BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD
 $(error vendor_kernel_boot.modules.load not found or empty)
 endif
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA)
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE)
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA))
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE)))
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD)))
 
 BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.load))
 ifndef BOARD_VENDOR_KERNEL_MODULES_LOAD

BoardConfigEvolution.mk

@@ -1,10 +1,9 @@
 #
 # Copyright (C) 2024 The Evolution X Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-BUILD_BROKEN_DUP_RULES := true
-
 DISABLE_ARTIFACT_PATH_REQUIREMENTS := true
 
 SPOOF_FIRST_API_LEVEL_32 := true

BoardConfigLineage.mk

@@ -1,9 +1,13 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
+# Lineage Health
+TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_DEADLINE := true
+TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_TOGGLE := false
+
 # Manifests
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += vendor/lineage/config/device_framework_matrix.xml
 DEVICE_MANIFEST_FILE += \

CopyEfsTest/Android.bp

@@ -1,38 +0,0 @@
-// Copyright (C) 2024 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
-    default_applicable_licenses: ["device_google_zuma_license"],
-}
-
-java_test_host {
-    name: "CopyEfsTest",
-    // Include all test java files
-    srcs: ["src/**/*.java"],
-    static_libs: [
-        "junit",
-        "platform-test-annotations",
-        "truth",
-    ],
-    libs: [
-        "tradefed",
-        "compatibility-host-util",
-        "compatibility-tradefed",
-    ],
-    test_suites: [
-        "device-tests",
-        "device-pixel-tests"
-    ],
-    test_config: "AndroidTest.xml",
-}

CopyEfsTest/AndroidTest.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2024 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<configuration description="Runs 16K developer option test.">
-    <option name="test-suite-tag" value="apct"/>
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
-        <option name="force-root" value="true" />
-    </target_preparer>
-
-    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
-        <option name="jar" value="CopyEfsTest.jar" />
-    </test>
-
-    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
-        <!-- Unlock screen -->
-        <option name="run-command" value="input keyevent KEYCODE_WAKEUP" />
-        <!-- Dismiss keyguard, in case it's set as "Swipe to unlock" -->
-        <option name="run-command" value="wm dismiss-keyguard" />
-        <!-- Collapse notifications -->
-        <option name="run-command" value="cmd statusbar collapse" />
-        <!-- dismiss all system dialogs before launch test -->
-        <option name="run-command" value="am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS" />
-    </target_preparer>
-
-</configuration>

CopyEfsTest/src/com/android/test/CopyEfsTest.java

@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-import org.junit.Before;
-import org.junit.After;
-
-import android.platform.test.annotations.AppModeFull;
-
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
-import com.android.tradefed.testtype.junit4.DeviceTestRunOptions;
-import com.android.tradefed.util.CommandResult;
-import com.android.tradefed.util.RunUtil;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.BufferedReader;
-import java.io.StringReader;
-
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class CopyEfsTest extends BaseHostJUnit4Test {
-
-    @Before
-    public void setUp() throws Exception {
-        getDevice().enableAdbRoot();
-
-        getDevice().executeShellCommand("rm -rf /data/local/tmp/efs_test");
-        getDevice().executeShellCommand("mkdir -p /data/local/tmp/efs_test/mnt");
-        getDevice().executeShellCommand("mkdir -p /data/local/tmp/efs_test/dump");
-    }
-
-    @Test
-    @AppModeFull
-    public void copyEfsTest() throws Exception {
-        assumeTrue(getDevice().executeShellCommand("getconf PAGESIZE").trim().equals("4096"));
-
-        testDumpF2FS("efs");
-        testDumpF2FS("efs_backup");
-        testDumpF2FS("modem_userdata");
-        testDumpF2FS("persist");
-    }
-
-    private CommandResult RunAndCheckAdbCmd(String cmd) throws DeviceNotAvailableException {
-        CommandResult r = getDevice().executeShellV2Command(cmd);
-        assertEquals("Failed to run " + cmd, Integer.valueOf(0), r.getExitCode());
-        return r;
-    }
-
-    // Remove timestamps because ls on device does not support --time-style.
-    // Format is [permissions] [links] [uid] [gid] [size] time [name/symlink]
-    // time may vary greatly in formatting
-    // symlinks will be of the form a -> b
-    // So we can check for -> in the second to last spot to determine what position the timestamp ends at
-    // Remove totals because on disk block usage may change depending on filesystem
-    private String removeTimestamps(String input) {
-        StringBuilder output = new StringBuilder();
-        for (String line : input.split("\n")) {
-            String[] tokens = line.split("(?<![\\\\])\s+");
-            if (tokens[0].equals("total"))
-                continue;
-            if (tokens.length < 3) {
-                output.append(line + "\n");
-                continue;
-            }
-            int name_offset = 1;
-            if (tokens[tokens.length - 2].equals("->"))
-                name_offset = 3;
-            for (int i=0; i<tokens.length; i++) {
-                if (i >= 5 && i < tokens.length - name_offset)
-                    continue;
-                if (i != 0)
-                    output.append(" ");
-                output.append(tokens[i]);
-            }
-            output.append("\n");
-        }
-        return output.toString();
-    }
-
-    private void testDumpF2FS(String name) throws Exception {
-        RunAndCheckAdbCmd(String.format("cp /dev/block/by-name/%s /data/local/tmp/efs_test/%s.img", name, name));
-
-        // The device was mounted r/w. To get a clean image, we run fsck, and then mount to allow mount time fixes to happen.
-        // We can then dump and mount read only to ensure the contents should be the same.
-        RunAndCheckAdbCmd(String.format("fsck.f2fs -f /data/local/tmp/efs_test/%s.img", name));
-        RunAndCheckAdbCmd(String.format("mount /data/local/tmp/efs_test/%s.img /data/local/tmp/efs_test/mnt", name));
-        RunAndCheckAdbCmd("umount /data/local/tmp/efs_test/mnt");
-
-        RunAndCheckAdbCmd(String.format("dump.f2fs -rfPLo /data/local/tmp/efs_test/dump /data/local/tmp/efs_test/%s.img", name));
-        RunAndCheckAdbCmd(String.format("mount -r /data/local/tmp/efs_test/%s.img /data/local/tmp/efs_test/mnt", name));
-
-        CommandResult r = RunAndCheckAdbCmd("diff -rq --no-dereference /data/local/tmp/efs_test/mnt /data/local/tmp/efs_test/dump");
-        assertEquals(r.getStdout(), "");
-
-        String ls_cmd = "cd /data/local/tmp/efs_test/%s;ls -AlnR .";
-        CommandResult mnt_ls = RunAndCheckAdbCmd(String.format(ls_cmd, "mnt"));
-        CommandResult dump_ls = RunAndCheckAdbCmd(String.format(ls_cmd, "dump"));
-        assertEquals(removeTimestamps(mnt_ls.getStdout()), removeTimestamps(dump_ls.getStdout()));
-
-        getDevice().executeShellCommand("umount /data/local/tmp/efs_test/mnt");
-        getDevice().executeShellCommand("rm -rf /data/local/tmp/efs_test/dump/*");
-        getDevice().executeShellCommand("rm /data/local/tmp/efs_test/" + name + ".img");
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        getDevice().executeShellCommand("umount /data/local/tmp/efs_test/mnt");
-        getDevice().executeShellCommand("rm -rf /data/local/tmp/efs_test");
-    }
-}

OWNERS

@@ -1,2 +1,2 @@
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
+per-file *.mk=file:device/google/gs-common:main:/OWNERS

conf/Android.bp

@@ -14,6 +14,16 @@
  * limitations under the License.
  */
 
+// By default this device uses hardware-wrapped keys for storage encryption,
+// which is intended to offer increased security over the traditional method
+// (software keys).  However, hardware-wrapped keys aren't compatible with
+// FIPS-140 certification of the encryption hardware, and hence we have to
+// disable the use of them in FIPS mode.  This requires having two fstab files:
+// one for the default mode, and one for FIPS mode selectable via
+// androidboot.fstab_suffix on the kernel command line.  These fstabs should be
+// identical with the exception of the encryption settings, so to keep them in
+// sync the rules below generate them from a template file.
+
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -23,7 +33,52 @@ package {
     default_applicable_licenses: ["device_google_zuma_license"],
 }
 
-filegroup {
-    name: "fstab.zuma.common",
-    srcs: ["fstab.zuma.common"],
-}
+genrule {
+    name: "gen_fstab.zuma-hw-encrypt",
+    srcs: ["fstab.zuma.in"],
+    out: ["fstab.zuma"],
+    cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" +
+        " -e s/@inlinecrypt@/inlinecrypt/ " +
+        " -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)",
+}
+
+genrule {
+    name: "gen_fstab.zuma-sw-encrypt",
+    srcs: ["fstab.zuma.in"],
+    out: ["fstab.zuma"],
+    cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" +
+        " -e s/@inlinecrypt@// " +
+        " -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)",
+}
+
+genrule {
+    name: "gen_fstab.zuma-no-encrypt",
+    srcs: ["fstab.zuma.in"],
+    out: ["fstab.zuma"],
+    cmd: "sed -e s/@fileencryption@//" +
+        " -e s/@inlinecrypt@// " +
+        " -e s/@metadata_encryption@// $(in) > $(out)",
+}
+
+genrule {
+    name: "gen_fstab.zuma-fips",
+    srcs: ["fstab.zuma.in"],
+    out: ["fstab.zuma-fips"],
+    cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" +
+        " -e s/@inlinecrypt@/inlinecrypt/ " +
+        " -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)",
+}
+
+prebuilt_etc {
+    name: "fstab.zuma",
+    src: ":gen_fstab.zuma-hw-encrypt",
+    vendor: true,
+    vendor_ramdisk_available: true,
+}
+
+prebuilt_etc {
+    name: "fstab.zuma-fips",
+    src: ":gen_fstab.zuma-fips",
+    vendor: true,
+    vendor_ramdisk_available: true,
+}

conf/OWNERS

@@ -1,2 +0,0 @@
-# per-file for Pixel fstab
-per-file fstab.*=file:device/google/gs-common:main:/FSTAB_OWNERS

conf/ext4/Android.bp

@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// By default this device uses hardware-wrapped keys for storage encryption,
-// which is intended to offer increased security over the traditional method
-// (software keys).  However, hardware-wrapped keys aren't compatible with
-// FIPS-140 certification of the encryption hardware, and hence we have to
-// disable the use of them in FIPS mode.  This requires having two fstab files:
-// one for the default mode, and one for FIPS mode selectable via
-// androidboot.fstab_suffix on the kernel command line.  These fstabs should be
-// identical with the exception of the encryption settings, so to keep them in
-// sync the rules below generate them from a template file.
-
-soong_namespace {
-    imports: [
-        "device/google/zuma",
-    ],
-}
-
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "device_google_zuma_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["device_google_zuma_license"],
-}
-
-genrule {
-    name: "gen_fstab.zuma-hw-encrypt",
-    srcs: [
-        ":fstab.zuma.common",
-        "fstab.zuma.ext4",
-    ],
-    out: ["fstab.zuma"],
-    cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" +
-        " -e s/@inlinecrypt@/inlinecrypt/ " +
-        " -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)",
-}
-
-genrule {
-    name: "gen_fstab.zuma-sw-encrypt",
-    srcs: [
-        ":fstab.zuma.common",
-        "fstab.zuma.ext4",
-    ],
-    out: ["fstab.zuma"],
-    cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" +
-        " -e s/@inlinecrypt@// " +
-        " -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)",
-}
-
-genrule {
-    name: "gen_fstab.zuma-no-encrypt",
-    srcs: [
-        ":fstab.zuma.common",
-        "fstab.zuma.ext4",
-    ],
-    out: ["fstab.zuma"],
-    cmd: "sed -e s/@fileencryption@//" +
-        " -e s/@inlinecrypt@// " +
-        " -e s/@metadata_encryption@// $(in) > $(out)",
-}
-
-genrule {
-    name: "gen_fstab.zuma-fips",
-    srcs: [
-        ":fstab.zuma.common",
-        "fstab.zuma.ext4",
-    ],
-    out: ["fstab.zuma-fips"],
-    cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" +
-        " -e s/@inlinecrypt@/inlinecrypt/ " +
-        " -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)",
-}
-
-prebuilt_etc {
-    name: "fstab.zuma",
-    src: ":gen_fstab.zuma-hw-encrypt",
-    vendor: true,
-    vendor_ramdisk_available: true,
-}
-
-prebuilt_etc {
-    name: "fstab.zuma-fips",
-    src: ":gen_fstab.zuma-fips",
-    vendor: true,
-    vendor_ramdisk_available: true,
-}

conf/ext4/fstab.zuma.ext4

@@ -1,10 +0,0 @@
-# Android fstab file.
-#
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-#
-#<src>                                                   <mnt_point>                 <type>  <mnt_flags and options>  <fs_mgr_flags>
-/dev/block/platform/13200000.ufs/by-name/userdata        /data                       ext4     noatime,nosuid,nodev,@inlinecrypt@    latemount,wait,check,quota,formattable,reservedsize=128M,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption
-/dev/block/platform/13200000.ufs/by-name/userdata        /data                       f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache    latemount,wait,check,quota,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device
-/dev/block/platform/13200000.ufs/by-name/metadata        /metadata                   ext4    noatime,nosuid,nodev,data=journal,commit=1    wait,check,formattable,first_stage_mount,metadata_csum
-/dev/block/platform/13200000.ufs/by-name/metadata        /metadata                   f2fs    noatime,nosuid,nodev,sync  wait,check,first_stage_mount

conf/f2fs/Android.bp

@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// By default this device uses hardware-wrapped keys for storage encryption,
-// which is intended to offer increased security over the traditional method
-// (software keys).  However, hardware-wrapped keys aren't compatible with
-// FIPS-140 certification of the encryption hardware, and hence we have to
-// disable the use of them in FIPS mode.  This requires having two fstab files:
-// one for the default mode, and one for FIPS mode selectable via
-// androidboot.fstab_suffix on the kernel command line.  These fstabs should be
-// identical with the exception of the encryption settings, so to keep them in
-// sync the rules below generate them from a template file.
-
-soong_namespace {
-    imports: [
-        "device/google/zuma",
-    ],
-}
-
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "device_google_zuma_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["device_google_zuma_license"],
-}
-
-genrule {
-    name: "gen_fstab.zuma-hw-encrypt",
-    srcs: [
-        ":fstab.zuma.common",
-        "fstab.zuma.f2fs",
-    ],
-    out: ["fstab.zuma"],
-    cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" +
-        " -e s/@inlinecrypt@/inlinecrypt/ " +
-        " -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)",
-}
-
-genrule {
-    name: "gen_fstab.zuma-sw-encrypt",
-    srcs: [
-        ":fstab.zuma.common",
-        "fstab.zuma.f2fs",
-    ],
-    out: ["fstab.zuma"],
-    cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" +
-        " -e s/@inlinecrypt@// " +
-        " -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)",
-}
-
-genrule {
-    name: "gen_fstab.zuma-no-encrypt",
-    srcs: [
-        ":fstab.zuma.common",
-        "fstab.zuma.f2fs",
-    ],
-    out: ["fstab.zuma"],
-    cmd: "sed -e s/@fileencryption@//" +
-        " -e s/@inlinecrypt@// " +
-        " -e s/@metadata_encryption@// $(in) > $(out)",
-}
-
-genrule {
-    name: "gen_fstab.zuma-fips",
-    srcs: [
-        ":fstab.zuma.common",
-        "fstab.zuma.f2fs",
-    ],
-    out: ["fstab.zuma-fips"],
-    cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" +
-        " -e s/@inlinecrypt@/inlinecrypt/ " +
-        " -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)",
-}
-
-prebuilt_etc {
-    name: "fstab.zuma",
-    src: ":gen_fstab.zuma-hw-encrypt",
-    vendor: true,
-    vendor_ramdisk_available: true,
-}
-
-prebuilt_etc {
-    name: "fstab.zuma-fips",
-    src: ":gen_fstab.zuma-fips",
-    vendor: true,
-    vendor_ramdisk_available: true,
-}

conf/f2fs/fstab.zuma.f2fs

@@ -1,10 +0,0 @@
-# Android fstab file.
-#
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-#
-#<src>                                                   <mnt_point>                 <type>  <mnt_flags and options>  <fs_mgr_flags>
-/dev/block/platform/13200000.ufs/by-name/userdata        /data                       f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache    latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device
-/dev/block/platform/13200000.ufs/by-name/userdata        /data                       ext4     noatime,nosuid,nodev,@inlinecrypt@    latemount,wait,check,quota,formattable,reservedsize=128M,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption
-/dev/block/platform/13200000.ufs/by-name/metadata        /metadata                   f2fs    noatime,nosuid,nodev,sync  wait,check,formattable,first_stage_mount
-/dev/block/platform/13200000.ufs/by-name/metadata        /metadata                   ext4    noatime,nosuid,nodev,data=journal,commit=1    wait,check,formattable,first_stage_mount,metadata_csum

conf/fstab.efs

@@ -1,6 +0,0 @@
-# Android fstab file.
-# <src>                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
-# Create the specific fstab file for efs partitions for flexibility
-/dev/block/platform/13200000.ufs/by-name/efs             /mnt/vendor/efs             f2fs    noatime,sync             wait,check,formattable
-/dev/block/platform/13200000.ufs/by-name/efs_backup      /mnt/vendor/efs_backup      f2fs    noatime,sync             wait,check,formattable
-/dev/block/platform/13200000.ufs/by-name/modem_userdata  /mnt/vendor/modem_userdata  f2fs    noatime,sync             wait,check,formattable

conf/fstab.efs.from_data

@@ -1,10 +0,0 @@
-# Android fstab file.
-# <src>                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
-# Create the specific fstab file for efs partitions for flexibility
-/data/vendor/copied/efs             /mnt/vendor/efs             none    bind 	latemount
-
-/data/vendor/copied/efs_backup      /mnt/vendor/efs_backup      none    bind 	latemount
-
-/data/vendor/copied/modem_userdata  /mnt/vendor/modem_userdata  none    bind 	latemount
-
-/data/vendor/copied/persist  /mnt/vendor/persist none      bind 	latemount

conf/fstab.zuma.in

@@ -14,7 +14,12 @@ vendor                                                   /vendor
 vendor_dlkm                                              /vendor_dlkm                ext4    noatime,ro                       wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount
 /dev/block/platform/13200000.ufs/by-name/boot            /boot                       emmc    defaults                 slotselect,avb=boot,first_stage_mount
 /dev/block/platform/13200000.ufs/by-name/init_boot       /init_boot                  emmc    defaults                 slotselect,avb=init_boot,first_stage_mount
+/dev/block/platform/13200000.ufs/by-name/efs             /mnt/vendor/efs             f2fs    noatime,sync             wait,check,formattable
+/dev/block/platform/13200000.ufs/by-name/efs_backup      /mnt/vendor/efs_backup      f2fs    noatime,sync             wait,check,formattable
+/dev/block/platform/13200000.ufs/by-name/modem_userdata  /mnt/vendor/modem_userdata  f2fs    noatime,sync             wait,check,formattable
 /dev/block/platform/13200000.ufs/by-name/misc            /misc                       emmc    defaults                 wait
+/dev/block/platform/13200000.ufs/by-name/metadata        /metadata                   f2fs    noatime,nosuid,nodev,sync  wait,check,formattable,first_stage_mount
 #/dev/block/platform/13200000.ufs/by-name/pvmfw           /pvmfw                      emmc    defaults                 wait,slotselect,avb=pvmfw,first_stage_mount
+/dev/block/platform/13200000.ufs/by-name/userdata        /data                       f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=apex,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache    latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,zoned_device
 /dev/block/platform/13200000.ufs/by-name/vbmeta          /vbmeta                     emmc    defaults                 slotselect,first_stage_mount
 /devices/platform/11210000.usb*                          auto                        vfat    defaults                 voldmanaged=usb:auto

conf/init.efs.16k.rc

@@ -1,24 +0,0 @@
-
-service copy_efs_files_to_data /vendor/bin/copy_efs_files_to_data
-    user root
-    group root radio system audio media graphics camera
-    stdio_to_kmsg
-    oneshot
-    disabled
-
-on post-fs-data && property:ro.boot.hardware.cpu.pagesize=16384
-    mkdir /data/vendor/copied 0775 radio system
-    restorecon_recursive /data/vendor/copied
-    exec_start copy_efs_files_to_data
-    mount_all /vendor/etc/fstab.efs.from_data
-    restorecon_recursive /mnt/vendor/persist
-    restorecon_recursive /data/vendor/ss
-    setprop ro.vendor.persist.status mounted
-
-on early-init && property:ro.boot.hardware.cpu.pagesize=4096
-    mount_all /vendor/etc/fstab.persist --early
-    setprop ro.vendor.persist.status mounted
-
-on late-fs && property:ro.boot.hardware.cpu.pagesize=4096
-    mount_all /vendor/etc/fstab.efs --early
-

conf/init.efs.4k.rc

@@ -1,6 +0,0 @@
-on early-init
-    mount_all /vendor/etc/fstab.persist --early
-    setprop ro.vendor.persist.status mounted
-
-on late-fs
-    mount_all /vendor/etc/fstab.efs --early

conf/init.eng.memtag.rc

@@ -1,16 +0,0 @@
-# MTE in -eng build: litle and mid cores in Sync mode
-# Big core in Asymm mode to work around a performance issue (b/266613799)
-on init
-    # Per-core mode overrides.
-    # Little Cores: sync
-    write /sys/devices/system/cpu/cpu0/mte_tcf_preferred sync
-    write /sys/devices/system/cpu/cpu1/mte_tcf_preferred sync
-    write /sys/devices/system/cpu/cpu2/mte_tcf_preferred sync
-    write /sys/devices/system/cpu/cpu3/mte_tcf_preferred sync
-    # Mid Cores: sync
-    write /sys/devices/system/cpu/cpu4/mte_tcf_preferred sync
-    write /sys/devices/system/cpu/cpu5/mte_tcf_preferred sync
-    write /sys/devices/system/cpu/cpu6/mte_tcf_preferred sync
-    write /sys/devices/system/cpu/cpu7/mte_tcf_preferred sync
-    # Big Core: asymm
-    write /sys/devices/system/cpu/cpu8/mte_tcf_preferred asymm

conf/init.persist.rc

@@ -1,47 +0,0 @@
-on property:ro.vendor.persist.status=mounted
-    # for modem related functions
-    restorecon_recursive /mnt/vendor/efs
-    chown radio system /mnt/vendor/efs
-    restorecon_recursive /mnt/vendor/efs_backup
-    chown radio system /mnt/vendor/efs_backup
-    restorecon_recursive /mnt/vendor/modem_userdata
-    chown radio system /mnt/vendor/modem_userdata
-
-    # for battery defender
-    mkdir /mnt/vendor/persist/battery 0700 system system
-
-    # Factory calibration files
-    chmod 0771 /mnt/vendor/persist/camera
-    chmod 0771 /mnt/vendor/persist/camera/OTP_calibration
-    chmod 0771 /mnt/vendor/persist/camera/pdaf_calibration_data
-    mkdir /mnt/vendor/persist/camera/rear 0771 system camera
-    chmod 0771 /mnt/vendor/persist/camera/rear
-
-    restorecon_recursive /mnt/vendor/persist
-    restorecon_recursive /mnt/vendor/persist/aoc
-    restorecon_recursive /mnt/vendor/persist/audio
-    restorecon_recursive /mnt/vendor/persist/sensors
-    restorecon_recursive /mnt/vendor/persist/battery
-    restorecon_recursive /mnt/vendor/persist/camera
-    restorecon_recursive /mnt/vendor/persist/modem
-    # Set up display-related directories and permissions
-    # Add restorecon_recursive command to make sure the restorecon label is persist_display_file.
-    restorecon_recursive /mnt/vendor/persist/display
-    mkdir /mnt/vendor/persist/data/sfs 0700 system system
-    mkdir /mnt/vendor/persist/data/tz 0700 system system
-    mkdir /mnt/vendor/persist/touch 0770 system system
-
-on property:ro.fstype.data=* && property:ro.vendor.persist.status=mounted
-    # Proxy for Secure Storage
-    mkdir /data/vendor/rebootescrow 0770 hsm hsm
-    mkdir /data/vendor/ss 0770 root system
-    mkdir /mnt/vendor/persist/ss 0770 root system
-    restorecon_recursive /mnt/vendor/persist/ss
-    symlink /mnt/vendor/persist/ss /data/vendor/ss/persist
-    chown root system /data/vendor/ss/persist
-    chmod 0770 /data/vendor/ss/persist
-    symlink /dev/block/platform/13200000\.ufs/by-name/trusty_persist /data/vendor/ss/persist/0
-    chown system system /data/vendor/ss/persist/0
-    chown system system /data/vendor/ss/persist/nsp
-
-    restart storageproxyd

conf/init.zuma.rc

@@ -1,9 +1,9 @@
-import /vendor/etc/init/hw/init.zuma.storage.rc
 import /vendor/etc/init/hw/init.zuma.usb.rc
 import android.hardware.drm@1.2-service.widevine.rc
 import init.exynos.sensorhub.rc
 
 on early-init
+    mount_all /vendor/etc/fstab.persist --early
     write /proc/sys/kernel/sched_pelt_multiplier 1
     write /sys/kernel/mm/lru_gen/enabled n
 
@@ -16,6 +16,10 @@ on init
     # Disable util-awareness for mids and bigs
     write /proc/vendor_sched/teo_util_threshold "2 1024 1024"
 
+    # Boot time fs tuning
+    write /sys/block/sda/queue/scheduler bfq
+    write /sys/block/sda/queue/iosched/slice_idle 0
+
     chown system system /proc/vendor_sched/groups/bg/set_task_group
     chown system system /proc/vendor_sched/groups/cam/set_task_group
     chown system system /proc/vendor_sched/groups/fg/set_task_group
@@ -44,8 +48,6 @@ on init
     chown system system /proc/vendor_sched/prefer_idle_clear
     chown system system /proc/vendor_sched/pmu_poll_enable
     chown system system /proc/vendor_sched/pmu_poll_time
-    chown system system /proc/vendor_sched/uclamp_fork_reset_clear
-    chown system system /proc/vendor_sched/uclamp_fork_reset_set
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency
@@ -97,91 +99,16 @@ on init
     chmod 0220 /proc/vendor_sched/prefer_idle_clear
     chmod 0660 /proc/vendor_sched/pmu_poll_enable
     chmod 0220 /proc/vendor_sched/pmu_poll_time
-    chmod 0220 /proc/vendor_sched/uclamp_fork_reset_clear
-    chmod 0220 /proc/vendor_sched/uclamp_fork_reset_set
 
     start vendor.keymaster-4-0
 
-    # Change permission of sched qos nodes
-    chown system system /proc/vendor_sched/sched_qos/adpf_set
-    chown system system /proc/vendor_sched/sched_qos/adpf_clear
-    chown system system /proc/vendor_sched/sched_qos/auto_uclamp_max_set
-    chown system system /proc/vendor_sched/sched_qos/auto_uclamp_max_clear
-    chown system system /proc/vendor_sched/sched_qos/boost_prio_set
-    chown system system /proc/vendor_sched/sched_qos/boost_prio_clear
-    chown system system /proc/vendor_sched/sched_qos/preempt_wakeup_set
-    chown system system /proc/vendor_sched/sched_qos/preempt_wakeup_clear
-    chown system system /proc/vendor_sched/sched_qos/prefer_fit_set
-    chown system system /proc/vendor_sched/sched_qos/prefer_fit_clear
-    chown system system /proc/vendor_sched/sched_qos/prefer_high_cap_set
-    chown system system /proc/vendor_sched/sched_qos/prefer_high_cap_clear
-    chown system system /proc/vendor_sched/sched_qos/prefer_idle_set
-    chown system system /proc/vendor_sched/sched_qos/prefer_idle_clear
-    chown system system /proc/vendor_sched/sched_qos/rampup_multiplier_set
-    chown system system /proc/vendor_sched/sched_qos/rampup_multiplier_clear
-
-    chmod 0220 /proc/vendor_sched/sched_qos/adpf_set
-    chmod 0220 /proc/vendor_sched/sched_qos/adpf_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/auto_uclamp_max_set
-    chmod 0220 /proc/vendor_sched/sched_qos/auto_uclamp_max_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/boost_prio_set
-    chmod 0220 /proc/vendor_sched/sched_qos/boost_prio_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/preempt_wakeup_set
-    chmod 0220 /proc/vendor_sched/sched_qos/preempt_wakeup_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_fit_set
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_fit_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_high_cap_set
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_high_cap_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_idle_set
-    chmod 0220 /proc/vendor_sched/sched_qos/prefer_idle_clear
-    chmod 0220 /proc/vendor_sched/sched_qos/rampup_multiplier_set
-    chmod 0220 /proc/vendor_sched/sched_qos/rampup_multiplier_clear
-
-    # Enable sched_qos for some groups
-    write /proc/vendor_sched/groups/ta/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/ta/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/ta/qos_boost_prio_enable 1
-    write /proc/vendor_sched/groups/ta/qos_preempt_wakeup_enable 1
-    write /proc/vendor_sched/groups/ta/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/ta/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/ta/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/ta/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/fg/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/fg/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/fg/qos_boost_prio_enable 1
-    write /proc/vendor_sched/groups/fg/qos_preempt_wakeup_enable 1
-    write /proc/vendor_sched/groups/fg/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/fg/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/fg/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/fg/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_boost_prio_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_preempt_wakeup_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/fg_wi/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/cam/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/cam/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/cam/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/cam/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/cam/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/cam/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_auto_uclamp_max_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_prefer_fit_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_prefer_high_cap_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_prefer_idle_enable 1
-    write /proc/vendor_sched/groups/cam_power/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/rt/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/rt/qos_rampup_multiplier_enable 1
-    write /proc/vendor_sched/groups/sf/qos_adpf_enable 1
-    write /proc/vendor_sched/groups/sf/qos_rampup_multiplier_enable 1
-
     # ZRAM setup
+    write /sys/block/zram0/comp_algorithm lz77eh
     write /proc/sys/vm/page-cluster 0
 
+    # adjust PCP high level
+    write /proc/sys/vm/percpu_pagelist_high_fraction 430
+
     # Some user code relies on ro.boot.hardware.revision
     setprop ro.boot.hardware.revision ${ro.revision}
 
@@ -216,6 +143,16 @@ on init
     write /sys/class/net/rmnet6/queues/rx-0/rps_cpus fe
     write /sys/class/net/rmnet7/queues/rx-0/rps_cpus fe
 
+    # Create UDS structure for base VR services.
+    mkdir /dev/socket/pdx 0775 system system
+    mkdir /dev/socket/pdx/system 0775 system system
+    mkdir /dev/socket/pdx/system/buffer_hub 0775 system system
+    mkdir /dev/socket/pdx/system/performance 0775 system system
+    mkdir /dev/socket/pdx/system/vr 0775 system system
+    mkdir /dev/socket/pdx/system/vr/display 0775 system system
+    mkdir /dev/socket/pdx/system/vr/pose 0775 system system
+    mkdir /dev/socket/pdx/system/vr/sensors 0775 system system
+
     # Boot time 183626384
     write /proc/vendor_sched/groups/ta/uclamp_min 221
     write /proc/vendor_sched/groups/ta/prefer_idle 1
@@ -227,11 +164,14 @@ on init
     # governor setting
     write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel
     write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/up_rate_limit_us 500
+    write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us 5000
     write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_scale_pow 2
     write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor sched_pixel
     write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/up_rate_limit_us 500
+    write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us 20000
     write /sys/devices/system/cpu/cpu8/cpufreq/scaling_governor sched_pixel
     write /sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/up_rate_limit_us 500
+    write /sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us 20000
 
 
     # memlat cpuidle awareness setting
@@ -322,7 +262,6 @@ on init
     chown system system /sys/class/power_supply/wireless/device/version
     chown system system /sys/class/power_supply/wireless/device/features
     chown system system /sys/class/power_supply/wireless/device/authtype
-    chown system system /sys/class/power_supply/wireless/device/authstart
 
     # Adaptive charge
     chown system system /sys/class/power_supply/battery/charge_deadline
@@ -426,15 +365,6 @@ on init
     chown root system /sys/devices/platform/16490000.gsa-ns/log_main
     chown root system /sys/devices/platform/16490000.gsa-ns/log_intermediate
 
-    # Enable CPU Idle histograms
-    write /sys/kernel/metrics/cpuidle_histogram/enable 1
-
-on init && property:ro.boot.hardware.cpu.pagesize=4096
-    write /sys/block/zram0/comp_algorithm lz77eh
-
-on init && property:ro.boot.hardware.cpu.pagesize=16384
-    write /sys/block/zram0/comp_algorithm lzo-rle
-
 on post-fs
     # Ensure device is ready and start storageproxyd
     wait /dev/sg1
@@ -448,11 +378,6 @@ on late-fs
     # Mount RW partitions which need run fsck
     mount_all --late
 
-on late-init
-    write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us 5000
-    write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us 20000
-    write /sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us 20000
-
 on post-fs-data
     # Modem temperature driver
     chown radio system /sys/devices/platform/cp-tm1/cp_temp
@@ -474,7 +399,7 @@ on post-fs-data
     mkdir /data/vendor/radio/logs/always-on 777 system radio
 
     # Modem extended log folder
-    mkdir /data/vendor/radio/extended_logs 0771 radio system
+    mkdir /data/vendor/radio/extended_logs 0770 radio system
 
     # Log Mask Library Mask storage paths
     mkdir /data/vendor/radio/log_masks 777 system system
@@ -518,6 +443,13 @@ on post-fs-data
     chown system system /dev/ispolin_ranging
     chmod 0660 /dev/ispolin_ranging
 
+    # Factory calibration files
+    chmod 0771 /mnt/vendor/persist/camera
+    chmod 0771 /mnt/vendor/persist/camera/OTP_calibration
+    chmod 0771 /mnt/vendor/persist/camera/pdaf_calibration_data
+    mkdir /mnt/vendor/persist/camera/rear 0771 system camera
+    chmod 0771 /mnt/vendor/persist/camera/rear
+
     # Audio dump and debug
     mkdir /data/vendor/audio 0770 audio audio
 
@@ -611,9 +543,9 @@ on early-boot
     chown system system /dev/logbuffer_usbpd
     chown system system /dev/logbuffer_wireless
     chown system system /dev/logbuffer_pca9468
-    chown system system /dev/logbuffer_dc_mains
     chown system system /dev/logbuffer_cpm
     chown system system /dev/logbuffer_wc68
+    chown system system /dev/logbuffer_ln8411
     chown system system /dev/logbuffer_pcie0
     chown system system /dev/logbuffer_pcie1
     chown system system /dev/logbuffer_bd
@@ -679,11 +611,34 @@ on property:persist.vendor.radio.no_modem_board=1
 
 on fs
     mount_all --early
+    restorecon_recursive /mnt/vendor/efs
+    chown radio system /mnt/vendor/efs
+    restorecon_recursive /mnt/vendor/efs_backup
+    chown radio system /mnt/vendor/efs_backup
+    restorecon_recursive /mnt/vendor/modem_userdata
+    chown radio system /mnt/vendor/modem_userdata
 
     # Mount modem partition
     mount_all /vendor/etc/fstab.modem --early
     restorecon_recursive /mnt/vendor/modem_img
 
+    # for battery defender
+    mkdir /mnt/vendor/persist/battery 0700 system system
+
+    restorecon_recursive /mnt/vendor/persist
+    restorecon_recursive /mnt/vendor/persist/aoc
+    restorecon_recursive /mnt/vendor/persist/audio
+    restorecon_recursive /mnt/vendor/persist/sensors
+    restorecon_recursive /mnt/vendor/persist/battery
+    restorecon_recursive /mnt/vendor/persist/camera
+    restorecon_recursive /mnt/vendor/persist/modem
+    # Set up display-related directories and permissions
+    # Add restorecon_recursive command to make sure the restorecon label is persist_display_file.
+    restorecon_recursive /mnt/vendor/persist/display
+    mkdir /mnt/vendor/persist/data/sfs 0700 system system
+    mkdir /mnt/vendor/persist/data/tz 0700 system system
+    mkdir /mnt/vendor/persist/touch 0770 system system
+
 # Permissions for ION
     chmod 0660 /sys/class/ion_cma/ion_video_ext/isolated
     chown system system /sys/class/ion_cma/ion_video_ext/isolated
@@ -702,7 +657,6 @@ on fs
     chown system system /sys/devices/platform/exynos-drm/primary-panel/panel_need_handle_idle_exit
     chown system system /sys/devices/platform/exynos-drm/primary-panel/op_hz
     chown system system /sys/devices/platform/exynos-drm/primary-panel/refresh_ctrl
-    chown system system /sys/devices/platform/exynos-drm/primary-panel/power_state
     chown system system /sys/module/drm/parameters/vblankoffdelay
     chown system system /sys/module/drm/parameters/debug
     chown system system /sys/class/dqe0/atc/ambient_light
@@ -808,9 +762,6 @@ on property:sys.boot_completed=1
     # Set kswapd affinity
     write /sys/kernel/vendor_mm/kswapd_cpu_affinity ff
 
-    # Set kcompactd affinity
-    write /sys/kernel/vendor_mm/kcompactd_cpu_affinity ff
-
     # Adjust watermark level
     write /proc/sys/vm/watermark_scale_factor 200
 
@@ -822,9 +773,9 @@ on property:sys.boot_completed=1
     write /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/exynos_data/cancel_boot_freq 1
 
     # Restore prefer idle
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0xff
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0xff
-    write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0xff
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0x1ff
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0x1ff
+    write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0x1ff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_low 0x1ff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_mid 0x1ff
     write /proc/vendor_sched/groups/fg/preferred_idle_mask_high 0x1ff
@@ -841,12 +792,6 @@ on property:sys.boot_completed=1
     write /dev/cpuset/camera-daemon/cpus 0-8
     setprop vendor.powerhal.init 1
 
-    # Setup scheduler parameters
-    write /proc/vendor_sched/min_granularity_ns 1000000
-    write /proc/vendor_sched/latency_ns 8000000
-    write /proc/vendor_sched/max_load_balance_interval 1
-    write /proc/vendor_sched/enable_hrtick 1
-
     # Setup final cpu.uclamp
     write /proc/vendor_sched/groups/ta/uclamp_min 1
     write /proc/vendor_sched/groups/fg/uclamp_min 0
@@ -937,9 +882,6 @@ on property:sys.boot_completed=1
     # Enable SICD
     write /sys/devices/system/cpu/cpupm/cpupm/sicd 1
 
-    # To be removed after InputDispatche and InputReader become ADPF
-    write /proc/vendor_sched/prefer_idle_task_name "InputDispatcher,InputReader"
-
 on property:sys.boot_completed=1 && property:persist.sys.device_provisioned=1
     write /sys/class/power_supply/battery/first_usage_date 0
 
@@ -995,6 +937,20 @@ service bugreport /system/bin/dumpstate -d -p -z
     oneshot
     keycodes 114 115 116
 
+# Proxy for Secure Storage
+on post-fs-data
+    mkdir /data/vendor/rebootescrow 0770 hsm hsm
+    mkdir /data/vendor/ss 0770 root system
+    mkdir /mnt/vendor/persist/ss 0770 root system
+    restorecon_recursive /mnt/vendor/persist/ss
+    symlink /mnt/vendor/persist/ss /data/vendor/ss/persist
+    chown root system /data/vendor/ss/persist
+    chmod 0770 /data/vendor/ss/persist
+    symlink /dev/block/platform/13200000\.ufs/by-name/trusty_persist /data/vendor/ss/persist/0
+    chown system system /data/vendor/ss/persist/0
+    chown system system /data/vendor/ss/persist/nsp
+
+    restart storageproxyd
 
 service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 \
         -r /dev/sg1 -p /data/vendor/ss -t ufs
@@ -1060,14 +1016,38 @@ on property:vendor.thermal.link_ready=1
     write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_cpu2_lvl 12000
     write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_gpu_lvl 9000
     write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_tpu_lvl 8500
-    write /sys/devices/virtual/pmic/mitigation/triggered_lvl/ocp_cpu2_lvl 12000
-    write /sys/devices/virtual/pmic/mitigation/triggered_lvl/ocp_gpu_lvl 9000
-    write /sys/devices/virtual/pmic/mitigation/triggered_lvl/ocp_tpu_lvl 12000
     write /sys/devices/virtual/pmic/mitigation/clock_div/tpu_clk_div 0x1
     write /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x1
     write /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x1
     write /sys/devices/platform/cpupm/cpupm/cpd_cl1 1 #Enable power down
     write /sys/devices/platform/cpupm/cpupm/cpd_cl2 1 #Enable power down
+    chown system system /dev/thermal/tz-by-name/soc/mode
+    chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/vdroop1/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/vdroop1/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/smpl_gm/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/smpl_gm/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/ocp_cpu1/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/ocp_cpu1/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/ocp_cpu2/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/ocp_cpu2/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/ocp_tpu/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/ocp_tpu/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/ocp_gpu/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/ocp_gpu/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/soft_ocp_cpu1/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/soft_ocp_cpu1/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/soft_ocp_cpu2/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/soft_ocp_cpu2/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/soft_ocp_tpu/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/soft_ocp_tpu/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/soc/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/soc/trip_point_0_hyst
+    chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_temp
+    chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_hyst
     # Thermal
     chown system system /dev/thermal/tz-by-name/soc_therm/trip_point_0_temp
     chown system system /dev/thermal/tz-by-name/soc_therm/trip_point_0_hyst

conf/init.zuma.usb.rc

@@ -423,12 +423,3 @@ on property:persist.vendor.usb.displayport.enabled=1
 on property:persist.vendor.usb.displayport.enabled=0
     write /sys/module/exynos_drm/parameters/dp_enabled 0
     write /sys/class/typec/port0/port0.0/mode1/active "no"
-
-on property:persist.sys.hdcp_checking=always
-    write /sys/module/exynos_hdcp2/parameters/max_ver 3
-
-on property:persist.sys.hdcp_checking="drm-only"
-    write /sys/module/exynos_hdcp2/parameters/max_ver 2
-
-on property:persist.sys.hdcp_checking=never
-    write /sys/module/exynos_hdcp2/parameters/max_ver 0

conf/ueventd.zuma.rc

@@ -97,7 +97,6 @@
 /dev/acd-mel_processor          0660   system     audio
 /dev/amcs                       0660   system     audio
 /dev/acd-audio_rtp_*            0660   system     radio
-/dev/acd-mc_headpos             0660   system     audio
 
 # Secure MEM driver
 /dev/s5p-smem             0660   drm        drmrpc
@@ -156,20 +155,10 @@
 /dev/acd-com.google.chre              0660   system     system
 /dev/acd-com.google.chre.non_wake_up  0660   system     system
 
-# CHRE (EFW transport)
-/dev/acd-chre_ctl       	0660   system   system
-/dev/acd-chre_data_tx   	0220   system   system
-/dev/acd-chre_data_rx   	0440   system   system
-
 # BT
 /dev/acd-com.google.bt  		          0660   system     system
 /dev/acd-com.google.bt.non_wake_up  	0660   system     system
 
-# AoC Bluetooth Offload
-/dev/acd-chre_bt_offload_ctl       0660   bluetooth   bluetooth
-/dev/acd-chre_bt_offload_data_tx   0220   bluetooth   bluetooth
-/dev/acd-chre_bt_offload_data_rx   0440   bluetooth   bluetooth
-
 # LWIS
 /dev/lwis*               0660   system     system
 
@@ -256,4 +245,4 @@
 /sys/bus/aoc/devices/control    udfps_get_disp_freq     0440    system  system
 
 # USB Alt Modes
-/sys/devices/platform/10cb0000.hsi2c/i2c-*/*-0025/typec/port0/port0-partner/port0-partner.*    mode1/active    0664    system    system
+/sys/devices/platform/10cb0000.hsi2c/i2c-*/*-0025/typec/port0/port0-partner/port0-partner.*    mode1/active    0664    system    system

copy_efs_files_to_data.sh

@@ -1,40 +0,0 @@
-#!/vendor/bin/sh
-
-CHECKPOINT_DIR=/data/vendor/copied
-
-export BIN_DIR=/vendor/bin
-
-$BIN_DIR/mkdir -p $CHECKPOINT_DIR
-
-function copy_files_to_data()
-{
-  block_device=$1
-  partition_name=$(basename $1)
-  mount_point=$2
-  tmpdir=$CHECKPOINT_DIR/$partition_name.img
-  build_checkpoint=$CHECKPOINT_DIR/$partition_name
-  if [ ! -e $build_checkpoint ]; then
-    $BIN_DIR/rm -rf $tmpdir
-    $BIN_DIR/mkdir -p $tmpdir
-    $BIN_DIR/dump.f2fs -rfPLo $tmpdir $block_device
-    if [ $? -ne 0 ]; then
-      echo "Failed to $BIN_DIR/dump.f2fs -rfPLo $tmpdir $block_device"
-      return
-    fi
-    $BIN_DIR/mv $tmpdir $build_checkpoint
-    if [ $? -ne 0 ]; then
-      echo "mv $tmpdir $build_checkpoint"
-      return
-    fi
-    $BIN_DIR/fsync `dirname $build_checkpoint`
-  fi
-  echo "Successfully copied $mount_point to $build_checkpoint"
-}
-
-copy_files_to_data "/dev/block/by-name/efs" "/mnt/vendor/efs"
-copy_files_to_data "/dev/block/by-name/efs_backup" "/mnt/vendor/efs_backup"
-copy_files_to_data "/dev/block/by-name/modem_userdata" "/mnt/vendor/modem_userdata"
-
-copy_files_to_data "/dev/block/by-name/persist" "/mnt/vendor/persist"
-
-$BIN_DIR/fsync /data/vendor/copied

default-permissions.xml

@@ -51,14 +51,11 @@
         <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
     </exception>
 
-    <exception package="com.google.android.GoogleCamera">
-        <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
-    </exception>
-
     <exception package="com.google.android.apps.camera.services">
         <!-- Camera -->
         <permission name="android.permission.CAMERA" fixed="false"/>
         <!-- Camera Connectivity -->
+        <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
         <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
         <permission name="android.permission.BLUETOOTH_SCAN" fixed="false"/>
@@ -78,8 +75,6 @@
         <permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
         <!-- Notifications -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
-        <!-- Used by Bluetooth Module to collect bluetooth info -->
-        <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
     </exception>
 
     <exception package="com.google.android.apps.setupwizard.searchselector">
@@ -167,16 +162,5 @@
         <!-- Notifications -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
-
-    <exception package="com.google.android.apps.pixel.relationships">
-        <permission name="android.permission.CALL_PHONE" fixed="false"/>
-        <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
-        <permission name="android.permission.READ_CONTACTS" fixed="false"/>
-        <permission name="android.permission.WRITE_CONTACTS" fixed="false"/>
-    </exception>
-    <exception
-        package="com.google.android.apps.privacy.wildlife">
-        <permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
-    </exception>
 </exceptions>
 

device-common.mk

@@ -44,15 +44,17 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.thermal_warmreset = true
 
+# Set the max page size to 4096 (b/300367402)
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 4096
+
 # Trigger fsck on upgrade (305658663)
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.preventative_fsck = 1
 
 # Indicate that the bootloader supports the MTE developer option switch
-# (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products and
-# eng products that force enable MTE
+# (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products that
+# force enable MTE.
 ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT)))
-ifeq (,$(filter eng,$(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_supported=1
 # N.B. persist properties in product Makefiles aren't actually persisted to the data
 # partition, so they will actually go away if we remove them here, or if the user
@@ -62,11 +64,3 @@ PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.google.android.blueto
 PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.nfc=off
 PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.system_server=off
 endif
-endif
-
-ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT)))
-ifneq (,$(filter eng,$(TARGET_BUILD_VARIANT)))
-PRODUCT_COPY_FILES += \
-       device/google/zuma/conf/init.eng.memtag.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.eng.memtag.rc
-endif
-endif

device.mk

@@ -16,7 +16,7 @@
 
 include device/google/gs-common/device.mk
 include device/google/gs-common/gs_watchdogd/watchdog.mk
-include device/google/gs-common/ramdump_and_coredump/ramdump_and_coredump.mk
+include device/google/gs-common/ramdump/ramdump.mk
 include device/google/gs-common/soc/soc.mk
 include device/google/gs-common/modem/modem.mk
 include device/google/gs-common/aoc/aoc.mk
@@ -26,7 +26,6 @@ include device/google/gs-common/storage/storage.mk
 include device/google/gs-common/thermal/dump/thermal.mk
 include device/google/gs-common/thermal/thermal_hal/device.mk
 include device/google/gs-common/performance/perf.mk
-include device/google/gs-common/power/power.mk
 include device/google/gs-common/pixel_metrics/pixel_metrics.mk
 include device/google/gs-common/soc/freq.mk
 include device/google/gs-common/gps/dump/log.mk
@@ -43,8 +42,6 @@ include device/google/gs-common/sota_app/factoryota.mk
 include device/google/gs-common/misc_writer/misc_writer.mk
 include device/google/gs-common/gyotaku_app/gyotaku.mk
 include device/google/gs-common/bootctrl/bootctrl_aidl.mk
-include device/google/gs-common/betterbug/betterbug.mk
-include device/google/gs-common/fingerprint/fingerprint.mk
 
 include device/google/zuma/dumpstate/item.mk
 
@@ -75,15 +72,14 @@ PRODUCT_SOONG_NAMESPACES += \
 	hardware/google/gchips/gralloc4 \
 	hardware/google/graphics/common \
 	hardware/google/graphics/zuma \
-	hardware/google/graphics/zuma/libhwc2.1 \
 	hardware/google/interfaces \
 	hardware/google/pixel \
 	device/google/zuma \
 	device/google/zuma/powerstats \
 	vendor/google_devices/common/chre/host/hal \
-	vendor/google_devices/zuma/proprietary/debugpolicy \
 	vendor/google/whitechapel/tools \
 	vendor/google/interfaces \
+	vendor/google_devices/common/proprietary/confirmatioui_hal \
 	vendor/google_nos/host/android \
 	vendor/google_nos/test/system-test-harness \
 	vendor/google/camera
@@ -187,7 +183,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.asha.central.enabled?=true \
 	bluetooth.profile.a2dp.source.enabled?=true \
 	bluetooth.profile.avrcp.target.enabled?=true \
-	bluetooth.profile.bap.unicast.client.enabled?=true \
+	bluetooth.profile.bap.unicast.server.enabled?=true \
 	bluetooth.profile.bas.client.enabled?=true \
 	bluetooth.profile.csip.set_coordinator.enabled?=true \
 	bluetooth.profile.gatt.enabled?=true \
@@ -202,8 +198,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.pan.panu.enabled?=true \
 	bluetooth.profile.pbap.server.enabled?=true \
 	bluetooth.profile.sap.server.enabled?=true \
-	bluetooth.profile.ccp.server.enabled?=true \
-	bluetooth.profile.vcp.controller.enabled?=true
+	bluetooth.profile.tbs.server.enabled?=true \
+	bluetooth.profile.vc.server.enabled?=true
 
 # Carrier configuration default location
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -212,7 +208,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	telephony.active_modems.max_count=2
 
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.usb.displayport.enabled=1
 else
@@ -220,29 +216,14 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.usb.displayport.enabled=1
 endif
 
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.sys.hdcp_checking=drm-only
-
 USE_LASSEN_OEMHOOK := true
-# The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when
-# $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true.
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-    $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true)
-    PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
-endif
 
 # Use for GRIL
 USES_LASSEN_MODEM := true
-$(call soong_config_set, vendor_ril_google_feature, use_lassen_modem, true)
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-$(call soong_config_set_bool,grilservice,use_google_qns,true)
-endif
 
 ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true)
 USE_GOOGLE_DIALER := true
 USE_GOOGLE_CARRIER_SETTINGS := true
-# GoogleDialer in PDK build with "USES_GOOGLE_DIALER_CARRIER_SETTINGS=true"
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/zuma/proprietary/GoogleDialer
 endif
 
 ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true)
@@ -261,15 +242,8 @@ USE_SWIFTSHADER := false
 # HWUI
 TARGET_USES_VULKAN = true
 
-# "vendor/arm" doesn't exist in PDK build
-ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
-PRODUCT_SOONG_NAMESPACES += \
-	vendor/google_devices/zuma/prebuilts/firmware/gpu \
-	vendor/google_devices/zuma/prebuilts/gpu
-else
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/arm/mali/valhall
-endif
 
 $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
 $(call soong_config_set,arm_gralloc,soc,$(TARGET_BOARD_PLATFORM))
@@ -279,18 +253,9 @@ PRODUCT_PACKAGES += \
 	csffw_image_prebuilt__firmware_prebuilt_ttux_mali_csffw.bin \
 	libGLES_mali \
 	vulkan.mali \
+	libOpenCL \
 	libgpudataproducer
 
-# Install the OpenCL ICD Loader
-PRODUCT_SOONG_NAMESPACES += external/OpenCL-ICD-Loader
-PRODUCT_PACKAGES += \
-       libOpenCL \
-       mali_icd__customer_pixel_opencl-icd_ARM.icd
-ifeq ($(DEVICE_IS_64BIT_ONLY),false)
-PRODUCT_PACKAGES += \
-	mali_icd__customer_pixel_opencl-icd_ARM32.icd
-endif
-
 ifeq ($(USE_SWIFTSHADER),true)
 PRODUCT_PACKAGES += \
 	libEGL_angle \
@@ -308,10 +273,11 @@ PRODUCT_VENDOR_PROPERTIES += \
 endif
 
 # Mali Configuration Properties
+# b/221255664 prevents setting PROTECTED_MAX_CORE_COUNT=2
 PRODUCT_VENDOR_PROPERTIES += \
 	vendor.mali.platform.config=/vendor/etc/mali/platform.config \
 	vendor.mali.debug.config=/vendor/etc/mali/debug.config \
-	vendor.mali.base_protected_max_core_count=4 \
+	vendor.mali.base_protected_max_core_count=1 \
 	vendor.mali.base_protected_tls_max=67108864 \
 	vendor.mali.platform_agt_frequency_khz=24576
 
@@ -320,8 +286,9 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
 	frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
 	frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \
-	frameworks/native/data/etc/android.software.vulkan.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
-	frameworks/native/data/etc/android.software.opengles.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
+	frameworks/native/data/etc/android.software.contextualsearch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.contextualsearch.xml \
+	frameworks/native/data/etc/android.software.vulkan.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
+	frameworks/native/data/etc/android.software.opengles.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
 
 #endif
 
@@ -344,7 +311,6 @@ PRODUCT_VENDOR_PROPERTIES += ro.surface_flinger.prime_shader_cache.ultrahdr=1
 DEVICE_MANIFEST_FILE := \
 	device/google/zuma/manifest.xml
 
-BOARD_USE_CODEC2_AIDL := V1
 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 DEVICE_MANIFEST_FILE += \
 	device/google/zuma/manifest_media_aosp.xml
@@ -382,20 +348,7 @@ PRODUCT_COPY_FILES += \
 	device/google/zuma/conf/ueventd.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
 
 PRODUCT_COPY_FILES += \
-	device/google/zuma/conf/init.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.rc \
-	device/google/zuma/conf/init.persist.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.persist.rc
-
-ifeq (true,$(filter $(TARGET_BOOTS_16K) $(PRODUCT_16K_DEVELOPER_OPTION),true))
-PRODUCT_COPY_FILES += \
-	device/google/zuma/conf/init.efs.16k.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.efs.rc \
-	device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.efs.from_data:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs.from_data \
-
-PRODUCT_PACKAGES += copy_efs_files_to_data
-PRODUCT_PACKAGES += fsck.f2fs.vendor
-else
-PRODUCT_COPY_FILES += \
-	device/google/zuma/conf/init.efs.4k.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.efs.rc
-endif
+	device/google/zuma/conf/init.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.rc
 
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
@@ -404,27 +357,11 @@ PRODUCT_COPY_FILES += \
 	device/google/zuma/conf/init.freq.userdebug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.freq.userdebug.rc
 endif
 
-ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION)))
-PRODUCT_COPY_FILES += \
-	device/google/zuma/storage/5.15/init.zuma.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.storage.rc
-else
-PRODUCT_COPY_FILES += \
-	device/google/zuma/storage/6.1/init.zuma.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.storage.rc
-endif
-
 # Recovery files
 PRODUCT_COPY_FILES += \
 	device/google/zuma/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.zuma.rc
 
 # Fstab files
-ifeq (ext4,$(TARGET_RW_FILE_SYSTEM_TYPE))
-PRODUCT_SOONG_NAMESPACES += \
-        device/google/zuma/conf/ext4
-else
-PRODUCT_SOONG_NAMESPACES += \
-        device/google/zuma/conf/f2fs
-endif
-
 PRODUCT_PACKAGES += \
 	fstab.zuma \
 	fstab.zuma.vendor_ramdisk \
@@ -433,9 +370,7 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_COPY_FILES += \
 	device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \
-	device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem \
-	device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.efs:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs
-
+	device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem
 
 # Shell scripts
 PRODUCT_PACKAGES += \
@@ -451,6 +386,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_HOST_PACKAGES += \
 	mkdtimg
 
+PRODUCT_PACKAGES += \
+	messaging
+
 # CHRE
 ## Tools
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
@@ -468,6 +406,8 @@ PRODUCT_COPY_FILES += \
 ## Enable the CHRE Daemon
 CHRE_USF_DAEMON_ENABLED := false
 CHRE_DEDICATED_TRANSPORT_CHANNEL_ENABLED := true
+PRODUCT_PACKAGES += \
+	preloaded_nanoapps.json
 
 # Filesystem management tools
 PRODUCT_PACKAGES += \
@@ -586,9 +526,6 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2
 PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2
 PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000
 
-# Set util_clamp_min for s/w spatializer
-PRODUCT_PROPERTY_OVERRIDES += audio.spatializer.effect.util_clamp_min=300
-
 # Calliope firmware overwrite
 #PRODUCT_COPY_FILES += \
 	device/google/zuma/firmware/calliope_dram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram.bin \
@@ -615,6 +552,10 @@ PRODUCT_PROPERTY_OVERRIDES += audio.spatializer.effect.util_clamp_min=300
 PRODUCT_PACKAGES += \
 	com.android.future.usb.accessory
 
+PRODUCT_PACKAGES += \
+	android.hardware.graphics.mapper@4.0-impl \
+	android.hardware.graphics.allocator-V1-service
+
 PRODUCT_PACKAGES += \
 	android.hardware.memtrack-service.pixel \
 	libion_exynos \
@@ -654,11 +595,13 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
         ConnectivityOverlay
 
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
 	f2fs_io \
 	check_f2fs \
 	f2fs.fibmap \
 	dump.f2fs
+endif
 
 # Storage health HAL
 PRODUCT_PACKAGES += \
@@ -682,8 +625,10 @@ ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
 include device/google/gs-common/dauntless/gsc.mk
 endif
 
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
 	WvInstallKeybox
+endif
 
 # Copy Camera HFD Setfiles
 #PRODUCT_COPY_FILES += \
@@ -840,25 +785,16 @@ PRODUCT_COPY_FILES += \
 	device/google/zuma/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
 
 PRODUCT_PROPERTY_OVERRIDES += \
+       debug.stagefright.c2-poolmask=458752 \
        debug.c2.use_dmabufheaps=1 \
        media.c2.dmabuf.padding=512 \
        debug.stagefright.ccodec_delayed_params=1 \
        ro.vendor.gpu.dataspace=1
 
-ifneq ($(BOARD_USE_CODEC2_AIDL), )
-PRODUCT_PROPERTY_OVERRIDES += \
-        debug.stagefright.c2-poolmask=1507328
-else
-PRODUCT_PROPERTY_OVERRIDES += \
-        debug.stagefright.c2-poolmask=458752
-endif
-
 # Create input surface on the framework side
 PRODUCT_PROPERTY_OVERRIDES += \
 	debug.stagefright.c2inputsurface=-1 \
 
-PRODUCT_PROPERTY_OVERRIDES += media.c2.hal.selection=aidl
-
 # 2. OpenMAX IL
 PRODUCT_COPY_FILES += \
 	device/google/zuma/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
@@ -892,11 +828,15 @@ $(call inherit-product, system/core/trusty/trusty-storage.mk)
 $(call inherit-product, system/core/trusty/trusty-base.mk)
 
 # Trusty unit test tool and code coverage tool
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
    trusty-ut-ctrl \
    tipc-test \
    trusty_stats_test \
-   trusty-coverage-controller \
+   trusty-coverage-controller
+endif
+
+include device/google/gs101/confirmationui/confirmationui.mk
 
 # Trusty Metrics Daemon
 PRODUCT_SOONG_NAMESPACES += \
@@ -983,9 +923,7 @@ PRODUCT_PACKAGES += ShannonRcs
 # Exynos RIL and telephony
 # Multi SIM(DSDS)
 SIM_COUNT := 2
-$(call soong_config_set,sim,sim_count,$(SIM_COUNT))
 SUPPORT_MULTI_SIM := true
-
 # Support NR
 SUPPORT_NR := true
 # Support 5G on both stacks
@@ -1016,12 +954,8 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
 
 ifneq ($(BOARD_WITHOUT_RADIO),true)
-
-# Use Lassen specifc Shared Modem Platform
-SHARED_MODEM_PLATFORM_VENDOR := lassen
-
-# Shared Modem Platform
-include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
+# modem_svc_sit daemon
+PRODUCT_PACKAGES += modem_svc_sit
 
 # modem_ml_svc_sit daemon
 PRODUCT_PACKAGES += modem_ml_svc_sit
@@ -1076,11 +1010,13 @@ PRODUCT_PACKAGES += \
 endif
 
 # Vibrator Diag
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
 	diag-vibrator \
 	diag-vibrator-cs40l25a \
 	diag-vibrator-drv2624 \
 	$(NULL)
+endif
 
 PRODUCT_PACKAGES += \
 	android.hardware.health-service.zuma \
@@ -1160,9 +1096,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google_devices/zuma/proprietary/gchips/tpu/darwinn_logging_service \
 	vendor/google_devices/zuma/proprietary/gchips/tpu/nnapi_stable_aidl \
 	vendor/google_devices/zuma/proprietary/gchips/tpu/aidl \
-	vendor/google_devices/zuma/proprietary/gchips/tpu/hal \
-	vendor/google_devices/zuma/proprietary/gchips/tpu/tachyon/tachyon_apis \
-	vendor/google_devices/zuma/proprietary/gchips/tpu/tachyon/service
+	vendor/google_devices/zuma/proprietary/gchips/tpu/hal
 # TPU firmware
 PRODUCT_PACKAGES += edgetpu-rio.fw
 
@@ -1214,6 +1148,9 @@ else
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/logger_app
 endif
 
+# sscoredump
+include hardware/google/pixel/sscoredump/device.mk
+
 # RadioExt Version
 USES_RADIOEXT_V1_6 = true
 
@@ -1221,7 +1158,9 @@ USES_RADIOEXT_V1_6 = true
 include hardware/google/pixel/wifi_ext/device.mk
 
 # Battery Stats Viewer
-PRODUCT_PACKAGES_ENG += BatteryStatsViewer
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
+endif
 
 # Install product specific framework compatibility matrix
 # (TODO: b/169535506) This includes the FCM for system_ext and product partition.
@@ -1244,7 +1183,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
 include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
 
 # UFS: the script is used to select the corresponding firmware to run FFU.
-PRODUCT_PACKAGES_ENG += ufs_firmware_update.sh
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += ufs_firmware_update.sh
+endif
 
 # RIL extension service
 ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT)))
@@ -1252,8 +1193,8 @@ include device/google/gs-common/pixel_ril/ril.mk
 endif
 
 # Touch service
+include hardware/google/pixel/input/twoshay.mk
 include device/google/gs-common/touch/twoshay/aidl_zuma.mk
-include device/google/gs-common/touch/twoshay/twoshay.mk
 
 # Allow longer timeout for incident report generation in bugreport
 # Overriding in /product partition instead of /vendor intentionally,

device_framework_matrix_product.xml

@@ -114,7 +114,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>13</version>
+        <version>10</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>
@@ -153,7 +153,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>2-4</version>
+        <version>2-3</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>

dumpstate/Android.bp

@@ -24,7 +24,6 @@ cc_binary {
     ],
     vendor: true,
     relative_install_path: "dump",
-    init_rc: ["dump_power.rc"],
 }
 
 sh_binary {

dumpstate/dump_power.cpp

@@ -21,9 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/sysinfo.h>
-#include <sys/wait.h>
 #include <time.h>
-#include <unistd.h>
 #include <vector>
 
 #include <android-base/file.h>
@@ -200,18 +198,39 @@ void dumpMaxFg() {
 
     const char *maxfg [][2] = {
             {"Power supply property maxfg", "/sys/class/power_supply/maxfg/uevent"},
-            {"maxfg registers", "/sys/class/power_supply/maxfg/registers_dump"},
             {"m5_state", "/sys/class/power_supply/maxfg/m5_model_state"},
             {"maxfg logbuffer", "/dev/logbuffer_maxfg"},
             {"maxfg_monitor logbuffer", "/dev/logbuffer_maxfg_monitor"},
     };
 
+    const char *maxfgFlip [][2] = {
+            {"Power supply property maxfg_base", "/sys/class/power_supply/maxfg_base/uevent"},
+            {"Power supply property maxfg_flip", "/sys/class/power_supply/maxfg_flip/uevent"},
+            {"m5_state", "/sys/class/power_supply/maxfg_base/m5_model_state"},
+            {"maxfg_base", "/dev/logbuffer_maxfg_base"},
+            {"maxfg_flip", "/dev/logbuffer_maxfg_flip"},
+            {"maxfg_base", "/dev/logbuffer_maxfg_base_monitor"},
+            {"maxfg_flip", "/dev/logbuffer_maxfg_flip_monitor"},
+    };
+
+    const char *maxfgHistoryName = "Maxim FG History";
+    const char *maxfgHistoryDir = "/dev/maxfg_history";
+
     std::string content;
 
+
     if (isValidDir(maxfgLoc)) {
         for (const auto &row : maxfg) {
             dumpFileContent(row[0], row[1]);
         }
+    } else {
+        for (const auto &row : maxfgFlip) {
+            dumpFileContent(row[0], row[1]);
+        }
+    }
+
+    if (isValidFile(maxfgHistoryDir)) {
+        dumpFileContent(maxfgHistoryName, maxfgHistoryDir);
     }
 }
 
@@ -241,50 +260,55 @@ void dumpLogBufferTcpm() {
 }
 
 void dumpTcpc() {
-    const char* max77759TcpcHead = "TCPC Device Attributes";
-    const char* directory = "/sys/class/typec/port0/device";
-    const char* max77759Tcpc [] {
-            "auto_discharge",
-            "bc12_enabled",
-            "cc_toggle_enable",
-            "contaminant_detection",
-            "contaminant_detection_status",
-            "frs",
-            "irq_hpd_count",
-            "non_compliant_reasons",
-            "sbu_pullup",
-            "update_sdp_enum_timeout",
-            "usb_limit_accessory_current",
-            "usb_limit_accessory_enable",
-            "usb_limit_sink_current",
-            "usb_limit_sink_enable",
-            "usb_limit_source_enable",
+    int ret;
+    const char* max77759TcpcHead = "TCPC";
+    const char* i2cSubDirMatch = "i2c-";
+    const char* directory = "/sys/devices/platform/10d60000.hsi2c/";
+    const char* max77759Tcpc [][2] {
+            {"registers:", "/i2c-max77759tcpc/registers"},
+            {"frs:", "/i2c-max77759tcpc/frs"},
+            {"auto_discharge:", "/i2c-max77759tcpc/auto_discharge"},
+            {"bcl2_enabled:", "/i2c-max77759tcpc/bcl2_enabled"},
+            {"cc_toggle_enable:", "/i2c-max77759tcpc/cc_toggle_enable"},
+            {"containment_detection:", "/i2c-max77759tcpc/containment_detection"},
+            {"containment_detection_status:", "/i2c-max77759tcpc/containment_detection_status"},
     };
 
+    std::vector<std::string> files;
     std::string content;
-    std::string tcpcRegistersPath(std::string(directory) + "/registers");
-
-    dumpFileContent("TCPC Registers", tcpcRegistersPath.c_str());
 
     printTitle(max77759TcpcHead);
 
-    for (auto& tcpcVal : max77759Tcpc) {
-        std::string filename = std::string(directory) + "/" + std::string(tcpcVal);
-        printf("%s: ", tcpcVal);
-        android::base::ReadFileToString(filename, &content);
-        if (!content.empty() && (content.back() == '\n' || content.back() == '\r'))
-            content.pop_back();
-        printf("%s\n", content.c_str());
+    ret = getFilesInDir(directory, &files);
+    if (ret < 0) {
+        for (auto &tcpcVal : max77759Tcpc)
+            printf("%s\n", tcpcVal[0]);
+        return;
+    }
+
+    for (auto &file : files) {
+        for (auto &tcpcVal : max77759Tcpc) {
+            printf("%s ", tcpcVal[0]);
+            if (std::string::npos == std::string(file).find(i2cSubDirMatch)) {
+                continue;
+            }
+
+            std::string fileName = directory + file + "/" + std::string(tcpcVal[1]);
+
+            if (!android::base::ReadFileToString(fileName, &content)) {
+                continue;
+            }
+
+            printf("%s\n", content.c_str());
+        }
     }
-    printf("\n");
 }
 
 void dumpPdEngine() {
     const char* pdEngine [][2] {
-            {"Logbuffer TCPC", "/dev/logbuffer_usbpd"},
-            {"PPS-google_cpm logbuffer", "/dev/logbuffer_cpm"},
-            {"PPS-pca9468 logbuffer", "/dev/logbuffer_pca9468"},
-            {"PPS-dc_mains logbuffer", "/dev/logbuffer_dc_mains"},
+            {"PD Engine", "/dev/logbuffer_usbpd"},
+            {"PPS-google_cpm", "/dev/logbuffer_cpm"},
+            {"PPS-dc", "/dev/logbuffer_pca9468"},
     };
 
     for (const auto &row : pdEngine) {
@@ -310,6 +334,15 @@ void dumpWc68() {
     }
 }
 
+void dumpLn8411() {
+    const char* ln8411Title = "LN8411";
+    const char* ln8411File = "/dev/logbuffer_ln8411";
+
+    if (isValidFile(ln8411File)) {
+        dumpFileContent(ln8411Title, ln8411File);
+    }
+}
+
 void dumpBatteryHealth() {
     const char* batteryHealth [][2] {
             {"Battery Health", "/sys/class/power_supply/battery/health_index_stats"},
@@ -329,7 +362,7 @@ void dumpBatteryHealth() {
 }
 
 void dumpBatteryDefend() {
-    const char* defendConfig [][3] {
+    const char* defendConfig [][4] {
             {"TRICKLE-DEFEND Config",
                     "/sys/devices/platform/google,battery/power_supply/battery/", "bd_"},
             {"DWELL-DEFEND Config", "/sys/devices/platform/google,charger/", "charge_s"},
@@ -374,57 +407,6 @@ void dumpBatteryDefend() {
     }
 }
 
-void dumpBatteryCaretaker() {
-    const char* aacpConfig [][3] {
-            {"AACP Version",
-                    "/sys/devices/platform/google,battery/power_supply/battery/", "aacp_"},
-            {"AACR Config",
-                    "/sys/devices/platform/google,battery/power_supply/battery/", "aacr_"},
-            {"AAFV Config",
-                    "/sys/devices/platform/google,battery/power_supply/battery/", "aafv_"},
-            {"AACT Config",
-                    "/sys/devices/platform/google,battery/power_supply/battery/", "aact_"},
-            {"AACC",
-                    "/sys/devices/platform/google,battery/power_supply/battery/", "aacc"},
-    };
-
-    std::vector<std::string> files;
-    struct dirent *entry;
-    std::string content;
-    std::string fileLocation;
-
-    for (auto &config : aacpConfig) {
-        DIR *dir = opendir(config[1]);
-        if (dir == NULL)
-            continue;
-
-        printTitle(config[0]);
-        while ((entry = readdir(dir)) != NULL) {
-            if (std::string(entry->d_name).find(config[2]) != std::string::npos &&
-                    strncmp(config[2], entry->d_name, strlen(config[2])) == 0) {
-                files.push_back(entry->d_name);
-            }
-        }
-        closedir(dir);
-
-        sort(files.begin(), files.end());
-
-        for (auto &file : files) {
-            fileLocation = std::string(config[1]) + std::string(file);
-            if (!android::base::ReadFileToString(fileLocation, &content) || content.empty()) {
-                content = "\n";
-            }
-
-            printf("%s: %s", file.c_str(), content.c_str());
-
-            if (content.back() != '\n')
-                printf("\n");
-        }
-
-        files.clear();
-    }
-}
-
 void printValuesOfDirectory(const char *directory, std::string debugfs, const char *strMatch) {
     std::vector<std::string> files;
     auto info = directory;
@@ -499,6 +481,7 @@ void dumpChgUserDebug() {
     const std::string debugfs = "/d/";
     const char *maxFgDir = "/d/maxfg";
     const char *maxFgStrMatch = "maxfg";
+    const char *maxFg77779StrMatch = "max77779fg";
     const char *chgTblName = "Charging table dump";
     const char *chgTblDir = "/d/google_battery/chg_raw_profile";
 
@@ -506,6 +489,16 @@ void dumpChgUserDebug() {
             "fg_model",
             "algo_ver",
             "model_ok",
+            "registers",
+            "nv_registers",
+    };
+
+    const char *max77779FgInfo [] {
+            "fg_model",
+            "algo_ver",
+            "model_ok",
+            "registers",
+            "debug_registers",
     };
 
     if (isUserBuild())
@@ -517,6 +510,10 @@ void dumpChgUserDebug() {
         for (auto & directory : maxFgInfo) {
             printValuesOfDirectory(directory, debugfs, maxFgStrMatch);
         }
+    } else {
+        for (auto & directory : max77779FgInfo) {
+            printValuesOfDirectory(directory, debugfs, maxFg77779StrMatch);
+        }
     }
 }
 
@@ -635,27 +632,10 @@ void dumpGvoteables() {
 
 void dumpMitigation() {
     const char *mitigationList [][2] {
-            {"LastmealCSV" , "/data/vendor/mitigation/lastmeal.csv"},
             {"Lastmeal" , "/data/vendor/mitigation/lastmeal.txt"},
             {"Thismeal" , "/data/vendor/mitigation/thismeal.txt"},
     };
 
-    /* parsing thismeal.bin */
-    int status;
-    int pid = fork();
-    if (pid < 0) {
-        printf("Fork failed for parsing thismeal.bin.\n");
-        exit(EXIT_FAILURE);
-    } else if (pid == 0) {
-        execl("/vendor/bin/hw/battery_mitigation", "battery_mitigation", "-d", nullptr);
-        exit(EXIT_SUCCESS);
-    }
-    waitpid(pid, &status, 0);
-
-    if (WIFSIGNALED(status)) {
-        printf("Failed to parse thismeal.bin.(killed by: %d)\n", WTERMSIG(status));
-    }
-
     for (auto &row : mitigationList) {
         if (!isValidFile(row[1]))
             printTitle(row[0]);
@@ -961,21 +941,9 @@ void dumpIrqDurationCounts() {
     }
 }
 
-void dumpCpuIdleHistogramStats() {
-    const char* cpuIdleHistogramTitle = "CPU Idle Histogram";
-    const char* cpuIdleHistogramFile = "/sys/kernel/metrics/cpuidle_histogram/"
-                                        "cpuidle_histogram";
-    const char* cpuClusterHistogramTitle = "CPU Cluster Histogram";
-    const char* cpuClusterHistogramFile = "/sys/kernel/metrics/"
-                                    "cpuidle_histogram/cpucluster_histogram";
-    dumpFileContent(cpuIdleHistogramTitle, cpuIdleHistogramFile);
-    dumpFileContent(cpuClusterHistogramTitle, cpuClusterHistogramFile);
-}
-
 int main() {
     dumpPowerStatsTimes();
     dumpAcpmStats();
-    dumpCpuIdleHistogramStats();
     dumpPowerSupplyStats();
     dumpMaxFg();
     dumpPowerSupplyDock();
@@ -984,9 +952,9 @@ int main() {
     dumpPdEngine();
     dumpEusbRepeater();
     dumpWc68();
+    dumpLn8411();
     dumpBatteryHealth();
     dumpBatteryDefend();
-    dumpBatteryCaretaker();
     dumpChg();
     dumpChgUserDebug();
     dumpBatteryEeprom();

dumpstate/dump_power.rc

@@ -1,3 +0,0 @@
-on init
-    # for parsing thismeal.bin
-    chown system system /vendor/bin/hw/battery_mitigation

dumpstate/item.mk

@@ -1,4 +1,6 @@
 PRODUCT_PACKAGES += dump_wlan.sh \
 		    dump_power
 
-PRODUCT_PACKAGES_ENG += dump_gsa.sh
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += dump_gsa.sh
+endif

evolution_common.mk

@@ -6,6 +6,3 @@
 
 # PixelParts
 include packages/apps/PixelParts/device.mk
-
-# UDFPS
-TARGET_HAS_UDFPS += true

health/android.hardware.health-service.zuma.xml

@@ -1,7 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.health</name>
-        <version>4</version>
+        <version>3</version>
         <fqname>IHealth/default</fqname>
     </hal>
 </manifest>

lineage_common.mk

@@ -1,6 +1,6 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -16,23 +16,12 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.vendor.camera.extensions.package=com.google.android.apps.camera.services \
     ro.vendor.camera.extensions.service=com.google.android.apps.camera.services.extensions.service.PixelExtensions
 
-# EUICC
-PRODUCT_PACKAGES += \
-    EuiccSupportPixelOverlay
-
-# Experiments
-include device/google/gs-common/performance/experiments/experiments.mk
-
 # Google Assistant
 PRODUCT_PRODUCT_PROPERTIES += ro.opa.eligible_device=true
 
 # Lineage Health
 include hardware/google/pixel/lineage_health/device.mk
 
-$(call soong_config_set,lineage_health,charging_control_supports_deadline,true)
-$(call soong_config_set,lineage_health,charging_control_supports_limit,true)
-$(call soong_config_set,lineage_health,charging_control_supports_toggle,false)
-
 # Linker config
 PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
     device/google/zuma/linker.config.json
@@ -41,9 +30,5 @@ PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
 PRODUCT_PACKAGES += \
     GoogleParts
 
-# Tethering
-PRODUCT_PACKAGES += \
-    TetheringOverlay
-
 # Touch
 include hardware/google/pixel/touch/device.mk

linker.config.json

@@ -1,10 +1,5 @@
 {
   "provideLibs": [
-    "liboemcrypto.so",
-    "lib_aion_buffer.so",
-    "libedgetpu_client.google.so",
-    "libedgetpu_tachyon.google.so",
-    "libedgetpu_util.so",
-    "libgxp.so"
+    "liboemcrypto.so"
   ]
 }

manifest.xml

@@ -1,4 +1,13 @@
 <manifest version="1.0" type="device" target-level="8">
+    <hal format="hidl">
+        <name>android.hardware.graphics.mapper</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>4.0</version>
+        <interface>
+            <name>IMapper</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="aidl">
         <name>android.hardware.boot</name>
         <fqname>IBootControl/default</fqname>

manifest_media.xml

@@ -1,13 +1,12 @@
 <manifest version="1.0" type="device">
-    <!-- AIDL fragment -->
-    <hal format="aidl">
-      <name>android.hardware.media.c2</name>
-      <version>1</version>
-      <fqname>IComponentStore/default1</fqname>
-    </hal>
-    <hal format="aidl">
-      <name>android.hardware.media.c2</name>
-      <version>1</version>
-      <fqname>IComponentStore/default</fqname>
+    <hal format="hidl">
+        <name>android.hardware.media.c2</name>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>IComponentStore</name>
+            <instance>default</instance>
+            <instance>default1</instance>
+        </interface>
     </hal>
 </manifest>

manifest_media_aosp.xml

@@ -1,5 +1,4 @@
 <manifest version="1.0" type="device">
-    <!-- HIDL fragment -->
     <hal format="hidl">
         <name>android.hardware.media.c2</name>
         <transport>hwbinder</transport>
@@ -9,10 +8,4 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <!-- AIDL fragment -->
-    <hal format="aidl">
-      <name>android.hardware.media.c2</name>
-      <version>1</version>
-      <fqname>IComponentStore/default</fqname>
-    </hal>
 </manifest>

media_codecs_aosp_c2.xml

@@ -108,7 +108,7 @@
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp8.decoder" type="video/x-vnd.on2.vp8" >
             <Limit name="size" min="32x32" max="3840x2160" />
-            <Limit name="alignment" value="1x1" />
+            <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
@@ -122,7 +122,7 @@
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.decoder" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="7680x4352" />
-            <Limit name="alignment" value="1x1" />
+            <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
             <Limit name="block-count" range="1-8160" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
@@ -137,7 +137,7 @@
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.decoder.secure" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="3840x2176" />
-            <Limit name="alignment" value="1x1" />
+            <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
@@ -222,7 +222,7 @@
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp8.encoder" type="video/x-vnd.on2.vp8" >
             <Limit name="size" min="32x32" max="3840x2160" />
-            <Limit name="alignment" value="1x1" />
+            <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
@@ -238,7 +238,7 @@
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.encoder" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="3840x2176" />
-            <Limit name="alignment" value="1x1" />
+            <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
             <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="243000" />

media_codecs_bo_c2.xml

@@ -19,7 +19,7 @@
     <Decoders>
         <MediaCodec name="c2.google.av1.decoder" type="video/av01">
           <Limit name="size" min="96x96" max="3840x2160" />
-          <Limit name="alignment" value="1x1" />
+          <Limit name="alignment" value="2x2" />
           <Limit name="block-size" value="16x16" />
           <Limit name="block-count" range="36-32400" />
           <Limit name="blocks-per-second" min="24" max="1944000" />
@@ -34,7 +34,7 @@
         </MediaCodec>
         <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01">
           <Limit name="size" min="96x96" max="3840x2160" />
-          <Limit name="alignment" value="1x1" />
+          <Limit name="alignment" value="2x2" />
           <Limit name="block-size" value="16x16" />
           <Limit name="block-count" range="36-32400" />
           <Limit name="blocks-per-second" min="24" max="1944000" />
@@ -51,21 +51,20 @@
     </Decoders>
     <Encoders>
         <MediaCodec name="c2.google.av1.encoder" type="video/av01">
-           <Limit name="size" min="80x80" max="3840x2176" />
-            <Limit name="alignment" value="1x1" />
+            <Limit name="size" min="64x64" max="3840x2176" />
+            <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
-            <Limit name="block-count" range="4-2040" />
-            <Limit name="blocks-per-second" min="4" max="61200" />
+            <Limit name="block-count" range="1-2040" />
+            <Limit name="blocks-per-second" min="1" max="61200" />
             <Limit name="bitrate" range="1-120000000" />
-            <Limit name="performance-point-1280x720"  value="200" />
+            <Limit name="performance-point-1280x720" range="240" />
             <Limit name="performance-point-1920x1080" value="180" />
             <Limit name="performance-point-1920x1079" value="120" />
-            <Limit name="performance-point-3840x2160" value="60" />
+            <Limit name="performance-point-3840x2160" range="60" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="vq-minimum-quality"/>
             <Feature name="encoding-statistics"/>
-            <Feature name="hdr-editing" />
         </MediaCodec>
     </Encoders>
 </MediaCodecs>

media_codecs_performance_c2.xml

@@ -115,24 +115,24 @@
         </MediaCodec>
         <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
             <!-- measured 90%:342-360 med:343 N=2 -->
-            <Limit name="measured-frame-rate-320x240" range="291-512" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-320x240" range="342-351" /> <!-- v90%=1.0 -->
             <!-- measured 90%:142-147 med:143 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="244-474" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-720x480" range="142-145" /> <!-- v90%=1.0 -->
             <!-- measured 90%:54-56 med:55 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="110-209" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="54-55" /> <!-- v90%=1.0 -->
             <!-- measured 90%:25-26 med:26 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="45-87" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="25-26" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="291-512" />
+            <Limit name="measured-frame-rate-352x288" range="583-674" />
             <!-- measured 90%:196-207 med:196 N=2 -->
-            <Limit name="measured-frame-rate-640x360" range="244-474" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="196-201" /> <!-- v90%=1.0 -->
             <!-- measured 90%:177-180 med:178 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="232-443" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-720x480" range="177-178" /> <!-- v90%=1.0 -->
             <!-- measured 90%:81-82 med:82 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="171-325" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="81-82" /> <!-- v90%=1.0 -->
             <!-- measured 90%:45-47 med:46 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="118-219" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="45-46" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="1111-1176" />

overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml

@@ -18,10 +18,6 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Whether device has screen with higher aspect ratio -->
-    <bool name="config_haveHigherAspectRatioScreen">true</bool>
-
     <!-- Defines the actions shown in advanced reboot submenu -->
     <string-array name="config_restartActionsList">
         <item>restart</item>

overlay-lineage/packages/apps/SimpleDeviceConfig/res/values/config.xml

@@ -20,34 +20,29 @@
         <item>connectivity_thermal_power_manager/apply_action_time_seconds=10</item>
         <item>connectivity_thermal_power_manager/atm_power_threshold_mw=800</item>
         <item>connectivity_thermal_power_manager/cellular_thermal_adaptive_thermal_status_adaptive_action_list=</item>
-        <item>connectivity_thermal_power_manager/criteria_1_enabled=true</item>
         <item>connectivity_thermal_power_manager/criteria_4_enabled=true</item>
-        <item>connectivity_thermal_power_manager/criteria_4_lte_pref_mode=3</item>
         <item>connectivity_thermal_power_manager/wifi_disconnected_time_seconds=180</item>
         <item>connectivity_thermal_power_manager/wifi_internet_driven_endc_product_carrier_id_set=shiba,husky,akita,komodo,tokay,caiman,comet@1,1989,2023,2576,2067,2071,2073,2577,2522,2075,2578,2083,2433,1949</item>
 
         <!-- Live Caption (Pixel 2017 + OEM) -->
         <item>device_personalization_services/Captions__allow_box_x_axis_movement=true</item>
         <item>device_personalization_services/Captions__allow_use_public_speech_recognition=true</item>
-        <item>device_personalization_services/Captions__allow_voip_call_without_audio_recording=true</item>
-        <item>device_personalization_services/Captions__available_for_download=en-US;en-GB;en-CA;en-IE;en-AU;en-SG;en-IN;fr-FR;fr-CA;fr-BE;fr-CH;it-IT;it-CH;de-DE;de-AT;de-BE;de-CH;ja-JP;es-ES;es-US;cmn-Hant-TW;hi-IN;pt-BR;tr-TR;pl-PL;cmn-Hans-CN;ko-KR;ru-RU;vi-VN</item>
+        <item>device_personalization_services/Captions__allow_voip_call_without_audio_recording=false</item>
+        <item>device_personalization_services/Captions__available_for_download=en-US;en-GB;en-CA;en-IE;en-AU;en-SG;en-IN;fr-FR;fr-CA;fr-BE;fr-CH;it-IT;it-CH;de-DE;de-AT;de-BE;de-CH;ja-JP;es-ES;es-US;cmn-Hant-TW;hi-IN</item>
         <item>device_personalization_services/Captions__disable_prod=false</item>
         <!-- <item>device_personalization_services/Captions__enable=false</item> -->
-        <item>device_personalization_services/Captions__enable_activation_boost=true</item>
         <item>device_personalization_services/Captions__enable_adaptive_box_width=true</item>
         <item>device_personalization_services/Captions__enable_augmented_modality=true</item>
         <item>device_personalization_services/Captions__enable_augmented_modality_input=true</item>
         <item>device_personalization_services/Captions__enable_augmented_modality_language_detection=true</item>
         <item>device_personalization_services/Captions__enable_augmented_music=true</item>
         <!-- <item>device_personalization_services/Captions__enable_clearcut_logging=true</item> -->
-        <item>device_personalization_services/Captions__enable_drag_and_double_tap_to_resize=true</item>
-        <item>device_personalization_services/Captions__enable_ec_integration=false</item>
+        <item>device_personalization_services/Captions__enable_drag_and_double_tap_to_resize=false</item>
         <item>device_personalization_services/Captions__enable_language_detection=true</item>
         <item>device_personalization_services/Captions__enable_new_model_version_advanced_2023=true</item>
         <item>device_personalization_services/Captions__enable_one_caption_experiment=false</item>
         <item>device_personalization_services/Captions__enable_punctuations=true</item>
         <item>device_personalization_services/Captions__enable_setting_page=false</item>
-        <item>device_personalization_services/Captions__enable_survey=false</item>
         <item>device_personalization_services/Captions__enable_text_transform=true</item>
         <item>device_personalization_services/Captions__enable_westworld_logging=false</item>
         <item>device_personalization_services/Captions__enable_zero_day=false</item>
@@ -57,9 +52,7 @@
         <item>device_personalization_services/Captions__new_model_version=20210623</item>
         <item>device_personalization_services/Captions__new_model_version_advanced_2023=20230808</item>
         <item>device_personalization_services/Captions__speech_threshold=0.2</item>
-        <item>device_personalization_services/Captions__support_lang_id_disabled_after_dismissals=true</item>
-        <item>device_personalization_services/Captions__supported_languages=en-US;fr-FR;it-IT;de-DE;ja-JP;es-ES;cmn-Hant-TW;hi-IN;pt-BR;tr-TR;pl-PL;cmn-Hans-CN;ko-KR;ru-RU;vi-VN</item>
-        <item>device_personalization_services/Captions__supported_languages_beta_quality=ja-JP;pt-BR;tr-TR;pl-PL;cmn-Hans-CN;ko-KR;ru-RU;vi-VN</item>
+        <item>device_personalization_services/Captions__supported_languages=en-US;fr-FR;it-IT;de-DE;ja-JP;es-ES;cmn-Hant-TW;hi-IN</item>
         <item>device_personalization_services/Captions__surface_sound_events=true</item>
         <item>device_personalization_services/Captions__text_transform_augmented_input=true</item>
         <item>device_personalization_services/Captions__visibility_playing_duration_millis=5000</item>
@@ -67,23 +60,12 @@
 
         <!-- Now Playing (Pixel 2017) -->
         <item>device_personalization_services/NowPlaying__ambient_music_apk_music_detector_min_score=0.45</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_download_album_art_via_astrea=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_enable_resource_download_logging=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_enhanced_metadata_shards_manifest=4003:https://storage.googleapis.com/music-iq-db/updatable_db_v4/20241015-000033/manifest.json</item>
         <item>device_personalization_services/NowPlaying__ambient_music_get_model_state_cooldown_seconds_cloud_search=9</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_index_manifest_17_09_02=3105:https://storage.googleapis.com/music-iq-db/updatable_db_v3/20241013-030037/manifest.json</item>
+        <item>device_personalization_services/NowPlaying__ambient_music_index_manifest_17_09_02=3082:https://storage.googleapis.com/music-iq-db/updatable_db_v3/20240421-030101/manifest.json</item>
         <item>device_personalization_services/NowPlaying__ambient_music_matcher_match_threshold_17_09_02=1.0E-6</item>
         <item>device_personalization_services/NowPlaying__ambient_music_on_demand_enabled=true</item>
         <item>device_personalization_services/NowPlaying__ambient_music_on_demand_music_confidence=0.48</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_on_demand_search_use_new_opt_in_flow=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_show_album_art=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_support_dsp_model_tflite_p6=true</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_use_enhanced_matches_database=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_use_metadata_shards_database=false</item>
-        <item>device_personalization_services/NowPlaying__ambient_music_use_yt_domain_fife_urls=false</item>
         <item>device_personalization_services/NowPlaying__cloud_api_allowed=true</item>
-        <item>device_personalization_services/NowPlaying__create_shortcut_on_np_enabled=false</item>
-        <item>device_personalization_services/NowPlaying__default_music_player_setting=false</item>
         <item>device_personalization_services/NowPlaying__dsp_model_checksum_enabled=true</item>
         <!-- <item>device_personalization_services/NowPlaying__enable_usage_fa=true</item> -->
         <item>device_personalization_services/NowPlaying__favorites_enabled=true</item>
@@ -97,7 +79,6 @@
         <item>device_personalization_services/NowPlaying__on_demand_hide_if_fingerprinter_install_not_confirmed=true</item>
         <item>device_personalization_services/NowPlaying__on_demand_min_supported_aga_version=12.35.17</item>
         <item>device_personalization_services/NowPlaying__on_demand_retry_fingerprinter_install=true</item>
-        <item>device_personalization_services/NowPlaying__shortcut_direct_create_enabled=false</item>
         <item>device_personalization_services/NowPlaying__youtube_export_enabled=true</item>
 
         <!-- Adaptive Sound (Pixel 2020) -->
@@ -125,10 +106,8 @@
         <item>device_personalization_services/Translate__enable_default_langid_model=true</item>
         <item>device_personalization_services/Translate__enable_dictionary_langid_detection=true</item>
         <item>device_personalization_services/Translate__enable_opmv4_service=true</item>
-        <item>device_personalization_services/Translate__enable_settings_backup_restore=false</item>
         <item>device_personalization_services/Translate__enable_setup_wizard_dialog_v2=false</item>
         <item>device_personalization_services/Translate__enable_spa_setting=false</item>
-        <item>device_personalization_services/Translate__enable_translate_kit_api_migration=false</item>
         <item>device_personalization_services/Translate__interpreter_source_languages=de,en,ja,es,fr,it</item>
         <item>device_personalization_services/Translate__interpreter_target_languages=de,en,ja,es,fr,it</item>
         <item>device_personalization_services/Translate__replace_auto_translate_copied_text_enabled=true</item>

overlay/frameworks/base/core/res/res/values/config.xml

@@ -74,9 +74,6 @@
     <!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
     <bool name="config_unplugTurnsOnScreen">true</bool>
 
-
-    <bool name="config_use_tiered_cached_adj">false</bool>
-
     <!-- If device supports pickup/lift gesture -->
     <bool name="config_dozePulsePickup">true</bool>
 
@@ -244,8 +241,8 @@
         <item>"/system_ext/priv-app/SystemUI/SystemUI.apk"</item>
     </string-array>
 
-    <!-- Bytes that the PinnerService will pin for Home app -->
-    <integer name="config_pinnerHomePinBytes">6291456</integer>
+    <!-- Should the pinner service pin the Home application? -->
+    <bool name="config_pinnerHomeApp">true</bool>
 
     <!-- Bytes that the PinnerService will pin for WebView -->
     <integer name="config_pinnerWebviewPinBytes">20971520</integer>
@@ -279,9 +276,6 @@
     <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
     <bool name="config_zramWriteback">true</bool>
 
-    <!-- the number of the max cached processes in the system. -->
-    <integer name="config_customizedMaxCachedProcesses">1024</integer>
-
     <!-- Boolean indicating if restoring network selection should be skipped -->
     <!-- The restoring is handled by modem if it is true -->
     <bool translatable="false" name="skip_restoring_network_selection">true</bool>
@@ -313,7 +307,4 @@
 
     <!-- Pre-scale volume at volume step 3 for Absolute Volume -->
     <fraction name="config_prescaleAbsoluteVolume_index3">100%</fraction>
-
-    <!-- Whether to enable usb state update via udc sysfs. -->
-    <bool name="config_enableUdcSysfsUsbStateUpdate">true</bool>
 </resources>

overlay/frameworks/base/packages/SettingsLib/res/values-mcc310-mnc004/strings.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2020, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Content description of the data connection type 5G UW. [CHAR LIMIT=NONE] -->
+    <string name="data_connection_5g_plus" translatable="false">5G UW</string>
+</resources>

overlay/frameworks/base/packages/SettingsLib/res/values-mcc311-mnc480/strings.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2020, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Content description of the data connection type 5G UW. [CHAR LIMIT=NONE] -->
+    <string name="data_connection_5g_plus" translatable="false">5G UW</string>
+</resources>

pixelstats/service.cpp

@@ -105,16 +105,6 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
         "/sys/class/power_supply/maxfg/gmsr",
         "/sys/class/power_supply/maxfg_base/gmsr",
     },
-    .FGModelLoadingPath = {
-        "/sys/class/power_supply/maxfg/m5_model_state",
-        "/sys/class/power_supply/maxfg_base/m5_model_state"
-    },
-    .FGLogBufferPath = {
-        "/dev/logbuffer_maxfg_monitor",
-        "/dev/logbuffer_max77779fg_monitor",
-        "/dev/logbuffer_maxfg_base_monitor",
-        "/dev/logbuffer_maxfg_secondary_monitor"
-    },
     .DisplayPortStatsPaths = {
         "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/link_negotiation_failures",
         "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/edid_read_failures",
@@ -123,23 +113,6 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
         "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/sink_count_invalid_failures",
         "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/link_unstable_failures",
     },
-    .DisplayPortDSCStatsPaths = {
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/fec_dsc_supported",
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/fec_dsc_not_supported",
-    },
-    .DisplayPortMaxResolutionStatsPaths = {
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/max_res_other",
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/max_res_1366_768",
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/max_res_1440_900",
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/max_res_1600_900",
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/max_res_1920_1080",
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/max_res_2560_1080",
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/max_res_2560_1440",
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/max_res_3440_1440",
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/max_res_3840_2160",
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/max_res_5120_2880",
-        "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/max_res_7680_4320",
-    },
     .HDCPStatsPaths = {
         "/sys/devices/platform/hdcp/hdcp2_success_count",
         "/sys/devices/platform/hdcp/hdcp2_fallback_count",
@@ -147,14 +120,21 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
         "/sys/devices/platform/hdcp/hdcp1_success_count",
         "/sys/devices/platform/hdcp/hdcp1_fail_count",
         "/sys/devices/platform/hdcp/hdcp0_count",
-    },
-    .SpeakerVersionPath = "/sys/devices/platform/audiometrics/speaker_version"
+    }
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {
         .AudioUevent = "/devices/virtual/amcs/amcs",
         .TypeCPartnerUevent = "PRODUCT_TYPE=",
-        .FwUpdatePath = ""
+        .FGLearningPath = {
+            "/sys/class/power_supply/maxfg/fg_learning_events",
+            "/sys/class/power_supply/maxfg_base/fg_learning_events"
+        },
+        .FwUpdatePath = "",
+        .FGModelLoadingPath = {
+            "/sys/class/power_supply/maxfg/m5_model_state",
+            "/sys/class/power_supply/maxfg_base/m5_model_state"
+        }
 };
 
 int main() {

powerstats/ZumaCommonDataProviders.cpp

@@ -282,7 +282,7 @@ void addSoC(std::shared_ptr<PowerStats> p) {
 }
 
 void setEnergyMeter(std::shared_ptr<PowerStats> p) {
-    std::vector<std::string> deviceNames { "s2mpg14-odpm", "s2mpg15-odpm" };
+    std::vector<const std::string> deviceNames { "s2mpg14-odpm", "s2mpg15-odpm" };
     p->setEnergyMeterDataProvider(std::make_unique<IioEnergyMeterDataProvider>(deviceNames, true));
 }
 

rro_overlays/TetheringOverlay/Android.bp

@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-runtime_resource_overlay {
-    name: "TetheringOverlay",
-    sdk_version: "current",
-    product_specific: true
-}

rro_overlays/TetheringOverlay/AndroidManifest.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!-- Pixel specific tethering overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.networkstack.tethering.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-        android:targetPackage="com.android.networkstack.tethering"
-        android:targetName="TetheringConfig"
-        android:isStatic="true"
-        android:priority="0" />
-</manifest>

rro_overlays/TetheringOverlay/res/values/config.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<resources>
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         USB interfaces.  If the device doesn't want to support tethering over USB this should
-         be empty.  An example would be "usb.*" -->
-    <string-array translatable="false" name="config_tether_usb_regexs">
-        <item>rndis\\d</item>
-    </string-array>
-
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         NCM interfaces.  If the device doesn't want to support tethering over NCM this should
-         be empty. -->
-    <string-array translatable="false" name="config_tether_ncm_regexs">
-        <item>ncm\\d</item>
-    </string-array>
-
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         Wifi P2P interfaces.  If the device doesn't want to support tethering over Wifi P2p this
-         should be empty.  An example would be "p2p-p2p\\d-.*" -->
-    <string-array translatable="false" name="config_tether_wifi_p2p_regexs">
-        <item>p2p-p2p\\d-.*</item>
-        <item>p2p\\d</item>
-        <item>p2p-wlan\\d-.*</item>
-    </string-array>
-
-    <!-- Which USB function should be enabled when TETHERING_USB is requested. 0: RNDIS, 1: NCM.
-         -->
-    <integer translatable="false" name="config_tether_usb_functions">1</integer>
-</resources>

sepolicy/legacy/whitechapel_pro/certs/EuiccSupportPixel.x509.pem

@@ -1,28 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----

sepolicy/legacy/whitechapel_pro/file_contexts

@@ -14,7 +14,6 @@
 /vendor/lib(64)?/libGralloc4Wrapper\.so                                     u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/pixel-power-ext-V1-ndk\.so                                 u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/android\.frameworks\.stats-V1-ndk\.so                      u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/android\.frameworks\.stats-V2-ndk\.so                      u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/vendor-pixelatoms-cpp\.so                                  u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/libprotobuf-cpp-lite-(\d+\.){2,3}so                        u:object_r:same_process_hal_file:s0
 

sepolicy/legacy/whitechapel_pro/genfs_contexts

@@ -64,14 +64,13 @@ genfscon sysfs /devices/platform/google,usbc_port_cooling_dev/cleared_time
 genfscon sysfs /devices/platform/google,usbc_port_cooling_dev/hysteresis_time   u:object_r:sysfs_usbc_throttling_stats:s0
 genfscon sysfs /devices/platform/google,usbc_port_cooling_dev/trip_time         u:object_r:sysfs_usbc_throttling_stats:s0
 
-# ARM ETE
-genfscon sysfs /devices/platform/ete0    u:object_r:sysfs_devices_cs_etm:s0
-genfscon sysfs /devices/platform/ete1    u:object_r:sysfs_devices_cs_etm:s0
-genfscon sysfs /devices/platform/ete2    u:object_r:sysfs_devices_cs_etm:s0
-genfscon sysfs /devices/platform/ete3    u:object_r:sysfs_devices_cs_etm:s0
-genfscon sysfs /devices/platform/ete4    u:object_r:sysfs_devices_cs_etm:s0
-genfscon sysfs /devices/platform/ete5    u:object_r:sysfs_devices_cs_etm:s0
-genfscon sysfs /devices/platform/ete6    u:object_r:sysfs_devices_cs_etm:s0
-genfscon sysfs /devices/platform/ete7    u:object_r:sysfs_devices_cs_etm:s0
-genfscon sysfs /devices/platform/ete8    u:object_r:sysfs_devices_cs_etm:s0
+# Coresight ETM
+genfscon sysfs /devices/platform/2b840000.etm    u:object_r:sysfs_devices_cs_etm:s0
+genfscon sysfs /devices/platform/2b940000.etm    u:object_r:sysfs_devices_cs_etm:s0
+genfscon sysfs /devices/platform/2ba40000.etm    u:object_r:sysfs_devices_cs_etm:s0
+genfscon sysfs /devices/platform/2bb40000.etm    u:object_r:sysfs_devices_cs_etm:s0
+genfscon sysfs /devices/platform/2bc40000.etm    u:object_r:sysfs_devices_cs_etm:s0
+genfscon sysfs /devices/platform/2bd40000.etm    u:object_r:sysfs_devices_cs_etm:s0
+genfscon sysfs /devices/platform/2be40000.etm    u:object_r:sysfs_devices_cs_etm:s0
+genfscon sysfs /devices/platform/2bf40000.etm    u:object_r:sysfs_devices_cs_etm:s0
 

sepolicy/legacy/whitechapel_pro/property.te

@@ -1,6 +1,4 @@
-# Vendor
 vendor_internal_prop(vendor_nfc_prop)
-vendor_restricted_prop(vendor_nfc_antenna_prop)
 vendor_internal_prop(vendor_secure_element_prop)
 vendor_internal_prop(vendor_battery_profile_prop)
 vendor_internal_prop(vendor_camera_prop)
@@ -8,7 +6,6 @@ vendor_internal_prop(vendor_camera_fatp_prop)
 vendor_internal_prop(vendor_ro_sys_default_prop)
 vendor_internal_prop(vendor_persist_sys_default_prop)
 vendor_internal_prop(vendor_display_prop)
-vendor_internal_prop(vendor_persist_prop)
 
 # UWB calibration
 system_vendor_config_prop(vendor_uwb_calibration_prop)

sepolicy/legacy/whitechapel_pro/property_contexts

@@ -3,7 +3,6 @@ persist.vendor.testing_battery_profile     u:object_r:vendor_battery_profile_pro
 
 # NFC
 persist.vendor.nfc.                        u:object_r:vendor_nfc_prop:s0
-persist.vendor.nfc.antenna.                u:object_r:vendor_nfc_antenna_prop:s0
 
 # SecureElement
 persist.vendor.se.                         u:object_r:vendor_secure_element_prop:s0

sepolicy/legacy/whitechapel_pro/vndservice_contexts

@@ -0,0 +1 @@
+rlsservice            u:object_r:rls_service:s0

sepolicy/radio/cbd.te

@@ -5,7 +5,6 @@ init_daemon_domain(cbd)
 set_prop(cbd, vendor_modem_prop)
 set_prop(cbd, vendor_cbd_prop)
 set_prop(cbd, vendor_rild_prop)
-get_prop(cbd, telephony_modem_prop)
 
 allow cbd mnt_vendor_file:dir r_dir_perms;
 

sepolicy/radio/certs/com_google_mds.x509.pem

@@ -1,28 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIF1TCCA72gAwIBAgIVAPZ4KZV2jpxRBCoVAidCu62l3cDqMA0GCSqGSIb3DQEBCwUAMHsxCzAJB
-gNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEg
-YDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEXMBUGA1UEAwwOY29tX2dvb2dsZV9
-tZHMwHhcNMTkwNDIyMTQ1NzA1WhcNNDkwNDIyMTQ1NzA1WjB7MQswCQYDVQQGEwJVUzETMBEGA1UE
-CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluY
-y4xEDAOBgNVBAsTB0FuZHJvaWQxFzAVBgNVBAMMDmNvbV9nb29nbGVfbWRzMIICIjANBgkqhkiG9w
-0BAQEFAAOCAg8AMIICCgKCAgEAqgNC0hhI3NzaPUllJfe01hCTuEpl35D02+DKJ5prPFxv6KGTk6s
-kjZOwV87Zf2pyj/cbnv28ioDjwvqMBe4ntFdKtH9gl2tTAVl69HMKXF4Iny/wnrt2mxzhWxFUd5Pu
-W+mWug+UQw/NGUuaf5d/yys/RrchHKM1+zBV6aOzH6BXiwDoOF2i43d5GlNQ/tFuMySWLJftJN0QU
-LFelxNDFFJZhw2P3c4opxjmF2yCoIiDfBEIhTZFKUbHX6YDLXmtUpXl35q+cxK4TCxPURyzwdfiyh
-eF3TTxagfzhvXNg/ifrY67S4qCGfzoEMPxrTz02gS0u3D6r/2+hl9vAJChLKDNdIs6TqIw+YnABrE
-LiZLLFnaABnjQ7xC3xv1s3W6dWxaxnoVMtC1YvdgwhC5gSpJ4A+AGcCLv96hoeB1IIoGV9Yt0Z97M
-FpXeHFpAxFZ1F9feBqwOCDbu50dmdKZvqGHZ4Ts3uy7ukDQ08dquHpT+NmqkmmW5GGhkuyZS3HHpU
-/QeVsZiyJCJBbDe5lz6NGXK56ruuF9ILeGHtldjQm40oYRc01ESScyVjSU0kpMOC7hn1B7rKAm8xx
-G7eH04ieQrNnbbee7atOO4C3157W5CqujfLMeo6OCRVtcYkYIuSi8hIPNySu/qOaEtEP4owVNZR0H
-6mCHy5pANsyBofMkCAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUgk8pmLx8yP3RILwR
-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
+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
+
 -----END CERTIFICATE-----

sepolicy/radio/copy_efs_files_to_data.te

@@ -1,60 +0,0 @@
-type copy_efs_files_to_data, domain;
-type copy_efs_files_to_data_exec, exec_type, vendor_file_type, file_type;
-
-init_daemon_domain(copy_efs_files_to_data);
-
-
-
-# Allow creating files on /data/vendor/copied
-allow copy_efs_files_to_data modem_efs_image_file:dir  { create_dir_perms };
-allow copy_efs_files_to_data modem_efs_image_file:file { create_file_perms };
-allow copy_efs_files_to_data modem_efs_image_file:lnk_file { create_file_perms };
-
-
-# Allow execute binaries from /vendor/bin
-allow copy_efs_files_to_data vendor_toolbox_exec:file rx_file_perms;
-allow copy_efs_files_to_data vendor_shell_exec:file rx_file_perms;
-
-# Allow execute /vendor/bin/dump.f2fs
-allow copy_efs_files_to_data vendor_file:file { getattr execute_no_trans };
-
-# Allow execute dump.f2fs to dump files from /dev/block/by-name/efs
-allow copy_efs_files_to_data block_device:dir search;
-allow copy_efs_files_to_data efs_block_device:blk_file r_file_perms;
-allow copy_efs_files_to_data modem_userdata_block_device:blk_file r_file_perms;
-allow copy_efs_files_to_data persist_block_device:blk_file r_file_perms;
-
-# Allow checking if /data/vendor/copied/[efs/efs_backup/persist] exist
-allow copy_efs_files_to_data modem_efs_file:dir getattr;
-allow copy_efs_files_to_data modem_userdata_file:dir getattr;
-allow copy_efs_files_to_data persist_file:dir getattr;
-
-
-allow copy_efs_files_to_data sysfs_scsi_devices_0000:dir r_dir_perms;
-allow copy_efs_files_to_data sysfs_scsi_devices_0000:file r_file_perms;
-
-# dump.f2fs need to restore file permissions after dumping
-# files from an f2fs image
-allow copy_efs_files_to_data self:capability chown;
-allow copy_efs_files_to_data self:capability fowner;
-
-
-allow copy_efs_files_to_data kmsg_debug_device:chr_file { w_file_perms ioctl getattr };
-
-
-
-# Should not write to any block devices. Only read from block device
-# and dump files to /data/vendor/copied
-dontaudit copy_efs_files_to_data dev_type:blk_file write;
-# Setting xattr requires sys_admin
-dontaudit copy_efs_files_to_data self:capability sys_admin;
-# dump.f2fs would attempt to restore selinux on dumped files, but we
-# will use restorecon to do the job.
-dontaudit copy_efs_files_to_data modem_efs_image_file:dir relabelfrom;
-dontaudit copy_efs_files_to_data modem_efs_image_file:file relabelfrom;
-dontaudit copy_efs_files_to_data modem_efs_file:dir relabelto;
-dontaudit copy_efs_files_to_data modem_efs_file:file relabelto;
-dontaudit copy_efs_files_to_data modem_userdata_file:dir relabelto;
-dontaudit copy_efs_files_to_data modem_userdata_file:file relabelto;
-dontaudit copy_efs_files_to_data vendor_persist_type:dir relabelto;
-dontaudit copy_efs_files_to_data vendor_persist_type:file relabelto;

sepolicy/radio/device.te

@@ -1,4 +1,4 @@
-# radio
 type modem_block_device, dev_type;
 type vendor_gnss_device, dev_type;
-
+type modem_userdata_block_device, dev_type;
+type efs_block_device, dev_type;

sepolicy/radio/file.te

@@ -1,6 +1,5 @@
 # Data
 type rild_vendor_data_file, file_type, data_file_type;
-type modem_efs_image_file, file_type, data_file_type;
 type vendor_gps_file, file_type, data_file_type;
 type modem_ml_data_file, file_type, data_file_type;
 type modem_stat_data_file, file_type, data_file_type;

sepolicy/radio/file_contexts

@@ -6,12 +6,12 @@
 /vendor/bin/sced                                                            u:object_r:sced_exec:s0
 /vendor/bin/rfsd                                                            u:object_r:rfsd_exec:s0
 /vendor/bin/modem_logging_control                                           u:object_r:modem_logging_control_exec:s0
+/vendor/bin/modem_svc_sit                                                   u:object_r:modem_svc_sit_exec:s0
 /vendor/bin/modem_ml_svc_sit                                                u:object_r:modem_ml_svc_sit_exec:s0
 /vendor/bin/cbd                                                             u:object_r:cbd_exec:s0
 /vendor/bin/hw/rild_exynos                                                  u:object_r:rild_exec:s0
 /vendor/bin/hw/vendor\.google\.radioext@1\.0-service                        u:object_r:hal_radioext_default_exec:s0
 /vendor/bin/liboemservice_proxy_default                                     u:object_r:liboemservice_proxy_default_exec:s0
-/vendor/bin/copy_efs_files_to_data                                                            u:object_r:copy_efs_files_to_data_exec:s0
 
 # Config files
 /vendor/etc/modem_ml_models\.conf                                           u:object_r:modem_config_file:s0
@@ -23,7 +23,6 @@
 /data/vendor/modem_ml(/.*)?                                                 u:object_r:modem_ml_data_file:s0
 /data/vendor/modem_stat(/.*)?                                               u:object_r:modem_stat_data_file:s0
 /data/vendor/rild(/.*)?                                                     u:object_r:rild_vendor_data_file:s0
-/data/vendor/copied(/.*)?                                                     u:object_r:modem_efs_image_file:s0
 
 # vendor extra images
 /mnt/vendor/efs(/.*)?                                                       u:object_r:modem_efs_file:s0

sepolicy/radio/grilservice_app.te

@@ -17,5 +17,3 @@ binder_call(grilservice_app, hal_wifi_ext)
 binder_call(grilservice_app, hal_audiometricext_default)
 binder_call(grilservice_app, rild)
 hal_client_domain(grilservice_app, hal_power_stats)
-set_prop(grilservice_app, vendor_logger_prop)
-set_prop(grilservice_app, vendor_modem_prop)

sepolicy/radio/hal_radioext_default.te

@@ -4,7 +4,6 @@ init_daemon_domain(hal_radioext_default)
 
 hwbinder_use(hal_radioext_default)
 get_prop(hal_radioext_default, hwservicemanager_prop)
-set_prop(hal_radioext_default, vendor_gril_prop)
 add_hwservice(hal_radioext_default, hal_radioext_hwservice)
 
 binder_call(hal_radioext_default, servicemanager)

sepolicy/radio/modem_diagnostic_app.te

@@ -7,8 +7,6 @@ allow modem_diagnostic_app app_api_service:service_manager find;
 allow modem_diagnostic_app radio_service:service_manager find;
 
 userdebug_or_eng(`
-  allow modem_diagnostic_app sysfs_modem_state:file r_file_perms;
-
   hal_client_domain(modem_diagnostic_app, hal_power_stats);
 
   allow modem_diagnostic_app hal_exynos_rild_hwservice:hwservice_manager find;

sepolicy/radio/modem_svc_sit.te

@@ -1,4 +1,3 @@
-# Selinux rule for modem_svc_sit daemon
 type modem_svc_sit, domain;
 type modem_svc_sit_exec, vendor_file_type, exec_type, file_type;
 init_daemon_domain(modem_svc_sit)
@@ -21,7 +20,7 @@ allow modem_svc_sit modem_stat_data_file:file create_file_perms;
 allow modem_svc_sit vendor_fw_file:dir search;
 allow modem_svc_sit vendor_fw_file:file r_file_perms;
 
-allow modem_svc_sit mnt_vendor_file:dir r_dir_perms;
+allow modem_svc_sit mnt_vendor_file:dir search;
 allow modem_svc_sit modem_userdata_file:dir create_dir_perms;
 allow modem_svc_sit modem_userdata_file:file create_file_perms;
 
@@ -37,17 +36,3 @@ get_prop(modem_svc_sit, hwservicemanager_prop)
 
 # logging property
 get_prop(modem_svc_sit, vendor_logger_prop)
-
-# Write trace data to the Perfetto traced daemon. This requires connecting to
-# its producer socket and obtaining a (per-process) tmpfs fd.
-perfetto_producer(modem_svc_sit)
-
-# Allow modem_svc_sit to access modem image file/dir
-allow modem_svc_sit modem_img_file:dir r_dir_perms;
-allow modem_svc_sit modem_img_file:file r_file_perms;
-allow modem_svc_sit modem_img_file:lnk_file r_file_perms;
-
-# Allow modem_svc_sit to access socket for UMI
-userdebug_or_eng(`
-  allow modem_svc_sit radio_vendor_data_file:sock_file { create unlink };
-')

sepolicy/radio/property.te

@@ -6,7 +6,6 @@ vendor_internal_prop(vendor_persist_config_default_prop)
 vendor_internal_prop(vendor_diag_prop)
 vendor_internal_prop(vendor_modem_prop)
 vendor_internal_prop(vendor_rild_prop)
-vendor_internal_prop(vendor_gril_prop)
 vendor_internal_prop(vendor_ssrdump_prop)
 vendor_internal_prop(vendor_wifi_version)
 vendor_internal_prop(vendor_imssvc_prop)

sepolicy/radio/property_contexts

@@ -38,9 +38,6 @@ vendor.sys.rild_reset                      u:object_r:vendor_rild_prop:s0
 persist.vendor.radio.                      u:object_r:vendor_rild_prop:s0
 ro.vendor.config.build_carrier             u:object_r:vendor_carrier_prop:s0
 
-# for GRIL
-vendor.gril.                               u:object_r:vendor_gril_prop:s0
-
 # SSR Detector
 vendor.debug.ssrdump.                      u:object_r:vendor_ssrdump_prop:s0
 persist.vendor.sys.ssr.                    u:object_r:vendor_ssrdump_prop:s0

sepolicy/radio/rfsd.te

@@ -29,7 +29,6 @@ allow rfsd radio_device:chr_file rw_file_perms;
 # Allow to set rild and modem property
 set_prop(rfsd, vendor_modem_prop)
 set_prop(rfsd, vendor_rild_prop)
-set_prop(rfsd, vendor_cbd_prop)
 
 # Allow rfsd to access modem image file/dir
 allow rfsd modem_img_file:dir r_dir_perms;

sepolicy/radio/seapp_contexts

@@ -1,3 +1,6 @@
+# Sub System Ramdump
+user=system seinfo=platform name=com.google.SSRestartDetector domain=ssr_detector_app type=system_app_data_file levelFrom=user
+
 # CBRS setup app
 user=_app seinfo=platform name=com.google.googlecbrs domain=cbrs_setup_app type=app_data_file levelFrom=user
 

sepolicy/radio/ssr_detector.te

@@ -0,0 +1,24 @@
+type ssr_detector_app, domain;
+
+app_domain(ssr_detector_app)
+allow ssr_detector_app app_api_service:service_manager find;
+allow ssr_detector_app radio_service:service_manager find;
+
+allow ssr_detector_app system_app_data_file:dir create_dir_perms;
+allow ssr_detector_app system_app_data_file:file create_file_perms;
+
+allow ssr_detector_app sscoredump_vendor_data_crashinfo_file:dir r_dir_perms;
+allow ssr_detector_app sscoredump_vendor_data_crashinfo_file:file r_file_perms;
+userdebug_or_eng(`
+  allow ssr_detector_app sscoredump_vendor_data_coredump_file:dir r_dir_perms;
+  allow ssr_detector_app sscoredump_vendor_data_coredump_file:file r_file_perms;
+  get_prop(ssr_detector_app, vendor_aoc_prop)
+  allow ssr_detector_app sysfs_sjtag:dir r_dir_perms;
+  allow ssr_detector_app sysfs_sjtag:file rw_file_perms;
+  allow ssr_detector_app proc_vendor_sched:dir search;
+  allow ssr_detector_app proc_vendor_sched:file rw_file_perms;
+  allow ssr_detector_app cgroup:file write;
+')
+
+get_prop(ssr_detector_app, vendor_ssrdump_prop)
+get_prop(ssr_detector_app, vendor_wifi_version)

sepolicy/radio/vendor_init.te

@@ -1,5 +1,4 @@
 set_prop(vendor_init, vendor_cbd_prop)
-get_prop(vendor_init, telephony_modem_prop)
 set_prop(vendor_init, vendor_carrier_prop)
 set_prop(vendor_init, vendor_modem_prop)
 set_prop(vendor_init, vendor_rild_prop)

sepolicy/system_ext/private/pixelntnservice_app.te

@@ -1,5 +0,0 @@
-typeattribute pixelntnservice_app coredomain;
-
-app_domain(pixelntnservice_app);
-allow pixelntnservice_app app_api_service:service_manager find;
-set_prop(pixelntnservice_app, telephony_modem_prop)

sepolicy/system_ext/private/property_contexts

@@ -1,6 +1,2 @@
 # Telephony
-telephony.TnNtn.image_switch u:object_r:telephony_modem_prop:s0    exact enum ntn tn
 telephony.ril.silent_reset    u:object_r:telephony_ril_prop:s0    exact    bool
-
-# HDCP setting of the display connected via USB port
-persist.sys.hdcp_checking     u:object_r:usb_control_prop:s0 exact string

sepolicy/system_ext/private/seapp_contexts

@@ -1,5 +1,2 @@
 # PixelDisplayService
 user=_app seinfo=platform name=com.android.pixeldisplayservice domain=pixeldisplayservice_app type=app_data_file levelFrom=all
-
-# PixelNtnService
-user=system seinfo=platform name=com.google.android.satellite domain=pixelntnservice_app type=app_data_file levelFrom=all

sepolicy/system_ext/private/systemui_app.te

@@ -1,4 +1,3 @@
-# SEPolicy for System UI
 typeattribute systemui_app coredomain;
 app_domain(systemui_app)
 
@@ -20,11 +19,9 @@ allow systemui_app statsmanager_service:service_manager find;
 get_prop(systemui_app, keyguard_config_prop)
 set_prop(systemui_app, bootanim_system_prop)
 get_prop(systemui_app, qemu_hw_prop)
-get_prop(systemui_app, radio_cdma_ecm_prop)
 
 # Allow writing and removing wmshell protolog in /data/misc/wmtrace.
 userdebug_or_eng(`
   allow systemui_app wm_trace_data_file:dir rw_dir_perms;
   allow systemui_app wm_trace_data_file:file create_file_perms;
 ')
-set_prop(systemui_app, debug_tracing_desktop_mode_visible_tasks_prop)

sepolicy/system_ext/public/pixelntnservice_app.te

@@ -1 +0,0 @@
-type pixelntnservice_app, domain;

sepolicy/system_ext/public/property.te

@@ -1,7 +1,6 @@
 # Telephony
 system_public_prop(telephony_ril_prop)
-system_restricted_prop(telephony_modem_prop)
 
 userdebug_or_eng(`
   set_prop(shell, telephony_ril_prop)
-')
+')

sepolicy/tracking_denials/bluetooth.te

@@ -1,2 +0,0 @@
-# b/382362125
-dontaudit bluetooth default_android_service:service_manager { find };

sepolicy/tracking_denials/bug_map

@@ -1,42 +1,18 @@
-aconfigd apex_info_file file b/381326735
-bluetooth audio_config_prop file b/379245855
-dump_modem sscoredump_vendor_data_coredump_file dir b/361725982
-dump_modem sscoredump_vendor_data_logcat_file dir b/361725982
 dumpstate app_zygote process b/288049050
-edgetpu_vendor_server shell_data_file dir b/369475225
-edgetpu_vendor_server shell_data_file dir b/369475363
-hal_bluetooth_btlinux vendor_default_prop property_service b/350832030
-hal_camera_default aconfig_storage_metadata_file dir b/383013471
 hal_radioext_default radio_vendor_data_file file b/312590044
+hal_vibrator_default default_android_service service_manager b/314054292
 incidentd debugfs_wakeup_sources file b/288049561
 incidentd incidentd anon_inode b/288049561
-init init capability b/379207041
 insmod-sh insmod-sh key b/274374722
 kernel dm_device blk_file b/319403445
-modem_svc_sit hal_radioext_default process b/364446415
-modem_svc_sit modem_ml_svc_sit file b/360060606
-modem_svc_sit modem_ml_svc_sit file b/360060992
 mtectrl unlabeled dir b/264483752
-pixelstats_vendor block_device dir b/369540673
-pixelstats_vendor block_device dir b/369540836
-platform_app radio_vendor_data_file dir b/380756119
-platform_app vendor_fw_file dir b/372121912
-platform_app vendor_rild_prop file b/372121912
-priv_app audio_config_prop file b/379246064
-radio audio_config_prop file b/379245771
-ramdump ramdump capability b/369475700
-shell sysfs_net file b/330081782
-ssr_detector_app default_prop file b/340722729
+pixelstats_vendor sysfs file b/299553682
+rfsd vendor_cbd_prop file b/323086582
 system_server sysfs_batteryinfo file b/294967729
-system_server vendor_default_prop file b/366116488
 system_suspend sysfs_batteryinfo dir b/317316633
-system_suspend sysfs_touch_gti dir b/350832258
-untrusted_app audio_config_prop file b/379245754
 vendor_init default_prop file b/315104235
 vendor_init default_prop file b/315104803
 vendor_init default_prop file b/323087197
 vendor_init default_prop file b/323087490
 vendor_init default_prop property_service b/315104235
-vendor_init default_prop property_service b/359428180
 vendor_init vendor_volte_mif_off property_service b/316816642
-zygote zygote capability b/379207101

sepolicy/vendor/certs/com_google_android_apps_camera_services.x509.pem

@@ -1,28 +1,30 @@
------BEGIN CERTIFICATE-----
-MIIFyTCCA7GgAwIBAgIVAOIyhgQLgi+rUO4eSQQXtNRbmCkxMA0GCSqGSIb3DQEBCwUAMHQxCzAJB
-gNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEg
-YDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAgFw0
-yMTA2MzAyMzI2MTJaGA8yMDUxMDYzMDIzMjYxMlowdDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
-bGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC0dvb2dsZSBJbmMuMRAwD
-gYDVQQLEwdBbmRyb2lkMRAwDgYDVQQDEwdBbmRyb2lkMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMI
-ICCgKCAgEAyd6adlL+Lz1Cik4amNBKJ9tRXchwrvn3xN5Cap8hpVkM0LsY/jqPEEKamZnR4rb22tl
-G6r6nINAvsG/Umre1daWiR+nfYNPu3yAvT+88KfqR4nq2RHEuap/EceB4CzgrWFtSYewNFiiT5yNT
-+GKCXq6MSu2MVS7tL8l9130rL5Y7MSCYdbd99JvfcqHz8h0yaTvCq0Kk1Vc/vjpxmAVxc8WWFH6x0
-3ibLK95rAy3Gbvxg+xevUhRFZYH/pOLY0U6V4D++ChV8dcbxeYCscW7wY5HSHel79XsZXVkiTtfmd
-H/KXsc6XGVC9x61/TvXC+VwzwXcQgfAtDDsy+LI/O11fv/vw01LY/JpxocvV5IjyMcQiG3ExGx2FS
-nkIvYyzS8thBuQtOkpTk19zmmjG6HtUdol449I4X4P7SFAhdvah+WQ6Bt5BEyAt+0gqTl+P8GqeUF
-Gv3Zgm73ic4Y3G41FbKDPlXU4+bH+j442GuvJfPIV++N9FnxhEb9Dg+6ZHab1RlBPzY1ElubgGef7
-xOIygfBmThnsoeWzldT8ov/+RRPu4dM5xm3qzZl7kbgnE7zCsTbklhIdU1Cux/aujcDfawqENbQSI
-BctnUoQCPIUmsHYy3It/tYemCk5bJA/ljQLl683IeoatydHeYBE2SAkeVzP2ZjQPTJJPO6SP7lzlM
-CAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUWGDcf/UfEzceEZquM9YwNiimSqIwHwYD
-VR0jBBgwFoAUWGDcf/UfEzceEZquM9YwNiimSqIwDQYJKoZIhvcNAQELBQADggIBAIe/ANIkuEZnL
-vYTP2+wlKSQvSZAMKStNZRhxmrjFrpeWTL1biX4We8soepNNRLUx3UunPnSvr6dDHksmk3l9b65EI
-CmpDJs5YiPAf2aLLcWA2XAZ6P2QDHM+xAwMF8OWlLLSPASwrJSxUsnKfQfTO/Aq9kgHP4nNQ5p5G3
-I6svZ+YSauh1+giGql+hkN27KAZfnIwjQJ8MQo8R7aHkIpIwCYB7GL0JyLf6uvNdJeKzW6/mNEEYD
-XwPu4zTVILMLfWjRkPl1XEHbAM3a3ROb24faez45wJDqGg6N4BAwXeYH3eBoVRNrAfWhg+291fZQw
-fDus1lHbs5rDSxeCCfdyHSSVhcRWL8evE9S4Rtu9YRrxHoZ5gPAJB3xD9dJXKj/cXwZFIl7wiFxuT
-NbESSzIfq7TVZ+iCjZbJbrfy5Dt9Q/PnxU2DLxgUt+wja0C4+GyOMvVBnGMxaklVPYi5O+1rsvfok
-uK1rFFSuDF9qbPyfKtHvoXM5hX6poPV2hCTIwaPn33z2huNAk56MtAb5U04FALE+HWnsIKXbRq4ys
-nH66x9lfj+uIWCkBm+wc//CkERC1ttwi78aQVtEv2w3tvMV9t+ZtxMW6oRJry9Hbs1WFI4J9sU8qQ
-3iiSqjdfgp35+eAGFWuYB2lPuSGLH9UinvgkDyqsFXhUcfjj3TJRR18
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGCzCCA/OgAwIBAgIVAIHtywgrR7O/EgQ+PeYSfHDaUDt8MA0GCSqGSIb3DQEBCwUAMIGUMQsw
+CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEU
+MBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxMDAuBgNVBAMMJ2NvbV9nb29n
+bGVfYW5kcm9pZF9hcHBzX2NhbWVyYV9zZXJ2aWNlczAgFw0yMTA2MzAyMzI2MThaGA8yMDUxMDYz
+MDIzMjYxOFowgZQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1N
+b3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEwMC4G
+A1UEAwwnY29tX2dvb2dsZV9hbmRyb2lkX2FwcHNfY2FtZXJhX3NlcnZpY2VzMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAof2MqYxoQkV05oUZULYlNLDIJKryWjC8ha300YUktBNNVBSP
+1y33+ZTBldm7drcBGo54S1JE1lCIP1dMxby0rNTJ8/Zv2bMVMjXX0haF5vULt64itDcR0SqUDfFR
+UsHapPVmRmMpDOMOUYUbN7gjU7iYAc9oWBo6BFfckdpwwKfzYY/sgieen1E/MN7Zpzmefct3WDU5
+4Dc8mpoNsen3oqquieYAgv9FOw5gCIgsDaOfYFBgvAE08Pqo3J/zU6dAuqUJztNH8EhgTNbcaNVL
+jCmofa+iIAjSpmP69jcgaUyfmH0EE3/m55qouVRJzqARvmEO/M7LEr3n1ZKKhDZdO6TJysMzP9g8
+pONPO8/3hTQ+GP+7fOQooNQJEGNgJuZOHSyNL/8nGCgHBZKgZdZPKk8HV2M578UDf8yNyV5AYpx0
+VK1JdoBtNMzp0cv7Q6TTugIuDEzT3jmgGGp6WmXE6B9dJOq+cnVC7cSYva8wctFS3RpoqT79vkW3
+A7g2b26bM5GMQ8KcGC4qm4pJkrX5kKZWZGWXjm0F8gRJQ5D0S/AcUw3B+sG/AmfQzLm8SCK36HhO
+sFnPsQJ/VdL7kg9HHWrQYVexNaQnD/QLOCenk09COUzSwexws+kQhUH45OSbQFjOJwPbS4YAn9qV
+eV+DPlvemZEFYF5+MVlDwOGQ3JsCAwEAAaNQME4wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUtjMO
+nlaC4nsk4PwT+fcIYpg52JQwHwYDVR0jBBgwFoAUtjMOnlaC4nsk4PwT+fcIYpg52JQwDQYJKoZI
+hvcNAQELBQADggIBABhYDqPD2yWiXNCVtHk6h7Kb2H2U3rc8G7Or1/mwrXSCEgqHnCkpiWeb1h/5
+YNS9fRrexQD+O0hukCpjvIFccQvk8EkZdWpn4kDlrUqfakWpASzlwEqRviS31Hiybn/+QUpYuDTm
+FYorrHzDzPiNttzxVK0ENt4T4ETDWVqiGB7tbTlLPr6tz/oxDjRH8y4iS/For7SkfdI512txJgDr
+njvRVY9WJykySs+AAqwS1PIMXGoI03UmLJUsFNUjHehaqguPS1uiewlKiQq07blWbnQXdcyH7QTI
+hOUPY2rRBh8ciXu4L0Uk4To7+DP/8nHSGC7qXPvP6W3gqW1hj0d6GviMEfJ9fBSUEzaCRF3aL/5e
+JOGQQKxh7Jsl/zZs4+MYg0Q2cyg/BQVNNOhESG4et4OV5go9W+1oAy20FV0NgtdPoeb9ABNoi4T3
+IrKLgxOsbACpoDt3zPhncqiJhX3feFtyVV4oRiylydiiYO927qNdfMGmcnGFSG4814kUxSdpkoCA
+V7WCQD42zfBYj4pkdZwiJW4yZSaPWN/Eodi3PBsV+10Y1O1WOvebJuTGmcvWWMCPGtFQJDijUy4H
+r8rDe3ZmRGQ+vEGPJZC8nx9+qxLQ314ZCzdS0R1HwRRuOji3fCSCnaPQuCFe3YlzhB2j6fRGNf7F
+DB17LhMLl0GxX9j1
+-----END CERTIFICATE-----

sepolicy/vendor/debug_camera_app.te

@@ -1,4 +1,3 @@
-# File containing sepolicies for GCA-Eng & GCA-Next.
 userdebug_or_eng(`
 	# Allows GCA-Eng & GCA-Next access the GXP device and properties.
 	allow debug_camera_app gxp_device:chr_file rw_file_perms;
@@ -10,7 +9,4 @@ userdebug_or_eng(`
 
 	# Allows  GCA_Eng & GCA-Next to access the hw_jpeg /dev/video12.
 	allow debug_camera_app hw_jpg_device:chr_file rw_file_perms;
-
-	# Allow tachyon_service to communicate with GCA-Eng via binder.
-	binder_call(edgetpu_tachyon_server, debug_camera_app);
 ')

sepolicy/vendor/device.te

@@ -1,7 +1,8 @@
-# Block Devices
+type persist_block_device, dev_type;
 type tee_persist_block_device, dev_type;
 type custom_ab_block_device, dev_type;
 type mfg_data_block_device, dev_type;
+type ufs_internal_block_device, dev_type;
 type logbuffer_device, dev_type;
 type hw_jpg_device, dev_type, mlstrustedobject;
 type fingerprint_device, dev_type;
@@ -16,4 +17,3 @@ type gcma_camera_heap_device, dmabuf_heap_device_type, dev_type;
 
 # SecureElement SPI device
 type st54spi_device, dev_type;
-

sepolicy/vendor/file_contexts

@@ -15,6 +15,7 @@
 /vendor/bin/dump/dump_wlan\.sh                                              u:object_r:dump_wlan_exec:s0
 /vendor/bin/dump/dump_gsa\.sh                                               u:object_r:dump_gsa_exec:s0
 /vendor/bin/dump/dump_power                                                 u:object_r:dump_power_exec:s0
+/vendor/bin/rlsservice                                                      u:object_r:rlsservice_exec:s0
 /vendor/bin/tcpdump_logger                                                  u:object_r:tcpdump_logger_exec:s0
 /vendor/bin/storageproxyd                                                   u:object_r:tee_exec:s0
 /vendor/bin/trusty_apploader                                                u:object_r:trusty_apploader_exec:s0
@@ -24,8 +25,11 @@
 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty         u:object_r:hal_keymint_default_exec:s0
 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.rust\.trusty         u:object_r:hal_keymint_default_exec:s0
 /vendor/bin/hw/android\.hardware\.security\.secretkeeper\.trusty            u:object_r:hal_secretkeeper_default_exec:s0
+/vendor/bin/ufs_firmware_update\.sh                                         u:object_r:ufs_firmware_update_exec:s0
 /vendor/bin/hw/android\.hardware\.memtrack-service\.pixel                   u:object_r:hal_memtrack_default_exec:s0
 /vendor/bin/hw/disable_contaminant_detection\.sh                            u:object_r:disable-contaminant-detection-sh_exec:s0
+/vendor/bin/hw/qorvo\.uci-daemon                                            u:object_r:qorvo-uci-daemon_exec:s0
+/vendor/bin/hw/qorvo\.uci-bridge                                            u:object_r:qorvo-uci-daemon_exec:s0
 
 # Vendor Firmwares
 /vendor/firmware(/.*)?                                                      u:object_r:vendor_fw_file:s0
@@ -43,7 +47,6 @@
 /data/vendor/bluetooth(/.*)?                                                u:object_r:vendor_bt_data_file:s0
 /data/vendor/uwb(/.*)?                                                      u:object_r:uwb_data_vendor:s0
 /data/vendor/chre(/.*)?                                                     u:object_r:chre_data_file:s0
-/data/vendor/fingerprint(/.*)?                                              u:object_r:fingerprint_vendor_data_file:s0
 
 # persist
 /mnt/vendor/persist/camera(/.*)?                                            u:object_r:persist_camera_file:s0

sepolicy/vendor/genfs_contexts

@@ -77,7 +77,6 @@ genfscon sysfs /devices/platform/19470000.drmdecon/counters
 genfscon sysfs /devices/platform/19471000.drmdecon/counters                                               u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19472000.drmdecon/counters                                               u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/backlight                            u:object_r:sysfs_leds:s0
-genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/power_state                          u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/panel_extinfo                        u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/panel_name                           u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/serial_number                        u:object_r:sysfs_display:s0
@@ -85,7 +84,6 @@ genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/refresh_rat
 genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/panel_model                          u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/panel_pwr_vreg                       u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/refresh_ctrl                         u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/power_mode                           u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19470000.drmdecon/dqe0/atc                                               u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19470000.drmdecon/hibernation                                            u:object_r:sysfs_display:s0
 genfscon sysfs /module/drm/parameters/vblankoffdelay                                                      u:object_r:sysfs_display:s0
@@ -97,22 +95,9 @@ genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport/dp_hotplug_error
 genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/link_negotiation_failures           u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/edid_read_failures                  u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/dpcd_read_failures                  u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/fec_dsc_not_supported               u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/fec_dsc_supported                   u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/edid_invalid_failures               u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/sink_count_invalid_failures         u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/link_unstable_failures              u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/max_res_other                       u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/max_res_1366_768                    u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/max_res_1440_900                    u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/max_res_1600_900                    u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/max_res_1920_1080                   u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/max_res_2560_1080                   u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/max_res_2560_1440                   u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/max_res_3440_1440                   u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/max_res_3840_2160                   u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/max_res_5120_2880                   u:object_r:sysfs_display:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/drm-displayport-stats/max_res_7680_4320                   u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/hdcp/hdcp2_success_count                                                 u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/hdcp/hdcp2_fallback_count                                                u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/hdcp/hdcp2_fail_count                                                    u:object_r:sysfs_display:s0
@@ -246,7 +231,7 @@ genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-9/9-003c/wakeup/wakeup
 genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-9/9-003b/power_supply/wireless/wakeup                                 u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-9/9-003b/wakeup/wakeup                                                u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/power_supply/tcpm-source-psy-11-0025/wakeup                u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/power_supply/tcpm-source-psy-i2c-max77759tcpc/wakeup       u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/power_supply/tcpm-source-psy-max77759tcpc/wakeup           u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/power_supply/usb/wakeup                                    u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/wakeup/wakeup                                              u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0036/power_supply/maxfg/wakeup                                  u:object_r:sysfs_wakeup:s0
@@ -258,11 +243,11 @@ genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0069/power_supply/main
 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0069/wakeup/wakeup                                              u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/wakeup                                                        u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.4.auto/wakeup                                 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.4.auto/usb1                                   u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.4.auto/usb2                                   u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.4.auto/usb1/wakeup                            u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.4.auto/usb2/wakeup                            u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.5.auto/wakeup                                 u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.5.auto/usb1                                   u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.5.auto/usb2                                   u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.5.auto/usb1/wakeup                            u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.5.auto/usb2/wakeup                            u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/13120000.pcie/pci0001:00/0001:00:00.0/0001:01:00.0/wakeup/wakeup                         u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/17000000.aoc/com.google.usf.non_wake_up/wakeup/wakeup                                    u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/17000000.aoc/com.google.usf/wakeup/wakeup                                                u:object_r:sysfs_wakeup:s0
@@ -289,7 +274,6 @@ genfscon sysfs /devices/virtual/wakeup/wakeup
 genfscon sysfs /devices/platform/odm/odm:btbcm/wakeup                                                                     u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/19440000.drmdsim/19440000.drmdsim.0/wakeup/                                              u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/19450000.drmdsim/19450000.drmdsim.0/wakeup/                                              u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/110f0000.drmdp/wakeup                                                                    u:object_r:sysfs_wakeup:s0
 
 # Trusty
 genfscon sysfs /module/trusty_virtio/parameters/use_high_wq               u:object_r:sysfs_trusty:s0
@@ -342,12 +326,3 @@ genfscon sysfs /devices/platform/155d0000.serial/uart_dbg                    u:o
 
 # OTA
 genfscon sysfs /devices/platform/13200000.ufs/pixel/boot_lun_enabled           u:object_r:sysfs_ota:s0
-
-# CPU
-genfscon sysfs /kernel/metrics/cpuidle_histogram/cpuidle_histogram        u:object_r:sysfs_cpu:s0
-genfscon sysfs /kernel/metrics/cpuidle_histogram/cpucluster_histogram     u:object_r:sysfs_cpu:s0
-
-# USB
-starting_at_board_api(202504, `
-genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/udc/11210000.dwc3/state   u:object_r:sysfs_udc:s0
-')

sepolicy/vendor/google_camera_app.te

@@ -8,6 +8,3 @@ allow google_camera_app edgetpu_device:chr_file { getattr read write ioctl map }
 
 # Allows GCA to access the hw_jpeg /dev/video12.
 allow google_camera_app hw_jpg_device:chr_file rw_file_perms;
-
-# Allow tachyon service to communicate with google_camera_app via binder.
-binder_call(edgetpu_tachyon_server, google_camera_app);

sepolicy/vendor/hal_bluetooth_btlinux.te

@@ -10,6 +10,3 @@ allow hal_bluetooth_btlinux sysfs_bt_uart:file rw_file_perms;
 
 # allow the HAL to call cccdktimesync registered callbacks
 binder_call(hal_bluetooth_btlinux, vendor_cccdktimesync_app)
-
-# Allow access for AoC properties.
-get_prop(hal_bluetooth_btlinux, vendor_aoc_prop)

sepolicy/vendor/hal_camera_default.te

@@ -43,6 +43,10 @@ userdebug_or_eng(`
   set_prop(hal_camera_default, vendor_camera_debug_prop);
 ')
 
+# For camera hal to talk with rlsservice
+allow hal_camera_default rls_service:service_manager find;
+binder_call(hal_camera_default, rlsservice)
+
 hal_client_domain(hal_camera_default, hal_graphics_allocator);
 hal_client_domain(hal_camera_default, hal_graphics_composer)
 hal_client_domain(hal_camera_default, hal_power);
@@ -64,10 +68,9 @@ allow hal_camera_default apex_info_file:file r_file_perms;
 # Allow camera HAL to query current device clock frequencies.
 allow hal_camera_default sysfs_devfreq_cur:file r_file_perms;
 
-# Allow camera HAL to read display info, including backlight
+# Allow camera HAL to read backlight of display
 allow hal_camera_default sysfs_leds:dir r_dir_perms;
 allow hal_camera_default sysfs_leds:file r_file_perms;
-allow hal_camera_default sysfs_display:file r_file_perms;
 
 # Allow camera HAL to query preferred camera frequencies from the radio HAL
 # extensions to avoid interference with cellular antennas.
@@ -77,6 +80,10 @@ binder_call(hal_camera_default, hal_radioext_default);
 # Allows camera HAL to access the hw_jpeg /dev/video12.
 allow hal_camera_default hw_jpg_device:chr_file rw_file_perms;
 
+# For camera hal to talk with rlsservice
+allow hal_camera_default rls_service:service_manager find;
+binder_call(hal_camera_default, rlsservice)
+
 # Allow access to always-on compute device node
 allow hal_camera_default aoc_device:chr_file rw_file_perms;
 

sepolicy/vendor/hal_fingerprint_default.te

@@ -41,9 +41,3 @@ allow hal_fingerprint_default sysfs_leds:dir r_dir_perms;
 # Allow fingerprint to access sysfs_aoc_udfps
 allow hal_fingerprint_default sysfs_aoc:dir search;
 allow hal_fingerprint_default sysfs_aoc_udfps:file rw_file_perms;
-
-# Allow fingerprint to read nsp file
-allow hal_fingerprint_default modem_efs_image_file:dir search;
-allow hal_fingerprint_default persist_file:dir search;
-allow hal_fingerprint_default persist_ss_file:dir search;
-allow hal_fingerprint_default persist_ss_file:file r_file_perms;

sepolicy/vendor/hal_gnss_pixel.te

@@ -1,5 +0,0 @@
-type hal_gnss_pixel, domain;
-init_daemon_domain(hal_gnss_pixel)
-type hal_gnss_pixel_exec, exec_type, vendor_file_type, file_type;
-hal_server_domain(hal_gnss_pixel, hal_gnss)
-

sepolicy/vendor/hal_graphics_composer_default.te

@@ -42,11 +42,6 @@ allow hal_graphics_composer_default vendor_hwc_log_file:dir rw_dir_perms;
 allow hal_graphics_composer_default vendor_hwc_log_file:file create_file_perms;
 allow hal_graphics_composer_default vendor_log_file:dir search;
 
-# allow HWC to access powerstats
-allow hal_graphics_composer_default thermal_link_device:dir search;
-allow hal_graphics_composer_default sysfs_thermal:dir search;
-allow hal_graphics_composer_default sysfs_thermal:file r_file_perms;
-
 # allow HWC to access IStats AIDL
 allow hal_graphics_composer_default fwk_stats_service:service_manager find;
 binder_call(hal_graphics_composer_default, system_server);

sepolicy/vendor/hal_nfc_default.te

@@ -1,9 +1,5 @@
 # HAL NFC property
-set_prop(hal_nfc_default, vendor_nfc_prop)
-set_prop(hal_nfc_default, vendor_nfc_antenna_prop)
-userdebug_or_eng(
-  get_prop(untrusted_app, vendor_nfc_antenna_prop)
-)
+get_prop(hal_nfc_default, vendor_nfc_prop)
 
 # SecureElement property
 set_prop(hal_nfc_default, vendor_secure_element_prop)

sepolicy/vendor/hal_usb_impl.te

@@ -20,9 +20,6 @@ hal_client_domain(hal_usb_impl, hal_thermal);
 # For monitoring usb sysfs attributes
 allow hal_usb_impl sysfs_wakeup:dir search;
 allow hal_usb_impl sysfs_wakeup:file r_file_perms;
-starting_at_board_api(202504, `
-allow hal_usb_impl sysfs_udc:file r_file_perms;
-')
 
 # For metrics upload
 allow hal_usb_impl fwk_stats_service:service_manager find;

sepolicy/vendor/kernel.te

@@ -8,16 +8,19 @@ allow kernel per_boot_file:file r_file_perms;
 allow kernel self:capability2 perfmon;
 allow kernel self:perf_event cpu;
 
-userdebug_or_eng(`
+no_debugfs_restriction(`
   allow kernel vendor_battery_debugfs:dir search;
-  allow kernel vendor_regmap_debugfs:dir search;
-  allow kernel vendor_usb_debugfs:dir search;
-  allow kernel vendor_votable_debugfs:dir search;
-  allow kernel vendor_charger_debugfs:dir search;
-  allow kernel vendor_maxfg_debugfs:dir search;
 ')
 
+dontaudit kernel vendor_maxfg_debugfs:dir search;
 dontaudit kernel sepolicy_file:file getattr;
 dontaudit kernel system_bootstrap_lib_file:dir getattr;
 dontaudit kernel system_bootstrap_lib_file:file getattr;
 dontaudit kernel system_dlkm_file:dir getattr;
+dontaudit kernel vendor_battery_debugfs:dir search;
+dontaudit kernel vendor_charger_debugfs:dir search;
+dontaudit kernel vendor_votable_debugfs:dir search;
+dontaudit kernel vendor_usb_debugfs:dir search;
+
+allow kernel vendor_regmap_debugfs:dir search;
+

sepolicy/vendor/pixelstats_vendor.te

@@ -1,6 +1,5 @@
 # Battery history
 allow pixelstats_vendor battery_history_device:chr_file r_file_perms;
-allow pixelstats_vendor logbuffer_device:chr_file r_file_perms;
 
 # BCL
 allow pixelstats_vendor sysfs_bcl:dir search;