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
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java
index 1ba3b5d..b8a2baa 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -452,6 +452,7 @@
if (inCallActivity != null) {
if (mInCallActivity == null) {
+ mContext = inCallActivity.getApplicationContext();
updateListeners = true;
LogUtil.i("InCallPresenter.updateActivity", "UI Initialized");
} else {
@@ -500,7 +501,7 @@
// (2) All calls could disconnect and then get a new incoming call before the
// activity is destroyed.
//
- // b/1122139 - We previously had a check for mServiceConnected here as well, but there are
+ // a bug - We previously had a check for mServiceConnected here as well, but there are
// cases where we need to recalculate the current state even if the service in not
// connected. In particular the case where startOrFinish() is called while the app is
// already finish()ing. In that case, we skip updating the state with the knowledge that
@@ -730,7 +731,7 @@
// incall activity for that call will still exist (even if it's not visible). In the case of
// an incoming call in that situation, just disconnect that "waiting for account" call and
// dismiss the dialog. The same activity will be reused to handle the new incoming call. See
- // b/33247755 for more details.
+ // a bug for more details.
DialerCall waitingForAccountCall;
if (newState == InCallState.INCOMING
&& (waitingForAccountCall = callList.getWaitingForAccountCall()) != null) {