Settings: Fix NPE in ChannelNotificationSettings

java.lang.NullPointerException: Attempt to invoke virtual method 'int
android.app.NotificationChannel.getImportance()' on a null object
reference at com.android.settings.notification.ChannelNotificationSettings.
onActivityResult.

Change-Id: I3ec7b51e2533dc108b1a14c151e3ad70d22113e5
CRs-Fixed: 2068192
Fixes: 64116799
Fixes: 64134707
Test: monkey
This commit is contained in:
qqzhou
2017-07-03 15:10:59 +08:00
committed by Dan Sandler
parent b27d65fa55
commit c18c517467

View File

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