camera2: Remove ProCamera.
Bug: 19186859
Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
diff --git a/Android.mk b/Android.mk
index 30318d6..1df2af3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -145,8 +145,6 @@
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 \
diff --git a/core/java/android/hardware/ICameraService.aidl b/core/java/android/hardware/ICameraService.aidl
index 9aede01..d5dfaf6 100644
--- a/core/java/android/hardware/ICameraService.aidl
+++ b/core/java/android/hardware/ICameraService.aidl
@@ -18,8 +18,6 @@
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 @@
// 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,
diff --git a/core/java/android/hardware/IProCameraCallbacks.aidl b/core/java/android/hardware/IProCameraCallbacks.aidl
deleted file mode 100644
index a09b452..0000000
--- a/core/java/android/hardware/IProCameraCallbacks.aidl
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
-}
diff --git a/core/java/android/hardware/IProCameraUser.aidl b/core/java/android/hardware/IProCameraUser.aidl
deleted file mode 100644
index eacb0f4..0000000
--- a/core/java/android/hardware/IProCameraUser.aidl
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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();
-}
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java
index 362bbc4..3bb5f01 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java
@@ -20,8 +20,6 @@
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 @@
}
}
- 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;