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

Check for valid last reported deviceId when starting service

Browse Source 
If last reported virtual deviceId has been removed/closed since
the latest activity was started, updateDeviceId would throw an
exception due to the deviceId being invalid.

Bug: 264250568
Test: atest DeviceAssociationTest
Change-Id: I5f57c0361f76646001cc606e819969b0114946f7
This commit is contained in:
Marco Loaiza
2023-01-03 16:16:10 +00:00
parent 7de5897932
commit 5ffbb10f6e
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);