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

Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f0f5796b95 am: a81102b92c am: 30de5f4593

Browse Source 
Change-Id: I18ffb79438ebc5cfb22b748953501f6a72ebf107
This commit is contained in:
Hall Liu
2020-03-19 21:54:53 +00:00
committed by Automerger Merge Worker
parent cb911db546 30de5f4593
commit 900ccba596
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java
View File

@@ -467,7 +467,7 @@ public class NotificationChannelSlice implements CustomSliceable {
return true;
}
return channel.isBlockableSystem()
return channel.isBlockable()
|| channel.getImportance() == IMPORTANCE_NONE;
}

2
src/com/android/settings/notification/app/NotificationPreferenceController.java
View File

@@ -134,7 +134,7 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
return channel.getImportance() == IMPORTANCE_NONE;
}
return channel.isBlockableSystem() || !mAppRow.systemApp
return channel.isBlockable() || !mAppRow.systemApp
|| channel.getImportance() == IMPORTANCE_NONE;
}
return false;