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/InCallPresenter.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/InCallPresenter.java')
| -rw-r--r-- | java/com/android/incallui/InCallPresenter.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index 1ba3b5d3a..b8a2baa00 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -452,6 +452,7 @@ public class InCallPresenter implements CallList.Listener { if (inCallActivity != null) { if (mInCallActivity == null) { + mContext = inCallActivity.getApplicationContext(); updateListeners = true; LogUtil.i("InCallPresenter.updateActivity", "UI Initialized"); } else { @@ -500,7 +501,7 @@ public class InCallPresenter implements CallList.Listener { // (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 @@ public class InCallPresenter implements CallList.Listener { // 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) { |