Merge "Fix an incorrect null check" am: 09071b4fa8 am: 2de74edd83 am: b0b9af6f19

am: 8164060184

Change-Id: I21614803991c575f7de67157fd33d93002768011
This commit is contained in:
Edward Savage-Jones
2018-07-20 08:31:00 -07:00
committed by android-build-merger

View File

@@ -481,7 +481,7 @@ public class NotificationManagerService extends SystemService {
String defaultDndAccess = getContext().getResources().getString(
com.android.internal.R.string.config_defaultDndAccessPackages);
if (defaultListenerAccess != null) {
if (defaultDndAccess != null) {
for (String whitelisted :
defaultDndAccess.split(ManagedServices.ENABLED_SERVICES_SEPARATOR)) {
try {