Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Note null alarm worksource names under the alarm's package" into nyc-dev

Browse Source
This commit is contained in:
Chris Tate
2016-06-14 20:37:06 +00:00
committed by Android (Google) Code Review
parent eb4e8105d3 0029f57123
commit 2f4636a333
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/AlarmManagerService.java
View File

@@ -3073,9 +3073,14 @@ class AlarmManagerService extends SystemService {
fs.numWakeup++; fs.numWakeup++;
if (alarm.workSource != null && alarm.workSource.size() > 0) { if (alarm.workSource != null && alarm.workSource.size() > 0) {
for (int wi=0; wi<alarm.workSource.size(); wi++) { 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( ActivityManagerNative.noteWakeupAlarm(
alarm.operation, alarm.workSource.get(wi), alarm.operation, alarm.workSource.get(wi),
alarm.workSource.getName(wi), alarm.statsTag); (wsName != null) ? wsName : alarm.packageName,
alarm.statsTag);
} }
} else { } else {
ActivityManagerNative.noteWakeupAlarm( ActivityManagerNative.noteWakeupAlarm(