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

Commit 0beb0db8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11661060 from 2b57e1ab to 24Q3-release 

Change-Id: I23a28ab04dc2b3216fbb94750f1d07952b3937e3
parents 4714a629 2b57e1ab

AconfigFlags.bp

+62 −0
Original line number Diff line number Diff line
@@ -158,6 +158,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"],

}
@@ -171,6 +172,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.hardware.devicestate.feature.flags",

    container: "system",

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

}
@@ -184,6 +186,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"],

}
@@ -203,6 +206,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"],

}
@@ -221,6 +225,7 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "android.location.flags",

    container: "system",

    srcs: [

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

    ],
@@ -242,6 +247,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.nfc",

    container: "system",

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

}
@@ -272,6 +278,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.security",

    container: "system",

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

}
@@ -292,6 +299,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"],

}
@@ -374,6 +382,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"],

}
@@ -386,6 +395,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"],

}
@@ -393,6 +403,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"],

}
@@ -406,6 +417,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"],

}
@@ -419,6 +431,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.view.flags",

    container: "system",

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

}
@@ -437,6 +450,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"],

}
@@ -455,6 +469,7 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "android.hardware.flags",

    container: "system",

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

}
@@ -468,6 +483,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.widget.flags",

    container: "system",

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

}
@@ -487,6 +503,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"],

}
@@ -507,6 +524,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"],

}
@@ -527,6 +545,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"],

}
@@ -547,6 +566,7 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

    srcs: [

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

    ],
@@ -562,6 +582,7 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

    srcs: [

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

    ],
@@ -577,6 +598,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"],

}
@@ -590,6 +612,7 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

}
@@ -603,6 +626,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.permission.flags",

    container: "system",

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

}
@@ -622,6 +646,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.database.sqlite",

    container: "system",

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

}
@@ -641,6 +666,7 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "android.hardware.biometrics",

    container: "system",

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

}
@@ -692,6 +718,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.multiuser",

    container: "system",

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

}
@@ -705,6 +732,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.app",

    container: "system",

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

}
@@ -718,6 +746,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"],

}
@@ -731,6 +760,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.credentials.flags",

    container: "system",

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

    exportable: true,

}
@@ -752,6 +782,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"],

}
@@ -765,6 +796,7 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

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

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

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

    container: "system",

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

}
@@ -791,6 +824,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"],

}
@@ -804,6 +838,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"],

}
@@ -817,6 +852,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",
@@ -833,6 +869,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.companion",

    container: "system",

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

}
@@ -846,6 +883,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__"],

}
@@ -854,6 +892,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"],

}
@@ -874,6 +913,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"],

}
@@ -892,6 +932,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"],

}
@@ -905,6 +946,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",

    ],
@@ -932,6 +974,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"],

}
@@ -950,6 +993,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"],

}
@@ -963,6 +1007,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"],

}
@@ -1003,6 +1048,7 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

}
@@ -1016,6 +1062,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"],

}
@@ -1036,6 +1083,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"],

}
@@ -1049,6 +1097,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"],

}
@@ -1069,6 +1118,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.tracing",

    container: "system",

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

}
@@ -1087,6 +1137,7 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "android.appwidget.flags",

    container: "system",

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

}
@@ -1100,6 +1151,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"],

}
@@ -1113,6 +1165,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",
@@ -1129,6 +1182,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.provider",

    container: "system",

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

}
@@ -1149,6 +1203,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.speech.flags",

    container: "system",

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

}
@@ -1169,6 +1224,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.content.flags",

    container: "system",

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

}
@@ -1182,6 +1238,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.adaptiveauth",

    container: "system",

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

}
@@ -1195,6 +1252,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.crashrecovery.flags",

    container: "system",

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

}
@@ -1215,6 +1273,7 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

    srcs: ["wifi/*.aconfig"],

}
@@ -1233,6 +1292,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.app.wearable",

    container: "system",

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

}
@@ -1245,6 +1305,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "com.android.internal.pm.pkg.component.flags-aconfig",

    package: "com.android.internal.pm.pkg.component.flags",

    container: "system",

    srcs: ["core/java/com/android/internal/pm/pkg/component/flags/flags.aconfig"],

}
@@ -1265,6 +1326,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.server",

    container: "system",

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

}

