Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 316c6e8d authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Check the null pointer in ProcStats" into tm-qpr-dev am: 52ef129d 

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



Change-Id: Ic69c4987f96c0085834105010d621901a24dd9f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 351dc0f5 52ef129d

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

+4 −1
Original line number Diff line number Diff line
@@ -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);

            }

        }

    }