1 files changed, 22 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 332d75e..a4c8882 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -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 SLEEP_TIMEOUT_MSG = FIRST_SUPERVISOR_STACK_MSG + 3;
     static final int LAUNCH_TIMEOUT_MSG = FIRST_SUPERVISOR_STACK_MSG + 4;
-    public BoostFramework mPerf = null;
     public BoostFramework mPerf_iop = null;
+    public BoostFramework mPerfBoost = null;
+    public BoostFramework mPerfPack = null;
     public boolean mIsPerfBoostEnabled = false;
+    public boolean mIsperfDisablepackingEnable = false;
     public int lBoostTimeOut = 0;
     public int lDisPackTimeOut = 0;
     public int lBoostCpuParamVal[];
@@ -352,13 +354,19 @@ public final class ActivityStackSupervisor implements DisplayListener {
         /* Is perf lock for cpu-boost enabled during App 1st launch */
         mIsPerfBoostEnabled = mService.mContext.getResources().getBoolean(
                    com.android.internal.R.bool.config_enableCpuBoostForAppLaunch);
+        mIsperfDisablepackingEnable = mService.mContext.getResources().getBoolean(
+                   com.android.internal.R.bool.config_disablePacking);
+
         if(mIsPerfBoostEnabled) {
            lBoostTimeOut = mService.mContext.getResources().getInteger(
                    com.android.internal.R.integer.launchboost_timeout_param);
+           lBoostCpuParamVal = mService.mContext.getResources().getIntArray(
+                           com.android.internal.R.array.launchboost_param_value);
+        }
+
+        if(mIsperfDisablepackingEnable) {
            lDisPackTimeOut = mService.mContext.getResources().getInteger(
                    com.android.internal.R.integer.disablepacking_timeout_param);
-           lBoostCpuParamVal = mService.mContext.getResources().getIntArray(
-                   com.android.internal.R.array.launchboost_param_value);
            lBoostPackParamVal = mService.mContext.getResources().getIntArray(
                         com.android.internal.R.array.launchboost_packing_param_value);
        }
@@ -3063,12 +3071,18 @@ public final class ActivityStackSupervisor implements DisplayListener {
 
     void acquireAppLaunchPerfLock() {
        /* Acquire perf lock during new app launch */
-       if (mIsPerfBoostEnabled == true && mPerf == null) {
-           mPerf = new BoostFramework();
+       if (mIsperfDisablepackingEnable == true && mPerfPack == null) {
+           mPerfPack = new BoostFramework();
+       }
+       if (mPerfPack != null) {
+           mPerfPack.perfLockAcquire(lDisPackTimeOut, lBoostPackParamVal);
+       }
+
+       if (mIsPerfBoostEnabled == true && mPerfBoost == null) {
+           mPerfBoost = new BoostFramework();
        }
-       if (mPerf != null) {
-             mPerf.perfLockAcquire(lDisPackTimeOut, lBoostPackParamVal);
-             mPerf.perfLockAcquire(lBoostTimeOut, lBoostCpuParamVal);
+       if (mPerfBoost != null) {
+           mPerfBoost.perfLockAcquire(lBoostTimeOut, lBoostCpuParamVal);
        }
     }