Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Safe guard the service type in the app fgs tracker.

Browse Source 
Bug: 219542109
Test: Manual - start an instant app with FGS.
Change-Id: I1715bf18462c7a02233cfe662be0a74abf6a8bcd
This commit is contained in:
Jing Ji
2022-02-14 17:06:25 -08:00
parent fe0f81e2b8
commit 000b8e8255
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/core/java/com/android/server/am/AppFGSTracker.java
View File

@@ -560,20 +560,22 @@ 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 ((serviceTypes & serviceType) != 0) {
// Start this type.
if (mEvents[i] == null) {
mEvents[i] = new LinkedList<>();
}
if (!isActive(i)) {
mEvents[i].add(new BaseTimeEvent(now));
notifyListenersOnStateChangeIfNecessary(true, now, serviceType);
}
} else {
// Stop this type.
if (mEvents[i] != null && isActive(i)) {
mEvents[i].add(new BaseTimeEvent(now));
notifyListenersOnStateChangeIfNecessary(false, now, serviceType);
if (i < mEvents.length) {
if ((serviceTypes & serviceType) != 0) {
// Start this type.
if (mEvents[i] == null) {
mEvents[i] = new LinkedList<>();
}
if (!isActive(i)) {
mEvents[i].add(new BaseTimeEvent(now));
notifyListenersOnStateChangeIfNecessary(true, now, serviceType);
}
} else {
// Stop this type.
if (mEvents[i] != null && isActive(i)) {
mEvents[i].add(new BaseTimeEvent(now));
notifyListenersOnStateChangeIfNecessary(false, now, serviceType);
}
}
}
changes &= ~serviceType;