LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of 6ea0082b to master

Browse Source 
Change-Id: I8ec28728c12d7cc3ce2c4f3d09d9ce6162504618
This commit is contained in:
Aaron Whyte
2014-07-11 13:34:41 -07:00
parent 0478ace923 6ea0082bdf
commit 37e24d93b5
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -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 =