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

Commit 38dc14e8 authored by Prashant Patil's avatar Prashant Patil Committed by Cherrypicker Worker
Browse files

Fix attestation properties reading logic 

Fixed the logic of reading attestation specific properties in
Build.java.

Bug: 110779648
Test: atest CtsKeystoreTestCases:android.keystore.cts.KeyAttestationTest CtsKeystoreTestCases:DeviceOwnerKeyManagementTest
(cherry picked from https://android-review.googlesource.com/q/commit:316e3d16c9f34212f3beace7695289651d15a071)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4edeaffcbb9d39efaf49d3e24a621110c367c560)
Merged-In: I9af7daa08cbd8bb52f3509fe93f787ba94b7bbc3
Change-Id: I9af7daa08cbd8bb52f3509fe93f787ba94b7bbc3
parent f8e3f1ee

core/java/android/os/Build.java

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