From fd79a5d9c1b1bc9588c228bbc8ac6e289638b1ee Mon Sep 17 00:00:00 2001 From: Jorge Lucangeli Obes Date: Fri, 8 Jan 2016 10:55:09 -0800 Subject: [PATCH] adbd: Remove check for set_supplementary_gids. With https://android-review.googlesource.com/#/c/195400, Minijail will check for this failure so there's no need to do it here, which allows to simplify the code. Bug: 26099611 Change-Id: I7c876fdcab874ed403f82bdd5a4048c0f1e5db58 --- adb/daemon/main.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/adb/daemon/main.cpp b/adb/daemon/main.cpp index 78db69dea..4721e2fbb 100644 --- a/adb/daemon/main.cpp +++ b/adb/daemon/main.cpp @@ -124,12 +124,9 @@ static void drop_privileges(int server_port) { AID_INET, AID_NET_BT, AID_NET_BT_ADMIN, AID_SDCARD_R, AID_SDCARD_RW, AID_NET_BW_STATS, AID_READPROC}; - if (minijail_set_supplementary_gids( - jail.get(), - sizeof(groups) / sizeof(groups[0]), - groups) != 0) { - LOG(FATAL) << "Could not configure supplementary groups"; - } + minijail_set_supplementary_gids(jail.get(), + sizeof(groups) / sizeof(groups[0]), + groups); // Don't listen on a port (default 5037) if running in secure mode. // Don't run as root if running in secure mode.