Merge "Merge "Construct the UidState in case of not found during unparceling" into tm-dev am: 0fe49ee574 am: ed578c06b2 am: d7bdd3b62a" into tm-qpr-dev-plus-aosp am: 904c0fdadc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563201

Change-Id: I8b6fab56da389503c36ab89c39e4c7ab2179db57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/com/android/internal/app/procstats/ProcessStats.java

@@ -1182,7 +1182,16 @@ public final class ProcessStats implements Parcelable {
                         + " " + proc);
                 mProcesses.put(procName, uid, proc);
 
-                mUidStates.get(uid).addProcess(proc);
+                UidState uidState = mUidStates.get(uid);
+                if (uidState == null) {
+                    // This is not expected, log a warning and construct a new UID state.
+                    if (DEBUG_PARCEL) {
+                        Slog.w(TAG, "Couldn't find the common UID " + uid + " for " + proc);
+                    }
+                    uidState = new UidState(this, uid);
+                    mUidStates.put(uid, uidState);
+                }
+                uidState.addProcess(proc);
             }
         }