Merge "Notify "skip to caller."

2011-03-02 18:25:53 -08:00
parent e0d9ed4a31 83183f4698
commit 027d610205
1 changed files with 4 additions and 1 deletions
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -243,8 +243,11 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
                // We don't want to let Wifi enabled when a user press skip without choosing
                // any access point.
                mWifiManager.setWifiEnabled(false);
+                // Notify "skip"
+                setResult(RESULT_FIRST_USER);
+            } else {
+                setResult(RESULT_OK);
            }
-            setResult(RESULT_OK);
            finish();
        } else if (view == mConnectButton) {
            if (DEBUG) Log.d(TAG, "Connect button pressed");