commit 0b144e4fc08898c677b06fc6a55de88deda311e5
author wangqi <wangqi@google.com> Mon Jun 18 15:15:28 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 18 15:15:28 2018 -0700
tree e2fbb747ad5a569167cba80860d682533de8b4e0
parent 2f880a4544ef22ee93aa22ab23e3819fa0396f33
parent 559ec9f12f5302dc4d794454fb4ca7c5785f6550

Merge "Fix wrong orientation change when a video call ends"
am: 559ec9f12f

Change-Id: I5efe51efe0eac37c44b049c88f1791da7686e90c

java/com/android/incallui/VideoCallPresenter.java

diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java
index 88713f4..5bdcd7a 100644
--- a/java/com/android/incallui/VideoCallPresenter.java
+++ b/java/com/android/incallui/VideoCallPresenter.java
@@ -691,8 +691,12 @@
   }
 
   private void checkForOrientationAllowedChange(@Nullable DialerCall call) {
-    InCallPresenter.getInstance()
-        .setInCallAllowsOrientationChange(isVideoCall(call) || isVideoUpgrade(call));
+    // Call could be null when video call ended. This check could prevent unwanted orientation
+    // change before incall UI gets destroyed.
+    if (call != null) {
+      InCallPresenter.getInstance()
+          .setInCallAllowsOrientationChange(isVideoCall(call) || isVideoUpgrade(call));
+    }
   }
 
   private void updateFullscreenAndGreenScreenMode(