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

Merge "Always report non-null TetherStatesParcel"

Browse Source
This commit is contained in:
Mark Chien
2020-02-07 10:48:28 +00:00
committed by Gerrit Code Review
parent a156a16654 f5a7c1647b
commit 8cbc588f5e
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Tethering/src/com/android/server/connectivity/tethering/Tethering.java
View File

@@ -1944,7 +1944,8 @@ public class Tethering {
parcel.tetheringSupported = mDeps.isTetheringSupported(); parcel.tetheringSupported = mDeps.isTetheringSupported();
parcel.upstreamNetwork = mTetherUpstream; parcel.upstreamNetwork = mTetherUpstream;
parcel.config = mConfig.toStableParcelable(); parcel.config = mConfig.toStableParcelable();
parcel.states = mTetherStatesParcel; parcel.states =
mTetherStatesParcel != null ? mTetherStatesParcel : emptyTetherStatesParcel();
try { try {
callback.onCallbackStarted(parcel); callback.onCallbackStarted(parcel);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -1953,6 +1954,17 @@ public class Tethering {
}); });
} }
private TetherStatesParcel emptyTetherStatesParcel() {
final TetherStatesParcel parcel = new TetherStatesParcel();
parcel.availableList = new String[0];
parcel.tetheredList = new String[0];
parcel.localOnlyList = new String[0];
parcel.erroredIfaceList = new String[0];
parcel.lastErrorList = new int[0];
return parcel;
}
/** Unregister tethering event callback */ /** Unregister tethering event callback */
void unregisterTetheringEventCallback(ITetheringEventCallback callback) { void unregisterTetheringEventCallback(ITetheringEventCallback callback) {
mHandler.post(() -> { mHandler.post(() -> {

13
Tethering/tests/unit/src/com/android/server/connectivity/tethering/TetheringTest.java
View File

@@ -127,6 +127,7 @@ import com.android.internal.util.StateMachine;
import com.android.internal.util.test.BroadcastInterceptingContext; import com.android.internal.util.test.BroadcastInterceptingContext;
import com.android.internal.util.test.FakeSettingsProvider; import com.android.internal.util.test.FakeSettingsProvider;
import com.android.networkstack.tethering.R; import com.android.networkstack.tethering.R;
import com.android.testutils.MiscAssertsKt;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@@ -1220,6 +1221,16 @@ public class TetheringTest {
} }
} }
private void assertTetherStatesNotNullButEmpty(final TetherStatesParcel parcel) {
assertFalse(parcel == null);
assertEquals(0, parcel.availableList.length);
assertEquals(0, parcel.tetheredList.length);
assertEquals(0, parcel.localOnlyList.length);
assertEquals(0, parcel.erroredIfaceList.length);
assertEquals(0, parcel.lastErrorList.length);
MiscAssertsKt.assertFieldCountEquals(5, TetherStatesParcel.class);
}
@Test @Test
public void testRegisterTetheringEventCallback() throws Exception { public void testRegisterTetheringEventCallback() throws Exception {
TestTetheringEventCallback callback = new TestTetheringEventCallback(); TestTetheringEventCallback callback = new TestTetheringEventCallback();
@@ -1232,7 +1243,7 @@ public class TetheringTest {
callback.expectConfigurationChanged( callback.expectConfigurationChanged(
mTethering.getTetheringConfiguration().toStableParcelable()); mTethering.getTetheringConfiguration().toStableParcelable());
TetherStatesParcel tetherState = callback.pollTetherStatesChanged(); TetherStatesParcel tetherState = callback.pollTetherStatesChanged();
assertEquals(tetherState, null); assertTetherStatesNotNullButEmpty(tetherState);
// 2. Enable wifi tethering. // 2. Enable wifi tethering.
UpstreamNetworkState upstreamState = buildMobileDualStackUpstreamState(); UpstreamNetworkState upstreamState = buildMobileDualStackUpstreamState();
when(mUpstreamNetworkMonitor.getCurrentPreferredUpstream()).thenReturn(upstreamState); when(mUpstreamNetworkMonitor.getCurrentPreferredUpstream()).thenReturn(upstreamState);