ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ServiceManager: Implement PING_TRANSACTION

Browse Source 
Stop printing "invalid id " to stderr every time a process tries to
connect to the servicemanager.

Change-Id: Ib0e5a0375bfa2dec2c2f9cd668bd5dda46ed6588
This commit is contained in:
Arve Hjønnevåg 2014-01-28 21:35:03 -08:00
parent 399b6c3bbc
commit e5245cbf5d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/servicemanager/binder.h
View File

@ -33,6 +33,8 @@ struct binder_death {
#define SVC_MGR_NAME "android.os.IServiceManager" #define SVC_MGR_NAME "android.os.IServiceManager"
enum { enum {
/* Must match definitions in IBinder.h and IServiceManager.h */
PING_TRANSACTION = B_PACK_CHARS('_','P','N','G'),
SVC_MGR_GET_SERVICE = 1, SVC_MGR_GET_SERVICE = 1,
SVC_MGR_CHECK_SERVICE, SVC_MGR_CHECK_SERVICE,
SVC_MGR_ADD_SERVICE, SVC_MGR_ADD_SERVICE,

3
cmds/servicemanager/service_manager.c
View File

@ -220,6 +220,9 @@ int svcmgr_handler(struct binder_state *bs,
if (txn->target.handle != svcmgr_handle) if (txn->target.handle != svcmgr_handle)
return -1; return -1;
if (txn->code == PING_TRANSACTION)
return 0;
// Equivalent to Parcel::enforceInterface(), reading the RPC // Equivalent to Parcel::enforceInterface(), reading the RPC
// header with the strict mode policy mask and the interface name. // header with the strict mode policy mask and the interface name.
// Note that we ignore the strict_policy and don't propagate it // Note that we ignore the strict_policy and don't propagate it