From 7890e192885ea760f9997bed9fbb4e8bfc559cb1 Mon Sep 17 00:00:00 2001 From: Jeremy Joslin Date: Mon, 6 Feb 2017 11:14:34 -0800 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/NetworkScoreService.java b/services/core/java/com/android/server/NetworkScoreService.java index 22dbf443a6315..5fe8b1a8ae9db 100644 --- a/services/core/java/com/android/server/NetworkScoreService.java +++ b/services/core/java/com/android/server/NetworkScoreService.java @@ -927,7 +927,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub { try { for (int i = 0; i < count; i++) { consumer.accept(callbackList.getBroadcastItem(i), - callbackList.getRegisteredCallbackCookie(i)); + callbackList.getBroadcastCookie(i)); } } finally { callbackList.finishBroadcast();