merge in ics-release history after reset to master
diff --git a/adb/commandline.c b/adb/commandline.c
index a69f867..75f337b 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -579,9 +579,6 @@
int fd, outFd;
int i, j;
- /* bare "adb backup" is not a valid command */
- if (argc < 2) return usage();
-
/* find, extract, and use any -f argument */
for (i = 1; i < argc; i++) {
if (!strcmp("-f", argv[i])) {
@@ -598,6 +595,9 @@
}
}
+ /* bare "adb backup" or "adb backup -f filename" are not valid invocations */
+ if (argc < 2) return usage();
+
outFd = adb_open_mode(filename, O_WRONLY | O_CREAT | O_TRUNC, 0640);
if (outFd < 0) {
fprintf(stderr, "adb: unable to open file %s\n", filename);
diff --git a/init/property_service.c b/init/property_service.c
index dd61b1b..18231e8 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -68,6 +68,7 @@
{ "gsm.", AID_RADIO, 0 },
{ "persist.radio", AID_RADIO, 0 },
{ "net.dns", AID_RADIO, 0 },
+ { "sys.usb.config", AID_RADIO, 0 },
{ "net.", AID_SYSTEM, 0 },
{ "dev.", AID_SYSTEM, 0 },
{ "runtime.", AID_SYSTEM, 0 },