1 files changed, 8 insertions, 3 deletions
diff --git a/admin/NfcProvisioning/Application/src/main/java/com/example/android/nfcprovisioning/ProvisioningValuesLoader.java b/admin/NfcProvisioning/Application/src/main/java/com/example/android/nfcprovisioning/ProvisioningValuesLoader.java
index 73a60532..f3940f1d 100644
--- a/admin/NfcProvisioning/Application/src/main/java/com/example/android/nfcprovisioning/ProvisioningValuesLoader.java
+++ b/admin/NfcProvisioning/Application/src/main/java/com/example/android/nfcprovisioning/ProvisioningValuesLoader.java
@@ -21,6 +21,7 @@ import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.os.Build;
 import android.os.Environment;
 import android.support.v4.content.AsyncTaskLoader;
 
@@ -136,9 +137,8 @@ public class ProvisioningValuesLoader extends AsyncTaskLoader<Map<String, String
     }
 
     private void gatherAdminExtras(HashMap<String, String> values) {
-        HashMap<String, String> newMap = new HashMap<String, String>();
         Properties props = new Properties();
-        Set<String>keys = new HashSet(values.keySet());
+        Set<String> keys = new HashSet<>(values.keySet());
         for (String key : keys) {
             if (key.startsWith("android.app.extra")) {
                 continue;
@@ -160,10 +160,15 @@ public class ProvisioningValuesLoader extends AsyncTaskLoader<Map<String, String
 
     private void loadSystemValues(HashMap<String, String> values) {
         Context context = getContext();
+        //noinspection deprecation
         putIfMissing(values, DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME,
                 "com.example.android.deviceowner");
+        if (Build.VERSION.SDK_INT >= 23) {
+            putIfMissing(values, DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME,
+                    "com.example.android.deviceowner/.DeviceOwnerReceiver");
+        }
         putIfMissing(values, DevicePolicyManager.EXTRA_PROVISIONING_LOCALE,
-                context.getResources().getConfiguration().locale.toString());
+                CompatUtils.getPrimaryLocale(context.getResources().getConfiguration()).toString());
         putIfMissing(values, DevicePolicyManager.EXTRA_PROVISIONING_TIME_ZONE,
                 TimeZone.getDefault().getID());
         if (!values.containsKey(DevicePolicyManager.EXTRA_PROVISIONING_WIFI_SSID)) {