commit f5afadd367bebd75a827fd51c232dbd04dc9a45c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri May 13 20:37:42 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri May 13 20:37:42 2022 +0000
tree f2f03439a9d4e819a6126ac4eba6a0102c0ab6b9
parent 5991036b8d5bd3e45b05b6424f360cfe0a5c76a1
parent 68f6fcb0f5afc9280f169797f03633400614a2f8

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

Change-Id: I5ad10652e4ba23d30bacccd917354f4095f7aa7c

src/com/android/keychain/KeyChainActivity.java

diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index f8cb0d3..e8bc1e7 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -372,7 +372,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 {