diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2015-01-08 15:11:47 -0600 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-03-23 13:39:38 -0700 |
| commit | ce17045efcf484cd8c40038bfe13e5c70b99457e (patch) | |
| tree | 2e8b666b589f2d42d6d04a4fb1ebbedc3ab8067d | |
| parent | 197268d3f1e676b09dc74f3f7dbed26dd11e3aac (diff) | |
| download | android_packages_providers_TelephonyProvider-ce17045efcf484cd8c40038bfe13e5c70b99457e.tar.gz android_packages_providers_TelephonyProvider-ce17045efcf484cd8c40038bfe13e5c70b99457e.tar.bz2 android_packages_providers_TelephonyProvider-ce17045efcf484cd8c40038bfe13e5c70b99457e.zip | |
TelephonyProvider: allow specifying a protocol for preferred apn
Change-Id: I36f9aae610710702f16ba1c740c3c20b99543742
| -rw-r--r-- | src/com/android/providers/telephony/TelephonyProvider.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java index 90be05d..11b0928 100644 --- a/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java @@ -258,9 +258,10 @@ public class TelephonyProvider extends ContentProvider String configPref = mContext.getResources().getString(R.string.config_preferred_apn, ""); if (!TextUtils.isEmpty(configPref)) { String[] s = configPref.split(","); - if (s.length == 3) { + if (s.length == 3 || s.length == 4) { Cursor c = db.query("carriers", new String[] { "_id" }, - "apn='" + s[0] + "' AND mcc='" + s[1] + "' AND mnc='" + s[2] + "'", + "apn='" + s[0] + "' AND mcc='" + s[1] + "' AND mnc='" + s[2] + + (s.length == 4 ? "' AND protocol='" + s[3] : "") + "'", null, null, null, null); if (c.moveToFirst()) { id = c.getInt(0); @@ -715,9 +716,10 @@ public class TelephonyProvider extends ContentProvider String configPref = getContext().getResources().getString(R.string.config_preferred_apn, ""); if (!TextUtils.isEmpty(configPref)) { String[] s = configPref.split(","); - if (s.length == 3) { + if (s.length == 3 || s.length == 4) { Cursor c = mOpenHelper.getReadableDatabase().query("carriers", new String[] { "_id" }, - "apn='" + s[0] + "' AND mcc='" + s[1] + "' AND mnc='" + s[2] + "'", + "apn='" + s[0] + "' AND mcc='" + s[1] + "' AND mnc='" + s[2] + + (s.length == 4 ? "' AND protocol='" + s[3] : "") + "'", null, null, null, null); if (c.moveToFirst()) { id = c.getLong(0); |