Merge \\"Unspecified alarm worksource names are the rule, not the exception\\" into nyc-dev am: 4eaaf7c8ff
am: fda1e10468
Change-Id: Ifd5f337fef38346e7c55f67b0e07e9af9d71ec7d
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user