diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-24 22:41:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-24 22:41:00 +0000 |
commit | daa1c44c00f3c598223639c9b80a52cf41db51ba (patch) | |
tree | e4c88a1862b157dc858abe73e52b077bf7b96948 /java/com/android/incallui/InCallServiceImpl.java | |
parent | ef7338cf787301c573fde8129bf8880d7faba040 (diff) | |
parent | 938468da6f5c225ebb161a68bd949c9cf3261892 (diff) |
Merge "Rename the new bubble package name from "bubble" to "newbubble"."
Diffstat (limited to 'java/com/android/incallui/InCallServiceImpl.java')
-rw-r--r-- | java/com/android/incallui/InCallServiceImpl.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/java/com/android/incallui/InCallServiceImpl.java b/java/com/android/incallui/InCallServiceImpl.java index 2c45cb375..402e0021f 100644 --- a/java/com/android/incallui/InCallServiceImpl.java +++ b/java/com/android/incallui/InCallServiceImpl.java @@ -38,6 +38,7 @@ import com.android.incallui.call.TelecomAdapter; public class InCallServiceImpl extends InCallService { private ReturnToCallController returnToCallController; + private NewReturnToCallController newReturnToCallController; @Override public void onCallAudioStateChanged(CallAudioState audioState) { @@ -97,6 +98,9 @@ public class InCallServiceImpl extends InCallService { if (ReturnToCallController.isEnabled(this)) { returnToCallController = new ReturnToCallController(this); } + if (NewReturnToCallController.isEnabled(this)) { + newReturnToCallController = new NewReturnToCallController(this); + } IBinder iBinder = super.onBind(intent); Trace.endSection(); @@ -125,6 +129,10 @@ public class InCallServiceImpl extends InCallService { returnToCallController.tearDown(); returnToCallController = null; } + if (newReturnToCallController != null) { + newReturnToCallController.tearDown(); + newReturnToCallController = null; + } Trace.endSection(); } } |