diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-09-22 20:47:45 -0700 |
|---|---|---|
| committer | Jay Shrauner <shrauner@google.com> | 2014-09-22 20:47:45 -0700 |
| commit | 5e6162de625dfda047ff390bbc1ccf9a97db2261 (patch) | |
| tree | 08ce10d3c88aa1820649d57c8f00b272977c0e1d /telecomm/java | |
| parent | acc0d6de530fd8d2a938fa2c663036da0621be70 (diff) | |
| download | frameworks_base-5e6162de625dfda047ff390bbc1ccf9a97db2261.zip frameworks_base-5e6162de625dfda047ff390bbc1ccf9a97db2261.tar.gz frameworks_base-5e6162de625dfda047ff390bbc1ccf9a97db2261.tar.bz2 | |
Fix NPE crash when mPhone is null
Bug:17609710
Change-Id: Idb99feb6f15fd29809adde51cda1eb0d44e20101
Diffstat (limited to 'telecomm/java')
| -rw-r--r-- | telecomm/java/android/telecom/InCallService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java index fa12756..11da0f2 100644 --- a/telecomm/java/android/telecom/InCallService.java +++ b/telecomm/java/android/telecom/InCallService.java @@ -59,6 +59,10 @@ public abstract class InCallService extends Service { private final Handler mHandler = new Handler(Looper.getMainLooper()) { @Override public void handleMessage(Message msg) { + if (mPhone == null && msg.what != MSG_SET_IN_CALL_ADAPTER) { + return; + } + switch (msg.what) { case MSG_SET_IN_CALL_ADAPTER: mPhone = new Phone(new InCallAdapter((IInCallAdapter) msg.obj)); |