SettingsProvider : Add functions for delimited strings (47f5b0e4) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+117 −0

Original line number	Diff line number	Diff line
		@@ -56,9 +56,12 @@ import android.util.Log;
		import com.android.internal.widget.ILockSettings;

		import java.net.URISyntaxException;
		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Locale;
		import java.util.regex.Pattern;

		/**
		* The Settings provider contains global system-level device preferences.
		@@ -1305,6 +1308,44 @@ public final class Settings {
		MOVED_TO_GLOBAL.add(Settings.Global.CERT_PIN_UPDATE_METADATA_URL);
		}

		/**
		* Put a delimited list as a string
		* @param resolver to access the database with
		* @param name to store
		* @param delimiter to split
		* @param list to join and store
		* @hide
		*/
		public static void putListAsDelimitedString(ContentResolver resolver, String name,
		String delimiter, List<String> list) {
		String store = TextUtils.join(delimiter, list);
		putString(resolver, name, store);
		}

		/**
		* Get a delimited string returned as a list
		* @param resolver to access the database with
		* @param name to store
		* @param delimiter to split the list with
		* @return list of strings for a specific Settings.Secure item
		* @hide
		*/
		public static List<String> getDelimitedStringAsList(ContentResolver resolver, String name,
		String delimiter) {
		String baseString = getString(resolver, name);
		List<String> list = new ArrayList<String>();
		if (!TextUtils.isEmpty(baseString)) {
		final String[] array = TextUtils.split(baseString, Pattern.quote(delimiter));
		for (String item : array) {
		if (TextUtils.isEmpty(item)) {
		continue;
		}
		list.add(item);
		}
		}
		return list;
		}

		/** @hide */
		public static void getMovedKeys(HashSet<String> outKeySet) {
		outKeySet.addAll(MOVED_TO_GLOBAL);
		@@ -3789,6 +3830,44 @@ public final class Settings {
		MOVED_TO_GLOBAL.add(Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY);
		}

		/**
		* Put a delimited list as a string
		* @param resolver to access the database with
		* @param name to store
		* @param delimiter to split
		* @param list to join and store
		* @hide
		*/
		public static void putListAsDelimitedString(ContentResolver resolver, String name,
		String delimiter, List<String> list) {
		String store = TextUtils.join(delimiter, list);
		putString(resolver, name, store);
		}

		/**
		* Get a delimited string returned as a list
		* @param resolver to access the database with
		* @param name to store
		* @param delimiter to split the list with
		* @return list of strings for a specific Settings.Secure item
		* @hide
		*/
		public static List<String> getDelimitedStringAsList(ContentResolver resolver, String name,
		String delimiter) {
		String baseString = getString(resolver, name);
		List<String> list = new ArrayList<String>();
		if (!TextUtils.isEmpty(baseString)) {
		final String[] array = TextUtils.split(baseString, Pattern.quote(delimiter));
		for (String item : array) {
		if (TextUtils.isEmpty(item)) {
		continue;
		}
		list.add(item);
		}
		}
		return list;
		}

		/** @hide */
		public static void getMovedKeys(HashSet<String> outKeySet) {
		outKeySet.addAll(MOVED_TO_GLOBAL);
		@@ -7629,6 +7708,44 @@ public final class Settings {
		MOVED_TO_SECURE.add(Settings.Global.INSTALL_NON_MARKET_APPS);
		}

		/**
		* Put a delimited list as a string
		* @param resolver to access the database with
		* @param name to store
		* @param delimiter to split
		* @param list to join and store
		* @hide
		*/
		public static void putListAsDelimitedString(ContentResolver resolver, String name,
		String delimiter, List<String> list) {
		String store = TextUtils.join(delimiter, list);
		putString(resolver, name, store);
		}

		/**
		* Get a delimited string returned as a list
		* @param resolver to access the database with
		* @param name to store
		* @param delimiter to split the list with
		* @return list of strings for a specific Settings.Secure item
		* @hide
		*/
		public static List<String> getDelimitedStringAsList(ContentResolver resolver, String name,
		String delimiter) {
		String baseString = getString(resolver, name);
		List<String> list = new ArrayList<String>();
		if (!TextUtils.isEmpty(baseString)) {
		final String[] array = TextUtils.split(baseString, Pattern.quote(delimiter));
		for (String item : array) {
		if (TextUtils.isEmpty(item)) {
		continue;
		}
		list.add(item);
		}
		}
		return list;
		}

		/**
		* Look up a name in the database.
		* @param resolver to access the database with