Merge "Fix bug that getBaseBandVersion() may write the value incorrectly." into rvc-dev am: b7efa56055 am: 64439fabab

Change-Id: I5035cfb5a287d00b2a4a166230d9252c42bd1ceb

telephony/java/android/telephony/TelephonyManager.java

@@ -9862,22 +9862,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.
      *
@@ -9885,10 +9869,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(), "");
     }