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

Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev

Browse Source
This commit is contained in:
Daniel Sandler
2016-12-19 16:44:09 +00:00
committed by Android (Google) Code Review
parent bd510de4e9 6e54b889d0
commit be09dd77dc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,9 +242,9 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab
return Ranking.IMPORTANCE_UNSPECIFIED; return Ranking.IMPORTANCE_UNSPECIFIED;
} }
} else { } else {
if (mBlock.isChecked()) { if (mBlock != null && mBlock.isChecked()) {
return Ranking.IMPORTANCE_NONE; return Ranking.IMPORTANCE_NONE;
} else if (mSilent.isChecked()) { } else if (mSilent != null && mSilent.isChecked()) {
return Ranking.IMPORTANCE_LOW; return Ranking.IMPORTANCE_LOW;
} else { } else {
return Ranking.IMPORTANCE_UNSPECIFIED; return Ranking.IMPORTANCE_UNSPECIFIED;