From ef169940c2ae0d59bfcb884ebea1e4401034d367 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Mon, 10 Mar 2014 12:16:58 -0700
Subject: 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)
---
 InCallUI/src/com/android/incallui/InCallActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'InCallUI')

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);
     }
-- 
cgit v1.2.3