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

am: add20708ba

Change-Id: Ic4dadceeb8d6a5197875177343f103e87df08a30
This commit is contained in:
qqzhou
2017-08-10 02:25:22 +00:00
committed by android-build-merger

View File

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