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

Merge "Fix NPE for devices that don't use a lock icon in sysui." into qt-dev

Browse Source 
am: 6490c31b4c

Change-Id: I4aaa45ca3f45570b8f6f5b844e2023e4faff4122
This commit is contained in:
Brad Stenning
2019-04-19 21:11:19 -07:00
committed by android-build-merger
parent 2c0915a69f 6490c31b4c
commit 9b8f834e48
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -134,7 +134,10 @@ public class KeyguardIndicationController implements StateListener {
mTextView.getTextColors() : ColorStateList.valueOf(Color.WHITE);
mDisclosure = indicationArea.findViewById(R.id.keyguard_indication_enterprise_disclosure);
mLockIcon = lockIcon;
mLockIcon.setOnLongClickListener(this::handleTrustCircleClick);
// lock icon is not used on all form factors.
if (mLockIcon != null) {
mLockIcon.setOnLongClickListener(this::handleTrustCircleClick);
}
mWakeLock = new SettableWakeLock(wakeLock, TAG);
mLockPatternUtils = lockPatternUtils;

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -250,6 +250,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
}
private void updateLockIcon() {
// Not all form factors have a lock icon
if (mLockIconContainer == null) {
return;
}
boolean keyguardWithoutQs = mStatusBarStateController.getState() == StatusBarState.KEYGUARD
&& !mNotificationPanelView.isQsExpanded();
int lockVisibility = (mBouncer.isShowing() || keyguardWithoutQs)