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

Commit 02b84c09 authored by Chris Tate's avatar Chris Tate Committed by android-build-merger
Browse files

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

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

Change-Id: Ifd5f337fef38346e7c55f67b0e07e9af9d71ec7d
parents 0d7dcf7b fda1e104

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,