From c0263f50affd039551b4b1490d9a36d9c7ac88db Mon Sep 17 00:00:00 2001 From: Mark Hansen Date: Thu, 24 Aug 2023 00:48:49 +0000 Subject: Move LayerType @ViewDebug.Exported annotation from private field to public method So that tools can access this reflectively post-Android-O. Change-Id: Ie0ef4e20a5bb0209ce2450683aaa0641d1193f87 BUG: 297272831 --- core/java/android/view/View.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index f50dc8ddd262..11e43dd4507a 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5223,11 +5223,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @Retention(RetentionPolicy.SOURCE) public @interface LayerType {} - @ViewDebug.ExportedProperty(category = "drawing", mapping = { - @ViewDebug.IntToString(from = LAYER_TYPE_NONE, to = "NONE"), - @ViewDebug.IntToString(from = LAYER_TYPE_SOFTWARE, to = "SOFTWARE"), - @ViewDebug.IntToString(from = LAYER_TYPE_HARDWARE, to = "HARDWARE") - }) int mLayerType = LAYER_TYPE_NONE; Paint mLayerPaint; @@ -21888,6 +21883,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @EnumEntry(value = LAYER_TYPE_SOFTWARE, name = "software"), @EnumEntry(value = LAYER_TYPE_HARDWARE, name = "hardware") }) + @ViewDebug.ExportedProperty(category = "drawing", mapping = { + @ViewDebug.IntToString(from = LAYER_TYPE_NONE, to = "NONE"), + @ViewDebug.IntToString(from = LAYER_TYPE_SOFTWARE, to = "SOFTWARE"), + @ViewDebug.IntToString(from = LAYER_TYPE_HARDWARE, to = "HARDWARE") + }) @LayerType public int getLayerType() { return mLayerType; -- cgit v1.2.3-59-g8ed1b