Merge "Fix bug that getBaseBandVersion() may write the value incorrectly." into rvc-dev (b7efa560) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+0 −20

Original line number	Original line	Diff line number	Diff line
	@@ -9862,22 +9862,6 @@ public class TelephonyManager {
	return getBasebandVersionForPhone(phoneId);		return getBasebandVersionForPhone(phoneId);
	}		}

	/**
	* Get baseband version for the default phone using the legacy approach.
	* This change was added in P, to ensure backward compatiblity.
	*
	* @return baseband version.
	* @hide
	*/
	private String getBasebandVersionLegacy(int phoneId) {
	if (SubscriptionManager.isValidPhoneId(phoneId)) {
	String prop = "gsm.version.baseband"
	+ ((phoneId == 0) ? "" : Integer.toString(phoneId));
	return SystemProperties.get(prop);
	}
	return null;
	}

	/**		/**
	* Get baseband version by phone id.		* Get baseband version by phone id.
	*		*
	@@ -9885,10 +9869,6 @@ public class TelephonyManager {
	* @hide		* @hide
	*/		*/
	public String getBasebandVersionForPhone(int phoneId) {		public String getBasebandVersionForPhone(int phoneId) {
	String version = getBasebandVersionLegacy(phoneId);
	if (version != null && !version.isEmpty()) {
	setBasebandVersionForPhone(phoneId, version);
	}
	return getTelephonyProperty(phoneId, TelephonyProperties.baseband_version(), "");		return getTelephonyProperty(phoneId, TelephonyProperties.baseband_version(), "");
	}		}