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

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

Snap for 12019843 from 597a0d91 to 24Q4-release 

Change-Id: I857aa9b2b778b05b019236d7eab6f896f4f42be8
parents c707c89a 597a0d91

AconfigFlags.bp

+6 −0
Original line number Diff line number Diff line
@@ -405,6 +405,12 @@ cc_aconfig_library { 
    aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",

}



cc_aconfig_library {

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

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

    host_supported: true,

}



java_aconfig_library {

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

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

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -511,6 +511,9 @@ java_library { 
    },

    lint: {

        baseline_filename: "lint-baseline.xml",

        warning_checks: [

            "FlaggedApi",

        ],

    },

    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",

}

Ravenwood.bp

+8 −5
Original line number Diff line number Diff line
@@ -225,12 +225,15 @@ java_library { 


// Jars in "ravenwood-runtime" are set to the classpath, sorted alphabetically.

// Rename some of the dependencies to make sure they're included in the intended order.

java_genrule {

// Also apply jarjar.

java_library {

    name: "100-framework-minus-apex.ravenwood",

    defaults: ["ravenwood-internal-only-visibility-genrule"],

    cmd: "cp $(in) $(out)",

    srcs: [":framework-minus-apex.ravenwood"],

    out: ["100-framework-minus-apex.ravenwood.jar"],

    defaults: ["ravenwood-internal-only-visibility-java"],

    static_libs: [

        "framework-minus-apex.ravenwood",

    ],

    sdk_version: "core_platform",

    jarjar_rules: ":ravenwood-framework-jarjar-rules",

}



java_genrule {

WEAR_OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ nalmalki@google.com 
shijianli@google.com

latkin@google.com

djsollen@google.com

hdhabu@google.com
 
 No newline at end of file

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -11336,7 +11336,7 @@ package android.content { 
    field public static final String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";

    field public static final String CATEGORY_VOICE = "android.intent.category.VOICE";

    field public static final String CATEGORY_VR_HOME = "android.intent.category.VR_HOME";

    field @FlaggedApi("android.service.chooser.chooser_album_text") public static final int CHOOSER_CONTENT_TYPE_ALBUM = 1; // 0x1

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

    field @NonNull public static final android.os.Parcelable.Creator<android.content.Intent> CREATOR;

    field public static final String EXTRA_ALARM_COUNT = "android.intent.extra.ALARM_COUNT";

    field public static final String EXTRA_ALLOW_MULTIPLE = "android.intent.extra.ALLOW_MULTIPLE";
@@ -11359,7 +11359,7 @@ package android.content { 
    field public static final String EXTRA_CHANGED_PACKAGE_LIST = "android.intent.extra.changed_package_list";

    field public static final String EXTRA_CHANGED_UID_LIST = "android.intent.extra.changed_uid_list";

    field @FlaggedApi("android.service.chooser.chooser_payload_toggling") public static final String EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI = "android.intent.extra.CHOOSER_ADDITIONAL_CONTENT_URI";

    field @FlaggedApi("android.service.chooser.chooser_album_text") public static final String EXTRA_CHOOSER_CONTENT_TYPE_HINT = "android.intent.extra.CHOOSER_CONTENT_TYPE_HINT";

    field public static final String EXTRA_CHOOSER_CONTENT_TYPE_HINT = "android.intent.extra.CHOOSER_CONTENT_TYPE_HINT";

    field public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS = "android.intent.extra.CHOOSER_CUSTOM_ACTIONS";

    field @FlaggedApi("android.service.chooser.chooser_payload_toggling") public static final String EXTRA_CHOOSER_FOCUSED_ITEM_POSITION = "android.intent.extra.CHOOSER_FOCUSED_ITEM_POSITION";

    field public static final String EXTRA_CHOOSER_MODIFY_SHARE_ACTION = "android.intent.extra.CHOOSER_MODIFY_SHARE_ACTION";