Merge "Fixed check for generated ids on onProvideStructureForAssistOrAutoFill()." (07ea1c63) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -6934,8 +6934,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		& (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 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		}

		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