summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-03-10 23:05:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-10 23:05:18 +0000
commit899205564599ba3cff49627ba6a6625e14c42c0b (patch)
tree6b2b4e3c6d949af043698290a02b7fb792f84d31 /InCallUI
parent1d13c31ba5990fc3e8e48a5e818a4ecb5e787804 (diff)
parentef169940c2ae0d59bfcb884ebea1e4401034d367 (diff)
am 083be348: DO NOT MERGE Fix IllegalStateException in InCallUI
* commit '083be3482e2692010c235514987b3379e069ca51': 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);
}