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

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

Snap for 14019536 from e6d8f6f9 to 25Q4-release 

Change-Id: I5f465019fd5b4edd7f907408c6809cbadae52fcb
parents 3cfb4823 e6d8f6f9

AconfigFlags.bp

+15 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ aconfig_declarations_group { 
        "libcore_exported_aconfig_flags_lib",

        "libcore_readonly_aconfig_flags_lib",

        "libgui_flags_java_lib",

        "mediaprovider_exported_aconfig_flag_lib",

        "networksecurity_exported_aconfig_flags_lib",

        "power_flags_lib",

        "sdk_sandbox_exported_flags_lib",
@@ -441,6 +442,7 @@ aconfig_declarations { 
    name: "android.nfc.flags-aconfig",

    package: "android.nfc",

    container: "system",

    exportable: true,

    srcs: ["nfc-non-updatable/flags/*.aconfig"],

}
@@ -461,6 +463,7 @@ java_aconfig_library { 
    name: "android.nfc.flags-aconfig-java",

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

    min_sdk_version: "34",

    mode: "exported",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",
@@ -1062,6 +1065,18 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "display_flags_lib-export",

    aconfig_declarations: "display_flags",

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

    min_sdk_version: "30",

    mode: "exported",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",

    ],

}



cc_aconfig_library {

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

    aconfig_declarations: "display_flags",

MULTIUSER_OWNERS

+3 −0
Original line number Diff line number Diff line 
# OWNERS of Multiuser related files

# Bug component: 71510

# Route bugs to: android-multiuser-triage@google.com



annabauza@google.com

bookatz@google.com

nykkumar@google.com

cmds/screencap/screencap.cpp

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ static int32_t flinger2bitmapFormat(aidl::android::hardware::graphics::common::P 
            return ANDROID_BITMAP_FORMAT_RGBA_1010102;

        case aidl::android::hardware::graphics::common::PixelFormat::BGRA_1010102:

            return ANDROID_BITMAP_FORMAT_BGRA_1010102;

        case aidl::android::hardware::graphics::common::PixelFormat::BGRX_1010102:

            return ANDROID_BITMAP_FORMAT_BGRX_1010102;

        default:

            return ANDROID_BITMAP_FORMAT_RGBA_8888;

    }

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -19253,6 +19253,7 @@ package android.hardware { 
    method public static boolean isSupported(@IntRange(from=1) int, @IntRange(from=1) int, int, @IntRange(from=1) int, long);

    method public void writeToParcel(android.os.Parcel, int);

    field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_bgra_1010102") public static final int BGRA_1010102 = 67; // 0x43

    field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_bgra_1010102") public static final int BGRX_1010102 = 68; // 0x44

    field public static final int BLOB = 33; // 0x21

    field @NonNull public static final android.os.Parcelable.Creator<android.hardware.HardwareBuffer> CREATOR;

    field public static final int DS_24UI8 = 50; // 0x32

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -954,6 +954,7 @@ package android.companion { 
    method @NonNull public android.companion.AssociationInfo.Builder setDeviceProfile(@Nullable String);

    method @NonNull public android.companion.AssociationInfo.Builder setDisplayName(@Nullable CharSequence);

    method @NonNull public android.companion.AssociationInfo.Builder setLastTimeConnected(long);

    method @FlaggedApi("android.companion.enable_data_sync") @NonNull public android.companion.AssociationInfo.Builder setMetadata(@NonNull android.os.PersistableBundle);

    method @NonNull public android.companion.AssociationInfo.Builder setNotifyOnDeviceNearby(boolean);

    method @FlaggedApi("android.companion.association_verification") @NonNull public android.companion.AssociationInfo.Builder setPackagesToNotify(@Nullable java.util.List<java.lang.String>);

    method @NonNull public android.companion.AssociationInfo.Builder setRevoked(boolean);