Merge "Black screen appears after tapping the back key" am: abcd256842 am: 8ef6f6c839 am: 21b97c074f

am: c2448ed53d

Change-Id: I3c8c4132eee66b0cd2fcb7a6c94114b9789155f2

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();
     }