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

Merge "Check for valid last reported deviceId when starting service"

Browse Source
This commit is contained in:
Marco Loaiza
2023-01-11 19:56:35 +00:00
committed by Android (Google) Code Review
parent dbed72c364 5ffbb10f6e
commit 8c068dc9d5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/ActivityThread.java
View File

@@ -4558,7 +4558,11 @@ public final class ActivityThread extends ClientTransactionHandler
service.attach(context, this, data.info.name, data.token, app,
ActivityManager.getService());
if (!service.isUiContext()) { // WindowProviderService is a UI Context.
service.updateDeviceId(mLastReportedDeviceId);
VirtualDeviceManager vdm = context.getSystemService(VirtualDeviceManager.class);
if (mLastReportedDeviceId == VirtualDeviceManager.DEVICE_ID_DEFAULT
|| vdm.isValidVirtualDeviceId(mLastReportedDeviceId)) {
service.updateDeviceId(mLastReportedDeviceId);
}
}
service.onCreate();
mServicesData.put(data.token, data);