Commit Graph

13021 Commits

Author SHA1 Message Date
Dan Albert 1403aa36b2 Merge "Move emulator tracing into its own file." 2015-02-19 02:10:10 +00:00
Dan Albert 21c3eaf4cc Move emulator tracing into its own file.
adb.c is far too monolithic.

Change-Id: I4a9ee97927e4a96a38ea5859d84efac86bfdfc35
2015-02-18 17:21:17 -08:00
Elliott Hughes dbfb9719d7 am 1af18c3c: Merge "Fix build."
* commit '1af18c3c98bfe003da4b7eede4a90c5dc9c9e9d2':
  Fix build.
2015-02-19 01:12:42 +00:00
Elliott Hughes 1af18c3c98 Merge "Fix build." 2015-02-19 00:59:36 +00:00
Elliott Hughes 4c9d24a3ed Fix build.
Change-Id: I31fc562068ebbba5e9872ee91694feb611fc957f
2015-02-18 16:57:30 -08:00
Elliott Hughes 1a015262a7 am e8637db8: am 8e16a7e2: Merge "adb: add "adb unroot" to restart adb in non-root mode"
* commit 'e8637db821cdcbcc30767c4a278bb58eee057019':
  adb: add "adb unroot" to restart adb in non-root mode
2015-02-19 00:38:55 +00:00
Elliott Hughes e8637db821 am 8e16a7e2: Merge "adb: add "adb unroot" to restart adb in non-root mode"
* commit '8e16a7e2a3506b6f526a503bd03e3919235dde71':
  adb: add "adb unroot" to restart adb in non-root mode
2015-02-19 00:33:47 +00:00
Elliott Hughes 8e16a7e2a3 Merge "adb: add "adb unroot" to restart adb in non-root mode" 2015-02-19 00:18:38 +00:00
Dan Albert 590bcff373 am a616f624: am 2268788a: Merge "Move USB transport code to libadb."
* commit 'a616f6240ac9dbc3ac09611db56ebc8db42a2cfe':
  Move USB transport code to libadb.
2015-02-19 00:00:10 +00:00
Dan Albert a616f6240a am 2268788a: Merge "Move USB transport code to libadb."
* commit '2268788ae4b56991a708625009be5531b9d63cd0':
  Move USB transport code to libadb.
2015-02-18 23:53:34 +00:00
Dan Albert 2268788ae4 Merge "Move USB transport code to libadb." 2015-02-18 23:42:42 +00:00
Yabin Cui a5beecd30c am e1d84768: am b703214e: Merge "Move sprintf to snprintf."
* commit 'e1d847685a1102905c68bf895a3d148efe6c2c47':
  Move sprintf to snprintf.
2015-02-18 23:04:40 +00:00
Dan Albert ff86a37e2f am 23cb0149: am 1ac334ec: Merge "Add extern "C" to all the adb headers."
* commit '23cb014927e780a8cf8f4c9ae493a9bcaee69305':
  Add extern "C" to all the adb headers.
2015-02-18 23:04:39 +00:00
Dan Albert cfdd291b86 am 90ffa2d0: am 32e872ca: Merge "Ignore useless cpplint messages in adb."
* commit '90ffa2d0ebc0736445c703eba832310e01ac9d28':
  Ignore useless cpplint messages in adb.
2015-02-18 23:04:38 +00:00
Yabin Cui e1d847685a am b703214e: Merge "Move sprintf to snprintf."
* commit 'b703214e25e6752037d013faf5edc80c4776dfa4':
  Move sprintf to snprintf.
2015-02-18 22:57:09 +00:00
Dan Albert 23cb014927 am 1ac334ec: Merge "Add extern "C" to all the adb headers."
* commit '1ac334ec660292298917668a40fc5239b1fdaa56':
  Add extern "C" to all the adb headers.
2015-02-18 22:57:08 +00:00
Dan Albert 90ffa2d0eb am 32e872ca: Merge "Ignore useless cpplint messages in adb."
* commit '32e872caa42ab00fc80bd595c9d621294899ae15':
  Ignore useless cpplint messages in adb.
2015-02-18 22:57:07 +00:00
Dan Pasanen 9885881d06 adb: add "adb unroot" to restart adb in non-root mode
Change-Id: Ice6b94a71a62648ac073d129914a07372411fb25
2015-02-18 12:37:11 -08:00
Yabin Cui b703214e25 Merge "Move sprintf to snprintf." 2015-02-18 20:26:02 +00:00
Dan Albert 9449376328 Move USB transport code to libadb.
Also note that we need both a libadb and a libadbd (for now) to
differentiate between code using ADB_HOST=1 and ADB_HOST=0.

