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

Commit 450dce97 authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge changes from topic "deprecate-iis-closed" am: bba51fed am: 9cb60599 

am: 0001cb00

Change-Id: I29066381f7e6c7c7867b6b125309630928850b14
parents 58cc1f21 0001cb00

api/current.txt

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

    method public java.lang.String getImei();

    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 getMeid();

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

    method public java.lang.String getManufacturerCode();

    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 getMmsUserAgent();

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

    method public int getSimState(int);

    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 getVoiceMailAlphaTag();

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

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

    field protected byte[] buf;

    field protected boolean closed;

    field protected deprecated boolean closed;

    field protected java.util.zip.Inflater inf;

    field protected int len;

  }