Merge "llkd: adbd is allowed to be a bad parent on userdebug"

am: eb9b11c096

Change-Id: I9cb0bc17b63bce95406dfb1c03054c71f681037b
This commit is contained in:
Mark Salyzyn 2018-12-17 14:10:16 -08:00 committed by android-build-merger
commit 028de4ae9f
2 changed files with 5 additions and 1 deletions

View file

@ -160,7 +160,7 @@ size of 92.
NB: false is a very very very unlikely process to want to blacklist.
#### ro.llk.blacklist.parent
default 0,2 (kernel and [kthreadd]).
default 0,2,adbd (kernel, [kthreadd] and adbd).
The string "*false*" is the equivalent to an *empty* list.
Do not watch processes that have this parent.
A parent process can be comm, cmdline or pid reference.

View file

@ -55,7 +55,11 @@ unsigned llkCheckMilliseconds(void);
#define LLK_BLACKLIST_PROCESS_DEFAULT \
"0,1,2,init,[kthreadd],[khungtaskd],lmkd,llkd,watchdogd,[watchdogd],[watchdogd/0]"
#define LLK_BLACKLIST_PARENT_PROPERTY "ro.llk.blacklist.parent"
#ifdef __PTRACE_ENABLED__ // defined if userdebug build
#define LLK_BLACKLIST_PARENT_DEFAULT "0,2,[kthreadd],adbd"
#else
#define LLK_BLACKLIST_PARENT_DEFAULT "0,2,[kthreadd]"
#endif
#define LLK_BLACKLIST_UID_PROPERTY "ro.llk.blacklist.uid"
#define LLK_BLACKLIST_UID_DEFAULT ""
#define LLK_BLACKLIST_STACK_PROPERTY "ro.llk.blacklist.process.stack"