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

Commit d221c070 authored by Oriol Prieto Gascó's avatar Oriol Prieto Gascó Committed by Gerrit Code Review
Browse files

Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main

parents 4838a878 7b816129

AconfigFlags.bp

+51 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ cc_aconfig_library { 
aconfig_declarations {

    name: "com.android.window.flags.window-aconfig",

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

    container: "system",

    srcs: ["core/java/android/window/flags/*.aconfig"],

}
@@ -154,6 +155,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "com.android.hardware.input.input-aconfig",

    package: "com.android.hardware.input",

    container: "system",

    srcs: ["core/java/android/hardware/input/*.aconfig"],

}
@@ -173,6 +175,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "com.android.text.flags-aconfig",

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

    container: "system",

    srcs: ["core/java/android/text/flags/*.aconfig"],

}
@@ -191,6 +194,7 @@ cc_aconfig_library { 
aconfig_declarations {

    name: "android.location.flags-aconfig",

    package: "android.location.flags",

    container: "system",

    srcs: [

        "location/java/android/location/flags/*.aconfig",

    ],
@@ -206,6 +210,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.nfc.flags-aconfig",

    package: "android.nfc",

    container: "system",

    srcs: ["nfc/java/android/nfc/*.aconfig"],

}
@@ -236,6 +241,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.security.flags-aconfig",

    package: "android.security",

    container: "system",

    srcs: ["core/java/android/security/*.aconfig"],

}
@@ -256,6 +262,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.app.usage.flags-aconfig",

    package: "android.app.usage",

    container: "system",

    srcs: ["core/java/android/app/usage/*.aconfig"],

}
@@ -269,6 +276,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.os.flags-aconfig",

    package: "android.os",

    container: "system",

    srcs: ["core/java/android/os/*.aconfig"],

}
@@ -300,6 +308,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.companion.virtualdevice.flags-aconfig",

    package: "android.companion.virtualdevice.flags",

    container: "system",

    srcs: ["core/java/android/companion/virtual/flags/*.aconfig"],

}
@@ -312,6 +321,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.companion.virtual.flags-aconfig",

    package: "android.companion.virtual.flags",

    container: "system",

    srcs: ["core/java/android/companion/virtual/*.aconfig"],

}
@@ -319,6 +329,7 @@ aconfig_declarations { 
aconfig_declarations {

    name: "android.view.inputmethod.flags-aconfig",

    package: "android.view.inputmethod",

    container: "system",

    srcs: ["core/java/android/view/inputmethod/flags.aconfig"],

}
@@ -332,6 +343,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.os.vibrator.flags-aconfig",

    package: "android.os.vibrator",

    container: "system",

    srcs: ["core/java/android/os/vibrator/*.aconfig"],

}
@@ -345,6 +357,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.view.flags-aconfig",

    package: "android.view.flags",

    container: "system",

    srcs: ["core/java/android/view/flags/*.aconfig"],

}
@@ -363,6 +376,7 @@ cc_aconfig_library { 
aconfig_declarations {

    name: "android.view.accessibility.flags-aconfig",

    package: "android.view.accessibility",

    container: "system",

    srcs: ["core/java/android/view/accessibility/flags/*.aconfig"],

}
@@ -381,6 +395,7 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "android.hardware.flags",

    container: "system",

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

}
@@ -394,6 +409,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.widget.flags-aconfig",

    package: "android.widget.flags",

    container: "system",

    srcs: ["core/java/android/widget/flags/*.aconfig"],

}
@@ -413,6 +429,7 @@ rust_aconfig_library { 
aconfig_declarations {

    name: "android.content.pm.flags-aconfig",

    package: "android.content.pm",

    container: "system",

    srcs: ["core/java/android/content/pm/flags.aconfig"],

}
@@ -433,6 +450,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.content.res.flags-aconfig",

    package: "android.content.res",

    container: "system",

    srcs: ["core/java/android/content/res/*.aconfig"],

}
@@ -446,6 +464,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "com.android.media.flags.bettertogether-aconfig",

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

    container: "system",

    srcs: [

        "media/java/android/media/flags/media_better_together.aconfig",

        "media/java/android/media/flags/fade_manager_configuration.aconfig",
@@ -462,6 +481,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.media.tv.flags-aconfig",

    package: "android.media.tv.flags",

    container: "system",

    srcs: ["media/java/android/media/tv/flags/media_tv.aconfig"],

}
@@ -475,6 +495,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.permission.flags-aconfig",

    package: "android.permission.flags",

    container: "system",

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

}
@@ -494,6 +515,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.database.sqlite-aconfig",

    package: "android.database.sqlite",

    container: "system",

    srcs: ["core/java/android/database/sqlite/*.aconfig"],

}
@@ -507,6 +529,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.hardware.biometrics",

    container: "system",

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

}
@@ -546,6 +569,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.multiuser.flags-aconfig",

    package: "android.multiuser",

    container: "system",

    srcs: ["core/java/android/content/pm/multiuser.aconfig"],

}
@@ -559,6 +583,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.app.flags-aconfig",

    package: "android.app",

    container: "system",

    srcs: ["core/java/android/app/*.aconfig"],

}
@@ -572,6 +597,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.hardware.radio",

    container: "system",

    srcs: ["core/java/android/hardware/radio/*.aconfig"],

}
@@ -585,6 +611,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.credentials.flags-aconfig",

    package: "android.credentials.flags",

    container: "system",

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

}
@@ -598,6 +625,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.view.contentprotection.flags-aconfig",

    package: "android.view.contentprotection.flags",

    container: "system",

    srcs: ["core/java/android/view/contentprotection/flags/*.aconfig"],

}
@@ -611,6 +639,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "com.android.server.flags.pinner-aconfig",

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

    container: "system",

    srcs: ["services/core/java/com/android/server/flags/pinner.aconfig"],

}
@@ -624,6 +653,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.service.controls.flags-aconfig",

    package: "android.service.controls.flags",

    container: "system",

    srcs: ["core/java/android/service/controls/flags/*.aconfig"],

}
@@ -637,6 +667,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.service.voice.flags-aconfig",

    package: "android.service.voice.flags",

    container: "system",

    srcs: ["core/java/android/service/voice/flags/*.aconfig"],

}
@@ -650,6 +681,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.service.autofill.flags-aconfig",

    package: "android.service.autofill",

    container: "system",

    srcs: [

        "services/autofill/bugfixes.aconfig",

        "services/autofill/features.aconfig",
@@ -666,6 +698,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.companion.flags-aconfig",

    package: "android.companion",

    container: "system",

    srcs: ["core/java/android/companion/*.aconfig"],

}
@@ -679,6 +712,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.net.platform.flags-aconfig",

    package: "android.net.platform.flags",

    container: "system",

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

    visibility: [":__subpackages__"],

}
@@ -687,6 +721,7 @@ aconfig_declarations { 
aconfig_declarations {

    name: "com.android.net.thread.platform.flags-aconfig",

    package: "com.android.net.thread.platform.flags",

    container: "system",

    srcs: ["core/java/android/net/thread/flags.aconfig"],

}
@@ -707,6 +742,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.media.playback.flags-aconfig",

    package: "com.android.media.playback.flags",

    container: "system",

    srcs: ["media/jni/playback_flags.aconfig"],

}
@@ -725,6 +761,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.net.vcn.flags-aconfig",

    package: "android.net.vcn",

    container: "system",

    srcs: ["core/java/android/net/vcn/*.aconfig"],

}
@@ -738,6 +775,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "device_policy_aconfig_flags",

    package: "android.app.admin.flags",

    container: "system",

    srcs: [

        "core/java/android/app/admin/flags/flags.aconfig",

    ],
