diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-16 14:58:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-16 14:58:59 +0000 |
| commit | 4886dddd4382d45db9893995445925bda472de2c (patch) | |
| tree | bf65b24fe5e99bce15151743042c03dfedf3f07c /framework-t/src/android/net/IpSecAlgorithm.java | |
| parent | 9a735b3dd095ec3e496d23b98855a3ff17eafca8 (diff) | |
| parent | db38285cf89ee24e04b8916479b9206d43afc01a (diff) | |
Merge "Remove isUnsafeBuild() from IpSecAlgorithm" am: ed3a5226ed am: db38285cf8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922077
Change-Id: I02197c0e8afbf57d951190742356bc9d5b9f5978
Diffstat (limited to 'framework-t/src/android/net/IpSecAlgorithm.java')
| -rw-r--r-- | framework-t/src/android/net/IpSecAlgorithm.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/framework-t/src/android/net/IpSecAlgorithm.java b/framework-t/src/android/net/IpSecAlgorithm.java index 840af28b77..5e647fe2f9 100644 --- a/framework-t/src/android/net/IpSecAlgorithm.java +++ b/framework-t/src/android/net/IpSecAlgorithm.java @@ -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 @NonNull public String toString() { return new StringBuilder() .append("{mName=") .append(mName) - .append(", mKey=") - .append(isUnsafeBuild() ? HexDump.toHexString(mKey) : "<hidden>") .append(", mTruncLenBits=") .append(mTruncLenBits) .append("}") |