Merge "Don't use toArray() inappropriately" into jb-mr1-dev (f92b57ca) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+7 −10

Original line number	Diff line number	Diff line
		@@ -1175,14 +1175,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		loadStringSetting(stmt, Settings.Secure.SCREENSAVER_COMPONENTS,
		R.string.def_screensaver_component);

		// Migrate now-global settings. Note that this happens before
		// new users can be created.
		createGlobalTable(db);
		String[] settingsToMove = (String[]) SettingsProvider.sSystemGlobalKeys.toArray();
		moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_GLOBAL, settingsToMove);
		settingsToMove = (String[]) SettingsProvider.sSecureGlobalKeys.toArray();
		moveSettingsToNewTable(db, TABLE_SECURE, TABLE_GLOBAL, settingsToMove);

		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		@@ -1216,9 +1208,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		// Migrate now-global settings. Note that this happens before
		// new users can be created.
		createGlobalTable(db);
		String[] settingsToMove = (String[]) SettingsProvider.sSystemGlobalKeys.toArray();
		String[] settingsToMove = hashsetToStringArray(SettingsProvider.sSystemGlobalKeys);
		moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_GLOBAL, settingsToMove);
		settingsToMove = (String[]) SettingsProvider.sSecureGlobalKeys.toArray();
		settingsToMove = hashsetToStringArray(SettingsProvider.sSecureGlobalKeys);
		moveSettingsToNewTable(db, TABLE_SECURE, TABLE_GLOBAL, settingsToMove);

		db.setTransactionSuccessful();
		@@ -1283,6 +1275,11 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		}
		}

		private String[] hashsetToStringArray(HashSet<String> set) {
		String[] array = new String[set.size()];
		return set.toArray(array);
		}

		private void moveSettingsToNewTable(SQLiteDatabase db,
		String sourceTable, String destTable,
		String[] settingsToMove) {