commit 112b3ab1c7eaa4e8e73421da4fb2e8ff25ac6fee
author Felipe Leme <felipeal@google.com> Sun Feb 28 00:56:33 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sun Feb 28 00:56:33 2021 +0000
tree 303af765582ff16b70578941683b06b95c872517
parent b53229572a86166a75cdc501af0af814098cfd13
parent 98fb72fe23a2c9992b1ffd9828ccb8896830b7c8

Fixed CarProvision so it only provisions user 0 after current user's. am: 98fb72fe23

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Provision/+/13617444

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I754365f5996fde68d2f513d44dd36913e08ec24d

src/com/android/car/provision/DefaultActivity.java

diff --git a/src/com/android/car/provision/DefaultActivity.java b/src/com/android/car/provision/DefaultActivity.java
index 24d3b46..bbd1b0a 100644
--- a/src/com/android/car/provision/DefaultActivity.java
+++ b/src/com/android/car/provision/DefaultActivity.java
@@ -143,8 +143,9 @@
         Log.i(TAG, "onCreate() for user " + userId + " Intent: " + getIntent());
 
         if (userId == UserHandle.USER_SYSTEM && UserManager.isHeadlessSystemUserMode()) {
-            Log.i(TAG, "onCreate(): skipping UI on headless system user");
-            finishSetup();
+            // System user will be provisioned together with the first non-system user
+            Log.i(TAG, "onCreate(): skipping setup on headless system user");
+            disableSelfAndFinish();
             return;
         }