From e9a96608a9d21b8becd94603c3f72d0d28a413d0 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Sun, 5 Jun 2016 23:45:25 +0900 Subject: [PATCH] Don't treat the lingerExpired broadcast specially. NetworkMonitor no longer uses the broadcast for lingering, it uses WakeupMessage instead. Bug: 23113288 Change-Id: Idb0c55fc68cb8f45b3213c7134213904f227852e --- .../com/android/server/ConnectivityServiceTest.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java index 9668d95c3e..68a35f1b91 100644 --- a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java @@ -130,18 +130,6 @@ public class ConnectivityServiceTest extends AndroidTestCase { mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider()); } - @Override - public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) { - // PendingIntents sent by the AlarmManager are not intercepted by - // BroadcastInterceptingContext so we must really register the receiver. - // This shouldn't effect the real NetworkMonitors as the action contains a random token. - if (filter.getAction(0).startsWith("android.net.netmon.lingerExpired")) { - return getBaseContext().registerReceiver(receiver, filter); - } else { - return super.registerReceiver(receiver, filter); - } - } - @Override public Object getSystemService(String name) { if (name == Context.CONNECTIVITY_SERVICE) return mCm; @@ -654,7 +642,6 @@ public class ConnectivityServiceTest extends AndroidTestCase { public void waitForIdle() { waitForIdle(TIMEOUT_MS); } - } private interface Criteria {