diff options
| author | Christopher Tate <ctate@google.com> | 2012-09-06 19:21:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-06 19:21:31 -0700 |
| commit | f92b57ca8beb231e06a792db88ef3a4605901a7d (patch) | |
| tree | e2c9b08a1afdc5ed2ff5db37010564ae00c860b4 | |
| parent | 52832e0c4f353bbeaccf50ca8689056c392fc750 (diff) | |
| parent | a96798e4a548f5ec0e387b2cdd8d419378498ebd (diff) | |
| download | frameworks_base-f92b57ca8beb231e06a792db88ef3a4605901a7d.zip frameworks_base-f92b57ca8beb231e06a792db88ef3a4605901a7d.tar.gz frameworks_base-f92b57ca8beb231e06a792db88ef3a4605901a7d.tar.bz2 | |
Merge "Don't use toArray() inappropriately" into jb-mr1-dev
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 41bbe6ef..0917b24 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -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) { |