Follow API change to rename *Blocked to *Hidden
Bug: 16191518
Also add a system property to disable encryption requirement, for
testing purposes.
Change-Id: Ic0f3690a9fc90a0dad0c67f5239754123c81108d
diff --git a/src/com/android/managedprovisioning/ManagedProvisioningActivity.java b/src/com/android/managedprovisioning/ManagedProvisioningActivity.java
index 3c36837..ac7e602 100644
--- a/src/com/android/managedprovisioning/ManagedProvisioningActivity.java
+++ b/src/com/android/managedprovisioning/ManagedProvisioningActivity.java
@@ -29,6 +29,7 @@
import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.os.SystemProperties;
import android.os.UserManager;
import android.support.v4.content.LocalBroadcastManager;
import android.text.TextUtils;
@@ -245,7 +246,8 @@
* user consent to encrypt the device.
*/
private void checkEncryptedAndStartProvisioningService() {
- if (EncryptDeviceActivity.isDeviceEncrypted()) {
+ if (EncryptDeviceActivity.isDeviceEncrypted()
+ || SystemProperties.getBoolean("persist.sys.no_req_encrypt", false)) {
// Remove any pre-provisioning UI in favour of progress display
BootReminder.cancelProvisioningReminder(this);
mProgressView.setVisibility(View.VISIBLE);
diff --git a/src/com/android/managedprovisioning/task/DeleteNonRequiredAppsTask.java b/src/com/android/managedprovisioning/task/DeleteNonRequiredAppsTask.java
index feff539..a36a5f9 100644
--- a/src/com/android/managedprovisioning/task/DeleteNonRequiredAppsTask.java
+++ b/src/com/android/managedprovisioning/task/DeleteNonRequiredAppsTask.java
@@ -65,7 +65,7 @@
for (String packageName : packagesToDelete) {
try {
- mIpm.setApplicationBlockedSettingAsUser(packageName, true, mUserId);
+ mIpm.setApplicationHiddenSettingAsUser(packageName, true, mUserId);
} catch (RemoteException neverThrown) {
// Never thrown, as we are making local calls.
ProvisionLogger.loge("This should not happen.", neverThrown);