5 files changed, 27 insertions, 13 deletions
diff --git a/api/removed.txt b/api/removed.txt
index b6ddf0e1ac6f..187349916286 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -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);
diff --git a/api/system-current.txt b/api/system-current.txt
index 9cb9aabf51b4..90e18ec56204 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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();
diff --git a/api/system-removed.txt b/api/system-removed.txt
index fbb7fec0f26b..60865a3892da 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -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);
diff --git a/api/test-removed.txt b/api/test-removed.txt
index b6ddf0e1ac6f..187349916286 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -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);
diff --git a/core/java/android/net/NetworkBadging.java b/core/java/android/net/NetworkBadging.java
index b4ef69542bd1..6de28b7146e8 100644
--- a/core/java/android/net/NetworkBadging.java
+++ b/core/java/android/net/NetworkBadging.java
@@ -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})