From e6d152ead20b61b7e4d2eb655af6ef28675f0c72 Mon Sep 17 00:00:00 2001 From: Ningyuan Wang Date: Mon, 18 Dec 2017 16:51:37 -0800 Subject: [PATCH] Remove unused ScanSettings and WifiChannel classes This is an internal cleanup patch Bug: 68388459 Test: compile, unit tests Test: manual test that wifi scan still works Change-Id: I30ee0b342a04fe55fc8da8142600ccc4d34b30c1 --- wifi/java/android/net/wifi/IWifiManager.aidl | 3 +- wifi/java/android/net/wifi/ScanSettings.aidl | 19 ----- wifi/java/android/net/wifi/ScanSettings.java | 87 -------------------- wifi/java/android/net/wifi/WifiChannel.java | 87 -------------------- wifi/java/android/net/wifi/WifiManager.java | 2 +- 5 files changed, 2 insertions(+), 196 deletions(-) delete mode 100644 wifi/java/android/net/wifi/ScanSettings.aidl delete mode 100644 wifi/java/android/net/wifi/ScanSettings.java delete mode 100644 wifi/java/android/net/wifi/WifiChannel.java diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 309bc80b88643..2f7b50d1bd0c0 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -28,7 +28,6 @@ import android.net.Network; import android.net.wifi.ISoftApCallback; import android.net.wifi.PasspointManagementObjectDefinition; import android.net.wifi.ScanResult; -import android.net.wifi.ScanSettings; import android.net.wifi.WifiActivityEnergyInfo; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; @@ -86,7 +85,7 @@ interface IWifiManager boolean disableNetwork(int netId, String packageName); - void startScan(in ScanSettings requested, in WorkSource ws, String packageName); + void startScan(String packageName); List getScanResults(String callingPackage); diff --git a/wifi/java/android/net/wifi/ScanSettings.aidl b/wifi/java/android/net/wifi/ScanSettings.aidl deleted file mode 100644 index ebd2a39ab7c1d..0000000000000 --- a/wifi/java/android/net/wifi/ScanSettings.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright (c) 2014, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.wifi; - -parcelable ScanSettings; diff --git a/wifi/java/android/net/wifi/ScanSettings.java b/wifi/java/android/net/wifi/ScanSettings.java deleted file mode 100644 index 094ce34afb81e..0000000000000 --- a/wifi/java/android/net/wifi/ScanSettings.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2014, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.wifi; - -import android.os.Parcel; -import android.os.Parcelable; - -import java.util.ArrayList; -import java.util.Collection; - -/** - * Bundle of customized scan settings - * - * @see WifiManager#startCustomizedScan - * - * @hide - */ -public class ScanSettings implements Parcelable { - - /** channel set to scan. this can be null or empty, indicating a full scan */ - public Collection channelSet; - - /** public constructor */ - public ScanSettings() { } - - /** copy constructor */ - public ScanSettings(ScanSettings source) { - if (source.channelSet != null) - channelSet = new ArrayList(source.channelSet); - } - - /** check for validity */ - public boolean isValid() { - for (WifiChannel channel : channelSet) - if (!channel.isValid()) return false; - return true; - } - - /** implement Parcelable interface */ - @Override - public int describeContents() { - return 0; - } - - /** implement Parcelable interface */ - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeInt(channelSet == null ? 0 : channelSet.size()); - if (channelSet != null) - for (WifiChannel channel : channelSet) channel.writeToParcel(out, flags); - } - - /** implement Parcelable interface */ - public static final Parcelable.Creator CREATOR = - new Parcelable.Creator() { - @Override - public ScanSettings createFromParcel(Parcel in) { - ScanSettings settings = new ScanSettings(); - int size = in.readInt(); - if (size > 0) { - settings.channelSet = new ArrayList(size); - while (size-- > 0) - settings.channelSet.add(WifiChannel.CREATOR.createFromParcel(in)); - } - return settings; - } - - @Override - public ScanSettings[] newArray(int size) { - return new ScanSettings[size]; - } - }; -} diff --git a/wifi/java/android/net/wifi/WifiChannel.java b/wifi/java/android/net/wifi/WifiChannel.java deleted file mode 100644 index 640481ee62613..0000000000000 --- a/wifi/java/android/net/wifi/WifiChannel.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2014, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.wifi; - -import android.os.Parcel; -import android.os.Parcelable; - -/** - * Wifi Channel - * - * @see ScanSettings - * - * @hide - */ -public class WifiChannel implements Parcelable { - - private static final int MIN_FREQ_MHZ = 2412; - private static final int MAX_FREQ_MHZ = 5825; - - private static final int MIN_CHANNEL_NUM = 1; - private static final int MAX_CHANNEL_NUM = 196; - - /** frequency */ - public int freqMHz; - - /** channel number */ - public int channelNum; - - /** is it a DFS channel? */ - public boolean isDFS; - - /** public constructor */ - public WifiChannel() { } - - /** check for validity */ - public boolean isValid() { - if (freqMHz < MIN_FREQ_MHZ || freqMHz > MAX_FREQ_MHZ) return false; - if (channelNum < MIN_CHANNEL_NUM || channelNum > MAX_CHANNEL_NUM) return false; - return true; - } - - /** implement Parcelable interface */ - @Override - public int describeContents() { - return 0; - } - - /** implement Parcelable interface */ - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeInt(freqMHz); - out.writeInt(channelNum); - out.writeInt(isDFS ? 1 : 0); - } - - /** implement Parcelable interface */ - public static final Parcelable.Creator CREATOR = - new Parcelable.Creator() { - @Override - public WifiChannel createFromParcel(Parcel in) { - WifiChannel channel = new WifiChannel(); - channel.freqMHz = in.readInt(); - channel.channelNum = in.readInt(); - channel.isDFS = in.readInt() != 0; - return channel; - } - - @Override - public WifiChannel[] newArray(int size) { - return new WifiChannel[size]; - } - }; -} diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index d2cdf8d380d58..c8df08773716f 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1634,7 +1634,7 @@ public class WifiManager { public boolean startScan(WorkSource workSource) { try { String packageName = mContext.getOpPackageName(); - mService.startScan(null, workSource, packageName); + mService.startScan(packageName); return true; } catch (RemoteException e) { throw e.rethrowFromSystemServer();