Merge "Remove enabled flag fix_merged_content_change_event_v2" into main (b85ab4b7) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+12 −24

Original line number	Diff line number	Diff line
		@@ -110,7 +110,6 @@ import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_SANDBOXING_VIEW_B
		import static android.view.WindowManagerGlobal.RELAYOUT_RES_CANCEL_AND_REDRAW;
		import static android.view.WindowManagerGlobal.RELAYOUT_RES_CONSUME_ALWAYS_SYSTEM_BARS;
		import static android.view.WindowManagerGlobal.RELAYOUT_RES_SURFACE_CHANGED;
		import static android.view.accessibility.Flags.fixMergedContentChangeEventV2;
		import static android.view.accessibility.Flags.forceInvertColor;
		import static android.view.accessibility.Flags.reduceWindowContentChangedEventThrottle;
		import static android.view.flags.Flags.addSchandleToVriSurface;
		@@ -12290,7 +12289,6 @@ public final class ViewRootImpl implements ViewParent,
		}

		if (mSource != null) {
		if (fixMergedContentChangeEventV2()) {
		View newSource = getCommonPredecessor(mSource, source);
		if (newSource != null) {
		newSource = newSource.getSelfOrParentImportantForA11y();
		@@ -12306,16 +12304,6 @@ public final class ViewRootImpl implements ViewParent,
		mChangeTypes \|= AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE;
		mSource = newSource;
		}
		} else {
		// If there is no common predecessor, then mSource points to
		// a removed view, hence in this case always prefer the source.
		View predecessor = getCommonPredecessor(mSource, source);
		if (predecessor != null) {
		predecessor = predecessor.getSelfOrParentImportantForA11y();
		}
		mSource = (predecessor != null) ? predecessor : source;
		mChangeTypes \|= changeType;
		}

		final int performingAction = mAccessibilityManager.getPerformingAction();
		if (performingAction != 0) {

core/java/android/view/accessibility/flags/accessibility_flags.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -97,16 +97,6 @@ flag {
		bug: "333783827"
		}

		flag {
		namespace: "accessibility"
		name: "fix_merged_content_change_event_v2"
		description: "Fixes event type and source of content change event merged in ViewRootImpl"
		bug: "277305460"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "accessibility"
		name: "flash_notification_system_api"