gs-common: Remove zuma HIDL audio configuration

Change-Id: I72c988fb23b7dece6cbc0b18b28a6b37fee4b896

16kb/16kb.mk

@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2025 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: Any rule defined here automatically gets inherited for
+# *BOTH* 4 KB and 16 KB targets where this file is included.
+#######################################################################
+
+PRODUCT_PACKAGES += copy_efs_files_to_data

16kb/Android.bp

@@ -0,0 +1,13 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+// 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,
+}

16kb/CopyEfsTest/Android.bp

@@ -0,0 +1,38 @@
+// Copyright (C) 2025 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_gs-common_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",
+}

16kb/CopyEfsTest/AndroidTest.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2025 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>

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

@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2025 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");
+    }
+}

16kb/copy_efs_files_to_data.sh

@@ -0,0 +1,39 @@
+#!/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

aoc/aoc.mk

@@ -7,16 +7,3 @@ PRODUCT_PACKAGES += dump_aoc \
 # If AoC Daemon is not present on this build, load firmware at boot via rc
 PRODUCT_COPY_FILES += \
 	device/google/gs-common/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
-
-ifneq ($(wildcard vendor/google/whitechapel/aoc/aocx/aidl/aocx/framework_compatibility_matrix.xml),)
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \
-    vendor/google/whitechapel/aoc/aocx/aidl/aocx/framework_compatibility_matrix.xml
-endif
-
-# AoC debug support
-PRODUCT_PACKAGES_ENG += \
-	aocdump \
-	aocutil \
-	aoc_audio_cfg \
-	vp_util \
-	aocx_tool

aoc/conf/init.aoc.nodaemon.rc

@@ -1,3 +0,0 @@
-# Load AoC firmware and boot
-on property:vendor.all.modules.ready=1
-    write /sys/devices/platform/19000000.aoc/firmware aoc.bin

audio/aidl.mk

@@ -31,11 +31,4 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_SYSTEM_EXT_PROPERTIES += \
        ro.audio.ihaladaptervendorextension_enabled=true
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-$(call soong_config_set,aoc_audio_func,dump_usecase_data,true)
-$(call soong_config_set,aoc_audio_func,hal_socket_control,true)
-$(call soong_config_set,aoc_audio_func,record_tuning_keys,true)
-$(call soong_config_set,aoc_audio_func,aidl_command_interface,true)
-endif
-
 $(call soong_config_set,pixel_audio_hal_type,aidl_build,true)

audio/aidl/device_framework_matrix_product.xml

@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework">
     <hal format="aidl">
         <name>vendor.google.whitechapel.audio.extension</name>
-        <version>4</version>
+        <version>4-5</version>
         <interface>
             <name>IAudioExtension</name>
             <instance>default</instance>

audio/common.mk

@@ -27,9 +27,4 @@ PRODUCT_COPY_FILES += \
 
 endif
 
-## TODO(b/271958194): separate for hidl and aidl.
-PRODUCT_SOONG_NAMESPACES += \
-	vendor/google/whitechapel/audio/hal \
-	vendor/google/whitechapel/audio/interfaces
-
 $(call soong_config_set,aoc_audio_board,platform,$(TARGET_BOARD_PLATFORM))

audio/hidl_zuma.mk

@@ -1,49 +0,0 @@
-DEVICE_MANIFEST_FILE += device/google/gs-common/audio/hidl/manifest.xml
-
-# Audio HAL Server & Default Implementations
-PRODUCT_PACKAGES += \
-	android.hardware.audio.service \
-	android.hardware.audio@7.1-impl \
-	android.hardware.audio.effect@7.0-impl \
-	android.hardware.soundtrigger@2.3-impl \
-	vendor.google.whitechapel.audio.audioext@4.0-impl \
-	android.hardware.bluetooth.audio-impl \
-
-#Audio HAL libraries
-PRODUCT_PACKAGES += \
-	audio.primary.$(TARGET_BOARD_PLATFORM) \
-	audio.platform.aoc \
-	audio_tunnel_aoc \
-	aoc_aud_ext \
-	libaoctuningdecoder \
-	liboffloadeffect \
-	audio_bt_aoc \
-	audio_waves_aoc \
-	audio_fortemedia_aoc \
-	audio_bluenote_aoc \
-	audio_usb_aoc \
-	audio_cca_aoc \
-	audio_compensation_aoc \
-	libamcsextfile \
-	audio_amcs_ext \
-	audio.usb.default \
-	audio.usbv2.default \
-	audio.bluetooth.default \
-	audio.r_submix.default \
-	audio_spk_35l41 \
-	audio_spk_tas25xx \
-	audio_hdmi_aoc \
-	sound_trigger.primary.$(TARGET_BOARD_PLATFORM)
-
-ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
-# IAudioMetricExt HIDL
-PRODUCT_PACKAGES += \
-	vendor.google.audiometricext@1.0-service-vendor
-endif
-
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hdmi_audio/drmdp
-
-include device/google/gs-common/audio/common.mk
-
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/audio/hidl/device_framework_matrix_product.xml

audio/sepolicy/aidl/hal_sensors_default.te

@@ -0,0 +1,3 @@
+# Allow access to audio HAL.
+binder_call(hal_sensors_default, hal_audio_default)
+allow hal_sensors_default hal_audio_ext_service:service_manager find;

battery_mitigation/bcl.mk

@@ -1,19 +1,11 @@
 ifeq (,$(filter factory_%,$(TARGET_PRODUCT)))
 PRODUCT_PACKAGES += battery_mitigation
 endif
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-ifeq (,$(filter factory_%,$(TARGET_PRODUCT)))
-PRODUCT_PACKAGES += BrownoutDetection
-endif
-endif
 
-ifeq ($(RELEASE_PIXEL_AIDL_BATTERY_MITIGATION_HAL), true)
 PRODUCT_PROPERTY_OVERRIDES += \
        vendor.battery_mitigation.aidl.enable=true
-endif
 
-PRODUCT_SOONG_NAMESPACES += device/google/gs-common/battery_mitigation \
-                            vendor/google/battery_mitigation
+PRODUCT_SOONG_NAMESPACES += device/google/gs-common/battery_mitigation
 PRODUCT_PACKAGES += vendor.google.battery_mitigation-default
 PRODUCT_PACKAGES += vendor.google.battery_mitigation.service_static
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/battery_mitigation/compatibility_matrix.xml

bcmbt/bluetooth.mk

@@ -1,10 +1,9 @@
-PRODUCT_SOONG_NAMESPACES += vendor/broadcom/bluetooth
 PRODUCT_PACKAGES += \
        android.hardware.bluetooth-V1-ndk.so \
        android.hardware.bluetooth.finder-V1-ndk.so \
        android.hardware.bluetooth.ranging-V1-ndk.so \
        android.hardware.bluetooth-service.bcmbtlinux \
-       vendor.google.bluetooth_ext-V1-ndk.so \
+       vendor.google.bluetooth_ext-V3-ndk.so \
        bt_vendor.conf \
        android.hardware.bluetooth.prebuilt.xml \
        android.hardware.bluetooth_le.prebuilt.xml

bcmbt/compatibility_matrix.xml

@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework">
     <hal format="aidl" optional="true">
         <name>vendor.google.bluetooth_ext</name>
-        <version>1</version>
+        <version>1-3</version>
         <interface>
             <name>IBluetoothFinder</name>
             <instance>default</instance>
@@ -26,5 +26,9 @@
             <name>IBluetoothEwp</name>
             <instance>default</instance>
         </interface>
+        <interface>
+            <name>IBluetoothCco</name>
+            <instance>default</instance>
+        </interface>
     </hal>
 </compatibility-matrix>

bcmbt/dump/Android.bp

@@ -1,20 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_binary {
-    name: "dump_bcmbt",
-    srcs: ["dump_bcmbt.cpp"],
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-    ],
-    shared_libs: [
-        "libbase",
-	"libdump",
-	"liblog",
-    ],
-    vendor: true,
-    relative_install_path: "dump",
-}

