commit ba6e25d4021ee382ea482c28c5d360b62442a03d
author Rubin Xu <rubinxu@google.com> Mon Mar 23 17:26:21 2015 +0000
committer Rubin Xu <rubinxu@google.com> Mon Mar 23 17:26:21 2015 +0000
tree 8339538e204f27ac9d701cda10bcaebb98edf49d
parent 9059b2dcaeff2eb8d6ddba63c0cb73827cbb765e

Fix EXTRA_PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME types.

It is treated in one place as a String, while ComponentName in another
place.

Bug: 19806407
Bug: 19891726
Change-Id: Ibe01f2c30af964cb4d73fda644a1d5777b180875

src/com/android/managedprovisioning/MessageParser.java

diff --git a/src/com/android/managedprovisioning/MessageParser.java b/src/com/android/managedprovisioning/MessageParser.java
index 26fce8c..19dde78 100644
--- a/src/com/android/managedprovisioning/MessageParser.java
+++ b/src/com/android/managedprovisioning/MessageParser.java
@@ -359,11 +359,8 @@
         if (hashString != null) {
             params.mDeviceAdminPackageChecksum = stringToByteArray(hashString);
         }
-        String name = intent.getStringExtra(
+        params.mDeviceInitializerComponentName = (ComponentName) intent.getParcelableExtra(
                 EXTRA_PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME);
-        if (name != null) {
-            params.mDeviceInitializerComponentName = ComponentName.unflattenFromString(name);
-        }
         params.mDeviceInitializerPackageDownloadLocation = intent.getStringExtra(
                 EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_LOCATION);
         params.mDeviceInitializerPackageDownloadCookieHeader = intent.getStringExtra(