2 files changed, 0 insertions, 79 deletions

diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java
index 778b2dd..50569d7 100644
--- a/core/java/android/widget/OverScroller.java
+++ b/core/java/android/widget/OverScroller.java
@@ -22,7 +22,6 @@ import android.util.Log;
 import android.view.ViewConfiguration;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
-import android.util.BoostFramework;
 
 /**
  * This class encapsulates scrolling with the ability to overshoot the bounds
@@ -600,18 +599,6 @@ public class OverScroller {
         private static final int CUBIC = 1;
         private static final int BALLISTIC = 2;
 
-        /*
-         * Perf boost related variables
-         * Enabled/Disabled using config_enableCpuBoostForOverScrollerFling
-         * true value turns it on, by default will be turned off
-         */
-        private BoostFramework mPerf = null;
-        private boolean mIsPerfLockAcquired = false;
-        private boolean mIsPerfBoostEnabled = false;
-        private int fBoostTimeOut = 0;
-        private int flingBoostTimeOut = 0;
-        private int fBoostParamVal[];
-
         static {
             float x_min = 0.0f;
             float y_min = 0.0f;
@@ -656,19 +643,6 @@ public class OverScroller {
                     * 39.37f // inch/meter
                     * ppi
                     * 0.84f; // look and feel tuning
-
-            mIsPerfBoostEnabled = context.getResources().getBoolean(
-                   com.android.internal.R.bool.config_enableCpuBoostForOverScrollerFling);
-            if (mIsPerfBoostEnabled) {
-            fBoostTimeOut = context.getResources().getInteger(
-                   com.android.internal.R.integer.flingboost_timeout_param);
-            fBoostParamVal = context.getResources().getIntArray(
-                        com.android.internal.R.array.flingboost_param_value);
-            }
-
-            if (mPerf == null && mIsPerfBoostEnabled) {
-                mPerf = new BoostFramework();
-            }
         }
 
         void updateScroll(float q) {
@@ -716,11 +690,6 @@ public class OverScroller {
         }
 
         void finish() {
-            if (mIsPerfLockAcquired && mPerf != null) {
-                mPerf.perfLockRelease();
-                mIsPerfLockAcquired = false;
-            }
-
             mCurrentPosition = mFinal;
             // Not reset since WebView relies on this value for fast fling.
             // TODO: restore when WebView uses the fast fling implemented in this class.
@@ -791,18 +760,6 @@ public class OverScroller {
             if (velocity != 0) {
                 mDuration = mSplineDuration = getSplineFlingDuration(velocity);
                 totalDistance = getSplineFlingDistance(velocity);
-
-                if (mPerf != null) {
-                    mIsPerfLockAcquired = true;
-                    if (0 == fBoostTimeOut) {
-                        //config value is not defined
-                        flingBoostTimeOut = mDuration;
-                    } else {
-                        //config value is present
-                        flingBoostTimeOut = fBoostTimeOut;
-                    }
-                    mPerf.perfLockAcquire(flingBoostTimeOut, fBoostParamVal);
-                }
             }
 
             mSplineDistance = (int) (totalDistance * Math.signum(velocity));
diff --git a/core/java/android/widget/Scroller.java b/core/java/android/widget/Scroller.java
index d0ba9e6..357c9c3 100644
--- a/core/java/android/widget/Scroller.java
+++ b/core/java/android/widget/Scroller.java
@@ -22,7 +22,6 @@ import android.os.Build;
 import android.view.ViewConfiguration;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
-import android.util.BoostFramework;
 
 
 /**
@@ -109,17 +108,6 @@ public class Scroller  {
     private float mDeceleration;
     private final float mPpi;
 
-    /*
-    * Perf boost related variables
-    * Enabled/Disabled using config_enableCpuBoostForScroller
-    * true value turns it on, by default will be turned off
-    */
-    private BoostFramework mPerf = null;
-    boolean bIsPerfBoostEnabled = false;
-    private int sBoostTimeOut = 0;
-    private int scrollBoostTimeOut = 0;
-    private int sBoostParamVal[];
-
     // A context-specific coefficient adjusted to physical values.
     private float mPhysicalCoeff;
 
@@ -179,7 +167,6 @@ public class Scroller  {
      * not to support progressive "flywheel" behavior in flinging.
      */
     public Scroller(Context context, Interpolator interpolator, boolean flywheel) {
-        boolean bIsPerfBoostEnabled = false;
         mFinished = true;
         if (interpolator == null) {
             mInterpolator = new ViscousFluidInterpolator();
@@ -191,18 +178,6 @@ public class Scroller  {
         mFlywheel = flywheel;
 
         mPhysicalCoeff = computeDeceleration(0.84f); // look and feel tuning
-        bIsPerfBoostEnabled = context.getResources().getBoolean(
-             com.android.internal.R.bool.config_enableCpuBoostForScroller);
-        if (bIsPerfBoostEnabled) {
-        sBoostTimeOut = context.getResources().getInteger(
-               com.android.internal.R.integer.scrollboost_timeout_param);
-        sBoostParamVal = context.getResources().getIntArray(
-               com.android.internal.R.array.scrollboost_param_value);
-        }
-        if (mPerf == null && bIsPerfBoostEnabled) {
-            mPerf = new BoostFramework();
-        }
-
     }
 
     /**
@@ -420,17 +395,6 @@ public class Scroller  {
         mDeltaX = dx;
         mDeltaY = dy;
         mDurationReciprocal = 1.0f / (float) mDuration;
-
-        if ((mPerf != null) && (duration != 0)) {
-            if (0 == sBoostTimeOut) {
-                //config value is not defined
-                scrollBoostTimeOut = mDuration;
-            } else {
-                //config value is present
-                scrollBoostTimeOut = sBoostTimeOut;
-            }
-            mPerf.perfLockAcquire(scrollBoostTimeOut, sBoostParamVal);
-        }
     }
 
     /**