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

Commit 47193b02 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Inline getVirtualDisplayName into deprecated API" into udc-dev am: 3a829d97 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22335282



Change-Id: I8d54596fc39c1368696ea7c6b23d8daf1f6a2061
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38366f7a 3a829d97

core/java/android/companion/virtual/VirtualDeviceManager.java

+6 −13
Original line number Diff line number Diff line
@@ -540,8 +540,13 @@ public final class VirtualDeviceManager { 
                @VirtualDisplayFlag int flags,

                @Nullable @CallbackExecutor Executor executor,

                @Nullable VirtualDisplay.Callback callback) {

            // Currently this just use the device ID, which means all of the virtual displays

            // created using the same virtual device will have the same name if they use this

            // deprecated API. The name should only be used for informational purposes, and not for

            // identifying the display in code.

            String virtualDisplayName =  "VirtualDevice_" + getDeviceId();

            VirtualDisplayConfig.Builder builder = new VirtualDisplayConfig.Builder(

                    getVirtualDisplayName(), width, height, densityDpi)

                    virtualDisplayName, width, height, densityDpi)

                    .setFlags(flags);

            if (surface != null) {

                builder.setSurface(surface);
@@ -825,18 +830,6 @@ public final class VirtualDeviceManager { 
            }

        }



        private String getVirtualDisplayName() {

            try {

                // Currently this just use the device ID, which means all of the virtual displays

                // created using the same virtual device will have the same name. The name should

                // only be used for informational purposes, and not for identifying the display in

                // code.

                return "VirtualDevice_" + mVirtualDevice.getDeviceId();

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

        }



        /**

         * Adds an activity listener to listen for events such as top activity change or virtual

         * display task stack became empty.