From 89553ceaaf34435109373acc4a0ef9793bf94515 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Sat, 20 Aug 2022 02:55:36 +0000
Subject: [PATCH] Fixed argument check on AM.switchUser(UserHandle).

Test: atest com.android.server.pm.UserManagerTest#testSwitchUserByHandle_ThrowsException
Bug: 239982558

Change-Id: I84e903506e308e1a8d963b51ca1cc4e65579ff92
---
 core/java/android/app/ActivityManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 182b0a3e5149f..e4c758e3d1bdc 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -4336,7 +4336,7 @@ public class ActivityManager {
     @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS,
             android.Manifest.permission.CREATE_USERS})
     public boolean switchUser(@NonNull UserHandle user) {
-        Preconditions.checkNotNull(user, "UserHandle cannot be null.");
+        Preconditions.checkArgument(user != null, "UserHandle cannot be null.");
 
         return switchUser(user.getIdentifier());
     }