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

Commit 038ad4db authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Instantiate MediaPlayerService for fuzzing am: 074e53c3 

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



Change-Id: I2ce3327299a673b759d4837ddb248a9d4bcc5121
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f6e84a0 074e53c3

media/libmediaplayerservice/Android.bp

+23 −17
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ license { 
    ],

}



cc_library {

cc_defaults {

    name: "libmediaplayerservice_defaults",



    srcs: [

        "ActivityManager.cpp",
@@ -83,31 +84,36 @@ cc_library { 
        "framework-permission-aidl-cpp",

    ],



    export_shared_lib_headers: [

        "libmedia",

        "framework-permission-aidl-cpp",

    ],



    export_header_lib_headers: [

        "libmediautils_headers",

    ],



    local_include_dirs: ["include"],



    export_include_dirs: [

        ".",

    ],



    cflags: [

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wall",

    ],



    name: "libmediaplayerservice",



    sanitize: {

        cfi: true,

    },

}



cc_library {

    name: "libmediaplayerservice",



    defaults: [

        "libmediaplayerservice_defaults",

    ],



    export_shared_lib_headers: [

        "libmedia",

        "framework-permission-aidl-cpp",

    ],



    export_header_lib_headers: [

        "libmediautils_headers",

    ],



    export_include_dirs: [

        ".",

    ],

}
 
 No newline at end of file

media/libmediaplayerservice/MediaPlayerService.cpp

+7 −0
Original line number Diff line number Diff line
@@ -3037,4 +3037,11 @@ status_t MediaPlayerService::BatteryTracker::pullBatteryData(Parcel* reply) { 
    }

    return NO_ERROR;

}



#ifdef FUZZ_MODE_MEDIA_PLAYER_SERVICE

sp<MediaPlayerService> MediaPlayerService::createForFuzzTesting() {

    return sp<MediaPlayerService>::make();

}

#endif // FUZZ_MODE_MEDIA_PLAYER_SERVICE



} // namespace android

media/libmediaplayerservice/MediaPlayerService.h

+6 −0
Original line number Diff line number Diff line
@@ -505,6 +505,12 @@ private: 
                SortedVector< wp<Client> >  mClients;

                SortedVector< wp<MediaRecorderClient> > mMediaRecorderClients;

                int32_t                     mNextConnId;



#ifdef FUZZ_MODE_MEDIA_PLAYER_SERVICE

public:

    friend class sp<MediaPlayerService>;

    static sp<MediaPlayerService> createForFuzzTesting();

#endif // FUZZ_MODE_MEDIA_PLAYER_SERVICE

};



// ----------------------------------------------------------------------------