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

am: b0b9af6f19

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

View File

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