Merge "Fix endless crash when load Bluetooth database" am: 07b5be0aac am: 59353bd6ff (705c5f15) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/btservice/storage/DatabaseManager.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,15 @@ public class DatabaseManager {
		switch (msg.what) {
		case MSG_LOAD_DATABASE: {
		synchronized (mDatabase) {
		List<Metadata> list = mDatabase.load();
		List<Metadata> list;
		try {
		list = mDatabase.load();
		} catch (IllegalStateException e) {
		Log.e(TAG, "Unable to open database: " + e);
		mDatabase = MetadataDatabase
		.createDatabaseWithoutMigration(mAdapterService);
		list = mDatabase.load();
		}
		cacheMetadata(list);
		}
		break;

+15 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ public abstract class MetadataDatabase extends RoomDatabase {
		protected abstract MetadataDao mMetadataDao();

		/**
		* Create a {@link MetadataDatabase} database
		* Create a {@link MetadataDatabase} database with migrations
		*
		* @param context the Context to create database
		* @return the created {@link MetadataDatabase}
		@@ -51,6 +51,20 @@ public abstract class MetadataDatabase extends RoomDatabase {
		.build();
		}

		/**
		* Create a {@link MetadataDatabase} database without migration, database
		* would be reset if any load failure happens
		*
		* @param context the Context to create database
		* @return the created {@link MetadataDatabase}
		*/
		public static MetadataDatabase createDatabaseWithoutMigration(Context context) {
		return Room.databaseBuilder(context,
		MetadataDatabase.class, DATABASE_NAME)
		.fallbackToDestructiveMigration()
		.build();
		}

		/**
		* Insert a {@link Metadata} to database
		*