summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2016-05-18 20:22:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-18 20:22:58 +0000
commitb15db3f15c45bb9018667ce0c679da1329743d8c (patch)
treeefac1b7052172be624c62ace0689bab1f96c7232
parentf91526c8e579751c238ac39cd8e490b01ff7441f (diff)
parent4befe72443ea8852bbd06ae97a919b46f530e177 (diff)
Merge "IMS-VT: Trigger internal onStateChanged notification" into nyc-mr1-dev
-rw-r--r--InCallUI/src/com/android/incallui/VideoCallFragment.java5
-rw-r--r--InCallUI/src/com/android/incallui/VideoCallPresenter.java4
2 files changed, 6 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/VideoCallFragment.java b/InCallUI/src/com/android/incallui/VideoCallFragment.java
index 2e65f81b4..6a46a423d 100644
--- a/InCallUI/src/com/android/incallui/VideoCallFragment.java
+++ b/InCallUI/src/com/android/incallui/VideoCallFragment.java
@@ -435,12 +435,11 @@ public class VideoCallFragment extends BaseFragment<VideoCallPresenter,
*/
@Override
public void onActivityCreated(Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
-
mIsLandscape = getResources().getBoolean(R.bool.is_layout_landscape);
-
Log.d(this, "onActivityCreated: IsLandscape=" + mIsLandscape);
getPresenter().init(getActivity());
+
+ super.onActivityCreated(savedInstanceState);
}
@Override
diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index 7617608d1..3494afa6d 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -244,6 +244,10 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
InCallVideoCallCallbackNotifier.getInstance().addVideoEventListener(this);
mCurrentVideoState = VideoProfile.STATE_AUDIO_ONLY;
mCurrentCallState = Call.State.INVALID;
+
+ final InCallPresenter.InCallState inCallState =
+ InCallPresenter.getInstance().getInCallState();
+ onStateChange(inCallState, inCallState, CallList.getInstance());
}
/**