From b632bd57168ef757002d577a53afad81ccd5db1b Mon Sep 17 00:00:00 2001
From: Chong Zhang <chz@google.com>
Date: Mon, 2 Nov 2020 11:01:48 -0800
Subject: Add NDK PermissionManager checkPermission

bug: 172283477
bug: 159172726

Change-Id: I532722772f6a86ef4f94a95146df34603278bb45
---
 libs/binder/ActivityManager.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'libs/binder/ActivityManager.cpp')

diff --git a/libs/binder/ActivityManager.cpp b/libs/binder/ActivityManager.cpp
index 5e4c98fc7a..727ea6024b 100644
--- a/libs/binder/ActivityManager.cpp
+++ b/libs/binder/ActivityManager.cpp
@@ -17,6 +17,7 @@
 #include <mutex>
 #include <unistd.h>
 
+#include <android/permission_manager.h>
 #include <binder/ActivityManager.h>
 #include <binder/Binder.h>
 #include <binder/IServiceManager.h>
@@ -98,6 +99,18 @@ int32_t ActivityManager::getUidProcessState(const uid_t uid, const String16& cal
     return PROCESS_STATE_UNKNOWN;
 }
 
+status_t ActivityManager::checkPermission(const String16& permission,
+                                     const pid_t pid,
+                                     const uid_t uid,
+                                     int32_t* outResult) {
+    sp<IActivityManager> service = getService();
+    if (service != nullptr) {
+        return service->checkPermission(permission, pid, uid, outResult);
+    }
+    // ActivityManagerService appears dead. Return usual error code for dead service.
+    return DEAD_OBJECT;
+}
+
 status_t ActivityManager::linkToDeath(const sp<IBinder::DeathRecipient>& recipient) {
     sp<IActivityManager> service = getService();
     if (service != nullptr) {
-- 
cgit v1.2.3-59-g8ed1b