commit 385a5a1e620bf1ecf465d9f60b13b98482bc5c53
author wangqi <wangqi@google.com> Thu Sep 28 10:44:54 2017 -0700
committer Eric Erfanian <erfanian@google.com> Fri Sep 29 10:43:32 2017 -0700
tree 9aed27cb8ebacbcf24cbc6bd8b9d12a58de94cc6
parent ea2f430dd5f5f5f08bb5c9438696112f44423abe

Fix crash on incoming video call when video upgrade call is pending.

This is a upstream fix from AOSP:
https://android-review.googlesource.com/#/c/platform/packages/apps/Dialer/+/475598/

Bug: 63608380
Test: none
PiperOrigin-RevId: 170365033
Change-Id: Id58cf4c67a3b0144521622a14997a83403017bee

java/com/android/incallui/CallCardPresenter.java

diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java
index 15b04ea..be9b3ef 100644
--- a/java/com/android/incallui/CallCardPresenter.java
+++ b/java/com/android/incallui/CallCardPresenter.java
@@ -142,7 +142,7 @@
       };
 
   public CallCardPresenter(Context context) {
-    LogUtil.i("CallCardController.constructor", null);
+    LogUtil.i("CallCardPresenter.constructor", null);
     mContext = Assert.isNotNull(context).getApplicationContext();
     callLocation = CallLocationComponent.get(mContext).getCallLocation();
   }
@@ -179,7 +179,7 @@
 
   @Override
   public void onInCallScreenReady() {
-    LogUtil.i("CallCardController.onInCallScreenReady", null);
+    LogUtil.i("CallCardPresenter.onInCallScreenReady", null);
     Assert.checkState(!isInCallScreenReady);
     if (mContactsPreferences != null) {
       mContactsPreferences.refreshValue(ContactsPreferences.DISPLAY_ORDER_KEY);
@@ -222,7 +222,7 @@
 
   @Override
   public void onInCallScreenUnready() {
-    LogUtil.i("CallCardController.onInCallScreenUnready", null);
+    LogUtil.i("CallCardPresenter.onInCallScreenUnready", null);
     Assert.checkState(isInCallScreenReady);
 
     // stop getting call state changes