Add new methods to ITaskStackListener
Refactor task change notification logic into a separate class
TaskChangeNotificationController.
Add ActivityManagerService.unregisterTaskStackChangedListener
Add a no-op implementation that clients can subclass to avoid
having to reimplement all new methods when they are added.
Add new methods:
onTaskAdded
onTaskRemoved
onTaskMovedToFront
onTaskDescriptionChanged
onActivityRequestedOrientationChanged
onTaskFinishing
Design doc:
https://docs.google.com/document/d/1IgWZ44rKe9k1CzkjP2Mohv12OgRD1FxH8oLAyzhvCY4/edit#heading=h.yhzl6os0dbo5
Cherry-picked from I8302d6d3baf1ac1ca928765fe203091b9fab4070
Bug: 32277482
Test: Verify that callbacks are called in dummy implementations
Change-Id: I2ac2b870147ef049f3ee05fc5916c99332334526
diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml
index 3548f28..4165467 100644
--- a/services/tests/servicestests/AndroidManifest.xml
+++ b/services/tests/servicestests/AndroidManifest.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,6 +30,7 @@
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
<uses-permission android:name="android.permission.REAL_GET_TASKS" />
<uses-permission android:name="android.permission.GET_DETAILED_TASKS" />
+ <uses-permission android:name="android.permission.REORDER_TASKS" />
<uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" />
<uses-permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY" />
<uses-permission android:name="android.permission.MODIFY_NETWORK_ACCOUNTING" />
@@ -159,6 +160,9 @@
<activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityA" />
<activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityB" />
+ <activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityRequestedOrientationChange" />
+ <activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityTaskChangeCallbacks" />
+ <activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityTaskDescriptionChange" />
</application>
diff --git a/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java b/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java
index b47d17e..c9c691d 100644
--- a/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java
@@ -17,21 +17,33 @@
package com.android.server.am;
import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import android.app.Activity;
+import android.app.ActivityManager.TaskDescription;
import android.app.ActivityManagerNative;
import android.app.IActivityManager;
import android.app.ITaskStackListener;
+import android.app.Instrumentation.ActivityMonitor;
+import android.app.TaskStackListener;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.res.Resources.Theme;
import android.os.RemoteException;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
import android.support.test.uiautomator.UiDevice;
-
+import android.text.TextUtils;
+import android.util.Pair;
import com.android.internal.annotations.GuardedBy;
-
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -39,9 +51,10 @@
@MediumTest
@RunWith(AndroidJUnit4.class)
-public class TaskStackChangedListenerTest extends ITaskStackListener.Stub {
+public class TaskStackChangedListenerTest {
private IActivityManager mService;
+ private ITaskStackListener mTaskStackListener;
private static final Object sLock = new Object();
@GuardedBy("sLock")
@@ -51,11 +64,25 @@
@Before
public void setUp() throws Exception {
mService = ActivityManagerNative.getDefault();
- mService.registerTaskStackListener(this);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ mService.unregisterTaskStackListener(mTaskStackListener);
+ mTaskStackListener = null;
}
@Test
public void testTaskStackChanged_afterFinish() throws Exception {
+ registerTaskStackChangedListener(new TaskStackListener() {
+ @Override
+ public void onTaskStackChanged() throws RemoteException {
+ synchronized (sLock) {
+ sTaskStackChangedCalled = true;
+ }
+ }
+ });
+
Context ctx = InstrumentationRegistry.getContext();
ctx.startActivity(new Intent(ctx, ActivityA.class));
UiDevice.getInstance(getInstrumentation()).waitForIdle();
@@ -65,31 +92,151 @@
Assert.assertTrue(sActivityBResumed);
}
- @Override
- public void onTaskStackChanged() throws RemoteException {
- synchronized (sLock) {
- sTaskStackChangedCalled = true;
+ @Test
+ public void testTaskDescriptionChanged() throws Exception {
+ final Object[] params = new Object[2];
+ final CountDownLatch latch = new CountDownLatch(1);
+ registerTaskStackChangedListener(new TaskStackListener() {
+ int taskId = -1;
+
+ @Override
+ public void onTaskCreated(int taskId, ComponentName componentName)
+ throws RemoteException {
+ this.taskId = taskId;
+ }
+ @Override
+ public void onTaskDescriptionChanged(int taskId, TaskDescription td)
+ throws RemoteException {
+ if (this.taskId == taskId && !TextUtils.isEmpty(td.getLabel())) {
+ params[0] = taskId;
+ params[1] = td;
+ latch.countDown();
+ }
+ }
+ });
+ final Activity activity = startTestActivity(ActivityTaskDescriptionChange.class);
+ waitForCallback(latch);
+ assertEquals(activity.getTaskId(), params[0]);
+ assertEquals("Test Label", ((TaskDescription) params[1]).getLabel());
+ }
+
+ @Test
+ public void testActivityRequestedOrientationChanged() throws Exception {
+ final int[] params = new int[2];
+ final CountDownLatch latch = new CountDownLatch(1);
+ registerTaskStackChangedListener(new TaskStackListener() {
+ @Override
+ public void onActivityRequestedOrientationChanged(int taskId,
+ int requestedOrientation) {
+ params[0] = taskId;
+ params[1] = requestedOrientation;
+ latch.countDown();
+ }
+ });
+ final Activity activity = startTestActivity(ActivityRequestedOrientationChange.class);
+ waitForCallback(latch);
+ assertEquals(activity.getTaskId(), params[0]);
+ assertEquals(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, params[1]);
+ }
+
+ @Test
+ /**
+ * Tests for onTaskCreated, onTaskMovedToFront, onTaskRemoved and onTaskRemovalStarted.
+ */
+ public void testTaskChangeCallBacks() throws Exception {
+ final Object[] params = new Object[2];
+ final CountDownLatch taskCreatedLaunchLatch = new CountDownLatch(1);
+ final CountDownLatch taskMovedToFrontLatch = new CountDownLatch(1);
+ final CountDownLatch taskRemovedLatch = new CountDownLatch(1);
+ final CountDownLatch taskRemovalStartedLatch = new CountDownLatch(1);
+ final CountDownLatch onDetachedFromWindowLatch = new CountDownLatch(1);
+ registerTaskStackChangedListener(new TaskStackListener() {
+ @Override
+ public void onTaskCreated(int taskId, ComponentName componentName)
+ throws RemoteException {
+ params[0] = taskId;
+ params[1] = componentName;
+ taskCreatedLaunchLatch.countDown();
+ }
+
+ @Override
+ public void onTaskMovedToFront(int taskId) throws RemoteException {
+ params[0] = taskId;
+ taskMovedToFrontLatch.countDown();
+ }
+
+ @Override
+ public void onTaskRemovalStarted(int taskId) {
+ params[0] = taskId;
+ taskRemovalStartedLatch.countDown();
+ }
+
+ @Override
+ public void onTaskRemoved(int taskId) throws RemoteException {
+ params[0] = taskId;
+ taskRemovedLatch.countDown();
+ }
+ });
+
+ final ActivityTaskChangeCallbacks activity =
+ (ActivityTaskChangeCallbacks) startTestActivity(ActivityTaskChangeCallbacks.class);
+ final int id = activity.getTaskId();
+
+ // Test for onTaskCreated.
+ waitForCallback(taskCreatedLaunchLatch);
+ assertEquals(id, params[0]);
+ ComponentName componentName = (ComponentName) params[1];
+ assertEquals(ActivityTaskChangeCallbacks.class.getName(), componentName.getClassName());
+
+ // Test for onTaskMovedToFront.
+ assertEquals(1, taskMovedToFrontLatch.getCount());
+ mService.moveTaskToFront(id, 0, null);
+ waitForCallback(taskMovedToFrontLatch);
+ assertEquals(activity.getTaskId(), params[0]);
+
+ // Test for onTaskRemovalStarted.
+ assertEquals(1, taskRemovalStartedLatch.getCount());
+ activity.finishAndRemoveTask();
+ waitForCallback(taskRemovalStartedLatch);
+ // onTaskRemovalStarted happens before the activity's window is removed.
+ assertFalse(activity.onDetachedFromWindowCalled);
+ assertEquals(id, params[0]);
+
+ // Test for onTaskRemoved.
+ assertEquals(1, taskRemovedLatch.getCount());
+ waitForCallback(taskRemovedLatch);
+ assertEquals(id, params[0]);
+ assertTrue(activity.onDetachedFromWindowCalled);
+ }
+
+ /**
+ * Starts the provided activity and returns the started instance.
+ */
+ private Activity startTestActivity(Class<?> activityClass) {
+ final Context context = InstrumentationRegistry.getContext();
+ final ActivityMonitor monitor =
+ new ActivityMonitor(activityClass.getName(), null, false);
+ InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
+ context.startActivity(new Intent(context, activityClass));
+ final Activity activity = monitor.waitForActivityWithTimeout(1000);
+ if (activity == null) {
+ throw new RuntimeException("Timed out waiting for Activity");
}
+ return activity;
}
- @Override
- public void onActivityPinned() throws RemoteException {
+ private void registerTaskStackChangedListener(ITaskStackListener listener) throws Exception {
+ mTaskStackListener = listener;
+ mService.registerTaskStackListener(listener);
}
- @Override
- public void onPinnedActivityRestartAttempt() throws RemoteException {
- }
-
- @Override
- public void onPinnedStackAnimationEnded() throws RemoteException {
- }
-
- @Override
- public void onActivityForcedResizable(String packageName, int taskId) throws RemoteException {
- }
-
- @Override
- public void onActivityDismissingDockedStack() throws RemoteException {
+ private void waitForCallback(CountDownLatch latch) {
+ try {
+ final boolean result = latch.await(2, TimeUnit.SECONDS);
+ if (!result) {
+ throw new RuntimeException("Timed out waiting for task stack change notification");
+ }
+ }catch (InterruptedException e) {}
}
public static class ActivityA extends Activity {
@@ -120,4 +267,31 @@
finish();
}
}
+
+ public static class ActivityRequestedOrientationChange extends Activity {
+ @Override
+ protected void onPostResume() {
+ super.onPostResume();
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ finish();
+ }
+ }
+
+ public static class ActivityTaskDescriptionChange extends Activity {
+ @Override
+ protected void onPostResume() {
+ super.onPostResume();
+ setTaskDescription(new TaskDescription("Test Label"));
+ finish();
+ }
+ }
+
+ public static class ActivityTaskChangeCallbacks extends Activity {
+ public boolean onDetachedFromWindowCalled = false;;
+
+ @Override
+ public void onDetachedFromWindow() {
+ onDetachedFromWindowCalled = true;
+ }
+ }
}