Bug: 17626262
Change-Id: I873a8fb442a8a69258fe39af17781714a8fae4f6
2015-02-18 10:55:28 -08:00
Dan Albert 1ac334ec66 Merge "Add extern "C" to all the adb headers." 2015-02-18 17:52:40 +00:00
Dan Albert 32e872caa4 Merge "Ignore useless cpplint messages in adb." 2015-02-18 17:45:26 +00:00
Dan Albert 818fb4b448 Add extern "C" to all the adb headers.
Change-Id: Iaefa3e18d6ee2e065eb97271a796613b2a8e7d6e
2015-02-18 00:21:16 -08:00
Dan Albert 54ac73aa34 Ignore useless cpplint messages in adb.
Change-Id: I6411eb3963d215b228e50cd967a2174e5036ed73
2015-02-18 00:20:37 -08:00
Yabin Cui e2d63af002 Move sprintf to snprintf.
Bug: 19340053
Change-Id: Id0d866e6195ed4752b4be6081eeb2aab8b1dbe9a
2015-02-17 19:27:51 -08:00
Elliott Hughes e3ba1810b9 am 2a451dd9: am f96c1500: Merge "Fix the WriteStringToFile overload that takes mode/owner/group."
* commit '2a451dd9e1733f8fae3838de06db69b3067d1553':
  Fix the WriteStringToFile overload that takes mode/owner/group.
2015-02-18 00:17:57 +00:00
Elliott Hughes 2a451dd9e1 am f96c1500: Merge "Fix the WriteStringToFile overload that takes mode/owner/group."
* commit 'f96c15000f849d4c3fef08f0145c61a4862c3833':
  Fix the WriteStringToFile overload that takes mode/owner/group.
2015-02-17 18:59:07 +00:00
Elliott Hughes f96c15000f Merge "Fix the WriteStringToFile overload that takes mode/owner/group." 2015-02-17 18:47:01 +00:00
Elliott Hughes 9d1f515ed1 Fix the WriteStringToFile overload that takes mode/owner/group.
The actual bug is == instead of !=, but the real cause was me trying to be
too clever. This patch switches to much simpler code, and -- since the
intended use of this code is security anyway -- adds logging if anything
goes wrong.

Bug: 19361774
Change-Id: If2af07d31a5002f9010b838247b691f6b28bdfb1
2015-02-17 10:25:23 -08:00
Elliott Hughes 7630916fb8 am 9c1bc6bb: am 29576ae8: Merge "/vendor is sometimes on a separate partition now."
* commit '9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31':
  /vendor is sometimes on a separate partition now.
2015-02-14 05:14:22 +00:00
Elliott Hughes 9c1bc6bbc8 am 29576ae8: Merge "/vendor is sometimes on a separate partition now."
* commit '29576ae8901eb95d4c8a34f242a282b2fb73d35f':
  /vendor is sometimes on a separate partition now.
2015-02-14 05:08:42 +00:00
Elliott Hughes 29576ae890 Merge "/vendor is sometimes on a separate partition now." 2015-02-14 04:56:22 +00:00
Elliott Hughes 3a5d71ac60 /vendor is sometimes on a separate partition now.
Change-Id: I3217c272ea38ab8212056e0432d0ededacd362f6
2015-02-13 16:59:00 -08:00
Elliott Hughes afb6545320 am c3d2793f: am b0572e25: Merge "Remove unused variable BOOTCHART_DEFAULT_TIME_SEC."
* commit 'c3d2793f6f89391285a2d65cbf85c3eab252ba8d':
  Remove unused variable BOOTCHART_DEFAULT_TIME_SEC.
2015-02-14 00:36:50 +00:00
Elliott Hughes c3d2793f6f am b0572e25: Merge "Remove unused variable BOOTCHART_DEFAULT_TIME_SEC."
* commit 'b0572e2566ed743e4e65b899ff0a678c804ee1a4':
  Remove unused variable BOOTCHART_DEFAULT_TIME_SEC.
