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

Commit 9cd6e647 authored by Aaron Whyte's avatar Aaron Whyte
Browse files

resolved conflicts for merge of d2b5f7da to master 

Change-Id: I8ec28728c12d7cc3ce2c4f3d09d9ce6162504618
parents e7f601c3 d2b5f7da

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -1621,4 +1621,6 @@ 
    the IMS connection -->

    <bool name="useImsAlwaysForEmergencyCall">true</bool>



    <bool name="config_networkSamplingWakesDevice">true</bool>



</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ 
  <java-symbol type="bool" name="config_enable_emergency_call_while_sim_locked" />

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

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

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

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

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

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

services/core/java/com/android/server/ConnectivityService.java

+11 −1
Original line number Diff line number Diff line
@@ -5320,9 +5320,19 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        setAlarm(samplingIntervalInSeconds * 1000, mSampleIntervalElapsedIntent);

    }



    /**

     * Sets a network sampling alarm.

     */

    void setAlarm(int timeoutInMilliseconds, PendingIntent intent) {

        long wakeupTime = SystemClock.elapsedRealtime() + timeoutInMilliseconds;

        mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, wakeupTime, intent);

        int alarmType;

        if (Resources.getSystem().getBoolean(

                R.bool.config_networkSamplingWakesDevice)) {

            alarmType = AlarmManager.ELAPSED_REALTIME_WAKEUP;

        } else {

            alarmType = AlarmManager.ELAPSED_REALTIME;

        }

        mAlarmManager.set(alarmType, wakeupTime, intent);

    }



    private final HashMap<Messenger, NetworkFactoryInfo> mNetworkFactoryInfos =