Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE for UDFPS devices without HBM" am: 6893b19adc am: 26fedd6afe am: c42b128038

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

Change-Id: I81837e2232563244c855565a226ba6e5da1958ea
This commit is contained in:
Treehugger Robot
2021-11-16 18:34:47 +00:00
committed by Automerger Merge Worker
parent 2d3bb1c042 c42b128038
commit 876f328142
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.java
View File

@@ -241,18 +241,20 @@ public class UdfpsView extends FrameLayout implements DozeReceiver, UdfpsIllumin
if (mGhbmView != null && surface == null) { if (mGhbmView != null && surface == null) {
Log.e(TAG, "doIlluminate | surface must be non-null for GHBM"); Log.e(TAG, "doIlluminate | surface must be non-null for GHBM");
} }
mHbmProvider.enableHbm(mHbmType, surface, () -> { if (mHbmProvider != null) {
if (mGhbmView != null) { mHbmProvider.enableHbm(mHbmType, surface, () -> {
mGhbmView.drawIlluminationDot(mSensorRect); if (mGhbmView != null) {
} mGhbmView.drawIlluminationDot(mSensorRect);
if (onIlluminatedRunnable != null) { }
// No framework API can reliably tell when a frame reaches the panel. A timeout if (onIlluminatedRunnable != null) {
// is the safest solution. // No framework API can reliably tell when a frame reaches the panel. A timeout
postDelayed(onIlluminatedRunnable, mOnIlluminatedDelayMs); // is the safest solution.
} else { postDelayed(onIlluminatedRunnable, mOnIlluminatedDelayMs);
Log.w(TAG, "doIlluminate | onIlluminatedRunnable is null"); } else {
} Log.w(TAG, "doIlluminate | onIlluminatedRunnable is null");
}); }
});
}
} }
@Override @Override
@@ -265,6 +267,8 @@ public class UdfpsView extends FrameLayout implements DozeReceiver, UdfpsIllumin
mGhbmView.setGhbmIlluminationListener(null); mGhbmView.setGhbmIlluminationListener(null);
mGhbmView.setVisibility(View.INVISIBLE); mGhbmView.setVisibility(View.INVISIBLE);
} }
mHbmProvider.disableHbm(null /* onHbmDisabled */); if (mHbmProvider != null) {
mHbmProvider.disableHbm(null /* onHbmDisabled */);
}
} }
} }