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

Commit f7a075b2 authored by Yorke Lee's avatar Yorke Lee Committed by The Android Automerger
Browse files

DO NOT MERGE Fix NPE in Telecom 

Use empty bundle instead of Bundle.EMPTY which is non mutable.

Bug: 19486064
Change-Id: Ia015a695c4e7849cb37b66c2ac73d8b1f58ac344
parent 787ab2d6

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]",