commit bca7b458e38253db4963f8290dfeb64438c02061
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 06 18:40:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 06 18:40:23 2020 +0000
tree ee54550c5a412e9b8e9d26b9188127cd0e90f164
parent ac86c02e3b2f3cb9bc0ae0f09a8786e6d1327be8
parent aaabe1e07851d12206d31a54506c0fe297aacd69

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

Change-Id: I0ddcc83f34c4bf08755ba8a3956161036c9940d2

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

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index f3a030e..6a9771a 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -1312,10 +1312,13 @@
     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);