diff options
author | Ying Zheng <yizheng@google.com> | 2018-06-05 14:06:26 -0700 |
---|---|---|
committer | Ying Zheng <yizheng@google.com> | 2018-06-05 15:38:23 -0700 |
commit | 11784a0c125bd9a147ba02984969c9ca68b15cbe (patch) | |
tree | c2757e165e1e163f44fa12f1a781739634e502b2 /car-lib | |
parent | bc847a0ef574b4aacc4a6f201bd7433b91aa77d3 (diff) | |
download | Car-11784a0c125bd9a147ba02984969c9ca68b15cbe.tar.gz |
Not allow deleting default user for now.
Bug: 109753975
Test: Manual
Change-Id: Ic7bae2287446fda5f643dc37fd16717cc02283bd
Diffstat (limited to 'car-lib')
-rw-r--r-- | car-lib/src/android/car/user/CarUserManagerHelper.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/car-lib/src/android/car/user/CarUserManagerHelper.java b/car-lib/src/android/car/user/CarUserManagerHelper.java index 7585ec76a9..4a69f0b738 100644 --- a/car-lib/src/android/car/user/CarUserManagerHelper.java +++ b/car-lib/src/android/car/user/CarUserManagerHelper.java @@ -17,6 +17,7 @@ package android.car.user; import android.annotation.Nullable; import android.app.ActivityManager; +import android.car.settings.CarSettings; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -227,6 +228,16 @@ public class CarUserManagerHelper { } /** + * Checks whether the user is default user. + * + * @param userInfo User to check against system user. + * @return {@code true} if is default user, {@code false} otherwise. + */ + public boolean isDefaultUser(UserInfo userInfo) { + return userInfo.id == CarSettings.DEFAULT_USER_ID_TO_BOOT_INTO; + } + + /** * Checks whether passed in user is the foreground user. * * @param userInfo User to check. @@ -409,6 +420,13 @@ public class CarUserManagerHelper { return false; } + // Not allow to delete the default user for now. Since default user is the one to + // boot into. + if (isHeadlessSystemUser() && isDefaultUser(userInfo)) { + Log.w(TAG, "User " + userInfo.id + " is the default user, could not be removed."); + return false; + } + if (userInfo.id == getCurrentForegroundUserId()) { startNewGuestSession(guestUserName); } |