diff options
| author | xinhe <xinhe@google.com> | 2015-04-21 21:39:06 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2015-04-21 21:39:07 +0000 |
| commit | b99d4144c41bd8b7c57487c94325fdb2f6fef177 (patch) | |
| tree | f295c59bf2081a9effb6fafb00ca93aa97273dab /wifi | |
| parent | 37f0820d6c23aa92a2b591327a734916131cb69a (diff) | |
| parent | 023158cbbc378bc924ad2e55b773c4e8fcb44ec8 (diff) | |
| download | frameworks_base-b99d4144c41bd8b7c57487c94325fdb2f6fef177.zip frameworks_base-b99d4144c41bd8b7c57487c94325fdb2f6fef177.tar.gz frameworks_base-b99d4144c41bd8b7c57487c94325fdb2f6fef177.tar.bz2 | |
Merge "set softAP band selection API hidden 20460598" into m-wireless-dev
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/RttManager.java | 7 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/wifi/java/android/net/wifi/RttManager.java b/wifi/java/android/net/wifi/RttManager.java index ca169f8..d2fb0dd 100644 --- a/wifi/java/android/net/wifi/RttManager.java +++ b/wifi/java/android/net/wifi/RttManager.java @@ -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) { diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 8cb45f6..b52f6cf 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -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; |