Merge tag 'android-8.1.0_r1' into o8.0-rebase
Android 8.1.0 Release 1 (OPM1.171019.011)
# gpg verification failed.
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..8fc359b
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=review.blissroms.com
+port=29418
+project=platform_packages_providers_TelephonyProvider.git
+defaultbranch=o8.0
diff --git a/res/values/config.xml b/res/values/config.xml
index 23c08b8..a78a5e0 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -14,4 +14,8 @@
If this value is empty or unparsable, we will apply APNs from the APN
conf xml file. -->
<string name="apn_source_service" translatable="false"></string>
+
+ <!-- The preferred APN to use, in the format name,mcc,mnc
+ Leave empty to choose automatically. -->
+ <string name="config_preferred_apn"></string>
</resources>
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 49c3d10..a664908 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -470,6 +470,24 @@
}
}
+ private int getDefaultPreferredApnId(SQLiteDatabase db) {
+ int id = -1;
+ String configPref = mContext.getResources().getString(R.string.config_preferred_apn, "");
+ if (!TextUtils.isEmpty(configPref)) {
+ String[] s = configPref.split(",");
+ if (s.length == 3) {
+ Cursor c = db.query("carriers", new String[] { "_id" },
+ "apn='" + s[0] + "' AND mcc='" + s[1] + "' AND mnc='" + s[2] + "'",
+ null, null, null, null);
+ if (c.moveToFirst()) {
+ id = c.getInt(0);
+ }
+ c.close();
+ }
+ }
+ return id;
+ }
+
/**
* This function adds APNs from xml file(s) to db. The db may or may not be empty to begin
* with.
@@ -1844,14 +1862,33 @@
Context.MODE_PRIVATE);
long apnId = sp.getLong(COLUMN_APN_ID + subId, INVALID_APN_ID);
if (apnId == INVALID_APN_ID && checkApnSp) {
- apnId = getPreferredApnIdFromApn(subId);
- if (apnId != INVALID_APN_ID) {
+ apnId = getDefaultPreferredApnId();
+ if (apnId > INVALID_APN_ID) {
setPreferredApnId(apnId, subId, false);
}
}
return apnId;
}
+ private long getDefaultPreferredApnId() {
+ long id = -1;
+ String configPref = getContext().getResources().getString(R.string.config_preferred_apn, "");
+ if (!TextUtils.isEmpty(configPref)) {
+ String[] s = configPref.split(",");
+ if (s.length == 3) {
+ Cursor c = mOpenHelper.getReadableDatabase().query("carriers", new String[] { "_id" },
+ "apn='" + s[0] + "' AND mcc='" + s[1] + "' AND mnc='" + s[2] + "'",
+ null, null, null, null);
+ if (c.moveToFirst()) {
+ id = c.getLong(0);
+ }
+ c.close();
+ }
+ }
+ Log.d(TAG, "Preferred APN: " + id);
+ return id;
+ }
+
private void deletePreferredApnId() {
SharedPreferences sp = getContext().getSharedPreferences(PREF_FILE_APN,
Context.MODE_PRIVATE);
@@ -2628,6 +2665,7 @@
restoreApnsWithService();
} else {
initDatabaseWithDatabaseHelper(db);
+ setPreferredApnId(getDefaultPreferredApnId(), subId);
}
}