diff options
| author | Li Li <dualli@google.com> | 2023-11-06 16:43:41 -0800 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-16 18:44:38 +0000 |
| commit | db83be86a64cbefdccf5fbf7100fa7b22ca3d737 (patch) | |
| tree | cd8bcd1e05888ddb0e1ee23fe53ac430a9a8367a | |
| parent | 4a5f3fd57508a91d5ca15c491f69af6f7acaa5ae (diff) | |
| download | base-db83be86a64cbefdccf5fbf7100fa7b22ca3d737.tar.gz | |
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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4f7bfa5c6dbf43f8b4e46ef3a7979dac47c2ad0c)
Merged-In: I380c892a6cb92adfe739fb9cafca3c902772a384
Change-Id: I380c892a6cb92adfe739fb9cafca3c902772a384
| -rw-r--r-- | services/core/java/com/android/server/am/CachedAppOptimizer.java | 2 |
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 7574e91ceee8..70ed9165a18a 100644 --- a/services/core/java/com/android/server/am/CachedAppOptimizer.java +++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java @@ -2575,7 +2575,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; } |