Merge "Add recovery support for perf experiments." into main
diff --git a/aoc/aoc.mk b/aoc/aoc.mk
index 9ee4517..13d849c 100644
--- a/aoc/aoc.mk
+++ b/aoc/aoc.mk
@@ -13,6 +13,11 @@
 	device/google/gs-common/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
 endif
 
+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_DEBUG += \
 	aocdump \
diff --git a/aoc/sepolicy/service_contexts b/aoc/sepolicy/service_contexts
index de31e51..80346c8 100644
--- a/aoc/sepolicy/service_contexts
+++ b/aoc/sepolicy/service_contexts
@@ -1 +1 @@
-aocx.IAocx    u:object_r:aocx:s0
+aocx.IAocx/default    u:object_r:aocx:s0
diff --git a/camera/Android.bp b/camera/Android.bp
index e845678..2c7ec58 100644
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -34,3 +34,27 @@
     src: "com.google.pixel.camera.concurrent_foldable_dual_front.xml",
     sub_dir: "permissions",
 }
+
+prebuilt_etc {
+    name: "libg3a_standalone_gabc_rc",
+    vendor: true,
+    proprietary: true,
+    init_rc: ["libg3a_gabc.rc"],
+    src: "libg3a_gabc.rc",
+}
+
+prebuilt_etc {
+    name: "libg3a_standalone_gaf_rc",
+    vendor: true,
+    proprietary: true,
+    init_rc: ["libg3a_gaf.rc"],
+    src: "libg3a_gaf.rc",
+}
+
+prebuilt_etc {
+    name: "libg3a_standalone_ghawb_rc",
+    vendor: true,
+    proprietary: true,
+    init_rc: ["libg3a_ghawb.rc"],
+    src: "libg3a_ghawb.rc",
+}
diff --git a/camera/libg3a_gabc.rc b/camera/libg3a_gabc.rc
new file mode 100644
index 0000000..c092edd
--- /dev/null
+++ b/camera/libg3a_gabc.rc
@@ -0,0 +1,28 @@
+# override default log levels.
+on boot
+    setprop log.tag.GABC E
+
+# backward-compatible system props.
+on property:persist.vendor.camera.gabc.debug_level=0
+    setprop log.tag.GABC S
+
+on property:persist.vendor.camera.gabc.debug_level=1
+    setprop log.tag.GABC V
+
+on property:persist.vendor.camera.gabc.debug_level=2
+    setprop log.tag.GABC V
+
+on property:persist.vendor.camera.gabc.debug_level=3
+    setprop log.tag.GABC D
+
+on property:persist.vendor.camera.gabc.debug_level=4
+    setprop log.tag.GABC I
+
+on property:persist.vendor.camera.gabc.debug_level=5
+    setprop log.tag.GABC W
+
+on property:persist.vendor.camera.gabc.debug_level=6
+    setprop log.tag.GABC E
+
+on property:persist.vendor.camera.gabc.debug_level=7
+    setprop log.tag.GABC A
diff --git a/camera/libg3a_gaf.rc b/camera/libg3a_gaf.rc
new file mode 100644
index 0000000..214b467
--- /dev/null
+++ b/camera/libg3a_gaf.rc
@@ -0,0 +1,83 @@
+# override default log levels.
+on boot
+    setprop log.tag.GAF E
+
+# backward-compatible system props.
+on property:persist.vendor.camera.af.debug_level=0
+    setprop log.tag.GAF S
+
+on property:persist.vendor.camera.af.debug_level=1
+    setprop log.tag.GAF V
+
+on property:persist.vendor.camera.af.debug_level=2
+    setprop log.tag.GAF V
+
+on property:persist.vendor.camera.af.debug_level=3
+    setprop log.tag.GAF D
+
+on property:persist.vendor.camera.af.debug_level=4
+    setprop log.tag.GAF I
+
+on property:persist.vendor.camera.af.debug_level=5
+    setprop log.tag.GAF W
+
+on property:persist.vendor.camera.af.debug_level=6
+    setprop log.tag.GAF E
+
+on property:persist.vendor.camera.af.debug_level=7
+    setprop log.tag.GAF A
+
+on property:persist.vendor.camera.af.video_debug_enable=2
+    setprop vendor.camera.3a.log_level 1
+    setprop log.tag.3a.gcrd.af.parser.input V
+    setprop log.tag.3a.gcrd.af.parser.output V
+    setprop log.tag.3a.gcrd.af.processor V
+    setprop log.tag.3a.gcrd.af.engine V
+    setprop log.tag.3a.gcrd.dtm V
+
+on property:persist.vendor.camera.af.video_debug_enable=0
+    setprop vendor.camera.3a.log_level 6
+    setprop log.tag.3a.gcrd.af.parser.input E
+    setprop log.tag.3a.gcrd.af.parser.output E
+    setprop log.tag.3a.gcrd.af.processor E
+    setprop log.tag.3a.gcrd.af.engine E
+    setprop log.tag.3a.gcrd.dtm E
+
+on property:persist.vendor.camera.af.default_focus_only=false
+    setprop persist.vendor.camera.af.ignore_ctrl_focus_region false
+    setprop persist.vendor.camera.af.ignore_face 0
+    setprop persist.vendor.camera.af.force_saliency_consumption ""
+
+on property:persist.vendor.camera.af.default_focus_only=true
+    setprop persist.vendor.camera.af.ignore_ctrl_focus_region true
+    setprop persist.vendor.camera.af.ignore_face 1
+    setprop persist.vendor.camera.af.force_saliency_consumption false
+
+# Reset every related properties
+on property:persist.vendor.camera.af.standalone_searchlet=reset
+    setprop persist.vendor.camera.af.ignore_pd \"\"
+    setprop persist.vendor.camera.af.ignore_tof \"\"
+    setprop persist.vendor.camera.af.ignore_cdaf \"\"
+    setprop persist.vendor.camera.af.ignore_gyro \"\"
+    setprop persist.vendor.camera.af.ignore_3a \"\"
+    setprop vendor.camera.debug.enable_saliency \"\"
+
+# Standalone framework: PDAF
+on property:persist.vendor.camera.af.standalone_searchlet=pdaf
+    setprop persist.vendor.camera.af.ignore_tof 1
+    setprop persist.vendor.camera.af.ignore_gyro 1
+    setprop persist.vendor.camera.af.ignore_3a 1
+    setprop vendor.camera.debug.enable_saliency 0
+
+# Standalone framework: LDAF
+on property:persist.vendor.camera.af.standalone_searchlet=ldaf
+    setprop persist.vendor.camera.af.ignore_pd 7
+    setprop persist.vendor.camera.af.ignore_gyro 1
+    setprop persist.vendor.camera.af.ignore_3a 1
+    setprop vendor.camera.debug.enable_saliency 0
+
+# Standalone framework: CDAF
+on property:persist.vendor.camera.af.standalone_searchlet=cdaf
+    setprop persist.vendor.camera.af.ignore_pd 7
+    setprop persist.vendor.camera.af.ignore_tof 1
+    setprop vendor.camera.debug.enable_saliency 0
diff --git a/camera/libg3a_ghawb.rc b/camera/libg3a_ghawb.rc
new file mode 100644
index 0000000..4ca6717
--- /dev/null
+++ b/camera/libg3a_ghawb.rc
@@ -0,0 +1,28 @@
+# override default log levels.
+on boot
+    setprop log.tag.GHAWB E
+
+# backward-compatible system props.
+on property:persist.vendor.camera.ghawb.debug_level=0
+    setprop log.tag.GHAWB S
+
+on property:persist.vendor.camera.ghawb.debug_level=1
+    setprop log.tag.GHAWB V
+
+on property:persist.vendor.camera.ghawb.debug_level=2
+    setprop log.tag.GHAWB V
+
+on property:persist.vendor.camera.ghawb.debug_level=3
+    setprop log.tag.GHAWB D
+
+on property:persist.vendor.camera.ghawb.debug_level=4
+    setprop log.tag.GHAWB I
+
+on property:persist.vendor.camera.ghawb.debug_level=5
+    setprop log.tag.GHAWB W
+
+on property:persist.vendor.camera.ghawb.debug_level=6
+    setprop log.tag.GHAWB E
+
+on property:persist.vendor.camera.ghawb.debug_level=7
+    setprop log.tag.GHAWB A
diff --git a/camera/lyric.mk b/camera/lyric.mk
index c886138..0ec1d6d 100644
--- a/camera/lyric.mk
+++ b/camera/lyric.mk
@@ -20,8 +20,20 @@
 # All shipping releases will switch to prebuilts (trunk+)
 # if this condition is not true, then build from source.
 
