Commit graph

13117 commits

Author SHA1 Message Date
Elliott Hughes
9680eaa182 Merge "fs_mgr: remove some dead code" 2015-05-07 20:03:34 +00:00
Elliott Hughes
a5aa7a1126 am 55c2e1f4: Merge "Clean up init /proc/cmdline handling."
* commit '55c2e1f4ba3aa3285da32c6a6027c11d9f7c22ed':
  Clean up init /proc/cmdline handling.
2015-05-07 18:14:44 +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
Mark Salyzyn
023f51f360 logd: uidToName add dex2oat UID
- When searching for uidToName from /data/system/packages.list
  one must search for the uid % AID_USER;
- If uid % AID_USER is greater than AID_SHARED_GID_START - AID_APP,
  then subract it and try again to pick up uidToName.

Change-Id: I24df42957ff7e746fffa5d39484637b1b726b9c0
2015-05-07 09:16:02 -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
Christopher Ferris
45fb081ec3 am 0e278e2e: Merge "Fix small ptrace reads."
* commit '0e278e2e8052744274bd149ad1dc0908bdb939b3':
  Fix small ptrace reads.
2015-05-07 01:58:45 +00: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
16ac3c3279 am 19792a66: Merge "Be tolerant of devices that don\'t report serials."
* commit '19792a666277ce6dfaacc03162c15688e43c5421':
  Be tolerant of devices that don't report serials.
2015-05-07 00:12:39 +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
84fcaea57c am 8b32c30b: Merge "Add offset to map data."
* commit '8b32c30b92be6914da2dca23089473c4f37adfb9':
  Add offset to map data.
2015-05-06 23:07:55 +00:00
Christopher Ferris
8b32c30b92 Merge "Add offset to map data." 2015-05-06 22:43:50 +00:00
Nick Kralevich
8d36ab8387 am 577c1245: Merge "Add /data/misc/perfprofd to store perf profile."
* commit '577c1245aab095e390d35d02567804546bb030f9':
  Add /data/misc/perfprofd to store perf profile.
2015-05-06 22:02:28 +00:00
Nick Kralevich
577c1245aa Merge "Add /data/misc/perfprofd to store perf profile." 2015-05-06 21:49:51 +00:00
Nick Kralevich
9f74a65b18 am 4a098bbe: Merge "rootdir: make sure the /oem mountpoint is always available"
* commit '4a098bbe213e8640cd80941145cf0eb6ca39a869':
  rootdir: make sure the /oem mountpoint is always available
2015-05-06 20:50:29 +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
adfebbcd50 am 93773991: Merge "Add some missing \'static\'s."
* commit '9377399150d323ea39e6abe6a44460ea33826ce4':
  Add some missing 'static's.
2015-05-06 03:00:34 +00: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
ad059d0318 am a2c1db24: Merge "Include the git sha in the adb version."
* commit 'a2c1db24ee4bd24fb4e20a615c78a88fbbc6c3c7':
  Include the git sha in the adb version.
2015-05-06 01:25:20 +00: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
a81df1cb0f am 3f05fb5d: Merge "Disable adb tests for Windows."
* commit '3f05fb5d97d27f55adfb09febbc1957e893f0f8e':
  Disable adb tests for Windows.
2015-05-05 22:17:56 +00:00
Elliott Hughes
28b9cb8f01 am 2e43387b: Merge "_beginthread returns uintptr_t."
* commit '2e43387b28e6e5a699bca69b2b66578ea60f9736':
  _beginthread returns uintptr_t.
2015-05-05 22:17:54 +00:00
Dan Albert
3f05fb5d97 Merge "Disable adb tests for Windows." 2015-05-05 22:11:01 +00:00
Dehao Chen
30c401fa92 Add /data/misc/perfprofd to store perf profile.
BUG: 19483574

Change-Id: Ib5eb9e789c063bd76d24181c4c03652f9ef12cb7
2015-05-05 15:06:21 -07:00
Elliott Hughes
2e43387b28 Merge "_beginthread returns uintptr_t." 2015-05-05 22:04:44 +00:00
Dan Albert
a7a67c3079 Disable adb tests for Windows.
The tests will need some massaging before they're ready to go for
Windows, so just disable them to unblock people trying to mm in adb.

