summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2016-01-12 18:54:12 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-12 18:54:12 +0000
commitede2f7e1f790a97db95f6d34f54e2839005b88ef (patch)
tree7b5edd902ca91fbd61fd2552c2b64180024e3c54
parent98ece9fa1c796514badcd60a2a810d5d938fb3c9 (diff)
parent86a8382274b955670f920324cba697360677a3b8 (diff)
downloadInCallUI-ede2f7e1f790a97db95f6d34f54e2839005b88ef.tar.gz
Merge "Fix InCallUI crash when post char dialog is shown"
am: 86a8382274 * commit '86a8382274b955670f920324cba697360677a3b8': Fix InCallUI crash when post char dialog is shown
-rw-r--r--src/com/android/incallui/PostCharDialogFragment.java19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/com/android/incallui/PostCharDialogFragment.java b/src/com/android/incallui/PostCharDialogFragment.java
index 09b626a9..400e8d76 100644
--- a/src/com/android/incallui/PostCharDialogFragment.java
+++ b/src/com/android/incallui/PostCharDialogFragment.java
@@ -29,9 +29,15 @@ import android.view.WindowManager;
*/
public class PostCharDialogFragment extends DialogFragment {
+ private static final String STATE_CALL_ID = "CALL_ID";
+ private static final String STATE_POST_CHARS = "POST_CHARS";
+
private String mCallId;
private String mPostDialStr;
+ public PostCharDialogFragment() {
+ }
+
public PostCharDialogFragment(String callId, String postDialStr) {
mCallId = callId;
mPostDialStr = postDialStr;
@@ -41,6 +47,11 @@ public class PostCharDialogFragment extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) {
super.onCreateDialog(savedInstanceState);
+ if (mPostDialStr == null && savedInstanceState != null) {
+ mCallId = savedInstanceState.getString(STATE_CALL_ID);
+ mPostDialStr = savedInstanceState.getString(STATE_POST_CHARS);
+ }
+
final StringBuilder buf = new StringBuilder();
buf.append(getResources().getText(R.string.wait_prompt_str));
buf.append(mPostDialStr);
@@ -71,4 +82,12 @@ public class PostCharDialogFragment extends DialogFragment {
TelecomAdapter.getInstance().postDialContinue(mCallId, false);
}
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+
+ outState.putString(STATE_CALL_ID, mCallId);
+ outState.putString(STATE_POST_CHARS, mPostDialStr);
+ }
}