From bc7a51132ab8254fdb30620ff1905619526a0f1f Mon Sep 17 00:00:00 2001 From: Mayank Garg Date: Sun, 27 Feb 2022 20:17:27 -0800 Subject: Improved error code for Remove Result Bug: 215555912 Test: atest UserManagerTest CarUserServiceTest Change-Id: I441e9afd03a2a510799dec13f796daac373964e7 --- service/src/com/android/car/user/CarUserService.java | 2 +- .../src/com/android/car/user/CarUserServiceTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java index 2020fd9489..c7ad9041dd 100644 --- a/service/src/com/android/car/user/CarUserService.java +++ b/service/src/com/android/car/user/CarUserService.java @@ -1084,7 +1084,7 @@ public final class CarUserService extends ICarUserService.Stub implements CarSer // "has caller restrictions" boolean overrideDevicePolicy = hasCallerRestrictions; int result = mUserManager.removeUserWhenPossible(user, overrideDevicePolicy); - if (result == UserManager.REMOVE_RESULT_ERROR) { + if (!UserManager.isRemoveResultSuccessful(result)) { sendUserRemovalResult(userId, UserRemovalResult.STATUS_ANDROID_FAILURE, receiver); return; } diff --git a/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java b/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java index 2f6a26acf8..ef6ad48661 100644 --- a/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java +++ b/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java @@ -769,7 +769,7 @@ public final class CarUserServiceTest extends BaseCarUserServiceTestCase { public void testRemoveUser_androidFailure() throws Exception { mockExistingUsersAndCurrentUser(mAdminUser); int targetUserId = mRegularUserId; - mockRemoveUser(mRegularUser, UserManager.REMOVE_RESULT_ERROR); + mockRemoveUser(mRegularUser, UserManager.REMOVE_RESULT_ERROR_UNKNOWN); removeUser(targetUserId, NO_CALLER_RESTRICTIONS, mUserRemovalFuture); -- cgit v1.2.3