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

Commit f086d786 authored by Ján Sebechlebský's avatar Ján Sebechlebský Committed by Automerger Merge Worker
Browse files

Merge "Do not share VirtualDeviceImpl lock with SensorController" into udc-dev am: d3924d0e 

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



Change-Id: I089ca5837b96a28b890399bfbe08746f45b64e8d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 435313a8 d3924d0e

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

+4 −5
Original line number Original line Diff line number Diff line
@@ -53,19 +53,18 @@ public class SensorController { 




    private static AtomicInteger sNextDirectChannelHandle = new AtomicInteger(1);

    private static AtomicInteger sNextDirectChannelHandle = new AtomicInteger(1);





    private final Object mLock;

    private final Object mLock = new Object();

    private final int mVirtualDeviceId;

    private final int mVirtualDeviceId;

    @GuardedBy("mLock")

    @GuardedBy("mLock")

    private final Map<IBinder, SensorDescriptor> mSensorDescriptors = new ArrayMap<>();

    private final ArrayMap<IBinder, SensorDescriptor> mSensorDescriptors = new ArrayMap<>();





    @NonNull

    @NonNull

    private final SensorManagerInternal.RuntimeSensorCallback mRuntimeSensorCallback;

    private final SensorManagerInternal.RuntimeSensorCallback mRuntimeSensorCallback;

    private final SensorManagerInternal mSensorManagerInternal;

    private final SensorManagerInternal mSensorManagerInternal;

    private final VirtualDeviceManagerInternal mVdmInternal;

    private final VirtualDeviceManagerInternal mVdmInternal;





    public SensorController(@NonNull Object lock, int virtualDeviceId,

    public SensorController(int virtualDeviceId,

            @Nullable IVirtualSensorCallback virtualSensorCallback) {

            @Nullable IVirtualSensorCallback virtualSensorCallback) {

        mLock = lock;

        mVirtualDeviceId = virtualDeviceId;

        mVirtualDeviceId = virtualDeviceId;

        mRuntimeSensorCallback = new RuntimeSensorCallbackWrapper(virtualSensorCallback);

        mRuntimeSensorCallback = new RuntimeSensorCallbackWrapper(virtualSensorCallback);

        mSensorManagerInternal = LocalServices.getService(SensorManagerInternal.class);

        mSensorManagerInternal = LocalServices.getService(SensorManagerInternal.class);
@@ -185,7 +184,7 @@ public class SensorController { 
    @VisibleForTesting

    @VisibleForTesting

    Map<IBinder, SensorDescriptor> getSensorDescriptors() {

    Map<IBinder, SensorDescriptor> getSensorDescriptors() {

        synchronized (mLock) {

        synchronized (mLock) {

            return mSensorDescriptors;

            return new ArrayMap<>(mSensorDescriptors);

        }

        }

    }

    }

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -266,8 +266,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 
            mInputController = inputController;

            mInputController = inputController;

        }

        }

        if (sensorController == null) {

        if (sensorController == null) {

            mSensorController = new SensorController(

            mSensorController = new SensorController(mDeviceId, mParams.getVirtualSensorCallback());

                    mVirtualDeviceLock, mDeviceId, mParams.getVirtualSensorCallback());

        } else {

        } else {

            mSensorController = sensorController;

            mSensorController = sensorController;

        }

        }

services/tests/servicestests/src/com/android/server/companion/virtual/SensorControllerTest.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -70,8 +70,7 @@ public class SensorControllerTest { 
        LocalServices.removeServiceForTest(SensorManagerInternal.class);

        LocalServices.removeServiceForTest(SensorManagerInternal.class);

        LocalServices.addService(SensorManagerInternal.class, mSensorManagerInternalMock);

        LocalServices.addService(SensorManagerInternal.class, mSensorManagerInternalMock);





        mSensorController =

        mSensorController = new SensorController(VIRTUAL_DEVICE_ID, mVirtualSensorCallback);

                new SensorController(new Object(), VIRTUAL_DEVICE_ID, mVirtualSensorCallback);

        mSensorEvent = new VirtualSensorEvent.Builder(new float[] { 1f, 2f, 3f}).build();

        mSensorEvent = new VirtualSensorEvent.Builder(new float[] { 1f, 2f, 3f}).build();

        mVirtualSensorConfig =

        mVirtualSensorConfig =

                new VirtualSensorConfig.Builder(Sensor.TYPE_ACCELEROMETER, VIRTUAL_SENSOR_NAME)

                new VirtualSensorConfig.Builder(Sensor.TYPE_ACCELEROMETER, VIRTUAL_SENSOR_NAME)

services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -359,8 +359,7 @@ public class VirtualDeviceManagerServiceTest { 
        mInputController = new InputController(mNativeWrapperMock,

        mInputController = new InputController(mNativeWrapperMock,

                new Handler(TestableLooper.get(this).getLooper()),

                new Handler(TestableLooper.get(this).getLooper()),

                mContext.getSystemService(WindowManager.class), threadVerifier);

                mContext.getSystemService(WindowManager.class), threadVerifier);

        mSensorController =

        mSensorController = new SensorController(VIRTUAL_DEVICE_ID_1, mVirtualSensorCallback);

                new SensorController(new Object(), VIRTUAL_DEVICE_ID_1, mVirtualSensorCallback);

        mCameraAccessController =

        mCameraAccessController =

                new CameraAccessController(mContext, mLocalService, mCameraAccessBlockedCallback);

                new CameraAccessController(mContext, mLocalService, mCameraAccessBlockedCallback);