Commit graph

12799 commits

Author SHA1 Message Date
Mark Salyzyn
b51546f43f Merge "liblog: Add kernel log id" 2015-05-11 16:09:04 +00:00
Andres Morales
1da6b1fe64 Merge "load ro.recovery_id property from recovery partition" 2015-05-09 01:05:39 +00:00
Andres Morales
cb3fce80fa load ro.recovery_id property from recovery partition
Change-Id: I9dc1f325e353375d9c1c8ed949636e2404601076
(cherry picked from commit db5f5d4367)
2015-05-08 17:35:13 -07:00
Dan Albert
dd6f7b8dd7 Merge "Revert "Revert "Split adb_main.cpp into client and daemon.""" 2015-05-09 00:33:49 +00:00
Dan Albert
c89e0ccd40 Revert "Revert "Split adb_main.cpp into client and daemon.""
This reverts commit 218dbccefa.

Change-Id: I74088db34983dc99e316a07c6ddc294340e0eb71
2015-05-08 17:33:21 -07:00
Dan Albert
8398386a63 Merge "Revert "Split adb_main.cpp into client and daemon."" 2015-05-08 23:12:39 +00:00
Dan Albert
588c64c44f Merge "Revert "Probably fix the Mac build."" 2015-05-08 23:12:23 +00:00
Dan Albert
218dbccefa Revert "Split adb_main.cpp into client and daemon."
This reverts commit cf07494ac2.
2015-05-08 16:08:57 -07:00
Dan Albert
3e1cb6d98d Revert "Probably fix the Mac build."
This reverts commit 49513cbcc7.
2015-05-08 16:08:53 -07:00
Dmitriy Ivanov
6b95c469b2 Merge "Switch liblog.so to hash-style=both" 2015-05-08 21:24:13 +00:00
Dmitriy Ivanov
fd8afe6f31 Switch liblog.so to hash-style=both
Bug: http://b/19059885
Change-Id: I7cde911f11b09c3a13553154aca6e291bb91befb
2015-05-08 14:09:24 -07:00
Dan Albert
3f68bc2586 Merge "Probably fix the Mac build." 2015-05-08 19:45:47 +00:00
Dan Albert
49513cbcc7 Probably fix the Mac build.
This was throwing an unused variable warning for kWorkaroundBug6558362
on Darwin.

Change-Id: I1cbf381708e9884180a37f3246af36795d07dfc2
2015-05-08 12:45:15 -07:00
Andres Morales
a773632b1d Merge "pass in correct buffer to print_id" 2015-05-08 17:49:52 +00:00
Andres Morales
bccc75a7c8 Merge "stop including rootdir build.prop" 2015-05-08 17:49:44 +00:00
Andres Morales
35e482de40 Merge "mkbootimg: make mkbootimg print image cksum to stdout" 2015-05-08 17:49:28 +00:00
Elliott Hughes
ee5ce0d14f Merge "Fix "adb remount" for devices without an oem partition." 2015-05-08 17:49:11 +00:00
Dan Albert
59bcabdd1f Merge "Split adb_main.cpp into client and daemon." 2015-05-08 17:27:13 +00:00
Dan Albert
cf07494ac2 Split adb_main.cpp into client and daemon.
The name "client" is somewhat misleading as it also contains the host
side adb server, but it's a part of the client binary.

Change-Id: I128b7bab213e330eb21b5010cd1fec5f7a62c8af
2015-05-08 10:20:26 -07:00
Andres Morales
a190ddf90f pass in correct buffer to print_id
hdr.id is actually larger than sha

Change-Id: Iac33dbaaf4bea9acde5ba49d8601f7ac767677d5
2015-05-08 09:20:22 -07:00
Andres Morales
dff18174d2 stop including rootdir build.prop
merged with default.prop

Change-Id: I18fcd37ddc63e3607278d0741181d0779118132d
2015-05-08 09:20:13 -07:00
Andres Morales
61fc195401 mkbootimg: make mkbootimg print image cksum to stdout
used by the build system as a fingerprint for the image

Change-Id: Ifaf230b881e68d921a8158ed2e8a3ee41f27a4b3
2015-05-08 09:20:07 -07:00
Elliott Hughes
f85f111620 Merge "Try to include the SHA in a ddmslib-compatible way." 2015-05-08 16:02:04 +00:00
Elliott Hughes
5677c23e8d Fix "adb remount" for devices without an oem partition.
On a device without an oem partition, we now have an /oem directory
anyway. This causes find_mount to fail, and that was returning nullptr
from a std::string-returning function. Boom!

Also clean up the bits of code I had to trace through between "adb remount"
on the host to the crash on the device as I debugged this.

The only other meaningful change is the error checking in
adb_connect_command --- adb_connect can also return -2.

