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

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

Merge "Remove VDMS reference from VirtualDeviceInternal" into main

parents 30e57c36 7f5dff65

core/java/android/companion/virtual/VirtualDeviceInternal.java

+1 −7
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ import java.util.function.IntConsumer; 
public class VirtualDeviceInternal {



    private final Context mContext;

    private final IVirtualDeviceManager mService;

    private final IVirtualDevice mVirtualDevice;

    private final Object mActivityListenersLock = new Object();

    @GuardedBy("mActivityListenersLock")
@@ -206,7 +205,6 @@ public class VirtualDeviceInternal { 
            Context context,

            int associationId,

            VirtualDeviceParams params) throws RemoteException {

        mService = service;

        mContext = context.getApplicationContext();

        mVirtualDevice = service.createVirtualDevice(

                new Binder(),
@@ -217,11 +215,7 @@ public class VirtualDeviceInternal { 
                mSoundEffectListener);

    }



    VirtualDeviceInternal(

            IVirtualDeviceManager service,

            Context context,

            IVirtualDevice virtualDevice) {

        mService = service;

    VirtualDeviceInternal(Context context, IVirtualDevice virtualDevice) {

        mContext = context.getApplicationContext();

        mVirtualDevice = virtualDevice;

        try {

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

+2 −3
Original line number Diff line number Diff line
@@ -577,9 +577,8 @@ public final class VirtualDeviceManager { 
        }



        /** @hide */

        public VirtualDevice(IVirtualDeviceManager service, Context context,

                IVirtualDevice virtualDevice) {

            mVirtualDeviceInternal = new VirtualDeviceInternal(service, context, virtualDevice);

        public VirtualDevice(Context context, IVirtualDevice virtualDevice) {

            mVirtualDeviceInternal = new VirtualDeviceInternal(context, virtualDevice);

        }



        /**

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

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ public class VirtualDeviceManagerService extends SystemService { 
                    params,

                    /* activityListener= */ null,

                    /* soundEffectListener= */ null);

            return new VirtualDeviceManager.VirtualDevice(mImpl, getContext(), virtualDevice);

            return new VirtualDeviceManager.VirtualDevice(getContext(), virtualDevice);

        }



        @Override