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

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

Snap for 13495399 from d68e06fe to 25Q3-release 

Change-Id: Idb60e0383a52699d415abf22dac264c36ed208b3
parents f279a0d1 d68e06fe

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);

config/preloaded-classes

+1 −0
Original line number Diff line number Diff line
@@ -16415,6 +16415,7 @@ java.util.ImmutableCollections$SetN$SetNIterator 
java.util.ImmutableCollections$SetN

java.util.ImmutableCollections$SubList

java.util.ImmutableCollections-IA

java.util.ImmutableCollections

java.util.InputMismatchException

java.util.Iterator

java.util.JumboEnumSet$EnumSetIterator

config/preloaded-classes-denylist

+0 −1
Original line number Diff line number Diff line
@@ -9,5 +9,4 @@ com.android.internal.jank.InteractionJankMonitor$InstanceHolder 
com.android.internal.util.LatencyTracker$SLatencyTrackerHolder

gov.nist.core.net.DefaultNetworkLayer

java.util.concurrent.ThreadLocalRandom

java.util.ImmutableCollections

sun.nio.fs.UnixChannelFactory

core/api/current.txt

+8 −5
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ package android { 
    field public static final String INTERACT_ACROSS_PROFILES = "android.permission.INTERACT_ACROSS_PROFILES";

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

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

    field @FlaggedApi("android.provider.launcher_data_access") public static final String LAUNCHER_DATA_ACCESS = "android.permission.LAUNCHER_DATA_ACCESS";

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

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

    field public static final String LOADER_USAGE_STATS = "android.permission.LOADER_USAGE_STATS";
@@ -244,6 +245,7 @@ package android { 
    field public static final String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS";

    field @Deprecated public static final String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";

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

    field @FlaggedApi("android.app.api_rich_ongoing_permission") public static final String POST_PROMOTED_NOTIFICATIONS = "android.permission.POST_PROMOTED_NOTIFICATIONS";

    field @Deprecated public static final String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";

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

    field public static final String PROVIDE_REMOTE_CREDENTIALS = "android.permission.PROVIDE_REMOTE_CREDENTIALS";
@@ -7126,6 +7128,7 @@ package android.app { 
    method public int getLightColor();

    method public int getLockscreenVisibility();

    method public CharSequence getName();

    method @FlaggedApi("android.service.notification.notification_get_original_importance") public int getOriginalImportance();

    method @Nullable public String getParentChannelId();

    method public android.net.Uri getSound();

    method @FlaggedApi("android.app.notification_channel_vibration_effect_api") @Nullable public android.os.VibrationEffect getVibrationEffect();
@@ -9861,13 +9864,13 @@ package android.app.usage { 
  public final class UsageStatsManager {

    method public int getAppStandbyBucket();

    method public boolean isAppInactive(String);

    method public java.util.Map<java.lang.String,android.app.usage.UsageStats> queryAndAggregateUsageStats(long, long);

    method public java.util.List<android.app.usage.ConfigurationStats> queryConfigurations(int, long, long);

    method public java.util.List<android.app.usage.EventStats> queryEventStats(int, long, long);

    method public android.app.usage.UsageEvents queryEvents(long, long);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.Map<java.lang.String,android.app.usage.UsageStats> queryAndAggregateUsageStats(long, long);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.ConfigurationStats> queryConfigurations(int, long, long);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.EventStats> queryEventStats(int, long, long);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public android.app.usage.UsageEvents queryEvents(long, long);

    method @FlaggedApi("android.app.usage.filter_based_event_query_api") @Nullable @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public android.app.usage.UsageEvents queryEvents(@NonNull android.app.usage.UsageEventsQuery);

    method public android.app.usage.UsageEvents queryEventsForSelf(long, long);

    method public java.util.List<android.app.usage.UsageStats> queryUsageStats(int, long, long);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.UsageStats> queryUsageStats(int, long, long);

    field @FlaggedApi("android.app.usage.user_interaction_type_api") public static final String EXTRA_EVENT_ACTION = "android.app.usage.extra.EVENT_ACTION";

    field @FlaggedApi("android.app.usage.user_interaction_type_api") public static final String EXTRA_EVENT_CATEGORY = "android.app.usage.extra.EVENT_CATEGORY";

    field public static final int INTERVAL_BEST = 4; // 0x4