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

Commit cd5cbe96 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev

parents 2a98c97e f0046911

src/com/android/server/telecom/CallReceiver.java

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class CallReceiver extends BroadcastReceiver { 
            clientExtras = intent.getBundleExtra(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS);

        }

        if (clientExtras == null) {

            clientExtras = Bundle.EMPTY;

            clientExtras = new Bundle();

        }



        final boolean isDefaultDialer = intent.getBooleanExtra(KEY_IS_DEFAULT_DIALER, false);
@@ -113,7 +113,7 @@ public class CallReceiver extends BroadcastReceiver { 
            clientExtras = intent.getBundleExtra(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS);

        }

        if (clientExtras == null) {

            clientExtras = Bundle.EMPTY;

            clientExtras = new Bundle();

        }



        Log.d(TAG, "Processing incoming call from connection service [%s]",