Merge "Move the main thread check to the appropriate place." into honeycomb (5b907be8) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRoot.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -486,6 +486,9 @@ public final class ViewRoot extends Handler implements ViewParent,
		mAttachInfo.mHardwareAccelerated = false;
		mAttachInfo.mHardwareAccelerationRequested = false;

		// Try to enable hardware acceleration if requested
		if (attrs != null &&
		(attrs.flags & WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED) != 0) {
		// Don't enable hardware acceleration when we're not on the main thread
		if (Looper.getMainLooper() != Looper.myLooper()) {
		Log.w(HardwareRenderer.LOG_TAG, "Attempting to initialize hardware acceleration "
		@@ -493,9 +496,6 @@ public final class ViewRoot extends Handler implements ViewParent,
		return;
		}

		// Try to enable hardware acceleration if requested
		if (attrs != null &&
		(attrs.flags & WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED) != 0) {
		// Only enable hardware acceleration if we are not in the system process
		// The window manager creates ViewRoots to display animated preview windows
		// of launching apps and we don't want those to be hardware accelerated