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

Commit fda1e104 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 exception\" into nyc-dev 

am: 4eaaf7c8

Change-Id: I92267b8ce147e9172147e0bea4ac2c23e91f6e8b
parents 75b60d5f 4eaaf7c8

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,