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

Commit efe7da1b authored by Dave Daynard's avatar Dave Daynard Committed by Steve Kondik
Browse files

Allow override of DUN settings 

Allow override of system DUN settings by setting
persist.sys.dun.override
to one of the following values:
2 = not set, 0 = DUN not required, 1 = DUN required
If the prop is not set or is set to an invalid value the system setting
will be used.

Conflicts:
	services/java/com/android/server/connectivity/Tethering.java

Change-Id: I296f303a23351e4ab29898895abfcd313c747db9
parent a17b9b9f

services/core/java/com/android/server/connectivity/Tethering.java

+5 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.Log;
@@ -901,6 +902,10 @@ public class Tethering extends BaseNetworkObserver { 
    public void checkDunRequired() {

        int secureSetting = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.TETHER_DUN_REQUIRED, 2);

        // Allow override of TETHER_DUN_REQUIRED via prop

        int prop = SystemProperties.getInt("persist.sys.dun.override", -1);

        secureSetting = ((prop < 3) && (prop >= 0)) ? prop : secureSetting;



        synchronized (mPublicSync) {

            // 2 = not set, 0 = DUN not required, 1 = DUN required

            if (secureSetting != 2) {