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

Commit 7559a98e authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "camera2: Remove ProCamera."

parents 43c0e5bf 2c2546a2

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -145,8 +145,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/hardware/ICamera.aidl \

	core/java/android/hardware/ICameraClient.aidl \

	core/java/android/hardware/IConsumerIrService.aidl \

	core/java/android/hardware/IProCameraUser.aidl \

	core/java/android/hardware/IProCameraCallbacks.aidl \

	core/java/android/hardware/camera2/ICameraDeviceUser.aidl \

	core/java/android/hardware/camera2/ICameraDeviceCallbacks.aidl \

	core/java/android/hardware/ISerialManager.aidl \

core/java/android/hardware/ICameraService.aidl

+0 −8
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package android.hardware; 


import android.hardware.ICamera;

import android.hardware.ICameraClient;

import android.hardware.IProCameraUser;

import android.hardware.IProCameraCallbacks;

import android.hardware.camera2.ICameraDeviceUser;

import android.hardware.camera2.ICameraDeviceCallbacks;

import android.hardware.camera2.impl.CameraMetadataNative;
@@ -45,12 +43,6 @@ interface ICameraService 
                    // Container for an ICamera object

                    out BinderHolder device);



    int connectPro(IProCameraCallbacks callbacks, int cameraId,

                              String clientPackageName,

                              int clientUid,

                              // Container for an IProCameraUser object

                              out BinderHolder device);



    int connectDevice(ICameraDeviceCallbacks callbacks, int cameraId,

                              String clientPackageName,

                              int clientUid,

core/java/android/hardware/IProCameraCallbacks.aidl

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware;



/** @hide */

interface IProCameraCallbacks

{

    /**

     * Keep up-to-date with frameworks/av/include/camera/IProCameraCallbacks.h

     */

    // TODO: consider implementing this.

}

core/java/android/hardware/IProCameraUser.aidl

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware;



/** @hide */

interface IProCameraUser

{

    /**

     * Keep up-to-date with frameworks/av/include/camera/IProCameraUser.h

     */

    void disconnect();

}

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

+0 −26
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import android.hardware.CameraInfo; 
import android.hardware.ICamera;

import android.hardware.ICameraClient;

import android.hardware.ICameraServiceListener;

import android.hardware.IProCameraCallbacks;

import android.hardware.IProCameraUser;

import android.hardware.camera2.ICameraDeviceCallbacks;

import android.hardware.camera2.ICameraDeviceUser;

import android.hardware.camera2.impl.CameraMetadataNative;
@@ -181,30 +179,6 @@ public class CameraBinderTest extends AndroidTestCase { 
        }

    }



    static class DummyProCameraCallbacks extends DummyBase implements IProCameraCallbacks {

    }



    @SmallTest

    public void testConnectPro() throws Exception {

        for (int cameraId = 0; cameraId < mUtils.getGuessedNumCameras(); ++cameraId) {



            IProCameraCallbacks dummyCallbacks = new DummyProCameraCallbacks();



            String clientPackageName = getContext().getPackageName();



            BinderHolder holder = new BinderHolder();

            CameraBinderDecorator.newInstance(mUtils.getCameraService())

                    .connectPro(dummyCallbacks, cameraId,

                    clientPackageName, CameraBinderTestUtils.USE_CALLING_UID, holder);

            IProCameraUser cameraUser = IProCameraUser.Stub.asInterface(holder.getBinder());

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



            Log.v(TAG, String.format("Camera %s connected", cameraId));



            cameraUser.disconnect();

        }

    }



    @SmallTest

    public void testConnectLegacy() throws Exception {

        final int CAMERA_HAL_API_VERSION_1_0 = 0x100;