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

Browse Source 
am: 467aad4219

Change-Id: I8084bdf06e20e94a2963f5bfe590a7588a9c2e4c
This commit is contained in:
qqzhou
2017-08-09 23:04:07 +00:00
committed by android-build-merger
parent 319c45ad51 467aad4219
commit add20708ba
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/ChannelNotificationSettings.java
View File

@@ -351,8 +351,10 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
if (mRingtone != null) { if (mRingtone != null) {
mRingtone.onActivityResult(requestCode, resultCode, data); mRingtone.onActivityResult(requestCode, resultCode, data);
} }
if (mChannel != null) {
mImportance.setSummary(getImportanceSummary(mChannel.getImportance())); mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
} }
}
boolean canPulseLight() { boolean canPulseLight() {
if (!getResources() if (!getResources()