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

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

Merge "Revert "Compilation Fix.""

parents b489294f 1b2ac6a1

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

+1 −20
Original line number Diff line number Diff line
@@ -90,28 +90,9 @@ public class CallActivity extends Activity { 
        if (Intent.ACTION_CALL.equals(action) ||

                Intent.ACTION_CALL_PRIVILEGED.equals(action) ||

                Intent.ACTION_CALL_EMERGENCY.equals(action)) {

            boolean isAddParticipant = intent.getBooleanExtra(

                    TelephonyProperties.ADD_PARTICIPANT_KEY, false);

            Log.d(this, "isAddparticipant = "+isAddParticipant);

            if (isAddParticipant) {

                String number = PhoneNumberUtils.getNumberFromIntent(intent, this);

                boolean isConferenceUri = intent.getBooleanExtra(

                        TelephonyProperties.EXTRA_DIAL_CONFERENCE_URI, false);

                if (!isConferenceUri) {

                    number = PhoneNumberUtils.stripSeparators(number);

                }

                CallsManager callsManager = CallsManager.getInstance();

                if (callsManager != null) {

                    callsManager.addParticipant(number);

                    callsManager.getInCallController().bringToForeground(false);

                } else {

                    Log.w(this, "CallsManager is null, can't process add Participant");

                }

            } else {

            processOutgoingCallIntent(intent);

        }

    }

    }



    private void verifyCallAction(Intent intent) {

        if (CallActivity.class.getName().equals(intent.getComponent().getClassName())) {