commit ddc80f5776fa8f78a8c097d46a697360365e6e8c
author Mayank Garg <gargmayank@google.com> Tue Sep 20 05:37:33 2022 +0000
committer Mayank Garg <gargmayank@google.com> Wed Sep 28 07:29:14 2022 +0000
tree 13784f5fd3b5449968e1514afba949a2b6e501d1
parent 0c1ee0b27022c8f5a6ba82b000cc6b23b756def1

Added version check so that car service doesn't crash

CarService was crashing on TM-QPR when car module was updated to U.

Bug: 247654777
Test: Manual Check
Change-Id: I26f5a26665ae82e54aded67f7d170f6395745462

service/src/com/android/car/user/CarUserService.java

diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index 950853f..8284aef 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -25,6 +25,7 @@
 import static com.android.car.PermissionHelper.checkHasAtLeastOnePermissionGranted;
 import static com.android.car.PermissionHelper.checkHasDumpPermissionGranted;
 import static com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport.DUMP_INFO;
+import static com.android.car.internal.util.VersionUtils.isPlatformVersionAtLeast;
 
 import android.annotation.IntDef;
 import android.annotation.NonNull;
@@ -1904,14 +1905,18 @@
                 }
             }
         }
-
         startUsersOrHomeOnSecondaryDisplays(userId);
     }
 
     private void startUsersOrHomeOnSecondaryDisplays(@UserIdInt int userId) {
-        if (!UserManagerHelper.isUsersOnSecondaryDisplaysSupported(mUserManager)) {
+        if (isPlatformVersionAtLeast(PlatformVersion.VERSION_CODES.UPSIDE_DOWN_CAKE_0)
+                && !UserManagerHelper.isUsersOnSecondaryDisplaysSupported(mUserManager)) {
+            if (DBG) {
+                Slogf.d(TAG, "startUsersOrHomeOnSecondaryDisplays(%d): not supported", userId);
+            }
             return;
         }
+
         // Run from here only when CMUMD is supported.
         if (userId == ActivityManager.getCurrentUser()) {
             mBgHandler.post(() -> startOtherUsers(/* currentUserId= */ userId));