From fd44e4eee1f1ba8323e094668f55aaedd69b4527 Mon Sep 17 00:00:00 2001
From: Chong Zhang <chz@google.com>
Date: Thu, 29 Oct 2020 17:47:10 -0700
Subject: [PATCH] MediaTranscodeManager: pass client's package name to service

Instead of querying it from package manager native.

bug: 159172726
test: dumpsys and see the package names still displayed correctly.
Change-Id: If171d08d1e44f1aee82e32f428b7d26051e7db1c
---
 media/java/android/media/MediaTranscodeManager.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/media/java/android/media/MediaTranscodeManager.java b/media/java/android/media/MediaTranscodeManager.java
index e5163ce51a90f..39511a573da22 100644
--- a/media/java/android/media/MediaTranscodeManager.java
+++ b/media/java/android/media/MediaTranscodeManager.java
@@ -489,8 +489,8 @@ public final class MediaTranscodeManager {
         mContext = context;
         mContentResolver = mContext.getContentResolver();
         mPackageName = mContext.getPackageName();
-        mPid = Os.getuid();
-        mUid = Os.getpid();
+        mUid = Os.getuid();
+        mPid = Os.getpid();
         IMediaTranscodingService service = getService(false /*retry*/);
         mTranscodingClient = registerClient(service);
     }
@@ -615,7 +615,7 @@ public final class MediaTranscodeManager {
         }
 
         /* Writes the TranscodingRequest to a parcel. */
-        private TranscodingRequestParcel writeToParcel() {
+        private TranscodingRequestParcel writeToParcel(@NonNull Context context) {
             TranscodingRequestParcel parcel = new TranscodingRequestParcel();
             // TODO(hkuang): Implement all the fields here to pass to service.
             parcel.priority = mPriority;
@@ -624,6 +624,8 @@ public final class MediaTranscodeManager {
             parcel.destinationFilePath = mDestinationUri.toString();
             parcel.clientUid = mClientUid;
             parcel.clientPid = mClientPid;
+            parcel.clientPackageName = mClientUid < 0 ? context.getPackageName() :
+                context.getPackageManager().getNameForUid(mClientUid);
             parcel.requestedVideoTrackFormat = convertToVideoTrackFormat(mVideoTrackFormat);
             if (mTestConfig != null) {
                 parcel.isForTesting = true;
@@ -1203,7 +1205,8 @@ public final class MediaTranscodeManager {
                     try {
                         // Submits the request to MediaTranscoding service.
                         TranscodingSessionParcel sessionParcel = new TranscodingSessionParcel();
-                        if (!client.submitRequest(mRequest.writeToParcel(), sessionParcel)) {
+                        if (!client.submitRequest(mRequest.writeToParcel(mManager.mContext),
+                                                  sessionParcel)) {
                             mHasRetried = true;
                             throw new UnsupportedOperationException("Failed to enqueue request");
                         }
@@ -1383,7 +1386,7 @@ public final class MediaTranscodeManager {
         Objects.requireNonNull(listener, "listener must not be null");
 
         // Converts the request to TranscodingRequestParcel.
-        TranscodingRequestParcel requestParcel = transcodingRequest.writeToParcel();
+        TranscodingRequestParcel requestParcel = transcodingRequest.writeToParcel(mContext);
 
         Log.i(TAG, "Getting transcoding request " + transcodingRequest.getSourceUri());