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

Commit bba51fed authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge changes from topic "deprecate-iis-closed" 

* changes:
  Deprecate InflaterInputStream.closed field
  Correct ordering of TelephonyManager methods
parents 80894b60 a9c136b4

api/current.txt

+5 −5
Original line number Original line Diff line number Diff line
@@ -40869,13 +40869,11 @@ package android.telephony { 
    method public java.lang.String getIccAuthentication(int, int, java.lang.String);

    method public java.lang.String getIccAuthentication(int, int, java.lang.String);

    method public java.lang.String getImei();

    method public java.lang.String getImei();

    method public java.lang.String getImei(int);

    method public java.lang.String getImei(int);

    method public java.lang.String getTypeAllocationCode();

    method public java.lang.String getTypeAllocationCode(int);

    method public java.lang.String getLine1Number();

    method public java.lang.String getLine1Number();

    method public java.lang.String getMeid();

    method public java.lang.String getMeid(int);

    method public java.lang.String getManufacturerCode();

    method public java.lang.String getManufacturerCode();

    method public java.lang.String getManufacturerCode(int);

    method public java.lang.String getManufacturerCode(int);

    method public java.lang.String getMeid();

    method public java.lang.String getMeid(int);

    method public java.lang.String getMmsUAProfUrl();

    method public java.lang.String getMmsUAProfUrl();

    method public java.lang.String getMmsUserAgent();

    method public java.lang.String getMmsUserAgent();

    method public java.lang.String getNai();

    method public java.lang.String getNai();
@@ -40898,6 +40896,8 @@ package android.telephony { 
    method public int getSimState();

    method public int getSimState();

    method public int getSimState(int);

    method public int getSimState(int);

    method public java.lang.String getSubscriberId();

    method public java.lang.String getSubscriberId();

    method public java.lang.String getTypeAllocationCode();

    method public java.lang.String getTypeAllocationCode(int);

    method public java.lang.String getVisualVoicemailPackageName();

    method public java.lang.String getVisualVoicemailPackageName();

    method public java.lang.String getVoiceMailAlphaTag();

    method public java.lang.String getVoiceMailAlphaTag();

    method public java.lang.String getVoiceMailNumber();

    method public java.lang.String getVoiceMailNumber();
@@ -69227,7 +69227,7 @@ package java.util.zip { 
    ctor public InflaterInputStream(java.io.InputStream);

    ctor public InflaterInputStream(java.io.InputStream);

    method protected void fill() throws java.io.IOException;

    method protected void fill() throws java.io.IOException;

    field protected byte[] buf;

    field protected byte[] buf;

    field protected boolean closed;

    field protected deprecated boolean closed;

    field protected java.util.zip.Inflater inf;

    field protected java.util.zip.Inflater inf;

    field protected int len;

    field protected int len;

  }

  }