Snap for 11135354 from 5092588 to udc-d2-release

Change-Id: I689a2035328157c8b7e98bd4b8f154bb60111842

Author: Android Build Coastguard Worker

common/device-side/interactive/src/main/java/com/android/interactive/Step.java

@@ -22,6 +22,8 @@
 import static com.android.interactive.Automator.AUTOMATION_FILE;
 
 import android.graphics.PixelFormat;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -247,27 +249,32 @@ public boolean hasFailed() {
      * Adds a button to the interaction prompt.
      */
     protected void addButton(String title, Runnable onClick) {
-        Button btn = new Button(TestApis.context().instrumentedContext());
-        btn.setText(title);
-        btn.setOnClickListener(v -> onClick.run());
-
-        GridLayout layout = mInstructionView.findViewById(R.id.buttons);
-        layout.addView(btn);
+        // Push to UI thread to avoid animation issues when adding the button
+        new Handler(Looper.getMainLooper()).post(() -> {
+            Button btn = new Button(TestApis.context().instrumentedContext());
+            btn.setText(title);
+            btn.setOnClickListener(v -> onClick.run());
+
+            GridLayout layout = mInstructionView.findViewById(R.id.buttons);
+            layout.addView(btn);
+        });
     }
 
     /**
      * Adds small button with a single up/down arrow, used for moving the text box to the
      * bottom of the screen in case it covers some critical area of the app
      */
-
     protected void addSwapButton() {
-        Button btn = new Button(TestApis.context().instrumentedContext());
-        // up/down arrow
-        btn.setText("\u21F5");
-        btn.setOnClickListener(v -> swap());
-
-        GridLayout layout = mInstructionView.findViewById(R.id.buttons);
-        layout.addView(btn);
+        // Push to UI thread to avoid animation issues when adding the button
+        new Handler(Looper.getMainLooper()).post(() -> {
+            Button btn = new Button(TestApis.context().instrumentedContext());
+            // up/down arrow
+            btn.setText("\u21F5");
+            btn.setOnClickListener(v -> swap());
+
+            GridLayout layout = mInstructionView.findViewById(R.id.buttons);
+            layout.addView(btn);
+        });
     }
 
     /**

tests/tests/hibernation/src/android/hibernation/cts/AppHibernationUtils.kt

@@ -298,7 +298,7 @@ fun openUnusedAppsNotification() {
         expandNotificationsWatch(UiAutomatorUtils.getUiDevice())
         waitFindObject(uiAutomation, notifSelector).click()
         // In wear os, notification has one additional button to open it
-        waitFindObject(uiAutomation, By.text("Open")).click()
+        waitFindObject(uiAutomation, By.textContains("Open")).click()
     } else {
         val permissionPkg: String = InstrumentationRegistry.getTargetContext()
             .packageManager.permissionControllerPackageName

tests/tests/virtualdevice/src/android/virtualdevice/cts/sensor/VirtualSensorTest.java

@@ -97,7 +97,7 @@ public class VirtualSensorTest {
     private static final String VIRTUAL_SENSOR_NAME = "VirtualAccelerometer";
     private static final String VIRTUAL_SENSOR_VENDOR = "VirtualDeviceVendor";
 
-    private static final int CUSTOM_SENSOR_TYPE = 9999;
+    private static final int CUSTOM_SENSOR_TYPE = Sensor.TYPE_DEVICE_PRIVATE_BASE + 9999;
 
     private static final int SENSOR_TIMEOUT_MILLIS = 1000;