Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't use toArray() inappropriately" into jb-mr1-dev

Browse Source
This commit is contained in:
Christopher Tate
2012-09-06 19:21:30 -07:00
committed by Android (Google) Code Review
parent 52832e0c4f a96798e4a5
commit f92b57ca8b
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -1175,14 +1175,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadStringSetting(stmt, Settings.Secure.SCREENSAVER_COMPONENTS, loadStringSetting(stmt, Settings.Secure.SCREENSAVER_COMPONENTS,
R.string.def_screensaver_component); 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(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); db.endTransaction();
@@ -1216,9 +1208,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
// Migrate now-global settings. Note that this happens before // Migrate now-global settings. Note that this happens before
// new users can be created. // new users can be created.
createGlobalTable(db); createGlobalTable(db);
String[] settingsToMove = (String[]) SettingsProvider.sSystemGlobalKeys.toArray(); String[] settingsToMove = hashsetToStringArray(SettingsProvider.sSystemGlobalKeys);
moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_GLOBAL, settingsToMove); moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_GLOBAL, settingsToMove);
settingsToMove = (String[]) SettingsProvider.sSecureGlobalKeys.toArray(); settingsToMove = hashsetToStringArray(SettingsProvider.sSecureGlobalKeys);
moveSettingsToNewTable(db, TABLE_SECURE, TABLE_GLOBAL, settingsToMove); moveSettingsToNewTable(db, TABLE_SECURE, TABLE_GLOBAL, settingsToMove);
db.setTransactionSuccessful(); 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, private void moveSettingsToNewTable(SQLiteDatabase db,
String sourceTable, String destTable, String sourceTable, String destTable,
String[] settingsToMove) { String[] settingsToMove) {