Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "framework-wifi-icon-sameas"

Browse Source 
* changes:
  Remove OsuProvider#mIcon
  SettingsLibTest: Remove OsuProvider#mIcon
This commit is contained in:
David Su
2019-12-03 03:26:04 +00:00
committed by Android (Google) Code Review
parent f99b66e8cb e0ee85b9c2
commit 53acd03943
4 changed files with 16 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
View File

@@ -120,7 +120,7 @@ public class AccessPointTest {
private OsuProvider createOsuProvider() {
Map<String, String> friendlyNames = new HashMap<>();
friendlyNames.put("en", OSU_FRIENDLY_NAME);
return new OsuProvider((WifiSsid) null, friendlyNames, null, null, null, null, null);
return new OsuProvider((WifiSsid) null, friendlyNames, null, null, null, null);
}
@Before

2
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
View File

@@ -336,7 +336,7 @@ public class WifiTrackerTest {
private static OsuProvider buildOsuProvider(String friendlyName) {
Map<String, String> friendlyNames = new HashMap<>();
friendlyNames.put("en", friendlyName);
return new OsuProvider((WifiSsid) null, friendlyNames, null, null, null, null, null);
return new OsuProvider((WifiSsid) null, friendlyNames, null, null, null, null);
}
private WifiTracker createTrackerWithImmediateBroadcastsAndInjectInitialScanResults(

42
wifi/java/android/net/wifi/hotspot2/OsuProvider.java
View File

@@ -19,7 +19,6 @@ package android.net.wifi.hotspot2;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.graphics.drawable.Icon;
import android.net.Uri;
import android.net.wifi.WifiSsid;
import android.os.Bundle;
@@ -86,23 +85,16 @@ public final class OsuProvider implements Parcelable {
*/
private final List<Integer> mMethodList;
/**
* Icon data for the OSU (Online Sign-Up) provider.
*/
private final Icon mIcon;
/** @hide */
public OsuProvider(String osuSsid, Map<String, String> friendlyNames,
String serviceDescription, Uri serverUri, String nai, List<Integer> methodList,
Icon icon) {
String serviceDescription, Uri serverUri, String nai, List<Integer> methodList) {
this(WifiSsid.createFromByteArray(osuSsid.getBytes(StandardCharsets.UTF_8)),
friendlyNames, serviceDescription, serverUri, nai, methodList, icon);
friendlyNames, serviceDescription, serverUri, nai, methodList);
}
/** @hide */
public OsuProvider(WifiSsid osuSsid, Map<String, String> friendlyNames,
String serviceDescription, Uri serverUri, String nai, List<Integer> methodList,
Icon icon) {
String serviceDescription, Uri serverUri, String nai, List<Integer> methodList) {
mOsuSsid = osuSsid;
mFriendlyNames = friendlyNames;
mServiceDescription = serviceDescription;
@@ -113,7 +105,6 @@ public final class OsuProvider implements Parcelable {
} else {
mMethodList = new ArrayList<>(methodList);
}
mIcon = icon;
}
/**
@@ -130,7 +121,6 @@ public final class OsuProvider implements Parcelable {
mServerUri = null;
mNetworkAccessIdentifier = null;
mMethodList = new ArrayList<>();
mIcon = null;
return;
}
@@ -144,7 +134,6 @@ public final class OsuProvider implements Parcelable {
} else {
mMethodList = new ArrayList<>(source.mMethodList);
}
mIcon = source.mIcon;
}
/** @hide */
@@ -205,11 +194,6 @@ public final class OsuProvider implements Parcelable {
return mMethodList;
}
/** @hide */
public Icon getIcon() {
return mIcon;
}
@Override
public int describeContents() {
return 0;
@@ -222,7 +206,6 @@ public final class OsuProvider implements Parcelable {
dest.writeParcelable(mServerUri, flags);
dest.writeString(mNetworkAccessIdentifier);
dest.writeList(mMethodList);
dest.writeParcelable(mIcon, flags);
Bundle bundle = new Bundle();
bundle.putSerializable("friendlyNameMap", (HashMap<String, String>) mFriendlyNames);
dest.writeBundle(bundle);
@@ -237,21 +220,16 @@ public final class OsuProvider implements Parcelable {
return false;
}
OsuProvider that = (OsuProvider) thatObject;
return (mOsuSsid == null ? that.mOsuSsid == null : mOsuSsid.equals(that.mOsuSsid))
&& (mFriendlyNames == null) ? that.mFriendlyNames == null
: mFriendlyNames.equals(that.mFriendlyNames)
return Objects.equals(mOsuSsid, that.mOsuSsid)
&& Objects.equals(mFriendlyNames, that.mFriendlyNames)
&& TextUtils.equals(mServiceDescription, that.mServiceDescription)
&& (mServerUri == null ? that.mServerUri == null
: mServerUri.equals(that.mServerUri))
&& Objects.equals(mServerUri, that.mServerUri)
&& TextUtils.equals(mNetworkAccessIdentifier, that.mNetworkAccessIdentifier)
&& (mMethodList == null ? that.mMethodList == null
: mMethodList.equals(that.mMethodList))
&& (mIcon == null ? that.mIcon == null : mIcon.sameAs(that.mIcon));
&& Objects.equals(mMethodList, that.mMethodList);
}
@Override
public int hashCode() {
// mIcon is not hashable, skip the variable.
return Objects.hash(mOsuSsid, mServiceDescription, mFriendlyNames,
mServerUri, mNetworkAccessIdentifier, mMethodList);
}
@@ -264,8 +242,7 @@ public final class OsuProvider implements Parcelable {
+ " mServiceDescription=" + mServiceDescription
+ " mServerUri=" + mServerUri
+ " mNetworkAccessIdentifier=" + mNetworkAccessIdentifier
+ " mMethodList=" + mMethodList
+ " mIcon=" + mIcon;
+ " mMethodList=" + mMethodList;
}
public static final @android.annotation.NonNull Creator<OsuProvider> CREATOR =
@@ -278,12 +255,11 @@ public final class OsuProvider implements Parcelable {
String nai = in.readString();
List<Integer> methodList = new ArrayList<>();
in.readList(methodList, null);
Icon icon = in.readParcelable(null);
Bundle bundle = in.readBundle();
Map<String, String> friendlyNamesMap = (HashMap) bundle.getSerializable(
"friendlyNameMap");
return new OsuProvider(osuSsid, friendlyNamesMap, serviceDescription,
serverUri, nai, methodList, icon);
serverUri, nai, methodList);
}
@Override

13
wifi/tests/src/android/net/wifi/hotspot2/OsuProviderTest.java
View File

@@ -19,7 +19,6 @@ package android.net.wifi.hotspot2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import android.graphics.drawable.Icon;
import android.net.Uri;
import android.net.wifi.WifiSsid;
import android.os.Parcel;
@@ -56,7 +55,6 @@ public class OsuProviderTest {
private static final String TEST_NAI = "test.access.com";
private static final List<Integer> TEST_METHOD_LIST =
Arrays.asList(OsuProvider.METHOD_SOAP_XML_SPP);
private static final Icon TEST_ICON = Icon.createWithData(new byte[10], 0, 10);
/**
* Verify parcel write and read consistency for the given {@link OsuProvider}.
@@ -82,7 +80,7 @@ public class OsuProviderTest {
*/
@Test
public void verifyParcelWithEmptyProviderInfo() throws Exception {
verifyParcel(new OsuProvider((WifiSsid) null, null, null, null, null, null, null));
verifyParcel(new OsuProvider((WifiSsid) null, null, null, null, null, null));
}
/**
@@ -93,7 +91,7 @@ public class OsuProviderTest {
@Test
public void verifyParcelWithFullProviderInfo() throws Exception {
verifyParcel(new OsuProvider(TEST_SSID, TEST_FRIENDLY_NAMES,
TEST_SERVICE_DESCRIPTION, TEST_SERVER_URI, TEST_NAI, TEST_METHOD_LIST, TEST_ICON));
TEST_SERVICE_DESCRIPTION, TEST_SERVER_URI, TEST_NAI, TEST_METHOD_LIST));
}
/**
@@ -102,7 +100,7 @@ public class OsuProviderTest {
*/
@Test
public void verifyCopyConstructorWithNullSource() throws Exception {
OsuProvider expected = new OsuProvider((WifiSsid) null, null, null, null, null, null, null);
OsuProvider expected = new OsuProvider((WifiSsid) null, null, null, null, null, null);
assertEquals(expected, new OsuProvider(null));
}
@@ -114,7 +112,7 @@ public class OsuProviderTest {
@Test
public void verifyCopyConstructorWithValidSource() throws Exception {
OsuProvider source = new OsuProvider(TEST_SSID, TEST_FRIENDLY_NAMES,
TEST_SERVICE_DESCRIPTION, TEST_SERVER_URI, TEST_NAI, TEST_METHOD_LIST, TEST_ICON);
TEST_SERVICE_DESCRIPTION, TEST_SERVER_URI, TEST_NAI, TEST_METHOD_LIST);
assertEquals(source, new OsuProvider(source));
}
@@ -126,7 +124,7 @@ public class OsuProviderTest {
@Test
public void verifyGetters() throws Exception {
OsuProvider provider = new OsuProvider(TEST_SSID, TEST_FRIENDLY_NAMES,
TEST_SERVICE_DESCRIPTION, TEST_SERVER_URI, TEST_NAI, TEST_METHOD_LIST, TEST_ICON);
TEST_SERVICE_DESCRIPTION, TEST_SERVER_URI, TEST_NAI, TEST_METHOD_LIST);
assertTrue(TEST_SSID.equals(provider.getOsuSsid()));
assertTrue(TEST_FRIENDLY_NAME.equals(provider.getFriendlyName()));
@@ -135,6 +133,5 @@ public class OsuProviderTest {
assertTrue(TEST_SERVER_URI.equals(provider.getServerUri()));
assertTrue(TEST_NAI.equals(provider.getNetworkAccessIdentifier()));
assertTrue(TEST_METHOD_LIST.equals(provider.getMethodList()));
assertTrue(TEST_ICON.sameAs(provider.getIcon()));
}
}