Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41a8090e authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Update active group when showing BiometricPrompt 

When authenticating after recently switching between work/owner profiles,
the active group is incorrect. This was fixed for keyguard. Now it's fixed
for BiometricPrompt as well.

Bug: 122582871

Test: 1) Flash wipe device
      2) Enroll FP in owner profile
      3) Set up testDPC using instructions in b/123502937 comment #1
      4) Enroll a work profile finger
      5) Install biometric prompt demo app
      6) Open owner profile version of app, show biometric prompt
      at this point, non-work background should be shown, and
      owner profile's fingerprint should be accepted

Change-Id: I429a703ad98f420de36b691fb740aabc08471e56
parent a30095d9

services/core/java/com/android/server/biometrics/face/FaceService.java

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ public class FaceService extends BiometricServiceBase { 
                String opPackageName, int cookie, int callingUid, int callingPid,

                int callingUserId) {

            checkPermission(USE_BIOMETRIC_INTERNAL);

            updateActiveGroup(groupId, opPackageName);

            final boolean restricted = true; // BiometricPrompt is always restricted

            final AuthenticationClientImpl client = new FaceAuthClient(getContext(),

                    mDaemonWrapper, mHalDeviceId, token,

services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ public class FingerprintService extends BiometricServiceBase { 
                IBiometricServiceReceiverInternal wrapperReceiver, String opPackageName,

                int cookie, int callingUid, int callingPid, int callingUserId) {

            checkPermission(MANAGE_BIOMETRIC);

            updateActiveGroup(groupId, opPackageName);

            final boolean restricted = true; // BiometricPrompt is always restricted

            final AuthenticationClientImpl client = new FingerprintAuthClient(getContext(),

                    mDaemonWrapper, mHalDeviceId, token,