-ifneq ($(RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT),true)
+# 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 \
@@ -41,7 +53,7 @@
 # Calibration tool for debug builds
 PRODUCT_PACKAGES_DEBUG += tarasque_test
 PRODUCT_PACKAGES_DEBUG += ProtoCalibGenerator
-endif  # RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT check
+endif  # BUILD_LYRIC_FROM_SOURCE
 
 # Init-time log settings for Google 3A
 PRODUCT_PACKAGES += libg3a_standalone_gabc_rc
diff --git a/camera/lyric_soong_variables.md b/camera/lyric_soong_variables.md
index b442943..4289109 100644
--- a/camera/lyric_soong_variables.md
+++ b/camera/lyric_soong_variables.md
@@ -44,3 +44,13 @@
 $(call soong_config_set,google3a_config,target_device,oriole)
 ```
 A mixture of `camera_hardware` and `tuning_product` used by 3A.
+
+## `radioext_interface_type`
+
+Example:
+```
+$(call soong_config_set,lyric,radioext_interface_type,aidl)
+```
+Specifies which interface type to use in the RadioExt client when communicating
+with the RadioExt service. The possible values are "hidl" and "aidl".
+Devices launching with Android 15 no longer support HIDL.
diff --git a/dump_chip_info/dump_chip_info.cpp b/dump_chip_info/dump_chip_info.cpp
index dd83743..bbd0065 100644
--- a/dump_chip_info/dump_chip_info.cpp
+++ b/dump_chip_info/dump_chip_info.cpp
@@ -19,6 +19,10 @@
 int main() {
     dumpFileContent("ap_rom_patch_ver", "/sys/devices/system/goog-chip-info/ap_rom_patch_ver");
     dumpFileContent("gpcm_asic_id", "/sys/devices/system/goog-chip-info/gpcm_asic_id");
+    dumpFileContent("device_table", "/sys/devices/system/goog-chip-info/device_table");
+    dumpFileContent("dvfs_table", "/sys/devices/system/goog-chip-info/dvfs_table");
+    dumpFileContent("hw_feature_table", "/sys/devices/system/goog-chip-info/hw_feature_table");
+    dumpFileContent("ids_table", "/sys/devices/system/goog-chip-info/ids_table");
 
     return 0;
 }
diff --git a/dump_chip_info/sepolicy/genfs_contexts b/dump_chip_info/sepolicy/genfs_contexts
index 3fda2de..ce42be1 100644
--- a/dump_chip_info/sepolicy/genfs_contexts
+++ b/dump_chip_info/sepolicy/genfs_contexts
@@ -1,2 +1,6 @@
 genfscon sysfs /devices/system/goog-chip-info/ap_rom_patch_ver u:object_r:sysfs_chip_info:s0
 genfscon sysfs /devices/system/goog-chip-info/gpcm_asic_id     u:object_r:sysfs_chip_info:s0
+genfscon sysfs /devices/system/goog-chip-info/device_table     u:object_r:sysfs_chip_info:s0
+genfscon sysfs /devices/system/goog-chip-info/dvfs_table       u:object_r:sysfs_chip_info:s0
+genfscon sysfs /devices/system/goog-chip-info/hw_feature_table u:object_r:sysfs_chip_info:s0
+genfscon sysfs /devices/system/goog-chip-info/ids_table        u:object_r:sysfs_chip_info:s0
diff --git a/edgetpu/sepolicy/edgetpu_tachyon_service.te b/edgetpu/sepolicy/edgetpu_tachyon_service.te
index 80db366..642b469 100644
--- a/edgetpu/sepolicy/edgetpu_tachyon_service.te
+++ b/edgetpu/sepolicy/edgetpu_tachyon_service.te
@@ -42,7 +42,7 @@
 
 # Allow Tachyon service to send trace packets to Perfetto with SELinux enabled
 # under userdebug builds.
-userdebug_or_eng(`perfetto_producer(edgetpu_tachyon_server)')
+perfetto_producer(edgetpu_tachyon_server)
 
 # Allow Tachyon service to read tflite DarwiNN delegate properties
 get_prop(edgetpu_tachyon_server, vendor_tflite_delegate_prop)
