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

am: 2c2b6b48de

Change-Id: I4255d1eea7583a448172dbfaba5fdec1eb168c28
This commit is contained in:
qqzhou
2017-08-09 21:07:36 +00:00
committed by android-build-merger

View File

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