auto import from //branches/cupcake/...@137873
diff --git a/adb/adb.c b/adb/adb.c
index fa5269f..7b23894 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -872,8 +872,10 @@
** AID_INPUT to diagnose input issues (getevent)
** AID_INET to diagnose network issues (netcfg, ping)
** AID_GRAPHICS to access the frame buffer
+ ** AID_NET_BT and AID_NET_BT_ADMIN to diagnose bluetooth (hcidump)
*/
- gid_t groups[] = { AID_ADB, AID_LOG, AID_INPUT, AID_INET, AID_GRAPHICS };
+ gid_t groups[] = { AID_ADB, AID_LOG, AID_INPUT, AID_INET, AID_GRAPHICS,
+ AID_NET_BT, AID_NET_BT_ADMIN };
setgroups(sizeof(groups)/sizeof(groups[0]), groups);
/* then switch user and group to "shell" */
@@ -1080,4 +1082,3 @@
return adb_main(0);
#endif
}
-
diff --git a/rootdir/init.rc b/rootdir/init.rc
index b6cd6a7..e4bb529 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -87,6 +87,9 @@
# set RLIMIT_NICE to allow priorities from 19 to -20
setrlimit 13 40 40
+# Set timeout value for rmnet stats.
+ write /sys/devices/virtual/net/rmnet0/timeout_suspend 5000000
+
# Define the oom_adj values for the classes of processes that can be
# killed by the kernel. These are used in ActivityManagerService.
setprop ro.FOREGROUND_APP_ADJ 0
diff --git a/vold/volmgr_vfat.c b/vold/volmgr_vfat.c
index 1dc4c8d..b08e6a5 100644
--- a/vold/volmgr_vfat.c
+++ b/vold/volmgr_vfat.c
@@ -116,14 +116,14 @@
}
rc = mount(devpath, vol->mount_point, "vfat", flags,
- "utf8,uid=1000,gid=1000,fmask=711,dmask=700");
+ "utf8,uid=1000,gid=1000,fmask=711,dmask=700,shortname=mixed");
if (rc && errno == EROFS) {
LOGE("vfat_mount(%d:%d, %s): Read only filesystem - retrying mount RO",
dev->major, dev->minor, vol->mount_point);
flags |= MS_RDONLY;
rc = mount(devpath, vol->mount_point, "vfat", flags,
- "utf8,uid=1000,gid=1000,fmask=711,dmask=700");
+ "utf8,uid=1000,gid=1000,fmask=711,dmask=700,shortname=mixed");
}
#if VFAT_DEBUG