Merge "API 25 is frozen, so we can't change API." into nyc-mr1-dev (663cfc0f) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −18

Original line number	Diff line number	Diff line
		@@ -39382,14 +39382,10 @@ package android.telecom {
		method public java.lang.String getConnectionService();
		method public java.util.List<android.telecom.ParcelableCallAnalytics.EventTiming> getEventTimings();
		method public long getStartTimeMillis();
		method public java.util.List<android.telecom.ParcelableCallAnalytics.VideoEvent> getVideoEvents();
		method public boolean isAdditionalCall();
		method public boolean isCreatedFromExistingConnection();
		method public boolean isEmergencyCall();
		method public boolean isInterrupted();
		method public boolean isVideoCall();
		method public void setIsVideoCall(boolean);
		method public void setVideoEvents(java.util.List<android.telecom.ParcelableCallAnalytics.VideoEvent>);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int CALLTYPE_INCOMING = 1; // 0x1
		field public static final int CALLTYPE_OUTGOING = 2; // 0x2
		@@ -39472,20 +39468,6 @@ package android.telecom {
		field public static final int UNHOLD_TIMING = 4; // 0x4
		}

		public static final class ParcelableCallAnalytics.VideoEvent implements android.os.Parcelable {
		ctor public ParcelableCallAnalytics.VideoEvent(int, long, int);
		method public int describeContents();
		method public int getEventName();
		method public long getTimeSinceLastEvent();
		method public int getVideoState();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.ParcelableCallAnalytics.VideoEvent> CREATOR;
		field public static final int RECEIVE_REMOTE_SESSION_MODIFY_REQUEST = 2; // 0x2
		field public static final int RECEIVE_REMOTE_SESSION_MODIFY_RESPONSE = 3; // 0x3
		field public static final int SEND_LOCAL_SESSION_MODIFY_REQUEST = 0; // 0x0
		field public static final int SEND_LOCAL_SESSION_MODIFY_RESPONSE = 1; // 0x1
		}

		public final deprecated class Phone {
		method public final void addListener(android.telecom.Phone.Listener);
		method public final boolean canAddCall();

telecomm/java/android/telecom/ParcelableCallAnalytics.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import java.util.List;
		*/
		@SystemApi
		public class ParcelableCallAnalytics implements Parcelable {
		/** {@hide} */
		public static final class VideoEvent implements Parcelable {
		public static final int SEND_LOCAL_SESSION_MODIFY_REQUEST = 0;
		public static final int SEND_LOCAL_SESSION_MODIFY_RESPONSE = 1;
		@@ -373,10 +374,13 @@ public class ParcelableCallAnalytics implements Parcelable {
		writeBooleanAsByte(out, isVideoCall);
		out.writeTypedList(videoEvents);
		}

		/** {@hide} */
		public void setIsVideoCall(boolean isVideoCall) {
		this.isVideoCall = isVideoCall;
		}

		/** {@hide} */
		public void setVideoEvents(List<VideoEvent> videoEvents) {
		this.videoEvents = videoEvents;
		}
		@@ -429,10 +433,12 @@ public class ParcelableCallAnalytics implements Parcelable {
		return eventTimings;
		}

		/** {@hide} */
		public boolean isVideoCall() {
		return isVideoCall;
		}

		/** {@hide} */
		public List<VideoEvent> getVideoEvents() {
		return videoEvents;
		}