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

Merge "Unspecified alarm worksource names are the rule, not the exception" into nyc-dev

Browse Source
This commit is contained in:
Chris Tate
2016-06-17 23:20:18 +00:00
committed by Android (Google) Code Review
parent f33ce4e846 e555cb9f4a
commit 4eaaf7c8ff
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3074,9 +3074,6 @@ class AlarmManagerService extends SystemService {
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); 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),
(wsName != null) ? wsName : alarm.packageName, (wsName != null) ? wsName : alarm.packageName,