Fix NPE in TelecomAdapter.stopForegroundNotification().

In InCallServiceImpl.tearDown(), we should only clear inCallService after
InCallPresenter.tearDown() where we remove all notification.

Also remove null
assertion in stopForegroundNotification() since other crash should only happens
when there is no notification.

Test: StatusBarNotifierTest
PiperOrigin-RevId: 172657924
Change-Id: I86e720b80f885aa93f12215fda899ee62eeaba5b

1 files changed, 7 insertions, 3 deletions

diff --git a/java/com/android/incallui/call/TelecomAdapter.java b/java/com/android/incallui/call/TelecomAdapter.java
index 0c0bbd473..d48ab68c2 100644
--- a/java/com/android/incallui/call/TelecomAdapter.java
+++ b/java/com/android/incallui/call/TelecomAdapter.java
@@ -185,8 +185,12 @@ public class TelecomAdapter implements InCallServiceListener {
    * Stop a started foreground notification. This does not stop {@code mInCallService} from running.
    */
   public void stopForegroundNotification() {
-    Assert.isNotNull(
-        mInCallService, "No inCallService available for stopping foreground notification");
-    mInCallService.stopForeground(true /*removeNotification*/);
+    if (mInCallService != null) {
+      mInCallService.stopForeground(true /*removeNotification*/);
+    } else {
+      LogUtil.e(
+          "TelecomAdapter.stopForegroundNotification",
+          "no inCallService available for stopping foreground notification");
+    }
   }
 }