commit b1d6143ffffc1fe7ea9025a9e74f83189049dc78
author Geoff Mendal <mendal@google.com> Wed Mar 18 14:27:09 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 18 14:27:10 2015 +0000
tree 5e3ce0b051704e4edd15d82101523939da8482c2
parent bc9b5ad5b498be9b25407938c273666a8ecb8875
parent 9bdb56d976578d63aed1090fd25e0794762f9627

Merge "Import translations. DO NOT MERGE"

src/com/android/managedprovisioning/DeviceOwnerProvisioningService.java

diff --git a/src/com/android/managedprovisioning/DeviceOwnerProvisioningService.java b/src/com/android/managedprovisioning/DeviceOwnerProvisioningService.java
index f5913e4..fd90682 100644
--- a/src/com/android/managedprovisioning/DeviceOwnerProvisioningService.java
+++ b/src/com/android/managedprovisioning/DeviceOwnerProvisioningService.java
@@ -30,7 +30,6 @@
 import android.os.IBinder;
 import android.os.UserHandle;
 import android.support.v4.content.LocalBroadcastManager;
-import android.text.TextUtils;
 
 import com.android.internal.app.LocalePicker;
 import com.android.managedprovisioning.task.AddWifiNetworkTask;
@@ -95,8 +94,8 @@
     // MessageId of the last error message.
     private int mLastErrorMessage = -1;
 
-    // Indicates whether provisioning has finished succesfully (service waiting to stop).
-    private boolean mDone = false;
+    // Indicates whether provisioning has finished successfully (service waiting to stop).
+    private volatile boolean mDone = false;
 
     // Provisioning tasks.
     private AddWifiNetworkTask mAddWifiNetworkTask;
@@ -124,7 +123,7 @@
                     sendError();
                 }
 
-                // Send success if provisioning was succesful.
+                // Send success if provisioning was successful.
                 if (mDone) {
                     onProvisioningSuccess();
                 }
@@ -311,6 +310,7 @@
                 R.array.vendor_required_apps_managed_device, true /* creating new profile */,
                 UserHandle.USER_OWNER, params.mLeaveAllSystemAppsEnabled,
                 new DeleteNonRequiredAppsTask.Callback() {
+                    @Override
                     public void onSuccess() {
                         // Done with provisioning. Success.
                         onProvisioningSuccess();
@@ -319,7 +319,7 @@
                     @Override
                     public void onError() {
                         error(R.string.device_owner_error_general);
-                    };
+                    }
                 });
 
         // Start first task, which starts next task in its callback, etc.