Merge "Fix ScoredNetwork: unparcel bundle in toString."

2017-01-13 20:06:28 +00:00
parent 13a5ccaa65 7a9612f032
commit 7fdd4d831b
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/net/ScoredNetwork.java
+++ b/core/java/android/net/ScoredNetwork.java
@@ -219,7 +219,8 @@ public class ScoredNetwork implements Parcelable {
                "networkKey=" + networkKey +
                ", rssiCurve=" + rssiCurve +
                ", meteredHint=" + meteredHint);
-        if (attributes != null) {
+        // calling isEmpty will unparcel the bundle so its contents can be converted to a string
+        if (attributes != null && !attributes.isEmpty()) {
            out.append(", attributes=" + attributes);
        }
        out.append('}');