Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix property setting with failure" am: da9de2d7fa

Browse Source 
am: 58be59a233

Change-Id: Ia3994b3595d6ccd945dc9ca45f7fc4c46c12908a
This commit is contained in:
Youming Ye
2018-12-13 13:53:07 -08:00
committed by android-build-merger
parent 0c0f42ff16 58be59a233
commit bab83ccabb
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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;