am 6f378ce8: am 08f6d3c2: am d74c31e2: Merge "Fixes for APi review" into mnc-dev (98229449) · Commits · e / os / android_frameworks_base

api/current.txt

+13 −13

Original line number	Diff line number	Diff line
		@@ -30049,15 +30049,6 @@ package android.telecom {
		field public static final int PROPERTY_WIFI = 8; // 0x8
		}

		public final class CameraCapabilities implements android.os.Parcelable {
		ctor public CameraCapabilities(int, int);
		method public int describeContents();
		method public int getHeight();
		method public int getWidth();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.CameraCapabilities> CREATOR;
		}

		public abstract class Conference implements android.telecom.Conferenceable {
		ctor public Conference(android.telecom.PhoneAccountHandle);
		method public final boolean addConnection(android.telecom.Connection);
		@@ -30183,7 +30174,7 @@ package android.telecom {
		public static abstract class Connection.VideoProvider {
		ctor public Connection.VideoProvider();
		method public void changeCallDataUsage(long);
		method public void changeCameraCapabilities(android.telecom.CameraCapabilities);
		method public void changeCameraCapabilities(android.telecom.VideoProfile.CameraCapabilities);
		method public void changePeerDimensions(int, int);
		method public void changeVideoQuality(int);
		method public void handleCallSessionEvent(int);
		@@ -30315,14 +30306,14 @@ package android.telecom {
		ctor public InCallService.VideoCall.Callback();
		method public abstract void onCallDataUsageChanged(long);
		method public abstract void onCallSessionEvent(int);
		method public abstract void onCameraCapabilitiesChanged(android.telecom.CameraCapabilities);
		method public abstract void onCameraCapabilitiesChanged(android.telecom.VideoProfile.CameraCapabilities);
		method public abstract void onPeerDimensionsChanged(int, int);
		method public abstract void onSessionModifyRequestReceived(android.telecom.VideoProfile);
		method public abstract void onSessionModifyResponseReceived(int, android.telecom.VideoProfile, android.telecom.VideoProfile);
		method public abstract void onVideoQualityChanged(int);
		}

		public class PhoneAccount implements android.os.Parcelable {
		public final class PhoneAccount implements android.os.Parcelable {
		method public static android.telecom.PhoneAccount.Builder builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence);
		method public android.graphics.drawable.Drawable createIconDrawable(android.content.Context);
		method public int describeContents();
		@@ -30374,7 +30365,7 @@ package android.telecom {
		method public android.telecom.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>);
		}

		public class PhoneAccountHandle implements android.os.Parcelable {
		public final class PhoneAccountHandle implements android.os.Parcelable {
		ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String);
		ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String, android.os.UserHandle);
		method public int describeContents();
		@@ -30532,6 +30523,15 @@ package android.telecom {
		field public static final int QUALITY_MEDIUM = 2; // 0x2
		}

		public static final class VideoProfile.CameraCapabilities implements android.os.Parcelable {
		ctor public VideoProfile.CameraCapabilities(int, int);
		method public int describeContents();
		method public int getHeight();
		method public int getWidth();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.VideoProfile.CameraCapabilities> CREATOR;
		}

		public static class VideoProfile.VideoState {
		ctor public VideoProfile.VideoState();
		method public static boolean isAudioOnly(int);

api/system-current.txt

+13 −13

Original line number	Diff line number	Diff line
		@@ -32179,15 +32179,6 @@ package android.telecom {
		ctor public Call.Listener();
		}

		public final class CameraCapabilities implements android.os.Parcelable {
		ctor public CameraCapabilities(int, int);
		method public int describeContents();
		method public int getHeight();
		method public int getWidth();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.CameraCapabilities> CREATOR;
		}

		public abstract class Conference implements android.telecom.Conferenceable {
		ctor public Conference(android.telecom.PhoneAccountHandle);
		method public final boolean addConnection(android.telecom.Connection);
		@@ -32316,7 +32307,7 @@ package android.telecom {
		public static abstract class Connection.VideoProvider {
		ctor public Connection.VideoProvider();
		method public void changeCallDataUsage(long);
		method public void changeCameraCapabilities(android.telecom.CameraCapabilities);
		method public void changeCameraCapabilities(android.telecom.VideoProfile.CameraCapabilities);
		method public void changePeerDimensions(int, int);
		method public void changeVideoQuality(int);
		method public void handleCallSessionEvent(int);
		@@ -32451,7 +32442,7 @@ package android.telecom {
		ctor public InCallService.VideoCall.Callback();
		method public abstract void onCallDataUsageChanged(long);
		method public abstract void onCallSessionEvent(int);
		method public abstract void onCameraCapabilitiesChanged(android.telecom.CameraCapabilities);
		method public abstract void onCameraCapabilitiesChanged(android.telecom.VideoProfile.CameraCapabilities);
		method public abstract void onPeerDimensionsChanged(int, int);
		method public abstract void onSessionModifyRequestReceived(android.telecom.VideoProfile);
		method public abstract void onSessionModifyResponseReceived(int, android.telecom.VideoProfile, android.telecom.VideoProfile);
		@@ -32477,7 +32468,7 @@ package android.telecom {
		method public void onCanAddCallChanged(android.telecom.Phone, boolean);
		}

		public class PhoneAccount implements android.os.Parcelable {
		public final class PhoneAccount implements android.os.Parcelable {
		method public static android.telecom.PhoneAccount.Builder builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence);
		method public android.graphics.drawable.Drawable createIconDrawable(android.content.Context);
		method public int describeContents();
		@@ -32530,7 +32521,7 @@ package android.telecom {
		method public android.telecom.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>);
		}

		public class PhoneAccountHandle implements android.os.Parcelable {
		public final class PhoneAccountHandle implements android.os.Parcelable {
		ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String);
		ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String, android.os.UserHandle);
		method public int describeContents();
		@@ -32707,6 +32698,15 @@ package android.telecom {
		field public static final int QUALITY_MEDIUM = 2; // 0x2
		}

		public static final class VideoProfile.CameraCapabilities implements android.os.Parcelable {
		ctor public VideoProfile.CameraCapabilities(int, int);
		method public int describeContents();
		method public int getHeight();
		method public int getWidth();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.VideoProfile.CameraCapabilities> CREATOR;
		}

		public static class VideoProfile.VideoState {
		ctor public VideoProfile.VideoState();
		method public static boolean isAudioOnly(int);

telecomm/java/android/telecom/CameraCapabilities.aidl

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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.telecom;

		/**
		* {@hide}
		*/
		parcelable CameraCapabilities;

telecomm/java/android/telecom/CameraCapabilities.java

deleted100644 → 0

+0 −157

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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.telecom;

		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* Represents the camera capabilities important to a Video Telephony provider.
		*/
		public final class CameraCapabilities implements Parcelable {

		/**
		* The width of the camera video in pixels.
		*/
		private final int mWidth;

		/**
		* The height of the camera video in pixels.
		*/
		private final int mHeight;

		/**
		* Whether the camera supports zoom.
		*/
		private final boolean mZoomSupported;

		/**
		* The maximum zoom supported by the camera.
		*/
		private final float mMaxZoom;

		/**
		* Create a call camera capabilities instance.
		*
		* @param width The width of the camera video (in pixels).
		* @param height The height of the camera video (in pixels).
		*/
		public CameraCapabilities(int width, int height) {
		this(width, height, false, 1.0f);
		}

		/**
		* Create a call camera capabilities instance that optionally
		* supports zoom.
		*
		* @param width The width of the camera video (in pixels).
		* @param height The height of the camera video (in pixels).
		* @param zoomSupported True when camera supports zoom.
		* @param maxZoom Maximum zoom supported by camera.
		* @hide
		*/
		public CameraCapabilities(int width, int height, boolean zoomSupported, float maxZoom) {
		mWidth = width;
		mHeight = height;
		mZoomSupported = zoomSupported;
		mMaxZoom = maxZoom;
		}

		/**
		* Responsible for creating CallCameraCapabilities objects from deserialized Parcels.
		**/
		public static final Parcelable.Creator<CameraCapabilities> CREATOR =
		new Parcelable.Creator<CameraCapabilities> () {
		/**
		* Creates a CallCameraCapabilities instances from a parcel.
		*
		* @param source The parcel.
		* @return The CallCameraCapabilities.
		*/
		@Override
		public CameraCapabilities createFromParcel(Parcel source) {
		int width = source.readInt();
		int height = source.readInt();
		boolean supportsZoom = source.readByte() != 0;
		float maxZoom = source.readFloat();

		return new CameraCapabilities(width, height, supportsZoom, maxZoom);
		}

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

		/**
		* Describe the kinds of special objects contained in this Parcelable's
		* marshalled representation.
		*
		* @return a bitmask indicating the set of special object types marshalled
		* by the Parcelable.
		*/
		@Override
		public int describeContents() {
		return 0;
		}

		/**
		* Flatten this object in to a Parcel.
		*
		* @param dest The Parcel in which the object should be written.
		* @param flags Additional flags about how the object should be written.
		* May be 0 or {@link #PARCELABLE_WRITE_RETURN_VALUE}.
		*/
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeInt(getWidth());
		dest.writeInt(getHeight());
		dest.writeByte((byte) (isZoomSupported() ? 1 : 0));
		dest.writeFloat(getMaxZoom());
		}

		/**
		* The width of the camera video in pixels.
		*/
		public int getWidth() {
		return mWidth;
		}

		/**
		* The height of the camera video in pixels.
		*/
		public int getHeight() {
		return mHeight;
		}

		/**
		* Whether the camera supports zoom.
		* @hide
		*/
		public boolean isZoomSupported() {
		return mZoomSupported;
		}

		/**
		* The maximum zoom supported by the camera.
		* @hide
		*/
		public float getMaxZoom() {
		return mMaxZoom;
		}
		}

telecomm/java/android/telecom/Connection.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -742,7 +742,7 @@ public abstract class Connection implements Conferenceable {
		*
		* @param cameraCapabilities The changed camera capabilities.
		*/
		public void changeCameraCapabilities(CameraCapabilities cameraCapabilities) {
		public void changeCameraCapabilities(VideoProfile.CameraCapabilities cameraCapabilities) {
		if (mVideoCallbacks != null) {
		try {
		for (IVideoCallback callback : mVideoCallbacks.values()) {