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

2016-06-17 23:20:18 +00:00
parent f33ce4e846 e555cb9f4a
commit 4eaaf7c8ff
1 changed files with 0 additions and 3 deletions
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@ -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,