diff options
author | maxwelb <maxwelb@google.com> | 2017-10-19 17:08:35 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-19 17:08:35 +0000 |
commit | ef7338cf787301c573fde8129bf8880d7faba040 (patch) | |
tree | 8b84595ae46c777ed72e6dea874ff33030bb0e4c /java/com/android/incallui/call/TelecomAdapter.java | |
parent | be608de8feeb51ccf19c4978d6175c8264659f99 (diff) | |
parent | 958b292fc04ad15879fff47df929d6d1a826615c (diff) |
Merge changes I9a5b30d6,Ie9e7b741,I415f5b7e,I86e720b8,Ia8b7d508, ...
am: 958b292fc0
Change-Id: Iaf76c729a8c2021b6a7d3cbccbeea4a9c2466aa0
Diffstat (limited to 'java/com/android/incallui/call/TelecomAdapter.java')
-rw-r--r-- | java/com/android/incallui/call/TelecomAdapter.java | 10 |
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"); + } } } |