PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-09 20:57:50 +00:00
committed by Android (Google) Code Review
parent 97e0e42959 c18c517467
commit 2c2b6b48de
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/notification/ChannelNotificationSettings.java
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() {