Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."

Browse Source
This commit is contained in:
Treehugger Robot
2017-01-20 02:00:42 +00:00
committed by Gerrit Code Review
parent 00514f1dc0 c4982553b9
commit b5b00857eb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/NetworkScoreService.java
View File

@@ -604,7 +604,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
@Override @Override
public void requestRecommendationAsync(RecommendationRequest request, public void requestRecommendationAsync(RecommendationRequest request,
RemoteCallback remoteCallback) { RemoteCallback remoteCallback) {
mContext.enforceCallingOrSelfPermission(permission.BROADCAST_NETWORK_PRIVILEGED, TAG); mContext.enforceCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES, TAG);
final OneTimeCallback oneTimeCallback = new OneTimeCallback(remoteCallback); final OneTimeCallback oneTimeCallback = new OneTimeCallback(remoteCallback);
final Pair<RecommendationRequest, OneTimeCallback> pair = final Pair<RecommendationRequest, OneTimeCallback> pair =

4
services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java
View File

@@ -290,12 +290,12 @@ public class NetworkScoreServiceTest {
@Test @Test
public void testRequestRecommendationAsync_noPermission() throws Exception { public void testRequestRecommendationAsync_noPermission() throws Exception {
doThrow(new SecurityException()).when(mContext) doThrow(new SecurityException()).when(mContext)
.enforceCallingOrSelfPermission(eq(permission.BROADCAST_NETWORK_PRIVILEGED), .enforceCallingOrSelfPermission(eq(permission.REQUEST_NETWORK_SCORES),
anyString()); anyString());
try { try {
mNetworkScoreService.requestRecommendationAsync(mRecommendationRequest, mNetworkScoreService.requestRecommendationAsync(mRecommendationRequest,
mRemoteCallback); mRemoteCallback);
fail("BROADCAST_NETWORK_PRIVILEGED not enforced."); fail("REQUEST_NETWORK_SCORES not enforced.");
} catch (SecurityException e) { } catch (SecurityException e) {
// expected // expected
} }