@@ -758,6 +796,7 @@ cc_aconfig_library { 
aconfig_declarations {

    name: "android.service.chooser.flags-aconfig",

    package: "android.service.chooser",

    container: "system",

    srcs: ["core/java/android/service/chooser/flags.aconfig"],

}
@@ -771,6 +810,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "framework-jobscheduler-job.flags-aconfig",

    package: "android.app.job",

    container: "system",

    srcs: ["apex/jobscheduler/framework/aconfig/job.aconfig"],

}
@@ -784,6 +824,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.service.dreams.flags-aconfig",

    package: "android.service.dreams",

    container: "system",

    srcs: ["core/java/android/service/dreams/flags.aconfig"],

}
@@ -797,6 +838,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.service.notification.flags-aconfig",

    package: "android.service.notification",

    container: "system",

    srcs: ["core/java/android/service/notification/flags.aconfig"],

}
@@ -810,6 +852,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.app.smartspace.flags-aconfig",

    package: "android.app.smartspace.flags",

    container: "system",

    srcs: ["core/java/android/app/smartspace/flags.aconfig"],

}
@@ -830,6 +873,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.view.contentcapture.flags-aconfig",

    package: "android.view.contentcapture.flags",

    container: "system",

    srcs: ["core/java/android/view/contentcapture/flags/*.aconfig"],

}
@@ -843,6 +887,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.hardware.usb.flags",

    container: "system",

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

}
@@ -863,6 +908,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.tracing.flags-aconfig",

    package: "android.tracing",

    container: "system",

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

}
@@ -876,6 +922,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.appwidget.flags-aconfig",

    package: "android.appwidget.flags",

    container: "system",

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

}
@@ -889,6 +936,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.server.app.flags-aconfig",

    package: "android.server.app",

    container: "system",

    srcs: ["services/core/java/com/android/server/app/flags.aconfig"],

}
@@ -902,6 +950,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.webkit.flags-aconfig",

    package: "android.webkit",

    container: "system",

    srcs: [

        "core/java/android/webkit/*.aconfig",

        "services/core/java/com/android/server/webkit/*.aconfig",
@@ -918,6 +967,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.provider.flags-aconfig",

    package: "android.provider",

    container: "system",

    srcs: ["core/java/android/provider/*.aconfig"],

}
@@ -931,6 +981,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.crashrecovery.flags-aconfig",

    package: "android.crashrecovery.flags",

    container: "system",

    srcs: ["packages/CrashRecovery/aconfig/flags.aconfig"],

}

apex/jobscheduler/framework/aconfig/job.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "android.app.job"

container: "system"



flag {

    name: "enforce_minimum_time_windows"

apex/jobscheduler/service/aconfig/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
aconfig_declarations {

    name: "service-deviceidle.flags-aconfig",

    package: "com.android.server.deviceidle",

    container: "system",

    srcs: [

        "device_idle.aconfig",

    ],
@@ -17,6 +18,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "service-job.flags-aconfig",

    package: "com.android.server.job",

    container: "system",

    srcs: [

        "job.aconfig",

    ],

apex/jobscheduler/service/aconfig/device_idle.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "com.android.server.deviceidle"

container: "system"



flag {

    name: "disable_wakelocks_in_light_idle"

apex/jobscheduler/service/aconfig/job.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "com.android.server.job"

container: "system"



flag {

    name: "relax_prefetch_connectivity_constraint_only_on_charger"