commit 02296d74d568432999f8dd2a86181722d20d607a
author Felipe Leme <felipeal@google.com> Tue Jan 17 09:36:59 2017 -0800
committer Felipe Leme <felipeal@google.com> Wed Jan 18 11:36:27 2017 -0800
tree 28844d8d9d7b9543ef8ee374e1a684cd8083bd5d
parent 3e6041557ad0fc0f32c94f0d9c7a93f72d3e74a5

Fixed check for generated ids on onProvideStructureForAssistOrAutoFill().

BUG: 33197203
Test: CtsAutoFillServiceTestCases passes

Change-Id: I7dc45b2f68881e2a718b5d704ff4c3c3e5d9527b

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 9d1af50..37dfdb9 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -6934,8 +6934,7 @@
                 & (View.AUTO_FILL_FLAG_TYPE_FILL
                         | View.AUTO_FILL_FLAG_TYPE_SAVE)) != 0;
         final int id = mID;
-        if (id > 0 && (id&0xff000000) != 0 && (id&0x00ff0000) != 0
-                && (id&0x0000ffff) != 0) {
+        if (id != NO_ID && !isViewIdGenerated(id)) {
             String pkg, type, entry;
             try {
                 final Resources res = getResources();
@@ -22640,6 +22639,10 @@
         }
     }
 
+    private static boolean isViewIdGenerated(int id) {
+        return (id & 0xFF000000) == 0 && (id & 0x00FFFFFF) != 0;
+    }
+
     /**
      * Gets the Views in the hierarchy affected by entering and exiting Activity Scene transitions.
      * @param transitioningViews This View will be added to transitioningViews if it is VISIBLE and