Merge "Fixing possible NullPointerException" into udc-dev am: d45d287761
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21550086 Change-Id: I584fd4e3a98b5e676ab7b4113a524eed804417a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -316,6 +316,10 @@ public class ForegroundServiceTypeLoggerModule {
|
|||||||
// then we should care, otherwise we assume
|
// then we should care, otherwise we assume
|
||||||
// it's not related to any FGS
|
// it's not related to any FGS
|
||||||
UidState uidState = mUids.get(uid);
|
UidState uidState = mUids.get(uid);
|
||||||
|
if (uidState == null) {
|
||||||
|
Log.w(TAG, "API event end called before start!");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
if (uidState.mOpenWithFgsCount.contains(apiType)) {
|
if (uidState.mOpenWithFgsCount.contains(apiType)) {
|
||||||
// are there any calls that started with an FGS?
|
// are there any calls that started with an FGS?
|
||||||
if (uidState.mOpenWithFgsCount.get(apiType) != 0) {
|
if (uidState.mOpenWithFgsCount.get(apiType) != 0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user