am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev

* commit '5426e7ae93e0e728e0e12bc98a02c957d464cfe0':
  Defer tap outside stack until multiwindows
This commit is contained in:
Craig Mautner
2015-01-27 20:54:42 +00:00
committed by Android Git Automerger

View File

@@ -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: