From 740e68c2aec1df8d8057dc2a109b739311dcb274 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Wed, 19 Feb 2020 13:37:39 -0800
Subject: [PATCH] Verbose Logging: Add maxTargetSdk

Add maxTargetSdk = Q for @UnsupportedAppUsage
Wifi Verbose Logging APIs. Callers on Android R+
should use formal @SystemApi's.

Bug: 148967842
Test: compiles
Change-Id: I27798f2ae97f07c3452e13ff8f82fdc90b36298d
---
 wifi/java/android/net/wifi/WifiManager.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index f693315c6cfff..2dd12dbff6faf 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -46,6 +46,7 @@ import android.net.wifi.hotspot2.OsuProvider;
 import android.net.wifi.hotspot2.PasspointConfiguration;
 import android.net.wifi.hotspot2.ProvisioningCallback;
 import android.os.Binder;
+import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerExecutor;
 import android.os.IBinder;
@@ -4900,7 +4901,10 @@ public class WifiManager {
     }
 
     /** @hide */
-    @UnsupportedAppUsage
+    @UnsupportedAppUsage(
+            maxTargetSdk = Build.VERSION_CODES.Q,
+            publicAlternatives = "Use {@code #setVerboseLoggingEnabled(boolean)} instead."
+    )
     @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
     public void enableVerboseLogging (int verbose) {
         try {
@@ -4928,7 +4932,10 @@ public class WifiManager {
 
     /** @hide */
     // TODO(b/145484145): remove once SUW stops calling this via reflection
-    @UnsupportedAppUsage
+    @UnsupportedAppUsage(
+            maxTargetSdk = Build.VERSION_CODES.Q,
+            publicAlternatives = "Use {@code #isVerboseLoggingEnabled()} instead."
+    )
     public int getVerboseLoggingLevel() {
         try {
             return mService.getVerboseLoggingLevel();