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

Commit 2b42bfaf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in logging" am: 537861f4 am: a25fc2bd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1736917

Change-Id: I34e9ac464bf0f2d35f86c7fbf716c0a006d6ecb4
parents f9220178 a25fc2bd

framework/java/android/bluetooth/OobData.java

+4 −3
Original line number Diff line number Diff line
@@ -937,17 +937,18 @@ public final class OobData implements Parcelable { 
    }



    @NonNull

    private String toHexString(@NonNull int b) {

    private String toHexString(int b) {

        return toHexString(new byte[] {(byte) b});

    }



    @NonNull

    private String toHexString(@NonNull byte b) {

    private String toHexString(byte b) {

        return toHexString(new byte[] {b});

    }



    @NonNull

    private String toHexString(@NonNull byte[] array) {

    private String toHexString(byte[] array) {

        if (array == null) return "null";

        StringBuilder builder = new StringBuilder(array.length * 2);

        for (byte b: array) {

            builder.append(String.format("%02x", b));