Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 976002b6 authored by Henry Fang's avatar Henry Fang Committed by Android (Google) Code Review
Browse files

Merge "use UID instead of user ID for metrics according to design doc."

parents 867e3f44 0077236f

media/java/android/media/MediaCas.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.annotation.TestApi;

import android.app.ActivityManager;

import android.content.Context;

import android.content.Context;

import android.hardware.cas.V1_0.HidlCasPluginDescriptor;

import android.hardware.cas.V1_0.HidlCasPluginDescriptor;

import android.hardware.cas.V1_0.ICas;

import android.hardware.cas.V1_0.ICas;
@@ -679,7 +678,7 @@ public final class MediaCas implements AutoCloseable { 
    private void createPlugin(int casSystemId) throws UnsupportedCasException {

    private void createPlugin(int casSystemId) throws UnsupportedCasException {

        try {

        try {

            mCasSystemId = casSystemId;

            mCasSystemId = casSystemId;

            mUserId = ActivityManager.getCurrentUser();

            mUserId = Process.myUid();

            IMediaCasService service = getService();

            IMediaCasService service = getService();

            android.hardware.cas.V1_2.IMediaCasService serviceV12 =

            android.hardware.cas.V1_2.IMediaCasService serviceV12 =

                    android.hardware.cas.V1_2.IMediaCasService.castFrom(service);

                    android.hardware.cas.V1_2.IMediaCasService.castFrom(service);