Merge "Resolve the deadlock caused by unfreezeProcess()." into tm-qpr-dev am: eff330b095

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19802702

Change-Id: I62cb78fdcf2720305f7a10b50b32ba2bc15baa3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-09-04 22:30:12 +00:00
committed by Automerger Merge Worker

View File

@@ -1167,7 +1167,18 @@ public final class CachedAppOptimizer {
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);
}
}
}