Prevent oem locked and default apps from being blocked

Test: robotests Fixes: 129358763 Change-Id: I999b017f9f7389424e499a44cfac43711acbbbea
2019-03-28 16:41:36 -04:00
parent 1cc5eef87f
commit bd2bb06567
2 changed files with 29 additions and 0 deletions
--- a/src/com/android/settings/notification/NotificationPreferenceController.java
+++ b/src/com/android/settings/notification/NotificationPreferenceController.java
@@ -126,6 +126,11 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
                return mChannel.getImportance() == IMPORTANCE_NONE;
            }

+            if (mChannel.isImportanceLockedByOEM()
+                    || mChannel.isImportanceLockedByCriticalDeviceFunction()) {
+                return false;
+            }
+
            return mChannel.isBlockableSystem() || !mAppRow.systemApp
                    || mChannel.getImportance() == IMPORTANCE_NONE;
        }