FileMap::create: remove duplicate addition. am: 54794ac613 am: 2912d9c190 am: 98e213207f am: a6d7150812 am: 8a192ea12a am: 3c751b9f66 am: 5281bee360
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12393457
Change-Id: I999c7dc09e266e082924939b2a08d6a7e2ff2e5b
diff --git a/adb/apex/apex_manifest.json b/adb/apex/apex_manifest.json
index 0444409..c825b04 100644
--- a/adb/apex/apex_manifest.json
+++ b/adb/apex/apex_manifest.json
@@ -1,4 +1,4 @@
{
"name": "com.android.adbd",
- "version": 300000000
+ "version": 309999900
}
diff --git a/adb/daemon/main.cpp b/adb/daemon/main.cpp
index 658e244..7a0f7ff 100644
--- a/adb/daemon/main.cpp
+++ b/adb/daemon/main.cpp
@@ -108,9 +108,12 @@
// 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.