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

Commit 7931bdc2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in FaceDetectClient" into sc-dev am: 48239434 am: cc15023a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15014047

Change-Id: Icb04befd9625eb6c917be0dae975a5babf5ec951
parents 9635bb6f cc15023a

services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java

+7 −5
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public class FaceDetectClient extends AcquisitionClient<ISession> implements Det 


    @Override

    protected void stopHalOperation() {

        if (mCancellationSignal != null) {

            try {

                mCancellationSignal.cancel();

            } catch (RemoteException e) {
@@ -66,6 +67,7 @@ public class FaceDetectClient extends AcquisitionClient<ISession> implements Det 
                mCallback.onClientFinished(this, false /* success */);

            }

        }

    }



    @Override

    protected void startHalOperation() {