diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-08-31 13:47:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-31 13:47:13 -0700 |
| commit | d20e80251258c88450ad3b5bd650f1cb6d01bc15 (patch) | |
| tree | 6d0b0ba988d03d8b9196d408cb19a6825a80bcff /core/java/android/provider | |
| parent | 6ed727e39e945a512cd870e3136dd47927242020 (diff) | |
| parent | eabe8bfaf8c45289a4cfd880f4107d1a9b17e38b (diff) | |
| download | frameworks_base-d20e80251258c88450ad3b5bd650f1cb6d01bc15.zip frameworks_base-d20e80251258c88450ad3b5bd650f1cb6d01bc15.tar.gz frameworks_base-d20e80251258c88450ad3b5bd650f1cb6d01bc15.tar.bz2 | |
Merge "Add settings option for running MTP server in PTP mode."
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 6d3ca27..57fa463 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1686,6 +1686,12 @@ public final class Settings { public static final String UNLOCK_SOUND = "unlock_sound"; /** + * True if we should appear as a PTP device instead of MTP. + * @hide + */ + public static final String USE_PTP_INTERFACE = "use_ptp_interface"; + + /** * Settings to backup. This is here so that it's in the same place as the settings * keys and easy to update. * @hide @@ -1745,7 +1751,8 @@ public final class Settings { DOCK_SOUNDS_ENABLED, LOCKSCREEN_SOUNDS_ENABLED, SHOW_WEB_SUGGESTIONS, - NOTIFICATION_LIGHT_PULSE + NOTIFICATION_LIGHT_PULSE, + USE_PTP_INTERFACE, }; // Settings moved to Settings.Secure |