fix A11

myflavor · Jun 7, 2022 · 9875b9f · 9875b9f
1 parent a847d0b
commit 9875b9f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         applicationId "cn.myflv.android.noanr"
         minSdk 23
         targetSdk 32
-        versionCode 7
+        versionCode 10
         versionName "2.4-alpha"
 
     }

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 7,
+      "versionCode": 10,
       "versionName": "2.4-alpha",
       "outputFile": "app-release.apk"
     }

diff --git a/app/src/main/java/cn/myflv/android/noanr/utils/AnrUtil.java b/app/src/main/java/cn/myflv/android/noanr/utils/AnrUtil.java
@@ -25,9 +25,9 @@ public static void startAnrConsumerIfNeeded(Object anrHelper) {
     }
 
     public static void resetNotResponding(Object processRecord) {
-        if (Build.VERSION.SDK_INT==Build.VERSION_CODES.S){
-            Object activityManagerService = ProcessUtil.getActivityManagerService(processRecord);
-            if (activityManagerService == null) return;
+        Object activityManagerService = ProcessUtil.getActivityManagerService(processRecord);
+        if (activityManagerService == null) return;
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.S) {
             if (AppUtil.getActivityManagerGlobalLock(activityManagerService) == null) {
                 return;
             }
@@ -36,6 +36,11 @@ public static void resetNotResponding(Object processRecord) {
                 if (mErrorState == null) return;
                 XposedHelpers.callMethod(mErrorState, MethodEnum.setNotResponding, false);
             }
+        } else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
+            synchronized (ProcessUtil.getActivityManagerService(processRecord)) {
+                XposedHelpers.callMethod(processRecord, MethodEnum.setNotResponding, false);
+            }
+
         }
     }