bcmbt/dump/dump_bcmbt.cpp

@@ -1,45 +0,0 @@
-/*
- * Copyright 2023 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.
- */
-#include <dump/pixel_dump.h>
-//#include <android-base/properties.h>
-#include <android-base/file.h>
-
-#define BCMBT_ACTIVITY_LOG_DIRECTORY "/data/vendor/bluetooth"
-#define BCMBT_SNOOP_LOG_DIRECTORY "/data/vendor/bluetooth"
-#define BCMBT_FW_LOG_DIRECTORY "/data/vendor/ssrdump/coredump"
-#define BCMBT_SNOOP_LOG_PREFIX "btsnoop_hci_vnd"
-#define BCMBT_BACKUP_SNOOP_LOG_PREFIX "backup_btsnoop_hci_vnd"
-#define BCMBT_FW_DUMP_LOG_PREFIX "coredump_bt_socdump_"
-#define BCMBT_CHRE_DUMP_LOG_PREFIX "coredump_bt_chredump_"
-#define BCMBT_HAL_DUMP_LOG_PREFIX "coredump_bt_"
-#define BCMBT_ACTIVITY_LOG_PREFIX "bt_activity_"
-
-int main() {
-    std::string outputDir = concatenatePath(BUGREPORT_PACKING_DIR, "bcmbt");
-    if (mkdir(outputDir.c_str(), 0777) == -1) {
-        printf("Unable to create folder: %s\n", outputDir.c_str());
-        return 0;
-    }
-
-    dumpLogs(BCMBT_SNOOP_LOG_DIRECTORY, outputDir.c_str(), 4,
-             BCMBT_SNOOP_LOG_PREFIX);
-    dumpLogs(BCMBT_SNOOP_LOG_DIRECTORY, outputDir.c_str(), 2, BCMBT_BACKUP_SNOOP_LOG_PREFIX);
-    dumpLogs(BCMBT_FW_LOG_DIRECTORY, outputDir.c_str(), 10, BCMBT_FW_DUMP_LOG_PREFIX);
-    dumpLogs(BCMBT_FW_LOG_DIRECTORY, outputDir.c_str(), 10, BCMBT_CHRE_DUMP_LOG_PREFIX);
-    dumpLogs(BCMBT_FW_LOG_DIRECTORY, outputDir.c_str(), 10, BCMBT_HAL_DUMP_LOG_PREFIX);
-    dumpLogs(BCMBT_ACTIVITY_LOG_DIRECTORY, outputDir.c_str(), 10, BCMBT_ACTIVITY_LOG_PREFIX);
-    return 0;
-}

bcmbt/dump/dumplog.mk

@@ -1,3 +1 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/bcmbt/dump/sepolicy/
-
-PRODUCT_PACKAGES_ENG += dump_bcmbt

bcmbt/manifest_bluetooth.xml

@@ -16,12 +16,13 @@
     </hal>
     <hal format="aidl">
         <name>vendor.google.bluetooth_ext</name>
-        <version>1</version>
+        <version>2</version>
         <fqname>IBTChannelAvoidance/default</fqname>
         <fqname>IBluetoothCcc/default</fqname>
         <fqname>IBluetoothEwp/default</fqname>
         <fqname>IBluetoothExt/default</fqname>
         <fqname>IBluetoothFinder/default</fqname>
         <fqname>IBluetoothSar/default</fqname>
+        <fqname>IBluetoothCco/default</fqname>
     </hal>
 </manifest>

bcmbt/sepolicy/service_contexts

@@ -5,3 +5,4 @@ vendor.google.bluetooth_ext.IBluetoothCcc/default                            u:o
 vendor.google.bluetooth_ext.IBluetoothEwp/default                            u:object_r:hal_bluetooth_coexistence_service:s0
 vendor.google.bluetooth_ext.IBluetoothExt/default                            u:object_r:hal_bluetooth_coexistence_service:s0
 vendor.google.bluetooth_ext.IBluetoothFinder/default                         u:object_r:hal_bluetooth_coexistence_service:s0
+vendor.google.bluetooth_ext.IBluetoothCco/default                            u:object_r:hal_bluetooth_coexistence_service:s0

betterbug/betterbug.mk

@@ -1,7 +1,6 @@
 # When neither AOSP nor factory targets
 ifeq (,$(filter aosp_% factory_% lineage_%, $(TARGET_PRODUCT)))
   PRODUCT_PACKAGES += BetterBugStub
-  PRODUCT_PACKAGES_DEBUG += $(RELEASE_PACKAGE_BETTER_BUG)
 endif
 
 PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/betterbug/sepolicy/product/public

bluetooth/bluetooth.mk

@@ -1,4 +1,3 @@
-PRODUCT_SOONG_NAMESPACES += vendor/google/connectivity/bluetooth/common
 PRODUCT_PACKAGES += \
        android.hardware.bluetooth-V1-ndk.so \
        android.hardware.bluetooth.finder-V1-ndk.so \

bluetooth/dump/Android.bp

@@ -1,20 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_binary {
-    name: "dump_bt",
-    srcs: ["dump.cpp"],
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-    ],
-    shared_libs: [
-        "libbase",
-        "libdump",
-        "liblog",
-    ],
-    vendor: true,
-    relative_install_path: "dump",
-}

bluetooth/dump/dump.cpp

@@ -1,44 +0,0 @@
-/*
- * Copyright 2023 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.
- */
-#include <dump/pixel_dump.h>
-#include <android-base/file.h>
-
-#define PIXELBT_ACTIVITY_LOG_DIRECTORY "/data/vendor/bluetooth"
-#define PIXELBT_SNOOP_LOG_DIRECTORY "/data/vendor/bluetooth"
-#define PIXELBT_FW_LOG_DIRECTORY "/data/vendor/ssrdump/coredump"
-#define PIXELBT_SNOOP_LOG_PREFIX "btsnoop_hci_vnd"
-#define PIXELBT_BACKUP_SNOOP_LOG_PREFIX "backup_btsnoop_hci_vnd"
-#define PIXELBT_FW_DUMP_LOG_PREFIX "coredump_bt_socdump_"
-#define PIXELBT_CHRE_DUMP_LOG_PREFIX "coredump_bt_chredump_"
-#define PIXELBT_HAL_DUMP_LOG_PREFIX "coredump_bt_"
-#define PIXELBT_ACTIVITY_LOG_PREFIX "bt_activity_"
-
-int main() {
-    std::string outputDir = concatenatePath(BUGREPORT_PACKING_DIR, "bt");
-    if (mkdir(outputDir.c_str(), 0777) == -1) {
-        printf("Unable to create folder: %s\n", outputDir.c_str());
-        return 0;
-    }
-
-    dumpLogs(PIXELBT_SNOOP_LOG_DIRECTORY, outputDir.c_str(), 4,
-             PIXELBT_SNOOP_LOG_PREFIX);
-    dumpLogs(PIXELBT_SNOOP_LOG_DIRECTORY, outputDir.c_str(), 2, PIXELBT_BACKUP_SNOOP_LOG_PREFIX);
-    dumpLogs(PIXELBT_FW_LOG_DIRECTORY, outputDir.c_str(), 10, PIXELBT_FW_DUMP_LOG_PREFIX);
-    dumpLogs(PIXELBT_FW_LOG_DIRECTORY, outputDir.c_str(), 10, PIXELBT_CHRE_DUMP_LOG_PREFIX);
-    dumpLogs(PIXELBT_FW_LOG_DIRECTORY, outputDir.c_str(), 10, PIXELBT_HAL_DUMP_LOG_PREFIX);
-    dumpLogs(PIXELBT_ACTIVITY_LOG_DIRECTORY, outputDir.c_str(), 10, PIXELBT_ACTIVITY_LOG_PREFIX);
-    return 0;
-}

bluetooth/dump/dumplog.mk

@@ -1,3 +1 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/bluetooth/dump/sepolicy/
-
-PRODUCT_PACKAGES_DEBUG += dump_bt

camera/Android.bp

