Merge "Remove ScoredNetwork.BADGING constants." into oc-dev (45a1fa12) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −7

Original line number	Diff line number	Diff line
		@@ -28183,10 +28183,6 @@ package android.net {
		field public static final java.lang.String ATTRIBUTES_KEY_BADGING_CURVE = "android.net.attributes.key.BADGING_CURVE";
		field public static final java.lang.String ATTRIBUTES_KEY_HAS_CAPTIVE_PORTAL = "android.net.attributes.key.HAS_CAPTIVE_PORTAL";
		field public static final java.lang.String ATTRIBUTES_KEY_RANKING_SCORE_OFFSET = "android.net.attributes.key.RANKING_SCORE_OFFSET";
		field public static final deprecated int BADGING_4K = 30; // 0x1e
		field public static final deprecated int BADGING_HD = 20; // 0x14
		field public static final deprecated int BADGING_NONE = 0; // 0x0
		field public static final deprecated int BADGING_SD = 10; // 0xa
		field public static final android.os.Parcelable.Creator<android.net.ScoredNetwork> CREATOR;
		field public final android.os.Bundle attributes;
		field public final boolean meteredHint;
		@@ -28194,9 +28190,6 @@ package android.net {
		field public final android.net.RssiCurve rssiCurve;
		}

		public static abstract deprecated class ScoredNetwork.Badging implements java.lang.annotation.Annotation {
		}

		public class TrafficStats {
		ctor public TrafficStats();
		method public static void clearThreadStatsTag();

+2 −2

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ public class NetworkBadging {
		*
		* @param signalLevel The level returned by {@link WifiManager#calculateSignalLevel(int, int)}
		* for a network. Must be between 0 and {@link WifiManager#RSSI_LEVELS}-1.
		* @param badging {@see ScoredNetwork#Badging}, retrieved from
		* @param badging {@see NetworkBadging#Badging}, retrieved from
		* {@link ScoredNetwork#calculateBadge(int)}.
		* @param theme The theme for the current application, may be null.
		* @return Drawable for the given icon
		@@ -140,7 +140,7 @@ public class NetworkBadging {
		* <p>This badge should be displayed with the badge signal resource retrieved from
		* {@link #getBadgedWifiSignalResource(int)}.
		*
		* @param badging {@see ScoredNetwork#Badging} from {@link ScoredNetwork#calculateBadge(int)}.
		* @param badging {@see NetworkBadging#Badging} from {@link ScoredNetwork#calculateBadge(int)}.
		* @return the @DrawableRes for the icon or {@link View#NO_ID} for
		* {@link NetworkBadging#BADGING_NONE}
		* @throws IllegalArgumentException for an invalid badging value.

+0 −23

Original line number	Diff line number	Diff line
		@@ -73,29 +73,6 @@ public class ScoredNetwork implements Parcelable {
		/** A {@link NetworkKey} uniquely identifying this network. */
		public final NetworkKey networkKey;

		// TODO(b/35323372): Delete these once external references are switched.
		/** @deprecated Use {@link NetworkBadging#Badging} instead. */
		@Deprecated
		@IntDef({BADGING_NONE, BADGING_SD, BADGING_HD, BADGING_4K})
		@Retention(RetentionPolicy.SOURCE)
		public @interface Badging {}

		/** @deprecated Use {@link NetworkBadging#BADGING_NONE} instead. */
		@Deprecated
		public static final int BADGING_NONE = 0;

		/** @deprecated Use {@link NetworkBadging#BADGING_SD} instead. */
		@Deprecated
		public static final int BADGING_SD = 10;

		/** @deprecated Use {@link NetworkBadging#BADGING_HD} instead. */
		@Deprecated
		public static final int BADGING_HD = 20;

		/** @deprecated Use {@link NetworkBadging#BADGING_4K} instead. */
		@Deprecated
		public static final int BADGING_4K = 30;

		/**
		* The {@link RssiCurve} representing the scores for this network based on the RSSI.
		*