diff options
| author | Julia Reynolds <juliacr@google.com> | 2019-03-28 16:41:36 -0400 |
|---|---|---|
| committer | Julia Reynolds <juliacr@google.com> | 2019-03-28 16:42:13 -0400 |
| commit | bd2bb06567100eff0a22d48e53059bce7a94e44f (patch) | |
| tree | ae72ebf7babb3a23916ad5496e75cc672bf179e5 /src/com/android/settings/notification/NotificationPreferenceController.java | |
| parent | 1cc5eef87f9d6c51d63b0bb2c4c57977c72aafc0 (diff) | |
| download | packages_apps_Settings-bd2bb06567100eff0a22d48e53059bce7a94e44f.tar.gz packages_apps_Settings-bd2bb06567100eff0a22d48e53059bce7a94e44f.tar.bz2 packages_apps_Settings-bd2bb06567100eff0a22d48e53059bce7a94e44f.zip | |
Prevent oem locked and default apps from being blocked
Test: robotests
Fixes: 129358763
Change-Id: I999b017f9f7389424e499a44cfac43711acbbbea
Diffstat (limited to 'src/com/android/settings/notification/NotificationPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/notification/NotificationPreferenceController.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java index 3f535fb074..d2b7c43d8b 100644 --- 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; } |