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

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

Snap for 13566433 from edef3e0f to 25Q3-release 

Change-Id: Ieab0fd206004a5a21e1440516771283e752e90d2
parents d81adc3f edef3e0f

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

+3 −2
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,

                            mOutSurfaceControl, mOutInsetsState, mOutControls);

                    mOutInsetsState, mOutControls);

        }



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

                mRelayoutSeq++;

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

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

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

                        mOutSurfaceControl);

            }

        }

    }

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,6 +34,8 @@ 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;
@@ -85,10 +87,9 @@ 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 InsetsState mOutInsetsState = new InsetsState();

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

        final Rect mOutAttachedFrame = new Rect();

        final float[] mOutSizeCompatScale = { 1f };

        final WindowRelayoutResult mRelayoutResult = new WindowRelayoutResult(

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

                new InsetsSourceControl.Array());



        TestWindow() {

            mLayoutParams.setTitle(TestWindow.class.getName());
@@ -105,9 +106,8 @@ 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,

                        mOutInsetsState, mOutControls, mOutAttachedFrame, mOutSizeCompatScale);

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

                        mRequestedVisibleTypes, inputChannel, mRelayoutResult);

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

                state.addExtraResult("add", elapsedTimeNsOfAdd);

boot/boot-image-profile-extra.txt

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ HSPLandroid/graphics/Color;->luminance()F 
# to include all hot MessageQueue methods, and the inner classes are profiled

# as well.

HSPLandroid/os/MessageQueue;->*

HSPLandroid/os/MessageQueue$EnqueueOrder;->*

HSPLandroid/os/MessageQueue$FileDescriptorRecord;->*

HSPLandroid/os/MessageQueue$IdleHandler;->*

HSPLandroid/os/MessageQueue$MessageCompare;->*

boot/preloaded-classes

+1 −0
Original line number Diff line number Diff line
@@ -6602,6 +6602,7 @@ android.os.Looper 
android.os.MemoryFile

android.os.Message$1

android.os.Message

android.os.MessageQueue$EnqueueOrder

android.os.MessageQueue$FileDescriptorRecord

android.os.MessageQueue$IdleHandler

android.os.MessageQueue$MatchAllFutureMessages

config/preloaded-classes

+1 −0
Original line number Diff line number Diff line
@@ -6607,6 +6607,7 @@ android.os.Looper 
android.os.MemoryFile

android.os.Message$1

android.os.Message

android.os.MessageQueue$EnqueueOrder

android.os.MessageQueue$FileDescriptorRecord

android.os.MessageQueue$IdleHandler

android.os.MessageQueue$MatchAllFutureMessages