Revert "Adding a LocalLog to debug SMS db wipe/recreation."
This reverts commit 25ac6945452aa66d66de2aa6d200a44948e2bdaa.
Reason for revert: Will submit CLs again in the correct order to make
CP for Dec SMR easy.
Bug: 115990430
Merged-in: Ibe5b0aa75f486e7fb97e1a8500ec73ac246de6b1
Change-Id: If5285267e9c721891a9a9639bfeffa61c3d0352c
diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
index d977690..2a65519 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -21,15 +21,11 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.SharedPreferences;
import android.database.Cursor;
-import android.database.DatabaseErrorHandler;
-import android.database.DefaultDatabaseErrorHandler;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteOpenHelper;
import android.os.storage.StorageManager;
-import android.preference.PreferenceManager;
import android.provider.BaseColumns;
import android.provider.Telephony;
import android.provider.Telephony.Mms;
@@ -41,21 +37,16 @@
import android.provider.Telephony.Sms;
import android.provider.Telephony.Threads;
import android.telephony.SubscriptionManager;
-import android.util.LocalLog;
import android.util.Log;
-import android.util.Slog;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.telephony.PhoneFactory;
import com.google.android.mms.pdu.EncodedStringValue;
import com.google.android.mms.pdu.PduHeaders;
import java.io.File;
-import java.io.FileDescriptor;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
@@ -255,47 +246,13 @@
private final Context mContext;
private LowStorageMonitor mLowStorageMonitor;
- // SharedPref key used to check if initial create has been done (if onCreate has already been
- // called once)
- private static final String INITIAL_CREATE_DONE = "initial_create_done";
-
- /**
- * The primary purpose of this DatabaseErrorHandler is to print a Slog.wtf so database
- * corruption can be caught earlier.
- */
- private static class MmsSmsDatabaseErrorHandler implements DatabaseErrorHandler {
- private DefaultDatabaseErrorHandler mDefaultDatabaseErrorHandler
- = new DefaultDatabaseErrorHandler();
-
- @Override
- public void onCorruption(SQLiteDatabase dbObj) {
- String logMsg = "Corruption reported by sqlite on database: " + dbObj.getPath();
- Slog.wtf(TAG, logMsg);
- PhoneFactory.localLog(TAG, logMsg);
- sendDbErrorIntents();
- mDefaultDatabaseErrorHandler.onCorruption(dbObj);
- }
- }
-
- private static MmsSmsDatabaseErrorHandler sMmsSmsDatabaseErrorHandler
- = new MmsSmsDatabaseErrorHandler();
private MmsSmsDatabaseHelper(Context context) {
- super(context, DATABASE_NAME, null, DATABASE_VERSION, sMmsSmsDatabaseErrorHandler);
+ super(context, DATABASE_NAME, null, DATABASE_VERSION);
mContext = context;
// Memory optimization - close idle connections after 30s of inactivity
setIdleConnectionTimeout(IDLE_CONNECTION_TIMEOUT_MS);
setWriteAheadLoggingEnabled(false);
- try {
- PhoneFactory.addLocalLog(TAG, 100);
- } catch (IllegalArgumentException e) {
- // ignore
- }
- }
-
- private static void sendDbErrorIntents() {
- // TODO: send intent to ConnectivityMonitor and also a public intent that tells apps
- // that messaging db is gone
}
/**
@@ -507,17 +464,6 @@
@Override
public void onCreate(SQLiteDatabase db) {
- PhoneFactory.localLog(TAG, "onCreate: Creating all SMS-MMS tables.");
- if (isInitialCreateDone()) {
- // this onCreate is called after onCreate was called once initially. The db file
- // disappeared mysteriously?
- String logMsg = "onCreate: was already called once earlier";
- Slog.wtf(TAG, logMsg);
- PhoneFactory.localLog(TAG, logMsg);
- sendDbErrorIntents();
- } else {
- setInitialCreateDone();
- }
createMmsTables(db);
createSmsTables(db);
createCommonTables(db);
@@ -527,18 +473,6 @@
createIndices(db);
}
- private boolean isInitialCreateDone() {
- SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext);
- return sp.getBoolean(INITIAL_CREATE_DONE, false);
- }
-
- private void setInitialCreateDone() {
- SharedPreferences.Editor editor
- = PreferenceManager.getDefaultSharedPreferences(mContext).edit();
- editor.putBoolean(INITIAL_CREATE_DONE, true);
- editor.commit();
- }
-
// When upgrading the database we need to populate the words
// table with the rows out of sms and part.
private void populateWordsTable(SQLiteDatabase db) {
@@ -1593,8 +1527,6 @@
}
Log.e(TAG, "Destroying all old data.");
- PhoneFactory.localLog(TAG, "onUpgrade: Calling dropAll() and onCreate(). Upgrading database from version "
- + oldVersion + " to " + currentVersion + "failed.");
dropAll(db);
onCreate(db);
}
@@ -1603,7 +1535,6 @@
// Clean the database out in order to start over from scratch.
// We don't need to drop our triggers here because SQLite automatically
// drops a trigger when its attached database is dropped.
- PhoneFactory.localLog(TAG, "****DROPPING ALL SMS-MMS TABLES****");
db.execSQL("DROP TABLE IF EXISTS canonical_addresses");
db.execSQL("DROP TABLE IF EXISTS threads");
db.execSQL("DROP TABLE IF EXISTS " + MmsSmsProvider.TABLE_PENDING_MSG);
@@ -1904,13 +1835,10 @@
boolean hasAutoIncrementAddresses = hasAutoIncrement(db, "canonical_addresses");
boolean hasAutoIncrementPart = hasAutoIncrement(db, "part");
boolean hasAutoIncrementPdu = hasAutoIncrement(db, "pdu");
- String logMsg = "[getWritableDatabase]" +
- " hasAutoIncrementThreads: " + hasAutoIncrementThreads +
+ Log.d(TAG, "[getWritableDatabase] hasAutoIncrementThreads: " + hasAutoIncrementThreads +
" hasAutoIncrementAddresses: " + hasAutoIncrementAddresses +
" hasAutoIncrementPart: " + hasAutoIncrementPart +
- " hasAutoIncrementPdu: " + hasAutoIncrementPdu;
- Log.d(TAG, logMsg);
- PhoneFactory.localLog(TAG, logMsg);
+ " hasAutoIncrementPdu: " + hasAutoIncrementPdu);
boolean autoIncrementThreadsSuccess = true;
boolean autoIncrementAddressesSuccess = true;
boolean autoIncrementPartSuccess = true;
@@ -2212,8 +2140,4 @@
" JOIN pdu ON pdu._id=part.mid " +
" WHERE part.ct != 'text/plain' AND part.ct != 'application/smil')");
}
-
- public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
- writer.println("MmsSmsDatabaseHelper:");
- }
}
diff --git a/src/com/android/providers/telephony/MmsSmsProvider.java b/src/com/android/providers/telephony/MmsSmsProvider.java
index 80c6d7a27..1653cd9 100644
--- a/src/com/android/providers/telephony/MmsSmsProvider.java
+++ b/src/com/android/providers/telephony/MmsSmsProvider.java
@@ -1392,9 +1392,6 @@
defaultSmsApp = "None";
}
writer.println("Default SMS app: " + defaultSmsApp);
- if (mOpenHelper != null) {
- ((MmsSmsDatabaseHelper) mOpenHelper).dump(fd, writer, args);
- }
}
@Override
