Merge \\\"Unspecified alarm worksource names are the rule, not the exception\\\" into nyc-dev am: 4eaaf7c8ff am: fda1e10468

am: 02b84c0945

Change-Id: Ie98028e553cd6889c7c7e9a6bb417e67f94ce136
This commit is contained in:
Christopher Tate
2016-06-17 23:42:05 +00:00
committed by android-build-merger

View File

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