LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 614c653b: am 1fdb5100: Merge "Handle null values in registerService" into lmp-dev

Browse Source 
* commit '614c653b7a2da14ded7d9c95142a5afd0b4d4722':
  Handle null values in registerService
This commit is contained in:
Christopher Lane
2014-09-14 17:25:44 +00:00
committed by Android Git Automerger
parent f27a1ca3c6 45cc2ce6ed
commit 4d85e0219f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/NsdService.java
View File

@@ -716,8 +716,9 @@ public class NsdService extends INsdManager.Stub {
for (String key : txtRecords.keySet()) { for (String key : txtRecords.keySet()) {
try { try {
// TODO: Send encoded TXT record as bytes once NDC/netd supports binary data. // 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, 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) { } catch (UnsupportedEncodingException e) {
Slog.e(TAG, "Failed to encode txtRecord " + e); Slog.e(TAG, "Failed to encode txtRecord " + e);
} }