Bug: http://b/20916855
Change-Id: I4c3b7858e13f3a3a8bbc7d30b3c0ee470bead587
2015-05-08 08:43:10 -07:00
Elliott Hughes
a3d1fb8043 Merge "Add some missing 'const's." 2015-05-08 05:40:16 +00:00
Elliott Hughes
f3bbfa6a21 Try to include the SHA in a ddmslib-compatible way.
Bug: http://b/20918202
Change-Id: I0c1a48459372b0d28aaf9d09d82540e44b438c9c
2015-05-07 21:56:31 -07:00
Elliott Hughes
aee80fb67b Add some missing 'const's.
Change-Id: I5bd26d4366e10fc8c6bc255b7ddb174a7a8b82a5
2015-05-07 21:38:41 -07:00
Dan Albert
0c537ce3c0 Merge "adb: win32: fix adb emu command" 2015-05-07 22:47:16 +00:00
Rom Lemarchand
b8e4e0a749 Merge "mkbootimg: use fixed-size types for image format" 2015-05-07 21:20:09 +00:00
Rom Lemarchand
dfff829062 mkbootimg: use fixed-size types for image format
Change-Id: I471ef420c3944b3ffefdba9ca7122c6a7f09e5ac
2015-05-07 14:08:31 -07:00
Elliott Hughes
9680eaa182 Merge "fs_mgr: remove some dead code" 2015-05-07 20:03:34 +00:00
Elliott Hughes
55c2e1f4ba Merge "Clean up init /proc/cmdline handling." 2015-05-07 18:04:24 +00:00
Elliott Hughes
e5ce30fed8 Clean up init /proc/cmdline handling.
Helped debug a problem where the N9 bootloader incorrectly
concatenated the various command lines.

Bug: http://b/20906691
Change-Id: I0580b06f4185129c7eedf0bdf74b5ce17f88bf9c
2015-05-07 11:02:08 -07:00
Oleksiy Avramchenko
093dd317ec fs_mgr: remove some dead code
Using logical op on unitialized memory is a bad thing. Good thing
is that this bug is dead because the structure is completely
cleared later via create_verity_device() -> verity_ioctl_init().

Change-Id: Idf5515a888bc6216eda0e23885a789f9b0320bac
2015-05-07 10:18:33 +02:00
Spencer Low
142ec75cf8 adb: win32: fix adb emu command
The adb emu command was never working because the socket connection to
the emulator was closed without reading all of the data that the
emulator sent. On Windows, this caused the emulator's recv() call to
error-out, so it never got the command that was sent.

Before settling on this fix, I also experimented changing the arguments
to the socket shutdown() call and that didn't seem to help. I also tried
removing the call to shutdown() and that didn't help. So that should
rule out shutdown() as the problem. One experiment that helped was
delaying before calling adb_close(), but that is of course fragile and
doesn't address the real issue, which is not closing the socket until
the commands have been read.

https://code.google.com/p/android/issues/detail?id=21021

Change-Id: I8fa4d740a2faa2c9922ec50792e16564a94f6eed
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-05-06 18:54:08 -07:00
Christopher Ferris
0e278e2e80 Merge "Fix small ptrace reads." 2015-05-07 01:51:50 +00:00
Dan Albert
19792a6662 Merge "Be tolerant of devices that don't report serials." 2015-05-06 23:58:01 +00:00
Dan Albert
d99d902abd Be tolerant of devices that don't report serials.
The USB spec explicitly says this is optional, so we shouldn't be
relying on it.

Bug: http://b/20883914
Change-Id: Icf38405b00275199bcf51a70c47d428ae7264f2b
2015-05-06 16:48:52 -07:00
Christopher Ferris
944f417ccb Fix small ptrace reads.
The BacktracePtrace::Read function crashes if the number of bytes to
read is less than the number of bytes needed to align the read to
a word_t boundary.

Fix this and add a test for this case.

Change-Id: I50808849ece44928f65dba1d25309e3885c829a2
2015-05-06 16:39:17 -07:00
Christopher Ferris
8b32c30b92 Merge "Add offset to map data." 2015-05-06 22:43:50 +00:00
Nick Kralevich
577c1245aa Merge "Add /data/misc/perfprofd to store perf profile." 2015-05-06 21:49:51 +00:00
Nick Kralevich
4a098bbe21 Merge "rootdir: make sure the /oem mountpoint is always available" 2015-05-06 20:41:35 +00:00
Christopher Ferris
5c8856854d Add offset to map data.
Also, print the offset in the maps section.

Bug: 20864928
Change-Id: I71f005726e5ef73cf75bbcb8f829fd5127cb9d61
2015-05-06 12:50:09 -07:00
Mark Salyzyn
440e109d64 liblog: Add kernel log id
Change-Id: I53002f05a8bdf8d67e1d761c56c8761d3b534a76
2015-05-06 08:54:59 -07:00
Elliott Hughes
9377399150 Merge "Add some missing 'static's." 2015-05-06 02:51:53 +00:00
Elliott Hughes
3edd54b3a8 Add some missing 'static's.
Change-Id: Id76bb1e954e8fa36a11a38b5445c87f4a64af799
2015-05-05 18:26:10 -07:00
Dan Albert
a2c1db24ee Merge "Include the git sha in the adb version." 2015-05-06 01:16:21 +00:00
Dan Albert
1ba1d7c1ee Include the git sha in the adb version.
Also add --version to adbd to display the same thing.

Change-Id: I47dfbad16c892c42ea938aedd085ba77492791ba
2015-05-05 18:04:37 -07:00
Nick Kralevich
f3b554fc61 rootdir: make sure the /oem mountpoint is always available
The /oem mount point is used to mount semi-trusted data, and
many Android One devices depend on it. Make sure it's guaranteed
to always be available.

Bug: 20816563
Change-Id: Ib5272f025d14d4da6125d753879054b3faeae696
2015-05-05 17:19:14 -07:00
Dan Albert
3f05fb5d97 Merge "Disable adb tests for Windows." 2015-05-05 22:11:01 +00:00