Merge "Expose initial focus feature flag for testing" into oc-dev (7ac3fb22) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY;
		import android.Manifest;
		import android.animation.LayoutTransition;
		import android.annotation.NonNull;
		import android.annotation.TestApi;
		import android.app.ActivityManager;
		import android.app.ActivityThread;
		import android.app.ResourcesManager;
		@@ -210,8 +211,11 @@ public final class ViewRootImpl implements ViewParent,

		/**
		* Always assign focus if a focusable View is available.
		*
		* @hide
		*/
		private static boolean sAlwaysAssignFocus;
		@TestApi
		public static boolean sAlwaysAssignFocus;

		/**
		* This list must only be modified by the main thread, so a lock is only needed when changing