Merge "Fix bug that getBaseBandVersion() may write the value incorrectly." am: 074af36692 (a7a00e93) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -9807,22 +9807,6 @@ public class TelephonyManager {
		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.
		*
		@@ -9830,10 +9814,6 @@ public class TelephonyManager {
		* @hide
		*/
		public String getBasebandVersionForPhone(int phoneId) {
		String version = getBasebandVersionLegacy(phoneId);
		if (version != null && !version.isEmpty()) {
		setBasebandVersionForPhone(phoneId, version);
		}
		return getTelephonyProperty(phoneId, TelephonyProperties.baseband_version(), "");
		}