am 1c4d6a34: am 8b568d69: am 9e0cb2a3: am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev

* commit '1c4d6a34c760bc9bb0bfe9d5c139517325ccad4b':
  Fix NPE crash when mPhone is null
This commit is contained in:
Jay Shrauner
2014-09-23 21:43:09 +00:00
committed by Android Git Automerger

View File

@@ -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));