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

Commit a6359b82 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Pipe though featureId from context to note-ops by camera code 

Bug: 136595429
Test: atest CtsAppOpsTestCases (now including two new test cases that
              open a camera with a null and a non-null feature)
Change-Id: Ia9be1016e4e6a1a2af09b7b08c9d0373440813c6
parent ec3c03ea

core/java/android/hardware/camera2/CameraManager.java

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ public final class CameraManager { 
                            "Camera service is currently unavailable");

                    }

                    cameraUser = cameraService.connectDevice(callbacks, cameraId,

                            mContext.getOpPackageName(), uid);

                            mContext.getOpPackageName(), mContext.getFeatureId(), uid);

                } else {

                    // Use legacy camera implementation for HAL1 devices

                    int id;

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java

+2 −1
Original line number Diff line number Diff line
@@ -284,11 +284,12 @@ public class CameraBinderTest extends AndroidTestCase { 
            ICameraDeviceCallbacks dummyCallbacks = new DummyCameraDeviceCallbacks();



            String clientPackageName = getContext().getPackageName();

            String clientFeatureId = getContext().getFeatureId();



            ICameraDeviceUser cameraUser =

                    mUtils.getCameraService().connectDevice(

                        dummyCallbacks, String.valueOf(cameraId),

                        clientPackageName,

                        clientPackageName, clientFeatureId,

                        ICameraService.USE_CALLING_UID);

            assertNotNull(String.format("Camera %s was null", cameraId), cameraUser);

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java

+2 −1
Original line number Diff line number Diff line
@@ -238,11 +238,12 @@ public class CameraDeviceBinderTest extends AndroidTestCase { 
        ICameraDeviceCallbacks.Stub dummyCallbacks = new DummyCameraDeviceCallbacks();



        String clientPackageName = getContext().getPackageName();

        String clientFeatureId = getContext().getFeatureId();



        mMockCb = spy(dummyCallbacks);



        mCameraUser = mUtils.getCameraService().connectDevice(mMockCb, mCameraId,

                clientPackageName, ICameraService.USE_CALLING_UID);

                clientPackageName, clientFeatureId, ICameraService.USE_CALLING_UID);

        assertNotNull(String.format("Camera %s was null", mCameraId), mCameraUser);

        mHandlerThread = new HandlerThread(TAG);

        mHandlerThread.start();