Android.bp

+11 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ filegroup { 
        ":framework-javastream-protos",

        ":statslog-framework-java-gen", // FrameworkStatsLog.java

        ":audio_policy_configuration_V7_0",

        ":perfetto_trace_javastream_protos",

    ],

}
@@ -425,6 +424,7 @@ java_defaults { 
        "audiopolicy-aidl-java",

        "sounddose-aidl-java",

        "modules-utils-expresslog",

        "perfetto_trace_javastream_protos_jarjar",

    ],

}
@@ -664,6 +664,16 @@ filegroup { 
    visibility: ["//frameworks/base/api"],

}



java_library {

    name: "perfetto_trace_javastream_protos_jarjar",

    srcs: [

        ":perfetto_trace_javastream_protos",

    ],

    jarjar_rules: ":framework-jarjar-rules",

    sdk_version: "core_platform",

    installable: false,

}



build = [

    "AconfigFlags.bp",

    "ProtoLibraries.bp",

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"

cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

+18 −0
Original line number Diff line number Diff line
@@ -1280,6 +1280,24 @@ public class Bmgr { 
                return "START_PACKAGE_RESTORE";

            case BackupManagerMonitor.LOG_EVENT_ID_AGENT_FAILURE:

                return "AGENT_FAILURE";

            case BackupManagerMonitor.LOG_EVENT_ID_RESTORE_AT_INSTALL_INVOKED:

                return "RESTORE_AT_INSTALL_INVOKED";

            case BackupManagerMonitor.LOG_EVENT_ID_SKIP_RESTORE_AT_INSTALL:

                return "SKIP_RESTORE_AT_INSTALL";

            case BackupManagerMonitor.LOG_EVENT_ID_PACKAGE_ACCEPTED_FOR_RESTORE:

                return "PACKAGE_ACCEPTED_FOR_RESTORE";

            case BackupManagerMonitor.LOG_EVENT_ID_RESTORE_DATA_DOES_NOT_BELONG_TO_PACKAGE:

                return "RESTORE_DATA_DOES_NOT_BELONG_TO_PACKAGE";

            case BackupManagerMonitor.LOG_EVENT_ID_UNABLE_TO_CREATE_AGENT_FOR_RESTORE:

                return "UNABLE_TO_CREATE_AGENT_FOR_RESTORE";

            case BackupManagerMonitor.LOG_EVENT_ID_AGENT_CRASHED_BEFORE_RESTORE_DATA_IS_SENT:

                return "AGENT_CRASHED_BEFORE_RESTORE_DATA_IS_SEN";

            case BackupManagerMonitor.LOG_EVENT_ID_FAILED_TO_SEND_DATA_TO_AGENT_DURING_RESTORE:

                return "FAILED_TO_SEND_DATA_TO_AGENT_DURING_RESTORE";

            case BackupManagerMonitor.LOG_EVENT_ID_AGENT_FAILURE_DURING_RESTORE:

                return "AGENT_FAILURE_DURING_RESTORE";

            case BackupManagerMonitor.LOG_EVENT_ID_FAILED_TO_READ_DATA_FROM_TRANSPORT:

                return "FAILED_TO_READ_DATA_FROM_TRANSPORT";

            default:

                return "UNKNOWN_ID";

        }

core/java/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -582,7 +582,9 @@ java_library { 
    srcs: [

        "com/android/internal/protolog/ProtoLogImpl.java",

        "com/android/internal/protolog/ProtoLogViewerConfigReader.java",

        ":perfetto_trace_javastream_protos",

    ],

    static_libs: [

        "perfetto_trace_javastream_protos_jarjar",

    ],

}