commit 0f17621c2ba90ebf3ba4c9f0272e42866196ea80
author Jeff Sharkey <jsharkey@android.com> Thu May 13 11:36:04 2021 -0600
committer android-build-team Robot <android-build-team-robot@google.com> Thu May 13 18:51:50 2021 +0000
tree ef64451a6c2dcdf8c13440dfe0850266cdec0d44
parent 3acaeeb8ae02653b0210eb24536903bfbc56e06f

Emergency workaround to patch over ID shuffling.

Bug: 188050150, 188011554
Test: manual
Change-Id: If865def2961b28d45b50a055272d8b24af7bbd32
(cherry picked from commit 62c5678f62ad1f11e5c90c3c927974fa1cdaa219)

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 98c2d40..6d0d344 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -245,6 +245,7 @@
 
   public static final class R.attr {
     ctor public R.attr();
+    field public static final int __removed3;
     field public static final int absListViewStyle = 16842858; // 0x101006a
     field public static final int accessibilityEventTypes = 16843648; // 0x1010380
     field public static final int accessibilityFeedbackType = 16843650; // 0x1010382

core/res/res/values/public.xml

diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index f7a9930..641b2ad 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3064,6 +3064,7 @@
     <public name="hotwordDetectionService" />
     <public name="previewLayout" />
     <public name="clipToOutline" />
+    <public name="__removed3" />
     <public name="knownCerts" />
     <public name="windowBackgroundBlurRadius"/>
     <public name="windowSplashScreenBackground"/>