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

Commit 5a6bdc46 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Improve ConnectivityManager docs 

Also fix some permission problems.
bug:5738328

Change-Id: Ib32c223f425b1fc03b8cce528456bcb50b540fdf
parent b8495145

core/java/android/net/ConnectivityManager.java

+383 −75

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −2
Original line number Diff line number Diff line
@@ -1823,6 +1823,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
    }



    public void sendConnectedBroadcast(NetworkInfo info) {

        enforceConnectivityInternalPermission();

        sendGeneralBroadcast(info, CONNECTIVITY_ACTION_IMMEDIATE);

        sendGeneralBroadcast(info, CONNECTIVITY_ACTION);

    }
@@ -2107,6 +2108,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 


    /** @hide */

    public void captivePortalCheckComplete(NetworkInfo info) {

        enforceConnectivityInternalPermission();

        mNetTrackers[info.getType()].captivePortalCheckComplete();

    }
@@ -2365,7 +2367,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
     * net.tcp.buffersize.[default|wifi|umts|edge|gprs] and set them for system

     * wide use

     */

   public void updateNetworkSettings(NetworkStateTracker nt) {

   private void updateNetworkSettings(NetworkStateTracker nt) {

        String key = nt.getTcpBufferSizesPropName();

        String bufferSizes = key == null ? null : SystemProperties.get(key);
@@ -2844,7 +2846,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
    }



    public int setUsbTethering(boolean enable) {

        enforceTetherAccessPermission();

        enforceTetherChangePermission();

        if (isTetheringSupported()) {

            return mTethering.setUsbTethering(enable);

        } else {
@@ -2997,6 +2999,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
    }



    public ProxyProperties getProxy() {

        enforceAccessPermission();

        synchronized (mDefaultProxyLock) {

            return mDefaultProxyDisabled ? null : mDefaultProxy;

        }
@@ -3048,6 +3051,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
    }



    public ProxyProperties getGlobalProxy() {

        enforceAccessPermission();

        synchronized (mGlobalProxyLock) {

            return mGlobalProxy;

        }

services/java/com/android/server/connectivity/Vpn.java

+1 −0
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ public class Vpn extends BaseNetworkStateTracker { 
     * secondary thread to perform connection work, returning quickly.

     */

    public void startLegacyVpn(VpnProfile profile, KeyStore keyStore, LinkProperties egress) {

        enforceControlPermission();

        if (!keyStore.isUnlocked()) {

            throw new IllegalStateException("KeyStore isn't unlocked");

        }