Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52546e46 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

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

parents eadbe1db 53b854ad
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -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) {