diff options
| author | 2021-06-17 09:30:28 +0000 | |
|---|---|---|
| committer | 2021-06-17 09:30:28 +0000 | |
| commit | 8766e5c15edf4aabb440803447466b028dc66c03 (patch) | |
| tree | 424adc83a8cf303f255afd5adcb7cf839f59c4f0 | |
| parent | 2ae1e25b803e43813ceb40546d9c479b50c57c8b (diff) | |
| parent | ed08ff82c427c5c3a604cc5f39546d3916891f41 (diff) | |
Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev
| -rw-r--r-- | packages/SystemUI/res/values-television/config.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values-television/config.xml b/packages/SystemUI/res/values-television/config.xml index 70bd85036198..2f0957caaaae 100644 --- a/packages/SystemUI/res/values-television/config.xml +++ b/packages/SystemUI/res/values-television/config.xml @@ -33,6 +33,7 @@ <item>com.android.systemui.statusbar.tv.notifications.TvNotificationPanel</item> <item>com.android.systemui.statusbar.tv.notifications.TvNotificationHandler</item> <item>com.android.systemui.statusbar.tv.VpnStatusObserver</item> + <item>com.android.systemui.globalactions.GlobalActionsComponent</item> <item>com.android.systemui.usb.StorageNotification</item> <item>com.android.systemui.power.PowerUI</item> <item>com.android.systemui.media.RingtonePlayer</item> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 2601b8b14e1d..e8463992ed13 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -899,6 +899,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb }; protected void updateStates() { + if (mContainer == null ) { + return; + } int vis = mContainer.getSystemUiVisibility(); boolean showing = mShowing; boolean occluded = mOccluded; |