1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java
index 1690c549..459921f1 100644
--- a/src/com/android/incallui/StatusBarNotifier.java
+++ b/src/com/android/incallui/StatusBarNotifier.java
@@ -140,6 +140,15 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
         mIsShowingNotification = false;
     }
 
+    /* package */ static void clearInCallNotification(Context backupContext) {
+        Log.i(StatusBarNotifier.class.getSimpleName(),
+                "Something terrible happened. Clear all InCall notifications");
+
+        NotificationManager notificationManager =
+                (NotificationManager) backupContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancel(IN_CALL_NOTIFICATION);
+    }
+
     /**
      * Helper method for updateInCallNotification() and
      * updateNotificationAndLaunchIncomingCallUi(): Update the phone app's
@@ -390,6 +399,9 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
      * Gets the most relevant call to display in the notification.
      */
     private Call getCallToShow(CallList callList) {
+        if (callList == null) {
+            return null;
+        }
         Call call = callList.getIncomingCall();
         if (call == null) {
             call = callList.getOutgoingCall();