commit c28a194e9a6f5dd8ae8b95f528ce0018c0e7411b
author Allen Su <allenwtsu@google.com> Sat Apr 03 16:58:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Apr 03 16:58:05 2021 +0000
tree 0355d5f030ebcfadd5da166c120fe403e462ec46
parent b48d6144d75103b4ddaec9131b1a26c4bde77d46
parent 16a51d9f1d8b005b5e321d570d22a9bef3726fb8

Merge "[RCS]Impose base64 on KsNaf" am: c9390bc55b am: 52f03fd7cb am: 16a51d9f1d

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1662383

Change-Id: I6b7671fa484502228de6e750d2ecbc4b1606ed48

testapps/TestRcsApp/TestApp/AndroidManifest.xml

diff --git a/testapps/TestRcsApp/TestApp/AndroidManifest.xml b/testapps/TestRcsApp/TestApp/AndroidManifest.xml
index 52dd427..460a1ce 100644
--- a/testapps/TestRcsApp/TestApp/AndroidManifest.xml
+++ b/testapps/TestRcsApp/TestApp/AndroidManifest.xml
@@ -19,8 +19,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.sample.rcsclient"
-    android:versionCode="11"
-    android:versionName="1.0.10">
+    android:versionCode="12"
+    android:versionName="1.0.11">
 
     <uses-sdk
         android:minSdkVersion="30"

testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/filetransfer/requestexecutor/GbaAuthenticationProvider.java

diff --git a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/filetransfer/requestexecutor/GbaAuthenticationProvider.java b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/filetransfer/requestexecutor/GbaAuthenticationProvider.java
index 55608e0..0bfa4cb 100644
--- a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/filetransfer/requestexecutor/GbaAuthenticationProvider.java
+++ b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/filetransfer/requestexecutor/GbaAuthenticationProvider.java
@@ -25,6 +25,7 @@
 import android.util.Log;
 
 import com.google.auto.value.AutoValue;
+import com.google.common.io.BaseEncoding;
 import com.google.common.util.concurrent.SettableFuture;
 
 import org.apache.http.auth.Credentials;
@@ -61,7 +62,7 @@
             int cipherSuite = carrierConfig.getInt(
                     CarrierConfigManager.KEY_GBA_UA_TLS_CIPHER_SUITE_INT);
             Log.i(TAG, "organization:" + organization + ", protocol:" + protocol + ", cipherSuite:"
-                    + cipherSuite);
+                    + cipherSuite + ", contentServerUrl:" + contentServerUrl);
 
             builder.setOrg(UaSecurityProtocolIdentifier.ORG_3GPP)
                     .setProtocol(
@@ -79,7 +80,8 @@
                 new TelephonyManager.BootstrapAuthenticationCallback() {
                     @Override
                     public void onKeysAvailable(byte[] gbaKey, String btId) {
-                        Log.i(TAG, "onKeysAvailable: key:[" + new String(gbaKey) + "] btid:[" + btId
+                        Log.i(TAG, "onKeysAvailable: String key:[" + new String(gbaKey) + "] btid:["
+                                + btId + "]" + "Base64 key:[" + BaseEncoding.base64().encode(gbaKey)
                                 + "]");
                         credentialsFuture.set(GbaCredentials.create(btId, gbaKey));
                     }
@@ -108,7 +110,7 @@
 
         public static GbaCredentials create(String btId, byte[] gbaKey) {
             return new AutoValue_GbaAuthenticationProvider_GbaCredentials(
-                    GbaPrincipal.create(btId), new String(gbaKey));
+                    GbaPrincipal.create(btId), BaseEncoding.base64().encode(gbaKey));
         }
 
         @Override