diff options
| author | Nick Pelly <npelly@google.com> | 2011-08-09 22:27:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-09 22:27:22 -0700 |
| commit | 7ad291a5e7bc430955dccc496dbfcade040a6535 (patch) | |
| tree | 2a987d641f4ab4b6f4d1199ff796e305a550b4d3 /packages | |
| parent | 8cceb1e42b76aabcd6c27cfe599f7cd251a84947 (diff) | |
| parent | 8d32a01bd24b8a0d1a98f0581b3394a78fab8242 (diff) | |
| download | frameworks_base-7ad291a5e7bc430955dccc496dbfcade040a6535.zip frameworks_base-7ad291a5e7bc430955dccc496dbfcade040a6535.tar.gz frameworks_base-7ad291a5e7bc430955dccc496dbfcade040a6535.tar.bz2 | |
Merge "Add NFC to airplane mode"
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 4 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 21 |
2 files changed, 22 insertions, 3 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 12dbdf9..3920257 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -21,8 +21,8 @@ <integer name="def_screen_off_timeout">60000</integer> <bool name="def_airplane_mode_on">false</bool> <!-- Comma-separated list of bluetooth, wifi, and cell. --> - <string name="def_airplane_mode_radios" translatable="false">cell,bluetooth,wifi</string> - <string name="airplane_mode_toggleable_radios" translatable="false">bluetooth,wifi</string> + <string name="def_airplane_mode_radios" translatable="false">cell,bluetooth,wifi,nfc</string> + <string name="airplane_mode_toggleable_radios" translatable="false">bluetooth,wifi,nfc</string> <bool name="def_auto_time">true</bool> <bool name="def_auto_time_zone">true</bool> <bool name="def_accelerometer_rotation">true</bool> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index f4890e0..5495d08 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -63,7 +63,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { // database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion' // is properly propagated through your change. Not doing so will result in a loss of user // settings. - private static final int DATABASE_VERSION = 69; + private static final int DATABASE_VERSION = 70; private Context mContext; @@ -917,6 +917,25 @@ public class DatabaseHelper extends SQLiteOpenHelper { upgradeVersion = 69; } + if (upgradeVersion == 69) { + // Add RADIO_NFC to AIRPLANE_MODE_RADIO and AIRPLANE_MODE_TOGGLEABLE_RADIOS + String airplaneRadios = mContext.getResources().getString( + R.string.def_airplane_mode_radios); + String toggleableRadios = mContext.getResources().getString( + R.string.airplane_mode_toggleable_radios); + db.beginTransaction(); + try { + db.execSQL("UPDATE system SET value='" + airplaneRadios + "' " + + "WHERE name='" + Settings.System.AIRPLANE_MODE_RADIOS + "'"); + db.execSQL("UPDATE system SET value='" + toggleableRadios + "' " + + "WHERE name='" + Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS + "'"); + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + upgradeVersion = 70; + } + // *** Remember to update DATABASE_VERSION above! if (upgradeVersion != currentVersion) { |