| commit | a2d8314ab8a72302aa67ee281f105f73ee51dabf | [log] [tgz] |
|---|---|---|
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Mon May 16 21:39:27 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 16 21:39:27 2022 +0000 |
| tree | dd4e665e7800ba4d00d792697aac266fdc41cfd4 | |
| parent | a2428c3eb65216e3bb8b98910cebd8174d857684 [diff] | |
| parent | b2e956083b97e9ea88ab681fd91f28a9bef704cd [diff] |
Merge cherrypicks of [18281033] into sc-qpr3-release. am: b2e956083b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/18416905 Change-Id: I91f61e401a9f9d7c16bf130a967d552caf721899 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java index 67219a5..45be472 100644 --- a/src/com/android/keychain/KeyChainActivity.java +++ b/src/com/android/keychain/KeyChainActivity.java
@@ -533,7 +533,7 @@ Uri uri = getIntent().getParcelableExtra(KeyChain.EXTRA_URI); if (uri != null) { String hostMessage = String.format(res.getString(R.string.requesting_server), - uri.getAuthority()); + Uri.encode(uri.getAuthority(), "$,;:@&=+")); if (contextMessage == null) { contextMessage = hostMessage; } else {