commit 52546e46353f455d6a5bd070da6095868d7fc8bd
author Michael Wright <michaelwr@google.com> Wed Apr 13 13:58:15 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 13 13:58:16 2016 +0000
tree c0285a3f8840d26a7f7ecc11fb99fbc0a9f7cb70
parent eadbe1db7574ea037e3b0a644031bca114421155
parent 53b854ad7de5c22e03383b0f6538a493f601b7c9

Merge "Crash early when requesting a keyboard shortcut helper..." into nyc-dev

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index a324767..44b92e1 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3373,6 +3373,16 @@
         }
 
         @Override
+        public boolean sendMessageAtTime(Message msg, long uptimeMillis) {
+            if (msg.what == MSG_REQUEST_KEYBOARD_SHORTCUTS && msg.obj == null) {
+                // Debugging for b/27963013
+                throw new NullPointerException(
+                        "Attempted to call MSG_REQUEST_KEYBOARD_SHORTCUTS with null receiver:");
+            }
+            return super.sendMessageAtTime(msg, uptimeMillis);
+        }
+
+        @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
             case MSG_INVALIDATE: