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

Commit ea93adec authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Changes to IMS SS API to better fit API standards/" am: 91bd0253 am: 6825dce3 

am: 15a54c38

Change-Id: I19d878aee8e8e212015465aa31f3a35991b303fd
parents 9bb51e76 15a54c38

api/system-current.txt

+0 −6
Original line number Diff line number Diff line
@@ -6855,12 +6855,6 @@ package android.telephony.ims { 
    method public android.telephony.ims.ImsSsInfo.Builder setProvisionStatus(int);

  }



  public static abstract class ImsSsInfo.ClirInterrogationStatus implements java.lang.annotation.Annotation {

  }



  public static abstract class ImsSsInfo.ClirOutgoingState implements java.lang.annotation.Annotation {

  }



  public final class ImsStreamMediaProfile implements android.os.Parcelable {

    ctor public ImsStreamMediaProfile(int, int, int, int, int);

    method public void copyFrom(android.telephony.ims.ImsStreamMediaProfile);

telephony/java/android/telephony/ims/ImsReasonInfo.java

+344 −122

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/ims/ImsSsData.java

+38 −41

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/ims/ImsSsInfo.java

+7 −5

File changed.

Preview size limit exceeded, changes collapsed.