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

Commit 17558f9f authored by Natiq Ahmed's avatar Natiq Ahmed
Browse files

Compilation Fix. 

Conflicts:
	src/com/android/server/telecom/CallActivity.java
Change-Id: I2cf179a366c95ac61318ad619218616eaf85a2e6
parent 0f4aae96

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

+20 −3
Original line number Diff line number Diff line
@@ -90,9 +90,26 @@ 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);

        } else if (TelecomManager.ACTION_INCOMING_CALL.equals(action)) {

            processIncomingCallIntent(intent);

            }

        }

    }