@@ -65,6 +65,4 @@
 ')
 
 # For shell level testing
-userdebug_or_eng(`
-    binder_call(edgetpu_tachyon_server, shell);
-')
+binder_call(edgetpu_tachyon_server, shell);
diff --git a/esim/esim.mk b/esim/esim.mk
index 47e21b7..487f15e 100644
--- a/esim/esim.mk
+++ b/esim/esim.mk
@@ -1,5 +1,10 @@
+## Configuration for eSIM bootstrap
+
+# Enable eSIM bootstrap by default
+PRODUCT_PRODUCT_PROPERTIES += setupwizard.feature.provisioning_profile_mode=true
+
+# init.rc and sepolcy to conditionally disable eSIM bootstrap
 PRODUCT_PACKAGES += init.esim-gs.rc
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/esim/sepolicy/vendor
-# system_ext
 SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/esim/sepolicy/system_ext/public
 SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/esim/sepolicy/system_ext/private
diff --git a/gps/dump/dump_gps.cpp b/gps/dump/dump_gps.cpp
index e073732..7906a1f 100644
--- a/gps/dump/dump_gps.cpp
+++ b/gps/dump/dump_gps.cpp
@@ -17,6 +17,7 @@
 #include <android-base/properties.h>
 #include <dirent.h>
 #include <dump/pixel_dump.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -66,6 +67,58 @@
   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");
@@ -85,9 +138,8 @@
     if (access(GPS_VENDOR_CHIP_INFO, F_OK) == 0) {
         copyFile(GPS_VENDOR_CHIP_INFO, concatenatePath(outputDir.c_str(), "chip.info").c_str());
     }
-    dumpLogs(GPS_LOG_DIRECTORY, outputDir.c_str(), maxFileNum, GPS_RAWLOG_PREFIX);
+    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;
 }
-