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

Hide block pref on non-configurable channels

Browse Source 
Test: robotests
Bug: 109875297
Change-Id: I164ae2e07d178db9e84746e5c59f0968e6c77eae
This commit is contained in:
Julia Reynolds
2018-06-07 15:45:41 -04:00
parent 90c770278e
commit 9e2ec5fa07
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/notification/NotificationPreferenceController.java
View File

@@ -138,11 +138,11 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
protected boolean isChannelBlockable() {
if (mChannel != null && mAppRow != null) {
if (!mAppRow.systemApp) {
return true;
if (!isChannelConfigurable()) {
return mChannel.getImportance() == IMPORTANCE_NONE;
}
return mChannel.isBlockableSystem()
return mChannel.isBlockableSystem() || !mAppRow.systemApp
|| mChannel.getImportance() == IMPORTANCE_NONE;
}
return false;