Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53acd039 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

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

* changes:
  Remove OsuProvider#mIcon
  SettingsLibTest: Remove OsuProvider#mIcon
parents f99b66e8 e0ee85b9

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -120,7 +120,7 @@ public class AccessPointTest { 
    private OsuProvider createOsuProvider() {

    private OsuProvider createOsuProvider() {

        Map<String, String> friendlyNames = new HashMap<>();

        Map<String, String> friendlyNames = new HashMap<>();

        friendlyNames.put("en", OSU_FRIENDLY_NAME);

        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

    @Before

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -336,7 +336,7 @@ public class WifiTrackerTest { 
    private static OsuProvider buildOsuProvider(String friendlyName) {

    private static OsuProvider buildOsuProvider(String friendlyName) {

        Map<String, String> friendlyNames = new HashMap<>();

        Map<String, String> friendlyNames = new HashMap<>();

        friendlyNames.put("en", friendlyName);

        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(

    private WifiTracker createTrackerWithImmediateBroadcastsAndInjectInitialScanResults(

wifi/java/android/net/wifi/hotspot2/OsuProvider.java

+9 −33
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ package android.net.wifi.hotspot2; 
import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.graphics.drawable.Icon;

import android.net.Uri;

import android.net.Uri;

import android.net.wifi.WifiSsid;

import android.net.wifi.WifiSsid;

import android.os.Bundle;

import android.os.Bundle;
@@ -86,23 +85,16 @@ public final class OsuProvider implements Parcelable { 
     */

     */

    private final List<Integer> mMethodList;

    private final List<Integer> mMethodList;





    /**

     * Icon data for the OSU (Online Sign-Up) provider.

     */

    private final Icon mIcon;



    /** @hide */

    /** @hide */

    public OsuProvider(String osuSsid, Map<String, String> friendlyNames,

    public OsuProvider(String osuSsid, Map<String, String> friendlyNames,

            String serviceDescription, Uri serverUri, String nai, List<Integer> methodList,

            String serviceDescription, Uri serverUri, String nai, List<Integer> methodList) {

            Icon icon) {

        this(WifiSsid.createFromByteArray(osuSsid.getBytes(StandardCharsets.UTF_8)),

        this(WifiSsid.createFromByteArray(osuSsid.getBytes(StandardCharsets.UTF_8)),

                friendlyNames, serviceDescription, serverUri, nai, methodList, icon);

                friendlyNames, serviceDescription, serverUri, nai, methodList);

    }

    }





    /** @hide */

    /** @hide */

    public OsuProvider(WifiSsid osuSsid, Map<String, String> friendlyNames,

    public OsuProvider(WifiSsid osuSsid, Map<String, String> friendlyNames,

            String serviceDescription, Uri serverUri, String nai, List<Integer> methodList,

            String serviceDescription, Uri serverUri, String nai, List<Integer> methodList) {

            Icon icon) {

        mOsuSsid = osuSsid;

        mOsuSsid = osuSsid;

        mFriendlyNames = friendlyNames;

        mFriendlyNames = friendlyNames;

        mServiceDescription = serviceDescription;

        mServiceDescription = serviceDescription;
@@ -113,7 +105,6 @@ public final class OsuProvider implements Parcelable { 
        } else {

        } else {

            mMethodList = new ArrayList<>(methodList);

            mMethodList = new ArrayList<>(methodList);

        }

        }

        mIcon = icon;

    }

    }





    /**

    /**
@@ -130,7 +121,6 @@ public final class OsuProvider implements Parcelable { 
            mServerUri = null;

            mServerUri = null;

            mNetworkAccessIdentifier = null;

            mNetworkAccessIdentifier = null;

            mMethodList = new ArrayList<>();

            mMethodList = new ArrayList<>();

            mIcon = null;

            return;

            return;

        }

        }
@@ -144,7 +134,6 @@ public final class OsuProvider implements Parcelable { 
        } else {

        } else {

            mMethodList = new ArrayList<>(source.mMethodList);

            mMethodList = new ArrayList<>(source.mMethodList);

        }

        }

        mIcon = source.mIcon;

    }

    }





    /** @hide */

    /** @hide */
@@ -205,11 +194,6 @@ public final class OsuProvider implements Parcelable { 
        return mMethodList;

        return mMethodList;

    }

    }





    /** @hide */

    public Icon getIcon() {

        return mIcon;

    }



    @Override

    @Override

    public int describeContents() {

    public int describeContents() {

        return 0;

        return 0;
@@ -222,7 +206,6 @@ public final class OsuProvider implements Parcelable { 
        dest.writeParcelable(mServerUri, flags);

        dest.writeParcelable(mServerUri, flags);

        dest.writeString(mNetworkAccessIdentifier);

        dest.writeString(mNetworkAccessIdentifier);

        dest.writeList(mMethodList);

        dest.writeList(mMethodList);

        dest.writeParcelable(mIcon, flags);

        Bundle bundle = new Bundle();

        Bundle bundle = new Bundle();

        bundle.putSerializable("friendlyNameMap", (HashMap<String, String>) mFriendlyNames);

        bundle.putSerializable("friendlyNameMap", (HashMap<String, String>) mFriendlyNames);

        dest.writeBundle(bundle);

        dest.writeBundle(bundle);
@@ -237,21 +220,16 @@ public final class OsuProvider implements Parcelable { 
            return false;

            return false;

        }

        }

        OsuProvider that = (OsuProvider) thatObject;

        OsuProvider that = (OsuProvider) thatObject;

        return (mOsuSsid == null ? that.mOsuSsid == null : mOsuSsid.equals(that.mOsuSsid))

        return Objects.equals(mOsuSsid, that.mOsuSsid)

                && (mFriendlyNames == null) ? that.mFriendlyNames == null

                && Objects.equals(mFriendlyNames, that.mFriendlyNames)

                            : mFriendlyNames.equals(that.mFriendlyNames)

                && TextUtils.equals(mServiceDescription, that.mServiceDescription)

                && TextUtils.equals(mServiceDescription, that.mServiceDescription)

                && (mServerUri == null ? that.mServerUri == null

                && Objects.equals(mServerUri, that.mServerUri)

                            : mServerUri.equals(that.mServerUri))

                && TextUtils.equals(mNetworkAccessIdentifier, that.mNetworkAccessIdentifier)

                && TextUtils.equals(mNetworkAccessIdentifier, that.mNetworkAccessIdentifier)

                && (mMethodList == null ? that.mMethodList == null

                && Objects.equals(mMethodList, that.mMethodList);

                            : mMethodList.equals(that.mMethodList))

                && (mIcon == null ? that.mIcon == null : mIcon.sameAs(that.mIcon));

    }

    }





    @Override

    @Override

    public int hashCode() {

    public int hashCode() {

        // mIcon is not hashable, skip the variable.

        return Objects.hash(mOsuSsid, mServiceDescription, mFriendlyNames,

        return Objects.hash(mOsuSsid, mServiceDescription, mFriendlyNames,

                mServerUri, mNetworkAccessIdentifier, mMethodList);

                mServerUri, mNetworkAccessIdentifier, mMethodList);

    }

    }
@@ -264,8 +242,7 @@ public final class OsuProvider implements Parcelable { 
                + " mServiceDescription=" + mServiceDescription

                + " mServiceDescription=" + mServiceDescription

                + " mServerUri=" + mServerUri

                + " mServerUri=" + mServerUri

                + " mNetworkAccessIdentifier=" + mNetworkAccessIdentifier

                + " mNetworkAccessIdentifier=" + mNetworkAccessIdentifier

                + " mMethodList=" + mMethodList

                + " mMethodList=" + mMethodList;

                + " mIcon=" + mIcon;

    }

    }





    public static final @android.annotation.NonNull Creator<OsuProvider> CREATOR =

    public static final @android.annotation.NonNull Creator<OsuProvider> CREATOR =
@@ -278,12 +255,11 @@ public final class OsuProvider implements Parcelable { 
                    String nai = in.readString();

                    String nai = in.readString();

                    List<Integer> methodList = new ArrayList<>();

                    List<Integer> methodList = new ArrayList<>();

                    in.readList(methodList, null);

                    in.readList(methodList, null);

                    Icon icon = in.readParcelable(null);

                    Bundle bundle = in.readBundle();

                    Bundle bundle = in.readBundle();

                    Map<String, String> friendlyNamesMap = (HashMap) bundle.getSerializable(

                    Map<String, String> friendlyNamesMap = (HashMap) bundle.getSerializable(

                            "friendlyNameMap");

                            "friendlyNameMap");

                    return new OsuProvider(osuSsid, friendlyNamesMap, serviceDescription,

                    return new OsuProvider(osuSsid, friendlyNamesMap, serviceDescription,

                            serverUri, nai, methodList, icon);

                            serverUri, nai, methodList);

                }

                }





            @Override

            @Override

wifi/tests/src/android/net/wifi/hotspot2/OsuProviderTest.java

+5 −8
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ package android.net.wifi.hotspot2; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.assertTrue;





import android.graphics.drawable.Icon;

import android.net.Uri;

import android.net.Uri;

import android.net.wifi.WifiSsid;

import android.net.wifi.WifiSsid;

import android.os.Parcel;

import android.os.Parcel;
@@ -56,7 +55,6 @@ public class OsuProviderTest { 
    private static final String TEST_NAI = "test.access.com";

    private static final String TEST_NAI = "test.access.com";

    private static final List<Integer> TEST_METHOD_LIST =

    private static final List<Integer> TEST_METHOD_LIST =

            Arrays.asList(OsuProvider.METHOD_SOAP_XML_SPP);

            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}.

     * Verify parcel write and read consistency for the given {@link OsuProvider}.
@@ -82,7 +80,7 @@ public class OsuProviderTest { 
     */

     */

    @Test

    @Test

    public void verifyParcelWithEmptyProviderInfo() throws Exception {

    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

    @Test

    public void verifyParcelWithFullProviderInfo() throws Exception {

    public void verifyParcelWithFullProviderInfo() throws Exception {

        verifyParcel(new OsuProvider(TEST_SSID, TEST_FRIENDLY_NAMES,

        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

    @Test

    public void verifyCopyConstructorWithNullSource() throws Exception {

    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));

        assertEquals(expected, new OsuProvider(null));

    }

    }
@@ -114,7 +112,7 @@ public class OsuProviderTest { 
    @Test

    @Test

    public void verifyCopyConstructorWithValidSource() throws Exception {

    public void verifyCopyConstructorWithValidSource() throws Exception {

        OsuProvider source = new OsuProvider(TEST_SSID, TEST_FRIENDLY_NAMES,

        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));

        assertEquals(source, new OsuProvider(source));

    }

    }
@@ -126,7 +124,7 @@ public class OsuProviderTest { 
    @Test

    @Test

    public void verifyGetters() throws Exception {

    public void verifyGetters() throws Exception {

        OsuProvider provider = new OsuProvider(TEST_SSID, TEST_FRIENDLY_NAMES,

        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_SSID.equals(provider.getOsuSsid()));

        assertTrue(TEST_FRIENDLY_NAME.equals(provider.getFriendlyName()));

        assertTrue(TEST_FRIENDLY_NAME.equals(provider.getFriendlyName()));
@@ -135,6 +133,5 @@ public class OsuProviderTest { 
        assertTrue(TEST_SERVER_URI.equals(provider.getServerUri()));

        assertTrue(TEST_SERVER_URI.equals(provider.getServerUri()));

        assertTrue(TEST_NAI.equals(provider.getNetworkAccessIdentifier()));

        assertTrue(TEST_NAI.equals(provider.getNetworkAccessIdentifier()));

        assertTrue(TEST_METHOD_LIST.equals(provider.getMethodList()));

        assertTrue(TEST_METHOD_LIST.equals(provider.getMethodList()));

        assertTrue(TEST_ICON.sameAs(provider.getIcon()));

    }

    }

}
 
}