Change-Id: I67f2cd3af1a2444dea9cbb61c0553989442ba44b
2015-05-05 14:50:09 -07:00
Elliott Hughes
2e4a2eeaf3 _beginthread returns uintptr_t.
64-bit Windows is a thing, and we'll have to support it some day...

Change-Id: Ib9e2da1a5625e95a0ffadfee8501825dfd4f9594
2015-05-05 14:34:41 -07:00
Elliott Hughes
ae19c9e9cb am 89114c50: Merge "Simplify adb_thread_create."
* commit '89114c50001ca8fff2d4f2edf8293a78e13162b3':
  Simplify adb_thread_create.
2015-05-05 21:30:48 +00:00
Elliott Hughes
f07179fede am aa76c462: Merge "Give enum types CamelCase names for clarity."
* commit 'aa76c46288a61d4bf4cafd2da0028ca6418119c9':
  Give enum types CamelCase names for clarity.
2015-05-05 21:30:47 +00:00
Elliott Hughes
89114c5000 Merge "Simplify adb_thread_create." 2015-05-05 21:18:21 +00:00
Elliott Hughes
aa76c46288 Merge "Give enum types CamelCase names for clarity." 2015-05-05 21:18:11 +00:00
Christopher Ferris
507136428d am 4eccbace: Merge "All debuggerd log output marked fatal."
* commit '4eccbacee245fabeb56dde32d85d1a044aceded2':
  All debuggerd log output marked fatal.
2015-05-05 21:11:46 +00:00
Christopher Ferris
4eccbacee2 Merge "All debuggerd log output marked fatal." 2015-05-05 21:04:16 +00:00
Elliott Hughes
9b0f354fa2 Simplify adb_thread_create.
Change-Id: I36d6021ef8fbc23e8bcd4ddbe1dac0eba467cc70
2015-05-05 13:41:21 -07:00
Christopher Ferris
b0412a5c2b All debuggerd log output marked fatal.
This avoids the log daemon skipping some of the log output from
debuggerd.

Bug: 20846525
Change-Id: Ifed48814d76c7e855645b6d5487d5e6e1fcafd9e
2015-05-05 13:27:41 -07:00
Elliott Hughes
64f83cf8c6 am 9337d0ac: Merge "Remove non-functional "adb persist"."
* commit '9337d0ac86d2baa33c2c64b0f50f84982d914e43':
  Remove non-functional "adb persist".
2015-05-05 20:18:37 +00:00
Elliott Hughes
3bd73c12c0 Give enum types CamelCase names for clarity.
Change-Id: I1c89f1cc155ee839f372fb14d972a288183b8bcd
2015-05-05 13:10:43 -07:00
Elliott Hughes
9337d0ac86 Merge "Remove non-functional "adb persist"." 2015-05-05 20:08:19 +00:00
Elliott Hughes
f55292e99f am f25752dc: Merge "Implement the ssh(1) escaping rules."
* commit 'f25752dcfa11a5e949fedf279c9534a4d4a3e9a3':
  Implement the ssh(1) escaping rules.
2015-05-05 19:50:31 +00:00
Elliott Hughes
32687beaf2 Remove non-functional "adb persist".
It isn't documented, it doesn't work, and it was only hacked into
"adb shell" anyway. (It's not a bad idea, though, but if we do it
we should do it properly.)

Change-Id: I930a5c6dd1d2850bfdf131f2e989ae04100f7db9
2015-05-05 12:50:26 -07:00
Elliott Hughes
f25752dcfa Merge "Implement the ssh(1) escaping rules." 2015-05-05 19:42:50 +00:00
Mark Salyzyn
aa43ae2268 logd: pidToName deficiency
any logging in zygote permanently sets the pidToName

Change-Id: I0b8fdc96fb5965a04d4dc4293c39815beef5eb8e
2015-05-05 12:34:16 -07:00