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

Merge changes Ie8d98359,I4d5cadfd am: 63383e755e am: 044ef2ba4e am: 010f29032c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7700b4ed9dd9105beb947944d63138330d8c565e
This commit is contained in:
Treehugger Robot
2021-03-04 14:51:09 +00:00
committed by Automerger Merge Worker
parent 34c8f85c27 010f29032c
commit d86b902b36
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -9877,12 +9877,11 @@ public class ConnectivityServiceTest {
.build();
// Act on ConnectivityService.setOemNetworkPreference()
final TestOemListenerCallback mOnSetOemNetworkPreferenceTestListener =
new TestOemListenerCallback();
mService.setOemNetworkPreference(pref, mOnSetOemNetworkPreferenceTestListener);
final TestOemListenerCallback oemPrefListener = new TestOemListenerCallback();
mService.setOemNetworkPreference(pref, oemPrefListener);
// Verify call returned successfully
mOnSetOemNetworkPreferenceTestListener.expectOnComplete();
oemPrefListener.expectOnComplete();
}
private static class TestOemListenerCallback implements IOnSetOemNetworkPreferenceListener {