Merge "Add ConnectivitySettingsManager" am: ef226d7a44 am: 7cf52fb928 (dc9bfe33) · Commits · e / os / android_frameworks_base

packages/Connectivity/framework/src/android/net/ConnectivitySettingsManager.java

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.net;

		/**
		* A manager class for connectivity module settings.
		*
		* @hide
		*/
		public class ConnectivitySettingsManager {

		private ConnectivitySettingsManager() {}

		/**
		* Whether to automatically switch away from wifi networks that lose Internet access.
		* Only meaningful if config_networkAvoidBadWifi is set to 0, otherwise the system always
		* avoids such networks. Valid values are:
		*
		* 0: Don't avoid bad wifi, don't prompt the user. Get stuck on bad wifi like it's 2013.
		* null: Ask the user whether to switch away from bad wifi.
		* 1: Avoid bad wifi.
		*/
		public static final String NETWORK_AVOID_BAD_WIFI = "network_avoid_bad_wifi";

		/**
		* User setting for ConnectivityManager.getMeteredMultipathPreference(). This value may be
		* overridden by the system based on device or application state. If null, the value
		* specified by config_networkMeteredMultipathPreference is used.
		*/
		public static final String NETWORK_METERED_MULTIPATH_PREFERENCE =
		"network_metered_multipath_preference";
		}

packages/Connectivity/framework/src/android/net/util/MultinetworkPolicyTracker.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@

		package android.net.util;

		import static android.provider.Settings.Global.NETWORK_AVOID_BAD_WIFI;
		import static android.provider.Settings.Global.NETWORK_METERED_MULTIPATH_PREFERENCE;
		import static android.net.ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI;
		import static android.net.ConnectivitySettingsManager.NETWORK_METERED_MULTIPATH_PREFERENCE;

		import android.annotation.NonNull;
		import android.content.BroadcastReceiver;

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ import android.net.ConnectivityDiagnosticsManager.ConnectivityReport;
		import android.net.ConnectivityDiagnosticsManager.DataStallReport;
		import android.net.ConnectivityManager;
		import android.net.ConnectivityManager.NetworkCallback;
		import android.net.ConnectivitySettingsManager;
		import android.net.DataStallReportParcelable;
		import android.net.DnsResolverServiceManager;
		import android.net.ICaptivePortal;
		@@ -8244,7 +8245,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}

		Settings.Global.putString(mContext.getContentResolver(),
		Settings.Global.NETWORK_AVOID_BAD_WIFI, null);
		ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI, null);
		}

		@Override