Merge "Note null alarm worksource names under the alarm's package" into nyc-dev (2f4636a3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/AlarmManagerService.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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(