commit c18c517467a49d74ec3262c2f4df1a44986f7ec3
author qqzhou <qqzhou@codeaurora.org> Mon Jul 03 15:10:59 2017 +0800
committer Dan Sandler <dsandler@android.com> Wed Aug 09 11:38:58 2017 -0400
tree c1a36474c0a0b5c7d6b1a590b5eec606e18e8ca1
parent b27d65fa55ad1e172e361447011423a3d1f89c5a

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

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() {