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

Commit f2e53c5e authored by Daniel Erat's avatar Daniel Erat Committed by Gerrit Code Review
Browse files

Merge "Remove BnServiceManager."

parents 6c8c8138 1835c85f

include/binder/IServiceManager.h

+0 −14
Original line number Diff line number Diff line
@@ -81,20 +81,6 @@ bool checkCallingPermission(const String16& permission, 
                            int32_t* outPid, int32_t* outUid);

bool checkPermission(const String16& permission, pid_t pid, uid_t uid);





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



class BnServiceManager : public BnInterface<IServiceManager>

{

public:

    virtual status_t    onTransact( uint32_t code,

                                    const Parcel& data,

                                    Parcel* reply,

                                    uint32_t flags = 0);

};



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



}; // namespace android



#endif // ANDROID_ISERVICE_MANAGER_H

libs/binder/IServiceManager.cpp

+0 −44
Original line number Diff line number Diff line
@@ -184,48 +184,4 @@ public: 


IMPLEMENT_META_INTERFACE(ServiceManager, "android.os.IServiceManager");



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



status_t BnServiceManager::onTransact(

    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

{

    //printf("ServiceManager received: "); data.print();

    switch(code) {

        case GET_SERVICE_TRANSACTION: {

            CHECK_INTERFACE(IServiceManager, data, reply);

            String16 which = data.readString16();

            sp<IBinder> b = const_cast<BnServiceManager*>(this)->getService(which);

            reply->writeStrongBinder(b);

            return NO_ERROR;

        } break;

        case CHECK_SERVICE_TRANSACTION: {

            CHECK_INTERFACE(IServiceManager, data, reply);

            String16 which = data.readString16();

            sp<IBinder> b = const_cast<BnServiceManager*>(this)->checkService(which);

            reply->writeStrongBinder(b);

            return NO_ERROR;

        } break;

        case ADD_SERVICE_TRANSACTION: {

            CHECK_INTERFACE(IServiceManager, data, reply);

            String16 which = data.readString16();

            sp<IBinder> b = data.readStrongBinder();

            status_t err = addService(which, b);

            reply->writeInt32(err);

            return NO_ERROR;

        } break;

        case LIST_SERVICES_TRANSACTION: {

            CHECK_INTERFACE(IServiceManager, data, reply);

            Vector<String16> list = listServices();

            const size_t N = list.size();

            reply->writeInt32(N);

            for (size_t i=0; i<N; i++) {

                reply->writeString16(list[i]);

            }

            return NO_ERROR;

        } break;

        default:

            return BBinder::onTransact(code, data, reply, flags);

    }

}



}; // namespace android