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

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

Snap for 13368745 from 6da6b524 to 25Q3-release 

Change-Id: I7454dc31d4dca6e51c904270f1b5b83fb97811ab
parents f7440f5b 6da6b524

AconfigFlags.bp

+15 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ aconfig_declarations_group { 
        "com.android.ranging.flags.ranging-aconfig-java-export",

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

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

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

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

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

        "configinfra_framework_flags_java_exported_lib",
@@ -1136,6 +1137,20 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Voice Interaction System Service

aconfig_declarations {

    name: "com.android.server.voiceinteraction.flags-aconfig",

    package: "com.android.server.voiceinteraction.flags",

    container: "system",

    srcs: ["services/voiceinteraction/flags/flags.aconfig"],

}



java_aconfig_library {

    name: "com.android.server.voiceinteraction.flags-java",

    aconfig_declarations: "com.android.server.voiceinteraction.flags-aconfig",

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

}



// Server Services Flags

aconfig_declarations {

    name: "com.android.server.flags.services-aconfig",

core/api/current.txt

+8 −1
Original line number Diff line number Diff line
@@ -44103,6 +44103,7 @@ package android.telecom { 
    field public static final String EVENT_CALL_REMOTELY_UNHELD = "android.telecom.event.CALL_REMOTELY_UNHELD";

    field @FlaggedApi("com.android.server.telecom.flags.call_sequencing_call_resume_failed") public static final String EVENT_CALL_RESUME_FAILED = "android.telecom.event.CALL_RESUME_FAILED";

    field public static final String EVENT_CALL_SWITCH_FAILED = "android.telecom.event.CALL_SWITCH_FAILED";

    field @FlaggedApi("com.android.server.telecom.flags.revert_disconnecting_during_merge") public static final String EVENT_DISCONNECT_FAILED = "android.telecom.event.DISCONNECT_FAILED";

    field public static final String EVENT_MERGE_COMPLETE = "android.telecom.event.MERGE_COMPLETE";

    field public static final String EVENT_MERGE_START = "android.telecom.event.MERGE_START";

    field public static final String EVENT_ON_HOLD_TONE_END = "android.telecom.event.ON_HOLD_TONE_END";
@@ -54439,6 +54440,7 @@ package android.view { 
    method public void requestPointerCapture();

    method public boolean requestRectangleOnScreen(android.graphics.Rect);

    method public boolean requestRectangleOnScreen(android.graphics.Rect, boolean);

    method @FlaggedApi("android.view.accessibility.request_rectangle_with_source") public boolean requestRectangleOnScreen(@NonNull android.graphics.Rect, boolean, int);

    method public final void requestUnbufferedDispatch(android.view.MotionEvent);

    method public final void requestUnbufferedDispatch(int);

    method @NonNull public final <T extends android.view.View> T requireViewById(@IdRes int);
@@ -54763,6 +54765,10 @@ package android.view { 
    field protected static final int[] PRESSED_SELECTED_WINDOW_FOCUSED_STATE_SET;

    field protected static final int[] PRESSED_STATE_SET;

    field protected static final int[] PRESSED_WINDOW_FOCUSED_STATE_SET;

    field @FlaggedApi("android.view.accessibility.request_rectangle_with_source") public static final int RECTANGLE_ON_SCREEN_REQUEST_SOURCE_INPUT_FOCUS = 3; // 0x3

    field @FlaggedApi("android.view.accessibility.request_rectangle_with_source") public static final int RECTANGLE_ON_SCREEN_REQUEST_SOURCE_SCROLL_ONLY = 1; // 0x1

    field @FlaggedApi("android.view.accessibility.request_rectangle_with_source") public static final int RECTANGLE_ON_SCREEN_REQUEST_SOURCE_TEXT_CURSOR = 2; // 0x2

    field @FlaggedApi("android.view.accessibility.request_rectangle_with_source") public static final int RECTANGLE_ON_SCREEN_REQUEST_SOURCE_UNDEFINED = 0; // 0x0

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final float REQUESTED_FRAME_RATE_CATEGORY_DEFAULT = (0.0f/0.0f);

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final float REQUESTED_FRAME_RATE_CATEGORY_HIGH = -4.0f;

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final float REQUESTED_FRAME_RATE_CATEGORY_LOW = -2.0f;
@@ -54871,7 +54877,7 @@ package android.view { 
    ctor public View.MeasureSpec();

    method public static int getMode(int);

    method public static int getSize(int);

    method public static int makeMeasureSpec(@IntRange(from=0, to=0x40000000 - 1) int, int);

    method public static int makeMeasureSpec(@IntRange(from=0, to=0x3fffffff) int, int);

    method public static String toString(int);

    field public static final int AT_MOST = -2147483648; // 0x80000000

    field public static final int EXACTLY = 1073741824; // 0x40000000
@@ -55316,6 +55322,7 @@ package android.view { 
    method public void recomputeViewAttributes(android.view.View);

    method public void requestChildFocus(android.view.View, android.view.View);

    method public boolean requestChildRectangleOnScreen(@NonNull android.view.View, android.graphics.Rect, boolean);

    method @FlaggedApi("android.view.accessibility.request_rectangle_with_source") public default boolean requestChildRectangleOnScreen(@NonNull android.view.View, @NonNull android.graphics.Rect, boolean, int);

    method public void requestDisallowInterceptTouchEvent(boolean);

    method public void requestFitSystemWindows();

    method public void requestLayout();

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6142,7 +6142,7 @@ package android.hardware.input { 
    method @NonNull public android.hardware.input.VirtualTouchEvent.Builder setAction(int);

    method @NonNull public android.hardware.input.VirtualTouchEvent.Builder setEventTimeNanos(long);

    method @NonNull public android.hardware.input.VirtualTouchEvent.Builder setMajorAxisSize(@FloatRange(from=0.0f) float);

    method @NonNull public android.hardware.input.VirtualTouchEvent.Builder setPointerId(@IntRange(from=0, to=0x10 - 1) int);

    method @NonNull public android.hardware.input.VirtualTouchEvent.Builder setPointerId(@IntRange(from=0, to=0xf) int);

    method @NonNull public android.hardware.input.VirtualTouchEvent.Builder setPressure(@FloatRange(from=0.0f) float);

    method @NonNull public android.hardware.input.VirtualTouchEvent.Builder setToolType(int);

    method @NonNull public android.hardware.input.VirtualTouchEvent.Builder setX(float);

core/java/android/app/ActivityThread.java

+11 −3
Original line number Diff line number Diff line
@@ -4821,7 +4821,11 @@ public final class ActivityThread extends ClientTransactionHandler 
        final SurfaceControl.Transaction transaction = new SurfaceControl.Transaction();

        transaction.hide(startingWindowLeash);

        startingWindowLeash.release();



        final boolean syncTransactionOnDraw =

                com.android.window.flags.Flags.splashScreenViewSyncTransaction();

        if (syncTransactionOnDraw) {

            decorView.getViewRootImpl().applyTransactionOnDraw(transaction);

        }

        view.syncTransferSurfaceOnDraw();



        if (decorView.isHardwareAccelerated()) {
@@ -4834,7 +4838,9 @@ public final class ActivityThread extends ClientTransactionHandler 
                                int syncResult, long frame) {

                            return didProduceBuffer -> {

                                Trace.instant(Trace.TRACE_TAG_VIEW, "transferSplashscreenView");

                                if (!syncTransactionOnDraw) {

                                    transaction.apply();

                                }

                                // Tell server we can remove the starting window after frame commit.

                                decorView.postOnAnimation(() ->

                                        reportSplashscreenViewShown(token, view));
@@ -4843,7 +4849,9 @@ public final class ActivityThread extends ClientTransactionHandler 
                    });

        } else {

            Trace.instant(Trace.TRACE_TAG_VIEW, "transferSplashscreenView_software");

            if (!syncTransactionOnDraw) {

                decorView.getViewRootImpl().applyTransactionOnDraw(transaction);

            }

            // Tell server we can remove the starting window after frame commit.

            decorView.postOnAnimation(() -> reportSplashscreenViewShown(token, view));

        }

core/java/android/app/ContextImpl.java

+11 −5
Original line number Diff line number Diff line
@@ -3431,9 +3431,7 @@ class ContextImpl extends Context { 
        // if this Context is not a WindowContext. WindowContext finalization is handled in

        // WindowContext class.

        try {

            if (!(com.android.window.flags.Flags.cleanUpWindowContextWithCleaner()

                    || com.android.window.flags.Flags.trackSystemUiContextBeforeWms())

                    && mToken instanceof WindowTokenClient && mOwnsToken) {

            if (!isCleanerEnabled() && mToken instanceof WindowTokenClient && mOwnsToken) {

                WindowTokenClientController.getInstance()

                        .detachIfNeeded((WindowTokenClient) mToken);

            }
@@ -3442,6 +3440,15 @@ class ContextImpl extends Context { 
        }

    }



    /**

     * Returns {@code true} if {@link WindowContext#registerCleaner} is enabled.

     */

    private static boolean isCleanerEnabled() {

        return com.android.window.flags.Flags.cleanUpWindowContextWithCleaner()

                // Cleaner only works on SystemUiContext or WindowContext.

                && com.android.window.flags.Flags.trackSystemUiContextBeforeWms();

    }



    @UnsupportedAppUsage

    static ContextImpl createSystemContext(ActivityThread mainThread) {

        LoadedApk packageInfo = new LoadedApk(mainThread);
@@ -3482,8 +3489,7 @@ class ContextImpl extends Context { 
        WindowTokenClientController.getInstance().attachToDisplayContent(token, displayId);

        context.mContextType = CONTEXT_TYPE_SYSTEM_OR_SYSTEM_UI;

        context.mOwnsToken = true;

        if (!com.android.window.flags.Flags.trackSystemUiContextBeforeWms()) {

            // #registerCleaner only support SystemUiContext or WindowContext.

        if (isCleanerEnabled()) {

            registerCleaner(systemUiContext);

        }

        return systemUiContext;