Merge "Fix test not willing to retrieve bluetooth name" into tm-dev am: 377bd0ea36 am: faca14f9bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/17891165
Change-Id: Iea3c7bf57be8c68f029041c232f432af1dacb33e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
index 73ffa3b..d2667c1 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -49,6 +49,7 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.TelephonyStatsLog;
import com.google.android.mms.pdu.EncodedStringValue;
import com.google.android.mms.pdu.PduHeaders;
@@ -81,6 +82,14 @@
*/
public class MmsSmsDatabaseHelper extends SQLiteOpenHelper {
private static final String TAG = "MmsSmsDatabaseHelper";
+ private static final int SECURITY_EXCEPTION = TelephonyStatsLog
+ .MMS_SMS_DATABASE_HELPER_ON_UPGRADE_FAILED__FAILURE_CODE__FAILURE_SECURITY_EXCEPTION;
+ private static final int FAILURE_UNKNOWN = TelephonyStatsLog
+ .MMS_SMS_DATABASE_HELPER_ON_UPGRADE_FAILED__FAILURE_CODE__FAILURE_UNKNOWN;
+ private static final int SQL_EXCEPTION = TelephonyStatsLog
+ .MMS_SMS_DATABASE_HELPER_ON_UPGRADE_FAILED__FAILURE_CODE__FAILURE_SQL_EXCEPTION;
+ private static final int IO_EXCEPTION = TelephonyStatsLog
+ .MMS_SMS_DATABASE_HELPER_ON_UPGRADE_FAILED__FAILURE_CODE__FAILURE_IO_EXCEPTION;
private static final String SMS_UPDATE_THREAD_READ_BODY =
" UPDATE threads SET read = " +
@@ -653,6 +662,11 @@
}
private void createWordsTables(SQLiteDatabase db) {
+ createWordsTables(db, -1, -1, -1);
+ }
+
+ private void createWordsTables(
+ SQLiteDatabase db, int oldVersion, int currentVersion, int upgradeVersion) {
try {
db.execSQL("CREATE VIRTUAL TABLE words USING FTS3 (_id INTEGER PRIMARY KEY, index_text TEXT, source_id INTEGER, table_to_use INTEGER);");
@@ -670,6 +684,7 @@
populateWordsTable(db);
} catch (Exception ex) {
Log.e(TAG, "got exception creating words table: " + ex.toString());
+ logException(ex, oldVersion, currentVersion, upgradeVersion);
}
}
@@ -681,36 +696,60 @@
}
private void createThreadIdIndex(SQLiteDatabase db) {
+ createThreadIdIndex(db, -1, -1, -1);
+ }
+
+ private void createThreadIdIndex(
+ SQLiteDatabase db, int oldVersion, int currentVersion, int upgradeVersion) {
try {
db.execSQL("CREATE INDEX IF NOT EXISTS typeThreadIdIndex ON sms" +
" (type, thread_id);");
} catch (Exception ex) {
Log.e(TAG, "got exception creating indices: " + ex.toString());
+ logException(ex, oldVersion, currentVersion, upgradeVersion);
}
}
private void createThreadIdDateIndex(SQLiteDatabase db) {
+ createThreadIdDateIndex(db, -1, -1, -1);
+ }
+
+ private void createThreadIdDateIndex(
+ SQLiteDatabase db, int oldVersion, int currentVersion, int upgradeVersion) {
try {
db.execSQL("CREATE INDEX IF NOT EXISTS threadIdDateIndex ON sms" +
" (thread_id, date);");
} catch (Exception ex) {
Log.e(TAG, "got exception creating indices: " + ex.toString());
+ logException(ex, oldVersion, currentVersion, upgradeVersion);
}
}
private void createPartMidIndex(SQLiteDatabase db) {
+ createPartMidIndex(db, -1, -1, -1);
+ }
+
+ private void createPartMidIndex(
+ SQLiteDatabase db, int oldVersion, int currentVersion, int upgradeVersion) {
try {
db.execSQL("CREATE INDEX IF NOT EXISTS partMidIndex ON part (mid)");
} catch (Exception ex) {
Log.e(TAG, "got exception creating indices: " + ex.toString());
+ logException(ex, oldVersion, currentVersion, upgradeVersion);
}
}
private void createAddrMsgIdIndex(SQLiteDatabase db) {
+ createAddrMsgIdIndex(db, -1, -1, -1);
+ }
+
+ private void createAddrMsgIdIndex(
+ SQLiteDatabase db, int oldVersion, int currentVersion, int upgradeVersion) {
try {
db.execSQL("CREATE INDEX IF NOT EXISTS addrMsgIdIndex ON addr (msg_id)");
} catch (Exception ex) {
Log.e(TAG, "got exception creating indices: " + ex.toString());
+ logException(ex, oldVersion, currentVersion, upgradeVersion);
}
}
@@ -1248,6 +1287,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 41);
break;
} finally {
db.endTransaction();
@@ -1264,6 +1304,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 42);
break;
} finally {
db.endTransaction();
@@ -1280,6 +1321,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 43);
break;
} finally {
db.endTransaction();
@@ -1296,6 +1338,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 44);
break;
} finally {
db.endTransaction();
@@ -1312,6 +1355,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 45);
break;
} finally {
db.endTransaction();
@@ -1323,10 +1367,11 @@
}
db.beginTransaction();
try {
- upgradeDatabaseToVersion46(db);
+ upgradeDatabaseToVersion46(db, oldVersion, currentVersion);
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 46);
break;
} finally {
db.endTransaction();
@@ -1343,6 +1388,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 47);
break;
} finally {
db.endTransaction();
@@ -1359,6 +1405,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 48);
break;
} finally {
db.endTransaction();
@@ -1371,10 +1418,11 @@
db.beginTransaction();
try {
- createWordsTables(db);
+ createWordsTables(db, oldVersion, currentVersion, 49);
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 49);
break;
} finally {
db.endTransaction();
@@ -1386,10 +1434,11 @@
}
db.beginTransaction();
try {
- createThreadIdIndex(db);
+ createThreadIdIndex(db, oldVersion, currentVersion, 50);
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 50);
break; // force to destroy all old data;
} finally {
db.endTransaction();
@@ -1406,6 +1455,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 51);
break;
} finally {
db.endTransaction();
@@ -1428,6 +1478,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 53);
break;
} finally {
db.endTransaction();
@@ -1444,6 +1495,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 54);
break;
} finally {
db.endTransaction();
@@ -1460,6 +1512,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 55);
break;
} finally {
db.endTransaction();
@@ -1476,6 +1529,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 56);
break;
} finally {
db.endTransaction();
@@ -1492,6 +1546,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 57);
break;
} finally {
db.endTransaction();
@@ -1508,6 +1563,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 58);
break;
} finally {
db.endTransaction();
@@ -1524,6 +1580,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 59);
break;
} finally {
db.endTransaction();
@@ -1540,6 +1597,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 60);
break;
} finally {
db.endTransaction();
@@ -1556,6 +1614,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 61);
break;
} finally {
db.endTransaction();
@@ -1568,10 +1627,11 @@
db.beginTransaction();
try {
- upgradeDatabaseToVersion62(db);
+ upgradeDatabaseToVersion62(db, oldVersion, currentVersion);
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 62);
break;
} finally {
db.endTransaction();
@@ -1585,10 +1645,11 @@
db.beginTransaction();
try {
// upgrade to 63: just add a happy little index.
- createThreadIdDateIndex(db);
+ createThreadIdDateIndex(db, oldVersion, currentVersion, 63);
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 63);
break;
} finally {
db.endTransaction();
@@ -1605,6 +1666,7 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 64);
break;
} finally {
db.endTransaction();
@@ -1617,10 +1679,11 @@
db.beginTransaction();
try {
- upgradeDatabaseToVersion65(db);
+ upgradeDatabaseToVersion65(db, oldVersion, currentVersion);
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 65);
break;
} finally {
db.endTransaction();
@@ -1633,10 +1696,11 @@
db.beginTransaction();
try {
- upgradeDatabaseToVersion66(db);
+ upgradeDatabaseToVersion66(db, oldVersion, currentVersion);
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 66);
break;
} finally {
db.endTransaction();
@@ -1648,11 +1712,12 @@
}
db.beginTransaction();
try {
- createPartMidIndex(db);
- createAddrMsgIdIndex(db);
+ createPartMidIndex(db, oldVersion, currentVersion, 67);
+ createAddrMsgIdIndex(db, oldVersion, currentVersion, 67);
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(TAG, ex.getMessage(), ex);
+ logException(ex, oldVersion, currentVersion, 67);
break; // force to destroy all old data;
} finally {
db.endTransaction();
@@ -1667,6 +1732,24 @@
onCreate(db);
}
+ private void logException(
+ Throwable ex, int oldVersion, int currentVersion, int upgradeVersion) {
+ int exception = FAILURE_UNKNOWN;
+ if (ex instanceof SQLiteException) {
+ exception = SQL_EXCEPTION;
+ } else if (ex instanceof IOException) {
+ exception = IO_EXCEPTION;
+ } else if (ex instanceof SecurityException) {
+ exception = SECURITY_EXCEPTION;
+ }
+ TelephonyStatsLog.write(
+ TelephonyStatsLog.MMS_SMS_DATABASE_HELPER_ON_UPGRADE_FAILED,
+ oldVersion,
+ currentVersion,
+ upgradeVersion,
+ exception);
+ }
+
private void dropAll(SQLiteDatabase db) {
// Clean the database out in order to start over from scratch.
// We don't need to drop our triggers here because SQLite automatically
@@ -1733,7 +1816,7 @@
db.execSQL("ALTER TABLE pdu ADD COLUMN " + Mms.LOCKED + " INTEGER DEFAULT 0");
}
- private void upgradeDatabaseToVersion46(SQLiteDatabase db) {
+ private void upgradeDatabaseToVersion46(SQLiteDatabase db, int oldVersion, int currentVersion) {
// add the "text" column for caching inline text (e.g. strings) instead of
// putting them in an external file
db.execSQL("ALTER TABLE part ADD COLUMN " + Part.TEXT + " TEXT");
@@ -1771,6 +1854,7 @@
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
+ logException(e, oldVersion, currentVersion, 46);
}
}
}
@@ -1783,6 +1867,7 @@
(new File(pathToDelete)).delete();
} catch (SecurityException ex) {
Log.e(TAG, "unable to clean up old mms file for " + pathToDelete, ex);
+ logException(ex, oldVersion, currentVersion, 46);
}
}
if (textRows != null) {
@@ -1904,7 +1989,7 @@
}
- private void upgradeDatabaseToVersion62(SQLiteDatabase db) {
+ private void upgradeDatabaseToVersion62(SQLiteDatabase db, int oldVersion, int currentVersion) {
// When a non-FBE device is upgraded to N, all MMS attachment files are moved from
// /data/data to /data/user_de. We need to update the paths stored in the parts table to
// reflect this change.
@@ -1914,6 +1999,7 @@
}
catch (IOException e){
Log.e(TAG, "openFile: check file path failed " + e, e);
+ logException(e, oldVersion, currentVersion, 62);
return;
}
@@ -1938,7 +2024,7 @@
db.execSQL("ALTER TABLE " + SmsProvider.TABLE_RAW +" ADD COLUMN deleted INTEGER DEFAULT 0");
}
- private void upgradeDatabaseToVersion65(SQLiteDatabase db) {
+ private void upgradeDatabaseToVersion65(SQLiteDatabase db, int oldVersion, int currentVersion) {
// aosp and internal code diverged at version 63. Aosp did createThreadIdDateIndex() on
// upgrading to 63, whereas internal (nyc) added column 'deleted'. A device upgrading from
// nyc will have columns deleted and message_body in raw table with version 64, but not
@@ -1948,17 +2034,19 @@
} catch (SQLiteException e) {
Log.w(TAG, "[upgradeDatabaseToVersion65] Exception adding column message_body; " +
"trying createThreadIdDateIndex() instead: " + e);
+ logException(e, oldVersion, currentVersion, 65);
createThreadIdDateIndex(db);
}
}
- private void upgradeDatabaseToVersion66(SQLiteDatabase db) {
+ private void upgradeDatabaseToVersion66(SQLiteDatabase db, int oldVersion, int currentVersion) {
try {
db.execSQL("ALTER TABLE " + SmsProvider.TABLE_RAW
+ " ADD COLUMN display_originating_addr TEXT");
} catch (SQLiteException e) {
Log.e(TAG, "[upgradeDatabaseToVersion66] Exception adding column "
+ "display_originating_addr; " + e);
+ logException(e, oldVersion, currentVersion, 66);
}
}
diff --git a/src/com/android/providers/telephony/MmsSmsProvider.java b/src/com/android/providers/telephony/MmsSmsProvider.java
index 8e01bcc..7c7003e 100644
--- a/src/com/android/providers/telephony/MmsSmsProvider.java
+++ b/src/com/android/providers/telephony/MmsSmsProvider.java
@@ -43,6 +43,8 @@
import android.text.TextUtils;
import android.util.Log;
+import com.android.internal.telephony.TelephonyStatsLog;
+
import com.google.android.mms.pdu.PduHeaders;
import java.io.FileDescriptor;
@@ -78,6 +80,10 @@
new UriMatcher(UriMatcher.NO_MATCH);
private static final String LOG_TAG = "MmsSmsProvider";
private static final boolean DEBUG = false;
+ private static final int MULTIPLE_THREAD_IDS_FOUND = TelephonyStatsLog
+ .MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED__FAILURE_CODE__FAILURE_MULTIPLE_THREAD_IDS_FOUND;
+ private static final int FAILURE_FIND_OR_CREATE_THREAD_ID_SQL = TelephonyStatsLog
+ .MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED__FAILURE_CODE__FAILURE_FIND_OR_CREATE_THREAD_ID_SQL;
private static final String NO_DELETES_INSERTS_OR_UPDATES =
"MmsSmsProvider does not support deletes, inserts, or updates for this URI.";
@@ -686,6 +692,10 @@
if (addressIds.size() == 0) {
Log.e(LOG_TAG, "getThreadId: NO receipients specified -- NOT creating thread",
new Exception());
+ TelephonyStatsLog.write(
+ TelephonyStatsLog.MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED,
+ TelephonyStatsLog
+ .MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED__FAILURE_CODE__FAILURE_NO_RECIPIENTS);
return null;
} else if (addressIds.size() == 1) {
// optimize for size==1, which should be most of the cases
@@ -724,12 +734,18 @@
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(LOG_TAG, ex.getMessage(), ex);
+ TelephonyStatsLog.write(
+ TelephonyStatsLog.MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED,
+ FAILURE_FIND_OR_CREATE_THREAD_ID_SQL);
} finally {
db.endTransaction();
}
if (cursor != null && cursor.getCount() > 1) {
Log.w(LOG_TAG, "getThreadId: why is cursorCount=" + cursor.getCount());
+ TelephonyStatsLog.write(
+ TelephonyStatsLog.MMS_SMS_PROVIDER_GET_THREAD_ID_FAILED,
+ MULTIPLE_THREAD_IDS_FOUND);
}
return cursor;
}