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

Commit 723ec00a authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Merge commit 'goog/master' into merge_master 

Conflicts:
	include/ui/Rect.h
	libs/ui/ISurfaceComposer.cpp
parents 310f8da0 39afd5f7

camera/libcameraservice/CameraService.cpp

+0 −6
Original line number Diff line number Diff line
@@ -1052,12 +1052,6 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) 
}





#define CHECK_INTERFACE(interface, data, reply) \

        do { if (!data.enforceInterface(interface::getInterfaceDescriptor())) { \

            LOGW("Call incorrectly routed to " #interface); \

            return PERMISSION_DENIED; \

        } } while (0)



status_t CameraService::onTransact(

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

{

cmds/runtime/ServiceManager.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#ifndef ANDROID_SERVICE_MANAGER_H

#define ANDROID_SERVICE_MANAGER_H



#include <utils/IServiceManager.h>

#include <binder/IServiceManager.h>

#include <utils/KeyedVector.h>

#include <utils/threads.h>

cmds/runtime/main_runtime.cpp

+2 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ static const char* ZYGOTE_ARGV[] = { 
    "--setgroups=1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,3001,3002,3003",

    /* CAP_SYS_TTY_CONFIG & CAP_SYS_RESOURCE & CAP_NET_BROADCAST &

     * CAP_NET_ADMIN & CAP_NET_RAW & CAP_NET_BIND_SERVICE  & CAP_KILL &

     * CAP_SYS_BOOT

     * CAP_SYS_BOOT CAP_SYS_NICE

     */

    "--capabilities=88161312,88161312",

    "--capabilities=96549920,96549920",

    "--runtime-init",

    "--nice-name=system_server",

    "com.android.server.SystemServer"

include/binder/Binder.h

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class BBinder : public IBinder 
public:

                        BBinder();



    virtual String16    getInterfaceDescriptor() const;

    virtual const String16& getInterfaceDescriptor() const;

    virtual bool        isBinderAlive() const;

    virtual status_t    pingBinder();

    virtual status_t    dump(int fd, const Vector<String16>& args);
@@ -71,6 +71,7 @@ private: 


            Extras*     mExtras;

            void*       mReserved0;

    static  String16    sEmptyDescriptor;

};



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

include/binder/BpBinder.h

+3 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ public: 


    inline  int32_t     handle() const { return mHandle; }



    virtual String16    getInterfaceDescriptor() const;

    virtual const String16&    getInterfaceDescriptor() const;

    virtual bool        isBinderAlive() const;

    virtual status_t    pingBinder();

    virtual status_t    dump(int fd, const Vector<String16>& args);
@@ -106,6 +106,7 @@ private: 
    };



            void                reportOneDeath(const Obituary& obit);

            bool                isDescriptorCached() const;



    mutable Mutex               mLock;

            volatile int32_t    mAlive;
@@ -113,6 +114,7 @@ private: 
            Vector<Obituary>*   mObituaries;

            ObjectManager       mObjects;

            Parcel*             mConstantData;

    mutable String16            mDescriptorCache;

};



}; // namespace android