Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3465cd9e authored by Jeremy Joslin's avatar Jeremy Joslin Committed by android-build-merger
Browse files

Merge "Check for REQUEST_NETWORK_SCORES instead of... 

Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am: b5b00857 am: 0af25e62
am: 5418f151

Change-Id: I74ce97c93e640a601e811b571f37fe1fed114391
parents 261b5c4c 5418f151

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

+1 −1
Original line number Diff line number Diff line
@@ -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 =

services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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

        }