am 6c1980bc: am 362e215e: Merge "Ensure ManagedProvisioning finish() calls set result code." into mnc-dev

* commit '6c1980bc5bf302d4444348e4716ff7b3b532eb68':
  Ensure ManagedProvisioning finish() calls set result code.

4 files changed, 10 insertions, 6 deletions

diff --git a/src/com/android/managedprovisioning/DeviceOwnerPreProvisioningActivity.java b/src/com/android/managedprovisioning/DeviceOwnerPreProvisioningActivity.java
index 5849cf90..2c213451 100644
--- a/src/com/android/managedprovisioning/DeviceOwnerPreProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/DeviceOwnerPreProvisioningActivity.java
@@ -125,7 +125,6 @@ public class DeviceOwnerPreProvisioningActivity extends SetupLayoutActivity
                         || SystemProperties.getBoolean("persist.sys.no_req_encrypt", false)
                         || mParams.skipEncryption)) {
             requestEncryption(parser, mParams);
-            finish();
             return;
             // System will reboot. Bootreminder will restart this activity.
         }
@@ -275,11 +274,13 @@ public class DeviceOwnerPreProvisioningActivity extends SetupLayoutActivity
         if (requestCode == ENCRYPT_DEVICE_REQUEST_CODE) {
             if (resultCode == RESULT_CANCELED) {
                 ProvisionLogger.loge("User canceled device encryption.");
+                setResult(RESULT_CANCELED);
                 finish();
             }
         } else if (requestCode == WIFI_REQUEST_CODE) {
             if (resultCode == RESULT_CANCELED) {
                 ProvisionLogger.loge("User canceled wifi picking.");
+                setResult(RESULT_CANCELED);
                 finish();
             } else if (resultCode == RESULT_OK) {
                 if (DEBUG) ProvisionLogger.logd("Wifi request result is OK");
diff --git a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
index ac21c7a0..29185e7b 100644
--- a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
@@ -230,7 +230,8 @@ public class DeviceOwnerProvisioningActivity extends SetupLayoutActivity {
                                         "DeviceOwnerProvisioningActivity.showCancelResetDialog()");
                                 sendBroadcast(intent);
                                 stopService(new Intent(DeviceOwnerProvisioningActivity.this,
-                                                DeviceOwnerProvisioningService.class));
+                                        DeviceOwnerProvisioningService.class));
+                                setResult(RESULT_CANCELED);
                                 finish();
                             }
                         })
@@ -270,6 +271,7 @@ public class DeviceOwnerProvisioningActivity extends SetupLayoutActivity {
                             sendBroadcast(intent);
                             stopService(new Intent(DeviceOwnerProvisioningActivity.this,
                                             DeviceOwnerProvisioningService.class));
+                            setResult(RESULT_CANCELED);
                             finish();
                         }
                     });
@@ -283,6 +285,7 @@ public class DeviceOwnerProvisioningActivity extends SetupLayoutActivity {
                             // Close activity.
                             stopService(new Intent(DeviceOwnerProvisioningActivity.this,
                                             DeviceOwnerProvisioningService.class));
+                            setResult(RESULT_CANCELED);
                             finish();
                         }
                     });
diff --git a/src/com/android/managedprovisioning/ProfileOwnerPreProvisioningActivity.java b/src/com/android/managedprovisioning/ProfileOwnerPreProvisioningActivity.java
index 2148b7ff..c721441e 100644
--- a/src/com/android/managedprovisioning/ProfileOwnerPreProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/ProfileOwnerPreProvisioningActivity.java
@@ -299,6 +299,7 @@ public class ProfileOwnerPreProvisioningActivity extends SetupLayoutActivity
 
     @Override
     public void onRemoveProfileCancel() {
+        setResult(Activity.RESULT_CANCELED);
         finish();
     }
 
diff --git a/src/com/android/managedprovisioning/ProfileOwnerProvisioningActivity.java b/src/com/android/managedprovisioning/ProfileOwnerProvisioningActivity.java
index d183e229..dbbb9cff 100644
--- a/src/com/android/managedprovisioning/ProfileOwnerProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/ProfileOwnerProvisioningActivity.java
@@ -179,10 +179,9 @@ public class ProfileOwnerProvisioningActivity extends SetupLayoutActivity {
     }
 
     private void onProvisioningAborted() {
-        ProfileOwnerProvisioningActivity.this.setResult(Activity.RESULT_CANCELED);
-        stopService(new Intent(ProfileOwnerProvisioningActivity.this,
-                        ProfileOwnerProvisioningService.class));
-        ProfileOwnerProvisioningActivity.this.finish();
+        stopService(new Intent(this, ProfileOwnerProvisioningService.class));
+        setResult(Activity.RESULT_CANCELED);
+        finish();
     }
 
     @Override