From 6b282f72d86bc09e45522c691987c5187ed7b148 Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Mon, 10 Mar 2014 12:16:58 -0700 Subject: 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 --- InCallUI/src/com/android/incallui/InCallActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index 5a11b1885..5f446336a 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 From 5f8cdff205fd45058e3be87fdad8d2b317180c7b Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Tue, 25 Mar 2014 11:05:00 -0700 Subject: Remove extra recycle() call BUG: 13636003 Change-Id: I28dfcf2506a5dcff6d17990eaf416ea18dada762 --- InCallUI/src/com/android/incallui/widget/multiwaveview/GlowPadView.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/InCallUI/src/com/android/incallui/widget/multiwaveview/GlowPadView.java b/InCallUI/src/com/android/incallui/widget/multiwaveview/GlowPadView.java index a346ba593..e97691bb8 100644 --- a/InCallUI/src/com/android/incallui/widget/multiwaveview/GlowPadView.java +++ b/InCallUI/src/com/android/incallui/widget/multiwaveview/GlowPadView.java @@ -262,8 +262,6 @@ public class GlowPadView extends View { setDirectionDescriptionsResourceId(resourceId); } - a.recycle(); - // Use gravity attribute from LinearLayout //a = context.obtainStyledAttributes(attrs, R.styleable.LinearLayout); mGravity = a.getInt(R.styleable.GlowPadView_android_gravity, Gravity.TOP); -- cgit v1.2.3 From fa5d81c49961c8249314fbd9c69e0715f534415f Mon Sep 17 00:00:00 2001 From: Evan Charlton Date: Thu, 15 May 2014 11:17:19 -0700 Subject: Fix end-call button Fix the end-call button wiring (was broken due to a bad merge). Bug: 14986852 Change-Id: Ie284f1840745fb7fdd752edf7c55186c9cba3073 --- InCallUI/src/com/android/incallui/CallCardPresenter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 4e98e7fe5..8cef71997 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -480,7 +480,8 @@ public class CallCardPresenter extends Presenter return; } - CallCommandClient.getInstance().disconnectCall(mPrimary.getCallId().hashCode()); + Log.i(this, "Disconnecting call: " + mPrimary); + TelecommAdapter.getInstance().disconnectCall(mPrimary.getCallId()); } public interface CallCardUi extends Ui { -- cgit v1.2.3