From f8e2dbf2d2590cdee3ff69f13b102b97620125f0 Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Thu, 7 Apr 2016 13:17:24 +0100
Subject: [PATCH] Guard double-showing of user credentials dialog

Only create & show the dialogfragment if it does not already exist.

Bug: 28058930
Change-Id: Ia48cc8a5fd60a12c3beb6c9263036a449cf8d67c
---
 src/com/android/settings/UserCredentialsSettings.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java
index 643876473f..a09800b3e5 100644
--- a/src/com/android/settings/UserCredentialsSettings.java
+++ b/src/com/android/settings/UserCredentialsSettings.java
@@ -104,10 +104,12 @@ public class UserCredentialsSettings extends OptionsMenuFragment implements OnIt
             final Bundle args = new Bundle();
             args.putParcelable(ARG_CREDENTIAL, item);
 
-            final CredentialDialogFragment frag = new CredentialDialogFragment();
-            frag.setTargetFragment(target, /* requestCode */ -1);
-            frag.setArguments(args);
-            frag.show(target.getFragmentManager(), TAG);
+            if (target.getFragmentManager().findFragmentByTag(TAG) == null) {
+                final DialogFragment frag = new CredentialDialogFragment();
+                frag.setTargetFragment(target, /* requestCode */ -1);
+                frag.setArguments(args);
+                frag.show(target.getFragmentManager(), TAG);
+            }
         }
 
         @Override
-- 
2.11.0