commit df2cbcdd1e689c7a051c04fcbccbb96588b4efdc
author Hui Yu <huiyu@google.com> Thu Sep 01 15:57:56 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 01 15:57:56 2022 +0000
tree dd4f483aff50debe3a00c25d4c34162fe445ad45
parent 1ccb47594110d15fdc26aad0861b096ce1c1f890
parent b4d82e7245b3c8e5d90c60ac6299c176e4683340

Merge "Resolve the deadlock caused by unfreezeProcess()."

services/core/java/com/android/server/am/CachedAppOptimizer.java

diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java
index 653b602..55fc6c5 100644
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -1351,7 +1351,18 @@
                 return;
             }
             Slog.d(TAG_AM, "quick sync unfreeze " + pid);
-            unfreezeAppLSP(app, reason);
+            try {
+                freezeBinder(pid, false);
+            } catch (RuntimeException e) {
+                Slog.e(TAG_AM, "Unable to quick unfreeze binder for " + pid);
+                return;
+            }
+
+            try {
+                Process.setProcessFrozen(pid, app.uid, false);
+            } catch (Exception e) {
+                Slog.e(TAG_AM, "Unable to quick unfreeze " + pid);
+            }
         }
     }