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

Commit 3ee0bd96 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "Add flagging libraries for trade-in mode." into main am: 8639b7d3 

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



Change-Id: Idd0bc10e3c80a83228aedb7b282afe485a4f8373
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0bc05f47 8639b7d3

AconfigFlags.bp

+27 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
aconfig_declarations_group {

    name: "framework-minus-apex-aconfig-declarations",

    aconfig_declarations_groups: [

        "aconfig_trade_in_mode_flags",

        "audio-framework-aconfig",

    ],

    java_aconfig_libraries: [
@@ -1521,3 +1522,29 @@ java_aconfig_library { 
    aconfig_declarations: "dropbox_flags",

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

}



// Trade in mode

aconfig_declarations {

    name: "aconfig_trade_in_mode_flags",

    package: "com.android.tradeinmode.flags",

    container: "system",

    srcs: [

        "core/java/android/os/image/flags/trade_in_mode_flags.aconfig",

    ],

}



java_aconfig_library {

    name: "aconfig_trade_in_mode_flags_java_lib",

    aconfig_declarations: "aconfig_trade_in_mode_flags",

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

}



cc_aconfig_library {

    name: "android_trade_in_mode_flags_cc_lib",

    aconfig_declarations: "aconfig_trade_in_mode_flags",

    apex_available: [

        "//apex_available:platform",

        "com.android.adbd",

    ],

    min_sdk_version: "apex_inherit",

}

core/java/android/os/image/flags/trade_in_mode_flags.aconfig

0 → 100644
+11 −0
Original line number Diff line number Diff line 
package: "com.android.tradeinmode.flags"

container: "system"



flag {

  name: "enable_trade_in_mode"

  is_exported: true

  namespace: "phoenix"

  description: "Enable Trade-in Mode"

  bug: "332683751"

  is_fixed_read_only: true

}