diff options
author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /adb/daemon/main.cpp | |
parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'adb/daemon/main.cpp')
-rw-r--r-- | adb/daemon/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/adb/daemon/main.cpp b/adb/daemon/main.cpp index eb28668b9..8c41c5e2d 100644 --- a/adb/daemon/main.cpp +++ b/adb/daemon/main.cpp @@ -108,9 +108,12 @@ static void drop_privileges(int server_port) { // AID_NET_BW_STATS to read out qtaguid statistics // AID_READPROC for reading /proc entries across UID boundaries // AID_UHID for using 'hid' command to read/write to /dev/uhid + // AID_EXT_DATA_RW for writing to /sdcard/Android/data (devices without sdcardfs) + // AID_EXT_OBB_RW for writing to /sdcard/Android/obb (devices without sdcardfs) gid_t groups[] = {AID_ADB, AID_LOG, AID_INPUT, AID_INET, AID_NET_BT, AID_NET_BT_ADMIN, AID_SDCARD_R, AID_SDCARD_RW, - AID_NET_BW_STATS, AID_READPROC, AID_UHID}; + AID_NET_BW_STATS, AID_READPROC, AID_UHID, AID_EXT_DATA_RW, + AID_EXT_OBB_RW}; minijail_set_supplementary_gids(jail.get(), arraysize(groups), groups); // Don't listen on a port (default 5037) if running in secure mode. |