PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-12 04:37:22 +00:00
committed by Android (Google) Code Review
parent f6aa140c36 08ebca3804
commit cb789fffd5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/notification/NotificationStation.java
View File

@@ -372,7 +372,7 @@ public class NotificationStation extends SettingsPreferenceFragment {
sb.append("\n")
.append(bold(getString(R.string.notification_log_details_sound)))
.append(delim);
if (channel.getImportance() == IMPORTANCE_UNSPECIFIED) {
if (channel == null || channel.getImportance() == IMPORTANCE_UNSPECIFIED) {
if (0 != (n.defaults & Notification.DEFAULT_SOUND)) {
sb.append(getString(R.string.notification_log_details_default));
@@ -387,7 +387,7 @@ public class NotificationStation extends SettingsPreferenceFragment {
sb.append("\n")
.append(bold(getString(R.string.notification_log_details_vibrate)))
.append(delim);
if (channel.getImportance() == IMPORTANCE_UNSPECIFIED) {
if (channel == null || channel.getImportance() == IMPORTANCE_UNSPECIFIED) {
if (0 != (n.defaults & Notification.DEFAULT_VIBRATE)) {
sb.append(getString(R.string.notification_log_details_default));
} else if (n.vibrate != null) {