Don't use APNs xml if CarrierSettings is installed am: 3de76f8ca4 -s ours
am: 4918865ef5 -s ours
Change-Id: Iad995250a3f4b080aea27d789491b69be1e682f5
diff --git a/res/values/config.xml b/res/values/config.xml
index 6148e5e..23c08b8 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -7,4 +7,11 @@
<item>310120</item>
<item>311480</item>
</string-array>
+
+ <!-- Specify a service to bind to that returns an implementation of the
+ IApnSourceService interface.
+ (e.g. com.foo/.Bar for the package com.foo and class com.foo.Bar)
+ 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>
</resources>
diff --git a/src/com/android/providers/telephony/CarrierDatabaseHelper.java b/src/com/android/providers/telephony/CarrierDatabaseHelper.java
index 5236b89..b654a77 100644
--- a/src/com/android/providers/telephony/CarrierDatabaseHelper.java
+++ b/src/com/android/providers/telephony/CarrierDatabaseHelper.java
@@ -21,6 +21,8 @@
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.text.TextUtils;
+import android.util.Log;
+
import java.util.ArrayList;
import java.util.List;
@@ -30,7 +32,7 @@
private static final String DATABASE_NAME = "CarrierInformation.db";
public static final String CARRIER_KEY_TABLE = "carrier_key";
- private static final int DATABASE_VERSION = 1;
+ private static final int DATABASE_VERSION = 2;
/**
* CarrierDatabaseHelper carrier database helper class.
@@ -40,14 +42,15 @@
super(context, DATABASE_NAME, null, DATABASE_VERSION);
}
- static final String KEY_TYPE = "key_type";
- static final String KEY = "key";
- static final String MCC = "mcc";
- static final String MNC = "mnc";
- static final String MVNO_TYPE = "mvno_type";
- static final String MVNO_MATCH_DATA = "mvno_match_data";
- static final String PUBLIC_CERTIFICATE = "public_certificate";
- static final String LAST_MODIFIED = "last_modified";
+ public static final String KEY_TYPE = "key_type";
+ public static final String MCC = "mcc";
+ public static final String MNC = "mnc";
+ public static final String MVNO_TYPE = "mvno_type";
+ public static final String MVNO_MATCH_DATA = "mvno_match_data";
+ public static final String PUBLIC_KEY = "public_key";
+ public static final String KEY_IDENTIFIER = "key_identifier";
+ public static final String EXPIRATION_TIME = "expiration_time";
+ public static final String LAST_MODIFIED = "last_modified";
private static final List<String> CARRIERS_UNIQUE_FIELDS = new ArrayList<String>();
@@ -67,8 +70,9 @@
MVNO_TYPE + " TEXT DEFAULT ''," +
MVNO_MATCH_DATA + " TEXT DEFAULT ''," +
KEY_TYPE + " TEXT DEFAULT ''," +
- KEY + " TEXT DEFAULT ''," +
- PUBLIC_CERTIFICATE + " TEXT DEFAULT ''," +
+ KEY_IDENTIFIER + " TEXT DEFAULT ''," +
+ PUBLIC_KEY + " BLOB DEFAULT ''," +
+ EXPIRATION_TIME + " INTEGER DEFAULT 0," +
LAST_MODIFIED + " INTEGER DEFAULT 0," +
"UNIQUE (" + TextUtils.join(", ", CARRIERS_UNIQUE_FIELDS) + "));";
}
@@ -78,8 +82,20 @@
db.execSQL(getStringForCarrierKeyTableCreation(CARRIER_KEY_TABLE));
}
+ public void createCarrierTable(SQLiteDatabase db) {
+ db.execSQL(getStringForCarrierKeyTableCreation(CARRIER_KEY_TABLE));
+ }
+
+ public void dropCarrierTable(SQLiteDatabase db) {
+ db.execSQL("DROP TABLE IF EXISTS " + CARRIER_KEY_TABLE + ";");
+ }
+
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- // do nothing
+ Log.d(TAG, "dbh.onUpgrade:+ db=" + db + " oldV=" + oldVersion + " newV=" + newVersion);
+ if (oldVersion < 2) {
+ dropCarrierTable(db);
+ createCarrierTable(db);
+ }
}
}
diff --git a/src/com/android/providers/telephony/CarrierProvider.java b/src/com/android/providers/telephony/CarrierProvider.java
index 1c85806..a13c7e3 100644
--- a/src/com/android/providers/telephony/CarrierProvider.java
+++ b/src/com/android/providers/telephony/CarrierProvider.java
@@ -78,14 +78,14 @@
@Override
public Uri insert(Uri uri, ContentValues values) {
values.put(CarrierDatabaseHelper.LAST_MODIFIED, System.currentTimeMillis());
- long row = getWritableDatabase().insert(CarrierDatabaseHelper.CARRIER_KEY_TABLE,
+ long row = getWritableDatabase().insertOrThrow(CarrierDatabaseHelper.CARRIER_KEY_TABLE,
null, values);
if (row > 0) {
Uri newUri = ContentUris.withAppendedId(CONTENT_URI, row);
getContext().getContentResolver().notifyChange(newUri, null);
return newUri;
}
- throw new SQLException("Fail to add a new record into " + uri);
+ return null;
}
@Override
@@ -95,7 +95,7 @@
@Override
public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-
+ values.put(CarrierDatabaseHelper.LAST_MODIFIED, System.currentTimeMillis());
if (VDBG) {
Log.d(TAG, "update:"
+ " uri=" + uri
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index b029f73..cef4fdb 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -59,10 +59,13 @@
import static android.provider.Telephony.Carriers.WAIT_TIME;
import static android.provider.Telephony.Carriers._ID;
+import android.content.ComponentName;
import android.content.ContentProvider;
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
import android.content.SharedPreferences;
import android.content.UriMatcher;
import android.content.pm.PackageManager;
@@ -78,6 +81,8 @@
import android.os.Binder;
import android.os.Environment;
import android.os.FileUtils;
+import android.os.IBinder;
+import android.os.RemoteException;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.telephony.ServiceState;
@@ -89,7 +94,9 @@
import android.util.Pair;
import android.util.Xml;
+import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.telephony.IApnSourceService;
import com.android.internal.util.XmlUtils;
import org.xmlpull.v1.XmlPullParser;
@@ -177,6 +184,12 @@
private static final int INVALID_APN_ID = -1;
private static final List<String> CARRIERS_UNIQUE_FIELDS = new ArrayList<String>();
+ private static Boolean s_apnSourceServiceExists;
+
+ protected final Object mLock = new Object();
+ @GuardedBy("mLock")
+ private IApnSourceService mIApnSourceService;
+
static {
// Columns not included in UNIQUE constraint: name, current, edited, user, server, password,
// authtype, type, protocol, roaming_protocol, sub_id, modem_cognitive, max_conns,
@@ -348,7 +361,13 @@
if (DBG) log("dbh.onCreate:+ db=" + db);
createSimInfoTable(db);
createCarriersTable(db, CARRIERS_TABLE);
- initDatabase(db);
+ // if CarrierSettings app is installed, we expect it to do the initializiation instead
+ if (apnSourceServiceExists(mContext)) {
+ log("dbh.onCreate: Skipping apply APNs from xml.");
+ } else {
+ log("dbh.onCreate: Apply apns from xml.");
+ initDatabase(db);
+ }
if (DBG) log("dbh.onCreate:- db=" + db);
}
@@ -1643,49 +1662,135 @@
return mOpenHelper.apnDbUpdateNeeded();
}
+ private static boolean apnSourceServiceExists(Context context) {
+ if (s_apnSourceServiceExists != null) {
+ return s_apnSourceServiceExists;
+ }
+ try {
+ String service = context.getResources().getString(R.string.apn_source_service);
+ if (TextUtils.isEmpty(service)) {
+ s_apnSourceServiceExists = false;
+ } else {
+ s_apnSourceServiceExists = context.getPackageManager().getServiceInfo(
+ ComponentName.unflattenFromString(service), 0)
+ != null;
+ }
+ } catch (PackageManager.NameNotFoundException e) {
+ s_apnSourceServiceExists = false;
+ }
+ return s_apnSourceServiceExists;
+ }
+
+ private void restoreApnsWithService() {
+ Context context = getContext();
+ Resources r = context.getResources();
+ ServiceConnection connection = new ServiceConnection() {
+ @Override
+ public void onServiceConnected(ComponentName className,
+ IBinder service) {
+ log("restoreApnsWithService: onServiceConnected");
+ synchronized (mLock) {
+ mIApnSourceService = IApnSourceService.Stub.asInterface(service);
+ mLock.notifyAll();
+ }
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName arg0) {
+ loge("mIApnSourceService has disconnected unexpectedly");
+ synchronized (mLock) {
+ mIApnSourceService = null;
+ }
+ }
+ };
+
+ Intent intent = new Intent(IApnSourceService.class.getName());
+ intent.setComponent(ComponentName.unflattenFromString(
+ r.getString(R.string.apn_source_service)));
+ log("binding to service to restore apns, intent=" + intent);
+ try {
+ context.startForegroundService(intent);
+ if (context.bindService(intent, connection, Context.BIND_IMPORTANT)) {
+ synchronized (mLock) {
+ while (mIApnSourceService == null) {
+ try {
+ mLock.wait();
+ } catch (InterruptedException e) {
+ loge("Error while waiting for service connection: " + e);
+ }
+ }
+ try {
+ ContentValues[] values = mIApnSourceService.getApns();
+ if (values != null) {
+ // we use the unsynchronized insert because this function is called
+ // within the syncrhonized function delete()
+ unsynchronizedBulkInsert(CONTENT_URI, values);
+ log("restoreApnsWithService: restored");
+ }
+ } catch (RemoteException e) {
+ loge("Error applying apns from service: " + e);
+ }
+ }
+ } else {
+ loge("unable to bind to service from intent=" + intent);
+ }
+ } catch (SecurityException e) {
+ loge("Error applying apns from service: " + e);
+ } finally {
+ if (connection != null) {
+ context.unbindService(connection);
+ }
+ synchronized (mLock) {
+ mIApnSourceService = null;
+ }
+ }
+ }
+
@Override
public boolean onCreate() {
mOpenHelper = new DatabaseHelper(getContext());
- // Call getReadableDatabase() to make sure onUpgrade is called
- if (VDBG) log("onCreate: calling getReadableDatabase to trigger onUpgrade");
- SQLiteDatabase db = getReadableDatabase();
+ if (!apnSourceServiceExists(getContext())) {
+ // Call getReadableDatabase() to make sure onUpgrade is called
+ if (VDBG) log("onCreate: calling getReadableDatabase to trigger onUpgrade");
+ SQLiteDatabase db = getReadableDatabase();
- // Update APN db on build update
- String newBuildId = SystemProperties.get("ro.build.id", null);
- if (!TextUtils.isEmpty(newBuildId)) {
- // Check if build id has changed
- SharedPreferences sp = getContext().getSharedPreferences(BUILD_ID_FILE,
- Context.MODE_PRIVATE);
- String oldBuildId = sp.getString(RO_BUILD_ID, "");
- if (!newBuildId.equals(oldBuildId)) {
- if (DBG) log("onCreate: build id changed from " + oldBuildId + " to " +
- newBuildId);
+ // Update APN db on build update
+ String newBuildId = SystemProperties.get("ro.build.id", null);
+ if (!TextUtils.isEmpty(newBuildId)) {
+ // Check if build id has changed
+ SharedPreferences sp = getContext().getSharedPreferences(BUILD_ID_FILE,
+ Context.MODE_PRIVATE);
+ String oldBuildId = sp.getString(RO_BUILD_ID, "");
+ if (!newBuildId.equals(oldBuildId)) {
+ if (DBG) log("onCreate: build id changed from " + oldBuildId + " to " +
+ newBuildId);
- // Get rid of old preferred apn shared preferences
- SubscriptionManager sm = SubscriptionManager.from(getContext());
- if (sm != null) {
- List<SubscriptionInfo> subInfoList = sm.getAllSubscriptionInfoList();
- for (SubscriptionInfo subInfo : subInfoList) {
- SharedPreferences spPrefFile = getContext().getSharedPreferences(
- PREF_FILE_APN + subInfo.getSubscriptionId(), Context.MODE_PRIVATE);
- if (spPrefFile != null) {
- SharedPreferences.Editor editor = spPrefFile.edit();
- editor.clear();
- editor.apply();
+ // Get rid of old preferred apn shared preferences
+ SubscriptionManager sm = SubscriptionManager.from(getContext());
+ if (sm != null) {
+ List<SubscriptionInfo> subInfoList = sm.getAllSubscriptionInfoList();
+ for (SubscriptionInfo subInfo : subInfoList) {
+ SharedPreferences spPrefFile = getContext().getSharedPreferences(
+ PREF_FILE_APN + subInfo.getSubscriptionId(), Context.MODE_PRIVATE);
+ if (spPrefFile != null) {
+ SharedPreferences.Editor editor = spPrefFile.edit();
+ editor.clear();
+ editor.apply();
+ }
}
}
- }
- // Update APN DB
- updateApnDb();
+ // Update APN DB
+ updateApnDb();
+ } else {
+ if (VDBG) log("onCreate: build id did not change: " + oldBuildId);
+ }
+ sp.edit().putString(RO_BUILD_ID, newBuildId).apply();
} else {
- if (VDBG) log("onCreate: build id did not change: " + oldBuildId);
+ if (VDBG) log("onCreate: newBuildId is empty");
}
- sp.edit().putString(RO_BUILD_ID, newBuildId).apply();
- } else {
- if (VDBG) log("onCreate: newBuildId is empty");
}
if (VDBG) log("onCreate:- ret true");
@@ -1971,8 +2076,19 @@
}
}
+ /**
+ * Insert an array of ContentValues and call notifyChange at the end.
+ */
@Override
public synchronized int bulkInsert(Uri url, ContentValues[] values) {
+ return unsynchronizedBulkInsert(url, values);
+ }
+
+ /**
+ * Do a bulk insert while inside a synchronized function. This is typically not safe and should
+ * only be done when you are sure there will be no conflict.
+ */
+ private int unsynchronizedBulkInsert(Uri url, ContentValues[] values) {
int count = 0;
boolean notify = false;
for (ContentValues value : values) {
@@ -2472,10 +2588,19 @@
editorApn.clear();
editorApn.apply();
- initDatabaseWithDatabaseHelper(db);
+ if (apnSourceServiceExists(getContext())) {
+ restoreApnsWithService();
+ } else {
+ initDatabaseWithDatabaseHelper(db);
+ }
}
private synchronized void updateApnDb() {
+ if (apnSourceServiceExists(getContext())) {
+ loge("called updateApnDb when apn source service exists");
+ return;
+ }
+
if (!needApnDbUpdate()) {
log("Skipping apn db update since apn-conf has not changed.");
return;
diff --git a/tests/src/com/android/providers/telephony/CarrierProviderTest.java b/tests/src/com/android/providers/telephony/CarrierProviderTest.java
index 6a56343..b0b9b09 100644
--- a/tests/src/com/android/providers/telephony/CarrierProviderTest.java
+++ b/tests/src/com/android/providers/telephony/CarrierProviderTest.java
@@ -54,7 +54,7 @@
private MockContentResolver mContentResolver;
private CarrierProviderTestable mCarrierProviderTestable;
- public static final String dummy_type = "TYPE5";
+ public static final int dummy_type = 1;
public static final String dummy_mnc = "MNC001";
public static final String dummy_mnc2 = "MNC002";
public static final String dummy_mcc = "MCC005";
@@ -62,6 +62,8 @@
public static final String dummy_key2 = "PUBKEY2";
public static final String dummy_mvno_type = "100";
public static final String dummy_mvno_match_data = "101";
+ public static final String dummy_key_identifier_data = "key_identifier1";
+ public static final long dummy_key_expiration = 1496795015L;
/**
@@ -147,7 +149,9 @@
contentValues.put(CarrierDatabaseHelper.MNC, dummy_mnc);
contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, dummy_mvno_type);
contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, dummy_mvno_match_data);
- contentValues.put(CarrierDatabaseHelper.PUBLIC_CERTIFICATE, dummy_key1);
+ contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, dummy_key_identifier_data);
+ contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key1.getBytes());
+ contentValues.put(CarrierDatabaseHelper.EXPIRATION_TIME, dummy_key_expiration);
try {
mContentResolver.insert(CarrierProvider.CONTENT_URI, contentValues);
@@ -181,7 +185,9 @@
contentValues.put(CarrierDatabaseHelper.MNC, dummy_mnc);
contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, dummy_mvno_type);
contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, dummy_mvno_match_data);
- contentValues.put(CarrierDatabaseHelper.PUBLIC_CERTIFICATE, dummy_key1);
+ contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, dummy_key_identifier_data);
+ contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key1.getBytes());
+ contentValues.put(CarrierDatabaseHelper.EXPIRATION_TIME, dummy_key_expiration);
try {
mContentResolver.insert(CarrierProvider.CONTENT_URI, contentValues);
@@ -191,18 +197,19 @@
try {
ContentValues updatedValues = new ContentValues();
- updatedValues.put(CarrierDatabaseHelper.PUBLIC_CERTIFICATE, dummy_key2);
+ updatedValues.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key2);
mContentResolver.update(CarrierProvider.CONTENT_URI, updatedValues,
- "mcc=? and mnc=? and key_type=?", new String[] { dummy_mcc, dummy_mnc, dummy_type });
+ "mcc=? and mnc=? and key_type=?", new String[] { dummy_mcc, dummy_mnc,
+ String.valueOf(dummy_type) });
} catch (Exception e) {
Log.d(TAG, "Error updating values:" + e);
}
try {
- String[] columns ={CarrierDatabaseHelper.PUBLIC_CERTIFICATE};
+ String[] columns ={CarrierDatabaseHelper.PUBLIC_KEY};
Cursor findEntry = mContentResolver.query(CarrierProvider.CONTENT_URI, columns,
"mcc=? and mnc=? and key_type=?",
- new String[] { dummy_mcc, dummy_mnc, dummy_type }, null);
+ new String[] { dummy_mcc, dummy_mnc, String.valueOf(dummy_type) }, null);
findEntry.moveToFirst();
key = findEntry.getString(0);
} catch (Exception e) {
@@ -224,7 +231,8 @@
contentValues.put(CarrierDatabaseHelper.MNC, dummy_mnc);
contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, dummy_mvno_type);
contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, dummy_mvno_match_data);
- contentValues.put(CarrierDatabaseHelper.PUBLIC_CERTIFICATE, dummy_key1);
+ contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, dummy_key_identifier_data);
+ contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key1.getBytes());
ContentValues contentValuesNew = new ContentValues();
contentValuesNew.put(CarrierDatabaseHelper.KEY_TYPE, dummy_type);
@@ -232,7 +240,8 @@
contentValuesNew.put(CarrierDatabaseHelper.MNC, dummy_mnc2);
contentValuesNew.put(CarrierDatabaseHelper.MVNO_TYPE, dummy_mvno_type);
contentValuesNew.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, dummy_mvno_match_data);
- contentValuesNew.put(CarrierDatabaseHelper.PUBLIC_CERTIFICATE, dummy_key2);
+ contentValues.put(CarrierDatabaseHelper.KEY_IDENTIFIER, dummy_key_identifier_data);
+ contentValuesNew.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key2.getBytes());
try {
mContentResolver.insert(CarrierProvider.CONTENT_URI, contentValues);
@@ -266,7 +275,7 @@
contentValues.put(CarrierDatabaseHelper.MNC, dummy_mnc);
contentValues.put(CarrierDatabaseHelper.MVNO_TYPE, dummy_mvno_type);
contentValues.put(CarrierDatabaseHelper.MVNO_MATCH_DATA, dummy_mvno_match_data);
- contentValues.put(CarrierDatabaseHelper.PUBLIC_CERTIFICATE, dummy_key1);
+ contentValues.put(CarrierDatabaseHelper.PUBLIC_KEY, dummy_key1.getBytes());
try {
mContentResolver.insert(CarrierProvider.CONTENT_URI, contentValues);