commit a2b002d741068ed5930b5d1e085cbd79561bc958
author Bharath <bharath@fairphone.com> Thu Jul 07 19:51:13 2022 +0530
committer Bharath <bharath@fairphone.com> Thu Jul 07 20:00:04 2022 +0530
tree 767b59350247de0ddd2b7df63f3d72238c94203b
parent 20370a49ee895fa4ddebe3aa2bbf0d797c3ed05c
parent a08b1af5cff905901b597def1ea898314b7d376b

Merge tag 'android-security-11.0.0_r57' into int/11/fp3

Android security 11.0.0 release 57

* tag 'android-security-11.0.0_r57':
  Encode authority part of uri before showing in UI

Change-Id: Ic50607265159a5ecd6e832b31fbe4976cb9ea677

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 {