Merge "Remove the thread-unsafe destroyHardwareResources in VRI#die" into main (a021ee43) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -9951,11 +9951,13 @@ public final class ViewRootImpl implements ViewParent,
		return false;
		}

		if (!com.android.graphics.hwui.flags.Flags.removeVriSketchyDestroy()) {
		if (!mIsDrawing) {
		destroyHardwareRenderer();
		} else {
		Log.e(mTag, "Attempting to destroy the window while drawing!\n" +
		" window=" + this + ", title=" + mWindowAttributes.getTitle());
		Log.e(mTag, "Attempting to destroy the window while drawing!\n"
		+ " window=" + this + ", title=" + mWindowAttributes.getTitle());
		}
		}
		mHandler.sendEmptyMessage(MSG_DIE);
		return true;
		@@ -9976,9 +9978,9 @@ public final class ViewRootImpl implements ViewParent,
		dispatchDetachedFromWindow();
		}

		if (mAdded && !mFirst) {
		destroyHardwareRenderer();

		if (mAdded && !mFirst) {
		if (mView != null) {
		int viewVisibility = mView.getVisibility();
		boolean viewVisibilityChanged = mViewVisibility != viewVisibility;

+10 −0

Original line number	Diff line number	Diff line
		@@ -154,3 +154,13 @@ flag {
		description: "API's that enable animated image drawables to use nearest sampling when scaling."
		bug: "370523334"
		}

		flag {
		name: "remove_vri_sketchy_destroy"
		namespace: "core_graphics"
		description: "Remove the eager yet thread-violating destroyHardwareResources in VRI#die"
		bug: "377057106"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}
		No newline at end of file