Merge "FixedActivity: add additional null check for UserManager" into rvc-dev
diff --git a/service/src/com/android/car/am/FixedActivityService.java b/service/src/com/android/car/am/FixedActivityService.java
index cd16463..ed5277a 100644
--- a/service/src/com/android/car/am/FixedActivityService.java
+++ b/service/src/com/android/car/am/FixedActivityService.java
@@ -571,6 +571,11 @@
return true;
}
int[] profileIds = mUm.getEnabledProfileIds(currentUser);
+ // null can happen in test env when UserManager is mocked. So this check is not necessary
+ // in real env but add it to make test impl easier.
+ if (profileIds == null) {
+ return false;
+ }
for (int id : profileIds) {
if (id == userId) {
return true;