Merge "Revert "Added mockito-extended support to WmTests."" (827a7fca) · Commits · e / os / android_frameworks_base

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

+3 −12

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

	@Override		@Override
	public void setDefaultDisplay(DisplayContentInfo displayContentInfo) {		public void setDefaultDisplay(DisplayContentInfo displayContentInfo) {
	setDefaultDisplay(displayContentInfo.getDisplay(), displayContentInfo.getDisplayRotation());		mDefaultDisplay = displayContentInfo.getDisplay();
	}		mDefaultDisplayRotation = displayContentInfo.getDisplayRotation();

	@VisibleForTesting
	void setDefaultDisplay(Display display, DisplayRotation displayRotation) {
	mDefaultDisplay = display;
	mDefaultDisplayRotation = displayRotation;
	mDefaultDisplayPolicy = mDefaultDisplayRotation.getDisplayPolicy();		mDefaultDisplayPolicy = mDefaultDisplayRotation.getDisplayPolicy();
	mDefaultOrientationListener = mDefaultDisplayRotation.getOrientationListener();		mDefaultOrientationListener = mDefaultDisplayRotation.getOrientationListener();
	}		}
	@@ -2668,11 +2663,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {

	@Override		@Override
	public void onConfigurationChanged(DisplayContentInfo displayContentInfo) {		public void onConfigurationChanged(DisplayContentInfo displayContentInfo) {
	onConfigurationChanged(displayContentInfo.getDisplayRotation());		final DisplayRotation displayRotation = displayContentInfo.getDisplayRotation();
	}

	@VisibleForTesting
	void onConfigurationChanged(DisplayRotation displayRotation) {
	// TODO(multi-display): Define policy for secondary displays.		// TODO(multi-display): Define policy for secondary displays.
	if (!displayRotation.isDefaultDisplay) {		if (!displayRotation.isDefaultDisplay) {
	return;		return;

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

+6 −1

Original line number	Original line	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 */		/** 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;		private static final int MAX_TASK_IDS_PER_USER = UserHandle.PER_USER_RANGE;

	final ActivityTaskManagerService mService;		ActivityTaskManagerService mService;

	/** The historial list of recent tasks including inactive tasks */		/** The historial list of recent tasks including inactive tasks */
	RecentTasks mRecentTasks;		RecentTasks mRecentTasks;
	@@ -617,6 +617,11 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
	mHandler = new ActivityStackSupervisorHandler(looper);		mHandler = new ActivityStackSupervisorHandler(looper);
	}		}

			@VisibleForTesting
			void setService(ActivityTaskManagerService service) {
			mService = service;
			}

	@VisibleForTesting		@VisibleForTesting
	void setWindowContainerController(RootWindowContainerController controller) {		void setWindowContainerController(RootWindowContainerController controller) {
	mWindowContainerController = controller;		mWindowContainerController = controller;

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

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -341,8 +341,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	ActivityManagerInternal mAmInternal;		ActivityManagerInternal mAmInternal;
	UriGrantsManagerInternal mUgmInternal;		UriGrantsManagerInternal mUgmInternal;
	private PackageManagerInternal mPmInternal;		private PackageManagerInternal mPmInternal;
	@VisibleForTesting		private ActivityTaskManagerInternal mInternal;
	final ActivityTaskManagerInternal mInternal;
	PowerManagerInternal mPowerManagerInternal;		PowerManagerInternal mPowerManagerInternal;
	private UsageStatsManagerInternal mUsageStatsInternal;		private UsageStatsManagerInternal mUsageStatsInternal;

	@@ -644,7 +643,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	mSystemThread = ActivityThread.currentActivityThread();		mSystemThread = ActivityThread.currentActivityThread();
	mUiContext = mSystemThread.getSystemUiContext();		mUiContext = mSystemThread.getSystemUiContext();
	mLifecycleManager = new ClientLifecycleManager();		mLifecycleManager = new ClientLifecycleManager();
	mInternal = new LocalService();
	GL_ES_VERSION = SystemProperties.getInt("ro.opengles.version", GL_ES_VERSION_UNDEFINED);		GL_ES_VERSION = SystemProperties.getInt("ro.opengles.version", GL_ES_VERSION_UNDEFINED);
	}		}

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

	private void start() {		private void start() {
			mInternal = new LocalService();
	LocalServices.addService(ActivityTaskManagerInternal.class, mInternal);		LocalServices.addService(ActivityTaskManagerInternal.class, mInternal);
	}		}

services/tests/wmtests/Android.mk

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
	services.core \		services.core \
	androidx.test.runner \		androidx.test.runner \
	androidx.test.rules \		androidx.test.rules \
	mockito-target-extended-minus-junit4 \		mockito-target-minus-junit4 \
	platform-test-annotations \		platform-test-annotations \
	truth-prebuilt \		truth-prebuilt \
	testables \		testables \
	@@ -36,11 +36,6 @@ LOCAL_COMPATIBILITY_SUITE := device-tests

	LOCAL_CERTIFICATE := platform		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_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

	LOCAL_JACK_FLAGS := --multi-dex native		LOCAL_JACK_FLAGS := --multi-dex native

services/tests/wmtests/AndroidManifest.xml

+1 −1

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

	<application android:testOnly="true" android:debuggable="true">		<application android:testOnly="true">
	<activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityA" />		<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$ActivityB" />
	<activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityRequestedOrientationChange" />		<activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityRequestedOrientationChange" />