Merge "Safe guard the service type in the app fgs tracker." (666c6e2a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/AppFGSTracker.java

+16 −14

Original line number	Diff line number	Diff line
		@@ -560,6 +560,7 @@ final class AppFGSTracker extends BaseAppStateDurationsTracker<AppFGSPolicy, Pac
		int changes = serviceTypes ^ mForegroundServiceTypes;
		for (int serviceType = Integer.highestOneBit(changes); serviceType != 0;) {
		final int i = foregroundServiceTypeToIndex(serviceType);
		if (i < mEvents.length) {
		if ((serviceTypes & serviceType) != 0) {
		// Start this type.
		if (mEvents[i] == null) {
		@@ -576,6 +577,7 @@ final class AppFGSTracker extends BaseAppStateDurationsTracker<AppFGSPolicy, Pac
		notifyListenersOnStateChangeIfNecessary(false, now, serviceType);
		}
		}
		}
		changes &= ~serviceType;
		serviceType = Integer.highestOneBit(changes);
		}