Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Video badging levels: @Deprecate and @remove" into oc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2017-05-02 00:44:47 +00:00
committed by Android (Google) Code Review
parent ba9b2ce254 2c60ef0fae
commit 0a5b14309a
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/removed.txt
View File

@@ -242,6 +242,14 @@ package android.net {
method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
}
public deprecated class NetworkBadging {
method public static android.graphics.drawable.Drawable getWifiIcon(int, int, android.content.res.Resources.Theme);
field public static final int BADGING_4K = 30; // 0x1e
field public static final int BADGING_HD = 20; // 0x14
field public static final int BADGING_NONE = 0; // 0x0
field public static final int BADGING_SD = 10; // 0xa
}
public abstract class NetworkRecommendationProvider {
ctor public deprecated NetworkRecommendationProvider(android.os.Handler);
method public deprecated void onRequestRecommendation(android.net.RecommendationRequest, android.net.NetworkRecommendationProvider.ResultCallback);

11
api/system-current.txt
View File

@@ -27756,17 +27756,6 @@ package android.net {
field public static final android.os.Parcelable.Creator<android.net.Network> CREATOR;
}
public class NetworkBadging {
method public static android.graphics.drawable.Drawable getWifiIcon(int, int, android.content.res.Resources.Theme);
field public static final int BADGING_4K = 30; // 0x1e
field public static final int BADGING_HD = 20; // 0x14
field public static final int BADGING_NONE = 0; // 0x0
field public static final int BADGING_SD = 10; // 0xa
}
public static abstract class NetworkBadging.Badging implements java.lang.annotation.Annotation {
}
public final class NetworkCapabilities implements android.os.Parcelable {
ctor public NetworkCapabilities(android.net.NetworkCapabilities);
method public int describeContents();

8
api/system-removed.txt
View File

@@ -240,6 +240,14 @@ package android.net {
method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
}
public deprecated class NetworkBadging {
method public static android.graphics.drawable.Drawable getWifiIcon(int, int, android.content.res.Resources.Theme);
field public static final int BADGING_4K = 30; // 0x1e
field public static final int BADGING_HD = 20; // 0x14
field public static final int BADGING_NONE = 0; // 0x0
field public static final int BADGING_SD = 10; // 0xa
}
public abstract class NetworkRecommendationProvider {
ctor public deprecated NetworkRecommendationProvider(android.os.Handler);
method public deprecated void onRequestRecommendation(android.net.RecommendationRequest, android.net.NetworkRecommendationProvider.ResultCallback);

8
api/test-removed.txt
View File

@@ -242,6 +242,14 @@ package android.net {
method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
}
public deprecated class NetworkBadging {
method public static android.graphics.drawable.Drawable getWifiIcon(int, int, android.content.res.Resources.Theme);
field public static final int BADGING_4K = 30; // 0x1e
field public static final int BADGING_HD = 20; // 0x14
field public static final int BADGING_NONE = 0; // 0x0
field public static final int BADGING_SD = 10; // 0xa
}
public abstract class NetworkRecommendationProvider {
ctor public deprecated NetworkRecommendationProvider(android.os.Handler);
method public deprecated void onRequestRecommendation(android.net.RecommendationRequest, android.net.NetworkRecommendationProvider.ResultCallback);

5
core/java/android/net/NetworkBadging.java
View File

@@ -35,9 +35,10 @@ import java.lang.annotation.RetentionPolicy;
/**
* Utility methods for working with network badging.
*
* @hide
* @removed
*
*/
@SystemApi
@Deprecated
public class NetworkBadging {
@IntDef({BADGING_NONE, BADGING_SD, BADGING_HD, BADGING_4K})