From d2fee7c2b6c87b150297b5341bcca2f4ebba9039 Mon Sep 17 00:00:00 2001 From: wangqi Date: Tue, 25 Jul 2017 17:30:12 -0700 Subject: Fix bug that dialpad is not shown when return from "use touch tone key" in dialpad choose. This is caused by saved instance state overriding values of showing dialpad from intent extra when incall activity is being recreated. Bug: 62046691 Test: manual PiperOrigin-RevId: 163148086 Change-Id: Ice8974d7ee90ca3adcefca5946ec7489837d0bf6 --- java/com/android/incallui/InCallActivityCommon.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java index 94fe6ec4f..14531e0ee 100644 --- a/java/com/android/incallui/InCallActivityCommon.java +++ b/java/com/android/incallui/InCallActivityCommon.java @@ -212,7 +212,8 @@ public class InCallActivityCommon { } }); - if (icicle != null) { + // Don't override the value if show dialpad request is true in intent extras. + if (icicle != null && showDialpadRequest == DIALPAD_REQUEST_NONE) { // If the dialpad was shown before, set variables indicating it should be shown and // populated with the previous DTMF text. The dialpad is actually shown and populated // in onResume() to ensure the hosting fragment has been inflated and is ready to receive it. -- cgit v1.2.3