Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7105844 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Emergency workaround to patch over ID shuffling." into sc-dev am: 14f4fe4d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14531029

Change-Id: Iaf7d458c38cbb72d263f4156b6b3eec17a357ccb
parents 3d7ed28f 14f4fe4d

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ package android { 














  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



+1
−0




























Original line number
Diff line number
Diff line








@@ -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"/>