aml_tz6_351400020 (13155446,com.google.android.go.tzdata6,com.google.android.tzdata6)

-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ9i73wAKCRDorT+BmrEO
 eCi5AKCHAzJVFdsm++eJGXcPb6LbaKIGTQCcDiWODLyLOWCK64nt7tfCwTgUFCE=
 =3OQU
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN SSH SIGNATURE-----
 U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ
 +rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
 AAAAQGzx1CwS4pcfih6dNJzdvsHLng+4M9qD8N/OatGRRJF0ck6x3Qwifdp45ItOlU7d0T
 52HZvmRrb/FCpQQR9Z/QE=
 -----END SSH SIGNATURE-----

Merge tag 'aml_tz6_351400020' into staging/lineage-23.0_merge-aml_tz6_351400020

aml_tz6_351400020 (13155446,com.google.android.go.tzdata6,com.google.android.tzdata6)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ9i73wAKCRDorT+BmrEO
# eCi5AKCHAzJVFdsm++eJGXcPb6LbaKIGTQCcDiWODLyLOWCK64nt7tfCwTgUFCE=
# =3OQU
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar 18 02:18:39 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Jaegeuk Kim (6) and others
# Via Android (Google) Code Review (55) and others
* tag 'aml_tz6_351400020': (74 commits)
  Fix comment
  Adjust the version set in manifest xml and matrix xml
  Add astd sepolicy to gs-common for P26 factory builds
  Allow tachyon service to make binder calls to gca
  display: add drm_atomic_state to debug-build bugreport
  init.pixel-perf.rc: Setup default rampup multiplier and util_est
  Allow write for restorecon
  Dump F2FS disk_map and UFS phy version
  Fix UFS err_stats
  Fix selinux permission denials
  move common init perf settings to gs_common
  Revert "Set up access control rule for aocxd"
  16KB: Move CopyEfsTest to device/google/gs-common
  Revert^2 "Add Bluetooth extension HAL - CCO"
  gs-common: wlc: add tx update permission for hal_googlebattery
  Revert "Add Bluetooth extension HAL - CCO"
  storage: fix userdata_exp.ai partition selinux error
  Revert "move common init perf settings to gs_common"
  insmod-sh: Allow writing to kmsg
  RamdumpService: Fix the SELinux errors from introducing Firebase Analytics.
  ...

 Conflicts:
	display/dump_pixel_display.mk

Change-Id: Iaa05ef7e62a7b8320f320ad4db482998863fe136

storage/dump_storage.cpp

@@ -27,7 +27,6 @@
 
 #define F2FS_FSCK_TIME_PROPERTY "ro.boottime.init.fsck.data"
 #define F2FS_MNT_TIME_PROPERTY "ro.boottime.init.mount.data"
-#define BOOTDEVICE_PROPERTY "ro.boot.bootdevice"
 #define BUILD_TYPE_PROPERTY "ro.build.type"
 
 void read_buffer(int buf_id, int total_len, const char* path)
@@ -68,11 +67,31 @@ int main() {
     int mnt_time = android::base::GetIntProperty(F2FS_MNT_TIME_PROPERTY, 0);
     printf("--- F2FS - checkpoint=disable time (ms) ---\n%d\n\n", mnt_time);
 
+    const std::string f2fs_proc_path("/proc/fs/f2fs/");
+    std::unique_ptr<DIR, decltype(&closedir)> procdir(
+        opendir(f2fs_proc_path.c_str()), closedir);
+    if (procdir) {
+      dirent *proc_entry;
+      while ((proc_entry = readdir(procdir.get())) != nullptr) {
+        std::string proc_name(proc_entry->d_name);
+        if (proc_name == "." || proc_name == ".." ||
+            strncmp(proc_name.c_str(), "dm-", 3))
+          continue;
+        dumpFileContent(("F2FS - " + proc_name).c_str(),
+                        (f2fs_proc_path + proc_name + "/disk_map").c_str());
+      }
+    }
+
     //UFS
     dumpFileContent("UFS model", "/sys/block/sda/device/model");
     dumpFileContent("UFS rev", "/sys/block/sda/device/rev");
     dumpFileContent("UFS size", "/sys/block/sda/size");
 
+    dumpFileContent("UFS phy version",
+                    "/dev/sys/block/bootdevice/pixel/phy_version");
+    dumpFileContent("UFS phy release_date",
+                    "/dev/sys/block/bootdevice/pixel/phy_release_date");
+
     dumpFileContent("UFS Slow IO Read",
                     "/dev/sys/block/bootdevice/slowio_read_cnt");
     dumpFileContent("UFS Slow IO Write",
@@ -90,24 +109,10 @@ int main() {
     if (statdir) {
         dirent *stat_entry;
         while ((stat_entry = readdir(statdir.get())) != nullptr) {
-            std::string ufs_err_stats_path(stat_entry->d_name);
-            if (!strcmp(ufs_err_stats_path.c_str(), ".")
-                    || !strcmp(ufs_err_stats_path.c_str(), ".."))
-                continue;
-            std::string bootdevice = android::base::GetProperty(
-                    BOOTDEVICE_PROPERTY, "");
-            std::string err_stat_path = "/sys/devices/platform/";
-            err_stat_path.append(bootdevice.c_str());
-            err_stat_path.append("/err_stats/");
-            err_stat_path.append(ufs_err_stats_path.c_str());
-            std::ifstream err_stat_file(err_stat_path);
-            if (err_stat_file.is_open()) {
-                std::string err_stat_atom;
-                err_stat_file >> err_stat_atom;
-                printf("%s:%s\n", ufs_err_stats_path.c_str(),
-                       err_stat_atom.c_str());
-                err_stat_file.close();
-            }
+          std::string stat_name(stat_entry->d_name);
+          if (stat_name == "." || stat_name == "..") continue;
+          dumpFileContent(stat_name.c_str(),
+                          (ufs_err_stats_path + stat_name).c_str());
         }
     }