From 3406ff9b1644507d049aa13fd753ac9a45058109 Mon Sep 17 00:00:00 2001
From: shubang <shubang@google.com>
Date: Thu, 10 Jun 2021 04:28:27 -0700
Subject: [PATCH] MediaMetrics: Cleanup the formatting of session ID

Use the flags Base64.NO_PADDING|Base64.NO_WRAP|Base64.URL_SAFE

This formats the id as one long string without == passing at the end,
Using -_ instead of +/ characters

Bug: 175357495
Test: atest android.media.metrics.cts.MediaMetricsAtomHostSideTests
Change-Id: Iba73976b5677e9a2e5fd3e156a55499005e26904
---
 .../server/media/metrics/MediaMetricsManagerService.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/media/metrics/MediaMetricsManagerService.java b/services/core/java/com/android/server/media/metrics/MediaMetricsManagerService.java
index 1e0142c496b01..2cc2ebf616c58 100644
--- a/services/core/java/com/android/server/media/metrics/MediaMetricsManagerService.java
+++ b/services/core/java/com/android/server/media/metrics/MediaMetricsManagerService.java
@@ -98,7 +98,8 @@ public final class MediaMetricsManagerService extends SystemService {
         private String getSessionIdInternal(int userId) {
             byte[] byteId = new byte[16]; // 128 bits
             mSecureRandom.nextBytes(byteId);
-            String id = Base64.encodeToString(byteId, Base64.DEFAULT);
+            String id = Base64.encodeToString(
+                    byteId, Base64.NO_PADDING | Base64.NO_WRAP | Base64.URL_SAFE);
             return id;
         }