Merge "camera: Add Java binder proxies for some existing binder interfaces" (cf88be6d) · Commits · e / os / android_frameworks_base

Android.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,12 @@ LOCAL_SRC_FILES += \
		core/java/android/content/pm/IPackageMoveObserver.aidl \
		core/java/android/content/pm/IPackageStatsObserver.aidl \
		core/java/android/database/IContentObserver.aidl \
		core/java/android/hardware/ICameraService.aidl \
		core/java/android/hardware/ICameraServiceListener.aidl \
		core/java/android/hardware/ICamera.aidl \
		core/java/android/hardware/ICameraClient.aidl \
		core/java/android/hardware/IProCameraUser.aidl \
		core/java/android/hardware/IProCameraCallbacks.aidl \
		core/java/android/hardware/ISerialManager.aidl \
		core/java/android/hardware/display/IDisplayManager.aidl \
		core/java/android/hardware/display/IDisplayManagerCallback.aidl \

core/java/android/hardware/CameraInfo.aidl

0 → 100644

+20 −0

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/CameraInfo.java

0 → 100644

+63 −0

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.os.Parcel;
		import android.os.Parcelable;

		/**
		* Information about a camera
		*
		* @hide
		*/
		public class CameraInfo implements Parcelable {
		// Can't parcel nested classes, so make this a top level class that composes
		// CameraInfo.
		public Camera.CameraInfo info = new Camera.CameraInfo();

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeInt(info.facing);
		out.writeInt(info.orientation);
		}

		public void readFromParcel(Parcel in) {
		info.facing = in.readInt();
		info.orientation = in.readInt();
		}

		public static final Parcelable.Creator<CameraInfo> CREATOR =
		new Parcelable.Creator<CameraInfo>() {
		@Override
		public CameraInfo createFromParcel(Parcel in) {
		CameraInfo info = new CameraInfo();
		info.readFromParcel(in);

		return info;
		}

		@Override
		public CameraInfo[] newArray(int size) {
		return new CameraInfo[size];
		}
		};
		};

core/java/android/hardware/ICamera.aidl

0 → 100644

+26 −0

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

0 → 100644

+26 −0

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.
		}