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

Commit 6552c64d authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Added mockito-extended support to WmTests."

parents 9237d02c 953fd225

services/core/java/com/android/server/policy/PhoneWindowManager.java

+12 −3
Original line number Diff line number Diff line
@@ -1925,8 +1925,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    @Override

    public void setDefaultDisplay(DisplayContentInfo displayContentInfo) {

        mDefaultDisplay = displayContentInfo.getDisplay();

        mDefaultDisplayRotation = displayContentInfo.getDisplayRotation();

        setDefaultDisplay(displayContentInfo.getDisplay(), displayContentInfo.getDisplayRotation());

    }



    @VisibleForTesting

    void setDefaultDisplay(Display display, DisplayRotation displayRotation) {

        mDefaultDisplay = display;

        mDefaultDisplayRotation = displayRotation;

        mDefaultDisplayPolicy = mDefaultDisplayRotation.getDisplayPolicy();

        mDefaultOrientationListener = mDefaultDisplayRotation.getOrientationListener();

    }
@@ -2663,7 +2668,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    @Override

    public void onConfigurationChanged(DisplayContentInfo displayContentInfo) {

        final DisplayRotation displayRotation = displayContentInfo.getDisplayRotation();

        onConfigurationChanged(displayContentInfo.getDisplayRotation());

    }



    @VisibleForTesting

    void onConfigurationChanged(DisplayRotation displayRotation) {

        // TODO(multi-display): Define policy for secondary displays.

        if (!displayRotation.isDefaultDisplay) {

            return;

services/core/java/com/android/server/wm/ActivityStackSupervisor.java

+1 −6
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
    /** The number of distinct task ids that can be assigned to the tasks of a single user */

    private static final int MAX_TASK_IDS_PER_USER = UserHandle.PER_USER_RANGE;



    ActivityTaskManagerService mService;

    final ActivityTaskManagerService mService;



    /** The historial list of recent tasks including inactive tasks */

    RecentTasks mRecentTasks;
@@ -617,11 +617,6 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
        mHandler = new ActivityStackSupervisorHandler(looper);

    }



    @VisibleForTesting

    void setService(ActivityTaskManagerService service) {

        mService = service;

    }



    @VisibleForTesting

    void setWindowContainerController(RootWindowContainerController controller) {

        mWindowContainerController = controller;

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+4 −3
Original line number Diff line number Diff line
@@ -341,7 +341,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
    ActivityManagerInternal mAmInternal;

    UriGrantsManagerInternal mUgmInternal;

    private PackageManagerInternal mPmInternal;

    private ActivityTaskManagerInternal mInternal;

    @VisibleForTesting

    final ActivityTaskManagerInternal mInternal;

    PowerManagerInternal mPowerManagerInternal;

    private UsageStatsManagerInternal mUsageStatsInternal;
@@ -643,6 +644,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        mSystemThread = ActivityThread.currentActivityThread();

        mUiContext = mSystemThread.getSystemUiContext();

        mLifecycleManager = new ClientLifecycleManager();

        mInternal = new LocalService();

        GL_ES_VERSION = SystemProperties.getInt("ro.opengles.version", GL_ES_VERSION_UNDEFINED);

    }
@@ -893,7 +895,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
    }



    private void start() {

        mInternal = new LocalService();

        LocalServices.addService(ActivityTaskManagerInternal.class, mInternal);

    }

services/tests/wmtests/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    services.core \

    androidx.test.runner \

    androidx.test.rules \

    mockito-target-minus-junit4 \

    mockito-target-extended-minus-junit4 \

    platform-test-annotations \

    truth-prebuilt \

    testables \
@@ -36,6 +36,11 @@ LOCAL_COMPATIBILITY_SUITE := device-tests 


LOCAL_CERTIFICATE := platform



# These are not normally accessible from apps so they must be explicitly included.

LOCAL_JNI_SHARED_LIBRARIES := \

    libdexmakerjvmtiagent \

    libstaticjvmtiagent \



LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_JACK_FLAGS := --multi-dex native

services/tests/wmtests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
    <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />

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



    <application android:testOnly="true">

    <application android:testOnly="true" android:debuggable="true">

        <activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityA" />

        <activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityB" />

        <activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityRequestedOrientationChange" />