Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb6d0605 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "API Cleanup: Remove VideoState class." into mnc-dev

parents 2d63f0a1 87b73f37

api/current.txt

+7 −9
Original line number Diff line number Diff line
@@ -30587,6 +30587,13 @@ package android.telecom { 
    method public int describeContents();

    method public int getQuality();

    method public int getVideoState();

    method public static boolean isAudioOnly(int);

    method public static boolean isBidirectional(int);

    method public static boolean isPaused(int);

    method public static boolean isReceptionEnabled(int);

    method public static boolean isTransmissionEnabled(int);

    method public static boolean isVideo(int);

    method public static java.lang.String videoStateToString(int);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.telecom.VideoProfile> CREATOR;

    field public static final int QUALITY_DEFAULT = 4; // 0x4
@@ -30609,15 +30616,6 @@ package android.telecom { 
    field public static final android.os.Parcelable.Creator<android.telecom.VideoProfile.CameraCapabilities> CREATOR;

  }













  public static class VideoProfile.VideoState {













    method public static boolean isAudioOnly(int);













    method public static boolean isBidirectional(int);













    method public static boolean isPaused(int);













    method public static boolean isReceptionEnabled(int);













    method public static boolean isTransmissionEnabled(int);













    method public static java.lang.String videoStateToString(int);













  }



























}





























package android.telephony {

























api/system-current.txt



+7
−9




























Original line number
Diff line number
Diff line








@@ -32801,6 +32801,13 @@ package android.telecom {













    method public int describeContents();















    method public int getQuality();















    method public int getVideoState();













    method public static boolean isAudioOnly(int);













    method public static boolean isBidirectional(int);













    method public static boolean isPaused(int);













    method public static boolean isReceptionEnabled(int);













    method public static boolean isTransmissionEnabled(int);













    method public static boolean isVideo(int);













    method public static java.lang.String videoStateToString(int);















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.telecom.VideoProfile> CREATOR;















    field public static final int QUALITY_DEFAULT = 4; // 0x4









@@ -32823,15 +32830,6 @@ package android.telecom {













    field public static final android.os.Parcelable.Creator<android.telecom.VideoProfile.CameraCapabilities> CREATOR;















  }



























  public static class VideoProfile.VideoState {













    method public static boolean isAudioOnly(int);













    method public static boolean isBidirectional(int);













    method public static boolean isPaused(int);













    method public static boolean isReceptionEnabled(int);













    method public static boolean isTransmissionEnabled(int);













    method public static java.lang.String videoStateToString(int);













  }



























}





























package android.telephony {

























telecomm/java/android/telecom/Conference.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -206,7 +206,7 @@ public abstract class Conference extends Conferenceable {













     * Returns video state of the primary call.















     */















    public int getVideoState() {













        return VideoProfile.VideoState.AUDIO_ONLY;













        return VideoProfile.STATE_AUDIO_ONLY;















    }































    /**

































telecomm/java/android/telecom/Connection.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1608,7 +1608,7 @@ public abstract class Connection extends Conferenceable {













     * a request to accept.















     */















    public void onAnswer() {













        onAnswer(VideoProfile.VideoState.AUDIO_ONLY);













        onAnswer(VideoProfile.STATE_AUDIO_ONLY);















    }































    /**

































telecomm/java/android/telecom/ConnectionRequest.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -42,7 +42,7 @@ public final class ConnectionRequest implements Parcelable {













            PhoneAccountHandle accountHandle,















            Uri handle,















            Bundle extras) {













        this(accountHandle, handle, extras, VideoProfile.VideoState.AUDIO_ONLY);













        this(accountHandle, handle, extras, VideoProfile.STATE_AUDIO_ONLY);















    }































    /**