From b4025ae27fea3f36e3b76d48d6e60b9d6eec414e Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Fri, 31 Mar 2023 19:56:24 +0000 Subject: [PATCH] CachedAppOptimzer.freezeProcess() should check for null UidRecord Test: tested on a pixel 6 Bug: 275649588 Change-Id: I18d2401c53191ea412e543dd0964d775f8402208 --- .../core/java/com/android/server/am/CachedAppOptimizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java index b293bcf0e17d8..2cef5ef1e7d18 100644 --- a/services/core/java/com/android/server/am/CachedAppOptimizer.java +++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java @@ -2056,7 +2056,7 @@ public final class CachedAppOptimizer { frozen = opt.isFrozen(); final UidRecord uidRec = proc.getUidRecord(); - if (frozen && uidRec.areAllProcessesFrozen()) { + if (frozen && uidRec != null && uidRec.areAllProcessesFrozen()) { uidRec.setFrozen(true); mFreezeHandler.sendMessage(mFreezeHandler.obtainMessage( UID_FROZEN_STATE_CHANGED_MSG, proc));