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

Commit f88d081e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "IMS: Fix NPE for call extras"

parents 6d3db15f 5ecf4213

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

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public class CallReceiver extends BroadcastReceiver { 
                    isSkipSchemaParsing);

        }

        if (clientExtras == null) {

            clientExtras = Bundle.EMPTY;

            clientExtras = new Bundle();

        }



        final boolean isDefaultDialer = intent.getBooleanExtra(KEY_IS_DEFAULT_DIALER, false);
@@ -130,7 +130,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]",