diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-03-13 11:01:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 11:01:09 -0700 |
| commit | ff832d2fed79e797443d40d426543776a94e16d0 (patch) | |
| tree | 8f1918a8bf2af8ad9c400804f367d1fe818a1a26 /core | |
| parent | c43e89a665a41b96b727547ac06044f150cd22e3 (diff) | |
| parent | 1cb98aeaad2e04e6f1cc4f67c92808aa1c8f50e5 (diff) | |
| download | frameworks_base-ff832d2fed79e797443d40d426543776a94e16d0.zip frameworks_base-ff832d2fed79e797443d40d426543776a94e16d0.tar.gz frameworks_base-ff832d2fed79e797443d40d426543776a94e16d0.tar.bz2 | |
am 1cb98aea: Merge "USB: Add support for disabling USB permission dialogs."
* commit '1cb98aeaad2e04e6f1cc4f67c92808aa1c8f50e5':
USB: Add support for disabling USB permission dialogs.
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index cfd4a63..4656f32 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1212,6 +1212,10 @@ <!-- Whether UI for multi user should be shown --> <bool name="config_enableMultiUserUI">false</bool> + <!-- If true, then we do not ask user for permission for apps to connect to USB devices. + Do not set this to true for production devices. Doing so will cause you to fail CTS. --> + <bool name="config_disableUsbPermissionDialogs">false</bool> + <!-- Minimum span needed to begin a touch scaling gesture. If the span is equal to or greater than this size, a scaling gesture will begin, where supported. (See android.view.ScaleGestureDetector) diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 6624da4..efa873d 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -290,6 +290,7 @@ <java-symbol type="bool" name="config_forceDefaultOrientation" /> <java-symbol type="bool" name="config_wifi_batched_scan_supported" /> <java-symbol type="bool" name="config_enableMultiUserUI"/> + <java-symbol type="bool" name="config_disableUsbPermissionDialogs"/> <java-symbol type="integer" name="config_cursorWindowSize" /> <java-symbol type="integer" name="config_extraFreeKbytesAdjust" /> |