commit c37bdfeb8001229d266b8e453749b273edb008b2
author Chong Zhang <chz@google.com> Tue Oct 06 13:54:09 2020 -0700
committer Chong Zhang <chz@google.com> Wed Oct 07 00:25:08 2020 +0000
tree 9196733568ae64a87e598205d29668e1dd4b9290
parent f8701c40e95ec237919884629f0497c0bb504c04

transcoding: trust MediaProvider to set uid for jobs

bug: 154733526
test: manually check that MediaProvider uid is obtained
successfully, and isTrustedCallingUid() is true

Change-Id: I5577adcfc1acdac343ec3d98a1e33a9fc2fe36d6

media/libmediatranscoding/TranscodingUidPolicy.cpp

diff --git a/media/libmediatranscoding/TranscodingUidPolicy.cpp b/media/libmediatranscoding/TranscodingUidPolicy.cpp
index f0d4945..9763921 100644
--- a/media/libmediatranscoding/TranscodingUidPolicy.cpp
+++ b/media/libmediatranscoding/TranscodingUidPolicy.cpp
@@ -24,7 +24,9 @@
 #include <android/content/pm/IPackageManagerNative.h>
 #include <binder/ActivityManager.h>
 #include <binder/IServiceManager.h>
+#include <binder/PermissionController.h>
 #include <cutils/misc.h>  // FIRST_APPLICATION_UID
+#include <cutils/multiuser.h>
 #include <inttypes.h>
 #include <media/TranscodingUidPolicy.h>
 #include <utils/Log.h>
@@ -133,6 +135,19 @@
     return true;
 }
 
+//static
+status_t TranscodingUidPolicy::getUidForPackage(String16 packageName, /*inout*/ uid_t& uid) {
+    PermissionController pc;
+    uid = pc.getPackageUid(packageName, 0);
+    if (uid <= 0) {
+        ALOGE("Unknown package: '%s'", String8(packageName).string());
+        return BAD_VALUE;
+    }
+
+    uid = multiuser_get_uid(0 /*userId*/, uid);
+    return NO_ERROR;
+}
+
 TranscodingUidPolicy::TranscodingUidPolicy()
       : mAm(std::make_shared<ActivityManager>()),
         mUidObserver(new UidObserver(this)),