commit a08b1af5cff905901b597def1ea898314b7d376b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri May 13 20:37:40 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri May 13 20:37:40 2022 +0000
tree 45a31629b769e1b943e741d0f811c2e56938c0a8
parent 7fb63afbef6c5b13835c655651724ced94cdc645
parent 0413d4587fff954e06399130002bbc779dc7c676

Merge cherrypicks of [18281033] into security-aosp-rvc-release.

Change-Id: I394aee0312d1412bfbd2f4fbe2c66e66fef26069

src/com/android/keychain/KeyChainActivity.java

diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 7165a09..ed289a1 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -416,7 +416,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 {