Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "deprecate-iis-closed"

Browse Source 
* changes:
  Deprecate InflaterInputStream.closed field
  Correct ordering of TelephonyManager methods
This commit is contained in:
Paul Duffin
2018-07-24 15:22:30 +00:00
committed by Gerrit Code Review
parent 80894b6063 a9c136b43e
commit bba51fede5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/current.txt
View File

@@ -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;
} }