Track crashing during migration to avoid crash loop. (1d6024d2) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/BinaryDictionary.java

+29 −11

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ public final class BinaryDictionary extends Dictionary {
		public static final int FORMAT_WORD_PROPERTY_COUNT_INDEX = 3;

		public static final String DICT_FILE_NAME_SUFFIX_FOR_MIGRATION = ".migrate";
		public static final String DIR_NAME_SUFFIX_FOR_RECORD_MIGRATION = ".migrating";

		private long mNativeDict;
		private final Locale mLocale;
		@@ -559,6 +560,20 @@ public final class BinaryDictionary extends Dictionary {
		if (!isValidDictionary()) {
		return false;
		}
		final File isMigratingDir =
		new File(mDictFilePath + DIR_NAME_SUFFIX_FOR_RECORD_MIGRATION);
		if (isMigratingDir.exists()) {
		isMigratingDir.delete();
		Log.e(TAG, "Previous migration attempt failed probably due to a crash. "
		+ "Giving up using the old dictionary (" + mDictFilePath + ").");
		return false;
		}
		if (!isMigratingDir.mkdir()) {
		Log.e(TAG, "Cannot create a dir (" + isMigratingDir.getAbsolutePath()
		+ ") to record migration.");
		return false;
		}
		try {
		final String tmpDictFilePath = mDictFilePath + DICT_FILE_NAME_SUFFIX_FOR_MIGRATION;
		if (!migrateNative(mNativeDict, tmpDictFilePath, newFormatVersion)) {
		return false;
		@@ -575,6 +590,9 @@ public final class BinaryDictionary extends Dictionary {
		loadDictionary(dictFile.getAbsolutePath(), 0 /* startOffset */,
		dictFile.length(), mIsUpdatable);
		return true;
		} finally {
		isMigratingDir.delete();
		}
		}

		@UsedForTesting