commit 81c92451950cf58fc75f8726431f22003d988962
author Aaron Whyte <awhyte@google.com> Thu Jul 10 14:05:35 2014 -0700
committer Aaron Whyte <awhyte@google.com> Thu Jul 10 14:05:35 2014 -0700
tree ad6145c19e03525673284e4d8fb47abab309731c
parent c5a19650525ef4f4154d8a0765e299cd7dbf2ce2

Allow overlays to configure ConnectivityService's network sampling to not wake the device.
This can increase clockwork device battery life.
Bug:15455204

Change-Id: Ifc551e6a522627dc8e5cfdfb8f56d4e3cbeea936

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 8e08583..aa14da1 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5038,8 +5038,18 @@
         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);
     }
 }