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 
am: 2f4636a333

Change-Id: I326cbd9ed3494797190fc9ee8bfe22a5cdc844c8
This commit is contained in:
Christopher Tate
2016-06-14 20:54:09 +00:00
committed by android-build-merger
parent f1a2347d04 2f4636a333
commit 84df024632
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++;
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(