Merge changes from topic 'mwd-merge-wifi-0602015' into mnc-dev
* changes:
keep hal based pno disabled by default
fix annoying typo
enable SSID whitelist
Rename HandlerThread name in RttManager The sHandlerThread name in RttManager is called "WifiScanner". It should be changed to RTTManager
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 8066d9f..9a15278 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -484,6 +484,9 @@
<!-- Wifi HAL supported PNO -->
<bool translatable="false" name="config_wifi_hal_pno_enable">false</bool>
+ <!-- Wifi SSID white list (can't be enabled if config_wifi_hal_pno_enable is not) -->
+ <bool translatable="false" name="config_wifi_ssid_white_list_enable">true</bool>
+
<!-- Idle Receive current for wifi radio. 0 by default-->
<integer translatable="false" name="config_wifi_idle_receive_cur_ma">1</integer>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 45dad8d..d5cf9b4 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -384,6 +384,7 @@
<java-symbol type="integer" name="config_wifi_scan_interval_p2p_connected" />
<java-symbol type="bool" name="config_wifi_hal_pno_enable" />
<java-symbol type="integer" name="config_windowOutsetBottom" />
+ <java-symbol type="bool" name="config_wifi_ssid_white_list_enable" />
<java-symbol type="integer" name="db_connection_pool_size" />
<java-symbol type="integer" name="db_journal_size_limit" />
<java-symbol type="integer" name="db_wal_autocheckpoint" />
diff --git a/wifi/java/android/net/wifi/RttManager.java b/wifi/java/android/net/wifi/RttManager.java
index dde8dba..7ced126 100644
--- a/wifi/java/android/net/wifi/RttManager.java
+++ b/wifi/java/android/net/wifi/RttManager.java
@@ -958,7 +958,7 @@
return;
}
- sHandlerThread = new HandlerThread("WifiScanner");
+ sHandlerThread = new HandlerThread("RttManager");
sAsyncChannel = new AsyncChannel();
sConnected = new CountDownLatch(1);
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index a38a96e..2184c01 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -1137,7 +1137,7 @@
if (diff <= 0) {
sbuf.append(" blackListed since <incorrect>");
} else {
- sbuf.append(" blackListed: ").append(Long.toString(diff/1000)).append( "sec");
+ sbuf.append(" blackListed: ").append(Long.toString(diff/1000)).append( "sec ");
}
}
if (creatorUid != 0) sbuf.append(" cuid=" + Integer.toString(creatorUid));
@@ -1155,27 +1155,27 @@
if (diff <= 0) {
sbuf.append("lastConnected since <incorrect>");
} else {
- sbuf.append("lastConnected: ").append(Long.toString(diff/1000)).append( "sec");
+ sbuf.append("lastConnected: ").append(Long.toString(diff/1000)).append( "sec ");
}
}
if (this.lastConnectionFailure != 0) {
sbuf.append('\n');
long diff = now_ms - this.lastConnectionFailure;
if (diff <= 0) {
- sbuf.append("lastConnectionFailure since <incorrect>");
+ sbuf.append("lastConnectionFailure since <incorrect> ");
} else {
sbuf.append("lastConnectionFailure: ").append(Long.toString(diff/1000));
- sbuf.append( "sec");
+ sbuf.append( "sec ");
}
}
if (this.lastRoamingFailure != 0) {
sbuf.append('\n');
long diff = now_ms - this.lastRoamingFailure;
if (diff <= 0) {
- sbuf.append("lastRoamingFailure since <incorrect>");
+ sbuf.append("lastRoamingFailure since <incorrect> ");
} else {
sbuf.append("lastRoamingFailure: ").append(Long.toString(diff/1000));
- sbuf.append( "sec");
+ sbuf.append( "sec ");
}
}
sbuf.append("roamingFailureBlackListTimeMilli: ").