Set MANAGED_PROVISIONING_DPC_DOWNLOADED when downloading DPC (oc).
Test: atest DownloadPackageTaskRoboTest
Bug: 132261064
Change-Id: I6174a490a3421b2217e4560d4465caa5ba8367e2
Merged-In: Iac574dcc0acd7594bd11d1b0001df3975685c78f
(cherry picked from commit 79be6ee2ed3330e96f3113a4fc59884116d9636a)
diff --git a/src/com/android/managedprovisioning/task/DownloadPackageTask.java b/src/com/android/managedprovisioning/task/DownloadPackageTask.java
index 867e6e8..6f044f6 100644
--- a/src/com/android/managedprovisioning/task/DownloadPackageTask.java
+++ b/src/com/android/managedprovisioning/task/DownloadPackageTask.java
@@ -15,6 +15,8 @@
*/
package com.android.managedprovisioning.task;
+import static android.provider.Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED;
+
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.PROVISIONING_DOWNLOAD_PACKAGE_TASK_MS;
import static com.android.internal.util.Preconditions.checkNotNull;
@@ -29,6 +31,7 @@
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
+import android.provider.Settings;
import com.android.internal.annotations.VisibleForTesting;
import com.android.managedprovisioning.common.ProvisionLogger;
@@ -102,6 +105,9 @@
error(ERROR_OTHER);
return;
}
+
+ setDpcDownloadedSetting(mContext);
+
mReceiver = createDownloadReceiver();
// register the receiver on the worker thread to avoid threading issues with respect to
// the location variable
@@ -134,6 +140,16 @@
mDownloadId = mDownloadManager.enqueue(request);
}
+ /**
+ * Set MANAGED_PROVISIONING_DPC_DOWNLOADED to 1, which will prevent restarting setup-wizard.
+ *
+ * <p>See b/132261064.
+ */
+ private static void setDpcDownloadedSetting(Context context) {
+ Settings.Secure.putInt(
+ context.getContentResolver(), MANAGED_PROVISIONING_DPC_DOWNLOADED, 1);
+ }
+
@Override
protected int getMetricsCategory() {
return PROVISIONING_DOWNLOAD_PACKAGE_TASK_MS;