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

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

Snap for 12813595 from b46969e3 to 25Q2-release 

Change-Id: I61a5aa0b6cc45bc7222ca319dd0021ed17d10cf3
parents 96fe9368 b46969e3

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -57120,6 +57120,7 @@ package android.view.contentcapture { 
    method public void close();

    method @NonNull public final android.view.contentcapture.ContentCaptureSession createContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureContext);

    method public final void destroy();

    method @FlaggedApi("android.view.contentcapture.flags.ccapi_baklava_enabled") public void flush();

    method @Nullable public final android.view.contentcapture.ContentCaptureContext getContentCaptureContext();

    method @NonNull public final android.view.contentcapture.ContentCaptureSessionId getContentCaptureSessionId();

    method @NonNull public android.view.autofill.AutofillId newAutofillId(@NonNull android.view.autofill.AutofillId, long);

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -19091,6 +19091,7 @@ package android.view.contentcapture { 
    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.view.contentcapture.ContentCaptureEvent> CREATOR;

    field public static final int TYPE_CONTEXT_UPDATED = 6; // 0x6

    field @FlaggedApi("android.view.contentcapture.flags.ccapi_baklava_enabled") public static final int TYPE_SESSION_FLUSH = 11; // 0xb

    field public static final int TYPE_SESSION_PAUSED = 8; // 0x8

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

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

core/java/android/hardware/display/DisplayManagerGlobal.java

+20 −13
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public final class DisplayManagerGlobal { 


    @IntDef(prefix = {"EVENT_DISPLAY_"}, flag = true, value = {

            EVENT_DISPLAY_ADDED,

            EVENT_DISPLAY_CHANGED,

            EVENT_DISPLAY_BASIC_CHANGED,

            EVENT_DISPLAY_REMOVED,

            EVENT_DISPLAY_BRIGHTNESS_CHANGED,

            EVENT_DISPLAY_HDR_SDR_RATIO_CHANGED,
@@ -119,7 +119,8 @@ public final class DisplayManagerGlobal { 
    public @interface DisplayEvent {}



    public static final int EVENT_DISPLAY_ADDED = 1;

    public static final int EVENT_DISPLAY_CHANGED = 2;

    public static final int EVENT_DISPLAY_BASIC_CHANGED = 2;



    public static final int EVENT_DISPLAY_REMOVED = 3;

    public static final int EVENT_DISPLAY_BRIGHTNESS_CHANGED = 4;

    public static final int EVENT_DISPLAY_HDR_SDR_RATIO_CHANGED = 5;
@@ -130,7 +131,7 @@ public final class DisplayManagerGlobal { 


    @LongDef(prefix = {"INTERNAL_EVENT_FLAG_"}, flag = true, value = {

            INTERNAL_EVENT_FLAG_DISPLAY_ADDED,

            INTERNAL_EVENT_FLAG_DISPLAY_CHANGED,

            INTERNAL_EVENT_FLAG_DISPLAY_BASIC_CHANGED,

            INTERNAL_EVENT_FLAG_DISPLAY_REMOVED,

            INTERNAL_EVENT_FLAG_DISPLAY_BRIGHTNESS_CHANGED,

            INTERNAL_EVENT_FLAG_DISPLAY_HDR_SDR_RATIO_CHANGED,
@@ -143,7 +144,7 @@ public final class DisplayManagerGlobal { 
    public @interface InternalEventFlag {}



    public static final long INTERNAL_EVENT_FLAG_DISPLAY_ADDED = 1L << 0;

    public static final long INTERNAL_EVENT_FLAG_DISPLAY_CHANGED = 1L << 1;

    public static final long INTERNAL_EVENT_FLAG_DISPLAY_BASIC_CHANGED = 1L << 1;

    public static final long INTERNAL_EVENT_FLAG_DISPLAY_REMOVED = 1L << 2;

    public static final long INTERNAL_EVENT_FLAG_DISPLAY_BRIGHTNESS_CHANGED = 1L << 3;

    public static final long INTERNAL_EVENT_FLAG_DISPLAY_HDR_SDR_RATIO_CHANGED = 1L << 4;
@@ -485,7 +486,7 @@ public final class DisplayManagerGlobal { 
        // There can be racing condition between DMS and WMS callbacks, so force triggering the

        // listener to make sure the client can get the onDisplayChanged callback even if

        // DisplayInfo is not changed (Display read from both DisplayInfo and WindowConfiguration).

        handleDisplayEvent(displayId, EVENT_DISPLAY_CHANGED, true /* forceUpdate */);

        handleDisplayEvent(displayId, EVENT_DISPLAY_BASIC_CHANGED, true /* forceUpdate */);

    }



    private static Looper getLooperForHandler(@Nullable Handler handler) {
@@ -518,7 +519,8 @@ public final class DisplayManagerGlobal { 
        }

        if (mDispatchNativeCallbacks) {

            mask |= INTERNAL_EVENT_FLAG_DISPLAY_ADDED

                    | INTERNAL_EVENT_FLAG_DISPLAY_CHANGED

                    | INTERNAL_EVENT_FLAG_DISPLAY_BASIC_CHANGED

                    | INTERNAL_EVENT_FLAG_DISPLAY_REFRESH_RATE

                    | INTERNAL_EVENT_FLAG_DISPLAY_REMOVED;

        }

        if (!mTopologyListeners.isEmpty()) {
@@ -571,7 +573,8 @@ public final class DisplayManagerGlobal { 
            }



            info = getDisplayInfoLocked(displayId);

            if (event == EVENT_DISPLAY_CHANGED && mDispatchNativeCallbacks) {

            if ((event == EVENT_DISPLAY_BASIC_CHANGED

                    || event == EVENT_DISPLAY_REFRESH_RATE_CHANGED) && mDispatchNativeCallbacks) {

                // Choreographer only supports a single display, so only dispatch refresh rate

                // changes for the default display.

                if (displayId == Display.DEFAULT_DISPLAY) {
@@ -1492,9 +1495,9 @@ public final class DisplayManagerGlobal { 
                        mListener.onDisplayAdded(displayId);

                    }

                    break;

                case EVENT_DISPLAY_CHANGED:

                    if ((mInternalEventFlagsMask & INTERNAL_EVENT_FLAG_DISPLAY_CHANGED)

                            != 0) {

                case EVENT_DISPLAY_BASIC_CHANGED:

                    if ((mInternalEventFlagsMask

                            & INTERNAL_EVENT_FLAG_DISPLAY_BASIC_CHANGED) != 0) {

                        if (info != null && (forceUpdate || !info.equals(mDisplayInfo))) {

                            if (extraLogging()) {

                                Slog.i(TAG, "Sending onDisplayChanged: Display Changed. Info: "
@@ -1691,8 +1694,8 @@ public final class DisplayManagerGlobal { 
        switch (event) {

            case EVENT_DISPLAY_ADDED:

                return "ADDED";

            case EVENT_DISPLAY_CHANGED:

                return "CHANGED";

            case EVENT_DISPLAY_BASIC_CHANGED:

                return "BASIC_CHANGED";

            case EVENT_DISPLAY_REMOVED:

                return "REMOVED";

            case EVENT_DISPLAY_BRIGHTNESS_CHANGED:
@@ -1763,7 +1766,11 @@ public final class DisplayManagerGlobal { 
        }



        if ((eventFlags & DisplayManager.EVENT_FLAG_DISPLAY_CHANGED) != 0) {

            baseEventMask |= INTERNAL_EVENT_FLAG_DISPLAY_CHANGED;

            // For backward compatibility, a client subscribing to

            // DisplayManager.EVENT_FLAG_DISPLAY_CHANGED will be enrolled to both Basic and

            // RR changes

            baseEventMask |= INTERNAL_EVENT_FLAG_DISPLAY_BASIC_CHANGED

                    | INTERNAL_EVENT_FLAG_DISPLAY_REFRESH_RATE;

        }



        if ((eventFlags

core/java/android/net/thread/flags.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ flag { 
    is_exported: true

    namespace: "thread_network"

    description: "Controls whether the Android Thread feature is enabled"

    bug: "301473012"

    bug: "384596973"

}

core/java/android/view/Display.java

+3 −1
Original line number Diff line number Diff line
@@ -1597,7 +1597,9 @@ public final class Display { 
            // Although we only care about the HDR/SDR ratio changing, that can also come in the

            // form of the larger DISPLAY_CHANGED event

            mGlobal.registerDisplayListener(toRegister, executor,

                    DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_CHANGED

                    DisplayManagerGlobal

                                    .INTERNAL_EVENT_FLAG_DISPLAY_BASIC_CHANGED

                            | DisplayManagerGlobal.INTERNAL_EVENT_FLAG_DISPLAY_REFRESH_RATE

                            | DisplayManagerGlobal

                                    .INTERNAL_EVENT_FLAG_DISPLAY_HDR_SDR_RATIO_CHANGED,

                    ActivityThread.currentPackageName());