diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-25 22:41:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-25 22:41:16 +0000 |
| commit | e5041c35b4c0ef31e5d242a8dd61d7441d490f44 (patch) | |
| tree | 42818e6e3276e3a80e32ba21c402ea83e33877ee | |
| parent | f4a24e7b5dbb05e3d36046a5ed8ebb16145f21b5 (diff) | |
| parent | fad3d877092cf18788be134ead9365add65f507d (diff) | |
Merge "Fix crash that isInMultiWindownMode is not supported on M."
| -rw-r--r-- | java/com/android/incallui/InCallActivityCommon.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java index d39ce22b0..a9702b447 100644 --- a/java/com/android/incallui/InCallActivityCommon.java +++ b/java/com/android/incallui/InCallActivityCommon.java @@ -51,6 +51,7 @@ import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.Selec import com.android.dialer.animation.AnimUtils; import com.android.dialer.animation.AnimationListenerAdapter; import com.android.dialer.common.LogUtil; +import com.android.dialer.compat.ActivityCompat; import com.android.dialer.compat.CompatUtils; import com.android.dialer.logging.Logger; import com.android.dialer.logging.ScreenEvent; @@ -714,7 +715,7 @@ public class InCallActivityCommon { } void updateNavigationBar(boolean isDialpadVisible) { - if (!inCallActivity.isInMultiWindowMode()) { + if (!ActivityCompat.isInMultiWindowMode(inCallActivity)) { View navigationBarBackground = inCallActivity.getWindow().findViewById(R.id.navigation_bar_background); if (navigationBarBackground != null) { |