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

Commit 6c4a1905 authored by Xiao Ma's avatar Xiao Ma Committed by android-build-merger
Browse files

Merge "Restore the Private DNS settings to default mode upon network resets."... 

Merge "Restore the Private DNS settings to default mode upon network resets." into qt-dev am: da15cb03
am: bfbb0f7e

Change-Id: Ib4aa84f745ae26865a94325c8ba8bf8e5d6f9189
parents ea53d94f bfbb0f7e

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.Manifest.permission.RECEIVE_DATA_ACTIVITY_CHANGE; 
import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;

import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;

import static android.net.ConnectivityManager.NETID_UNSET;

import static android.net.ConnectivityManager.NETID_UNSET;

import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;

import static android.net.ConnectivityManager.TYPE_ETHERNET;

import static android.net.ConnectivityManager.TYPE_ETHERNET;

import static android.net.ConnectivityManager.TYPE_NONE;

import static android.net.ConnectivityManager.TYPE_NONE;

import static android.net.ConnectivityManager.TYPE_VPN;

import static android.net.ConnectivityManager.TYPE_VPN;
@@ -6952,6 +6953,12 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            }

            }

        }

        }





        // restore private DNS settings to default mode (opportunistic)

        if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_PRIVATE_DNS)) {

            Settings.Global.putString(mContext.getContentResolver(),

                    Settings.Global.PRIVATE_DNS_MODE, PRIVATE_DNS_MODE_OPPORTUNISTIC);

        }



        Settings.Global.putString(mContext.getContentResolver(),

        Settings.Global.putString(mContext.getContentResolver(),

                Settings.Global.NETWORK_AVOID_BAD_WIFI, null);

                Settings.Global.NETWORK_AVOID_BAD_WIFI, null);

    }

    }