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

Commit 82ada650 authored by Xin Li's avatar Xin Li
Browse files

Merge 25Q1 (ab/12770256) to aosp-main-future 

Bug: 385190204
Merged-In: Ibc80f09d54bec2c83814874d94a8f8eb22b5075f
Change-Id: If7779ae57fd91631d08bd8af5434c2ddd963aad7
parents 2b327ef4 450f8ab1

AconfigFlags.bp

+174 −16
Original line number Diff line number Diff line
@@ -21,9 +21,12 @@ aconfig_declarations_group { 
    java_aconfig_libraries: [

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

        "aconfig_mediacodec_flags_java_lib",

        "android-sdk-flags-java",

        "aconfig_settingslib_flags_java_lib",

        "aconfig_trade_in_mode_flags_java_lib",

        "adpf_flags_java_lib",

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

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

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

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

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

        "android.app.jank.flags-aconfig-java",
@@ -59,14 +62,17 @@ aconfig_declarations_group { 
        "android.os.vibrator.flags-aconfig-java",

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

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

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

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

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

        "android.service.autofill.flags-aconfig-java",

        "android.service.chooser.flags-aconfig-java",

        "android.service.compat.flags-aconfig-java",

        "android.service.controls.flags-aconfig-java",

        "android.service.dreams.flags-aconfig-java",

        "android.service.notification.flags-aconfig-java",

        "android.service.appprediction.flags-aconfig-java",

        "android.service.quickaccesswallet.flags-aconfig-java",

        "android.service.voice.flags-aconfig-java",

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

        "android.systemserver.flags-aconfig-java",
@@ -78,6 +84,7 @@ aconfig_declarations_group { 
        "android.view.inputmethod.flags-aconfig-java",

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

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

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

        "art_exported_aconfig_flags_lib",

        "backstage_power_flags_lib",

        "backup_flags_lib",
@@ -88,6 +95,7 @@ aconfig_declarations_group { 
        "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.internal.widget.flags-aconfig-java",

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

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

        "com.android.media.flags.performance-aconfig-java",
@@ -99,6 +107,7 @@ aconfig_declarations_group { 
        "com.android.server.flags.services-aconfig-java",

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

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

        "conscrypt_exported_aconfig_flags_lib",

        "device_policy_aconfig_flags_lib",

        "display_flags_lib",

        "dropbox_flags_lib",
@@ -108,6 +117,7 @@ aconfig_declarations_group { 
        "interaction_jank_monitor_flags_lib",

        "keystore2_flags_java-framework",

        "libcore_exported_aconfig_flags_lib",

        "libcore_readonly_aconfig_flags_lib",

        "libgui_flags_java_lib",

        "power_flags_lib",

        "sdk_sandbox_flags_lib",
@@ -167,6 +177,34 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// See b/368409430 - This is for libcore flags to be generated with

// force-read-only mode, so access to the flags does not involve I/O,

// which could break Isolated Processes with I/O permission disabled.

// The issue will be addressed once new Aconfig storage API is landed

// and the readonly version will be removed.

aconfig_declarations {

    name: "libcore-readonly-aconfig-flags",

    package: "com.android.libcore.readonly",

    container: "system",

    srcs: ["libcore-readonly.aconfig"],

}



// Core Libraries / libcore

java_aconfig_library {

    name: "libcore_readonly_aconfig_flags_lib",

    aconfig_declarations: "libcore-readonly-aconfig-flags",

    mode: "force-read-only",

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

}



// Conscrypt

java_aconfig_library {

    name: "conscrypt_exported_aconfig_flags_lib",

    aconfig_declarations: "conscrypt-aconfig-flags",

    mode: "exported",

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

}



// Telecom

java_aconfig_library {

    name: "telecom_flags_core_java_lib",
@@ -242,6 +280,19 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



aconfig_declarations {

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

    package: "com.android.internal.widget.flags",

    container: "system",

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

}



java_aconfig_library {

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

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

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

}



// Text

aconfig_declarations {

    name: "com.android.text.flags-aconfig",
@@ -586,6 +637,11 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "aconfig_hardware_flags_c_lib",

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

}



// Widget

aconfig_declarations {

    name: "android.widget.flags-aconfig",
@@ -753,21 +809,6 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// 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"],

}



java_aconfig_library {

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

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

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

}



// Permissions

aconfig_declarations {

    name: "android.permission.flags-aconfig",
@@ -809,6 +850,12 @@ java_aconfig_library { 
    ],

}



cc_aconfig_library {

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

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

    host_supported: true,

}



// SQLite

aconfig_declarations {

    name: "android.database.sqlite-aconfig",
@@ -844,6 +891,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Adaptive Performance

java_aconfig_library {

    name: "adpf_flags_java_lib",

    aconfig_declarations: "adpf_flags",

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

}



// Graphics

java_aconfig_library {

    name: "hwui_flags_java_lib",
@@ -882,6 +936,21 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



aconfig_declarations {

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

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

    container: "system",

    srcs: [

        "services/core/java/com/android/server/compat/*.aconfig",

    ],

}



java_aconfig_library {

    name: "android.service.compat.flags-aconfig-java",

    aconfig_declarations: "android.service.compat.flags-aconfig",

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

}



// Multi user

aconfig_declarations {

    name: "android.multiuser.flags-aconfig",
@@ -896,6 +965,20 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// XR

aconfig_declarations {

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

    package: "android.xr",

    container: "system",

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

}



java_aconfig_library {

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

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

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

}



// android.app

aconfig_declarations {

    name: "android.app.flags-aconfig",
@@ -915,6 +998,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

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

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

    host_supported: true,

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

}



// Broadcast Radio

aconfig_declarations {

    name: "android.hardware.radio.flags-aconfig",
@@ -1139,6 +1229,17 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "device_policy_aconfig_flags_java_export",

    aconfig_declarations: "device_policy_aconfig_flags",

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

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

    ],

}



java_aconfig_library {

    name: "device_policy_aconfig_flags_lib_host",

    aconfig_declarations: "device_policy_aconfig_flags",
@@ -1241,6 +1342,20 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Assist

aconfig_declarations {

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

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

    container: "system",

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

}



java_aconfig_library {

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

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

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

}



// Smartspace

aconfig_declarations {

    name: "android.app.smartspace.flags-aconfig",
@@ -1353,6 +1468,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

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

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

    host_supported: true,

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

}



// App

aconfig_declarations {

    name: "android.server.app.flags-aconfig",
@@ -1497,6 +1619,11 @@ java_aconfig_library { 
    name: "android.crashrecovery.flags-aconfig-java",

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

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

    min_sdk_version: "35",

    apex_available: [

        "//apex_available:platform",

        "com.android.crashrecovery",

    ],

}



java_aconfig_library {
@@ -1674,3 +1801,34 @@ cc_aconfig_library { 
    ],

    min_sdk_version: "apex_inherit",

}



// Settings Lib

aconfig_declarations {

    name: "aconfig_settingslib_flags",

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

    container: "system",

    srcs: [

        "packages/SettingsLib/aconfig/settingslib.aconfig",

    ],

}



java_aconfig_library {

    name: "aconfig_settingslib_flags_java_lib",

    aconfig_declarations: "aconfig_settingslib_flags",

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

}



// Quick Access Wallet

aconfig_declarations {

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

    package: "android.service.quickaccesswallet",

    exportable: true,

    container: "system",

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

}



java_aconfig_library {

    name: "android.service.quickaccesswallet.flags-aconfig-java",

    aconfig_declarations: "android.service.quickaccesswallet.flags-aconfig",

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

}

Android.bp

+36 −18
Original line number Diff line number Diff line
@@ -103,12 +103,12 @@ filegroup { 
        ":android.hardware.gnss-V2-java-source",

        ":android.hardware.graphics.common-V3-java-source",

        ":android.hardware.keymaster-V4-java-source",

        ":android.hardware.radio-V3-java-source",

        ":android.hardware.radio.data-V3-java-source",

        ":android.hardware.radio.network-V3-java-source",

        ":android.hardware.radio.voice-V3-java-source",

        ":android.hardware.radio-V4-java-source",

        ":android.hardware.radio.data-V4-java-source",

        ":android.hardware.radio.network-V4-java-source",

        ":android.hardware.radio.voice-V4-java-source",

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

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

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

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

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

        ":android.security.authorization-java-source",
@@ -142,12 +142,10 @@ filegroup { 
        // For the generated R.java and Manifest.java

        ":framework-res{.aapt.srcjar}",



        // Java/AIDL sources to be moved out to CrashRecovery module

        ":framework-crashrecovery-sources",



        // etc.

        ":framework-javastream-protos",

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

        ":statslog-hwui-java-gen", // HwuiStatsLog.java

        ":audio_policy_configuration_V7_0",

    ] + select(release_flag("RELEASE_ATTEST_MODULES"), {

        true: [
@@ -229,18 +227,18 @@ java_library { 
        "android.hardware.contexthub-V1.0-java",

        "android.hardware.contexthub-V1.1-java",

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

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

        "android.hardware.contexthub-V4-java",

        "android.hardware.gnss-V1.0-java",

        "android.hardware.gnss-V2.1-java",

        "android.hardware.health-V1.0-java-constants",

        "android.hardware.radio-V1.6-java",

        "android.hardware.radio.data-V3-java",

        "android.hardware.radio.ims-V2-java",

        "android.hardware.radio.messaging-V3-java",

        "android.hardware.radio.modem-V3-java",

        "android.hardware.radio.network-V3-java",

        "android.hardware.radio.sim-V3-java",

        "android.hardware.radio.voice-V3-java",

        "android.hardware.radio.data-V4-java",

        "android.hardware.radio.ims-V3-java",

        "android.hardware.radio.messaging-V4-java",

        "android.hardware.radio.modem-V4-java",

        "android.hardware.radio.network-V4-java",

        "android.hardware.radio.sim-V4-java",

        "android.hardware.radio.voice-V4-java",

        "android.hardware.thermal-V1.0-java-constants",

        "android.hardware.thermal-V1.0-java",

        "android.hardware.thermal-V1.1-java",
@@ -369,6 +367,7 @@ java_defaults { 
    jarjar_rules: ":framework-jarjar-rules",

    javac_shard_size: 150,

    plugins: [

        "cached-property-annotation-processor",

        "view-inspector-annotation-processor",

        "staledataclass-annotation-processor",

        "error_prone_android_framework",
@@ -409,7 +408,9 @@ java_defaults { 
        "bouncycastle-repackaged-unbundled",

        "com.android.sysprop.foldlockbehavior",

        "com.android.sysprop.view",

        "configinfra_framework_flags_java_lib",

        "framework-internal-utils",

        "dynamic_instrumentation_manager_aidl-java",

        // If MimeMap ever becomes its own APEX, then this dependency would need to be removed

        // in favor of an API stubs dependency in java_library "framework" below.

        "mimemap",
@@ -440,7 +441,15 @@ java_library { 
    name: "framework-non-updatable-unbundled-impl-libs",

    static_libs: [

        "framework-location.impl",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": [],

        default: [

            "framework-platformcrashrecovery.impl",

        ],

    }) + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), {

        true: [],

        default: ["framework-ondeviceintelligence-platform.impl"],

    }),

    sdk_version: "core_platform",

    installable: false,

}
@@ -483,6 +492,7 @@ java_library { 
    apex_available: ["//apex_available:platform"],

    visibility: [

        "//frameworks/base:__subpackages__",

        "//packages/modules/NeuralNetworks:__subpackages__",

    ],

    compile_dex: false,

    headers_only: true,
@@ -574,7 +584,15 @@ java_library { 
        "documents-ui-compat-config",

        "calendar-provider-compat-config",

        "contacts-provider-platform-compat-config",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": [],

        default: [

            "framework-platformcrashrecovery-compat-config",

        ],

    }) + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), {

        true: [],

        default: ["framework-ondeviceintelligence-platform-compat-config"],

    }),

}



platform_compat_config {

PREUPLOAD.cfg

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               tests/

               tools/

bpfmt = -d

ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI

ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform,libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

android-sdk-flags/Android.bp

+10 −3
Original line number Diff line number Diff line
@@ -17,14 +17,21 @@ package { 
}



aconfig_declarations {

    name: "android-sdk-flags",

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

    package: "android.sdk",

    container: "system",

    srcs: ["flags.aconfig"],

}



java_aconfig_library {

    name: "android-sdk-flags-java",

    aconfig_declarations: "android-sdk-flags",

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

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

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

}



java_aconfig_library {

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

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

    host_supported: true,

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

}

android-sdk-flags/OWNERS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
include /SDK_OWNERS