Merge "Remove unused ScanSettings and WifiChannel classes" into pi-dev (c2753071) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/IWifiManager.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -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<ScanResult> getScanResults(String callingPackage);

wifi/java/android/net/wifi/ScanSettings.aidl

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		/**
		* 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;

wifi/java/android/net/wifi/ScanSettings.java

deleted100644 → 0

+0 −87

Original line number	Diff line number	Diff line
		/*
		* 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<WifiChannel> channelSet;

		/** public constructor */
		public ScanSettings() { }

		/** copy constructor */
		public ScanSettings(ScanSettings source) {
		if (source.channelSet != null)
		channelSet = new ArrayList<WifiChannel>(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<ScanSettings> CREATOR =
		new Parcelable.Creator<ScanSettings>() {
		@Override
		public ScanSettings createFromParcel(Parcel in) {
		ScanSettings settings = new ScanSettings();
		int size = in.readInt();
		if (size > 0) {
		settings.channelSet = new ArrayList<WifiChannel>(size);
		while (size-- > 0)
		settings.channelSet.add(WifiChannel.CREATOR.createFromParcel(in));
		}
		return settings;
		}

		@Override
		public ScanSettings[] newArray(int size) {
		return new ScanSettings[size];
		}
		};
		}

wifi/java/android/net/wifi/WifiChannel.java

deleted100644 → 0

+0 −87

Original line number	Diff line number	Diff line
		/*
		* 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<WifiChannel> CREATOR =
		new Parcelable.Creator<WifiChannel>() {
		@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];
		}
		};
		}

wifi/java/android/net/wifi/WifiManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();