diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-06-03 05:09:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-03 05:09:32 +0000 |
| commit | f0742bdf0665810cc64d22c0c275bc8c8b7463f0 (patch) | |
| tree | 5498e31b50e57742534ef7b8c811eee379cb073b /wifi/java/android/net | |
| parent | 2752a14939d113e3f2696458b0b969bc023dadfa (diff) | |
| parent | 8944741c4f7b344a3d6716f51b2b44af35c05cb4 (diff) | |
| download | frameworks_base-f0742bdf0665810cc64d22c0c275bc8c8b7463f0.zip frameworks_base-f0742bdf0665810cc64d22c0c275bc8c8b7463f0.tar.gz frameworks_base-f0742bdf0665810cc64d22c0c275bc8c8b7463f0.tar.bz2 | |
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
Diffstat (limited to 'wifi/java/android/net')
| -rw-r--r-- | wifi/java/android/net/wifi/RttManager.java | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 12 |
2 files changed, 7 insertions, 7 deletions
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 @@ public class RttManager { 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 @@ 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: "). |