Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" (aadbb2d4) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −11

Original line number	Diff line number	Diff line
		@@ -24809,16 +24809,6 @@ package android.net.sip {

		package android.net.wifi {

		public final class IconInfo implements android.os.Parcelable {
		ctor public IconInfo(java.lang.String, byte[]);
		ctor public IconInfo(android.net.wifi.IconInfo);
		method public int describeContents();
		method public byte[] getData();
		method public java.lang.String getFilename();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.wifi.IconInfo> CREATOR;
		}

		public class ScanResult implements android.os.Parcelable {
		method public int describeContents();
		method public boolean is80211mcResponder();
		@@ -25067,7 +25057,8 @@ package android.net.wifi {
		field public static final java.lang.String EXTRA_BSSID_LONG = "android.net.wifi.extra.BSSID_LONG";
		field public static final java.lang.String EXTRA_DELAY = "android.net.wifi.extra.DELAY";
		field public static final java.lang.String EXTRA_ESS = "android.net.wifi.extra.ESS";
		field public static final java.lang.String EXTRA_ICON_INFO = "android.net.wifi.extra.ICON_INFO";
		field public static final java.lang.String EXTRA_FILENAME = "android.net.wifi.extra.FILENAME";
		field public static final java.lang.String EXTRA_ICON = "android.net.wifi.extra.ICON";
		field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
		field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";
		field public static final java.lang.String EXTRA_NEW_STATE = "newState";

api/system-current.txt

+2 −11

Original line number	Diff line number	Diff line
		@@ -26961,16 +26961,6 @@ package android.net.wifi {
		field public boolean truncated;
		}

		public final class IconInfo implements android.os.Parcelable {
		ctor public IconInfo(java.lang.String, byte[]);
		ctor public IconInfo(android.net.wifi.IconInfo);
		method public int describeContents();
		method public byte[] getData();
		method public java.lang.String getFilename();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.wifi.IconInfo> CREATOR;
		}

		public class RttManager {
		method public void disableResponder(android.net.wifi.RttManager.ResponderCallback);
		method public void enableResponder(android.net.wifi.RttManager.ResponderCallback);
		@@ -27465,7 +27455,8 @@ package android.net.wifi {
		field public static final java.lang.String EXTRA_CHANGE_REASON = "changeReason";
		field public static final java.lang.String EXTRA_DELAY = "android.net.wifi.extra.DELAY";
		field public static final java.lang.String EXTRA_ESS = "android.net.wifi.extra.ESS";
		field public static final java.lang.String EXTRA_ICON_INFO = "android.net.wifi.extra.ICON_INFO";
		field public static final java.lang.String EXTRA_FILENAME = "android.net.wifi.extra.FILENAME";
		field public static final java.lang.String EXTRA_ICON = "android.net.wifi.extra.ICON";
		field public static final java.lang.String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges";
		field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
		field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";

api/test-current.txt

+2 −11

Original line number	Diff line number	Diff line
		@@ -24883,16 +24883,6 @@ package android.net.sip {

		package android.net.wifi {

		public final class IconInfo implements android.os.Parcelable {
		ctor public IconInfo(java.lang.String, byte[]);
		ctor public IconInfo(android.net.wifi.IconInfo);
		method public int describeContents();
		method public byte[] getData();
		method public java.lang.String getFilename();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.wifi.IconInfo> CREATOR;
		}

		public class ScanResult implements android.os.Parcelable {
		method public int describeContents();
		method public boolean is80211mcResponder();
		@@ -25141,7 +25131,8 @@ package android.net.wifi {
		field public static final java.lang.String EXTRA_BSSID_LONG = "android.net.wifi.extra.BSSID_LONG";
		field public static final java.lang.String EXTRA_DELAY = "android.net.wifi.extra.DELAY";
		field public static final java.lang.String EXTRA_ESS = "android.net.wifi.extra.ESS";
		field public static final java.lang.String EXTRA_ICON_INFO = "android.net.wifi.extra.ICON_INFO";
		field public static final java.lang.String EXTRA_FILENAME = "android.net.wifi.extra.FILENAME";
		field public static final java.lang.String EXTRA_ICON = "android.net.wifi.extra.ICON";
		field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
		field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";
		field public static final java.lang.String EXTRA_NEW_STATE = "newState";

wifi/java/android/net/wifi/IconInfo.aidl

deleted100644 → 0

+0 −19

Original line number	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;

		parcelable IconInfo;

wifi/java/android/net/wifi/IconInfo.java

deleted100644 → 0

+0 −111

Original line number	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 android.os.Parcelable;
		import android.text.TextUtils;
		import android.os.Parcel;

		import java.util.Arrays;
		import java.util.Objects;

		/**
		* A class representing icon information.
		*/
		public final class IconInfo implements Parcelable {
		/**
		* Name of the icon file.
		*/
		private final String mFilename;

		/**
		* Raw binary data of the icon.
		*/
		private final byte[] mData;

		public IconInfo(String filename, byte[] data) {
		mFilename = filename;
		mData = data;
		}

		public IconInfo(IconInfo source) {
		if (source == null) {
		mFilename = null;
		mData = null;
		return;
		}

		mFilename = source.mFilename;
		if (source.mData != null) {
		mData = Arrays.copyOf(source.mData, source.mData.length);
		} else {
		mData = null;
		}
		}

		public String getFilename() {
		return mFilename;
		}

		public byte[] getData() {
		return mData;
		}

		@Override
		public boolean equals(Object thatObject) {
		if (this == thatObject) {
		return true;
		}
		if (!(thatObject instanceof IconInfo)) {
		return false;
		}
		IconInfo that = (IconInfo) thatObject;
		return TextUtils.equals(mFilename, that.mFilename)
		&& Arrays.equals(mData, that.mData);
		}

		@Override
		public int hashCode() {
		return Objects.hash(mFilename, mData);
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeString(mFilename);
		dest.writeByteArray(mData);
		}

		public static final Creator<IconInfo> CREATOR =
		new Creator<IconInfo>() {
		@Override
		public IconInfo createFromParcel(Parcel in) {
		String filename = in.readString();
		byte[] data = in.createByteArray();
		return new IconInfo(filename, data);
		}

		@Override
		public IconInfo[] newArray(int size) {
		return new IconInfo[size];
		}
		};
		}