summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmkar Kolangade <omkark@codeaurora.org>2016-05-18 20:38:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-18 20:38:41 +0000
commit5a210c306d9757c30d07c83ae962c32261c40cd8 (patch)
treedf0d5644ad03663e4e364753572fcbffba083d32
parent49c48609048dbd2fc3210560272949345bdd437c (diff)
parentb15db3f15c45bb9018667ce0c679da1329743d8c (diff)
Merge "IMS-VT: Trigger internal onStateChanged notification" into nyc-mr1-dev
am: b15db3f15c * commit 'b15db3f15c45bb9018667ce0c679da1329743d8c': IMS-VT: Trigger internal onStateChanged notification Change-Id: Ifb253c84daec36790c0f8ec025cd7f2c033e922e
-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());
}
/**