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

Commit 7e319afc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove isUnsafeBuild() from IpSecAlgorithm" am: 8f4e057f am: 04d6da9c am: 9a64eb3c

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

Change-Id: I5b6315902921bdaaa3d5de701acab6250742ddf4
parents 6aa5b56f 9a64eb3c
Loading
Loading
Loading
Loading
+0 −8
Original line number Original line Diff line number Diff line
@@ -469,20 +469,12 @@ public final class IpSecAlgorithm implements Parcelable {
        }
        }
    }
    }


    // Because encryption keys are sensitive and userdebug builds are used by large user pools
    // such as beta testers, we only allow sensitive info such as keys on eng builds.
    private static boolean isUnsafeBuild() {
        return Build.IS_DEBUGGABLE && Build.IS_ENG;
    }

    @Override
    @Override
    @NonNull
    @NonNull
    public String toString() {
    public String toString() {
        return new StringBuilder()
        return new StringBuilder()
                .append("{mName=")
                .append("{mName=")
                .append(mName)
                .append(mName)
                .append(", mKey=")
                .append(isUnsafeBuild() ? HexDump.toHexString(mKey) : "<hidden>")
                .append(", mTruncLenBits=")
                .append(", mTruncLenBits=")
                .append(mTruncLenBits)
                .append(mTruncLenBits)
                .append("}")
                .append("}")