Merge "Use additional ro property to determine provisioning condition" into main

1 files changed, 10 insertions, 1 deletions

diff --git a/provision/EmulatorProvisonLib/src/com/android/sdksetup/ProvisionActivity.java b/provision/EmulatorProvisonLib/src/com/android/sdksetup/ProvisionActivity.java
index 8c3a7bff..8ba2c913 100644
--- a/provision/EmulatorProvisonLib/src/com/android/sdksetup/ProvisionActivity.java
+++ b/provision/EmulatorProvisonLib/src/com/android/sdksetup/ProvisionActivity.java
@@ -46,7 +46,7 @@ public abstract class ProvisionActivity extends Activity {
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        if (Settings.Global.getInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0) != 1) {
+        if (provisionRequired()) {
             preProvivion();
             doProvision();
             postProvision();
@@ -225,4 +225,13 @@ public abstract class ProvisionActivity extends Activity {
             }
         }
     }
+
+    protected boolean provisionRequired() {
+        return (Settings.Global.getInt(getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 0) != 1) || forceProvision();
+    }
+
+    protected boolean forceProvision() {
+        return SystemProperties.get("ro.automotive_emulator.provisioning", "").equals("SdkSetup");
+    }
 }