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

Merge changes from topic "deprecate-iis-closed" am: bba51fede5

Browse Source 
am: 9cb60599e4

Change-Id: Ie07581b9bc9644aab759e0898c16abe29d5b0473
This commit is contained in:
Paul Duffin
2018-07-24 12:22:13 -07:00
committed by android-build-merger
parent 0eab57038b 9cb60599e4
commit 0001cb000a
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

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