commit 07ab0871eea8e307f412f3d7433016bff4c275aa
author Christopher Lane <lanechr@google.com> Sun Sep 14 17:06:45 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Sep 14 17:06:46 2014 +0000
tree 2b19b998d0994805b0480a8cbd437bea0a768215
parent 2ae312e30652a4d0019b17825b58d558c4483a58
parent 0f35cdd862fba23e9bcc5344403426ae74fec55c

Merge "Handle null values in registerService" into lmp-dev

services/core/java/com/android/server/NsdService.java

diff --git a/services/core/java/com/android/server/NsdService.java b/services/core/java/com/android/server/NsdService.java
index cb1748d..39aa972 100644
--- a/services/core/java/com/android/server/NsdService.java
+++ b/services/core/java/com/android/server/NsdService.java
@@ -716,8 +716,9 @@
             for (String key : txtRecords.keySet()) {
                 try {
                     // TODO: Send encoded TXT record as bytes once NDC/netd supports binary data.
+                    byte[] recordValue = txtRecords.get(key);
                     cmd.appendArg(String.format(Locale.US, "%s=%s", key,
-                            new String(txtRecords.get(key), "UTF_8")));
+                            recordValue != null ? new String(recordValue, "UTF_8") : ""));
                 } catch (UnsupportedEncodingException e) {
                     Slog.e(TAG, "Failed to encode txtRecord " + e);
                 }