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

Remove unused TetheringConfigurationParcel fileds

Browse Source 
Bug: 237338640
Test: atest TetheringTests

Change-Id: Ic851e2e9ed16b5be6f5b1380f6b905fcc1e131cf
This commit is contained in:
Mark Chien
2022-08-11 19:08:24 +08:00
committed by Mark
parent 655a024846
commit 40caeb78f3
3 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Tethering/common/TetheringLib/src/android/net/TetheringConfigurationParcel.aidl
View File

@@ -21,17 +21,10 @@ package android.net;
* @hide
*/
parcelable TetheringConfigurationParcel {
int subId;
String[] tetherableUsbRegexs;
String[] tetherableWifiRegexs;
String[] tetherableBluetoothRegexs;
boolean isDunRequired;
boolean chooseUpstreamAutomatically;
int[] preferredUpstreamIfaceTypes;
String[] legacyDhcpRanges;
String[] defaultIPv4DNS;
boolean enableLegacyDhcpServer;
String[] provisioningApp;
String provisioningAppNoUi;
int provisioningCheckPeriod;
}

10
Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java
View File

@@ -652,21 +652,13 @@ public class TetheringConfiguration {
*/
public TetheringConfigurationParcel toStableParcelable() {
final TetheringConfigurationParcel parcel = new TetheringConfigurationParcel();
parcel.subId = activeDataSubId;
parcel.tetherableUsbRegexs = tetherableUsbRegexs;
parcel.tetherableWifiRegexs = tetherableWifiRegexs;
parcel.tetherableBluetoothRegexs = tetherableBluetoothRegexs;
parcel.isDunRequired = isDunRequired;
parcel.chooseUpstreamAutomatically = chooseUpstreamAutomatically;
parcel.preferredUpstreamIfaceTypes = toIntArray(preferredUpstreamIfaceTypes);
parcel.legacyDhcpRanges = legacyDhcpRanges;
parcel.defaultIPv4DNS = defaultIPv4DNS;
parcel.enableLegacyDhcpServer = mEnableLegacyDhcpServer;
parcel.provisioningApp = provisioningApp;
parcel.provisioningAppNoUi = provisioningAppNoUi;
parcel.provisioningCheckPeriod = provisioningCheckPeriod;
return parcel;
}
}

8
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
View File

@@ -1854,20 +1854,12 @@ public class TetheringTest {
private void assertTetherConfigParcelEqual(@NonNull TetheringConfigurationParcel actual,
@NonNull TetheringConfigurationParcel expect) {
assertEquals(actual.subId, expect.subId);
assertArrayEquals(actual.tetherableUsbRegexs, expect.tetherableUsbRegexs);
assertArrayEquals(actual.tetherableWifiRegexs, expect.tetherableWifiRegexs);
assertArrayEquals(actual.tetherableBluetoothRegexs, expect.tetherableBluetoothRegexs);
assertEquals(actual.isDunRequired, expect.isDunRequired);
assertEquals(actual.chooseUpstreamAutomatically, expect.chooseUpstreamAutomatically);
assertArrayEquals(actual.preferredUpstreamIfaceTypes,
expect.preferredUpstreamIfaceTypes);
assertArrayEquals(actual.legacyDhcpRanges, expect.legacyDhcpRanges);
assertArrayEquals(actual.defaultIPv4DNS, expect.defaultIPv4DNS);
assertEquals(actual.enableLegacyDhcpServer, expect.enableLegacyDhcpServer);
assertArrayEquals(actual.provisioningApp, expect.provisioningApp);
assertEquals(actual.provisioningAppNoUi, expect.provisioningAppNoUi);
assertEquals(actual.provisioningCheckPeriod, expect.provisioningCheckPeriod);
}
}