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

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

Snap for 12391343 from 6a0cf455 to 24Q4-release 

Change-Id: I354dc6dc5f2dfcbfb993ce4e1ec9a0aaea4dcada
parents 77c8255e 6a0cf455

AconfigFlags.bp

+8 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ aconfig_declarations_group { 
        "com.android.media.flags.performance-aconfig-java",

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

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

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

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

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

        "com.android.text.flags-aconfig-java",
@@ -1549,6 +1550,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Ranging

java_aconfig_library {

    name: "com.android.ranging.flags.ranging-aconfig-java",

    aconfig_declarations: "ranging_aconfig_flags",

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

}



// System Server

aconfig_declarations {

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

api/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -102,6 +102,11 @@ combined_apis { 
            "framework-crashrecovery",

        ],

        default: [],

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

        true: [

            "framework-ranging",

        ],

        default: [],

    }),

    system_server_classpath: [

        "service-art",

api/StubLibraries.bp

+71 −2
Original line number Diff line number Diff line
@@ -465,6 +465,32 @@ java_library { 
    ],

}



java_library {

    name: "android-non-updatable.stubs.system_server",

    defaults: ["android-non-updatable_defaults"],

    static_libs: [

        "android-non-updatable.stubs.system_server.from-source",

    ],

    product_variables: {

        build_from_text_stub: {

            static_libs: [

                "android-non-updatable.stubs.system_server.from-text",

            ],

            exclude_static_libs: [

                "android-non-updatable.stubs.system_server.from-source",

            ],

        },

    },

}



java_library {

    name: "android-non-updatable.stubs.exportable.system_server",

    defaults: ["android-non-updatable_defaults"],

    static_libs: [

        "android-non-updatable.stubs.exportable.system_server.from-source",

    ],

}



java_library {

    name: "android-non-updatable.stubs.from-source",

    defaults: [
@@ -561,6 +587,30 @@ java_library { 
    },

}



java_library {

    name: "android-non-updatable.stubs.system_server.from-source",

    defaults: [

        "android-non-updatable_defaults",

        "android-non-updatable_from_source_defaults",

    ],

    srcs: [":services-non-updatable-stubs"],

    libs: non_updatable_api_deps_on_modules,

}



java_library {

    name: "android-non-updatable.stubs.exportable.system_server.from-source",

    defaults: [

        "android-non-updatable_defaults",

        "android-non-updatable_from_source_defaults",

        "android-non-updatable_exportable_from_source_defaults",

    ],

    srcs: [":services-non-updatable-stubs{.exportable}"],

    libs: non_updatable_api_deps_on_modules,

    dist: {

        dir: "apistubs/android/system-server",

    },

}



java_defaults {

    name: "android-non-updatable_from_text_defaults",

    defaults: ["android-non-updatable-stubs-libs-defaults"],
@@ -662,6 +712,25 @@ java_api_library { 
    libs: ["all-modules-system-stubs"],

}



java_api_library {

    name: "android-non-updatable.stubs.system_server.from-text",

    api_surface: "system_server",

    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

        "system-api-stubs-docs-non-updatable.api.contribution",

        "module-lib-api-stubs-docs-non-updatable.api.contribution",

        "services-non-updatable-stubs.api.contribution",

    ],

    defaults: [

        "module-classpath-java-defaults",

        "android-non-updatable_everything_from_text_defaults",

    ],



    // Use full Android API not just the non-updatable API as the latter is incomplete

    // and can result in incorrect behavior.

    previous_api: ":android.api.combined.system-server.latest",

}



java_defaults {

    name: "android_stubs_dists_default",

    dist: {
@@ -813,9 +882,9 @@ java_library { 
    defaults: [

        "android.jar_defaults",

    ],

    srcs: [":services-non-updatable-stubs"],

    installable: false,

    static_libs: [

        "android-non-updatable.stubs.system_server",

        "android_module_lib_stubs_current",

    ],

    visibility: ["//frameworks/base/services"],
@@ -827,9 +896,9 @@ java_library { 
        "android.jar_defaults",

        "android_stubs_dists_default",

    ],

    srcs: [":services-non-updatable-stubs{.exportable}"],

    installable: false,

    static_libs: [

        "android-non-updatable.stubs.exportable.system_server",

        "android_module_lib_stubs_current_exportable",

    ],

    dist: {

cmds/uiautomator/library/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ droidstubs { 
        "testrunner-src/**/*.java",

    ],

    libs: [

        "android.test.runner",

        "android.test.runner.stubs.system",

        "junit",

        "android.test.base",

        "android.test.base.stubs.system",

        "unsupportedappusage",

    ],

    installable: false,
@@ -56,9 +56,9 @@ droiddoc { 
        ":uiautomator-stubs",

    ],

    libs: [

        "android.test.runner",

        "android.test.runner.stubs",

        "junit",

        "android.test.base",

        "android.test.base.stubs",

    ],

    sdk_version: "current",

    installable: false,

core/api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -32613,6 +32613,13 @@ package android.os { 
    method public boolean isCharging();

    field public static final String ACTION_CHARGING = "android.os.action.CHARGING";

    field public static final String ACTION_DISCHARGING = "android.os.action.DISCHARGING";

    field @FlaggedApi("android.os.battery_part_status_api") public static final int BATTERY_CAPACITY_LEVEL_CRITICAL = 1; // 0x1

    field @FlaggedApi("android.os.battery_part_status_api") public static final int BATTERY_CAPACITY_LEVEL_FULL = 5; // 0x5

    field @FlaggedApi("android.os.battery_part_status_api") public static final int BATTERY_CAPACITY_LEVEL_HIGH = 4; // 0x4

    field @FlaggedApi("android.os.battery_part_status_api") public static final int BATTERY_CAPACITY_LEVEL_LOW = 2; // 0x2

    field @FlaggedApi("android.os.battery_part_status_api") public static final int BATTERY_CAPACITY_LEVEL_NORMAL = 3; // 0x3

    field @FlaggedApi("android.os.battery_part_status_api") public static final int BATTERY_CAPACITY_LEVEL_UNKNOWN = 0; // 0x0

    field @FlaggedApi("android.os.battery_part_status_api") public static final int BATTERY_CAPACITY_LEVEL_UNSUPPORTED = -1; // 0xffffffff

    field public static final int BATTERY_HEALTH_COLD = 7; // 0x7

    field public static final int BATTERY_HEALTH_DEAD = 4; // 0x4

    field public static final int BATTERY_HEALTH_GOOD = 2; // 0x2
@@ -32637,6 +32644,7 @@ package android.os { 
    field public static final int BATTERY_STATUS_NOT_CHARGING = 4; // 0x4

    field public static final int BATTERY_STATUS_UNKNOWN = 1; // 0x1

    field public static final String EXTRA_BATTERY_LOW = "battery_low";

    field @FlaggedApi("android.os.battery_part_status_api") public static final String EXTRA_CAPACITY_LEVEL = "android.os.extra.CAPACITY_LEVEL";

    field public static final String EXTRA_CHARGING_STATUS = "android.os.extra.CHARGING_STATUS";

    field public static final String EXTRA_CYCLE_COUNT = "android.os.extra.CYCLE_COUNT";

    field public static final String EXTRA_HEALTH = "health";