From 5ecd71861fa05e0cd5605235ff8e01f35f3e367c Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Fri, 23 Sep 2022 16:47:50 -0700
Subject: [PATCH] Check the null pointer in ProcStats

Bug: 246663534
Test: atest ProcStatsValidationTests
Test: atest ProcessStatsDumpsysTest
Test: atest CtsIncidentHostTestCases:ProcStatsProtoTest
Test: atest CtsStatsdHostTestCases
Test: atest CtsAppTestCases:ActivityManagerProcessStateTest
Change-Id: Ie39e232970238f44b447467173ae46d4775e6432
---
 .../com/android/internal/app/procstats/ProcessState.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/procstats/ProcessState.java b/core/java/com/android/internal/app/procstats/ProcessState.java
index 87e8ac1be611a..72b9cd272d026 100644
--- a/core/java/com/android/internal/app/procstats/ProcessState.java
+++ b/core/java/com/android/internal/app/procstats/ProcessState.java
@@ -473,7 +473,10 @@ public final class ProcessState {
                 }
             }
             mCurCombinedState = state;
-            mStats.mUidStates.get(mUid).updateCombinedState(state, now);
+            final UidState uidState = mStats.mUidStates.get(mUid);
+            if (uidState != null) {
+                uidState.updateCombinedState(state, now);
+            }
         }
     }