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

Commit fb19d8d7 authored by Ningyuan Wang's avatar Ningyuan Wang Committed by Gerrit Code Review
Browse files

Merge "Create createFromByteArray() for WifiSsid"

parents 132842ef a6ea570a
Loading
Loading
Loading
Loading
+8 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,14 @@ public class WifiSsid implements Parcelable {
    private WifiSsid() {
    private WifiSsid() {
    }
    }


    public static WifiSsid createFromByteArray(byte ssid[]) {
        WifiSsid wifiSsid = new WifiSsid();
        if (ssid != null) {
            wifiSsid.octets.write(ssid, 0/* the start offset */, ssid.length);;
        }
        return wifiSsid;
    }

    public static WifiSsid createFromAsciiEncoded(String asciiEncoded) {
    public static WifiSsid createFromAsciiEncoded(String asciiEncoded) {
        WifiSsid a = new WifiSsid();
        WifiSsid a = new WifiSsid();
        a.convertToBytes(asciiEncoded);
        a.convertToBytes(asciiEncoded);
+40 −0
Original line number Original line Diff line number Diff line
/*
 * Copyright (C) 2017 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package android.net.wifi;

import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;

import org.junit.Test;

/**
 * Unit tests for {@link android.net.wifi.WifiSsid}.
 */
public class WifiSsidTest {

    private static final byte[] TEST_SSID =
            new byte[] {'G', 'o', 'o', 'g', 'l', 'e', 'G', 'u', 'e', 's', 't'};
    /**
     * Check that createFromByteArray() works.
     */
    @Test
    public void testCreateFromByteArray() {
        WifiSsid wifiSsid = WifiSsid.createFromByteArray(TEST_SSID);
        assertTrue(wifiSsid != null);
        assertEquals(new String(TEST_SSID), wifiSsid.toString());
    }
}