summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRavi Paluri <rpaluri@codeaurora.org>2014-11-07 17:04:06 +0530
committerArne Coucheron <arco68@gmail.com>2014-12-13 01:45:36 +0100
commitcb36b695ebba82753264923967ddc7d4ea41e00f (patch)
treef6ca4ff5a31a062c38e259f12dcc233eda4a9675
parent8b2feca8079a4ee7c2d02285aa5a1dd5c6a44ccc (diff)
downloadpackages_apps_InCallUI-cb36b695ebba82753264923967ddc7d4ea41e00f.tar.gz
packages_apps_InCallUI-cb36b695ebba82753264923967ddc7d4ea41e00f.tar.bz2
packages_apps_InCallUI-cb36b695ebba82753264923967ddc7d4ea41e00f.zip
IMS-VT: Add null check in call upgrade fail scenario
Crash is observed if call is ended in the interval wherein handler is started to change state from REQUEST_FAILED to NO_REQUEST after an interval. Added null check to change state only when call exists Change-Id: I382e8885efe0a841ce36c9ff4aff51c6c1b8791b CRs-Fixed: 752475
-rw-r--r--src/com/android/incallui/VideoCallPresenter.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/incallui/VideoCallPresenter.java b/src/com/android/incallui/VideoCallPresenter.java
index c10d76a2..31635550 100644
--- a/src/com/android/incallui/VideoCallPresenter.java
+++ b/src/com/android/incallui/VideoCallPresenter.java
@@ -731,12 +731,15 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
} else {
call.setSessionModificationState(Call.SessionModificationState.REQUEST_FAILED);
+ final Call modifyCall = call;
// Start handler to change state from REQUEST_FAILED to NO_REQUEST after an interval.
mSessionModificationResetHandler.postDelayed(new Runnable() {
@Override
public void run() {
- mPrimaryCall
+ if (modifyCall != null) {
+ modifyCall
.setSessionModificationState(Call.SessionModificationState.NO_REQUEST);
+ }
}
}, SESSION_MODIFICATION_RESET_DELAY_MS);
}