diff options
author | Yuichi Araki <yaraki@google.com> | 2016-08-01 17:26:51 +0900 |
---|---|---|
committer | Yuichi Araki <yaraki@google.com> | 2016-08-02 10:14:27 +0900 |
commit | b8008ace00a4111669422fc11b26df2e2a2a6c27 (patch) | |
tree | 2009db54ceb719bed75b08564a64c38321d5a99e /admin/NfcProvisioning/Application/src/main/java/com/example/android/nfcprovisioning/ProvisioningValuesLoader.java | |
parent | 65c62e9681dba7b5318c3dd25801f768fefcde24 (diff) | |
download | android-b8008ace00a4111669422fc11b26df2e2a2a6c27.tar.gz |
NfcProvisioning, DeviceOwner: Several fixes
- Use EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME on API Level 23 and
above
- Wrap deprecated Configuration#locale and use #getLocales().
- (Moderately) Materialize DeviceOwner app
- Remove an unused variable
Change-Id: Ic8288e157e3fd724201acb30e59d644a53219f53
Diffstat (limited to 'admin/NfcProvisioning/Application/src/main/java/com/example/android/nfcprovisioning/ProvisioningValuesLoader.java')
-rw-r--r-- | admin/NfcProvisioning/Application/src/main/java/com/example/android/nfcprovisioning/ProvisioningValuesLoader.java | 11 |
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)) { |