commit bba51fede5c1b90a133d086d94e314918274c6ca
author Paul Duffin <paulduffin@google.com> Tue Jul 24 15:22:30 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 24 15:22:30 2018 +0000
tree 41ce0177380c8d7d4570c6688e79ab65a21d65e2
parent 80894b606303eb9320a9969c1553d14ce0220dca
parent a9c136b43ea460c725b6d451a41d42363165effe

Merge changes from topic "deprecate-iis-closed"

* changes:
  Deprecate InflaterInputStream.closed field
  Correct ordering of TelephonyManager methods

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index f211f6d..5d7b8c8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -40869,13 +40869,11 @@
     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();
@@ -40898,6 +40896,8 @@
     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();
@@ -69227,7 +69227,7 @@
     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;
   }