From c4982553b92a753e6436f1dd4e1f173d63dfc395 Mon Sep 17 00:00:00 2001
From: Jeremy Joslin <jjoslin@google.com>
Date: Wed, 18 Jan 2017 15:12:01 -0800
Subject: [PATCH] Check for REQUEST_NETWORK_SCORES instead of
 BROADCAST_NETWORK_PRIVILEGED.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33752149
Change-Id: I559e8f47c5edb491ea7cd0d03010736c81fcee9b
Merged-In: If261cf25c227eeeb4155e43afd9354e6ff8df3b4
---
 .../core/java/com/android/server/NetworkScoreService.java     | 2 +-
 .../src/com/android/server/NetworkScoreServiceTest.java       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/NetworkScoreService.java b/services/core/java/com/android/server/NetworkScoreService.java
index 6f497023bce73..7a22c92972b3d 100644
--- a/services/core/java/com/android/server/NetworkScoreService.java
+++ b/services/core/java/com/android/server/NetworkScoreService.java
@@ -604,7 +604,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
     @Override
     public void requestRecommendationAsync(RecommendationRequest request,
             RemoteCallback remoteCallback) {
-        mContext.enforceCallingOrSelfPermission(permission.BROADCAST_NETWORK_PRIVILEGED, TAG);
+        mContext.enforceCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES, TAG);
 
         final OneTimeCallback oneTimeCallback = new OneTimeCallback(remoteCallback);
         final Pair<RecommendationRequest, OneTimeCallback> pair =
diff --git a/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java
index 75d9c3911fca6..2e921c16bf6c7 100644
--- a/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java
@@ -290,12 +290,12 @@ public class NetworkScoreServiceTest {
     @Test
     public void testRequestRecommendationAsync_noPermission() throws Exception {
         doThrow(new SecurityException()).when(mContext)
-                .enforceCallingOrSelfPermission(eq(permission.BROADCAST_NETWORK_PRIVILEGED),
+                .enforceCallingOrSelfPermission(eq(permission.REQUEST_NETWORK_SCORES),
                         anyString());
         try {
             mNetworkScoreService.requestRecommendationAsync(mRecommendationRequest,
                     mRemoteCallback);
-            fail("BROADCAST_NETWORK_PRIVILEGED not enforced.");
+            fail("REQUEST_NETWORK_SCORES not enforced.");
         } catch (SecurityException e) {
             // expected
         }