commit 2c2b6b48de737acd06dff0b8151c7f0c9f202193
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 09 20:57:50 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 09 20:57:50 2017 +0000
tree 3484a12655ec11ca7798de62db4a5f5a19489b1d
parent 97e0e42959fca75b3364fa4c41a45e1d5fe23ffe
parent c18c517467a49d74ec3262c2f4df1a44986f7ec3

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

src/com/android/settings/notification/ChannelNotificationSettings.java

diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index c873c07..6c052d5 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -352,7 +352,9 @@
         if (mRingtone != null) {
             mRingtone.onActivityResult(requestCode, resultCode, data);
         }
-        mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
+        if (mChannel != null) {
+            mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
+        }
     }
 
     boolean canPulseLight() {