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

am: 2c2b6b48de Change-Id: Id7c3417b82cd6f814f5ffbdd993a8c22be1c7a81
2017-08-09 22:41:12 +00:00
parent 14be0e4124 2c2b6b48de
commit 467aad4219
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -351,8 +351,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()