diff options
5 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/companion/virtual/IVirtualDevice.aidl b/core/java/android/companion/virtual/IVirtualDevice.aidl index 30a1135d6be4..24f18cc257f8 100644 --- a/core/java/android/companion/virtual/IVirtualDevice.aidl +++ b/core/java/android/companion/virtual/IVirtualDevice.aidl @@ -281,5 +281,5 @@ interface IVirtualDevice { * Returns the id of the virtual camera with given config. */ @EnforcePermission("CREATE_VIRTUAL_DEVICE") - int getVirtualCameraId(in VirtualCameraConfig camera); + String getVirtualCameraId(in VirtualCameraConfig camera); } diff --git a/core/java/android/companion/virtual/VirtualDeviceInternal.java b/core/java/android/companion/virtual/VirtualDeviceInternal.java index 00d534370fa1..60448bad8e69 100644 --- a/core/java/android/companion/virtual/VirtualDeviceInternal.java +++ b/core/java/android/companion/virtual/VirtualDeviceInternal.java @@ -378,8 +378,8 @@ public class VirtualDeviceInternal { VirtualCamera createVirtualCamera(@NonNull VirtualCameraConfig config) { try { mVirtualDevice.registerVirtualCamera(config); - return new VirtualCamera(mVirtualDevice, - Integer.toString(mVirtualDevice.getVirtualCameraId(config)), config); + return new VirtualCamera(mVirtualDevice, mVirtualDevice.getVirtualCameraId(config), + config); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java index 4a9900763a94..6704049e3612 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java @@ -1055,7 +1055,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub @Override // Binder call @EnforcePermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) - public int getVirtualCameraId(@NonNull VirtualCameraConfig cameraConfig) + public String getVirtualCameraId(@NonNull VirtualCameraConfig cameraConfig) throws RemoteException { super.getVirtualCameraId_enforcePermission(); Objects.requireNonNull(cameraConfig); diff --git a/services/companion/java/com/android/server/companion/virtual/camera/VirtualCameraController.java b/services/companion/java/com/android/server/companion/virtual/camera/VirtualCameraController.java index 743086ee1c16..62efafbe12c6 100644 --- a/services/companion/java/com/android/server/companion/virtual/camera/VirtualCameraController.java +++ b/services/companion/java/com/android/server/companion/virtual/camera/VirtualCameraController.java @@ -135,7 +135,7 @@ public final class VirtualCameraController implements IBinder.DeathRecipient { } /** Return the id of the virtual camera with the given config. */ - public int getCameraId(@NonNull VirtualCameraConfig cameraConfig) { + public String getCameraId(@NonNull VirtualCameraConfig cameraConfig) { connectVirtualCameraServiceIfNeeded(); try { diff --git a/services/tests/servicestests/src/com/android/server/companion/virtual/camera/VirtualCameraControllerTest.java b/services/tests/servicestests/src/com/android/server/companion/virtual/camera/VirtualCameraControllerTest.java index 4505a8b88b25..627ca03c8d96 100644 --- a/services/tests/servicestests/src/com/android/server/companion/virtual/camera/VirtualCameraControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/companion/virtual/camera/VirtualCameraControllerTest.java @@ -95,7 +95,7 @@ public class VirtualCameraControllerTest { mVirtualCameraController = new VirtualCameraController(mVirtualCameraServiceMock, DEVICE_POLICY_CUSTOM, DEVICE_ID); when(mVirtualCameraServiceMock.registerCamera(any(), any(), anyInt())).thenReturn(true); - when(mVirtualCameraServiceMock.getCameraId(any())).thenReturn(0); + when(mVirtualCameraServiceMock.getCameraId(any())).thenReturn("0"); } @After |