Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f35cdd8 authored by Christopher Lane's avatar Christopher Lane
Browse files

Handle null values in registerService 

Bug: 17491971
Change-Id: I0443a9accd86ab70510d16456a03912845718ca9
parent ead6ad8a

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

+2 −1
Original line number Diff line number Diff line
@@ -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);

                }