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

Commit 5c504ee4 authored by Chong Zhang's avatar Chong Zhang
Browse files

transcoding: use __ANDROID_API_FUTURE__ in __builtin_available check 

__builtin_available 31 fails because we're not officially 31 yet.
Use __ANDROID_API_FUTURE__ for now.

bug: 178144708
test: builds; transcoding unit tests; manually test transcoding works.
Change-Id: I4ccf05f3858feb9e22eb294b4443edc830737204
parent 03b68517

media/libmediatranscoding/TranscodingClientManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ bool TranscodingClientManager::isTrustedCaller(pid_t pid, uid_t uid) { 
    }



    int32_t result;

    if (__builtin_available(android 31, *)) {

    if (__builtin_available(android __TRANSCODING_MIN_API__, *)) {

        if (APermissionManager_checkPermission("android.permission.WRITE_MEDIA_STORAGE", pid, uid,

                                               &result) == PERMISSION_MANAGER_STATUS_OK &&

            result == PERMISSION_MANAGER_PERMISSION_GRANTED) {

media/libmediatranscoding/TranscodingUidPolicy.cpp

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void TranscodingUidPolicy::OnUidImportance(uid_t uid, int32_t uidImportance, voi 
}



void TranscodingUidPolicy::registerSelf() {

    if (__builtin_available(android 31, *)) {

    if (__builtin_available(android __TRANSCODING_MIN_API__, *)) {

        mUidObserver = AActivityManager_addUidImportanceListener(&OnUidImportance, -1, (void*)this);

    }
@@ -63,7 +63,7 @@ void TranscodingUidPolicy::registerSelf() { 
}



void TranscodingUidPolicy::unregisterSelf() {

    if (__builtin_available(android 31, *)) {

    if (__builtin_available(android __TRANSCODING_MIN_API__, *)) {

        AActivityManager_removeUidImportanceListener(mUidObserver);

        mUidObserver = nullptr;
@@ -91,7 +91,7 @@ void TranscodingUidPolicy::registerMonitorUid(uid_t uid) { 
    }



    int32_t state = IMPORTANCE_UNKNOWN;

    if (__builtin_available(android 31, *)) {

    if (__builtin_available(android __TRANSCODING_MIN_API__, *)) {

        if (mRegistered && AActivityManager_isUidActive(uid)) {

            state = AActivityManager_getUidImportance(uid);

        }

media/libmediatranscoding/include/media/TranscodingUidPolicy.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
#include <unordered_map>

#include <unordered_set>



// TODO: replace __ANDROID_API_FUTURE__with 31 when it's official (b/178144708)

#define __TRANSCODING_MIN_API__ __ANDROID_API_FUTURE__



struct AActivityManager_UidImportanceListener;



namespace android {

services/mediatranscoding/MediaTranscodingService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ binder_status_t MediaTranscodingService::dump(int fd, const char** /*args*/, uin 


    uid_t callingUid = AIBinder_getCallingUid();

    pid_t callingPid = AIBinder_getCallingPid();

    if (__builtin_available(android 31, *)) {

    if (__builtin_available(android __TRANSCODING_MIN_API__, *)) {

        int32_t permissionResult;

        if (APermissionManager_checkPermission("android.permission.DUMP", callingPid, callingUid,

                                               &permissionResult) != PERMISSION_MANAGER_STATUS_OK ||