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

Commit 276b675e authored by Manish Kumar's avatar Manish Kumar
Browse files

Merge commit 'd60b539d' into HEAD 

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	services/core/java/com/android/server/MountService.java
	telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
	telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl

Change-Id: I5c02abfbf57d4769ecbe6a73c219ac2c665ea0be
parents 4d9d25f9 d60b539d

core/java/android/app/Activity.java

+45 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ import java.lang.annotation.Retention; 
import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.HashMap;

import org.codeaurora.Performance;



/**

 * An activity is a single, focused thing that the user can do.  Almost all
@@ -662,7 +663,15 @@ public class Activity extends ContextThemeWrapper 
        Window.Callback, KeyEvent.Callback,

        OnCreateContextMenuListener, ComponentCallbacks2,

        Window.OnWindowDismissedCallback {



    private static Performance mPerf = null;

    private static int mDragBoostPossible = -1;

    private static int mPerfLockDuration = -1;

    private static int mAsCpuBoost = -1;

    private static int mAsSchedBoost = -1;

    private static int mAsPcDisblBoost = -1;

    private static final String TAG = "Activity";



    private static final boolean DEBUG_LIFECYCLE = false;



    /** Standard activity result: operation canceled. */
@@ -2733,6 +2742,42 @@ public class Activity extends ContextThemeWrapper 
     * @return boolean Return true if this event was consumed.

     */

    public boolean dispatchTouchEvent(MotionEvent ev) {

        String currentActivity = getPackageName();

        if(mDragBoostPossible == -1)

        {

            mDragBoostPossible = 0;

            String[] activityList = getResources().getStringArray(

                com.android.internal.R.array.boost_activityList);

            if(activityList != null){

                for (String match : activityList) {

                    if (currentActivity.indexOf(match) != -1){

                        mDragBoostPossible = 1;

                        break;

                    }

                }

            }

        }

        if (mDragBoostPossible == 1)

        {

            if (mPerf == null){

                mPerf = new Performance();

            }

            if(mPerfLockDuration == -1){

                mPerfLockDuration = getResources().getInteger(

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

                mAsCpuBoost = getResources().getInteger(

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

                mAsSchedBoost = getResources().getInteger(

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

                mAsPcDisblBoost = getResources().getInteger(

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

            }

            mPerf.perfLockAcquireTouch(ev,

                getResources().getDisplayMetrics(),

                mPerfLockDuration,

                mAsSchedBoost, mAsCpuBoost, mAsPcDisblBoost);

        }



        if (ev.getAction() == MotionEvent.ACTION_DOWN) {

            onUserInteraction();

        }

core/java/android/provider/Settings.java

+0 −7
Original line number Diff line number Diff line
@@ -5930,13 +5930,6 @@ public final class Settings { 
       public static final String WIFI_SCAN_ALWAYS_AVAILABLE =

                "wifi_scan_always_enabled";



       /**

        * Setting to allow enable or disable rssi threshold.

        * @hide

        */

       public static final String WIFI_RSSI_THRESHOLD =

                "wifi_rssi_threshold";



       /**

        * Used to save the Wifi_ON state prior to tethering.

        * This state will be checked to restore Wifi after

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/java/com/android/server/net/NetlinkTracker.java

+6 −6
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class NetlinkTracker extends BaseNetworkObserver { 
    private final String TAG;



    public interface Callback {

        public void update();

        public void update(LinkProperties lp);

    }



    private final String mInterfaceName;
@@ -112,7 +112,7 @@ public class NetlinkTracker extends BaseNetworkObserver { 
                changed = mLinkProperties.addLinkAddress(address);

            }

            if (changed) {

                mCallback.update();

                mCallback.update(new LinkProperties(mLinkProperties));

            }

        }

    }
@@ -126,7 +126,7 @@ public class NetlinkTracker extends BaseNetworkObserver { 
                changed = mLinkProperties.removeLinkAddress(address);

            }

            if (changed) {

                mCallback.update();

                mCallback.update(new LinkProperties(mLinkProperties));

            }

        }

    }
@@ -140,7 +140,7 @@ public class NetlinkTracker extends BaseNetworkObserver { 
                changed = mLinkProperties.addRoute(route);

            }

            if (changed) {

                mCallback.update();

                mCallback.update(new LinkProperties(mLinkProperties));

            }

        }

    }
@@ -154,7 +154,7 @@ public class NetlinkTracker extends BaseNetworkObserver { 
                changed = mLinkProperties.removeRoute(route);

            }

            if (changed) {

                mCallback.update();

                mCallback.update(new LinkProperties(mLinkProperties));

            }

        }

    }
@@ -168,7 +168,7 @@ public class NetlinkTracker extends BaseNetworkObserver { 
                synchronized (this) {

                    mDnsServerRepository.setDnsServersOn(mLinkProperties);

                }

                mCallback.update();

                mCallback.update(new LinkProperties(mLinkProperties));

            }

        }

    }