Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2e5db7a authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge \\\"Unspecified alarm worksource names are the rule, not the... 

Merge \\\"Unspecified alarm worksource names are the rule, not the exception\\\" into nyc-dev am: 4eaaf7c8 am: fda1e104
am: 02b84c09

Change-Id: Ie98028e553cd6889c7c7e9a6bb417e67f94ce136
parents 045de3f0 02b84c09

services/core/java/com/android/server/AlarmManagerService.java

+0 −3
Original line number Diff line number Diff line
@@ -3074,9 +3074,6 @@ class AlarmManagerService extends SystemService { 
                if (alarm.workSource != null && alarm.workSource.size() > 0) {

                    for (int wi=0; wi<alarm.workSource.size(); wi++) {

                        final String wsName = alarm.workSource.getName(wi);

                        if (wsName == null) {

                            Slog.w(TAG, "Null worksource name for alarm " + alarm);

                        }

                        ActivityManagerNative.noteWakeupAlarm(

                                alarm.operation, alarm.workSource.get(wi),

                                (wsName != null) ? wsName : alarm.packageName,