diff options
| author | Craig Mautner <cmautner@google.com> | 2015-01-27 20:48:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-27 20:48:55 +0000 |
| commit | 5426e7ae93e0e728e0e12bc98a02c957d464cfe0 (patch) | |
| tree | 3c7f4d6c1c2f0cb5b382192ced040e3070777d11 /services | |
| parent | efe085ffbd97b6f9d1460a9642084a6d3be11797 (diff) | |
| parent | baf6bef001a582fea275bf891294cf1fe9d5472e (diff) | |
| download | frameworks_base-5426e7ae93e0e728e0e12bc98a02c957d464cfe0.zip frameworks_base-5426e7ae93e0e728e0e12bc98a02c957d464cfe0.tar.gz frameworks_base-5426e7ae93e0e728e0e12bc98a02c957d464cfe0.tar.bz2 | |
Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 1c2fbb1..a840ed9 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -8060,16 +8060,16 @@ public class WindowManagerService extends IWindowManager.Stub break; case TAP_OUTSIDE_STACK: { - int stackId; - synchronized (mWindowMap) { - stackId = ((DisplayContent)msg.obj).stackIdFromPoint(msg.arg1, msg.arg2); - } - if (stackId >= 0) { - try { - mActivityManager.setFocusedStack(stackId); - } catch (RemoteException e) { - } - } +// int stackId; +// synchronized (mWindowMap) { +// stackId = ((DisplayContent)msg.obj).stackIdFromPoint(msg.arg1, msg.arg2); +// } +// if (stackId >= 0) { +// try { +// mActivityManager.setFocusedStack(stackId); +// } catch (RemoteException e) { +// } +// } } break; case NOTIFY_ACTIVITY_DRAWN: |