commit 7890e192885ea760f9997bed9fbb4e8bfc559cb1
author Jeremy Joslin <jjoslin@google.com> Mon Feb 06 11:14:34 2017 -0800
committer Jeremy Joslin <jjoslin@google.com> Mon Feb 06 11:14:34 2017 -0800
tree 3ae2004236b183783dbcb21b5cf646f8af09e99c
parent 391b1b82d291aa4e5a301397b4138a31abd2b3b5

Fix NPE when getting the callback cookie.

Was using the wrong method to fetch the cookie.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 34987725
Change-Id: Iba26086e52ded98c4bf2ea5f9b5d7d6abfe88c20

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

diff --git a/services/core/java/com/android/server/NetworkScoreService.java b/services/core/java/com/android/server/NetworkScoreService.java
index 22dbf44..5fe8b1a 100644
--- a/services/core/java/com/android/server/NetworkScoreService.java
+++ b/services/core/java/com/android/server/NetworkScoreService.java
@@ -927,7 +927,7 @@
                 try {
                     for (int i = 0; i < count; i++) {
                         consumer.accept(callbackList.getBroadcastItem(i),
-                                callbackList.getRegisteredCallbackCookie(i));
+                                callbackList.getBroadcastCookie(i));
                     }
                 } finally {
                     callbackList.finishBroadcast();