commit 938468da6f5c225ebb161a68bd949c9cf3261892
author Eric Erfanian <erfanian@google.com> Tue Oct 24 14:05:52 2017 -0700
committer Eric Erfanian <erfanian@google.com> Tue Oct 24 14:05:52 2017 -0700
tree 232533fa35dc9d140fdfe0dac82b2bd21ad1b5c4
parent 958b292fc04ad15879fff47df929d6d1a826615c

Rename the new bubble package name from "bubble" to "newbubble".

It fixes AOSP for package name conflict.

Test: manual
PiperOrigin-RevId: 173298696
Change-Id: Id10ebe0bcf029e61f65cf6580c7198abd8395081

java/com/android/incallui/InCallServiceImpl.java

diff --git a/java/com/android/incallui/InCallServiceImpl.java b/java/com/android/incallui/InCallServiceImpl.java
index 2c45cb3..402e002 100644
--- a/java/com/android/incallui/InCallServiceImpl.java
+++ b/java/com/android/incallui/InCallServiceImpl.java
@@ -38,6 +38,7 @@
 public class InCallServiceImpl extends InCallService {
 
   private ReturnToCallController returnToCallController;
+  private NewReturnToCallController newReturnToCallController;
 
   @Override
   public void onCallAudioStateChanged(CallAudioState audioState) {
@@ -97,6 +98,9 @@
     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 @@
       returnToCallController.tearDown();
       returnToCallController = null;
     }
+    if (newReturnToCallController != null) {
+      newReturnToCallController.tearDown();
+      newReturnToCallController = null;
+    }
     Trace.endSection();
   }
 }