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

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

Merge \\\"Note null alarm worksource names under the alarm\\\'s package\\\"... 

Merge \\\"Note null alarm worksource names under the alarm\\\'s package\\\" into nyc-dev am: 2f4636a3 am: 84df0246
am: 6341ca30

Change-Id: I36154dc768407086bf648309c3a9f3b8f3467cb7
parents b4e2c577 6341ca30

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

+6 −1
Original line number Diff line number Diff line
@@ -3073,9 +3073,14 @@ class AlarmManagerService extends SystemService { 
                fs.numWakeup++;

                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),

                                alarm.workSource.getName(wi), alarm.statsTag);

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

                                alarm.statsTag);

                    }

                } else {

                    ActivityManagerNative.noteWakeupAlarm(