Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f0742bdf: Merge changes from topic \'mwd-merge-wifi-0602015\' into mnc-dev

Browse Source 
* commit 'f0742bdf0665810cc64d22c0c275bc8c8b7463f0':
  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
This commit is contained in:
Vinit Deshpande
2015-06-03 05:21:02 +00:00
committed by Android Git Automerger
parent 031aead10a f0742bdf06
commit 18611fbff8
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
View File

@@ -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>

1
core/res/res/values/symbols.xml
View File

@@ -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" />

2
wifi/java/android/net/wifi/RttManager.java
View File

@@ -958,7 +958,7 @@ public class RttManager {
return;
}
sHandlerThread = new HandlerThread("WifiScanner");
sHandlerThread = new HandlerThread("RttManager");
sAsyncChannel = new AsyncChannel();
sConnected = new CountDownLatch(1);

12
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -1137,7 +1137,7 @@ public class WifiConfiguration implements Parcelable {
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 @@ public class WifiConfiguration implements Parcelable {
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: ").