Merge changes Ie8d98359,I4d5cadfd

* changes:
  Fix a bug in RequestReassignment#toString
  Cleanup some of the PANS code
This commit is contained in:
Treehugger Robot
2021-03-04 12:39:04 +00:00
committed by Gerrit Code Review
2 changed files with 20 additions and 15 deletions

View File

@@ -9932,12 +9932,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 {