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

Merge "Remove isUnsafeBuild() from IpSecAlgorithm" am: ed3a5226ed am: db38285cf8 am: 4886dddd43

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

Change-Id: I5b6315902921bdaaa3d5de701acab6250742ddf4
This commit is contained in:
Treehugger Robot
2021-12-16 15:15:38 +00:00
committed by Automerger Merge Worker
parent 5266f9e9d6 4886dddd43
commit 844332044c
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework-t/src/android/net/IpSecAlgorithm.java
View File

@@ -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("}")