summaryrefslogtreecommitdiffstats
path: root/policy/src
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2015-02-03 17:51:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-03 17:51:31 +0000
commit5656036dd779fd81d89b755b871e85fa6d959c4f (patch)
tree215c35f3f8ceec9287e64c8d3ee858797ca1ffcd /policy/src
parent338026f59ac7dc8448bcbd5834882af35df03d94 (diff)
parentcd1b1ee39fbeaf7d95089c183b549b0853206ffd (diff)
downloadframeworks_base-5656036dd779fd81d89b755b871e85fa6d959c4f.zip
frameworks_base-5656036dd779fd81d89b755b871e85fa6d959c4f.tar.gz
frameworks_base-5656036dd779fd81d89b755b871e85fa6d959c4f.tar.bz2
am cd1b1ee3: Merge "Remove fall through for KEYCODE_VOICE_ASSIST" automerge: 84533ed automerge: 11c6f8b
* commit 'cd1b1ee39fbeaf7d95089c183b549b0853206ffd': Remove fall through for KEYCODE_VOICE_ASSIST
Diffstat (limited to 'policy/src')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index ac095e6..8320656 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -4747,6 +4747,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
msg.setAsynchronous(true);
msg.sendToTarget();
}
+ break;
}
}