Merge "Add null check to a11y call." into oc-dev (6f40533f) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewParent.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -402,7 +402,7 @@ public interface ViewParent {
		* descendants has changed and that the structure of the subtree is
		* different.
		* @param child The direct child whose subtree has changed.
		* @param source The descendant view that changed.
		* @param source The descendant view that changed. May not be {@code null}.
		* @param changeType A bit mask of the types of changes that occurred. One
		* or more of:
		* <ul>
		@@ -412,7 +412,8 @@ public interface ViewParent {
		* <li>{@link AccessibilityEvent#CONTENT_CHANGE_TYPE_UNDEFINED}
		* </ul>
		*/
		public void notifySubtreeAccessibilityStateChanged(View child, View source, int changeType);
		public void notifySubtreeAccessibilityStateChanged(
		View child, @NonNull View source, int changeType);

		/**
		* Tells if this view parent can resolve the layout direction.

+2 −1

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ import com.android.internal.annotations.GuardedBy;
		import com.android.internal.os.IResultReceiver;
		import com.android.internal.os.SomeArgs;
		import com.android.internal.policy.PhoneFallbackEventHandler;
		import com.android.internal.util.Preconditions;
		import com.android.internal.view.BaseSurfaceHolder;
		import com.android.internal.view.RootViewSurfaceTaker;
		import com.android.internal.view.SurfaceCallbackHelper;
		@@ -7195,7 +7196,7 @@ public final class ViewRootImpl implements ViewParent,

		@Override
		public void notifySubtreeAccessibilityStateChanged(View child, View source, int changeType) {
		postSendWindowContentChangedCallback(source, changeType);
		postSendWindowContentChangedCallback(Preconditions.checkNotNull(source), changeType);
		}

		@Override