diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-19 17:05:55 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-19 17:05:55 +0000 |
commit | 958b292fc04ad15879fff47df929d6d1a826615c (patch) | |
tree | 7f16f98729404c79ed9d2d8dd6894e05a4049539 /java/com/android/incallui/call | |
parent | 5cb3ecff08854c7b3da976f7981d1b9c3ff5bee0 (diff) | |
parent | 88041ae80c81fc4dfab1e17f937baa35688b0040 (diff) |
Merge changes I9a5b30d6,Ie9e7b741,I415f5b7e,I86e720b8,Ia8b7d508, ...
* changes:
Automated g4 rollback of changelist 172154863.
Take into account special dialable characters when grouping calls in the call log UI.
Move more Video Share stuff to third_party
Fix NPE in TelecomAdapter.stopForegroundNotification().
wrapping %s in in <xliff:g> </xliff:g> tags to prevent translation
Check AD eligibility before utilizing the feature.
Diffstat (limited to 'java/com/android/incallui/call')
-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"); + } } } |