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

Commit 876f3281 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 am: 26fedd6a am: c42b1280 

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

Change-Id: I81837e2232563244c855565a226ba6e5da1958ea
parents 2d3bb1c0 c42b1280

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

+17 −13
Original line number Diff line number Diff line
@@ -241,6 +241,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);
@@ -254,6 +255,7 @@ public class UdfpsView extends FrameLayout implements DozeReceiver, UdfpsIllumin 
                }

            });

        }

    }



    @Override

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

            mGhbmView.setVisibility(View.INVISIBLE);

        }

        if (mHbmProvider != null) {

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

        }

    }

}