2015-02-14 00:31:07 +00:00
Elliott Hughes b0572e2566 Merge "Remove unused variable BOOTCHART_DEFAULT_TIME_SEC." 2015-02-14 00:18:16 +00:00
Elliott Hughes 0f58cb0035 Remove unused variable BOOTCHART_DEFAULT_TIME_SEC.
Change-Id: Id43c73dd32d2f9f1eee9592b55aa3fd3c02094b2
2015-02-13 16:17:42 -08:00
Elliott Hughes 690c230b45 am f19cccfd: am bf7560f1: Merge "Further refactoring of the bootchart code."
* commit 'f19cccfd2a562e8b21045fdc6ddc620badfa4ad5':
  Further refactoring of the bootchart code.
2015-02-14 00:12:34 +00:00
Elliott Hughes f19cccfd2a am bf7560f1: Merge "Further refactoring of the bootchart code."
* commit 'bf7560f12c6c2ca81a6648bd59bba5024dcd24fe':
  Further refactoring of the bootchart code.
2015-02-14 00:06:35 +00:00
Elliott Hughes bf7560f12c Merge "Further refactoring of the bootchart code." 2015-02-13 23:54:29 +00:00
Elliott Hughes 841b263fae Further refactoring of the bootchart code.
Change-Id: Ifed6ae8d481b605139fd27799574de4c2d0f5908
2015-02-13 15:15:11 -08:00
Elliott Hughes e6cc8012f5 am 0903c13a: am 265df6f5: Merge "bootchart: fix bootchart can not be triggered problem"
* commit '0903c13ade29e6eedecd198ac54131248a1818f3':
  bootchart: fix bootchart can not be triggered problem
2015-02-12 21:36:21 +00:00
Elliott Hughes 0903c13ade am 265df6f5: Merge "bootchart: fix bootchart can not be triggered problem"
* commit '265df6f50c508710f0b717d67650732baa906976':
  bootchart: fix bootchart can not be triggered problem
2015-02-12 20:32:33 +00:00
Elliott Hughes 265df6f50c Merge "bootchart: fix bootchart can not be triggered problem" 2015-02-12 20:17:50 +00:00
Yongqin Liu a197ff12dd bootchart: fix bootchart can not be triggered problem
bootchart uses a file on the data partition to decide if it should collect
data for bootchart, but the data partition will be mounted by the mount_all
command in the "on fs" section, and it will be only added into the action
queue when command "trigger fs" is executed, but that's after the
bootchart_init action (late_init).

This change makes bootchart_init a builtin command of init,
and make it executed as the first command of "on post-fs" section
which will be triggered after the "on fs" section.

This change also refactors the bootchart code to all be in bootchart.cpp.

Change-Id: Ia74aa34ca5b785f51fcffdd383075a549b2a99d9
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2015-02-12 12:13:24 -08:00
Christopher Ferris b31528e9fe am 06b308be: am 884f1942: Merge "Do not dump maps/memory/code of sibling threads."
* commit '06b308bef0432db53c41b28930a857f6ab3cdcb6':
  Do not dump maps/memory/code of sibling threads.
2015-02-11 03:11:10 +00:00
Mark Salyzyn d9c5263967 am de874aec: am 05a67c96: Merge "liblog: test: ARM64: Enable 32 and 64-bit liblog_benchmark"
* commit 'de874aec8baec69eeefdf1b2688ea75a96a51913':
  liblog: test: ARM64: Enable 32 and 64-bit liblog_benchmark
2015-02-11 02:50:49 +00:00
Narayan Kamath dcf6fe7340 am 851f3aa5: am 0d385d1c: Merge "Track renaming of initUnchangeableSystemProperty."
* commit '851f3aa51c8c4183c8d3578319bc1d5acfda2810':
  Track renaming of initUnchangeableSystemProperty.
2015-02-11 02:48:07 +00:00
Andreas Gampe 9f08ce8886 am f320e8e5: am ed318bff: Merge "log.h: Fix typo"
* commit 'f320e8e53df75ba50db755c89843251e481dc696':
  log.h: Fix typo
2015-02-11 02:48:05 +00:00
Mark Salyzyn ee632f734a am 8a5198a1: am fd867303: Merge changes I420b5b8a,Ica23fe41
* commit '8a5198a1505a4dc7d4722bb58a6eb809b0dd5d2c':
  log.h: wrap android_testLog around __android_log_is_loggable
  log.h: deprecate CONDITION
2015-02-11 02:48:04 +00:00