summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-06-13 19:50:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-13 19:50:37 -0700
commitfa77931784cb66503bc4dfd755cea41bdb832562 (patch)
tree22fc408c335c727b36bfecc0b9dc8f5ba958b80e /packages
parent922261deab46b93641eadd9bc337fa72f8a5d734 (diff)
parent1324f22d8dc1a26fe481fd33511bdae04c81ac14 (diff)
downloadframeworks_base-fa77931784cb66503bc4dfd755cea41bdb832562.zip
frameworks_base-fa77931784cb66503bc4dfd755cea41bdb832562.tar.gz
frameworks_base-fa77931784cb66503bc4dfd755cea41bdb832562.tar.bz2
Merge "Settings: Remove unused USE_PTP_INTERFACE setting"
Diffstat (limited to 'packages')
-rw-r--r--packages/SettingsProvider/res/values/defaults.xml2
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java3
2 files changed, 0 insertions, 5 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 2e2768f..b349030 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -77,8 +77,6 @@
<!-- Default for Settings.System.VIBRATE_IN_SILENT -->
<bool name="def_vibrate_in_silent">true</bool>
- <bool name="def_use_ptp_interface">false</bool>
-
<!-- Default for Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION -->
<bool name="def_accessibility_script_injection">false</bool>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 9cbf704..47ab150 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -1209,9 +1209,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT,
R.bool.def_vibrate_in_silent);
- loadBooleanSetting(stmt, Settings.System.USE_PTP_INTERFACE,
- R.bool.def_use_ptp_interface);
-
// Set notification volume to follow ringer volume by default
loadBooleanSetting(stmt, Settings.System.NOTIFICATIONS_USE_RING_VOLUME,
R.bool.def_notifications_use_ring_volume);