Merge "Camera2: Switch to auto-gen C++ binder interfaces" into nyc-dev (74989b4d) · Commits · e / os / android_frameworks_base

Android.mk

+12 −8

Original line number	Diff line number	Diff line
		@@ -150,14 +150,14 @@ LOCAL_SRC_FILES += \
		core/java/android/content/pm/IPackageStatsObserver.aidl \
		core/java/android/content/pm/IOnPermissionsChangeListener.aidl \
		core/java/android/database/IContentObserver.aidl \
		core/java/android/hardware/ICameraService.aidl \
		core/java/android/hardware/ICameraServiceListener.aidl \
		core/java/android/hardware/ICameraServiceProxy.aidl \
		core/java/android/hardware/ICamera.aidl \
		core/java/android/hardware/ICameraClient.aidl \
		../av/camera/aidl/android/hardware/ICameraService.aidl \
		../av/camera/aidl/android/hardware/ICameraServiceListener.aidl \
		../av/camera/aidl/android/hardware/ICameraServiceProxy.aidl \
		../av/camera/aidl/android/hardware/ICamera.aidl \
		../av/camera/aidl/android/hardware/ICameraClient.aidl \
		../av/camera/aidl/android/hardware/camera2/ICameraDeviceUser.aidl \
		../av/camera/aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl \
		core/java/android/hardware/IConsumerIrService.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/display/IDisplayManager.aidl \
		core/java/android/hardware/display/IDisplayManagerCallback.aidl \
		@@ -455,6 +455,10 @@ LOCAL_AIDL_INCLUDES += \
		$(FRAMEWORKS_BASE_JAVA_SRC_DIRS) \
		frameworks/native/aidl/binder

		LOCAL_AIDL_INCLUDES += \
		frameworks/av/camera/aidl \
		frameworks/native/aidl/gui

		LOCAL_INTERMEDIATE_SOURCES := \
		$(framework_res_source_path)/android/R.java \
		$(framework_res_source_path)/android/Manifest.java \
		@@ -577,7 +581,7 @@ aidl_files := \
		frameworks/base/core/java/android/view/Display.aidl \
		frameworks/base/core/java/android/view/InputDevice.aidl \
		frameworks/base/core/java/android/view/InputEvent.aidl \
		frameworks/base/core/java/android/view/Surface.aidl \
		frameworks/native/aidl/gui/android/view/Surface.aidl \
		frameworks/base/core/java/android/view/WindowContentFrameStats.aidl \
		frameworks/base/core/java/android/view/inputmethod/InputMethodSubtype.aidl \
		frameworks/base/core/java/android/view/inputmethod/CursorAnchorInfo.aidl \

core/java/android/hardware/CameraInfo.aidl

deleted100644 → 0

+0 −20

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 */
		parcelable CameraInfo;

core/java/android/hardware/ICamera.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 ICamera
		{
		/**
		* Keep up-to-date with frameworks/av/include/camera/ICamera.h
		*/
		void disconnect();
		}

core/java/android/hardware/ICameraClient.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 ICameraClient
		{
		/**
		* Keep up-to-date with frameworks/av/include/camera/ICameraClient.h
		*/
		// TODO: consider implementing this.
		}

core/java/android/hardware/ICameraService.aidl

deleted100644 → 0

+0 −89

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;

		import android.hardware.ICamera;
		import android.hardware.ICameraClient;
		import android.hardware.camera2.ICameraDeviceUser;
		import android.hardware.camera2.ICameraDeviceCallbacks;
		import android.hardware.camera2.impl.CameraMetadataNative;
		import android.hardware.camera2.utils.BinderHolder;
		import android.hardware.ICameraServiceListener;
		import android.hardware.CameraInfo;

		/**
		* Binder interface for the native camera service running in mediaserver.
		*
		* @hide
		*/
		interface ICameraService
		{
		/**
		* Keep up-to-date with frameworks/av/include/camera/ICameraService.h
		*/
		int getNumberOfCameras(int type);

		// rest of 'int' return values in this file are actually status_t

		int getCameraInfo(int cameraId, out CameraInfo info);

		int connect(ICameraClient client, int cameraId,
		String opPackageName,
		int clientUid,
		// Container for an ICamera object
		out BinderHolder device);

		int connectDevice(ICameraDeviceCallbacks callbacks, int cameraId,
		String opPackageName,
		int clientUid,
		// Container for an ICameraDeviceUser object
		out BinderHolder device);

		int addListener(ICameraServiceListener listener);
		int removeListener(ICameraServiceListener listener);

		int getCameraCharacteristics(int cameraId, out CameraMetadataNative info);

		/**
		* The java stubs for this method are not intended to be used. Please use
		* the native stub in frameworks/av/include/camera/ICameraService.h instead.
		* The BinderHolder output is being used as a placeholder, and will not be
		* well-formatted in the generated java method.
		*/
		int getCameraVendorTagDescriptor(out BinderHolder desc);

		// Writes the camera1 parameters into a single-element array.
		int getLegacyParameters(int cameraId, out String[] parameters);
		// Determines if a particular API version is supported; see ICameraService.h for version defines
		int supportsCameraApi(int cameraId, int apiVersion);

		int connectLegacy(ICameraClient client, int cameraId,
		int halVersion,
		String opPackageName,
		int clientUid,
		// Container for an ICamera object
		out BinderHolder device);

		int setTorchMode(String CameraId, boolean enabled, IBinder clientBinder);

		/**
		* Notify the camera service of a system event. Should only be called from system_server.
		*
		* Callers require the android.permission.CAMERA_SEND_SYSTEM_EVENTS permission.
		*/
		oneway void notifySystemEvent(int eventId, in int[] args);
		}