From 0077236f371c29ff523827de83ed7053ac6b1a17 Mon Sep 17 00:00:00 2001
From: Henry Fang <quxiangfang@google.com>
Date: Wed, 11 Nov 2020 18:50:46 -0800
Subject: [PATCH] use UID instead of user ID for metrics according to design
 doc.

bug: 169537354
Test: atest -c MediaCasTest
Change-Id: I63e13eb20b1f16c6f28c6d0391bfcad836dc7a45
---
 media/java/android/media/MediaCas.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media/java/android/media/MediaCas.java b/media/java/android/media/MediaCas.java
index 5c1f89313ec05..9957975f16926 100644
--- a/media/java/android/media/MediaCas.java
+++ b/media/java/android/media/MediaCas.java
@@ -20,7 +20,6 @@ import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.TestApi;
-import android.app.ActivityManager;
 import android.content.Context;
 import android.hardware.cas.V1_0.HidlCasPluginDescriptor;
 import android.hardware.cas.V1_0.ICas;
@@ -679,7 +678,7 @@ public final class MediaCas implements AutoCloseable {
     private void createPlugin(int casSystemId) throws UnsupportedCasException {
         try {
             mCasSystemId = casSystemId;
-            mUserId = ActivityManager.getCurrentUser();
+            mUserId = Process.myUid();
             IMediaCasService service = getService();
             android.hardware.cas.V1_2.IMediaCasService serviceV12 =
                     android.hardware.cas.V1_2.IMediaCasService.castFrom(service);