Merge "set softAP band selection API hidden 20460598" into m-wireless-dev (b99d4144) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/RttManager.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -883,9 +883,9 @@ public class RttManager {
		}
		index++;
		}

		validateChannel();
		ParcelableRttParams parcelableParams = new ParcelableRttParams(params);
		Log.i(TAG, "Send RTT request to RTT Service");
		sAsyncChannel.sendMessage(CMD_OP_START_RANGING,
		0, putListener(listener), parcelableParams);
		}
		@@ -1033,6 +1033,7 @@ public class RttManager {
		}
		@Override
		public void handleMessage(Message msg) {
		Log.i(TAG, "RTT manager get message: " + msg.what);
		switch (msg.what) {
		case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED:
		if (msg.arg1 == AsyncChannel.STATUS_SUCCESSFUL) {
		@@ -1058,10 +1059,10 @@ public class RttManager {

		Object listener = getListener(msg.arg2);
		if (listener == null) {
		if (DBG) Log.d(TAG, "invalid listener key = " + msg.arg2);
		Log.e(TAG, "invalid listener key = " + msg.arg2 );
		return;
		} else {
		if (DBG) Log.d(TAG, "listener key = " + msg.arg2);
		Log.i(TAG, "listener key = " + msg.arg2);
		}

		switch (msg.what) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -239,6 +239,7 @@ public class WifiConfiguration implements Parcelable {
		* The band which AP resides on
		* 0-2G 1-5G
		* By default, 2G is chosen
		* @hidden
		*/
		public int apBand = 0;

		@@ -247,6 +248,7 @@ public class WifiConfiguration implements Parcelable {
		* 2G 1-11
		* 5G 36,40,44,48,149,153,157,161,165
		* 0 - find a random available channel according to the apBand
		* @hidden
		*/
		public int apChannel = 0;