summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-03-10 12:16:58 -0700
committerYorke Lee <yorkelee@google.com>2014-03-10 20:12:43 +0000
commitef169940c2ae0d59bfcb884ebea1e4401034d367 (patch)
tree36b4ad3bc1492467caa63197f6bbe30018d21a69 /InCallUI
parent30c8387f8d446b23d96bc2a99679324e9a21418f (diff)
DO NOT MERGE Fix IllegalStateException in InCallUI
InCallActivity.displayDialpad can possibly be called after onSaveInstanceState, so we need to use commitAllowingStateLoss instead of commit. Bug: 13396054 Change-Id: If2f61b16d97db159bebb5ddb5d1feecb87765386 (cherry picked from commit ea648d1e33c5dd12d01f22620e3556cc31002763)
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/InCallActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index e99fc997e..fa6cc2dc6 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -411,7 +411,7 @@ public class InCallActivity extends Activity {
ft.setCustomAnimations(0, R.anim.slide_out);
ft.hide(mDialpadFragment);
}
- ft.commit();
+ ft.commitAllowingStateLoss();
InCallPresenter.getInstance().getProximitySensor().onDialpadVisible(showDialpad);
}