Merge "Construct the UidState in case of not found during unparceling" into tm-dev

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);
             }
         }