Merge "AccessibilityRequestPreparer shouldn't crash if the view is released... (37d4372c) · Commits · e / os / android_frameworks_base

core/java/android/view/accessibility/AccessibilityManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -848,7 +848,7 @@ public final class AccessibilityManager {
		if (mRequestPreparerLists == null) {
		mRequestPreparerLists = new SparseArray<>(1);
		}
		int id = preparer.getView().getAccessibilityViewId();
		int id = preparer.getAccessibilityViewId();
		List<AccessibilityRequestPreparer> requestPreparerList = mRequestPreparerLists.get(id);
		if (requestPreparerList == null) {
		requestPreparerList = new ArrayList<>(1);
		@@ -864,7 +864,7 @@ public final class AccessibilityManager {
		if (mRequestPreparerLists == null) {
		return;
		}
		int viewId = preparer.getView().getAccessibilityViewId();
		int viewId = preparer.getAccessibilityViewId();
		List<AccessibilityRequestPreparer> requestPreparerList = mRequestPreparerLists.get(viewId);
		if (requestPreparerList != null) {
		requestPreparerList.remove(preparer);

+6 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ public abstract class AccessibilityRequestPreparer {
		public @interface RequestTypes {}

		private final WeakReference<View> mViewRef;
		private final int mAccessibilityViewId;
		private final int mRequestTypes;

		/**
		@@ -68,6 +69,7 @@ public abstract class AccessibilityRequestPreparer {
		throw new IllegalStateException("View must be attached to a window");
		}
		mViewRef = new WeakReference<>(view);
		mAccessibilityViewId = view.getAccessibilityViewId();
		mRequestTypes = requestTypes;
		view.addOnAttachStateChangeListener(new ViewAttachStateListener());
		}
		@@ -118,4 +120,8 @@ public abstract class AccessibilityRequestPreparer {
		v.removeOnAttachStateChangeListener(this);
		}
		}

		int getAccessibilityViewId() {
		return mAccessibilityViewId;
		}
		}