diff options
| author | Aaron Whyte <awhyte@google.com> | 2014-04-16 23:45:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-16 23:45:22 +0000 |
| commit | 4980996bcc4e8065cf5dff1cf989d73face38281 (patch) | |
| tree | 7dd66cac3a887ced57454c2fdb67a15097a6789d /core | |
| parent | 973ddaacaef255b8659d35cfe4151dd5b7436138 (diff) | |
| parent | d1931ffc075f73d043616b7446f14a653609782e (diff) | |
Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 0b42588bb5af..88deb398453b 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1332,10 +1332,10 @@ Example: com.google.android.myapp/.resolver.MyResolverActivity --> <string name="config_customResolverActivity"></string> - <!-- Name of the activity that prompts the user to reject, accept, or whitelist + <!-- Name of the activity or service that prompts the user to reject, accept, or whitelist an adb host's public key, when an unwhitelisted host connects to the local adbd. Can be customized for other product types --> - <string name="config_customAdbPublicKeyActivity" + <string name="config_customAdbPublicKeyConfirmationComponent" >com.android.systemui/com.android.systemui.usb.UsbDebuggingActivity</string> <!-- Apps that are authorized to access shared accounts, overridden by product overlays --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 323494aa751e..f88b8bbef999 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1625,7 +1625,7 @@ <java-symbol type="string" name="enable_explore_by_touch_warning_message" /> <java-symbol type="bool" name="config_powerDecoupleAutoSuspendModeFromDisplay" /> <java-symbol type="bool" name="config_powerDecoupleInteractiveModeFromDisplay" /> - <java-symbol type="string" name="config_customAdbPublicKeyActivity" /> + <java-symbol type="string" name="config_customAdbPublicKeyConfirmationComponent" /> <java-symbol type="layout" name="resolver_list" /> <java-symbol type="id" name="resolver_list" /> |