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

Commit 31e2127d authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Move ServiceUtilities from audioflinger to libmediautils"

parents 808dba40 ab7ef300

media/utils/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ cc_library { 
        "MemoryLeakTrackUtil.cpp",

        "ProcessInfo.cpp",

        "SchedulingPolicyService.cpp",

        "ServiceUtilities.cpp",

    ],

    shared_libs: [

        "libbinder",

services/audioflinger/ServiceUtilities.cpp→media/utils/ServiceUtilities.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <binder/IServiceManager.h>

#include <binder/PermissionCache.h>

#include <private/android_filesystem_config.h>

#include "ServiceUtilities.h"

#include "mediautils/ServiceUtilities.h"



/* When performing permission checks we do not use permission cache for

 * runtime permissions (protection level dangerous) as they may change at

services/audioflinger/ServiceUtilities.h→media/utils/include/mediautils/ServiceUtilities.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 


namespace android {



// Audio permission utilities



extern pid_t getpid_cached;

bool isTrustedCallingUid(uid_t uid);

bool recordingAllowed(const String16& opPackageName, pid_t pid, uid_t uid);

services/audioflinger/Android.mk

+0 −20
Original line number Diff line number Diff line
@@ -2,25 +2,6 @@ LOCAL_PATH:= $(call my-dir) 


include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

    ServiceUtilities.cpp



# FIXME Move this library to frameworks/native

LOCAL_MODULE := libserviceutility



LOCAL_SHARED_LIBRARIES := \

    libcutils \

    libutils \

    liblog \

    libbinder



LOCAL_CFLAGS := -Wall -Werror

LOCAL_SANITIZE := integer_overflow



include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)



LOCAL_SRC_FILES:=               \

    AudioFlinger.cpp            \

    Threads.cpp                 \
@@ -54,7 +35,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libnbaio \

    libnblog \

    libpowermanager \

    libserviceutility \

    libmediautils \

    libmemunreachable \

    libmedia_helper

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include <system/audio.h>



#include "AudioFlinger.h"

#include "ServiceUtilities.h"



#include <media/AudioResamplerPublic.h>
@@ -66,6 +65,7 @@ 
#include <media/nbaio/PipeReader.h>

#include <media/AudioParameter.h>

#include <mediautils/BatteryNotifier.h>

#include <mediautils/ServiceUtilities.h>

#include <private/android_filesystem_config.h>



//#define BUFLOG_NDEBUG 0