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

Commit bca7b458 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix unexpected crashed phone app notification when use system dialer as... 

Merge "Fix unexpected crashed phone app notification when use system dialer as default dialer." am: aaabe1e0

Change-Id: I0ddcc83f34c4bf08755ba8a3956161036c9940d2
parents ac86c02e aaabe1e0

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

+5 −2
Original line number Diff line number Diff line
@@ -1312,10 +1312,13 @@ public class InCallController extends CallsManagerListenerBase { 
    private InCallServiceInfo getDefaultDialerComponent() {

        String packageName = mDefaultDialerCache.getDefaultDialerApplication(

                mCallsManager.getCurrentUserHandle().getIdentifier());

        String systemPackageName = mDefaultDialerCache.getSystemDialerApplication();

        Log.d(this, "Default Dialer package: " + packageName);



        InCallServiceInfo defaultDialerComponent = getInCallServiceComponent(packageName,

                IN_CALL_SERVICE_TYPE_DIALER_UI);

        InCallServiceInfo defaultDialerComponent =

                (systemPackageName != null && systemPackageName.equals(packageName))

                ? getInCallServiceComponent(packageName, IN_CALL_SERVICE_TYPE_SYSTEM_UI)

                : getInCallServiceComponent(packageName, IN_CALL_SERVICE_TYPE_DIALER_UI);

        if (packageName != null && defaultDialerComponent == null) {

            // The in call service of default phone app is disabled, send notification.

            sendCrashedInCallServiceNotification(packageName);