commit 74ffe87630323e9f50a7e41475638045eb7a00d0
author Devci Telephony <devci-telephony@localhost> Sun Dec 18 01:23:43 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Dec 18 01:23:43 2016 -0800
tree 6daf988e63fa223140a3031000a645d7bf628edb
parent b2737974f5d5f45624970df02feeabc9762f6aab
parent 4dd3306d9d24d103ed07e1abbf48fb6cdc67afa1

Merge "IMS: Grey out merge menu item in more options" into atel.lnx.2.0-dev

InCallUI/src/com/android/incallui/InCallActivity.java

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index dd2af36..4598d3c 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -309,8 +309,8 @@
         InCallPresenter.getInstance().setThemeColors();
         InCallPresenter.getInstance().onUiShowing(true);
 
-        // Clear fullscreen state onResume; the stored value may not match reality.
-        InCallPresenter.getInstance().clearFullscreen();
+        // Exit fullscreen state onResume; the stored value may not match reality.
+        InCallPresenter.getInstance().setFullScreen(false);
 
         // If there is a pending request to show or hide the dialpad, handle that now.
         if (mShowDialpadRequest != DIALPAD_REQUEST_NONE) {