From bf7d22f3cde0cd43edc30360ea504da3048f4a30 Mon Sep 17 00:00:00 2001 From: Saki Oomori Date: Thu, 21 Jun 2018 12:12:19 +0900 Subject: Fix to read Tethering APN data terminated by empty parameters correctly If Tethering APN data is terminated by empty parameters(",,,"), the tethering APN data is not read correctly from configuration file. Because second argument of split() is not set in ApnSetting.java, these empty parameters are ignored and an error occurs during parameter length check later. To fix this, second argument of split() should be set as "-1". Bug: 112876857 Test: manual - Checked that Tethering APN data could be read correctly. Change-Id: I18be0131287dc927334d51522f1c816da83d4add --- telephony/java/android/telephony/data/ApnSetting.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index 9388ed155390..0e4a7addd58c 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -810,7 +810,7 @@ public class ApnSetting implements Parcelable { version = 1; } - String[] a = data.split("\\s*,\\s*"); + String[] a = data.split("\\s*,\\s*", -1); if (a.length < 14) { return null; } -- cgit v1.2.3-59-g8ed1b