diff options
| author | 2023-08-21 14:56:45 +0000 | |
|---|---|---|
| committer | 2023-08-21 14:56:45 +0000 | |
| commit | 6d0e0cb1881cbabe89a5651e0d57b8201099c9a3 (patch) | |
| tree | d1c5f3219be7453c29aa45ebe887653c019316fa | |
| parent | 5da3bffd8df4a8fc8dee4a76dd25bba867bdf6a2 (diff) | |
| parent | b68714bf1ed3e6d3aa192c7d1e90b4ab44a2d9df (diff) | |
Merge "Fix attestation properties reading logic" into main am: b68714bf1e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2712214
Change-Id: I8d54b9b4fabf876204ab75764d3d1683de409e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | core/java/android/os/Build.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 2e05b8dc8da3..9dc4a97033e6 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -1560,7 +1560,7 @@ public class Build { String attestProp = getString( TextUtils.formatSimple("ro.product.%s_for_attestation", property)); return attestProp.equals(UNKNOWN) - ? getString(TextUtils.formatSimple("ro.product.vendor.%s", property)) : UNKNOWN; + ? getString(TextUtils.formatSimple("ro.product.vendor.%s", property)) : attestProp; } private static String[] getStringList(String property, String separator) { |