commit e44ad1bc7e8ad2f46b1534a2e054550ce6311331
author arangelov <arangelov@google.com> Fri Aug 02 13:39:17 2019 +0100
committer arangelov <arangelov@google.com> Fri Aug 02 13:55:49 2019 +0100
tree 087fb271067c3b8022e4d6b02fb17bfb12c97122
parent 4b315d97fd27ffd8424b667f1f2c9e38c3949ca0

Skip DeviceOwnerTest#testInstallUpdateLogged for non-AB devices.

Fixes: 136964101
Test: manual
Change-Id: I4c3207a758c65dbac122ea9d20e8a7be3e081119

hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java

diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
index 8260c95..da0a331 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
@@ -77,9 +77,10 @@
 
     /**
      * Copied from {@link android.app.admin.DevicePolicyManager
-     * .InstallSystemUpdateCallback#UPDATE_ERROR_BATTERY_LOW}
+     * .InstallSystemUpdateCallback#UPDATE_ERROR_UPDATE_FILE_INVALID}
      */
-    private static final int UPDATE_ERROR_BATTERY_LOW = 5;
+    private static final int UPDATE_ERROR_UPDATE_FILE_INVALID = 3;
+
     private static final int TYPE_NONE = 0;
 
     /**
@@ -1034,20 +1035,19 @@
     }
 
     public void testInstallUpdateLogged() throws Exception {
-        if (!mHasFeature) {
+        if (!mHasFeature || !isDeviceAb()) {
             return;
         }
-        pushUpdateFileToDevice("wrongSize.zip");
+        pushUpdateFileToDevice("wrongHash.zip");
         assertMetricsLogged(getDevice(), () -> {
-                executeDeviceTestMethod(".InstallUpdateTest",
-                        "testInstallUpdate_notCharging_belowThreshold_failsBatteryCheck");
+            executeDeviceTestMethod(".InstallUpdateTest", "testInstallUpdate_failWrongHash");
         }, new DevicePolicyEventWrapper.Builder(EventId.INSTALL_SYSTEM_UPDATE_VALUE)
-               .setAdminPackageName(DEVICE_OWNER_PKG)
-               .setBoolean(isDeviceAb())
-               .build(),
-        new DevicePolicyEventWrapper.Builder(EventId.INSTALL_SYSTEM_UPDATE_ERROR_VALUE)
-               .setInt(UPDATE_ERROR_BATTERY_LOW)
-               .build());
+                    .setAdminPackageName(DEVICE_OWNER_PKG)
+                    .setBoolean(/* isDeviceAb */ true)
+                    .build(),
+            new DevicePolicyEventWrapper.Builder(EventId.INSTALL_SYSTEM_UPDATE_ERROR_VALUE)
+                    .setInt(UPDATE_ERROR_UPDATE_FILE_INVALID)
+                    .build());
     }
 
     private boolean isDeviceAb() throws DeviceNotAvailableException {