commit c18ad7a8c917c6388668784461456cc779031e0b
author yueg <yueg@google.com> Wed Oct 18 14:45:05 2017 -0700
committer Eric Erfanian <erfanian@google.com> Thu Oct 19 08:37:25 2017 -0700
tree aa6c70e1f0c287f013b068e95b10ca400f2a659f
parent 6b864300238962f896ab78eaedea3b04814e3bff

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

java/com/android/incallui/InCallServiceImpl.java

diff --git a/java/com/android/incallui/InCallServiceImpl.java b/java/com/android/incallui/InCallServiceImpl.java
index 8570c58..2c45cb3 100644
--- a/java/com/android/incallui/InCallServiceImpl.java
+++ b/java/com/android/incallui/InCallServiceImpl.java
@@ -119,8 +119,8 @@
     Trace.beginSection("InCallServiceImpl.tearDown");
     Log.v(this, "tearDown");
     // Tear down the InCall system
-    TelecomAdapter.getInstance().clearInCallService();
     InCallPresenter.getInstance().tearDown();
+    TelecomAdapter.getInstance().clearInCallService();
     if (returnToCallController != null) {
       returnToCallController.tearDown();
       returnToCallController = null;

java/com/android/incallui/call/TelecomAdapter.java

diff --git a/java/com/android/incallui/call/TelecomAdapter.java b/java/com/android/incallui/call/TelecomAdapter.java
index 0c0bbd4..d48ab68 100644
--- a/java/com/android/incallui/call/TelecomAdapter.java
+++ b/java/com/android/incallui/call/TelecomAdapter.java
@@ -185,8 +185,12 @@
    * 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");
+    }
   }
 }