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

Commit cfe6d4bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 70f17d9f ef216948

media/java/android/media/tv/tuner/Tuner.java

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.app.ActivityManager;

import android.content.Context;

import android.hardware.tv.tuner.V1_0.Constants;

import android.media.tv.TvInputService;
@@ -54,6 +53,7 @@ import android.os.Handler; 
import android.os.HandlerExecutor;

import android.os.Looper;

import android.os.Message;

import android.os.Process;

import android.util.Log;



import com.android.internal.util.FrameworkStatsLog;
@@ -352,7 +352,7 @@ public class Tuner implements AutoCloseable { 
                profile, new HandlerExecutor(mHandler), mResourceListener, clientId);

        mClientId = clientId[0];



        mUserId = ActivityManager.getCurrentUser();

        mUserId = Process.myUid();

    }



    /**

media/java/android/media/tv/tuner/dvr/DvrPlayback.java

+2 −2
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ import android.annotation.BytesLong; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.app.ActivityManager;

import android.hardware.tv.tuner.V1_0.Constants;

import android.media.tv.tuner.Tuner;

import android.media.tv.tuner.Tuner.Result;

import android.media.tv.tuner.TunerUtils;

import android.media.tv.tuner.filter.Filter;

import android.os.ParcelFileDescriptor;

import android.os.Process;

import android.util.Log;



import com.android.internal.util.FrameworkStatsLog;
@@ -98,7 +98,7 @@ public class DvrPlayback implements AutoCloseable { 
    private native long nativeRead(byte[] bytes, long offset, long size);



    private DvrPlayback() {

        mUserId = ActivityManager.getCurrentUser();

        mUserId = Process.myUid();

        mSegmentId = (sInstantId & 0x0000ffff) << 16;

        sInstantId++;

    }

media/java/android/media/tv/tuner/dvr/DvrRecorder.java

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ package android.media.tv.tuner.dvr; 
import android.annotation.BytesLong;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.app.ActivityManager;

import android.media.tv.tuner.Tuner;

import android.media.tv.tuner.Tuner.Result;

import android.media.tv.tuner.TunerUtils;

import android.media.tv.tuner.filter.Filter;

import android.os.ParcelFileDescriptor;

import android.os.Process;

import android.util.Log;



import com.android.internal.util.FrameworkStatsLog;
@@ -61,7 +61,7 @@ public class DvrRecorder implements AutoCloseable { 
    private native long nativeWrite(byte[] bytes, long offset, long size);



    private DvrRecorder() {

        mUserId = ActivityManager.getCurrentUser();

        mUserId = Process.myUid();

        mSegmentId = (sInstantId & 0x0000ffff) << 16;

        sInstantId++;

    }