Internal change

PiperOrigin-RevId: 739557324

Author: vincent0425

src/java/com/google/devtools/deviceinfra/ext/devicemanagement/device/platform/android/realdevice/AndroidRealDeviceDelegate.java

@@ -329,6 +329,14 @@ private void setUpFastbootModeDevice() throws MobileHarnessException, Interrupte
       if (!Strings.isNullOrEmpty(sbdpArUpdate)) {
         device.updateDimension(Dimension.Name.SBDP_AR_UPDATE, Ascii.toLowerCase(sbdpArUpdate));
       }
+      String arNs = fastboot.getVar(deviceId, FastbootProperty.AP_AR_NS);
+      if (!Strings.isNullOrEmpty(arNs)) {
+        device.updateDimension(Dimension.Name.AP_AR_NS, Ascii.toLowerCase(arNs));
+      }
+      String arS = fastboot.getVar(deviceId, FastbootProperty.AP_AR_S);
+      if (!Strings.isNullOrEmpty(arS)) {
+        device.updateDimension(Dimension.Name.AP_AR_S, Ascii.toLowerCase(arS));
+      }
 
       try {
         String serialno = fastboot.getVar(deviceId, FastbootProperty.SERIALNO);

src/java/com/google/devtools/deviceinfra/platform/android/sdk/fastboot/Enums.java

@@ -48,6 +48,8 @@ public enum Partition {
 
   /** Android device properties in fastboot mode. */
   public enum FastbootProperty {
+    AP_AR_NS,
+    AP_AR_S,
     CURRENT_SLOT,
     DEVKEY_ALLOW,
     HARDWARE,

src/java/com/google/devtools/mobileharness/platform/android/sdktool/adb/AndroidProperty.java

@@ -67,6 +67,7 @@ public enum AndroidProperty {
   MEMORY_CLASS("dalvik.vm.heapgrowthlimit", "dalvik.vm.heapsize"),
   MODEL("ro.product.model"),
   NATIVE_BRIDGE("ro.dalvik.vm.native.bridge"),
+  NONSEC_AR("ro.boot.hw.soc.nonsec-ar"),
   PREVIEW_SDK_VERSION("ro.build.version.preview_sdk"),
   @DoNotAddToDimension
   PRODUCT("ro.build.product"),
@@ -78,6 +79,7 @@ public enum AndroidProperty {
   SCREEN_DENSITY("qemu.sf.lcd_density", "ro.sf.lcd_density"),
   SDK_VERSION("ro.build.version.sdk"),
   SECURE_BOOT("ro.boot.secure_boot"),
+  SEC_AR("ro.boot.hw.soc.sec-ar"),
   @KeepDimensionValueCase
   SERIAL("ro.serialno"),
   SIGN("ro.build.tags"),

src/java/com/google/wireless/qa/mobileharness/shared/constant/Dimension.java

@@ -186,6 +186,10 @@ public enum Name {
     ABI,
     /** Customized dimension: Android Google Search App version */
     AGSA_VERSION,
+    /** The Pixel bootloader Non-Secure AP Anti-Rollback counter */
+    AP_AR_NS,
+    /** The Pixel bootloader Secure AP Anti-Rollback counter */
+    AP_AR_S,
     /** The brand of the device. */
     BRAND,
     /** The build name of the device. */
@@ -244,6 +248,8 @@ public enum Name {
     MEMORY_CLASS_IN_MB,
     /** Moreto lab version for Moreto remote control protocol backward compatibility. */
     MORETO_LAB_VERSION,
+    /** The Pixel bootloader Non-Secure AP Anti-Rollback counter. */
+    NONSEC_AR,
     /** Number of CPUs on the android device */
     NUM_CPUS,
     /** The oem unlock statue of the device. Only used in fastboot mode. */
@@ -259,6 +265,8 @@ public enum Name {
     SCREEN_DENSITY,
     /** The screen size. */
     SCREEN_SIZE,
+    /** The Pixel bootloader Secure AP Anti-Rollback counter. */
+    SEC_AR,
     /**
      * Serial no of the device. For normal Android device, SERIAL = ID. For Arc++, SERIAL is the
      * value of Build.SERIAL while ID is the ip of the device