Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev

This commit is contained in:
TreeHugger Robot
2017-08-09 20:57:50 +00:00
committed by Android (Google) Code Review

View File

@@ -352,7 +352,9 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
if (mRingtone != null) {
mRingtone.onActivityResult(requestCode, resultCode, data);
}
mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
if (mChannel != null) {
mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
}
}
boolean canPulseLight() {