diff options
| author | 2018-07-24 12:31:28 -0700 | |
|---|---|---|
| committer | 2018-07-24 12:31:28 -0700 | |
| commit | 450dce9749109111c7aabe6ebb6b5f08afbde52e (patch) | |
| tree | 877cd4aad25de79d82d836cf0b86b5741bcb6a24 | |
| parent | 58cc1f212156b34dc1ad90b7412023b15b69f4e8 (diff) | |
| parent | 0001cb000a0f0c31c5937e88c8eca5449456b088 (diff) | |
Merge changes from topic "deprecate-iis-closed" am: bba51fede5 am: 9cb60599e4
am: 0001cb000a
Change-Id: I29066381f7e6c7c7867b6b125309630928850b14
| -rw-r--r-- | api/current.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index cd1ec19b0434..2ab2dc0911cb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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; } |