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

Commit 8450fd17 authored by Lenka Trochtova's avatar Lenka Trochtova Committed by Android Git Automerger
Browse files

Merge branch 'lmp-dev' of... 

Merge branch 'lmp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev
parents 5cb5059b 7257bd8b

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -28813,6 +28813,8 @@ package android.system { 
package android.telecomm {















  public final class AudioState implements android.os.Parcelable {













    ctor public AudioState(boolean, int, int);













    ctor public AudioState(android.telecomm.AudioState);















    method public int describeContents();















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















    field public static final android.os.Parcelable.Creator CREATOR;

























telecomm/java/android/telecomm/AudioState.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -56,14 +56,12 @@ public final class AudioState implements Parcelable {













    /** Bit vector of all routes supported by this call. */















    public final int supportedRouteMask;





























    /** @hide */















    public AudioState(boolean isMuted, int route, int supportedRouteMask) {















        this.isMuted = isMuted;















        this.route = route;















        this.supportedRouteMask = supportedRouteMask;















    }





























    /** @hide */















    public AudioState(AudioState state) {















        isMuted = state.isMuted;















        route = state.route;