From 1481996b33f5b83f100cd495398aad8bacbe69eb Mon Sep 17 00:00:00 2001 From: Adam He Date: Wed, 28 Jul 2021 15:53:26 -0700 Subject: [PATCH] Fix FLAGS_ALL_CONTROL to match more recently added flags. * Also add a warning message for future flags being added. Fixes: 177097561 Test: atest CtsAutoFillServiceTestCases Change-Id: Ia2e78601dfb18a50c2a243936a210d5f372821cf --- core/java/android/app/assist/AssistStructure.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/assist/AssistStructure.java b/core/java/android/app/assist/AssistStructure.java index fc4a2b49d0c22..e1f6af0cc1282 100644 --- a/core/java/android/app/assist/AssistStructure.java +++ b/core/java/android/app/assist/AssistStructure.java @@ -658,6 +658,7 @@ public class AssistStructure implements Parcelable { float mElevation; float mAlpha = 1.0f; + // TODO: The FLAGS_* below have filled all bits, will need to be refactored. static final int FLAGS_DISABLED = 0x00000001; static final int FLAGS_VISIBILITY_MASK = View.VISIBLE|View.INVISIBLE|View.GONE; static final int FLAGS_FOCUSABLE = 0x00000010; @@ -673,6 +674,10 @@ public class AssistStructure implements Parcelable { static final int FLAGS_CONTEXT_CLICKABLE = 0x00004000; static final int FLAGS_OPAQUE = 0x00008000; + // --IMPORTANT-- must update this flag if any below flags extend to further bits. + // This flag is used to clear all FLAGS_HAS_* values in mFlags prior to parceling. + static final int FLAGS_ALL_CONTROL = 0xffff0000; + static final int FLAGS_HAS_MIME_TYPES = 0x80000000; static final int FLAGS_HAS_MATRIX = 0x40000000; static final int FLAGS_HAS_ALPHA = 0x20000000; @@ -689,7 +694,7 @@ public class AssistStructure implements Parcelable { static final int FLAGS_HAS_INPUT_TYPE = 0x00040000; static final int FLAGS_HAS_URL_SCHEME = 0x00020000; static final int FLAGS_HAS_LOCALE_LIST = 0x00010000; - static final int FLAGS_ALL_CONTROL = 0xfff00000; + // --IMPORTANT END-- static final int AUTOFILL_FLAGS_HAS_AUTOFILL_VIEW_ID = 0x0001; static final int AUTOFILL_FLAGS_HAS_AUTOFILL_VIRTUAL_VIEW_ID = 0x0002;