From 2cea7f814b0100cfdbf840427ce02f1805cbccb3 Mon Sep 17 00:00:00 2001
From: "xiaocheng.x.wang" <xiaocheng.x.wang@sonymobile.com>
Date: Mon, 25 Jan 2016 10:55:13 +0800
Subject: [PATCH] Black screen appears after tapping the back key

Black screen is displayed after tapping the back key when editing SIM name.

To reproduce:
Settings->Dual SIM->tap the SIM name->tap back key.

[Expected Result]
Screen should be displayed normally.

[Actual Result]:
Black screen is displayed.

The cause is the dialog is not finished when it's dismissed.

Bug: 32934740
Change-Id: Ieddb65247cfe7b9434c8cfa7aeec2396616d9b81
---
 src/com/android/settings/sim/SimPreferenceDialog.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/sim/SimPreferenceDialog.java b/src/com/android/settings/sim/SimPreferenceDialog.java
index 530cb38df19..d1957241177 100644
--- a/src/com/android/settings/sim/SimPreferenceDialog.java
+++ b/src/com/android/settings/sim/SimPreferenceDialog.java
@@ -167,7 +167,6 @@ public class SimPreferenceDialog extends Activity {
                 mSubInfoRecord.setIconTint(tint);
                 mSubscriptionManager.setIconTint(tint, subscriptionId);
                 dialog.dismiss();
-                finish();
             }
         });
 
@@ -175,10 +174,16 @@ public class SimPreferenceDialog extends Activity {
             @Override
             public void onClick(DialogInterface dialog, int whichButton) {
                 dialog.dismiss();
-                finish();
             }
         });
 
+        mBuilder.setOnDismissListener(new DialogInterface.OnDismissListener() {
+           @Override
+           public void onDismiss(DialogInterface dialogInListener) {
+               finish();
+           }
+        });
+
         mBuilder.create().show();
     }