Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 52546e4

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

Change-Id: Ia1be80e54af4c04af0c33ef2d03f7fc4e8dfee84
This commit is contained in:
Michael Wright
2016-04-13 14:02:50 +00:00
committed by android-build-merger
parent 8c5b37fd5a 52546e4635
commit f58d81e640
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/ViewRootImpl.java
View File

@@ -3372,6 +3372,16 @@ public final class ViewRootImpl implements ViewParent,
return super.getMessageName(message); 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 @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
switch (msg.what) { switch (msg.what) {