@@ -2,23 +2,6 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-cc_binary {
-    name: "dump_camera",
-    srcs: ["dump_camera.cpp"],
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-    ],
-    shared_libs: [
-        "libbase",
-        "libdump",
-        "liblog",
-    ],
-    vendor: true,
-    relative_install_path: "dump",
-}
-
 prebuilt_etc {
     name: "lyric_preview_dis_xml",
     vendor: true,
@@ -58,3 +41,11 @@ prebuilt_etc {
     init_rc: ["libg3a_ghawb.rc"],
     src: "libg3a_ghawb.rc",
 }
+
+prebuilt_etc {
+    name: "vendor-apex-allowlist-lyric.xml",
+    src: "vendor-apex-allowlist-lyric.xml",
+    vendor: true,
+    sub_dir: "sysconfig",
+    filename_from_src: true,
+}

camera/dump.mk

@@ -1,6 +1,3 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/vendor
 PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/product/public
 PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/product/private
-
-PRODUCT_PACKAGES_ENG += dump_camera
-

camera/dump_camera.cpp

@@ -1,56 +0,0 @@
-/*
- * Copyright 2022 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.
- */
-#include <android-base/file.h>
-#include <android-base/properties.h>
-#include <dump/pixel_dump.h>
-
-namespace {
-
-constexpr std::string_view kCameraLogDir = "/data/vendor/camera/profiler";
-constexpr std::string_view kGraphStateDumpDir = "/data/vendor/camera";
-
-}  // namespace
-
-int main() {
-  if (!::android::base::GetBoolProperty(
-          "vendor.camera.debug.camera_performance_analyzer.attach_to_bugreport",
-          true)) {
-    return 0;
-  }
-
-  const std::string cameraDestDir =
-      concatenatePath(BUGREPORT_PACKING_DIR, "camera");
-
-  if (mkdir(cameraDestDir.c_str(), 0777) == -1) {
-    printf("Unable to create folder: %s\n", cameraDestDir.c_str());
-    return 0;
-  }
-
-  // Attach multiple latest sessions (in case the user is running concurrent
-  // sessions or starts a new session after the one with performance issues).
-  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 10, "session-ended-");
-  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 10, "multicam-");
-  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 5, "high-drop-rate-");
-  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 5, "watchdog-");
-  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 5, "camera-ended-");
-  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 5, "fatal-error-");
-  dumpLogs(kGraphStateDumpDir.data(), cameraDestDir.c_str(), 5,
-           "hal_graph_state_");
-  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 10,
-           "fd_state_tracker-");
-
-  return 0;
-}

camera/libg3a_gaf.rc

@@ -1,6 +1,6 @@
 # override default log levels.
 on boot
-    setprop log.tag.GAF E
+    setprop log.tag.GAF I
 
 # backward-compatible system props.
 on property:persist.vendor.camera.af.debug_level=0

camera/lyric.mk

@@ -8,49 +8,6 @@ $(call soong_config_set,google3a_config,ghawb_truetone,true)
 # Flag controls whether Lyric apex can be located in the dist-directory.
 $(call soong_config_set, lyric, dist_lyric_apex, $(RELEASE_PIXEL_DIST_LYRIC_APEX))
 
-# Select GCH backend.
-# TODO(b/192681010): This dependency inversion should be removed.
-ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
-$(call soong_config_set,gch,hwl_library,lyric)
-endif
-
-# Use build-time flag to select whether to build from source
-# or ingest prebuilt-apex.  We would want the development teams
-# using release configuration: (trunk-staging) to build from source.
-# All shipping releases will switch to prebuilts (trunk+)
-# if this condition is not true, then build from source.
-
-# Fallback if the prebuilts directory does not exist, then we must
-# build from source no matter what, so we log a warning
-ifeq ($(RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT),true)
-  ifeq ($(wildcard vendor/google/services/LyricCameraHAL/prebuilt),)
-    $(warning Lyric prebuilt directory is missing, it will be built from source)
-    BUILD_LYRIC_FROM_SOURCE := true
-  else
-    BUILD_LYRIC_FROM_SOURCE := false
-  endif
-else
-  BUILD_LYRIC_FROM_SOURCE := true
-endif  # RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT
-
-ifeq ($(BUILD_LYRIC_FROM_SOURCE),true)
-PRODUCT_SOONG_NAMESPACES += \
-    vendor/google/camera \
-    vendor/google/camera/google_3a/libs_v4 \
-    vendor/google/camera/rlsservice
-
-# TODO(b/257379485): 3A is incrementally enabling cuttlefish build for native
-# code coverage support, temporary require separate namespace for folders that
-# can be built successfully.
-PRODUCT_SOONG_NAMESPACES += \
-    vendor/google/camera/common/g3_shared \
-    vendor/google/camera/google_3a/libs_v4/g3ABase \
-    vendor/google/camera/google_3a/libs_v4/gABC/native_coverage \
-    vendor/google/camera/google_3a/libs_v4/gAF \
-    vendor/google/camera/google_3a/libs_v4/gafd \
-    vendor/google/camera/google_3a/libs_v4/gHAWB/native_coverage
-endif  # BUILD_LYRIC_FROM_SOURCE
-
 # Init-time log settings for Google 3A
 PRODUCT_PACKAGES += libg3a_standalone_gabc_rc
 PRODUCT_PACKAGES += libg3a_standalone_gaf_rc
@@ -58,6 +15,7 @@ PRODUCT_PACKAGES += libg3a_standalone_ghawb_rc
 
 # Vendor APEX which contains the camera HAL
 PRODUCT_PACKAGES += com.google.pixel.camera.hal
+PRODUCT_PACKAGES += venodr-apex-allowlist-lyric.xml
 PRODUCT_PACKAGES += init.camera.set-interrupts-ownership
 PRODUCT_PACKAGES += lyric_preview_dis_xml
 
@@ -69,7 +27,3 @@ DEVICE_MATRIX_FILE += \
 
 # sepolicy dir is added in dump.mk.
 # Make doesn't deduplicate sepolicy dirs, so including it here causes build errors.
-
-# Calibration tools for debug builds
-PRODUCT_PACKAGES_DEBUG += tarasque_test
-PRODUCT_PACKAGES_DEBUG += ProtoCalibGenerator

camera/vendor-apex-allowlist-lyric.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ This XML file declares the vendor apex package names eligible for installation.
+-->
+
+<config>
+<allowed-vendor-apex package="com.google.pixel.camera.hal" installerPackage="com.google.android.GoogleCamera" />
+</config>

check_current_prebuilt/check_current_prebuilt.mk

@@ -1,27 +1,32 @@
+PIXEL_PREBUILT_SYMLINK_PATH=$(OUT_DIR)/pixel
+$(shell rm -rf pixel_current_*)
+$(shell rm -rf $(PIXEL_PREBUILT_SYMLINK_PATH)/pixel_current_*)
+$(shell mkdir -p $(PIXEL_PREBUILT_SYMLINK_PATH))
+
 # Create symlink for bootloader
 $(shell rm -f "pixel_current_bootloader")
 ifdef BOOTLOADER_FILE_PATH
-$(shell ln -sf ${BOOTLOADER_FILE_PATH} "pixel_current_bootloader")
+$(shell ln -sf ../../${BOOTLOADER_FILE_PATH} $(PIXEL_PREBUILT_SYMLINK_PATH)/"pixel_current_bootloader")
 else ifdef BOOTLOADER_RADIO_FILE_PATH
-$(shell ln -sf ${BOOTLOADER_RADIO_FILE_PATH} "pixel_current_bootloader")
+$(shell ln -sf ../../${BOOTLOADER_RADIO_FILE_PATH} $(PIXEL_PREBUILT_SYMLINK_PATH)/"pixel_current_bootloader")
 endif
 
 # Create symlink for kernel
 $(shell rm -f "pixel_current_kernel")
 ifdef TARGET_KERNEL_DIR
