summaryrefslogtreecommitdiff
path: root/core/java/android/app/IActivityManager.java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-12-16 16:14:02 -0800
committerCraig Mautner <cmautner@google.com>2014-01-06 08:51:21 -0800
commite0a3884cb627efc650e19fbe76b1b3343468cf57 (patch)
tree5cdfc0e202bb18c314138dea3f1328c3f6e55ba0 /core/java/android/app/IActivityManager.java
parent02d5df1066c07972e1169a338e5fba16c86cc51b (diff)
Extend stack management to other displays.
- Abandon ActivityContainer.startActivity() in favor of IActivityManager.startActivityAsUserInContainer(). - Modify Am to test starting an activity on a container. - Create a DisplayContext as the base context if the activity token is on a different display. - Test for home display in more cases when manipulating home stack. - Rename mDisplayInfos => mActivityDisplays. - Create new method for moving task to front of stack regardless of which display it is on. Change-Id: I4fcb83ae844c5839ee3e2722229623d1a80ed921
Diffstat (limited to 'core/java/android/app/IActivityManager.java')
-rw-r--r--core/java/android/app/IActivityManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index 4be194597b6f..3ed3f7bdf20e 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -410,6 +410,9 @@ public interface IActivityManager extends IInterface {
public IActivityContainer createActivityContainer(IBinder parentActivityToken,
IActivityContainerCallback callback) throws RemoteException;
+ public IActivityContainer getEnclosingActivityContainer(IBinder activityToken)
+ throws RemoteException;
+
public IBinder getHomeActivityToken() throws RemoteException;
/*
@@ -699,4 +702,5 @@ public interface IActivityManager extends IInterface {
int GET_PERSISTED_URI_PERMISSIONS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+181;
int APP_NOT_RESPONDING_VIA_PROVIDER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+182;
int GET_HOME_ACTIVITY_TOKEN_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+183;
+ int GET_ACTIVITY_CONTAINER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+184;
}