Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb8cfbba authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add virtual device id to exceptions in createVirtualDisplay" into main

parents 0c7a3b3c f85941b4

services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java

+5 −2
Original line number Diff line number Diff line
@@ -498,13 +498,16 @@ public class VirtualDeviceManagerService extends SystemService { 
            synchronized (mVirtualDeviceManagerLock) {

                virtualDeviceImpl = mVirtualDevices.get(virtualDevice.getDeviceId());

                if (virtualDeviceImpl == null) {

                    throw new SecurityException("Invalid VirtualDevice");

                    throw new SecurityException(

                            "Invalid VirtualDevice (deviceId = " + virtualDevice.getDeviceId()

                                    + ")");

                }

            }

            if (virtualDeviceImpl.getOwnerUid() != callingUid) {

                throw new SecurityException(

                        "uid " + callingUid

                                + " is not the owner of the supplied VirtualDevice");

                                + " is not the owner of the supplied VirtualDevice (deviceId = "

                                + virtualDevice.getDeviceId() + ")");

            }



            return virtualDeviceImpl.createVirtualDisplay(