diff options
| author | 2023-09-20 22:14:59 +0000 | |
|---|---|---|
| committer | 2023-09-20 22:14:59 +0000 | |
| commit | 558e2ef70a471854ce508ebca7074777f9849128 (patch) | |
| tree | 4b145aff62f21f7d5ec93be87dd4e40ff71400e7 | |
| parent | aaf3346fe32f3fc5d6f9d9d55120ac42d816fd04 (diff) | |
| parent | 901933af7d6775a5a9c27a3e6ba03f81eb56a294 (diff) | |
Merge "Fix NullPointException in KeyguardUpdateMonitor" into udc-qpr-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 5b9b53e65ff4..e2855c9e7260 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -4214,7 +4214,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); final boolean previousState = mAllowFingerprintOnCurrentOccludingActivity; mAllowFingerprintOnCurrentOccludingActivity = - standardTask.topActivity != null + standardTask != null && standardTask.topActivity != null && !TextUtils.isEmpty(standardTask.topActivity.getPackageName()) && mAllowFingerprintOnOccludingActivitiesFromPackage.contains( standardTask.topActivity.getPackageName()) |