Merge "WifiScanner: cleanup unused commands" (071691f7) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiScanner.java

+0 −31

Original line number	Diff line number	Diff line
		@@ -1104,8 +1104,6 @@ public class WifiScanner {
		/* commands for Wifi Service */
		private static final int BASE = Protocol.BASE_WIFI_SCANNER;

		/** @hide */
		public static final int CMD_SCAN = BASE + 0;
		/** @hide */
		public static final int CMD_START_BACKGROUND_SCAN = BASE + 2;
		/** @hide */
		@@ -1115,20 +1113,10 @@ public class WifiScanner {
		/** @hide */
		public static final int CMD_SCAN_RESULT = BASE + 5;
		/** @hide */
		public static final int CMD_AP_FOUND = BASE + 9;
		/** @hide */
		public static final int CMD_AP_LOST = BASE + 10;
		/** @hide */
		public static final int CMD_WIFI_CHANGE_DETECTED = BASE + 15;
		/** @hide */
		public static final int CMD_WIFI_CHANGES_STABILIZED = BASE + 16;
		/** @hide */
		public static final int CMD_OP_SUCCEEDED = BASE + 17;
		/** @hide */
		public static final int CMD_OP_FAILED = BASE + 18;
		/** @hide */
		public static final int CMD_PERIOD_CHANGED = BASE + 19;
		/** @hide */
		public static final int CMD_FULL_SCAN_RESULT = BASE + 20;
		/** @hide */
		public static final int CMD_START_SINGLE_SCAN = BASE + 21;
		@@ -1359,25 +1347,6 @@ public class WifiScanner {
		ScanResult result = (ScanResult) msg.obj;
		((ScanListener) listener).onFullResult(result);
		return;
		case CMD_PERIOD_CHANGED:
		((ScanListener) listener).onPeriodChanged(msg.arg1);
		return;
		case CMD_AP_FOUND:
		((BssidListener) listener).onFound(
		((ParcelableScanResults) msg.obj).getResults());
		return;
		case CMD_AP_LOST:
		((BssidListener) listener).onLost(
		((ParcelableScanResults) msg.obj).getResults());
		return;
		case CMD_WIFI_CHANGE_DETECTED:
		((WifiChangeListener) listener).onChanging(
		((ParcelableScanResults) msg.obj).getResults());
		return;
		case CMD_WIFI_CHANGES_STABILIZED:
		((WifiChangeListener) listener).onQuiescence(
		((ParcelableScanResults) msg.obj).getResults());
		return;
		case CMD_SINGLE_SCAN_COMPLETED:
		if (DBG) Log.d(TAG, "removing listener for single scan");
		removeListener(msg.arg2);