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

Commit bab83cca authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "Fix property setting with failure" am: da9de2d7 

am: 58be59a2

Change-Id: Ia3994b3595d6ccd945dc9ca45f7fc4c46c12908a
parents 0c0f42ff 58be59a2

telephony/java/android/telephony/TelephonyManager.java

+8 −2
Original line number Diff line number Diff line
@@ -5604,7 +5604,7 @@ public class TelephonyManager { 
        if (value == null) {

            value = "";

        }



        value.replace(',', ' ');

        if (prop != null) {

            p = prop.split(",");

        }
@@ -5630,7 +5630,13 @@ public class TelephonyManager { 
            }

        }



        if (propVal.length() > SystemProperties.PROP_VALUE_MAX) {

        int propValLen = propVal.length();

        try {

            propValLen = propVal.getBytes("utf-8").length;

        } catch (java.io.UnsupportedEncodingException e) {

            Rlog.d(TAG, "setTelephonyProperty: utf-8 not supported");

        }

        if (propValLen > SystemProperties.PROP_VALUE_MAX) {

            Rlog.d(TAG, "setTelephonyProperty: property too long phoneId=" + phoneId +

                    " property=" + property + " value: " + value + " propVal=" + propVal);

            return;