Merge "Merge "Overload setTelephonyProperty without phone ID" am: f27242dbd6... (dd4b4352) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+29 −2

Original line number	Diff line number	Diff line
		@@ -4801,7 +4801,7 @@ public class TelephonyManager {
		}

		/**
		* Sets the telephony property with the value specified.
		* Sets a per-phone telephony property with the value specified.
		*
		* @hide
		*/
		@@ -4850,6 +4850,20 @@ public class TelephonyManager {
		SystemProperties.set(property, propVal);
		}

		/**
		* Sets a global telephony property with the value specified.
		*
		* @hide
		*/
		public static void setTelephonyProperty(String property, String value) {
		if (value == null) {
		value = "";
		}
		Rlog.d(TAG, "setTelephonyProperty: success" + " property=" +
		property + " value: " + value);
		SystemProperties.set(property, value);
		}

		/**
		* Convenience function for retrieving a value from the secure settings
		* value list as an integer. Note that internally setting values are
		@@ -4939,7 +4953,7 @@ public class TelephonyManager {
		}

		/**
		* Gets the telephony property.
		* Gets a per-phone telephony property.
		*
		* @hide
		*/
		@@ -4955,6 +4969,19 @@ public class TelephonyManager {
		return propVal == null ? defaultVal : propVal;
		}

		/**
		* Gets a global telephony property.
		*
		* See also getTelephonyProperty(phoneId, property, defaultVal). Most telephony properties are
		* per-phone.
		*
		* @hide
		*/
		public static String getTelephonyProperty(String property, String defaultVal) {
		String propVal = SystemProperties.get(property);
		return propVal == null ? defaultVal : propVal;
		}

		/** @hide */
		public int getSimCount() {
		// FIXME Need to get it from Telephony Dev Controller when that gets implemented!