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

Don't treat the lingerExpired broadcast specially.

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

Bug: 23113288
Change-Id: Idb0c55fc68cb8f45b3213c7134213904f227852e
This commit is contained in:
Lorenzo Colitti
2016-06-05 23:45:25 +09:00
parent 9fc66e020a
commit e9a96608a9
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
View File

@@ -130,18 +130,6 @@ public class ConnectivityServiceTest extends AndroidTestCase {
mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider()); 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 @Override
public Object getSystemService(String name) { public Object getSystemService(String name) {
if (name == Context.CONNECTIVITY_SERVICE) return mCm; if (name == Context.CONNECTIVITY_SERVICE) return mCm;
@@ -654,7 +642,6 @@ public class ConnectivityServiceTest extends AndroidTestCase {
public void waitForIdle() { public void waitForIdle() {
waitForIdle(TIMEOUT_MS); waitForIdle(TIMEOUT_MS);
} }
} }
private interface Criteria { private interface Criteria {