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

Commit 2e0f8506 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder - split out I?ProcessInfoService" am: 9575a041 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662931

Change-Id: I5673c9a1cc314d96e0fdf0f2a5385a72fac4935f
parents 5f16bac9 9575a041

media/utils/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ cc_library { 
    static_libs: [

        "libc_malloc_debug_backtrace",

        "libbatterystats_aidl",

        "libprocessinfoservice_aidl",

    ],

    shared_libs: [

        "libaudioutils", // for clock.h

media/utils/ProcessInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
#include <media/stagefright/ProcessInfo.h>



#include <binder/IPCThreadState.h>

#include <binder/IProcessInfoService.h>

#include <binder/IServiceManager.h>

#include <private/android_filesystem_config.h>

#include <processinfo/IProcessInfoService.h>



namespace android {

services/camera/libcameraservice/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ cc_library_shared { 
    ],



    static_libs: [

        "libprocessinfoservice_aidl",

        "libbinderthreadstateutils",

    ],

services/camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <binder/MemoryBase.h>

#include <binder/MemoryHeapBase.h>

#include <binder/PermissionController.h>

#include <binder/ProcessInfoService.h>

#include <binder/IResultReceiver.h>

#include <binderthreadstate/CallerUtils.h>

#include <cutils/atomic.h>
@@ -57,6 +56,7 @@ 
#include <media/IMediaHTTPService.h>

#include <media/mediaplayer.h>

#include <mediautils/BatteryNotifier.h>

#include <processinfo/ProcessInfoService.h>

#include <utils/Errors.h>

#include <utils/Log.h>

#include <utils/String16.h>