commit a9e00cc5a505c238c0c3343bb89a3bd315ea534c
author Lorenzo Colitti <lorenzo@google.com> Tue Apr 27 13:57:12 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 27 13:57:12 2021 +0000
tree de122011c9121772ed2db42dfce67647f0fb724a
parent db027b1b79114642d6ce7ddfcfc375ef0239b4c0
parent 366c004236114b7e159857f8dde466f2ee6cb390

Merge "Add EXTRA_PROXY_INFO to incompatibilities.txt." into sc-dev

31/public/api/android-incompatibilities.txt

diff --git a/31/public/api/android-incompatibilities.txt b/31/public/api/android-incompatibilities.txt
index 9e3f65a..5ad193f 100644
--- a/31/public/api/android-incompatibilities.txt
+++ b/31/public/api/android-incompatibilities.txt
@@ -10,3 +10,6 @@
     Removed deprecated method android.app.ActivityManager.getMaxNumPictureInPictureActions()
 RemovedDeprecatedMethod: android.app.usage.StorageStats#getCodeBytes():
     Removed deprecated method android.app.usage.StorageStats.getCodeBytes()
+
+RemovedDeprecatedField: android.net.Proxy#EXTRA_PROXY_INFO:
+    Removed deprecated field android.net.Proxy.EXTRA_PROXY_INFO

31/public/api/android-non-updatable-incompatibilities.txt

diff --git a/31/public/api/android-non-updatable-incompatibilities.txt b/31/public/api/android-non-updatable-incompatibilities.txt
index 9637033..fd01a8e 100644
--- a/31/public/api/android-non-updatable-incompatibilities.txt
+++ b/31/public/api/android-non-updatable-incompatibilities.txt
@@ -224,3 +224,6 @@
 
 RemovedPackage: android.app.role:
     Removed package android.app.role
+
+RemovedDeprecatedField: android.net.Proxy#EXTRA_PROXY_INFO:
+    Removed deprecated field android.net.Proxy.EXTRA_PROXY_INFO