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

Commit 0f839e53 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 12L"

parents 0c41c9bb 7e916e36

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ filegroup { 
        ":framework_native_aidl",

        ":gatekeeper_aidl",

        ":gsiservice_aidl",

        ":guiconstants_aidl",

        ":idmap2_aidl",

        ":idmap2_core_aidl",

        ":incidentcompanion_aidl",
@@ -319,6 +320,8 @@ java_defaults { 
        "modules-utils-synchronous-result-receiver",

        "modules-utils-os",

        "framework-permission-aidl-java",

        "spatializer-aidl-java",

        "audiopolicy-types-aidl-java",

    ],

}

apct-tests/perftests/autofill/AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,16 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.perftests.autofill">



    <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />

    <uses-permission android:name="android.permission.DEVICE_POWER" />

    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />

    <uses-permission android:name="android.permission.MANAGE_USERS" />

    <uses-permission android:name="android.permission.REAL_GET_TASKS" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />



    <application>

        <uses-library android:name="android.test.runner" />

        <activity android:name="android.perftests.utils.PerfTestActivity"

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

+4 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static org.hamcrest.core.Is.is; 


import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.window.TaskSnapshot;

import android.app.IActivityTaskManager;

import android.content.ComponentName;

import android.content.Context;
@@ -41,6 +40,7 @@ import android.util.Pair; 
import android.view.IRecentsAnimationController;

import android.view.IRecentsAnimationRunner;

import android.view.RemoteAnimationTarget;

import android.window.TaskSnapshot;



import androidx.test.filters.LargeTest;

import androidx.test.runner.lifecycle.Stage;
@@ -210,13 +210,14 @@ public class RecentsAnimationPerfTest extends WindowManagerPerfTestBase 
            }



            @Override

            public void onAnimationCanceled(TaskSnapshot taskSnapshot) throws RemoteException {

            public void onAnimationCanceled(int[] taskIds, TaskSnapshot[] taskSnapshots)

                    throws RemoteException {

                Assume.assumeNoException(

                        new AssertionError("onAnimationCanceled should not be called"));

            }



            @Override

            public void onTaskAppeared(RemoteAnimationTarget app) throws RemoteException {

            public void onTasksAppeared(RemoteAnimationTarget[] app) throws RemoteException {

                /* no-op */

            }

        };

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

+3 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.IWindowSession; 
import android.view.InputChannel;

import android.view.InsetsSourceControl;

import android.view.InsetsState;

import android.view.InsetsVisibilities;

import android.view.View;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;
@@ -82,7 +83,7 @@ public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase 


    private static class TestWindow extends BaseIWindow {

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

        final InsetsState mRequestedVisibility = new InsetsState();

        final InsetsVisibilities mRequestedVisibilities = new InsetsVisibilities();

        final InsetsState mOutInsetsState = new InsetsState();

        final InsetsSourceControl[] mOutControls = new InsetsSourceControl[0];
@@ -102,7 +103,7 @@ public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase 


                long startTime = SystemClock.elapsedRealtimeNanos();

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

                        Display.DEFAULT_DISPLAY, mRequestedVisibility, inputChannel,

                        Display.DEFAULT_DISPLAY, mRequestedVisibilities, inputChannel,

                        mOutInsetsState, mOutControls);

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

                state.addExtraResult("add", elapsedTimeNsOfAdd);

cmds/idmap2/OWNERS

+1 −0
Original line number Diff line number Diff line 
set noparent

toddke@google.com

patb@google.com

zyy@google.com