Merge "Add MOBILE_DATA_PREFERRED_APPS setting" into sc-dev (241dd6ef) · Commits · e / os / android_frameworks_base

packages/Connectivity/framework/api/module-lib-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ package android.net {
		method @Nullable public static android.net.ProxyInfo getGlobalProxy(@NonNull android.content.Context);
		method @NonNull public static java.time.Duration getMobileDataActivityTimeout(@NonNull android.content.Context, @NonNull java.time.Duration);
		method public static boolean getMobileDataAlwaysOn(@NonNull android.content.Context, boolean);
		method @Nullable public static String getMobileDataPreferredApps(@NonNull android.content.Context);
		method public static int getNetworkAvoidBadWifi(@NonNull android.content.Context);
		method @Nullable public static String getNetworkMeteredMultipathPreference(@NonNull android.content.Context);
		method public static int getNetworkSwitchNotificationMaximumDailyCount(@NonNull android.content.Context, int);
		@@ -72,6 +73,7 @@ package android.net {
		method public static void setGlobalProxy(@NonNull android.content.Context, @NonNull android.net.ProxyInfo);
		method public static void setMobileDataActivityTimeout(@NonNull android.content.Context, @NonNull java.time.Duration);
		method public static void setMobileDataAlwaysOn(@NonNull android.content.Context, boolean);
		method public static void setMobileDataPreferredApps(@NonNull android.content.Context, @Nullable String);
		method public static void setNetworkAvoidBadWifi(@NonNull android.content.Context, int);
		method public static void setNetworkMeteredMultipathPreference(@NonNull android.content.Context, @NonNull String);
		method public static void setNetworkSwitchNotificationMaximumDailyCount(@NonNull android.content.Context, @IntRange(from=0) int);

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

+33 −0

Original line number	Diff line number	Diff line
		@@ -332,6 +332,14 @@ public class ConnectivitySettingsManager {
		public static final String NETWORK_METERED_MULTIPATH_PREFERENCE =
		"network_metered_multipath_preference";

		/**
		* A list of apps that should go on cellular networks in preference even when higher-priority
		* networks are connected.
		*
		* @hide
		*/
		public static final String MOBILE_DATA_PREFERRED_APPS = "mobile_data_preferred_apps";

		/**
		* Get mobile data activity timeout from {@link Settings}.
		*
		@@ -893,4 +901,29 @@ public class ConnectivitySettingsManager {
		Settings.Global.putString(
		context.getContentResolver(), NETWORK_METERED_MULTIPATH_PREFERENCE, preference);
		}

		/**
		* Get the list of apps(from {@link Settings}) that should go on cellular networks in preference
		* even when higher-priority networks are connected.
		*
		* @param context The {@link Context} to query the setting.
		* @return A list of apps that should go on cellular networks in preference even when
		* higher-priority networks are connected or null if no setting value.
		*/
		@Nullable
		public static String getMobileDataPreferredApps(@NonNull Context context) {
		return Settings.Secure.getString(context.getContentResolver(), MOBILE_DATA_PREFERRED_APPS);
		}

		/**
		* Set the list of apps(to {@link Settings}) that should go on cellular networks in preference
		* even when higher-priority networks are connected.
		*
		* @param context The {@link Context} to set the setting.
		* @param list A list of apps that should go on cellular networks in preference even when
		* higher-priority networks are connected.
		*/
		public static void setMobileDataPreferredApps(@NonNull Context context, @Nullable String list) {
		Settings.Secure.putString(context.getContentResolver(), MOBILE_DATA_PREFERRED_APPS, list);
		}
		}