Merge "BoostFramework: Adding config for disable packing params & scroll fix" (d4a7e7d4) · Commits · e / os / android_frameworks_base

core/java/android/widget/OverScroller.java

+11 −5

Original line number	Original line	Diff line number	Diff line
	@@ -609,6 +609,7 @@ public class OverScroller {
	private boolean mIsPerfLockAcquired = false;		private boolean mIsPerfLockAcquired = false;
	private boolean mIsPerfBoostEnabled = false;		private boolean mIsPerfBoostEnabled = false;
	private int fBoostTimeOut = 0;		private int fBoostTimeOut = 0;
			private int flingBoostTimeOut = 0;
	private int fBoostParamVal[];		private int fBoostParamVal[];

	static {		static {
	@@ -664,6 +665,10 @@ public class OverScroller {
	fBoostParamVal = context.getResources().getIntArray(		fBoostParamVal = context.getResources().getIntArray(
	com.android.internal.R.array.flingboost_param_value);		com.android.internal.R.array.flingboost_param_value);
	}		}

			if (mPerf == null && mIsPerfBoostEnabled) {
			mPerf = new BoostFramework();
			}
	}		}

	void updateScroll(float q) {		void updateScroll(float q) {
	@@ -786,16 +791,17 @@ public class OverScroller {
	if (velocity != 0) {		if (velocity != 0) {
	mDuration = mSplineDuration = getSplineFlingDuration(velocity);		mDuration = mSplineDuration = getSplineFlingDuration(velocity);
	totalDistance = getSplineFlingDistance(velocity);		totalDistance = getSplineFlingDistance(velocity);
	if (mPerf == null && mIsPerfBoostEnabled) {
	mPerf = new BoostFramework();
	}

	if (mPerf != null) {		if (mPerf != null) {
	mIsPerfLockAcquired = true;		mIsPerfLockAcquired = true;
	if (0 == fBoostTimeOut) {		if (0 == fBoostTimeOut) {
	fBoostTimeOut = mDuration;		//config value is not defined
			flingBoostTimeOut = mDuration;
			} else {
			//config value is present
			flingBoostTimeOut = fBoostTimeOut;
	}		}
	mPerf.perfLockAcquire(fBoostTimeOut, fBoostParamVal);		mPerf.perfLockAcquire(flingBoostTimeOut, fBoostParamVal);
	}		}
	}		}

core/java/android/widget/Scroller.java

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -117,6 +117,7 @@ public class Scroller {
	private BoostFramework mPerf = null;		private BoostFramework mPerf = null;
	boolean bIsPerfBoostEnabled = false;		boolean bIsPerfBoostEnabled = false;
	private int sBoostTimeOut = 0;		private int sBoostTimeOut = 0;
			private int scrollBoostTimeOut = 0;
	private int sBoostParamVal[];		private int sBoostParamVal[];

	// A context-specific coefficient adjusted to physical values.		// A context-specific coefficient adjusted to physical values.
	@@ -422,9 +423,13 @@ public class Scroller {

	if ((mPerf != null) && (duration != 0)) {		if ((mPerf != null) && (duration != 0)) {
	if (0 == sBoostTimeOut) {		if (0 == sBoostTimeOut) {
	sBoostTimeOut = mDuration;		//config value is not defined
			scrollBoostTimeOut = mDuration;
			} else {
			//config value is present
			scrollBoostTimeOut = sBoostTimeOut;
	}		}
	mPerf.perfLockAcquire(sBoostTimeOut, sBoostParamVal);		mPerf.perfLockAcquire(scrollBoostTimeOut, sBoostParamVal);
	}		}
	}		}

core/res/res/values/config.xml

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2278,11 +2278,14 @@

	<!-- Whether cpu boost is enabled for AppLaunch -->		<!-- Whether cpu boost is enabled for AppLaunch -->
	<bool name="config_enableCpuBoostForAppLaunch">false</bool>		<bool name="config_enableCpuBoostForAppLaunch">false</bool>
	<integer name="disablepacking_timeout_param">0</integer>
	<integer-array name="launchboost_packing_param_value"/>
	<integer name="launchboost_timeout_param">0</integer>		<integer name="launchboost_timeout_param">0</integer>
	<integer-array name="launchboost_param_value"/>		<integer-array name="launchboost_param_value"/>

			<!-- Whether disablepacking is enabled or not -->
			<bool name="config_disablePacking">false</bool>
			<integer name="disablepacking_timeout_param">0</integer>
			<integer-array name="launchboost_packing_param_value"/>

	<!-- Whether cpu boost is enabled for animation. -->		<!-- Whether cpu boost is enabled for animation. -->
	<bool name="config_enablePerfBoostForAnimation">false</bool>		<bool name="config_enablePerfBoostForAnimation">false</bool>
	<integer name="animationboost_timeout_param">0</integer>		<integer name="animationboost_timeout_param">0</integer>

core/res/res/values/symbols.xml

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2330,11 +2330,14 @@

	<!-- cpu boost for AppLaunch -->		<!-- cpu boost for AppLaunch -->
	<java-symbol type="bool" name="config_enableCpuBoostForAppLaunch" />		<java-symbol type="bool" name="config_enableCpuBoostForAppLaunch" />
	<java-symbol type="integer" name="disablepacking_timeout_param" />
	<java-symbol type="array" name="launchboost_packing_param_value"/>
	<java-symbol type="integer" name="launchboost_timeout_param" />		<java-symbol type="integer" name="launchboost_timeout_param" />
	<java-symbol type="array" name="launchboost_param_value" />		<java-symbol type="array" name="launchboost_param_value" />

			<!-- cpu boost for AppLaunch -->
			<java-symbol type="bool" name="config_disablePacking" />
			<java-symbol type="integer" name="disablepacking_timeout_param" />
			<java-symbol type="array" name="launchboost_packing_param_value" />

	<!-- cpu boost for Animationboost -->		<!-- cpu boost for Animationboost -->
	<java-symbol type="bool" name="config_enablePerfBoostForAnimation" />		<java-symbol type="bool" name="config_enablePerfBoostForAnimation" />
	<java-symbol type="integer" name="animationboost_timeout_param" />		<java-symbol type="integer" name="animationboost_timeout_param" />

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+22 −8

Original line number	Original line	Diff line number	Diff line
	@@ -161,9 +161,11 @@ public final class ActivityStackSupervisor implements DisplayListener {
	static final int RESUME_TOP_ACTIVITY_MSG = FIRST_SUPERVISOR_STACK_MSG + 2;		static final int RESUME_TOP_ACTIVITY_MSG = FIRST_SUPERVISOR_STACK_MSG + 2;
	static final int SLEEP_TIMEOUT_MSG = FIRST_SUPERVISOR_STACK_MSG + 3;		static final int SLEEP_TIMEOUT_MSG = FIRST_SUPERVISOR_STACK_MSG + 3;
	static final int LAUNCH_TIMEOUT_MSG = FIRST_SUPERVISOR_STACK_MSG + 4;		static final int LAUNCH_TIMEOUT_MSG = FIRST_SUPERVISOR_STACK_MSG + 4;
	public BoostFramework mPerf = null;
	public BoostFramework mPerf_iop = null;		public BoostFramework mPerf_iop = null;
			public BoostFramework mPerfBoost = null;
			public BoostFramework mPerfPack = null;
	public boolean mIsPerfBoostEnabled = false;		public boolean mIsPerfBoostEnabled = false;
			public boolean mIsperfDisablepackingEnable = false;
	public int lBoostTimeOut = 0;		public int lBoostTimeOut = 0;
	public int lDisPackTimeOut = 0;		public int lDisPackTimeOut = 0;
	public int lBoostCpuParamVal[];		public int lBoostCpuParamVal[];
	@@ -352,13 +354,19 @@ public final class ActivityStackSupervisor implements DisplayListener {
	/* Is perf lock for cpu-boost enabled during App 1st launch */		/* Is perf lock for cpu-boost enabled during App 1st launch */
	mIsPerfBoostEnabled = mService.mContext.getResources().getBoolean(		mIsPerfBoostEnabled = mService.mContext.getResources().getBoolean(
	com.android.internal.R.bool.config_enableCpuBoostForAppLaunch);		com.android.internal.R.bool.config_enableCpuBoostForAppLaunch);
			mIsperfDisablepackingEnable = mService.mContext.getResources().getBoolean(
			com.android.internal.R.bool.config_disablePacking);

	if(mIsPerfBoostEnabled) {		if(mIsPerfBoostEnabled) {
	lBoostTimeOut = mService.mContext.getResources().getInteger(		lBoostTimeOut = mService.mContext.getResources().getInteger(
	com.android.internal.R.integer.launchboost_timeout_param);		com.android.internal.R.integer.launchboost_timeout_param);
	lDisPackTimeOut = mService.mContext.getResources().getInteger(
	com.android.internal.R.integer.disablepacking_timeout_param);
	lBoostCpuParamVal = mService.mContext.getResources().getIntArray(		lBoostCpuParamVal = mService.mContext.getResources().getIntArray(
	com.android.internal.R.array.launchboost_param_value);		com.android.internal.R.array.launchboost_param_value);
			}

			if(mIsperfDisablepackingEnable) {
			lDisPackTimeOut = mService.mContext.getResources().getInteger(
			com.android.internal.R.integer.disablepacking_timeout_param);
	lBoostPackParamVal = mService.mContext.getResources().getIntArray(		lBoostPackParamVal = mService.mContext.getResources().getIntArray(
	com.android.internal.R.array.launchboost_packing_param_value);		com.android.internal.R.array.launchboost_packing_param_value);
	}		}
	@@ -3063,12 +3071,18 @@ public final class ActivityStackSupervisor implements DisplayListener {

	void acquireAppLaunchPerfLock() {		void acquireAppLaunchPerfLock() {
	/* Acquire perf lock during new app launch */		/* Acquire perf lock during new app launch */
	if (mIsPerfBoostEnabled == true && mPerf == null) {		if (mIsperfDisablepackingEnable == true && mPerfPack == null) {
	mPerf = new BoostFramework();		mPerfPack = new BoostFramework();
			}
			if (mPerfPack != null) {
			mPerfPack.perfLockAcquire(lDisPackTimeOut, lBoostPackParamVal);
			}

			if (mIsPerfBoostEnabled == true && mPerfBoost == null) {
			mPerfBoost = new BoostFramework();
	}		}
	if (mPerf != null) {		if (mPerfBoost != null) {
	mPerf.perfLockAcquire(lDisPackTimeOut, lBoostPackParamVal);		mPerfBoost.perfLockAcquire(lBoostTimeOut, lBoostCpuParamVal);
	mPerf.perfLockAcquire(lBoostTimeOut, lBoostCpuParamVal);
	}		}
	}		}