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

Commit 7563b242 authored by Shaquille Johnson's avatar Shaquille Johnson Committed by Automerger Merge Worker
Browse files

Merge "Add aconfig for biometrics flags" into main am: 9cb671cd am: bbbfcfa7 

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



Change-Id: I7b6c695b9327d795aec5b2a39e85702fdd9fddc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd953701 bbbfcfa7

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
// limitations under the License.



aconfig_srcjars = [

    ":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}",

    ":android.os.flags-aconfig-java{.generated_srcjars}",

    ":android.security.flags-aconfig-java{.generated_srcjars}",

    ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",
@@ -129,3 +130,16 @@ java_aconfig_library { 
    test: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Biometrics

aconfig_declarations {

    name: "android.hardware.biometrics.flags-aconfig",

    package: "android.hardware.biometrics",

    srcs: ["core/java/android/hardware/biometrics/flags.aconfig"],

}



java_aconfig_library {

    name: "android.hardware.biometrics.flags-aconfig-java",

    aconfig_declarations: "android.hardware.biometrics.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

core/java/android/hardware/biometrics/flags.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "android.hardware.biometrics"



flag {

  name: "add_key_agreement_crypto_object"

  namespace: "biometrics"

  description: "Feature flag for adding KeyAgreement api to CryptoObject."

  bug: "282058146"

}