Merge "BLAST: Two start-up optimizations" into rvc-dev am: 9005cdcf01 am: 6008585fa0 am: 572ee349bb (10be2224) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+17 −12

Original line number	Original line	Diff line number	Diff line
	@@ -327,6 +327,8 @@ public final class ViewRootImpl implements ViewParent,
	private boolean mForceNextConfigUpdate;		private boolean mForceNextConfigUpdate;

	private boolean mUseBLASTAdapter;		private boolean mUseBLASTAdapter;
			private boolean mForceDisableBLAST;
			private boolean mEnableTripleBuffering;

	/**		/**
	* Signals that compatibility booleans have been initialized according to		* Signals that compatibility booleans have been initialized according to
	@@ -784,7 +786,6 @@ public final class ViewRootImpl implements ViewParent,

	loadSystemProperties();		loadSystemProperties();
	mImeFocusController = new ImeFocusController(this);		mImeFocusController = new ImeFocusController(this);
	mUseBLASTAdapter = WindowManagerGlobal.useBLAST();
	}		}

	public static void addFirstDrawHandler(Runnable callback) {		public static void addFirstDrawHandler(Runnable callback) {
	@@ -925,10 +926,9 @@ public final class ViewRootImpl implements ViewParent,
	if (mWindowAttributes.packageName == null) {		if (mWindowAttributes.packageName == null) {
	mWindowAttributes.packageName = mBasePackageName;		mWindowAttributes.packageName = mBasePackageName;
	}		}
	if (mUseBLASTAdapter) {
	mWindowAttributes.privateFlags \|=		mWindowAttributes.privateFlags \|=
	WindowManager.LayoutParams.PRIVATE_FLAG_USE_BLAST;		WindowManager.LayoutParams.PRIVATE_FLAG_USE_BLAST;
	}
	attrs = mWindowAttributes;		attrs = mWindowAttributes;
	setTag();		setTag();

	@@ -1102,6 +1102,13 @@ public final class ViewRootImpl implements ViewParent,
	"Unable to add window -- unknown error code " + res);		"Unable to add window -- unknown error code " + res);
	}		}

			if ((res & WindowManagerGlobal.ADD_FLAG_USE_BLAST) != 0) {
			mUseBLASTAdapter = true;
			}
			if ((res & WindowManagerGlobal.ADD_FLAG_USE_TRIPLE_BUFFERING) != 0) {
			mEnableTripleBuffering = true;
			}

	if (view instanceof RootViewSurfaceTaker) {		if (view instanceof RootViewSurfaceTaker) {
	mInputQueueCallback =		mInputQueueCallback =
	((RootViewSurfaceTaker)view).willYouTakeTheInputQueue();		((RootViewSurfaceTaker)view).willYouTakeTheInputQueue();
	@@ -1414,10 +1421,8 @@ public final class ViewRootImpl implements ViewParent,
	}		}
	mWindowAttributes.privateFlags \|= compatibleWindowFlag;		mWindowAttributes.privateFlags \|= compatibleWindowFlag;

	if (mUseBLASTAdapter) {
	mWindowAttributes.privateFlags \|=		mWindowAttributes.privateFlags \|=
	WindowManager.LayoutParams.PRIVATE_FLAG_USE_BLAST;		WindowManager.LayoutParams.PRIVATE_FLAG_USE_BLAST;
	}

	if (mWindowAttributes.preservePreviousSurfaceInsets) {		if (mWindowAttributes.preservePreviousSurfaceInsets) {
	// Restore old surface insets.		// Restore old surface insets.
	@@ -1784,7 +1789,7 @@ public final class ViewRootImpl implements ViewParent,
	Surface ret = null;		Surface ret = null;
	if (mBlastBufferQueue == null) {		if (mBlastBufferQueue == null) {
	mBlastBufferQueue = new BLASTBufferQueue(		mBlastBufferQueue = new BLASTBufferQueue(
	mBlastSurfaceControl, width, height);		mBlastSurfaceControl, width, height, mEnableTripleBuffering);
	// We only return the Surface the first time, as otherwise		// We only return the Surface the first time, as otherwise
	// it hasn't changed and there is no need to update.		// it hasn't changed and there is no need to update.
	ret = mBlastBufferQueue.getSurface();		ret = mBlastBufferQueue.getSurface();
	@@ -7393,7 +7398,7 @@ public final class ViewRootImpl implements ViewParent,
	mPendingDisplayCutout, mPendingMergedConfiguration, mSurfaceControl, mTempInsets,		mPendingDisplayCutout, mPendingMergedConfiguration, mSurfaceControl, mTempInsets,
	mTempControls, mSurfaceSize, mBlastSurfaceControl);		mTempControls, mSurfaceSize, mBlastSurfaceControl);
	if (mSurfaceControl.isValid()) {		if (mSurfaceControl.isValid()) {
	if (!mUseBLASTAdapter) {		if (!useBLAST()) {
	mSurface.copyFrom(mSurfaceControl);		mSurface.copyFrom(mSurfaceControl);
	} else {		} else {
	final Surface blastSurface = getOrCreateBLASTSurface(mSurfaceSize.x,		final Surface blastSurface = getOrCreateBLASTSurface(mSurfaceSize.x,
	@@ -9760,7 +9765,7 @@ public final class ViewRootImpl implements ViewParent,
	* @hide		* @hide
	*/		*/
	public SurfaceControl getRenderSurfaceControl() {		public SurfaceControl getRenderSurfaceControl() {
	if (mUseBLASTAdapter) {		if (useBLAST()) {
	return mBlastSurfaceControl;		return mBlastSurfaceControl;
	} else {		} else {
	return mSurfaceControl;		return mSurfaceControl;
	@@ -9777,11 +9782,11 @@ public final class ViewRootImpl implements ViewParent,
	* flag. Needs to be called before addView.		* flag. Needs to be called before addView.
	*/		*/
	void forceDisableBLAST() {		void forceDisableBLAST() {
	mUseBLASTAdapter = false;		mForceDisableBLAST = true;
	}		}

	boolean useBLAST() {		boolean useBLAST() {
	return mUseBLASTAdapter;		return mUseBLASTAdapter && !mForceDisableBLAST;
	}		}

	/**		/**

core/java/android/view/WindowManagerGlobal.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -124,8 +124,10 @@ public final class WindowManagerGlobal {
	*/		*/
	public static final int RELAYOUT_DEFER_SURFACE_DESTROY = 0x2;		public static final int RELAYOUT_DEFER_SURFACE_DESTROY = 0x2;

			public static final int ADD_FLAG_IN_TOUCH_MODE = 0x1;
	public static final int ADD_FLAG_APP_VISIBLE = 0x2;		public static final int ADD_FLAG_APP_VISIBLE = 0x2;
	public static final int ADD_FLAG_IN_TOUCH_MODE = RELAYOUT_RES_IN_TOUCH_MODE;		public static final int ADD_FLAG_USE_TRIPLE_BUFFERING = 0x4;
			public static final int ADD_FLAG_USE_BLAST = 0x8;

	/**		/**
	* Like {@link #RELAYOUT_RES_CONSUME_ALWAYS_SYSTEM_BARS}, but as a "hint" when adding the		* Like {@link #RELAYOUT_RES_CONSUME_ALWAYS_SYSTEM_BARS}, but as a "hint" when adding the

core/jni/android_graphics_BLASTBufferQueue.cpp

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -29,9 +29,10 @@

	namespace android {		namespace android {

	static jlong nativeCreate(JNIEnv* env, jclass clazz, jlong surfaceControl, jlong width, jlong height) {		static jlong nativeCreate(JNIEnv* env, jclass clazz, jlong surfaceControl, jlong width, jlong height,
			jboolean enableTripleBuffering) {
	sp<BLASTBufferQueue> queue = new BLASTBufferQueue(		sp<BLASTBufferQueue> queue = new BLASTBufferQueue(
	reinterpret_cast<SurfaceControl*>(surfaceControl), width, height);		reinterpret_cast<SurfaceControl*>(surfaceControl), width, height, enableTripleBuffering);
	queue->incStrong((void*)nativeCreate);		queue->incStrong((void*)nativeCreate);
	return reinterpret_cast<jlong>(queue.get());		return reinterpret_cast<jlong>(queue.get());
	}		}
	@@ -59,7 +60,7 @@ static void nativeUpdate(JNIEnv*env, jclass clazz, jlong ptr, jlong surfaceContr

	static const JNINativeMethod gMethods[] = {		static const JNINativeMethod gMethods[] = {
	/* name, signature, funcPtr */		/* name, signature, funcPtr */
	{ "nativeCreate", "(JJJ)J",		{ "nativeCreate", "(JJJZ)J",
	(void*)nativeCreate },		(void*)nativeCreate },
	{ "nativeGetSurface", "(J)Landroid/view/Surface;",		{ "nativeGetSurface", "(J)Landroid/view/Surface;",
	(void*)nativeGetSurface },		(void*)nativeGetSurface },

graphics/java/android/graphics/BLASTBufferQueue.java

+5 −4

services/core/java/com/android/server/wm/WindowManagerService.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -399,12 +399,18 @@ public class WindowManagerService extends IWindowManager.Stub
	private static final String HIERARCHICAL_ANIMATIONS_PROPERTY =		private static final String HIERARCHICAL_ANIMATIONS_PROPERTY =
	"persist.wm.hierarchical_animations";		"persist.wm.hierarchical_animations";

			private static final String DISABLE_TRIPLE_BUFFERING_PROPERTY =
			"ro.sf.disable_triple_buffer";

	/**		/**
	* @see #HIERARCHICAL_ANIMATIONS_PROPERTY		* @see #HIERARCHICAL_ANIMATIONS_PROPERTY
	*/		*/
	static boolean sHierarchicalAnimations =		static boolean sHierarchicalAnimations =
	SystemProperties.getBoolean(HIERARCHICAL_ANIMATIONS_PROPERTY, true);		SystemProperties.getBoolean(HIERARCHICAL_ANIMATIONS_PROPERTY, true);

			static boolean sEnableTripleBuffering = !SystemProperties.getBoolean(
			DISABLE_TRIPLE_BUFFERING_PROPERTY, false);

	// Enums for animation scale update types.		// Enums for animation scale update types.
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	@IntDef({WINDOW_ANIMATION_SCALE, TRANSITION_ANIMATION_SCALE, ANIMATION_DURATION_SCALE})		@IntDef({WINDOW_ANIMATION_SCALE, TRANSITION_ANIMATION_SCALE, ANIMATION_DURATION_SCALE})
	@@ -1604,6 +1610,14 @@ public class WindowManagerService extends IWindowManager.Stub
	// From now on, no exceptions or errors allowed!		// From now on, no exceptions or errors allowed!

	res = WindowManagerGlobal.ADD_OKAY;		res = WindowManagerGlobal.ADD_OKAY;

			if (mUseBLAST) {
			res \|= WindowManagerGlobal.ADD_FLAG_USE_BLAST;
			}
			if (sEnableTripleBuffering) {
			res \|= WindowManagerGlobal.ADD_FLAG_USE_TRIPLE_BUFFERING;
			}

	if (displayContent.mCurrentFocus == null) {		if (displayContent.mCurrentFocus == null) {
	displayContent.mWinAddedSinceNullFocus.add(win);		displayContent.mWinAddedSinceNullFocus.add(win);
	}		}