summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Li Li <dualli@google.com> 2023-11-06 16:43:41 -0800
committer Li Li <dualli@google.com> 2023-11-07 00:53:12 +0000
commitd0a3ce0471df7c63bc07f1d93df8cd5f11d6957f (patch)
treeac9f2c0ffb3bec9db4532c4c25f48e744488d00a
parent6ec5523a415ca168fdf2f42e583816dd4b646b84 (diff)
Skip binder error handler if freezer is disabled
Although freezer has been enforced to be enabled, it can be disabled on legacy vendor freeze project. And it can be temporarily disabled when taking a bugreport. Bug: 309448826 Test: Disable freezer and boot Android Change-Id: I380c892a6cb92adfe739fb9cafca3c902772a384
-rw-r--r--services/core/java/com/android/server/am/CachedAppOptimizer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java
index 68af626869b7..a0a7b2b48725 100644
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -2583,7 +2583,7 @@ public final class CachedAppOptimizer {
// Do nothing if the binder error callback is not enabled.
// That means the frozen apps in a wrong state will be killed when they are unfrozen later.
- if (!mFreezerBinderCallbackEnabled) {
+ if (!mUseFreezer || !mFreezerBinderCallbackEnabled) {
return;
}