add IGNORE_BATTERY_OPTIMIZATIONS, fix dumpHierarchy, fix UiAutomation…

… quit but server still alive bug
openatx · May 11, 2024 · 5fe3557 · 5fe3557
1 parent d099871
commit 5fe3557
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/app/src/androidTest/java/com/github/uiautomator/stub/AutomatorServiceImpl.java b/app/src/androidTest/java/com/github/uiautomator/stub/AutomatorServiceImpl.java
@@ -309,7 +309,11 @@ public String dumpWindowHierarchy(boolean compressed) {
         device.setCompressedLayoutHierarchy(compressed);
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         try {
-            uiAutomation.clearCache();
+            try {
+                uiAutomation.clearCache();
+            } catch (NoSuchMethodError e) {
+                // ignore
+            }
             device.dumpWindowHierarchy(os);
             return os.toString("UTF-8");
         } catch (IOException e) {

diff --git a/app/src/androidTest/java/com/github/uiautomator/stub/Stub.java b/app/src/androidTest/java/com/github/uiautomator/stub/Stub.java
@@ -23,9 +23,12 @@
 
 package com.github.uiautomator.stub;
 
+import android.app.Instrumentation;
 import android.content.Context;
 import android.content.Intent;
 import android.os.RemoteException;
+import android.view.accessibility.AccessibilityNodeInfo;
+
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -68,7 +71,7 @@ public class Stub {
 
     @Before
     public void setUp() throws Exception {
-        launchService();
+        //launchService();
         JsonRpcServer jrs = new JsonRpcServer(new ObjectMapper(), new AutomatorServiceImpl(), AutomatorService.class);
         jrs.setShouldLogInvocationErrors(true);
         jrs.setErrorResolver(new ErrorResolver() {
@@ -103,7 +106,6 @@ private void launchPackage(String packageName) {
 
     private void launchService() throws RemoteException {
         UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-
         device.wakeUp();
 
         // Wait for launcher
@@ -142,8 +144,20 @@ private void stopMonitorService(Context context) {
     @LargeTest
     public void testUIAutomatorStub() throws InterruptedException {
         Log.i("server started");
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        int nullCount = 0;
         while (server.isAlive()) {
-            Thread.sleep(100);
+            AccessibilityNodeInfo nodeInfo = instrumentation.getUiAutomation().getRootInActiveWindow();
+            if (nodeInfo == null) {
+                nullCount += 1;
+            } else {
+                nullCount = 0;
+            }
+            if (nullCount >= 3) {
+                Log.e("uiAutomation.getRootInActiveWindow() always return null, okhttpd server quit");
+                return;
+            }
+            Thread.sleep(500);
         }
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -117,6 +117,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
 
 </manifest>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -141,6 +141,18 @@
                 android:layout_weight="1" />
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                style="@style/LeftTitle"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:text="version: todo"
+                android:textStyle="bold"/>
+        </LinearLayout>
+
     </LinearLayout>
 
 </ScrollView>