summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Tan <samueltan@google.com>2016-03-30 16:45:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-03-30 16:45:25 +0000
commit02a782764421f0cccc6a9044df31f58b6558f980 (patch)
treed12d0efc6c6117988577d935a12c34739b74029f
parentd5d850a6435d044f73f196715967f74ffd6f7ea3 (diff)
parent64697f7a5b9c1c39f8c9d9c225b8ca4c798422c2 (diff)
Merge "WifiNative: fix error log message typo in getNetworkExtra()" into nyc-dev
-rw-r--r--service/java/com/android/server/wifi/WifiNative.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index bc05e160d..2c659ba3e 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -444,7 +444,7 @@ public class WifiNative {
}
return values;
} catch (UnsupportedEncodingException e) {
- Log.e(TAG, "Unable to serialize networkExtra: " + e.toString());
+ Log.e(TAG, "Unable to deserialize networkExtra: " + e.toString());
return null;
} catch (JSONException e) {
// This is not necessarily an error. This exception will also occur if we encounter a