From 1adb838636cc114e79d5af3b8eb276c83363d9aa Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 21 Feb 2020 07:39:35 -0800
Subject: [PATCH] Revert "Exempt-From-Owner-Approval: Workaround for build
 break on WifiNl80211Manager"

This reverts commit d90bc26a07fed241e8dec23cf0c676033dde9d71.

Sharding jarjar'd classes is fixed.

Bug: 149969343
Test: m framework-minus-apex
Change-Id: I12ae9d4870a3fad5c61c143368e0ef9025202ccd
---
 .../net/wifi/nl80211/WifiNl80211Manager.java  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/wifi/java/android/net/wifi/nl80211/WifiNl80211Manager.java b/wifi/java/android/net/wifi/nl80211/WifiNl80211Manager.java
index 7d24142ba1355..3215246a9c1ff 100644
--- a/wifi/java/android/net/wifi/nl80211/WifiNl80211Manager.java
+++ b/wifi/java/android/net/wifi/nl80211/WifiNl80211Manager.java
@@ -25,6 +25,7 @@ import android.annotation.SystemService;
 import android.app.AlarmManager;
 import android.content.Context;
 import android.net.wifi.SoftApInfo;
+import android.net.wifi.WifiAnnotations;
 import android.net.wifi.WifiScanner;
 import android.os.Binder;
 import android.os.Handler;
@@ -244,7 +245,7 @@ public class WifiNl80211Manager {
          *                     indication that the SoftAp is not enabled.
          * @param bandwidth The new bandwidth of the SoftAp.
          */
-        void onSoftApChannelSwitched(int frequencyMhz,  int bandwidth);
+        void onSoftApChannelSwitched(int frequencyMhz, @WifiAnnotations.Bandwidth int bandwidth);
     }
 
     /**
@@ -382,7 +383,7 @@ public class WifiNl80211Manager {
                     toFrameworkBandwidth(bandwidth)));
         }
 
-        private  int toFrameworkBandwidth(int bandwidth) {
+        private @WifiAnnotations.Bandwidth int toFrameworkBandwidth(int bandwidth) {
             switch(bandwidth) {
                 case IApInterfaceEventCallback.BANDWIDTH_INVALID:
                     return SoftApInfo.CHANNEL_WIDTH_INVALID;
@@ -855,7 +856,7 @@ public class WifiNl80211Manager {
     /**
      * Return scan type for the parcelable {@link SingleScanSettings}
      */
-    private static int getScanType(int scanType) {
+    private static int getScanType(@WifiAnnotations.ScanType int scanType) {
         switch (scanType) {
             case WifiScanner.SCAN_TYPE_LOW_LATENCY:
                 return IWifiScannerImpl.SCAN_TYPE_LOW_SPAN;
@@ -890,7 +891,7 @@ public class WifiNl80211Manager {
      * @return Returns true on success, false on failure (e.g. when called before the interface
      * has been set up).
      */
-    public boolean startScan(@NonNull String ifaceName,  int scanType,
+    public boolean startScan(@NonNull String ifaceName, @WifiAnnotations.ScanType int scanType,
             @Nullable Set<Integer> freqs, @Nullable List<byte[]> hiddenNetworkSSIDs) {
         IWifiScannerImpl scannerImpl = getScannerImpl(ifaceName);
         if (scannerImpl == null) {
@@ -1046,7 +1047,7 @@ public class WifiNl80211Manager {
      * @return frequencies vector of valid frequencies (MHz), or an empty array for error.
      * @throws IllegalArgumentException if band is not recognized.
      */
-    public @NonNull int[] getChannelsMhzForBand(int band) {
+    public @NonNull int[] getChannelsMhzForBand(@WifiAnnotations.WifiBandBasic int band) {
         if (mWificond == null) {
             Log.e(TAG, "No valid wificond scanner interface handler");
             return new int[0];
@@ -1225,7 +1226,7 @@ public class WifiNl80211Manager {
      */
     public static class OemSecurityType {
         /** The protocol defined in {@link android.net.wifi.WifiAnnotations.Protocol}. */
-        public final  int protocol;
+        public final @WifiAnnotations.Protocol int protocol;
         /**
          * Supported key management types defined
          * in {@link android.net.wifi.WifiAnnotations.KeyMgmt}.
@@ -1237,7 +1238,7 @@ public class WifiNl80211Manager {
          */
         @NonNull public final List<Integer> pairwiseCipher;
         /** The group cipher type defined in {@link android.net.wifi.WifiAnnotations.Cipher}. */
-        public final  int groupCipher;
+        public final @WifiAnnotations.Cipher int groupCipher;
         /**
          * Default constructor for OemSecurityType
          *
@@ -1251,10 +1252,10 @@ public class WifiNl80211Manager {
          *                    in {@link android.net.wifi.WifiAnnotations.Cipher}.
          */
         public OemSecurityType(
-                int protocol,
+                @WifiAnnotations.Protocol int protocol,
                 @NonNull List<Integer> keyManagement,
                 @NonNull List<Integer> pairwiseCipher,
-                 int groupCipher) {
+                @WifiAnnotations.Cipher int groupCipher) {
             this.protocol = protocol;
             this.keyManagement = (keyManagement != null)
                 ? keyManagement : new ArrayList<Integer>();