diff options
author | Paul Lawrence | 2014-10-09 09:22:49 -0500 |
---|---|---|
committer | Elliott Hughes | 2014-12-09 19:02:17 -0600 |
commit | ec900bba20630934dc51a1b3a57d6d7a30fed325 (patch) | |
tree | 50d20668d3fb0891ccaf251f38e7273e3ad857d8 /adb/services.c | |
parent | 7a497e3b5cc8aee61c5fa3e323d322f68a13c5b2 (diff) | |
download | platform-system-core-ec900bba20630934dc51a1b3a57d6d7a30fed325.tar.gz platform-system-core-ec900bba20630934dc51a1b3a57d6d7a30fed325.tar.xz platform-system-core-ec900bba20630934dc51a1b3a57d6d7a30fed325.zip |
Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""
This reverts commit 152d2d4234ba89e0c20c4af13e291b6049a7bc33.
Fixed build error, and also fixed memory leak spotted from warning.
(cherry-pick of bbb36319119edde9377fb80015235893c30d2bc9.)
Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
Diffstat (limited to 'adb/services.c')
-rw-r--r-- | adb/services.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/adb/services.c b/adb/services.c index 300807a63..1aeb37655 100644 --- a/adb/services.c +++ b/adb/services.c | |||
@@ -471,6 +471,8 @@ int service_to_fd(const char *name) | |||
471 | free(cookie); | 471 | free(cookie); |
472 | } | 472 | } |
473 | } | 473 | } |
474 | } else if(!strncmp(name, "disable-verity:", 15)) { | ||
475 | ret = create_service_thread(disable_verity_service, NULL); | ||
474 | #endif | 476 | #endif |
475 | } | 477 | } |
476 | if (ret >= 0) { | 478 | if (ret >= 0) { |