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

Merge "Add 6 more fields to ForegroundServiceStateChanged" into udc-qpr-dev am: 6ff0eddd66

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

Change-Id: I1f791478c5789aa61200a1c73cd1b8b656bccc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Makoto Onuki
2023-07-21 17:43:14 +00:00
committed by Automerger Merge Worker
parent 5e1aaad478 6ff0eddd66
commit 55d63280fe
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -8168,7 +8168,13 @@ public final class ActiveServices {
mAm.getUidStateLocked(r.mRecentCallingUid), mAm.getUidStateLocked(r.mRecentCallingUid),
mAm.getUidProcessCapabilityLocked(r.mRecentCallingUid), mAm.getUidProcessCapabilityLocked(r.mRecentCallingUid),
0, 0,
0); 0,
r.mAllowWhileInUsePermissionInFgsReasonNoBinding,
r.mAllowWIUInBindService,
r.mAllowWIUByBindings,
r.mAllowStartForegroundNoBinding,
r.mAllowStartInBindService,
r.mAllowStartByBindings);
int event = 0; int event = 0;
if (state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER) { if (state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER) {

16
services/core/java/com/android/server/am/ForegroundServiceTypeLoggerModule.java
View File

@@ -506,7 +506,13 @@ public class ForegroundServiceTypeLoggerModule {
ActivityManager.PROCESS_STATE_UNKNOWN, ActivityManager.PROCESS_STATE_UNKNOWN,
ActivityManager.PROCESS_CAPABILITY_NONE, ActivityManager.PROCESS_CAPABILITY_NONE,
apiDurationBeforeFgsStart, apiDurationBeforeFgsStart,
apiDurationAfterFgsEnd); apiDurationAfterFgsEnd,
r.mAllowWhileInUsePermissionInFgsReasonNoBinding,
r.mAllowWIUInBindService,
r.mAllowWIUByBindings,
r.mAllowStartForegroundNoBinding,
r.mAllowStartInBindService,
r.mAllowStartByBindings);
} }
/** /**
@@ -557,7 +563,13 @@ public class ForegroundServiceTypeLoggerModule {
ActivityManager.PROCESS_STATE_UNKNOWN, ActivityManager.PROCESS_STATE_UNKNOWN,
ActivityManager.PROCESS_CAPABILITY_NONE, ActivityManager.PROCESS_CAPABILITY_NONE,
0, 0,
apiDurationAfterFgsEnd); apiDurationAfterFgsEnd,
0,
0,
0,
0,
0,
0);
} }
/** /**