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

Commit 46b645ec authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future

parents bf50d5c1 4af97203

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShimPriv_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "10093150"

    build_id: "11947186"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShimPriv.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "udc-dev"

  git_branch: "main"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShim_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "10093150"

    build_id: "11947186"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShim.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "udc-dev"

  git_branch: "main"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShimPriv_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "10093150"

    build_id: "11947186"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShimPriv.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "udc-dev"

  git_branch: "main"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShim_apk.asciipb

+2 −2
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "10093150"

    build_id: "11947186"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShim.apk"

  }
@@ -8,7 +8,7 @@ drops { 
  version: ""

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "udc-dev"

  git_branch: "main"

  transform: TRANSFORM_NONE

  transform_options {

  }

AconfigFlags.bp

+233 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ aconfig_declarations_group { 
        // !!! KEEP THIS LIST ALPHABETICAL !!!

        "aconfig_mediacodec_flags_java_lib",

        "android.adaptiveauth.flags-aconfig-java",

        "android.app.contextualsearch.flags-aconfig-java",

        "android.app.flags-aconfig-java",

        "android.app.ondeviceintelligence-aconfig-java",

        "android.app.smartspace.flags-aconfig-java",
@@ -73,21 +74,27 @@ aconfig_declarations_group { 
        "android.view.inputmethod.flags-aconfig-java",

        "android.webkit.flags-aconfig-java",

        "android.widget.flags-aconfig-java",

        "backstage_power_flags_lib",

        "backup_flags_lib",

        "camera_platform_flags_core_java_lib",

        "com.android.hardware.input-aconfig-java",

        "com.android.input.flags-aconfig-java",

        "com.android.internal.compat.flags-aconfig-java",

        "com.android.internal.foldables.flags-aconfig-java",

        "com.android.internal.os.flags-aconfig-java",

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

        "com.android.media.flags.bettertogether-aconfig-java",

        "com.android.media.flags.editing-aconfig-java",

        "com.android.media.flags.performance-aconfig-java",

        "com.android.media.flags.projection-aconfig-java",

        "com.android.net.thread.platform.flags-aconfig-java",

        "com.android.server.contextualsearch.flags-java",

        "com.android.server.flags.services-aconfig-java",

        "com.android.text.flags-aconfig-java",

        "com.android.window.flags.window-aconfig-java",

        "device_policy_aconfig_flags_lib",

        "display_flags_lib",

        "dropbox_flags_lib",

        "framework-jobscheduler-job.flags-aconfig-java",

        "framework_graphics_flags_java_lib",

        "hwui_flags_java_lib",
@@ -166,9 +173,15 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

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

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

}



// DeviceStateManager

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/hardware/devicestate/feature/*.aconfig"],
@@ -183,6 +196,7 @@ java_aconfig_library { 
// Input

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/hardware/input/*.aconfig"],
@@ -323,6 +337,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.os",

    exportable: true,

    container: "system",

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

}
@@ -340,6 +355,50 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

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

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

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

    mode: "exported",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.mediaprovider",

        "com.android.permission",

    ],

}



cc_aconfig_library {

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

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

}



cc_aconfig_library {

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

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

    mode: "test",

}



cc_aconfig_library {

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

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

    host_supported: true,

}



// OS Internal

aconfig_declarations {

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

    package: "com.android.internal.os",

    container: "system",

    srcs: ["core/java/com/android/internal/os/flags.aconfig"],

}



java_aconfig_library {

    name: "com.android.internal.os.flags-aconfig-java",

    aconfig_declarations: "com.android.internal.os.flags-aconfig",

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

}



// VirtualDeviceManager

cc_aconfig_library {

    name: "android.companion.virtualdevice.flags-aconfig-cc",
@@ -441,6 +500,7 @@ cc_aconfig_library { 
// Hardware

aconfig_declarations {

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

    exportable: true,

    package: "android.hardware.flags",

    container: "system",

    srcs: ["core/java/android/hardware/flags/*.aconfig"],
@@ -477,6 +537,7 @@ aconfig_declarations { 
    name: "android.content.pm.flags-aconfig",

    package: "android.content.pm",

    container: "system",

    exportable: true,

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

}
@@ -486,6 +547,18 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

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

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

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

    mode: "exported",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

    ],

}



java_aconfig_library {

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

    aconfig_declarations: "android.content.pm.flags-aconfig",
@@ -507,6 +580,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

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

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

    host_supported: true,

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

}



// Media BetterTogether

aconfig_declarations {

    name: "com.android.media.flags.bettertogether-aconfig",
@@ -531,6 +611,7 @@ java_aconfig_library { 
// Media Editing

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: [
@@ -560,9 +641,26 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Media Performance

aconfig_declarations {

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

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

    container: "system",

    srcs: [

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

    ],

}



java_aconfig_library {

    name: "com.android.media.flags.performance-aconfig-java",

    aconfig_declarations: "com.android.media.flags.performance-aconfig",

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

}



// Media TV

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["media/java/android/media/tv/flags/media_tv.aconfig"],
@@ -577,6 +675,7 @@ java_aconfig_library { 
// OnDeviceIntelligence

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/app/ondeviceintelligence/flags/ondevice_intelligence.aconfig"],
@@ -591,15 +690,17 @@ java_aconfig_library { 
// Permissions

aconfig_declarations {

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

    package: "android.permission.flags",

    container: "system",

    package: "android.permission.flags",

    exportable: true,

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

}



java_aconfig_library {

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

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

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

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

    mode: "exported",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -608,6 +709,25 @@ java_aconfig_library { 
    ],

}



java_aconfig_library {

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

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

    host_supported: true,

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

    min_sdk_version: "30",

}



java_aconfig_library {

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

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

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

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",

    ],

}



// SQLite

aconfig_declarations {

    name: "android.database.sqlite-aconfig",
@@ -622,9 +742,16 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

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

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

    host_supported: true,

}



// Biometrics

aconfig_declarations {

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

    exportable: true,

    package: "android.hardware.biometrics",

    container: "system",

    srcs: ["core/java/android/hardware/biometrics/flags.aconfig"],
@@ -656,12 +783,24 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "android.server.display.flags-aconfig-cc",

    aconfig_declarations: "display_flags",

}



java_aconfig_library {

    name: "com.android.internal.foldables.flags-aconfig-java",

    aconfig_declarations: "fold_lock_setting_flags",

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

}



// Platform Compat

java_aconfig_library {

    name: "com.android.internal.compat.flags-aconfig-java",

    aconfig_declarations: "compat_logging_flags",

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

}



// Multi user

aconfig_declarations {

    name: "android.multiuser.flags-aconfig",
@@ -693,6 +832,7 @@ java_aconfig_library { 
// Broadcast Radio

aconfig_declarations {

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

    exportable: true,

    package: "android.hardware.radio",

    container: "system",

    srcs: ["core/java/android/hardware/radio/*.aconfig"],
@@ -710,6 +850,7 @@ aconfig_declarations { 
    package: "android.credentials.flags",

    container: "system",

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

    exportable: true,

}



java_aconfig_library {
@@ -718,9 +859,17 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

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

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

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

    mode: "exported",

}



// Content Protection

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/view/contentprotection/flags/*.aconfig"],
@@ -732,6 +881,20 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Contextual Search system service

aconfig_declarations {

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

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

    container: "system",

    srcs: ["services/contextualsearch/flags/flags.aconfig"],

}



java_aconfig_library {

    name: "com.android.server.contextualsearch.flags-java",

    aconfig_declarations: "com.android.server.contextualsearch.flags-aconfig",

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

}



// Server Services Flags

aconfig_declarations {

    name: "com.android.server.flags.services-aconfig",
@@ -749,6 +912,7 @@ java_aconfig_library { 
// App prediction

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/service/appprediction/flags/*.aconfig"],
@@ -763,6 +927,7 @@ java_aconfig_library { 
// Controls

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/service/controls/flags/*.aconfig"],
@@ -777,6 +942,7 @@ java_aconfig_library { 
// Voice

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/service/voice/flags/*.aconfig"],
@@ -808,6 +974,7 @@ java_aconfig_library { 
// Companion

aconfig_declarations {

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

    exportable: true,

    package: "android.companion",

    container: "system",

    srcs: ["core/java/android/companion/*.aconfig"],
@@ -822,6 +989,7 @@ java_aconfig_library { 
// Networking

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/net/flags.aconfig"],
@@ -831,6 +999,7 @@ aconfig_declarations { 
// Thread network

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/net/thread/flags.aconfig"],
@@ -934,6 +1103,7 @@ aconfig_declarations { 
    name: "framework-jobscheduler-job.flags-aconfig",

    package: "android.app.job",

    container: "system",

    exportable: true,

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

}
@@ -984,9 +1154,24 @@ java_aconfig_library { 
    ],

}



// Contextual Search

aconfig_declarations {

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

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

    container: "system",

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

}



java_aconfig_library {

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

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

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

}



// Smartspace

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/app/smartspace/flags.aconfig"],
@@ -1022,6 +1207,7 @@ java_aconfig_library { 
// USB

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/hardware/usb/flags/*.aconfig"],
@@ -1107,6 +1293,7 @@ java_aconfig_library { 
// Provider

aconfig_declarations {

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

    exportable: true,

    package: "android.provider",

    container: "system",

    srcs: ["core/java/android/provider/*.aconfig"],
@@ -1128,6 +1315,7 @@ java_aconfig_library { 
// Speech

aconfig_declarations {

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

    exportable: true,

    package: "android.speech.flags",

    container: "system",

    srcs: ["core/java/android/speech/flags/*.aconfig"],
@@ -1149,6 +1337,7 @@ java_aconfig_library { 
// Content

aconfig_declarations {

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

    exportable: true,

    package: "android.content.flags",

    container: "system",

    srcs: ["core/java/android/content/flags/flags.aconfig"],
@@ -1177,6 +1366,7 @@ java_aconfig_library { 
// CrashRecovery Module

aconfig_declarations {

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

    exportable: true,

    package: "android.crashrecovery.flags",

    container: "system",

    srcs: ["packages/CrashRecovery/aconfig/flags.aconfig"],
@@ -1188,6 +1378,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

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

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

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

    host_supported: true,

}



// Backup

java_aconfig_library {

    name: "backup_flags_lib",
@@ -1217,6 +1414,7 @@ java_aconfig_library { 
// Wearable Sensing

aconfig_declarations {

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

    exportable: true,

    package: "android.app.wearable",

    container: "system",

    srcs: ["core/java/android/app/wearable/*.aconfig"],
@@ -1261,3 +1459,36 @@ java_aconfig_library { 
    aconfig_declarations: "android.systemserver.flags-aconfig",

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

}



// backstage power

aconfig_declarations {

    name: "backstage_power_flags",

    package: "com.android.server.power.optimization",

    container: "system",

    exportable: true,

    srcs: [

        "services/core/java/com/android/server/power/stats/flags.aconfig",

    ],

}



java_aconfig_library {

    name: "backstage_power_flags_lib",

    aconfig_declarations: "backstage_power_flags",

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

}



// Dropbox data

aconfig_declarations {

    name: "dropbox_flags",

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

    container: "system",

    srcs: [

        "services/core/java/com/android/server/feature/dropbox_flags.aconfig",

    ],

}



java_aconfig_library {

    name: "dropbox_flags_lib",

    aconfig_declarations: "dropbox_flags",

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

}