| commit | e598612edb78ac83649699c06e2e5c14f12fc859 | [log] [tgz] |
|---|---|---|
| author | Sander Alewijnse <salewijnse@google.com> | Tue Aug 19 14:25:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 19 14:25:08 2014 +0000 |
| tree | 4791efc57d9dfef57e8ab5320d464380cca8b42b | |
| parent | 2d6cc2e47548aaa870555b1603652580747e9233 [diff] | |
| parent | 31342068576d9715c024ca86c0e16c8a36332901 [diff] |
am 31342068: am 67efd63e: Merge "Set the result to RESULT_OK when provisioining succeeds." into lmp-dev * commit '31342068576d9715c024ca86c0e16c8a36332901': Set the result to RESULT_OK when provisioining succeeds.
diff --git a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java index 7a114ed..c0d91ad 100644 --- a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java +++ b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
@@ -203,6 +203,8 @@ } sendBroadcast(completeIntent); + + setResult(Activity.RESULT_OK); finish(); }