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

Commit cec525e8 authored by Chandru S's avatar Chandru S
Browse files

Create cancellation signal closer to where face detection runs 

With this change the detectCancellationSignal only gets modified from the main thread.
The nonNull check started appearing (rarely) out in the wild from 2023-12-05 a couple of days after we moved flows to the bg dispatcher, that meant this line was being executed in the background thread.
This error stopped in builds appearing created after 2023-12-13 after we reverted the change.

This change is a no-op right now

Bug: 316255379
Flag: NONE
Test: everything builds.
Change-Id: Ied8c792344a75329a799d53ebc586490f028d51c
parent 01f5ca18

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepository.kt

+10 −8
Original line number Diff line number Diff line
@@ -626,19 +626,21 @@ constructor( 
            faceAuthLogger.skippingDetection(_isAuthRunning.value, detectCancellationSignal != null)

            return

        }

        detectCancellationSignal?.cancel()

        detectCancellationSignal = CancellationSignal()

        withContext(mainDispatcher) {

            // We always want to invoke face detect in the main thread.

            faceAuthLogger.faceDetectionStarted()

            detectCancellationSignal?.cancel()

            detectCancellationSignal = CancellationSignal()

            detectCancellationSignal?.let {

                faceManager?.detectFace(

                checkNotNull(detectCancellationSignal),

                    it,

                    detectionCallback,

                    SysUiFaceAuthenticateOptions(currentUserId, uiEvent, uiEvent.extraInfo)

                        .toFaceAuthenticateOptions()

                )

            }

        }

    }



    private val currentUserId: Int

        get() = userRepository.getSelectedUserInfo().id