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

Commit ff99923f authored by Karuna Wadhera's avatar Karuna Wadhera Committed by Android (Google) Code Review
Browse files

Merge "Remove flagging for module attestation" into main

parents 7af0bfa6 0991c31b

AconfigFlags.bp

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ aconfig_declarations_group { 
        "hwui_flags_java_lib",

        "icu_exported_aconfig_flags_lib",

        "interaction_jank_monitor_flags_lib",

        "keystore2_flags_java-framework",

        "libcore_exported_aconfig_flags_lib",

        "libcore_readonly_aconfig_flags_lib",

        "libgui_flags_java_lib",

Android.bp

+3 −10
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ filegroup { 
        ":android.hardware.radio.data-V5-java-source",

        ":android.hardware.radio.network-V5-java-source",

        ":android.hardware.radio.voice-V5-java-source",

        ":android.hardware.security.keymint-V4-java-source",

        ":android.hardware.security.secureclock-V1-java-source",

        ":android.hardware.thermal-V3-java-source",

        ":android.hardware.tv.tuner-V3-java-source",
@@ -115,6 +116,7 @@ filegroup { 
        ":android.security.legacykeystore-java-source",

        ":android.security.maintenance-java-source",

        ":android.security.metrics-java-source",

        ":android.system.keystore2-V5-java-source",

        ":android.hardware.cas-V1-java-source",

        ":credstore_aidl",

        ":dumpstate_aidl",
@@ -147,16 +149,7 @@ filegroup { 
        ":statslog-framework-java-gen", // FrameworkStatsLog.java

        ":statslog-hwui-java-gen", // HwuiStatsLog.java

        ":audio_policy_configuration_V7_0",

    ] + select(release_flag("RELEASE_ATTEST_MODULES"), {

        true: [

            ":android.hardware.security.keymint-V4-java-source",

            ":android.system.keystore2-V5-java-source",

    ],

        default: [

            ":android.hardware.security.keymint-V3-java-source",

            ":android.system.keystore2-V4-java-source",

        ],

    }),

}



java_library {

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -41325,7 +41325,7 @@ package android.security.keystore { 
    method @NonNull public java.util.List<java.security.cert.X509Certificate> getGrantedCertificateChainFromId(long) throws android.security.keystore.KeyPermanentlyInvalidatedException, java.security.UnrecoverableKeyException;

    method @NonNull public java.security.Key getGrantedKeyFromId(long) throws android.security.keystore.KeyPermanentlyInvalidatedException, java.security.UnrecoverableKeyException;

    method @NonNull public java.security.KeyPair getGrantedKeyPairFromId(long) throws android.security.keystore.KeyPermanentlyInvalidatedException, java.security.UnrecoverableKeyException;

    method @FlaggedApi("android.security.keystore2.attest_modules") @NonNull public byte[] getSupplementaryAttestationInfo(int) throws android.security.KeyStoreException;

    method @NonNull public byte[] getSupplementaryAttestationInfo(int) throws android.security.KeyStoreException;

    method public long grantKeyAccess(@NonNull String, int) throws android.security.KeyStoreException, java.security.UnrecoverableKeyException;

    method public void revokeKeyAccess(@NonNull String, int) throws android.security.KeyStoreException, java.security.UnrecoverableKeyException;

    field public static final int MODULE_HASH = -1879047468; // 0x900002d4

core/java/android/security/keymaster/KeymasterDefs.java

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ public final class KeymasterDefs { 
            Tag.DEVICE_UNIQUE_ATTESTATION; // KM_BOOL | 720;

    public static final int KM_TAG_ATTESTATION_ID_SECOND_IMEI =

            Tag.ATTESTATION_ID_SECOND_IMEI; // KM_BYTES | 723;

    public static final int KM_TAG_MODULE_HASH =

            Tag.MODULE_HASH; // KM_BYTES | 724;



    public static final int KM_TAG_NONCE = Tag.NONCE; // KM_BYTES | 1001;

    public static final int KM_TAG_MAC_LENGTH = Tag.MAC_LENGTH; // KM_UINT | 1003;

keystore/java/Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -13,13 +13,5 @@ filegroup { 
        "**/*.java",

        "**/*.aidl",

    ],

    exclude_srcs: select(release_flag("RELEASE_ATTEST_MODULES"), {

        true: [

            "android/security/KeyStore2HalCurrent.java",

        ],

        default: [

            "android/security/KeyStore2HalLatest.java",

        ],

    }),

    visibility: ["//frameworks/base"],

}