Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cd71362 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Truncate baseband version string to 45 characters at most" am:... 

Merge "Truncate baseband version string to 45 characters at most" am: e4cf9afc am: 2368604a am: e1b7bf62 am: 7b99f9b5

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1440472

Change-Id: Ideab4f75edc40c854e7015a9cb311e570767defe
parents 5af04df6 7b99f9b5

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+15 −2
Original line number Diff line number Diff line
@@ -2899,8 +2899,21 @@ public class GsmCdmaPhone extends Phone { 
                }



                if (DBG) logd("Baseband version: " + ar.result);

                /* Android property value is limited to 91 characters, but low layer

                 could pass a larger version string. To avoid runtime exception,

                 truncate the string baseband version string to 45 characters at most

                 for this per sub property. Since the latter part of the version string

                 is meaningful, truncated the version string from the beginning and

                 keep the end of the version.

                */

                String version = (String)ar.result;

                if (version != null) {

                    int length = version.length();

                    final int MAX_VERSION_LEN = SystemProperties.PROP_VALUE_MAX/2;

                    TelephonyManager.from(mContext).setBasebandVersionForPhone(getPhoneId(),

                        (String)ar.result);

                            length <= MAX_VERSION_LEN ? version

                                : version.substring(length - MAX_VERSION_LEN, length));

                }

            break;



            case EVENT_GET_IMEI_DONE: