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

Commit 0b14d9d4 authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

Merge "Fix attestation properties reading logic" into main am: b68714bf am:... 

Merge "Fix attestation properties reading logic" into main am: b68714bf am: 6d0e0cb1 am: 7bbc4201

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



Change-Id: I34e44fad177a30f2de673fab635f05c2efa84586
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32251e10 7bbc4201

core/java/android/os/Build.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {