summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2015-01-27 21:00:29 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-01-27 21:00:29 +0000
commitbf6af73de6b24e53e9656da75b542d2f8caa77e6 (patch)
treeed758e78456ed5cd3a7b61bf5ba8ede68c2e72fc
parent45e6c8b31253d864d55c9835c76180a9b3d5bd59 (diff)
parent604a9e280e8273f6ed1f1a50724c0d510cf09bb0 (diff)
am 604a9e28: am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev
* commit '604a9e280e8273f6ed1f1a50724c0d510cf09bb0': Defer tap outside stack until multiwindows
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java20
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 14f50f3b890d..30bd7af13093 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -8085,16 +8085,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: