Also check that device is not already connected in "adb connect"
Change-Id: I5f84b56b63d8c6932f23791cac319fd6bc39d36c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '1dec5032cfadc1a3d7687ce5b6cd322e4151ce9d' into eclair-plus-aosp
* commit '1dec5032cfadc1a3d7687ce5b6cd322e4151ce9d':
Force the mediaserver process to restart whenever the zygote or system
Merge commit 'ea935c1d9771fa2cc00583720586c209463f2791' into eclair-plus-aosp
* commit 'ea935c1d9771fa2cc00583720586c209463f2791':
Make vmallocinfo readable by group log so we can put it in bugreports
Merge commit 'bbf4093e7a04f6c61c12bc51d07f03c6b58f4142' into eclair-plus-aosp
* commit 'bbf4093e7a04f6c61c12bc51d07f03c6b58f4142':
add free space on system and cache to free_storage_left log event
Merge commit '46ef2b87d01a2df67074351d0078bf900550f343' into eclair
* commit '46ef2b87d01a2df67074351d0078bf900550f343':
add free space on system and cache to free_storage_left log event
add O_TRUNC flag in open(), which will truncate the target file,
otherwise, copy will keep the old content of the target file.
Signed-off-by: Tom Zhu <ling.zhu@motorola.com>
Signed-off-by: San Mehat <san@google.com>
Merge commit '9e42da45cf8de612107fb14660763eeca7582b8f' into eclair-plus-aosp
* commit '9e42da45cf8de612107fb14660763eeca7582b8f':
Add a new event log tag for corrupted database files.
Merge commit '09e713789e31f640a80af1cddb2fc40cbeb02ad5' into eclair-plus-aosp
* commit '09e713789e31f640a80af1cddb2fc40cbeb02ad5':
Print code around PC and LR in the inline log.
Merge commit '3afe20b0beb7e274eee195de436211a3e8d1b0ce' into eclair-plus-aosp
* commit '3afe20b0beb7e274eee195de436211a3e8d1b0ce':
vold: Add support for /dev/block/mmcblk1
Merge commit 'ff7d5835d91b979836b66dc42fac69adf2c6c3a3' into eclair-plus-aosp
* commit 'ff7d5835d91b979836b66dc42fac69adf2c6c3a3':
Add NOTICE file and license tag for adb
Merge commit 'a0c98ef01a4c5a859fdde35fed7977b1eb919007' into eclair-plus-aosp
* commit 'a0c98ef01a4c5a859fdde35fed7977b1eb919007':
Ensure -user builds can run the dex preopt pass in the emulator.
This is done by ensuring that /init.goldfish.rc and /system/etc/init.goldfish.sh
are part of the system image, even if it lacks other emulator related bits.
Merge commit '79aedbee8ff9d9c37ae063fc970632faa3f90227' into eclair-plus-aosp
* commit '79aedbee8ff9d9c37ae063fc970632faa3f90227':
Add support for Acer devices
Merge commit 'b92174db6d93521656893a2c5108950417532c1d' into eclair-plus-aosp
* commit 'b92174db6d93521656893a2c5108950417532c1d':
Add event parameter for the restore set (device id) data is being restored from
Merge commit '061b6de7b350a03a969a82b273a4d585ffbd086c' into eclair-plus-aosp
* commit '061b6de7b350a03a969a82b273a4d585ffbd086c':
Add event log tag for server-prompted reset of backup data
Merge commit '88003b0de2d1d9c24ef4542473e6eabca79d0bd7' into eclair-plus-aosp
* commit '88003b0de2d1d9c24ef4542473e6eabca79d0bd7':
add account field to the sync log event
Merge commit '6ae9256322053354c7d2badccc0ce5c24b37c243' into eclair-plus-aosp
* commit '6ae9256322053354c7d2badccc0ce5c24b37c243':
adb: Add USB Vendor IDs for LG and Huawei