Handle null values in registerService

Bug: 17491971
Change-Id: I0443a9accd86ab70510d16456a03912845718ca9
This commit is contained in:
Christopher Lane
2014-09-13 11:13:39 -07:00
parent a2a966b884
commit 45cc2ce6ed

View File

@@ -716,8 +716,9 @@ public class NsdService extends INsdManager.Stub {
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);
}