-$(shell ln -sf ${TARGET_KERNEL_DIR} "pixel_current_kernel")
+$(shell ln -sf ../../${TARGET_KERNEL_DIR} $(PIXEL_PREBUILT_SYMLINK_PATH)/"pixel_current_kernel")
 endif
 
 # Create symlink for radio
 $(shell rm -f "pixel_current_radio")
 ifdef RADIO_FILE_PATH
-$(shell ln -sf ${RADIO_FILE_PATH} "pixel_current_radio")
+$(shell ln -sf ../../${RADIO_FILE_PATH} $(PIXEL_PREBUILT_SYMLINK_PATH)/"pixel_current_radio")
 else ifdef BOOTLOADER_RADIO_FILE_PATH
-$(shell ln -sf ${BOOTLOADER_RADIO_FILE_PATH} "pixel_current_radio")
+$(shell ln -sf ../../${BOOTLOADER_RADIO_FILE_PATH} $(PIXEL_PREBUILT_SYMLINK_PATH)/"pixel_current_radio")
 endif
 
 # Create symlink for radiocfg
 $(shell rm -f "pixel_current_radiocfg")
 ifdef SRC_MDM_CFG_DIR
-$(shell ln -sf ${SRC_MDM_CFG_DIR} "pixel_current_radiocfg")
+$(shell ln -sf ../../${SRC_MDM_CFG_DIR} $(PIXEL_PREBUILT_SYMLINK_PATH)/"pixel_current_radiocfg")
 endif

dauntless/gsc.mk

@@ -1,95 +1,2 @@
 # Dauntless
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/dauntless/sepolicy
-ifneq ($(wildcard vendor/google_nos),)
-PRODUCT_SOONG_NAMESPACES += vendor/google_nos/init/dauntless
-
-PRODUCT_PACKAGES += \
-    citadeld \
-    citadel_updater \
-    android.hardware.weaver-service.citadel \
-    android.hardware.authsecret-service.citadel \
-    android.hardware.oemlock-service.citadel \
-    init_citadel \
-    android.hardware.strongbox_keystore.xml \
-    android.hardware.security.keymint-service.citadel \
-    dump_gsc.sh
-
-# USERDEBUG ONLY: Install test packages
-PRODUCT_PACKAGES_ENG += citadel_integration_tests \
-                          pwntest \
-                          nugget_targeted_tests \
-                          CitadelProvision \
-                          nugget_aidl_test_weaver
-
-# Assign default value for RELEASE_GOOGLE_DAUNTLESS_DIR if no trunk flags support
-RELEASE_GOOGLE_DAUNTLESS_DIR ?= vendor/google_nos/prebuilts/dauntless
-
-# The production Dauntless firmware will be of flavors evt and d3m2.
-# There are also several flavors of pre-release chips. Each flavor
-# (production and pre-release) requires the firmware to be signed differently.
-DAUNTLESS_FIRMWARE_SIZE := 1048576
-
-# The nearly-production Dauntless chips are "proto1.1"
-ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin))
-$(error GSC firmware size check fail)
-endif
-PRODUCT_COPY_FILES += \
-    $(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/proto11.ec.bin
-$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin)
-else
-$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR))
-endif
-
-# The production Dauntless chips are "evt"
-ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin))
-$(error GSC firmware size check fail)
-endif
-PRODUCT_COPY_FILES += \
-    $(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/evt.ec.bin
-$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin)
-else
-$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR))
-endif
-
-# New 2023 production Dauntless chips are "d3m2"
-ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin))
-$(error GSC firmware size check fail)
-endif
-PRODUCT_COPY_FILES += \
-    $(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/d3m2.ec.bin
-$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin)
-else
-$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR))
-endif
-
-# Intermediate image artifacts are published, but aren't included in /vendor/firmware/dauntless
-# in PRODUCT_COPY_FILES
-# This is because intermediate images aren't needed on user devices, but the published artifact
-# is useful for flashstation purposes.
-
-# proto11 chips need an intermediate image prior to upgrading to newever versions of the firmware
-ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin))
-$(error GSC firmware size check fail)
-endif
-$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin)
-endif
-# evt chips need an intermediate image prior to upgrading to newever versions of the firmware
-ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin))
-$(error GSC firmware size check fail)
-endif
-$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin)
-endif
-# d3m2 chips need an intermediate image prior to upgrading to newever versions of the firmware
-ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin))
-$(error GSC firmware size check fail)
-endif
-$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin)
-endif
-
-endif # $(wildcard vendor/google_nos)

display/Android.bp

