diff options
| author | Mayank Garg <gargmayank@google.com> | 2022-03-15 02:08:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-03-15 02:08:04 +0000 |
| commit | 554f2a600c8b9d9f38e8d8e7a4a70c4ae7ccdd56 (patch) | |
| tree | ae12f410e721ffc93e0c68b6f03d3fd1b1444a32 | |
| parent | bebc1183a6f8bc707301b0380d5444d34affa6ba (diff) | |
| parent | bc7a51132ab8254fdb30620ff1905619526a0f1f (diff) | |
| download | Car-554f2a600c8b9d9f38e8d8e7a4a70c4ae7ccdd56.tar.gz | |
Merge "Improved error code for Remove Result" into tm-dev
| -rw-r--r-- | service/src/com/android/car/user/CarUserService.java | 2 | ||||
| -rw-r--r-- | tests/carservice_unit_test/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 8a7973faf9..7c059aa700 100644 --- a/service/src/com/android/car/user/CarUserService.java +++ b/service/src/com/android/car/user/CarUserService.java @@ -1127,7 +1127,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 a22f9b4421..87d8637a1c 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 @@ -773,7 +773,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); |