Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f11cbc0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "perf: Add prefer_idle boost parameter"

parents 846c24e0 9e6f59d4

core/java/android/widget/OverScroller.java

+4 −1
Original line number Diff line number Diff line
@@ -616,6 +616,7 @@ public class OverScroller { 
        private int lBoostSchedBoost = 0;

        private int lBoostPcDisblBoost = 0;

        private int lBoostKsmBoost = 0;

        private int lBoostPreferIdle = 0;



        static {

            float x_min = 0.0f;
@@ -675,6 +676,8 @@ public class OverScroller { 
                   com.android.internal.R.integer.flingboost_pcdisbl_param);

            lBoostKsmBoost = context.getResources().getInteger(

                   com.android.internal.R.integer.flingboost_ksmboost_param);

            lBoostPreferIdle = context.getResources().getInteger(

                   com.android.internal.R.integer.flingboost_preferidle_param);

            }

        }
@@ -808,7 +811,7 @@ public class OverScroller { 
                        lBoostTimeOut = mDuration;

                    }

                    mPerf.perfLockAcquire(lBoostTimeOut, lBoostPcDisblBoost, lBoostSchedBoost,

                                          lBoostCpuBoost, lBoostKsmBoost);

                                          lBoostCpuBoost, lBoostKsmBoost,lBoostPreferIdle);



                }

            }

core/java/android/widget/Scroller.java

+4 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public class Scroller { 
    private int lBoostSchedBoost = 0;

    private int lBoostPcDisblBoost = 0;

    private int lBoostKsmBoost = 0;

    private int lBoostPreferIdle =0;





    // A context-specific coefficient adjusted to physical values.
@@ -207,6 +208,8 @@ public class Scroller { 
               com.android.internal.R.integer.scrollboost_pcdisbl_param);

        lBoostKsmBoost = context.getResources().getInteger(

               com.android.internal.R.integer.scrollboost_ksmboost_param);

        lBoostPreferIdle = context.getResources().getInteger(

               com.android.internal.R.integer.scrollboost_preferidle_param);

        }
@@ -437,7 +440,7 @@ public class Scroller { 
                lBoostTimeOut = mDuration;

            }

            mPerf.perfLockAcquire(lBoostTimeOut, lBoostPcDisblBoost, lBoostSchedBoost,

                                          lBoostCpuBoost, lBoostKsmBoost);

                                          lBoostCpuBoost, lBoostKsmBoost,lBoostPreferIdle);

        }

    }

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2034,6 +2034,7 @@ 
    <integer name="flingboost_cpuboost_param">0</integer>

    <integer name="flingboost_pcdisbl_param">0</integer>

    <integer name="flingboost_ksmboost_param">0</integer>

    <integer name="flingboost_preferidle_param">0</integer>



    <!-- Whether cpu boost is enabled for horizontal scroll. -->

    <bool name="config_enableCpuBoostForScroller">false</bool>
@@ -2042,6 +2043,7 @@ 
    <integer name="scrollboost_cpuboost_param">0</integer>

    <integer name="scrollboost_pcdisbl_param">0</integer>

    <integer name="scrollboost_ksmboost_param">0</integer>

    <integer name="scrollboost_preferidle_param">0</integer>



    <!-- Configuration to enable non-default PDP during IWLAN -->

    <bool name="config_feature_iwlan_enabled">false</bool>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2173,6 +2173,7 @@ 
  <java-symbol type="integer" name="flingboost_cpuboost_param" />

  <java-symbol type="integer" name="flingboost_pcdisbl_param" />

  <java-symbol type="integer" name="flingboost_ksmboost_param" />

  <java-symbol type="integer" name="flingboost_preferidle_param" />



  <!-- cpu boost for horizontal scroll -->

  <java-symbol type="bool" name="config_enableCpuBoostForScroller" />
@@ -2181,6 +2182,7 @@ 
  <java-symbol type="integer" name="scrollboost_cpuboost_param" />

  <java-symbol type="integer" name="scrollboost_pcdisbl_param" />

  <java-symbol type="integer" name="scrollboost_ksmboost_param" />

  <java-symbol type="integer" name="scrollboost_preferidle_param" />



  <!-- Data Connectivity Error Configurations -->

  <java-symbol type="bool" name="config_reject_ggsn_perm_failure" />