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

Commit 1b3fb5ff authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge "Allow testing of signal strength" am: 2f46cd18 am: 2e2b52d5 

Change-Id: Ib00611c70d9b8fc3e4ee5338980344f5e2167fa1
parents 885c7ef7 2e2b52d5

core/java/android/net/NetworkCapabilities.java

+2 −0
Original line number Diff line number Diff line
@@ -680,11 +680,13 @@ public final class NetworkCapabilities implements Parcelable { 
    public void restrictCapabilitesForTestNetwork() {

        final long originalCapabilities = mNetworkCapabilities;

        final NetworkSpecifier originalSpecifier = mNetworkSpecifier;

        final int originalSignalStrength = mSignalStrength;

        clearAll();

        // Reset the transports to only contain TRANSPORT_TEST.

        mTransportTypes = (1 << TRANSPORT_TEST);

        mNetworkCapabilities = originalCapabilities & TEST_NETWORKS_ALLOWED_CAPABILITIES;

        mNetworkSpecifier = originalSpecifier;

        mSignalStrength = originalSignalStrength;

    }



    /**

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

+2 −1
Original line number Diff line number Diff line
@@ -2151,7 +2151,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    private boolean checkNetworkSignalStrengthWakeupPermission(int pid, int uid) {

        return checkAnyPermissionOf(pid, uid,

                android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP,

                NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK);

                NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,

                android.Manifest.permission.NETWORK_SETTINGS);

    }



    private void enforceConnectivityRestrictedNetworksPermission() {