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

Merge "Check for lock icon nullability" into qt-dev

Browse Source 
am: e0bbf0e387

Change-Id: I62c349e5cec1b9361fe174aa1fae3fbe3b2d2aed
This commit is contained in:
Lucas Dupin
2019-05-14 15:53:45 -07:00
committed by android-build-merger
parent af14dc08ba e0bbf0e387
commit 12a34b05d7
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
View File

@@ -262,7 +262,9 @@ public class StatusBarWindowView extends FrameLayout {
* Propagate {@link StatusBar} pulsing state.
*/
public void setPulsing(boolean pulsing) {
mLockIcon.setPulsing(pulsing);
if (mLockIcon != null) {
mLockIcon.setPulsing(pulsing);
}
}
/**
@@ -270,14 +272,18 @@ public class StatusBarWindowView extends FrameLayout {
* @param wakeAndUnlock If the type is {@link BiometricUnlockController#isWakeAndUnlock()}
*/
public void onBiometricAuthModeChanged(boolean wakeAndUnlock) {
mLockIcon.onBiometricAuthModeChanged(wakeAndUnlock);
if (mLockIcon != null) {
mLockIcon.onBiometricAuthModeChanged(wakeAndUnlock);
}
}
/**
* Called after finished unlocking and the status bar window is already collapsed.
*/
public void onKeyguardFadedAway() {
mLockIcon.onKeyguardFadedAway();
if (mLockIcon != null) {
mLockIcon.onKeyguardFadedAway();
}
}
public void setStatusBarView(PhoneStatusBarView statusBarView) {