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

Commit 35f34eab authored by Jeremy Joslin's avatar Jeremy Joslin
Browse files

Rename isCallerSystemUid(). 

The method wasn't actually checking if the caller was
Process.SYSTEM_UID, nor was that it's intent.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Change-Id: I341f2fb1d1dca0a460140992a68831316daa4eb8
parent e3ed795f

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

+3 −3
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub { 
        }

    }



    private boolean isCallerSystemUid() {

    private boolean callerCanRequestScores() {

        // REQUEST_NETWORK_SCORES is a signature only permission.

        return mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES) ==

                 PackageManager.PERMISSION_GRANTED;
@@ -634,7 +634,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub { 
    @Override

    public boolean clearScores() {

        // Only the active scorer or the system should be allowed to flush all scores.

        if (isCallerActiveScorer(getCallingUid()) || isCallerSystemUid()) {

        if (isCallerActiveScorer(getCallingUid()) || callerCanRequestScores()) {

            final long token = Binder.clearCallingIdentity();

            try {

                clearInternal();
@@ -695,7 +695,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub { 
    @Override

    public void disableScoring() {

        // Only the active scorer or the system should be allowed to disable scoring.

        if (isCallerActiveScorer(getCallingUid()) || isCallerSystemUid()) {

        if (isCallerActiveScorer(getCallingUid()) || callerCanRequestScores()) {

            // no-op for now but we could write to the setting if needed.

        } else {

            throw new SecurityException(