diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-15 20:32:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-15 20:32:13 +0000 |
| commit | 189fe2dd3dbb0a8e5a75c76b8161c36e6b2dad0a (patch) | |
| tree | a870c496c72921a2e4132b34b3b42d4feccf5864 /java/com/android/incallui/InCallServiceImpl.java | |
| parent | bc9963db56bfb006c723ade3b86de9f84619e2c5 (diff) | |
| parent | 448dc9060e5106a896c8347b660d258732bd79fa (diff) | |
Merge changes I845855d0,Id1518174
* changes:
Fix bubble not showing on device restart.
Add Brazil to the set of countries we do not format phone numbers
Diffstat (limited to 'java/com/android/incallui/InCallServiceImpl.java')
| -rw-r--r-- | java/com/android/incallui/InCallServiceImpl.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/com/android/incallui/InCallServiceImpl.java b/java/com/android/incallui/InCallServiceImpl.java index 959f13f2e..2b147e7f8 100644 --- a/java/com/android/incallui/InCallServiceImpl.java +++ b/java/com/android/incallui/InCallServiceImpl.java @@ -111,10 +111,8 @@ public class InCallServiceImpl extends InCallService { InCallPresenter.getInstance().onServiceBind(); InCallPresenter.getInstance().maybeStartRevealAnimation(intent); TelecomAdapter.getInstance().setInCallService(this); - if (ReturnToCallController.isEnabled(this)) { - returnToCallController = - new ReturnToCallController(this, ContactInfoCache.getInstance(context)); - } + returnToCallController = + new ReturnToCallController(this, ContactInfoCache.getInstance(context)); feedbackListener = FeedbackComponent.get(context).getCallFeedbackListener(); CallList.getInstance().addListener(feedbackListener); |