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

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

Snap for 13503953 from 21c5f04f to 25Q3-release 

Change-Id: I4673e5f790fae139881106e6ab4b31c82555c071
parents f6211a90 21c5f04f

Ravenwood.bp

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ java_library { 
    name: "framework-minus-apex-for-host",

    installable: false,

    static_libs: ["framework-minus-apex"],

    srcs: [":framework-ravenwood-sources"],

    visibility: ["//frameworks/base/ravenwood"],

}

apct-tests/perftests/windowmanager/src/android/wm/RelayoutPerfTest.java

+2 −3
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase 
            mOutSurfaceControl = mView.getViewRootImpl().getSurfaceControl();

            mViewVisibility = visibilitySupplier;

            mOutRelayoutResult = new WindowRelayoutResult(mOutFrames, mOutMergedConfiguration,

                    mOutInsetsState, mOutControls);

                            mOutSurfaceControl, mOutInsetsState, mOutControls);

        }



        void runBenchmark(BenchmarkState state) throws RemoteException {
@@ -157,8 +157,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase 
            while (state.keepRunning()) {

                mRelayoutSeq++;

                session.relayout(mWindow, mParams, mWidth, mHeight, mViewVisibility.getAsInt(),

                        mFlags, mRelayoutSeq, 0 /* lastSyncSeqId */, mOutRelayoutResult,

                        mOutSurfaceControl);

                        mFlags, mRelayoutSeq, 0 /* lastSyncSeqId */, mOutRelayoutResult);

            }

        }

    }

apct-tests/perftests/windowmanager/src/android/wm/WindowAddRemovePerfTest.java

+8 −8
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ package android.wm; 
import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR;

import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;



import android.graphics.Rect;

import android.os.RemoteException;

import android.os.SystemClock;

import android.perftests.utils.ManualBenchmarkState;

import android.perftests.utils.ManualBenchmarkState.ManualBenchmarkTest;

import android.perftests.utils.PerfManualStatusReporter;

import android.util.MergedConfiguration;

import android.view.Display;

import android.view.IWindowSession;

import android.view.InputChannel;
@@ -34,8 +34,6 @@ import android.view.View; 
import android.view.WindowInsets;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;

import android.view.WindowRelayoutResult;

import android.window.ClientWindowFrames;



import androidx.test.filters.LargeTest;
@@ -87,9 +85,10 @@ public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase 
    private static class TestWindow extends BaseIWindow {

        final WindowManager.LayoutParams mLayoutParams = new WindowManager.LayoutParams();

        final int mRequestedVisibleTypes = WindowInsets.Type.defaultVisible();

        final WindowRelayoutResult mRelayoutResult = new WindowRelayoutResult(

                new ClientWindowFrames(), new MergedConfiguration(), new InsetsState(),

                new InsetsSourceControl.Array());

        final InsetsState mOutInsetsState = new InsetsState();

        final InsetsSourceControl.Array mOutControls = new InsetsSourceControl.Array();

        final Rect mOutAttachedFrame = new Rect();

        final float[] mOutSizeCompatScale = { 1f };



        TestWindow() {

            mLayoutParams.setTitle(TestWindow.class.getName());
@@ -106,8 +105,9 @@ public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase 
                final InputChannel inputChannel = new InputChannel();



                long startTime = SystemClock.elapsedRealtimeNanos();

                session.addToDisplay(this, mLayoutParams, View.VISIBLE, Display.DEFAULT_DISPLAY,

                        mRequestedVisibleTypes, inputChannel, mRelayoutResult);

                session.addToDisplay(this, mLayoutParams, View.VISIBLE,

                        Display.DEFAULT_DISPLAY, mRequestedVisibleTypes, inputChannel,

                        mOutInsetsState, mOutControls, mOutAttachedFrame, mOutSizeCompatScale);

                final long elapsedTimeNsOfAdd = SystemClock.elapsedRealtimeNanos() - startTime;

                state.addExtraResult("add", elapsedTimeNsOfAdd);

core/api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -54493,6 +54493,7 @@ package android.view { 
    method public boolean performContextClick();

    method public boolean performHapticFeedback(int);

    method public boolean performHapticFeedback(int, int);

    method @FlaggedApi("android.os.vibrator.haptic_feedback_with_custom_usage") public boolean performHapticFeedback(@NonNull android.os.vibrator.HapticFeedbackRequest);

    method public boolean performLongClick();

    method public boolean performLongClick(float, float);

    method @Nullable public android.view.ContentInfo performReceiveContent(@NonNull android.view.ContentInfo);
@@ -55056,10 +55057,12 @@ package android.view { 
    method public static int getKeyRepeatDelay();

    method public static int getKeyRepeatTimeout();

    method public static int getLongPressTimeout();

    method @FlaggedApi("android.companion.virtualdevice.flags.viewconfiguration_apis") public int getLongPressTimeoutMillis();

    method @Deprecated public static int getMaximumDrawingCacheSize();

    method @Deprecated public static int getMaximumFlingVelocity();

    method @Deprecated public static int getMinimumFlingVelocity();

    method public static int getMultiPressTimeout();

    method @FlaggedApi("android.companion.virtualdevice.flags.viewconfiguration_apis") public int getMultiPressTimeoutMillis();

    method public static int getPressedStateDuration();

    method @FloatRange(from=1.0) public float getScaledAmbiguousGestureMultiplier();

    method public int getScaledDoubleTapSlop();

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ package android { 
    field public static final String BIND_SATELLITE_SERVICE = "android.permission.BIND_SATELLITE_SERVICE";

    field public static final String BIND_SETTINGS_SUGGESTIONS_SERVICE = "android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE";

    field public static final String BIND_SOUND_TRIGGER_DETECTION_SERVICE = "android.permission.BIND_SOUND_TRIGGER_DETECTION_SERVICE";

    field @FlaggedApi("android.permission.flags.supervision_role_enabled") public static final String BIND_SUPERVISION_APP_SERVICE = "android.permission.BIND_SUPERVISION_APP_SERVICE";

    field public static final String BIND_TELEPHONY_DATA_SERVICE = "android.permission.BIND_TELEPHONY_DATA_SERVICE";

    field public static final String BIND_TELEPHONY_NETWORK_SERVICE = "android.permission.BIND_TELEPHONY_NETWORK_SERVICE";

    field public static final String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";
@@ -173,6 +174,7 @@ package android { 
    field @Deprecated public static final String HIDE_NON_SYSTEM_OVERLAY_WINDOWS = "android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS";

    field @FlaggedApi("android.xr.xr_manifest_entries") public static final String IMPORT_XR_ANCHOR = "android.permission.IMPORT_XR_ANCHOR";

    field public static final String INJECT_EVENTS = "android.permission.INJECT_EVENTS";

    field @FlaggedApi("com.android.hardware.input.create_virtual_keyboard_api") public static final String INJECT_KEY_EVENTS = "android.permission.INJECT_KEY_EVENTS";

    field @FlaggedApi("android.content.pm.sdk_dependency_installer") public static final String INSTALL_DEPENDENCY_SHARED_LIBRARIES = "android.permission.INSTALL_DEPENDENCY_SHARED_LIBRARIES";

    field public static final String INSTALL_DPC_PACKAGES = "android.permission.INSTALL_DPC_PACKAGES";

    field public static final String INSTALL_DYNAMIC_SYSTEM = "android.permission.INSTALL_DYNAMIC_SYSTEM";