@@ -2,16 +2,9 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-sh_binary {
-    name: "dump_display_userdebug.sh",
-    src: "dump_display_userdebug.sh",
-    vendor: true,
-    sub_dir: "dump",
-}
-
 cc_binary {
-    name: "dump_display",
-    srcs: ["dump_display.cpp"],
+    name: "dump_exynos_display",
+    srcs: ["exynos/dump_display.cpp"],
     cflags: [
         "-Wall",
         "-Wextra",
@@ -26,8 +19,8 @@ cc_binary {
 }
 
 cc_binary {
-    name: "dump_second_display",
-    srcs: ["dump_second_display.cpp"],
+    name: "dump_exynos_second_display",
+    srcs: ["exynos/dump_second_display.cpp"],
     cflags: [
         "-Wall",
         "-Wextra",
@@ -40,3 +33,33 @@ cc_binary {
     relative_install_path: "dump",
 }
 
+cc_binary {
+    name: "dump_pixel_display",
+    srcs: ["pixel/dump_display.cpp"],
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ],
+    shared_libs: [
+        "libbase",
+        "libdump",
+    ],
+    vendor: true,
+    relative_install_path: "dump",
+}
+
+cc_binary {
+    name: "dump_pixel_second_display",
+    srcs: ["pixel/dump_second_display.cpp"],
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ],
+    shared_libs: [
+        "libdump",
+    ],
+    vendor: true,
+    relative_install_path: "dump",
+}

display/dump.mk

@@ -1,4 +0,0 @@
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy
-
-PRODUCT_PACKAGES_ENG += dump_display_userdebug.sh
-PRODUCT_PACKAGES += dump_display

display/dump_display_userdebug.sh

@@ -1,26 +0,0 @@
-#!/vendor/bin/sh
-display_trace_path="/sys/kernel/tracing/instances/pixel-display/trace"
-echo "------ Display Trace ($display_trace_path)------"
-cat $display_trace_path
-
-echo "------ HWC Fence States ------"
-for f in $(ls /data/vendor/log/hwc/*_hwc_fence_state*.txt)
-do
-  echo $f
-  cat $f
-done
-
-echo "------ HWC Error Logs ------"
-for f in $(ls /data/vendor/log/hwc/*_hwc_error_log*.txt)
-do
-  echo $f
-  cat $f
-done
-
-echo "------ HWC Debug Dumps ------"
-for f in $(ls /data/vendor/log/hwc/*_hwc_debug*.dump)
-do
-  echo $f
-  cat $f
-done
-

display/dump_exynos_display.mk

@@ -1,3 +1,3 @@
-PRODUCT_PACKAGES += dump_second_display
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy_second_display
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy/exynos
 
+PRODUCT_PACKAGES += dump_exynos_display

display/dump_exynos_second_display.mk

@@ -0,0 +1,3 @@
+PRODUCT_PACKAGES += dump_exynos_second_display
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy_second_display/exynos
+

display/dump_pixel_display.mk

@@ -0,0 +1,3 @@
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy/pixel
+
+PRODUCT_PACKAGES += dump_pixel_display

display/dump_pixel_second_display.mk

@@ -0,0 +1,3 @@
+PRODUCT_PACKAGES += dump_pixel_second_display
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy_second_display/pixel
+

display/exynos/dump_display.cpp

@@ -18,7 +18,7 @@
 
 int main() {
     setbuf(stdout, NULL);
-    dumpFileContent("DECON-0 counters /sys/class/drm/card0/device/decon0/counters", "/sys/class/drm/card0/device/decon0/counters");
+    dumpFileContent("DECON-0 counters", "/sys/class/drm/card0/device/decon0/counters");
     dumpFileContent("CRTC-0 event log", "/sys/kernel/debug/dri/0/crtc-0/event");
     runCommand("libdisplaycolor", "/vendor/bin/dumpsys displaycolor -v");
 

display/exynos/dump_second_display.cpp

@@ -16,7 +16,7 @@
 #include <dump/pixel_dump.h>
 
 int main() {
-    dumpFileContent("DECON-1 counters /sys/class/drm/card0/device/decon1/counters", "/sys/class/drm/card0/device/decon1/counters");
+    dumpFileContent("DECON-1 counters", "/sys/class/drm/card0/device/decon1/counters");
     dumpFileContent("CRTC-1 event log", "/sys/kernel/debug/dri/0/crtc-1/event");
 
     dumpFileContent("Secondary panel name", "/sys/class/drm/card0/device/secondary-panel/panel_name");

display/pixel/dump_display.cpp

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 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.
+ */
+#include <dump/pixel_dump.h>
+#include <android-base/file.h>
+
+int main() {
+    setbuf(stdout, NULL);
+    dumpFileContent("CRTC-0 status", "/sys/kernel/debug/dri/0/crtc-0/status");
+    dumpFileContent("DRM State", "/sys/kernel/debug/dri/0/state");
+    runCommand("libdisplaycolor", "/vendor/bin/dumpsys displaycolor -v");
+
+    dumpFileContent("Primary panel name", "/sys/class/drm/card0/device/primary-panel/panel_name");
+    dumpFileContent("Primary panel extra info", "/sys/class/drm/card0/device/primary-panel/panel_extinfo");
+    dumpFileContent("Primary panel power Vreg", "/sys/class/drm/card0/device/primary-panel/panel_pwr_vreg");
+    dumpFileContent("Primary panel power mode register", "/sys/class/drm/card0/device/primary-panel/power_mode");
+    return 0;
+}

display/pixel/dump_second_display.cpp

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #include <dump/pixel_dump.h>
 
 int main() {
-    dumpFileContent("Green LED Brightness", "/sys/class/leds/green/brightness");
-    dumpFileContent("Green LED Max Brightness", "/sys/class/leds/green/max_brightness");
-    dumpFileContent("LED Calibration Data", "/mnt/vendor/persist/led/led_calibration_LUT.txt");
+    dumpFileContent("CRTC-1 status", "/sys/kernel/debug/dri/0/crtc-1/status");
+
+    dumpFileContent("Secondary panel name", "/sys/class/drm/card0/device/secondary-panel/panel_name");
+    dumpFileContent("Secondary panel extra info", "/sys/class/drm/card0/device/secondary-panel/panel_extinfo");
+    dumpFileContent("Secondary panel power mode register", "/sys/class/drm/card0/device/secondary-panel/power_mode");
     return 0;
 }

display/sepolicy/dump_display.te

@@ -1,15 +0,0 @@
-# Display (dump for bugreport)
-pixel_bugreport(dump_display)
-
-allow dump_display sysfs_display:file r_file_perms;
-allow dump_display vendor_displaycolor_service:service_manager find;
-binder_call(dump_display, hal_graphics_composer_default)
-allow dump_display vendor_dumpsys:file execute_no_trans;
-allow dump_display vendor_shell_exec:file execute_no_trans;
-
-userdebug_or_eng(`
-  allow dump_display vendor_dri_debugfs:dir r_dir_perms;
-  allow dump_display vendor_dri_debugfs:file r_file_perms;
-')
-vndbinder_use(dump_display)
-

display/sepolicy/dump_display_userdebug.te

@@ -1,11 +0,0 @@
-# Display eng/userdebug (dump for bugreport)
-pixel_bugreport(dump_display_userdebug)
-
-userdebug_or_eng(`
-  allow dump_display_userdebug vendor_toolbox_exec:file execute_no_trans;
-  allow dump_display_userdebug vendor_log_file:dir search;
-  allow dump_display_userdebug vendor_hwc_log_file:dir r_dir_perms;
-  allow dump_display_userdebug vendor_hwc_log_file:file r_file_perms;
-  allow dump_display_userdebug debugfs_tracing_instances:dir search;
-  allow dump_display_userdebug debugfs_tracing_instances:file r_file_perms;
-')

display/sepolicy/exynos/dump_display.te

@@ -0,0 +1,15 @@
+# Display (dump for bugreport)
+pixel_bugreport(dump_exynos_display)
+
+allow dump_exynos_display sysfs_display:file r_file_perms;
+allow dump_exynos_display vendor_displaycolor_service:service_manager find;
+binder_call(dump_exynos_display, hal_graphics_composer_default)
+allow dump_exynos_display vendor_dumpsys:file execute_no_trans;
+allow dump_exynos_display vendor_shell_exec:file execute_no_trans;
+
+userdebug_or_eng(`
+  allow dump_exynos_display vendor_dri_debugfs:dir r_dir_perms;
+  allow dump_exynos_display vendor_dri_debugfs:file r_file_perms;
+')
+vndbinder_use(dump_exynos_display)
+

display/sepolicy/exynos/dump_display_userdebug.te

@@ -0,0 +1,11 @@
+# Display eng/userdebug (dump for bugreport)
+pixel_bugreport(dump_exynos_display_userdebug)
+
+userdebug_or_eng(`
+  allow dump_exynos_display_userdebug vendor_toolbox_exec:file execute_no_trans;
+  allow dump_exynos_display_userdebug vendor_log_file:dir search;
+  allow dump_exynos_display_userdebug vendor_hwc_log_file:dir r_dir_perms;
+  allow dump_exynos_display_userdebug vendor_hwc_log_file:file r_file_perms;
+  allow dump_exynos_display_userdebug debugfs_tracing_instances:dir search;
+  allow dump_exynos_display_userdebug debugfs_tracing_instances:file r_file_perms;
+')

display/sepolicy/exynos/file_contexts

@@ -0,0 +1,5 @@
+/vendor/bin/dump/dump_display_userdebug\.sh      u:object_r:dump_exynos_display_userdebug_exec:s0
+/vendor/bin/dump/dump_exynos_display             u:object_r:dump_exynos_display_exec:s0
+
+/data/vendor/log/hwc(/.*)?                       u:object_r:vendor_hwc_log_file:s0
+

display/sepolicy/exynos/hal_graphics_composer_default.te

@@ -0,0 +1,3 @@
+allow hal_graphics_composer_default dump_exynos_display:fifo_file { append write };
+allow hal_graphics_composer_default dump_exynos_display:fd use;
+

display/sepolicy/hal_graphics_composer_default.te

@@ -1,3 +0,0 @@
-allow hal_graphics_composer_default dump_display:fifo_file { append write };
-allow hal_graphics_composer_default dump_display:fd use;
-

display/sepolicy/pixel/dump_display.te

@@ -0,0 +1,15 @@
+# Display (dump for bugreport)
+pixel_bugreport(dump_pixel_display)
+
+allow dump_pixel_display sysfs_display:file r_file_perms;
+allow dump_pixel_display vendor_displaycolor_service:service_manager find;
+binder_call(dump_pixel_display, hal_graphics_composer_default)
+allow dump_pixel_display vendor_dumpsys:file execute_no_trans;
+allow dump_pixel_display vendor_shell_exec:file execute_no_trans;
+
+userdebug_or_eng(`
+  allow dump_pixel_display vendor_dri_debugfs:dir r_dir_perms;
+  allow dump_pixel_display vendor_dri_debugfs:file r_file_perms;
+')
+vndbinder_use(dump_pixel_display)
+

display/sepolicy/pixel/dump_display_userdebug.te

@@ -0,0 +1,11 @@
+# Display eng/userdebug (dump for bugreport)
+pixel_bugreport(dump_pixel_display_userdebug)
+
+userdebug_or_eng(`
+  allow dump_pixel_display_userdebug vendor_toolbox_exec:file execute_no_trans;
+  allow dump_pixel_display_userdebug vendor_log_file:dir search;
+  allow dump_pixel_display_userdebug vendor_hwc_log_file:dir r_dir_perms;
+  allow dump_pixel_display_userdebug vendor_hwc_log_file:file r_file_perms;
+  allow dump_pixel_display_userdebug debugfs_tracing_instances:dir search;
+  allow dump_pixel_display_userdebug debugfs_tracing_instances:file r_file_perms;
+')

display/sepolicy/pixel/file.te

@@ -0,0 +1,3 @@
+type vendor_hwc_log_file, file_type, data_file_type;
+type vendor_dri_debugfs, fs_type, debugfs_type;
+

display/sepolicy/pixel/file_contexts

@@ -1,5 +1,5 @@
-/vendor/bin/dump/dump_display_userdebug\.sh      u:object_r:dump_display_userdebug_exec:s0
-/vendor/bin/dump/dump_display                    u:object_r:dump_display_exec:s0
+/vendor/bin/dump/dump_display_userdebug\.sh      u:object_r:dump_pixel_display_userdebug_exec:s0
+/vendor/bin/dump/dump_pixel_display              u:object_r:dump_pixel_display_exec:s0
 
 /data/vendor/log/hwc(/.*)?                       u:object_r:vendor_hwc_log_file:s0
 

display/sepolicy/pixel/genfs_contexts

@@ -0,0 +1,4 @@
+
+genfscon debugfs /dri/0/crtc-                                           u:object_r:vendor_dri_debugfs:s0
+genfscon debugfs /dri/0/state                                           u:object_r:vendor_dri_debugfs:s0
+genfscon sysfs /module/drm/parameters/debug                             u:object_r:sysfs_display:s0

display/sepolicy/pixel/hal_graphics_composer_default.te

@@ -0,0 +1,3 @@
+allow hal_graphics_composer_default dump_pixel_display:fifo_file { append write };
+allow hal_graphics_composer_default dump_pixel_display:fd use;
+

display/sepolicy/pixel/vndservice.te

@@ -0,0 +1,2 @@
+type vendor_displaycolor_service, vndservice_manager_type;
+

display/sepolicy/pixel/vndservice_contexts

@@ -0,0 +1,2 @@
+displaycolor          u:object_r:vendor_displaycolor_service:s0
+

display/sepolicy_second_display/dump_second_display.te

@@ -1,9 +0,0 @@
-pixel_bugreport(dump_second_display)
-
-allow dump_second_display sysfs_display:file r_file_perms;
-
-userdebug_or_eng(`
-  allow dump_second_display vendor_dri_debugfs:dir r_dir_perms;
-  allow dump_second_display vendor_dri_debugfs:file r_file_perms;
-')
-

display/sepolicy_second_display/exynos/dump_second_display.te

@@ -0,0 +1,9 @@
+pixel_bugreport(dump_exynos_second_display)
+
+allow dump_exynos_second_display sysfs_display:file r_file_perms;
+
+userdebug_or_eng(`
+  allow dump_exynos_second_display vendor_dri_debugfs:dir r_dir_perms;
+  allow dump_exynos_second_display vendor_dri_debugfs:file r_file_perms;
+')
+

display/sepolicy_second_display/exynos/file_contexts

@@ -0,0 +1,2 @@
+/vendor/bin/dump/dump_exynos_second_display          u:object_r:dump_exynos_second_display_exec:s0
+

display/sepolicy_second_display/file_contexts

@@ -1,2 +0,0 @@
-/vendor/bin/dump/dump_second_display          u:object_r:dump_second_display_exec:s0
-

display/sepolicy_second_display/pixel/dump_second_display.te

@@ -0,0 +1,9 @@
+pixel_bugreport(dump_pixel_second_display)
+
+allow dump_pixel_second_display sysfs_display:file r_file_perms;
+
+userdebug_or_eng(`
+  allow dump_pixel_second_display vendor_dri_debugfs:dir r_dir_perms;
+  allow dump_pixel_second_display vendor_dri_debugfs:file r_file_perms;
+')
+

display/sepolicy_second_display/pixel/file_contexts

@@ -0,0 +1,2 @@
+/vendor/bin/dump/dump_pixel_second_display           u:object_r:dump_pixel_second_display_exec:s0
+

euiccpixel_app/sepolicy/common/euiccpixel_app.te

@@ -24,4 +24,4 @@ get_prop(euiccpixel_app, dck_prop)
 
 # b/265286368 framework UI rendering properties and file access
 dontaudit euiccpixel_app default_prop:file { read };
-dontaudit euiccpixel_app sysfs_gpu_uevent:file { read open getattr };
+

euiccpixel_app/sepolicy/common/file.te

@@ -1,2 +0,0 @@
-# type for gpu uevent
-type sysfs_gpu_uevent, sysfs_type, fs_type;

euiccpixel_app/sepolicy/common/genfs_contexts

@@ -1 +0,0 @@
-genfscon sysfs /devices/platform/34f00000.gpu0/uevent                 u:object_r:sysfs_gpu_uevent:s0

gcam_app/sepolicy/vendor/debug_camera_app.te

@@ -12,5 +12,8 @@ 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;
+
+    # Allows tachyon_service to communicate with GCA-Eng via binder.
+    binder_call(edgetpu_tachyon_server, debug_camera_app);
 ')
 

gcam_app/sepolicy/vendor/google_camera_app.te

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

gear/dumpstate/android.hardware.dumpstate-service.rc

@@ -1,5 +1,5 @@
 service vendor.dumpstate-default /vendor/bin/hw/android.hardware.dumpstate-service
     class hal
     user system
-    group system shell
+    group system shell readtracefs
     interface aidl android.hardware.dumpstate.IDumpstateDevice/default

gps/brcm/device.mk

@@ -1,6 +1,5 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/brcm/sepolicy
 
-PRODUCT_SOONG_NAMESPACES += vendor/broadcom/gps/bcm47765
 ifeq (,$(call soong_config_get,gpssdk,sdkv1))
     $(call soong_config_set,gpssdk,sdkv1,false)
 endif
@@ -12,6 +11,3 @@ PRODUCT_PACKAGES += \
 	bcm47765_gps_package \
 	sitril-gps \
 	android.hardware.location.gps.prebuilt.xml
-
-PRODUCT_PACKAGES_ENG += \
-	init.gps_log.rc

gps/dump/Android.bp

@@ -1,20 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_binary {
-    name: "dump_gps",
-    srcs: ["dump_gps.cpp"],
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-    ],
-    shared_libs: [
-        "libbase",
-	"libdump",
-	"liblog",
-    ],
-    vendor: true,
-    relative_install_path: "dump",
-}

gps/dump/dump_gps.cpp

@@ -1,145 +0,0 @@
-/*
- * Copyright 2022 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.
- */
-#include <android-base/file.h>
-#include <android-base/properties.h>
-#include <dirent.h>
-#include <dump/pixel_dump.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#define GPS_LOG_NUMBER_PROPERTY "persist.vendor.gps.aol.log_num"
-#define GPS_LOG_DIRECTORY "/data/vendor/gps/logs"
-#define GPS_RESOURCE_DIRECTORY "/data/vendor/gps/resource"
-#define GPS_TMP_LOG_DIRECTORY "/data/vendor/gps/logs/.tmp"
-#define GPS_LOG_PREFIX "gl-"
-#define GPS_MCU_LOG_PREFIX "esw-"
-#define GPS_MALLOC_LOG_DIRECTORY "/data/vendor/gps"
-#define GPS_MALLOC_LOG_PREFIX "malloc_"
-#define GPS_VENDOR_CHIP_INFO "/data/vendor/gps/chip.info"
-#define GPS_RAWLOG_PREFIX "rawbin"
-#define GPS_MEMDUMP_LOG_PREFIX "memdump_"
-
-static void copyDirectory(const std::string &source,
-                          const std::string &outputDir) {
-  DIR *dir = opendir(source.c_str());
-  if (dir == nullptr) {
-    return;
-  }
-
-  if (mkdir(outputDir.c_str(), 0777) == -1) {
-    closedir(dir);
-    return;
-  }
-
-  struct dirent *entry;
-  while ((entry = readdir(dir)) != nullptr) {
-    std::string entryName = entry->d_name;
-    if (entryName == "." || entryName == "..") {
-      continue;
-    }
-
-    std::string sourcePath = source + "/" + entryName;
-    std::string destPath = outputDir + "/" + entryName;
-
-    struct stat st;
-    if (stat(sourcePath.c_str(), &st) == 0) {
-      if (S_ISDIR(st.st_mode))
-        copyDirectory(sourcePath, destPath);
-      else
-        copyFile(sourcePath.c_str(), destPath.c_str());
-    }
-  }
-  closedir(dir);
-  return;
-}
-
-int compareFileExtensions(const struct dirent **a, const struct dirent **b) {
-    int num_a, num_b;
-    sscanf((*a)->d_name, "rawbinlog.out.%d", &num_a);
-    sscanf((*b)->d_name, "rawbinlog.out.%d", &num_b);
-
-    return num_a - num_b;
-}
-
-void dumpLogsAscending(const char* SrcDir, const char* DestDir, int limit, const char* prefix) {
-
-    struct dirent **dirent_list = NULL;
-    int num_entries = scandir(SrcDir, &dirent_list, 0, (int (*)(const struct dirent **, const struct dirent **)) alphasort);
-    if (!dirent_list) {
-        printf("Unable to scan dir: %s.\n", SrcDir);
-        return;
-    } else if (num_entries <= 0) {
-        printf("No file is found.\n");
-        return;
-    }
-
-    if (access(DestDir, R_OK)) {
-        printf("Unable to find folder: %s\n", DestDir);
-        return;
-    }
-
-    qsort(dirent_list, num_entries, sizeof(struct dirent *), (int (*)(const void *, const void *)) compareFileExtensions);
-
-    int copiedFiles = 0;
-
-    for (int i = 0 ; i < num_entries; i++) {
-
-        if (0 != strncmp(dirent_list[i]->d_name, prefix, strlen(prefix))) {
-            continue;
-        }
-
-        if ((copiedFiles >= limit) && (limit != -1)) {
-            printf("Skipped %s\n", dirent_list[i]->d_name);
-            continue;
-        }
-
-        copiedFiles++;
-        copyFile(concatenatePath(SrcDir, dirent_list[i]->d_name).c_str(), concatenatePath(DestDir, dirent_list[i]->d_name).c_str());
-    }
-
-    while (num_entries--) {
-        free(dirent_list[num_entries]);
-    }
-
-    free(dirent_list);
-    return;
-}
-
-int main() {
-    if(!::android::base::GetBoolProperty("vendor.gps.aol.enabled", false)) {
-        printf("vendor.gps.aol.enabled is false. gps logging is not running.\n");
-        return 0;
-    }
-    int maxFileNum = ::android::base::GetIntProperty(GPS_LOG_NUMBER_PROPERTY, 20);
-    std::string outputDir = concatenatePath(BUGREPORT_PACKING_DIR, "gps");
-    if (mkdir(outputDir.c_str(), 0777) == -1) {
-        printf("Unable to create folder: %s\n", outputDir.c_str());
-        return 0;
-    }
-
-    dumpLogs(GPS_TMP_LOG_DIRECTORY, outputDir.c_str(), 1, GPS_LOG_PREFIX);
-    dumpLogs(GPS_LOG_DIRECTORY, outputDir.c_str(), 3, GPS_MCU_LOG_PREFIX);
-    dumpLogs(GPS_LOG_DIRECTORY, outputDir.c_str(), maxFileNum, GPS_LOG_PREFIX);
-    dumpLogs(GPS_MALLOC_LOG_DIRECTORY, outputDir.c_str(), 1, GPS_MALLOC_LOG_PREFIX);
-    if (access(GPS_VENDOR_CHIP_INFO, F_OK) == 0) {
-        copyFile(GPS_VENDOR_CHIP_INFO, concatenatePath(outputDir.c_str(), "chip.info").c_str());
-    }
-    dumpLogsAscending(GPS_LOG_DIRECTORY, outputDir.c_str(), 5, GPS_RAWLOG_PREFIX);
-    dumpLogs(GPS_LOG_DIRECTORY, outputDir.c_str(), 18, GPS_MEMDUMP_LOG_PREFIX);
-    copyDirectory(GPS_RESOURCE_DIRECTORY, concatenatePath(outputDir.c_str(), "resource"));
-    return 0;
-}

gps/dump/log.mk

@@ -1,4 +1 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/dump/sepolicy/
-
-PRODUCT_PACKAGES_ENG += dump_gps
-

gps/pixel/sepolicy/hal_gnss_pixel.te

@@ -17,6 +17,10 @@ get_prop(hal_gnss_pixel, vendor_gps_prop)
 binder_call(hal_gnss_pixel, hal_contexthub_default)
 allow hal_gnss_pixel hal_contexthub_service:service_manager find;
 
+# Allow binder to fwk stats.
+binder_call(hal_gnss_pixel, fwk_stats_service)
+allow hal_gnss_pixel fwk_stats_service:service_manager find;
+
 # Allow connect to gnss service
 allow hal_gnss_pixel vendor_gps_file:dir create_dir_perms;
 allow hal_gnss_pixel vendor_gps_file:fifo_file create_file_perms;

gril/aidl/2.0/sepolicy/hal_aidl_radio_ext.te

@@ -30,4 +30,5 @@ allow hal_aidl_radio_ext sysfs_leds:dir search;
 allow hal_aidl_radio_ext sysfs_leds:file rw_file_perms;
 
 # legacy/zuma/vendor
+allow hal_aidl_radio_ext sysfs_display:dir search;
 allow hal_aidl_radio_ext sysfs_display:file rw_file_perms;

gsa/Android.bp

@@ -10,7 +10,6 @@ cc_binary {
         "-Wall",
         "-Wextra",
         "-Werror",
-        "-pedantic",
     ],
     shared_libs: [
         "libdump",

gxp/Android.bp

@@ -1,19 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_binary {
-    name: "dump_gxp",
-    srcs: ["dump_gxp.cpp"],
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-    ],
-    shared_libs: [
-        "libbase",
-	"libdump",
-    ],
-    vendor: true,
-    relative_install_path: "dump",
-}

gxp/dump_gxp.cpp

@@ -1,37 +0,0 @@
-/*
- * Copyright 2022 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.
- */
-#include <dump/pixel_dump.h>
-#include <android-base/properties.h>
-#include <android-base/file.h>
-
-#define maxGxpDebugDumps 4
-
-int main() {
-    /* TODO(b/277094681): Set default value to false around device beta milestone. */
-    /* TODO(b/288368306): Create an android property for enabling/disabling
-     * bugreport collection for gxp */
-    std::string outputDir = concatenatePath(BUGREPORT_PACKING_DIR, "gxp_ssrdump");
-    printf("Creating %s", outputDir.c_str());
-    if (mkdir(outputDir.c_str(), 0777) == -1) {
-        printf("Unable to create folder: %s\n", outputDir.c_str());
-        return 0;
-    }
-
-    dumpLogs("/data/vendor/ssrdump/coredump", outputDir.c_str(), maxGxpDebugDumps, "coredump_gxp_");
-    dumpLogs("/data/vendor/ssrdump", outputDir.c_str(), maxGxpDebugDumps, "crashinfo_gxp_");
-    return 0;
-}
-

gxp/gxp.mk

@@ -6,8 +6,5 @@ PRODUCT_PACKAGES += \
 	gxp_metrics_logger
 # GXP C-API library
 PRODUCT_PACKAGES += libgxp
-# GXP Debug dump.
-PRODUCT_PACKAGES_ENG += dump_gxp
 
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gxp/sepolicy
-

gyotaku_app/dump/Android.bp

@@ -1,20 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_binary {
-    name: "dump_gyotaku",
-    srcs: ["dump_gyotaku.cpp"],
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-    ],
-    shared_libs: [
-        "libbase",
-        "libdump",
-        "liblog",
-    ],
-    vendor: true,
-    relative_install_path: "dump",
-}

gyotaku_app/dump/dump_gyotaku.cpp

@@ -1,36 +0,0 @@
-/*
- * Copyright 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.
- */
-#include <unistd.h>
-#include <dump/pixel_dump.h>
-#include <android-base/file.h>
-
-#define GYOTAKU_DIRECTORY "/data/vendor/gyotaku/andlog"
-#define GYOTAKU_ANDROID_LOG_PREFIX "android_"
-#define GYOTAKU_ODPM_LOG_PREFIX "odpm_"
-#define maxFileLogsNumber 30
-
-int main() {
-    std::string outputDir = concatenatePath(BUGREPORT_PACKING_DIR, "gyotaku");
-    if (mkdir(outputDir.c_str(), 0700) == -1) {
-        printf("Unable to create folder: %s\n", outputDir.c_str());
-        return 0;
-    }
-
-    dumpLogs(GYOTAKU_DIRECTORY, outputDir.c_str(), maxFileLogsNumber, GYOTAKU_ANDROID_LOG_PREFIX);
-    dumpLogs(GYOTAKU_DIRECTORY, outputDir.c_str(), maxFileLogsNumber, GYOTAKU_ODPM_LOG_PREFIX);
-    return 0;
-}
-

gyotaku_app/dump/dump_gyotaku.te

@@ -1,11 +0,0 @@
-pixel_bugreport(dump_gyotaku)
-
-userdebug_or_eng(`
-  # For access and collecting logs into vendor radio type folder.
-  allow dump_gyotaku radio_vendor_data_file:dir create_dir_perms;
-  allow dump_gyotaku radio_vendor_data_file:file create_file_perms;
-
-  # For access /data/vendor/ folder.
-  allow dump_gyotaku gyotaku_vendor_data_file:dir create_dir_perms;
-  allow dump_gyotaku gyotaku_vendor_data_file:file create_file_perms;
-')

gyotaku_app/dump/file.te

@@ -1,5 +0,0 @@
-# For /data/vendor use
-type gyotaku_vendor_data_file, file_type, data_file_type;
-userdebug_or_eng(`
-    typeattribute gyotaku_vendor_data_file mlstrustedobject;
-')

gyotaku_app/dump/file_contexts

@@ -1,4 +0,0 @@
-/data/vendor/gyotaku(/.*)?                u:object_r:gyotaku_vendor_data_file:s0
-
-# Pixel dump for Gyotaku
-/vendor/bin/dump/dump_gyotaku           u:object_r:dump_gyotaku_exec:s0

gyotaku_app/dump/gyotaku_app.te

@@ -1,5 +0,0 @@
-userdebug_or_eng(`
-  # For access /data/vendor/gyotaku folder
-  allow gyotaku_app gyotaku_vendor_data_file:dir create_dir_perms;
-  allow gyotaku_app gyotaku_vendor_data_file:file create_file_perms;
-')

gyotaku_app/fingerprint/gyotaku_app.te

@@ -1,19 +0,0 @@
-# Specific build for fingerprint
-type gyotaku_app, domain;
-
-app_domain(gyotaku_app)
-net_domain(gyotaku_app)
-
-# For Gyotaku app common use
-allow gyotaku_app app_api_service:service_manager find;
-allow gyotaku_app privapp_data_file:lnk_file read;
-allow gyotaku_app system_app_data_file:dir create_dir_perms;
-allow gyotaku_app system_app_data_file:file create_file_perms;
-
-# For getproperty isDebuggable use
-get_prop(gyotaku_app, userdebug_or_eng_prop)
-
-# For access /data/vendor/misc fingerprint use.
-allow gyotaku_app vendor_misc_data_file:dir search;
-allow gyotaku_app vendor_fingerprint_data_file:dir r_dir_perms;
-allow gyotaku_app vendor_fingerprint_data_file:file r_file_perms;

gyotaku_app/fingerprint/seapp_contexts

@@ -1,2 +0,0 @@
-# Gyotaku app
-user=system seinfo=platform name=com.google.android.apps.internal.gyotaku domain=gyotaku_app type=system_app_data_file levelFrom=all

gyotaku_app/gyotaku.mk

@@ -1,14 +0,0 @@
-ifneq ($(TARGET_BUILD_VARIANT), user)
-  ifeq (,$(filter aosp_% lineage_%, $(TARGET_PRODUCT))) # Skip aosp target product
-    PRODUCT_PACKAGES_DEBUG += \
-      Gyotaku
-
-      BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/sepolicy/
-
-      # Pixel 5a (barbet) does not support Pixel dump
-      ifeq (,$(filter barbet%,$(TARGET_PRODUCT)))
-        PRODUCT_PACKAGES_DEBUG += dump_gyotaku
-        BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/dump
-      endif
-  endif
-endif

gyotaku_app/gyotaku_fingerprint.mk

@@ -1,5 +0,0 @@
-# Specific build for fingerprint
-PRODUCT_PACKAGES_ENG += \
-   Gyotaku
-
-BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/fingerprint

gyotaku_app/sepolicy/gyotaku_app.te

@@ -1,28 +0,0 @@
-type gyotaku_app, domain;
-
-userdebug_or_eng(`
-  app_domain(gyotaku_app)
-  net_domain(gyotaku_app)
-
-  # For Gyotaku app common use
-  allow gyotaku_app app_api_service:service_manager find;
-  allow gyotaku_app privapp_data_file:lnk_file read;
-  allow gyotaku_app system_app_data_file:dir create_dir_perms;
-  allow gyotaku_app system_app_data_file:file create_file_perms;
-
-  # For access /proc/fs/f2fs/* storage use
-  allow gyotaku_app proc_f2fs:dir search;
-  allow gyotaku_app proc_f2fs:file r_file_perms;
-
-  # For access /proc/stat use
-  allow gyotaku_app proc_stat:file r_file_perms;
-
-  # For getproperty isDebuggable use
-  get_prop(gyotaku_app, userdebug_or_eng_prop)
-
-  # For persistent property use
-  get_prop(gyotaku_app, logpersistd_logging_prop);
-
-  # For access hal_power_stats
-  hal_client_domain(gyotaku_app, hal_power_stats);
-')

gyotaku_app/sepolicy/seapp_contexts

@@ -1,2 +0,0 @@
-# Gyotaku app
-user=system seinfo=platform name=com.google.android.apps.internal.gyotaku domain=gyotaku_app type=system_app_data_file levelFrom=all

input/gia/gia.mk

@@ -1,11 +1,10 @@
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/input/gia/sepolicy
+# When not AOSP target
+ifeq (,$(filter aosp_%, $(TARGET_PRODUCT)))
+	BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/input/gia/sepolicy
 
-PRODUCT_PACKAGES += gia
-PRODUCT_PACKAGES += com.google.input.gia.giaservicemanager
+	PRODUCT_PACKAGES += gia
+	PRODUCT_PACKAGES += com.google.input.gia.giaservicemanager
 
-PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces
-PRODUCT_SOONG_NAMESPACES += vendor/google/input/gia/core
-PRODUCT_SOONG_NAMESPACES += vendor/google/input/gia/core-servicemanager
-
-DEVICE_MANIFEST_FILE += device/google/gs-common/input/gia/aidl/manifest.xml
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/input/gia/aidl/compatibility_matrix.xml
+	DEVICE_MANIFEST_FILE += device/google/gs-common/input/gia/aidl/manifest.xml
+	DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/input/gia/aidl/compatibility_matrix.xml
+endif

input/gia/sepolicy/gia.te

@@ -16,3 +16,7 @@ hal_server_domain(gia, hal_gia)
 # allow gia for accessing touch related system file-nodes
 allow gia sysfs_touch_gti:dir r_dir_perms;
 allow gia sysfs_touch_gti:file rw_file_perms;
+
+# allow gia for collecting device stats
+allow gia fwk_stats_service:service_manager find;
+binder_call(gia, stats_service_server);