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

Merge "Fix potential NPE in NotificationRecord's KeyguardManager call" into udc-qpr-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-26 19:36:16 +00:00
committed by Android (Google) Code Review
parent 86e54c31ef c1b21100e8
commit 0dca838108
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/notification/NotificationRecord.java
View File

@@ -103,7 +103,7 @@ public final class NotificationRecord {
final int mTargetSdkVersion;
final int mOriginalFlags;
private final Context mContext;
private final KeyguardManager mKeyguardManager;
private KeyguardManager mKeyguardManager;
private final PowerManager mPowerManager;
NotificationUsageStats.SingleNotificationStats stats;
boolean isCanceled;
@@ -1625,10 +1625,21 @@ public final class NotificationRecord {
}
boolean isLocked() {
return mKeyguardManager.isKeyguardLocked()
return getKeyguardManager().isKeyguardLocked()
|| !mPowerManager.isInteractive(); // Unlocked AOD
}
/**
* For some early {@link NotificationRecord}, {@link KeyguardManager} can be {@code null} in
* the constructor. Retrieve it again if it is null.
*/
private KeyguardManager getKeyguardManager() {
if (mKeyguardManager == null) {
mKeyguardManager = mContext.getSystemService(KeyguardManager.class);
}
return mKeyguardManager;
}
@VisibleForTesting
static final class Light {
public final int color;