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

Commit 26fedd6a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE for UDFPS devices without HBM" am: 6893b19a 

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

Change-Id: I715fd67585d6163a3de8d5bcc940698754c25b22
parents 6d5a0796 6893b19a

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.java

+17 −13
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ public class UdfpsView extends FrameLayout implements DozeReceiver, UdfpsIllumin 
        if (mGhbmView != null && surface == null) {

            Log.e(TAG, "doIlluminate | surface must be non-null for GHBM");

        }

        if (mHbmProvider != null) {

            mHbmProvider.enableHbm(mHbmType, surface, () -> {

                if (mGhbmView != null) {

                    mGhbmView.drawIlluminationDot(mSensorRect);
@@ -252,6 +253,7 @@ public class UdfpsView extends FrameLayout implements DozeReceiver, UdfpsIllumin 
                }

            });

        }

    }



    @Override

    public void stopIllumination() {
@@ -263,6 +265,8 @@ public class UdfpsView extends FrameLayout implements DozeReceiver, UdfpsIllumin 
            mGhbmView.setGhbmIlluminationListener(null);

            mGhbmView.setVisibility(View.INVISIBLE);

        }

        if (mHbmProvider != null) {

            mHbmProvider.disableHbm(null /* onHbmDisabled */);

        }

    }

}