commit 15fbceb2fef105899e81eaa8eb01ebe0a05fa344
author Chan Kim <kimchan@google.com> Mon Aug 21 15:23:42 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 21 15:23:42 2023 +0000
tree 2c72666b6ee56cd699dfb80609735c540107ee5f
parent b68714bf1ed3e6d3aa192c7d1e90b4ab44a2d9df
parent 8539d6ec3cd42f841da5eb7e7ed1f0ca3365b12b

Merge "Update language to comply with Android's inclusive language guidance" into main

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 2e05b8d..9dc4a97 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1560,7 +1560,7 @@
         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) {