From dbd260b50a21e5f82bc177fe83dee48dad70d920 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Sun, 27 Jul 2014 09:41:34 -0700 Subject: [PATCH] Move Alarm setup to systemReady. Don't register alarms before the system is ready. bug:16484913 Change-Id: Iae5c75ff8d40d4d39dbb23ff65a600b4a00cd1f0 --- .../com/android/server/ConnectivityService.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index ec9243fea7..56265e12da 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -817,13 +817,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { mDataConnectionStats = new DataConnectionStats(mContext); mDataConnectionStats.startMonitoring(); - // start network sampling .. - Intent intent = new Intent(ACTION_PKT_CNT_SAMPLE_INTERVAL_ELAPSED, null); - mSampleIntervalElapsedIntent = PendingIntent.getBroadcast(mContext, - SAMPLE_INTERVAL_ELAPSED_REQUEST_CODE, intent, 0); - mAlarmManager = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE); - setAlarm(DEFAULT_START_SAMPLING_INTERVAL_IN_SECONDS * 1000, mSampleIntervalElapsedIntent); IntentFilter filter = new IntentFilter(); filter.addAction(ACTION_PKT_CNT_SAMPLE_INTERVAL_ELAPSED); @@ -2145,6 +2139,14 @@ public class ConnectivityService extends IConnectivityManager.Stub { } void systemReady() { + // start network sampling .. + Intent intent = new Intent(ACTION_PKT_CNT_SAMPLE_INTERVAL_ELAPSED); + intent.setPackage(mContext.getPackageName()); + + mSampleIntervalElapsedIntent = PendingIntent.getBroadcast(mContext, + SAMPLE_INTERVAL_ELAPSED_REQUEST_CODE, intent, 0); + setAlarm(DEFAULT_START_SAMPLING_INTERVAL_IN_SECONDS * 1000, mSampleIntervalElapsedIntent); + if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI)) { mCaptivePortalTracker = CaptivePortalTracker.makeCaptivePortalTracker(mContext, this); }