Merge "Check validity of the ProvisioningParams and rename some fields."

1 files changed, 6 insertions, 4 deletions

diff --git a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
index 13502890..5f280794 100644
--- a/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/DeviceOwnerProvisioningActivity.java
@@ -92,9 +92,9 @@ public class DeviceOwnerProvisioningActivity extends Activity {
         Intent bumpData = getIntent();
         try {
             params = parser.parseNfcIntent(bumpData);
-        } catch (NfcMessageParser.NfcParseException e) {
+        } catch (NfcMessageParser.ParseException e) {
             ProvisionLogger.loge("Could not read Nfc data from intent", e);
-            error(R.string.device_owner_error_nfc_parse_fail);
+            error(e.getErrorMessageId());
             return;
         }
 
@@ -121,9 +121,9 @@ public class DeviceOwnerProvisioningActivity extends Activity {
         final DownloadPackageTask downloadPackageTask = new DownloadPackageTask(this,
                 params.mDownloadLocation, params.mHash);
         final InstallPackageTask installPackageTask = new InstallPackageTask(this,
-                params.mMdmPackageName, params.mMdmAdminReceiver);
+                params.mDeviceAdminPackageName, params.mAdminReceiver);
         final SetDevicePolicyTask setDevicePolicyTask = new SetDevicePolicyTask(this,
-                params.mMdmPackageName, params.mMdmAdminReceiver, params.mOwner);
+                params.mDeviceAdminPackageName, params.mAdminReceiver, params.mOwner);
 
         // Set callbacks.
         addWifiNetworkTask.setCallback(new AddWifiNetworkTask.Callback() {
@@ -254,6 +254,8 @@ public class DeviceOwnerProvisioningActivity extends Activity {
         }
         try {
             ProvisionLogger.logd("Setting locale to " + locale);
+            // If locale is different from current locale this results in a configuration change,
+            // which will trigger the restarting of the activity.
             LocalePicker.updateLocale(locale);
         } catch (Exception e) {
             ProvisionLogger.loge("Failed to set the system locale.");