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

core/java/android/view/ViewRootImpl.java

@@ -3372,6 +3372,16 @@ public final class ViewRootImpl implements ViewParent,
             return super.getMessageName(message);
         }
 
+        @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) {