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

Commit 0a5b1430 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

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

parents ba9b2ce2 2c60ef0f

api/removed.txt

+8 −0
Original line number Diff line number Diff line
@@ -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);

api/system-current.txt

+0 −11
Original line number Diff line number Diff line
@@ -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();

























api/system-removed.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -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);

































api/test-removed.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -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);

































core/java/android/net/NetworkBadging.java



+3
−2




























Original line number
Diff line number
Diff line








@@ -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})