commit 252acb3e2b37e9661f6432d8afb7e37965b33ac3
author Pengquan Meng <mpq@google.com> Thu Oct 11 17:16:25 2018 -0700
committer Xiangyu/Malcolm Chen <refuhoo@google.com> Fri Oct 12 01:26:01 2018 +0000
tree bb3c6cced011af54647942344e926f7729062f14
parent c5bad38530808072fa626d8d38697fcc7c8dc9e6

Remove dependency of EmergencyCallbackModeExitDialog

Change EmergencyCallbackModeExitDialog to use the activity result code
to represent the user choice.

RESULT_OK mean the user click "yes" and exit the Emergency Callback
Mode, otherwise, RESULT_CANCELED will be returned.

This change allows the MobileNetworkSettings decouple from
EmergencyCallbackModeExitDialog.

Bug: 111453847
Test: Build & manual test
Change-Id: I4c2a4843a95858c16e45f13b4f38dc6def3bacf0

src/com/android/phone/EmergencyCallbackModeExitDialog.java

diff --git a/src/com/android/phone/EmergencyCallbackModeExitDialog.java b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
index fd6510b..2492f46 100644
--- a/src/com/android/phone/EmergencyCallbackModeExitDialog.java
+++ b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
@@ -52,8 +52,6 @@
     /** Intent to trigger the Emergency Callback Mode exit dialog */
     static final String ACTION_SHOW_ECM_EXIT_DIALOG =
             "com.android.phone.action.ACTION_SHOW_ECM_EXIT_DIALOG";
-    /** Used to get the users choice from the return Intent's extra */
-    public static final String EXTRA_EXIT_ECM_RESULT = "exit_ecm_result";
 
     public static final int EXIT_ECM_BLOCK_OTHERS = 1;
     public static final int EXIT_ECM_DIALOG = 2;
@@ -239,8 +237,7 @@
                             new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int whichButton) {
                                     // User clicked No
-                                    setResult(RESULT_OK, (new Intent()).putExtra(
-                                            EXTRA_EXIT_ECM_RESULT, false));
+                                    setResult(RESULT_CANCELED);
                                     finish();
                                 }
                             }).create();
@@ -257,8 +254,7 @@
                             new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int whichButton) {
                                     // User clicked Dismiss
-                                    setResult(RESULT_OK, (new Intent()).putExtra(
-                                            EXTRA_EXIT_ECM_RESULT, false));
+                                    setResult(RESULT_CANCELED);
                                     finish();
                                 }
                             }).create();
@@ -302,8 +298,7 @@
      */
     @Override
     public void onCancel(DialogInterface dialog) {
-        EmergencyCallbackModeExitDialog.this.setResult(RESULT_OK, (new Intent())
-                .putExtra(EXTRA_EXIT_ECM_RESULT, false));
+        EmergencyCallbackModeExitDialog.this.setResult(RESULT_CANCELED);
         finish();
     }
 
@@ -321,8 +316,7 @@
                         mAlertDialog.dismiss();
                     if (mProgressDialog != null)
                         mProgressDialog.dismiss();
-                    EmergencyCallbackModeExitDialog.this.setResult(RESULT_OK, (new Intent())
-                            .putExtra(EXTRA_EXIT_ECM_RESULT, true));
+                    EmergencyCallbackModeExitDialog.this.setResult(RESULT_OK);
                     finish();
                 }
             }
@@ -354,8 +348,7 @@
             switch (msg.what) {
                 case ECM_TIMER_RESET:
                     if(!((Boolean)((AsyncResult) msg.obj).result).booleanValue()) {
-                        EmergencyCallbackModeExitDialog.this.setResult(RESULT_OK, (new Intent())
-                                .putExtra(EXTRA_EXIT_ECM_RESULT, false));
+                        EmergencyCallbackModeExitDialog.this.setResult(RESULT_CANCELED);
                         finish();
                     }
                     break;

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index f6a225b..4bdc04a 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -1834,13 +1834,9 @@
         public void onActivityResult(int requestCode, int resultCode, Intent data) {
             switch(requestCode) {
                 case REQUEST_CODE_EXIT_ECM:
-                    Boolean isChoiceYes = data.getBooleanExtra(
-                            EmergencyCallbackModeExitDialog.EXTRA_EXIT_ECM_RESULT, false);
-                    if (isChoiceYes) {
+                    if (resultCode != Activity.RESULT_CANCELED) {
                         // If the phone exits from ECM mode, show the CDMA Options
                         mCdmaOptions.showDialog(mClickedPreference);
-                    } else {
-                        // do nothing
                     }
                     break;