diff options
author | Winson Chung <winsonc@google.com> | 2015-01-26 16:11:07 -0800 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2015-01-29 15:56:58 -0800 |
commit | d16c565a607de754379fe699a4def21bd0e3de2f (patch) | |
tree | f7267b6f364cca8e206a95a92a59f62830cdfb1c /services/core | |
parent | 3d62078498e8e9f7552d49f5f5e53ec339f4c2ce (diff) | |
download | frameworks_base-d16c565a607de754379fe699a4def21bd0e3de2f.zip frameworks_base-d16c565a607de754379fe699a4def21bd0e3de2f.tar.gz frameworks_base-d16c565a607de754379fe699a4def21bd0e3de2f.tar.bz2 |
Adding some debug controls to test multi-window.
Adding some preliminary controls to mirror the currently exposed api
to create new activity stacks, resize stacks, and to move tasks
between stacks.
Change-Id: I3fb51c248f53a1d4c4eb23ca9fb3a76888def1de
Diffstat (limited to 'services/core')
-rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 9 | ||||
-rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index df4b6d6..4c81b80 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -16077,6 +16077,15 @@ public final class ActivityManagerService extends ActivityManagerNative return mStackSupervisor.getFocusedStack(); } + @Override + public int getFocusedStackId() throws RemoteException { + ActivityStack focusedStack = getFocusedStack(); + if (focusedStack != null) { + return focusedStack.getStackId(); + } + return -1; + } + public Configuration getConfiguration() { Configuration ci; synchronized(this) { diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index b7728b3..03f1f71 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -3729,6 +3729,13 @@ public final class ActivityStackSupervisor implements DisplayListener { } @Override + public int getStackId() { + synchronized (mService) { + return mStackId; + } + } + + @Override public boolean injectEvent(InputEvent event) { final long origId = Binder.clearCallingIdentity(); try { |