diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-11 22:45:01 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-11 22:45:01 +0100 |
| commit | c65088b68e9bb0aa97768c536822c6b82cc86b6f (patch) | |
| tree | 6f1f1189764a238d417ed7d2f742a56f78507ad9 /telephony | |
| parent | a57394a0be5e601c447a07786487bd4c34b0d899 (diff) | |
| parent | 4ba10939b7c05e4cf44d053ee8fa37a703c19e9b (diff) | |
| download | frameworks_base-c65088b68e9bb0aa97768c536822c6b82cc86b6f.zip frameworks_base-c65088b68e9bb0aa97768c536822c6b82cc86b6f.tar.gz frameworks_base-c65088b68e9bb0aa97768c536822c6b82cc86b6f.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_base into replicant-6.0
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 5ec6950..1f63a22 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4692,6 +4692,12 @@ public class TelephonyManager { if (SubscriptionManager.isValidPhoneId(phoneId)) { String prop = TelephonyProperties.PROPERTY_BASEBAND_VERSION + ((phoneId == 0) ? "" : Integer.toString(phoneId)); + if (version != null && version.length() > SystemProperties.PROP_VALUE_MAX) { + Log.e(TAG, "setBasebandVersionForPhone(): version string '" + version + + "' too long! (" + version.length() + + " > " + SystemProperties.PROP_VALUE_MAX + ")"); + version = version.substring(0, SystemProperties.PROP_VALUE_MAX); + } SystemProperties.set(prop, version); } } |