Merge "Fix NPE that was stopping VT updates to Dialer" into nyc-mr1-dev (30b8e177) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/VideoProviderProxy.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -158,15 +158,17 @@ public class VideoProviderProxy extends Connection.VideoProvider {
		@Override
		public void receiveSessionModifyResponse(int status, VideoProfile requestProfile,
		VideoProfile responseProfile) {
		logFromVideoProvider("receiveSessionModifyResponse: status=" + status +
		" requestProfile=" + requestProfile + " responseProfile=" + responseProfile);
		String eventMessage = "Status Code : " + status + " Video State: " +
		(responseProfile != null ? responseProfile.getVideoState() : "null");
		Log.event(mCall, Log.Events.RECEIVE_VIDEO_RESPONSE, eventMessage);
		synchronized (mLock) {
		if (status == Connection.VideoProvider.SESSION_MODIFY_REQUEST_SUCCESS) {
		mCall.getAnalytics().addVideoEvent(
		Analytics.RECEIVE_REMOTE_SESSION_MODIFY_RESPONSE,
		requestProfile.getVideoState());
		logFromVideoProvider("receiveSessionModifyResponse: status=" + status +
		" requestProfile=" + requestProfile + " responseProfile=" +
		responseProfile);
		Log.event(mCall, Log.Events.RECEIVE_VIDEO_RESPONSE,
		VideoProfile.videoStateToString(responseProfile.getVideoState()));
		}
		VideoProviderProxy.this.receiveSessionModifyResponse(status, requestProfile,
		responseProfile);
		}