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 
am: 2c2b6b48de

Change-Id: I4255d1eea7583a448172dbfaba5fdec1eb168c28
This commit is contained in:
qqzhou
2017-08-09 21:07:36 +00:00
committed by android-build-merger
parent b2da45dd09 2c2b6b48de
commit 13d1167e44
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() {