From 957fae2aa7d33a5ae138d10ab06cb4aa9cf95cee Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mfasheh@google.com>
Date: Wed, 22 Mar 2023 19:29:24 +0000
Subject: [PATCH] CachedAppOptimizer: check for null uidrec

This fixes a crash we were seeing in unfreezeAppInternalLSP

Bug: 274723519
Test: tested on a Pixel 6

Change-Id: I55bcd81886b48fb350267d9c9f4932e6287a730f
---
 .../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 e8b65b86aed9c..2617fb74cbb30 100644
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -1233,7 +1233,7 @@ public final class CachedAppOptimizer {
         }
 
         UidRecord uidRec = app.getUidRecord();
-        if (uidRec.isFrozen()) {
+        if (uidRec != null && uidRec.isFrozen()) {
             uidRec.setFrozen(false);
             mFreezeHandler.removeMessages(UID_FROZEN_STATE_CHANGED_MSG, app);
             reportOneUidFrozenStateChanged(app.uid, false);