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

Merge "Prevent crash when switching displays with screen off" into sc-v2-dev

Browse Source
This commit is contained in:
Alex Florescu
2021-06-03 12:03:55 +00:00
committed by Android (Google) Code Review
parent 166d07a5d5 50be0fb14e
commit 0e79969bd4
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
View File

@@ -1585,6 +1585,13 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
// This receiver is unregistered when the view is detached, but on devices with multiple
// displays, it can sometimes still receive an ACTION_SCREEN_ON/ACTION_SCREEN_OFF on
// display switch, after it was detached, so this null check ensures no crash in that
// scenario.
if (mNavigationBarView == null) {
return;
}
String action = intent.getAction(); String action = intent.getAction();
if (Intent.ACTION_SCREEN_OFF.equals(action) if (Intent.ACTION_SCREEN_OFF.equals(action)
|| Intent.ACTION_SCREEN_ON.equals(action)) { || Intent.ACTION_SCREEN_ON.equals(action)) {