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

Commit 5db13141 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "Get rid of the "pid" parameter from createSurface"

parents b104800b 9638e5c1

cmds/bootanimation/BootAnimation.cpp

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ status_t BootAnimation::readyToRun() { 


    // create the native surface

    sp<SurfaceControl> control = session()->createSurface(

            getpid(), 0, dinfo.w, dinfo.h, PIXEL_FORMAT_RGB_565);

            0, dinfo.w, dinfo.h, PIXEL_FORMAT_RGB_565);

    session()->openTransaction();

    control->setLayer(0x40000000);

    session()->closeTransaction();

cmds/stagefright/sf2.cpp

+0 −1
Original line number Diff line number Diff line
@@ -543,7 +543,6 @@ int main(int argc, char **argv) { 
        CHECK_EQ(composerClient->initCheck(), (status_t)OK);



        control = composerClient->createSurface(

                getpid(),

                String8("A Surface"),

                0,

                1280,

cmds/stagefright/stream.cpp

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ int main(int argc, char **argv) { 


    sp<SurfaceControl> control =

        composerClient->createSurface(

                getpid(),

                String8("A Surface"),

                0,

                1280,

core/jni/android_view_Surface.cpp

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static void setSurface(JNIEnv* env, jobject clazz, const sp<Surface>& surface) 
static void Surface_init(

        JNIEnv* env, jobject clazz,

        jobject session,

        jint pid, jstring jname, jint dpy, jint w, jint h, jint format, jint flags)

        jint, jstring jname, jint dpy, jint w, jint h, jint format, jint flags)

{

    if (session == NULL) {

        doThrowNPE(env);
@@ -216,12 +216,12 @@ static void Surface_init( 


    sp<SurfaceControl> surface;

    if (jname == NULL) {

        surface = client->createSurface(pid, dpy, w, h, format, flags);

        surface = client->createSurface(dpy, w, h, format, flags);

    } else {

        const jchar* str = env->GetStringCritical(jname, 0);

        const String8 name(str, env->GetStringLength(jname));

        env->ReleaseStringCritical(jname, str);

        surface = client->createSurface(pid, name, dpy, w, h, format, flags);

        surface = client->createSurface(name, dpy, w, h, format, flags);

    }



    if (surface == 0) {

include/surfaceflinger/ISurfaceComposerClient.h

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ public: 
     * Requires ACCESS_SURFACE_FLINGER permission

     */

    virtual sp<ISurface> createSurface( surface_data_t* data,

                                        int pid,

                                        const String8& name,

                                        DisplayID display,

                                        uint32_t w,