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

Commit 10e260fc authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q4 into AOSP main 

Bug: 370570306
Merged-In: I3d210caa7b15c24eaf523207e4905b20a2894260
Change-Id: Ic3c8148937e940a0258e790ff89463dae79e992c
parents c04c1151 2e5f670c

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__riscv64_CtsShimPriv_apk.asciipb

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

  android_build_drop {

    build_id: "9653376"

    build_id: "11947186"

    target: "CtsShim"

    source_file: "aosp_riscv64/CtsShimPriv.apk"

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

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "master"

  git_branch: "main"

  transform: TRANSFORM_NONE

  transform_options {

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__riscv64_CtsShim_apk.asciipb

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

  android_build_drop {

    build_id: "9653376"

    build_id: "11947186"

    target: "CtsShim"

    source_file: "aosp_riscv64/CtsShim.apk"

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

  version_group: ""

  git_project: "platform/frameworks/base"

  git_branch: "master"

  git_branch: "main"

  transform: TRANSFORM_NONE

  transform_options {

  }

AconfigFlags.bp

+122 −1
Original line number Diff line number Diff line
@@ -21,11 +21,15 @@ aconfig_declarations_group { 
    java_aconfig_libraries: [

        // !!! KEEP THIS LIST ALPHABETICAL !!!

        "aconfig_mediacodec_flags_java_lib",

        "android-sdk-flags-java",

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

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

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

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

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

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

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

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

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

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

        "android.appwidget.flags-aconfig-java",
@@ -101,7 +105,10 @@ aconfig_declarations_group { 
        "framework-jobscheduler-job.flags-aconfig-java",

        "framework_graphics_flags_java_lib",

        "hwui_flags_java_lib",

        "interaction_jank_monitor_flags_lib",

        "keystore2_flags_java-framework",

        "libcore_exported_aconfig_flags_lib",

        "libgui_flags_java_lib",

        "power_flags_lib",

        "sdk_sandbox_flags_lib",

        "surfaceflinger_flags_java_lib",
@@ -152,6 +159,14 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Core Libraries / libcore

java_aconfig_library {

    name: "libcore_exported_aconfig_flags_lib",

    aconfig_declarations: "libcore-aconfig-flags",

    mode: "exported",

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

}



// Telecom

java_aconfig_library {

    name: "telecom_flags_core_java_lib",
@@ -174,6 +189,7 @@ cc_aconfig_library { 
// Window

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

    srcs: ["core/java/android/window/flags/*.aconfig"],
@@ -245,6 +261,12 @@ cc_aconfig_library { 
    aconfig_declarations: "com.android.text.flags-aconfig",

}



rust_aconfig_library {

    name: "libandroid_text_flags_rust",

    crate_name: "android_text_flags",

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

}



// Location

aconfig_declarations {

    name: "android.location.flags-aconfig",
@@ -433,6 +455,8 @@ java_aconfig_library { 
cc_aconfig_library {

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

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

    host_supported: true,

    mode: "test",

}



java_aconfig_library {
@@ -445,9 +469,22 @@ aconfig_declarations { 
    name: "android.companion.virtualdevice.flags-aconfig",

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

    container: "system",

    exportable: true,

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

}



java_aconfig_library {

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

    aconfig_declarations: "android.companion.virtualdevice.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.companion.virtual.flags-aconfig-java",

    aconfig_declarations: "android.companion.virtual.flags-aconfig",
@@ -707,7 +744,7 @@ aconfig_declarations { 
    exportable: true,

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

    container: "system",

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

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

}



java_aconfig_library {
@@ -1117,6 +1154,7 @@ cc_aconfig_library { 
// Chooser / "Sharesheet"

aconfig_declarations {

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

    exportable: true,

    package: "android.service.chooser",

    container: "system",

    srcs: ["core/java/android/service/chooser/flags.aconfig"],
@@ -1218,6 +1256,21 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Supervision

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

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

}



java_aconfig_library {

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

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

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

}



// SurfaceFlinger

java_aconfig_library {

    name: "surfaceflinger_flags_java_lib",
@@ -1225,6 +1278,12 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "libgui_flags_java_lib",

    aconfig_declarations: "libgui_flags",

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

}



// Content Capture

aconfig_declarations {

    name: "android.view.contentcapture.flags-aconfig",
@@ -1384,6 +1443,33 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// AppFunctions

aconfig_declarations {

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

    exportable: true,

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

    container: "system",

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

}



java_aconfig_library {

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

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

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

}



java_aconfig_library {

    name: "android.app.appfunctions.exported-flags-aconfig-java",

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

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

    mode: "exported",

    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

    ],

    min_sdk_version: "30",

}



// Adaptive Auth

aconfig_declarations {

    name: "android.adaptiveauth.flags-aconfig",
@@ -1512,6 +1598,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "backstage_power_flags_lib-host",

    aconfig_declarations: "backstage_power_flags",

    host_supported: true,

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

}



// Dropbox data

aconfig_declarations {

    name: "dropbox_flags",
@@ -1528,6 +1621,34 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Zero Jank

aconfig_declarations {

    name: "interaction_jank_monitor_flags",

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

    container: "system",

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

}



java_aconfig_library {

    name: "interaction_jank_monitor_flags_lib",

    aconfig_declarations: "interaction_jank_monitor_flags",

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

}



// App Jank

aconfig_declarations {

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

    package: "android.app.jank",

    container: "system",

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

}



java_aconfig_library {

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

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

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

}



// Trade in mode

aconfig_declarations {

    name: "aconfig_trade_in_mode_flags",

Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ filegroup { 
        ":android.frameworks.location.altitude-V2-java-source",

        ":android.hardware.biometrics.common-V4-java-source",

        ":android.hardware.biometrics.fingerprint-V5-java-source",

        ":android.hardware.biometrics.fingerprint.virtualhal-java-source",

        ":android.hardware.biometrics.face.virtualhal-java-source",

        ":android.hardware.biometrics.face-V4-java-source",

        ":android.hardware.gnss-V2-java-source",

        ":android.hardware.graphics.common-V3-java-source",
@@ -107,7 +109,7 @@ filegroup { 
        ":android.hardware.radio.voice-V3-java-source",

        ":android.hardware.security.secureclock-V1-java-source",

        ":android.hardware.thermal-V2-java-source",

        ":android.hardware.tv.tuner-V2-java-source",

        ":android.hardware.tv.tuner-V3-java-source",

        ":android.security.apc-java-source",

        ":android.security.authorization-java-source",

        ":android.security.legacykeystore-java-source",
@@ -255,7 +257,7 @@ java_library { 
        "android.hardware.vibrator-V1.1-java",

        "android.hardware.vibrator-V1.2-java",

        "android.hardware.vibrator-V1.3-java",

        "android.hardware.vibrator-V2-java",

        "android.hardware.vibrator-V3-java",

        "android.se.omapi-V1-java",

        "android.system.suspend.control.internal-java",

        "devicepolicyprotosnano",
@@ -428,6 +430,7 @@ java_defaults { 
        "modules-utils-expresslog",

        "perfetto_trace_javastream_protos_jarjar",

        "libaconfig_java_proto_nano",

        "aconfig_device_paths_java",

    ],

}

SQLITE_OWNERS

+7 −0
Original line number Diff line number Diff line 
# Android platform SQLite owners are responsible for:

# 1. Periodically updating libsqlite from upstream sqlite.org.

# 2. Escalating libsqlite bug reports to upstream sqlite.org.

# 3. Addressing bugs, performance regressions, and feature requests

#    in Android SDK SQLite wrappers (android.database.sqlite.*).

# 4. Reviewing proposed changes to said Android SDK SQLite wrappers.



shayba@google.com

shombert@google.com