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

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

Merge "Copy libcore.utils.HexEncoding into Wifi module"

parents 3399dd32 5b62f3d4

wifi/java/android/net/wifi/aware/PublishConfig.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -19,11 +19,10 @@ package android.net.wifi.aware; 
import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.net.wifi.util.HexEncoding;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;





import libcore.util.HexEncoding;



import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;

import java.nio.charset.StandardCharsets;

import java.nio.charset.StandardCharsets;

wifi/java/android/net/wifi/aware/SubscribeConfig.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -19,11 +19,10 @@ package android.net.wifi.aware; 
import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.net.wifi.util.HexEncoding;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;





import libcore.util.HexEncoding;



import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;

import java.nio.charset.StandardCharsets;

import java.nio.charset.StandardCharsets;

wifi/java/android/net/wifi/aware/WifiAwareAgentNetworkSpecifier.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -17,12 +17,11 @@ 
package android.net.wifi.aware;

package android.net.wifi.aware;





import android.net.NetworkSpecifier;

import android.net.NetworkSpecifier;

import android.net.wifi.util.HexEncoding;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.util.Log;

import android.util.Log;





import libcore.util.HexEncoding;



import java.security.MessageDigest;

import java.security.MessageDigest;

import java.security.NoSuchAlgorithmException;

import java.security.NoSuchAlgorithmException;

import java.util.Arrays;

import java.util.Arrays;

wifi/java/android/net/wifi/aware/WifiAwareManager.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.Context; 
import android.net.ConnectivityManager;

import android.net.ConnectivityManager;

import android.net.NetworkRequest;

import android.net.NetworkRequest;

import android.net.NetworkSpecifier;

import android.net.NetworkSpecifier;

import android.net.wifi.util.HexEncoding;

import android.os.Binder;

import android.os.Binder;

import android.os.Build;

import android.os.Build;

import android.os.Bundle;

import android.os.Bundle;
@@ -36,8 +37,6 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.RemoteException;

import android.util.Log;

import android.util.Log;





import libcore.util.HexEncoding;



import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;

import java.lang.ref.WeakReference;

import java.lang.ref.WeakReference;

wifi/java/android/net/wifi/util/HexEncoding.java

0 → 100644
+183 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2014 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.util;



/**

 * Hexadecimal encoding where each byte is represented by two hexadecimal digits.

 *

 * Note: this is copied from {@link libcore.util.HexEncoding}.

 *

 * @hide

 */

public class HexEncoding {



    private static final char[] LOWER_CASE_DIGITS = {

            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'

    };



    private static final char[] UPPER_CASE_DIGITS = {

            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'

    };



    /** Hidden constructor to prevent instantiation. */

    private HexEncoding() {}



    /**

     * Encodes the provided byte as a two-digit hexadecimal String value.

     */

    public static String encodeToString(byte b, boolean upperCase) {

        char[] digits = upperCase ? UPPER_CASE_DIGITS : LOWER_CASE_DIGITS;

        char[] buf = new char[2]; // We always want two digits.

        buf[0] = digits[(b >> 4) & 0xf];

        buf[1] = digits[b & 0xf];

        return new String(buf, 0, 2);

    }



    /**

     * Encodes the provided data as a sequence of hexadecimal characters.

     */

    public static char[] encode(byte[] data) {

        return encode(data, 0, data.length, true /* upperCase */);

    }



    /**

     * Encodes the provided data as a sequence of hexadecimal characters.

     */

    public static char[] encode(byte[] data, boolean upperCase) {

        return encode(data, 0, data.length, upperCase);

    }



    /**

     * Encodes the provided data as a sequence of hexadecimal characters.

     */

    public static char[] encode(byte[] data, int offset, int len) {

        return encode(data, offset, len, true /* upperCase */);

    }



    /**

     * Encodes the provided data as a sequence of hexadecimal characters.

     */

