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

Commit f58d81e6 authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

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

am: 52546e46

* commit '52546e46':
  Crash early when requesting a keyboard shortcut helper...

Change-Id: Ia1be80e54af4c04af0c33ef2d03f7fc4e8dfee84
parents 8c5b37fd 52546e46
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) {