From 79ec1736be23bc624f67d65195ac5ac40def8f9e Mon Sep 17 00:00:00 2001
From: Christopher Wiley <wiley@google.com>
Date: Mon, 19 Sep 2016 14:09:42 -0700
Subject: [PATCH] Remove WifiManager#get/setFrequencyBand

These methods are marked @hide and only partially implemented by
the WifiService.  In general, it seems wrong to strictly prefer
one WiFi band over another for all WiFi operations.  To reduce
implementation complexity, cause setFrequencyBand to become a noop
and getFrequencyBand to reflect the underlying reality, which is
that we will always operate on all supported bands.

Bug: 31148223
Test: Compiles
Change-Id: Iccff517915f7d5ed7e96bf56e4f195b2cda80f0a
---
 wifi/java/android/net/wifi/IWifiManager.aidl |  4 ---
 wifi/java/android/net/wifi/WifiManager.java  | 34 --------------------
 2 files changed, 38 deletions(-)

diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 706b29495c211..a91c9491c60ab 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -97,10 +97,6 @@ interface IWifiManager
 
     String getCountryCode();
 
-    void setFrequencyBand(int band, boolean persist);
-
-    int getFrequencyBand();
-
     boolean isDualBandSupported();
 
     boolean saveConfiguration();
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 955161cf538b1..d04a60ecdfd2a 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1375,40 +1375,6 @@ public class WifiManager {
        }
     }
 
-    /**
-     * Set the operational frequency band.
-     * @param band  One of
-     *     {@link #WIFI_FREQUENCY_BAND_AUTO},
-     *     {@link #WIFI_FREQUENCY_BAND_5GHZ},
-     *     {@link #WIFI_FREQUENCY_BAND_2GHZ},
-     * @param persist {@code true} if this needs to be remembered
-     * @hide
-     */
-    public void setFrequencyBand(int band, boolean persist) {
-        try {
-            mService.setFrequencyBand(band, persist);
-        } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
-        }
-    }
-
-    /**
-     * Get the operational frequency band.
-     * @return One of
-     *     {@link #WIFI_FREQUENCY_BAND_AUTO},
-     *     {@link #WIFI_FREQUENCY_BAND_5GHZ},
-     *     {@link #WIFI_FREQUENCY_BAND_2GHZ} or
-     *     {@code -1} on failure.
-     * @hide
-     */
-    public int getFrequencyBand() {
-        try {
-            return mService.getFrequencyBand();
-        } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
-        }
-    }
-
     /**
      * Check if the chipset supports dual frequency band (2.4 GHz and 5 GHz)
      * @return {@code true} if supported, {@code false} otherwise.