Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in logging"

Browse Source
This commit is contained in:
Treehugger Robot
2021-06-17 23:55:09 +00:00
committed by Gerrit Code Review
parent cb85575990 22f1dcf528
commit ceba9c2521
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/bluetooth/OobData.java
View File

@@ -937,17 +937,18 @@ public final class OobData implements Parcelable {
} }
@NonNull @NonNull
private String toHexString(@NonNull int b) { private String toHexString(int b) {
return toHexString(new byte[] {(byte) b}); return toHexString(new byte[] {(byte) b});
} }
@NonNull @NonNull
private String toHexString(@NonNull byte b) { private String toHexString(byte b) {
return toHexString(new byte[] {b}); return toHexString(new byte[] {b});
} }
@NonNull @NonNull
private String toHexString(@NonNull byte[] array) { private String toHexString(byte[] array) {
if (array == null) return "null";
StringBuilder builder = new StringBuilder(array.length * 2); StringBuilder builder = new StringBuilder(array.length * 2);
for (byte b: array) { for (byte b: array) {
builder.append(String.format("%02x", b)); builder.append(String.format("%02x", b));