Suppress "dialer crashed" notification if the crashed dialer is system
dialer.
Allow non-UI in-call services return null from onBind without penalty.
Change unit test to work with this change, fix an wrong assertion and
make sure InCallController fallback to use system dialer after default
dialer disconnected.
Bug: 163033383
Test: Manually force stop the system dialer when there's an incoming
call and see no notification. atest
TelecomUnitTests:InCallControllerTests
Change-Id: Ia6583d19a0a3f2a86e9b73cce97d4fce2b019f93
(cherry picked from commit 98faa9a3109d24f4e67ca740171946d96176c995)
diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index 228cb3d..6de6dea 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -322,7 +322,10 @@
String packageName = mInCallServiceInfo.getComponentName().getPackageName();
mContext.unbindService(mServiceConnection);
mIsConnected = false;
- if (mIsNullBinding) {
+ if (mIsNullBinding && mInCallServiceInfo.getType() != IN_CALL_SERVICE_TYPE_NON_UI) {
+ // Non-UI InCallServices are allowed to return null from onBind if they don't
+ // want to handle calls at the moment, so don't report them to the user as
+ // crashed.
sendCrashedInCallServiceNotification(packageName);
}
if (mCall != null) {
@@ -1811,6 +1814,10 @@
private void sendCrashedInCallServiceNotification(String packageName) {
PackageManager packageManager = mContext.getPackageManager();
CharSequence appName;
+ String systemDialer = mDefaultDialerCache.getSystemDialerApplication();
+ if ((systemDialer != null) && systemDialer.equals(packageName)) {
+ return;
+ }
try {
appName = packageManager.getApplicationLabel(
packageManager.getApplicationInfo(packageName, 0));
diff --git a/tests/src/com/android/server/telecom/tests/InCallControllerTests.java b/tests/src/com/android/server/telecom/tests/InCallControllerTests.java
index e16b598..df3bf82 100644
--- a/tests/src/com/android/server/telecom/tests/InCallControllerTests.java
+++ b/tests/src/com/android/server/telecom/tests/InCallControllerTests.java
@@ -581,6 +581,7 @@
any(Intent.class), any(ServiceConnection.class), anyInt(), any(UserHandle.class)))
.thenReturn(true);
when(mMockContext.getApplicationInfo()).thenReturn(applicationInfo);
+ when(mDefaultDialerCache.getDefaultDialerApplication(CURRENT_USER_ID)).thenReturn(DEF_PKG);
setupMockPackageManager(true /* default */, true /* system */, false /* external calls */);
mInCallController.bindToServices(mMockCall);
@@ -607,7 +608,7 @@
verify(mNotificationManager).notify(eq(NOTIFICATION_TAG),
eq(IN_CALL_SERVICE_NOTIFICATION_ID), any(Notification.class));
- verify(mCallInfo).addInCallService(eq(sysDialerComponentName.flattenToShortString()),
+ verify(mCallInfo).addInCallService(eq(defDialerComponentName.flattenToShortString()),
anyInt(), anyLong(), eq(true));
ArgumentCaptor<Intent> bindIntentCaptor2 = ArgumentCaptor.forClass(Intent.class);
@@ -617,6 +618,7 @@
eq(Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE
| Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS),
eq(UserHandle.CURRENT));
+ assertEquals(sysDialerComponentName, bindIntentCaptor2.getValue().getComponent());
}
/**
