Merge "Add null checker for parent profile" into main

packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/CredentialInteractor.kt

@@ -62,7 +62,7 @@ constructor(
         userManager.getCredentialOwnerProfile(userId)
 
     override fun getParentProfileIdOrSelfId(userId: Int): Int =
-        userManager.getProfileParent(userId).id
+        userManager.getProfileParent(userId)?.id ?: userManager.getCredentialOwnerProfile(userId)
 
     override fun verifyCredential(
         request: BiometricPromptRequest.Credential,

packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/CredentialInteractorImplTest.kt

@@ -99,6 +99,16 @@ class CredentialInteractorImplTest : SysuiTestCase() {
         }
     }
 
+    @Test
+    fun useCredentialOwnerWhenParentProfileIsNull() {
+        val value = 1
+
+        whenever(userManager.getProfileParent(eq(USER_ID))).thenReturn(null)
+        whenever(userManager.getCredentialOwnerProfile(eq(USER_ID))).thenReturn(value)
+
+        assertThat(interactor.getParentProfileIdOrSelfId(USER_ID)).isEqualTo(value)
+    }
+
     @Test fun pinCredentialWhenGood() = pinCredential(goodCredential())
 
     @Test fun pinCredentialWhenBad() = pinCredential(badCredential())