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

am: 467aad4219

Change-Id: I8084bdf06e20e94a2963f5bfe590a7588a9c2e4c
This commit is contained in:
qqzhou
2017-08-09 23:04:07 +00:00
committed by android-build-merger

View File

@@ -351,7 +351,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() {