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

Merge "Prevent double-closure of VirtualDeviceImpl" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-20 16:14:33 +00:00
committed by Android (Google) Code Review
parent d3d04db56d c8856f7232
commit f08a702087
2 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
View File

@@ -404,39 +404,44 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
public void close() {
super.close_enforcePermission();
// Remove about-to-be-closed virtual device from the service before butchering it.
mService.removeVirtualDevice(mDeviceId);
boolean removed = mService.removeVirtualDevice(mDeviceId);
mDeviceId = Context.DEVICE_ID_INVALID;
VirtualDisplayWrapper[] virtualDisplaysToBeReleased;
synchronized (mVirtualDeviceLock) {
if (mVirtualAudioController != null) {
mVirtualAudioController.stopListening();
mVirtualAudioController = null;
}
mLocaleList = null;
virtualDisplaysToBeReleased = new VirtualDisplayWrapper[mVirtualDisplays.size()];
for (int i = 0; i < mVirtualDisplays.size(); i++) {
virtualDisplaysToBeReleased[i] = mVirtualDisplays.valueAt(i);
}
mVirtualDisplays.clear();
mVirtualSensorList = null;
mVirtualSensors.clear();
// Device is already closed.
if (!removed) {
return;
}
// Destroy the display outside locked section.
for (VirtualDisplayWrapper virtualDisplayWrapper : virtualDisplaysToBeReleased) {
mDisplayManager.releaseVirtualDisplay(virtualDisplayWrapper.getToken());
// The releaseVirtualDisplay call above won't trigger
// VirtualDeviceImpl.onVirtualDisplayRemoved callback because we already removed the
// virtual device from the service - we release the other display-tied resources here
// with the guarantee it will be done exactly once.
releaseOwnedVirtualDisplayResources(virtualDisplayWrapper);
}
mAppToken.unlinkToDeath(this, 0);
mCameraAccessController.stopObservingIfNeeded();
final long ident = Binder.clearCallingIdentity();
try {
VirtualDisplayWrapper[] virtualDisplaysToBeReleased;
synchronized (mVirtualDeviceLock) {
if (mVirtualAudioController != null) {
mVirtualAudioController.stopListening();
mVirtualAudioController = null;
}
mLocaleList = null;
virtualDisplaysToBeReleased = new VirtualDisplayWrapper[mVirtualDisplays.size()];
for (int i = 0; i < mVirtualDisplays.size(); i++) {
virtualDisplaysToBeReleased[i] = mVirtualDisplays.valueAt(i);
}
mVirtualDisplays.clear();
mVirtualSensorList = null;
mVirtualSensors.clear();
}
// Destroy the display outside locked section.
for (VirtualDisplayWrapper virtualDisplayWrapper : virtualDisplaysToBeReleased) {
mDisplayManager.releaseVirtualDisplay(virtualDisplayWrapper.getToken());
// The releaseVirtualDisplay call above won't trigger
// VirtualDeviceImpl.onVirtualDisplayRemoved callback because we already removed the
// virtual device from the service - we release the other display-tied resources
// here with the guarantee it will be done exactly once.
releaseOwnedVirtualDisplayResources(virtualDisplayWrapper);
}
mAppToken.unlinkToDeath(this, 0);
mCameraAccessController.stopObservingIfNeeded();
mInputController.close();
mSensorController.close();
} finally {

15
services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java
View File

@@ -202,8 +202,19 @@ public class VirtualDeviceManagerService extends SystemService {
}
}
void removeVirtualDevice(int deviceId) {
/**
* Remove the virtual device. Sends the
* {@link VirtualDeviceManager#ACTION_VIRTUAL_DEVICE_REMOVED} broadcast as a result.
*
* @param deviceId deviceId to be removed
* @return {@code true} if the device was removed, {@code false} if the operation was a no-op
*/
boolean removeVirtualDevice(int deviceId) {
synchronized (mVirtualDeviceManagerLock) {
if (!mVirtualDevices.contains(deviceId)) {
return false;
}
mAppsOnVirtualDevices.remove(deviceId);
mVirtualDevices.remove(deviceId);
}
@@ -223,6 +234,7 @@ public class VirtualDeviceManagerService extends SystemService {
} finally {
Binder.restoreCallingIdentity(identity);
}
return true;
}
private void syncVirtualDevicesToCdmAssociations(List<AssociationInfo> associations) {
@@ -248,7 +260,6 @@ public class VirtualDeviceManagerService extends SystemService {
for (VirtualDeviceImpl virtualDevice : virtualDevicesToRemove) {
virtualDevice.close();
}
}
private void registerCdmAssociationListener() {