    private static char[] encode(byte[] data, int offset, int len, boolean upperCase) {

        char[] digits = upperCase ? UPPER_CASE_DIGITS : LOWER_CASE_DIGITS;

        char[] result = new char[len * 2];

        for (int i = 0; i < len; i++) {

            byte b = data[offset + i];

            int resultIndex = 2 * i;

            result[resultIndex] = (digits[(b >> 4) & 0x0f]);

            result[resultIndex + 1] = (digits[b & 0x0f]);

        }



        return result;

    }



    /**

     * Encodes the provided data as a sequence of hexadecimal characters.

     */

    public static String encodeToString(byte[] data) {

        return encodeToString(data, true /* upperCase */);

    }



    /**

     * Encodes the provided data as a sequence of hexadecimal characters.

     */

    public static String encodeToString(byte[] data, boolean upperCase) {

        return new String(encode(data, upperCase));

    }



    /**

     * Decodes the provided hexadecimal string into a byte array.  Odd-length inputs

     * are not allowed.

     *

     * Throws an {@code IllegalArgumentException} if the input is malformed.

     */

    public static byte[] decode(String encoded) throws IllegalArgumentException {

        return decode(encoded.toCharArray());

    }



    /**

     * Decodes the provided hexadecimal string into a byte array. If {@code allowSingleChar}

     * is {@code true} odd-length inputs are allowed and the first character is interpreted

     * as the lower bits of the first result byte.

     *

     * Throws an {@code IllegalArgumentException} if the input is malformed.

     */

    public static byte[] decode(String encoded, boolean allowSingleChar)

            throws IllegalArgumentException {

        return decode(encoded.toCharArray(), allowSingleChar);

    }



    /**

     * Decodes the provided hexadecimal string into a byte array.  Odd-length inputs

     * are not allowed.

     *

     * Throws an {@code IllegalArgumentException} if the input is malformed.

     */

    public static byte[] decode(char[] encoded) throws IllegalArgumentException {

        return decode(encoded, false);

    }



    /**

     * Decodes the provided hexadecimal string into a byte array. If {@code allowSingleChar}

     * is {@code true} odd-length inputs are allowed and the first character is interpreted

     * as the lower bits of the first result byte.

     *

     * Throws an {@code IllegalArgumentException} if the input is malformed.

     */

    public static byte[] decode(char[] encoded, boolean allowSingleChar)

            throws IllegalArgumentException {

        int encodedLength = encoded.length;

        int resultLengthBytes = (encodedLength + 1) / 2;

        byte[] result = new byte[resultLengthBytes];



        int resultOffset = 0;

        int i = 0;

        if (allowSingleChar) {

            if ((encodedLength % 2) != 0) {

                // Odd number of digits -- the first digit is the lower 4 bits of the first result

                // byte.

                result[resultOffset++] = (byte) toDigit(encoded, i);

                i++;

            }

        } else {

            if ((encodedLength % 2) != 0) {

                throw new IllegalArgumentException("Invalid input length: " + encodedLength);

            }

        }



        for (; i < encodedLength; i += 2) {

            result[resultOffset++] = (byte) ((toDigit(encoded, i) << 4) | toDigit(encoded, i + 1));

        }



        return result;

    }



    private static int toDigit(char[] str, int offset) throws IllegalArgumentException {

        // NOTE: that this isn't really a code point in the traditional sense, since we're

        // just rejecting surrogate pairs outright.

        int pseudoCodePoint = str[offset];



        if ('0' <= pseudoCodePoint && pseudoCodePoint <= '9') {

            return pseudoCodePoint - '0';

        } else if ('a' <= pseudoCodePoint && pseudoCodePoint <= 'f') {

            return 10 + (pseudoCodePoint - 'a');

        } else if ('A' <= pseudoCodePoint && pseudoCodePoint <= 'F') {

            return 10 + (pseudoCodePoint - 'A');

        }



        throw new IllegalArgumentException("Illegal char: " + str[offset] + " at offset " + offset);

    }

}