Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13d1167e authored by qqzhou's avatar qqzhou Committed by android-build-merger
Browse files

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

am: 2c2b6b48

Change-Id: I4255d1eea7583a448172dbfaba5fdec1eb168c28
parents b2da45dd 2c2b6b48

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

+3 −1
Original line number Diff line number Diff line
@@ -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()