summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-03-10 23:06:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-10 23:06:51 +0000
commit6f47a5a3b868d07a9d0fe764e306ad136ba5670b (patch)
treecce89317caa3246841f0cabe7eeaa06c82e7c5a2 /InCallUI
parentdac9afd5017d05efaae158ae13c16905d4f9ff80 (diff)
parent899205564599ba3cff49627ba6a6625e14c42c0b (diff)
am ec9354f7: am 083be348: DO NOT MERGE Fix IllegalStateException in InCallUI
* commit 'ec9354f75df57fe9884dd114b9a8886d79ac6c4a': DO NOT MERGE Fix IllegalStateException in InCallUI
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);
}