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

Commit 46eb52cf authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Ensure ConnectionService death triggers disconnect tone." am: 84135b5b am: 1641579e 

am: fe986e18

Change-Id: Iaeb9df1db5143447159f4535ad5b27ffc405bc21
parents edc58e56 fe986e18

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

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.media.AudioManager;

import android.media.AudioSystem;

import android.media.ToneGenerator;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;
@@ -2045,7 +2046,8 @@ public class CallsManager extends Call.ListenerBase 
                if (call.getConnectionService() == service) {

                    if (call.getState() != CallState.DISCONNECTED) {

                        markCallAsDisconnected(call, new DisconnectCause(DisconnectCause.ERROR,

                                "CS_DEATH"));

                                null /* message */, null /* description */, "CS_DEATH",

                                ToneGenerator.TONE_PROP_PROMPT));

                    }

                    markCallAsRemoved(call);

                }