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

Commit 9acda9c8 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Don't treat the lingerExpired broadcast specially. 

NetworkMonitor no longer uses the broadcast for lingering, it
uses WakeupMessage instead.

Bug: 23113288
Change-Id: Idb0c55fc68cb8f45b3213c7134213904f227852e
parent 762ea7aa

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java

+0 −13
Original line number Diff line number Diff line
@@ -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 {