commit 8f90edb2966e2a01c84221d3efced2057fa30948
author Ying Zheng <yizheng@google.com> Wed Jun 13 12:42:31 2018 -0700
committer Ying Zheng <yizheng@google.com> Thu Jun 14 09:50:35 2018 -0700
tree b83bf06f56b220d2883844468b76b6fab64d8bb0
parent 5b9840513954394c79f9479ad99df005a2d80935

Disable add accounts for user 0.

Bug: 79535560
Test: Unit test
Change-Id: Ib0f04ee28829c60e46fbc378b04917a04a52c5ae

service/src/com/android/car/user/CarUserService.java

diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index b80d2d3..a666210 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -23,6 +23,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.UserInfo;
+import android.os.UserManager;
 import android.util.Log;
 
 import com.android.car.CarServiceBase;
@@ -88,6 +89,10 @@
 
         if (intent.getAction() == Intent.ACTION_LOCKED_BOOT_COMPLETED) {
             if (mCarUserManagerHelper.getAllUsers().size() == 0) {
+                // Disable adding accounts for user 0.
+                mCarUserManagerHelper.setUserRestriction(mCarUserManagerHelper.getSystemUserInfo(),
+                        UserManager.DISALLOW_MODIFY_ACCOUNTS, true);
+                // On very first boot, create an admin user and switch to that user.
                 UserInfo admin = mCarUserManagerHelper.createNewAdminUser(OWNER_NAME);
                 mCarUserManagerHelper.switchToUser(admin);
             } else {