diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2018-12-17 21:51:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-17 21:51:29 +0000 |
| commit | eb9b11c096414cef95d7104d7a410c5e7ffa9822 (patch) | |
| tree | 8f236f81c685678533215e3f729ee9ecea05942a /llkd | |
| parent | 17d41711c62cb677740475946019c4038224e6f6 (diff) | |
| parent | 599958d1148c1137bee925f4cf08eda7f8050d98 (diff) | |
| download | system_core-eb9b11c096414cef95d7104d7a410c5e7ffa9822.tar.gz system_core-eb9b11c096414cef95d7104d7a410c5e7ffa9822.tar.bz2 system_core-eb9b11c096414cef95d7104d7a410c5e7ffa9822.zip | |
Merge "llkd: adbd is allowed to be a bad parent on userdebug"
Diffstat (limited to 'llkd')
| -rw-r--r-- | llkd/README.md | 2 | ||||
| -rw-r--r-- | llkd/include/llkd.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/llkd/README.md b/llkd/README.md index 3da7a2f36..224e184d2 100644 --- a/llkd/README.md +++ b/llkd/README.md @@ -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. diff --git a/llkd/include/llkd.h b/llkd/include/llkd.h index b16b1d8e3..1efa32b74 100644 --- a/llkd/include/llkd.h +++ b/llkd/include/llkd.h @@ -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" |