summaryrefslogtreecommitdiffstats
path: root/wifi/java/android
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2015-04-24 14:03:28 -0700
committerEtan Cohen <etancohen@google.com>2015-04-24 14:03:28 -0700
commit644f41368f9eddd475fa9c5dddc7ceac5722a3a8 (patch)
tree7debb618bbe004bd6e710e758a7302715e96a3f2 /wifi/java/android
parenta6e5ff899a7cc300985c09e57a2e3b4f5aa170d3 (diff)
parent4cb5d80abeb88918534e90c2a7b58cdcba22ac77 (diff)
downloadframeworks_base-644f41368f9eddd475fa9c5dddc7ceac5722a3a8.zip
frameworks_base-644f41368f9eddd475fa9c5dddc7ceac5722a3a8.tar.gz
frameworks_base-644f41368f9eddd475fa9c5dddc7ceac5722a3a8.tar.bz2
Merge commit '4cb5d80' into merge2
Diffstat (limited to 'wifi/java/android')
-rw-r--r--wifi/java/android/net/wifi/RttManager.java7
-rw-r--r--wifi/java/android/net/wifi/WifiConfiguration.java2
-rw-r--r--wifi/java/android/net/wifi/WifiEnterpriseConfig.java4
3 files changed, 8 insertions, 5 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 802e0d2..21161b4 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -243,6 +243,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;
@@ -251,6 +252,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;
diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
index bee07ab..3525ec2 100644
--- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
+++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
@@ -596,7 +596,7 @@ public class WifiEnterpriseConfig implements Parcelable {
* match test-example.com.
* @param domain The domain value
*/
- public void setDomSuffixMatch(String domain) {
+ public void setDomainSuffixMatch(String domain) {
setFieldValue(DOM_SUFFIX_MATCH_KEY, domain);
}
@@ -604,7 +604,7 @@ public class WifiEnterpriseConfig implements Parcelable {
* Get the domain_suffix_match value. See setDomSuffixMatch.
* @return The domain value.
*/
- public String getDomSubjectMatch() {
+ public String getDomainSubjectMatch() {
return getFieldValue(DOM_SUFFIX_MATCH_KEY, "");
}