b14b958d16
am b210403a: am 98d3aa3f: Merge "logcat: tests: deal with -v threadtime default"
...
* commit 'b210403a8bf417e9f88bcca0a2a652d533f6c524':
logcat: tests: deal with -v threadtime default
2014-09-18 17:47:28 +00:00
b210403a8b
am 98d3aa3f: Merge "logcat: tests: deal with -v threadtime default"
...
* commit '98d3aa3f0d76190dbeea6248fffe326f7b6fe47d':
logcat: tests: deal with -v threadtime default
2014-09-18 17:35:26 +00:00
98d3aa3f0d
Merge "logcat: tests: deal with -v threadtime default"
2014-09-18 17:27:56 +00:00
a5e2429f09
logcat: tests: deal with -v threadtime default
...
- specify -v brief where necessary to preserve tests
- fix an occasional issue for logrotate and device block size
Change-Id: I09b02cc0359dc351a89311abc3ee762a0f23582c
2014-09-18 10:25:38 -07:00
bdac720255
am 6c03b85f: am 32e2f1be: Merge "Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license."
...
* commit '6c03b85f1dcfd0efd2ec741cbfb6c5ecc404fbd8':
Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license.
2014-09-18 03:23:08 +00:00
6c03b85f1d
am 32e2f1be: Merge "Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license."
...
* commit '32e2f1be039482762303378113c817ba99466953':
Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license.
2014-09-18 03:08:38 +00:00
32e2f1be03
Merge "Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license."
2014-09-18 03:02:05 +00:00
40b34524bb
am 40af0929: Fix charger mode on first boot of force encrypt devices
...
* commit '40af09297f9d60a3cfd4a186ff294cef6255a9df':
Fix charger mode on first boot of force encrypt devices
2014-09-17 14:13:11 +00:00
aa3ed7844a
am 81b857f3: Merge "fastboot: Remove tos from flashall" into lmp-dev
...
* commit '81b857f3a21f3ae96a5ec72e54982fe30278049f':
fastboot: Remove tos from flashall
2014-09-17 14:12:09 +00:00
757adc21c3
am a5ab96eb: 74602: Fixes adb not seeing connected devices on Mac.
...
* commit 'a5ab96eb50f27989240ab8917e8ebf3a028bcdfb':
74602: Fixes adb not seeing connected devices on Mac.
2014-09-17 14:11:38 +00:00
458d1253f5
Clean up memset[16,32] routines: unify files names, remove redundant wrapper
...
for 32-bit, remove Atom caches sizes for 64-bit, fix license.
Change-Id: Ieda6367d7b21cf25b2beda6dd8d77cf668d3f2af
Signed-off-by: Varvara Rainchik <varvara.rainchik@intel.com>
2014-09-17 18:11:18 +04:00
40af09297f
Fix charger mode on first boot of force encrypt devices
...
waitpid breaks whenever child status signals. Need to loop, continuing
on errno EINTR
Bug: 17515976
Change-Id: Ibb29056a38b3c90dc7904de8c6aedb5a362e511d
2014-09-16 22:14:46 +00:00
81b857f3a2
Merge "fastboot: Remove tos from flashall" into lmp-dev
2014-09-16 20:08:01 +00:00
ebae1bfeaa
am 46679c1d: am 8d35442b: Merge "fix windows build"
...
* commit '46679c1dce8dff027e1f87acb9bcfc81c0613721':
fix windows build
2014-09-16 18:20:08 +00:00
46679c1dce
am 8d35442b: Merge "fix windows build"
...
* commit '8d35442b18e9dddfdde89c81e0cc910c70a12202':
fix windows build
2014-09-16 18:12:06 +00:00
8d35442b18
Merge "fix windows build"
2014-09-16 18:00:47 +00:00
edda73d0c8
fix windows build
...
(cherry-picked from commit 4b39c6aca9
2014-09-16 10:59:49 -07:00
0a19c517b7
resolved conflicts for merge of d9714d34 to lmp-mr1-dev-plus-aosp
...
Change-Id: I11b38509c1e82f2a3d22be23ec45bfb023e0ee18
2014-09-16 10:55:08 -07:00
912514eeb7
am f37bfb32: am 23aeeff5: Merge "Use the correct fuse_init_out structure size."
...
* commit 'f37bfb32eb82393d14e339684c9f508cea3b0ab4':
Use the correct fuse_init_out structure size.
2014-09-16 17:49:17 +00:00
d9714d344c
am d372c5c3: Merge changes I11e84a7b,I5adaedd8
...
* commit 'd372c5c36510b99254b031d3fd5958e246a85544':
adb: fix 64-bit build
add sideload-host mode to adb
2014-09-16 17:39:39 +00:00
f37bfb32eb
am 23aeeff5: Merge "Use the correct fuse_init_out structure size."
...
* commit '23aeeff510b2962c127f9dc4ab4eb8cf564880c5':
Use the correct fuse_init_out structure size.
2014-09-16 17:39:38 +00:00
d372c5c365
Merge changes I11e84a7b,I5adaedd8
...
* changes:
adb: fix 64-bit build
add sideload-host mode to adb
2014-09-16 17:36:13 +00:00
52e0b61999
adb: fix 64-bit build
...
strlen returns a size_t, but the * modifier in printf expects an int.
On arm64 size_t != int.
(cherry-picked from commit 6d6a898b0c
2014-09-16 10:31:30 -07:00
23aeeff510
Merge "Use the correct fuse_init_out structure size."
2014-09-16 17:29:20 +00:00
8e49ae4bb8
add sideload-host mode to adb
...
The sideload-host mode turns the host into a server capable of sending
the device various pieces of the file on request, rather than
downloading it all in one transfer. It's used to support sideloading
OTA packages to devices without the need for them to hold the whole
package in RAM.
If the connected device doesn't support sideload-host mode, we fall
back to the older sideload connection.
(cherry-picked from commit 71fe584a1a
2014-09-16 10:27:38 -07:00
c749042298
am a9d789dd: am a3e53f1d: Merge "logcat: -v format defaults to threadtime"
...
* commit 'a9d789dd8a7c1cfe58793d77af80bb457fca3cf2':
logcat: -v format defaults to threadtime
2014-09-16 17:13:32 +00:00
a9d789dd8a
am a3e53f1d: Merge "logcat: -v format defaults to threadtime"
...
* commit 'a3e53f1dfe2686e6f0bad75a587f779d955427b3':
logcat: -v format defaults to threadtime
2014-09-16 17:06:00 +00:00
a3e53f1dfe
Merge "logcat: -v format defaults to threadtime"
2014-09-16 16:53:39 +00:00
649fc605f8
logcat: -v format defaults to threadtime
...
Change-Id: Iafddf83b0507a667e0395d38ec9afaed67319018
2014-09-16 09:27:37 -07:00
ff649ea5ab
Use the correct fuse_init_out structure size.
...
Kernel 2.6.16 is the first stable kernel with struct fuse_init_out
defined (fuse version 7.6). The structure is the same from 7.6 through
7.22. Beginning with 7.23, the structure increased in size and added
new parameters.
If the kernel only works on minor revs older than or equal to 22,
then use the older structure size since this code only uses the 7.22
version of the structure.
Change-Id: If2507a02ad674fcf02869a325221339ae1ace64d
2014-09-15 18:29:47 -07:00
a5ab96eb50
74602: Fixes adb not seeing connected devices on Mac.
...
Every alternate time an adb server was started already connected devices were
not being seen. This was caused by opened usb connections being "stalled".
See this thread for more information: http://lists.apple.com/archives/usb/2011/Jun/msg00050.html
Change-Id: Ic35b7a66c3f14a837b960066557f44e105609dcb
Fixes: https://code.google.com/p/android/issues/detail?id=74602
2014-09-15 15:46:13 -07:00
015d73ff4e
fastboot: Remove tos from flashall
...
bug: 17498561
Change-Id: I0190c1a5ac635375404799c040e4be523fa29622
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-09-15 13:44:07 -07:00
01401bbc37
am f253fd07: am 17077a28: Merge "Use the correct debuggerd given the tid."
...
* commit 'f253fd079b0768e8c90a616d6dda47652ca4f646':
Use the correct debuggerd given the tid.
2014-09-14 00:34:40 +00:00
f253fd079b
am 17077a28: Merge "Use the correct debuggerd given the tid."
...
* commit '17077a287c2260a35ea99e19b0308e479edc6cbb':
Use the correct debuggerd given the tid.
2014-09-14 00:26:34 +00:00
17077a287c
Merge "Use the correct debuggerd given the tid."
2014-09-14 00:15:27 +00:00
6bcc4acc6f
Use the correct debuggerd given the tid.
...
On 64 bit systems, calling dump_backtrace_to_file will automatically
call debuggerd64. If the process to dump is actually 32 bit, this
creates an unrecognizable dump backtrace. Modify the code to check the
type of the process and connect to the appropriate debuggerd process.
This change refactors both the tombstone and backtrace functionality to
allow both to work properly on 64 bit systems when dealing with mixed
processes.
Bug: 17487122
(cherry picked from commit a9fa7b87f1
2014-09-13 16:22:17 -07:00
07bb3f1e0b
am 07dda6b5: Merge "Use the correct debuggerd given the tid." into lmp-dev
...
* commit '07dda6b57c6a476177b68ad42966f24cbbdb04c1':
Use the correct debuggerd given the tid.
2014-09-13 22:54:00 +00:00
07dda6b57c
Merge "Use the correct debuggerd given the tid." into lmp-dev
2014-09-13 22:31:55 +00:00
a9fa7b87f1
Use the correct debuggerd given the tid.
...
On 64 bit systems, calling dump_backtrace_to_file will automatically
call debuggerd64. If the process to dump is actually 32 bit, this
creates an unrecognizable dump backtrace. Modify the code to check the
type of the process and connect to the appropriate debuggerd process.
This change refactors both the tombstone and backtrace functionality to
allow both to work properly on 64 bit systems when dealing with mixed
processes.
Bug: 17487122
Change-Id: Icf123a6f4508b1aeec073663aa1a0ceae5380aa1
2014-09-12 20:12:11 -07:00
bb7f515ad3
am b51e3dbd: am 6e9798f2: Merge "logd: fix format-extra-args warning."
...
* commit 'b51e3dbdd8d95f595c70dd244b5f2f4f23ef20cd':
logd: fix format-extra-args warning.
2014-09-13 00:42:14 +00:00
b51e3dbdd8
am 6e9798f2: Merge "logd: fix format-extra-args warning."
...
* commit '6e9798f2e44c82b0cd8257f96b7d23285a7edc67':
logd: fix format-extra-args warning.
2014-09-13 00:24:57 +00:00
6e9798f2e4
Merge "logd: fix format-extra-args warning."
2014-09-13 00:15:30 +00:00
634118e261
logd: fix format-extra-args warning.
...
Bug: 17409250
Change-Id: Id50ebb57754b12d69ed605d0e2901b8e05c607c6
2014-09-12 23:37:42 +00:00
da5b2d67fa
am 99bb69c1: am f41ee3d5: Merge "74602: Fixes adb not seeing connected devices on Mac."
...
* commit '99bb69c1cee678382bf5e48962aa444469b3310e':
74602: Fixes adb not seeing connected devices on Mac.
2014-09-12 21:43:43 +00:00
99bb69c1ce
am f41ee3d5: Merge "74602: Fixes adb not seeing connected devices on Mac."
...
* commit 'f41ee3d5a1f236b0770d1ebd7068606aea7288bd':
74602: Fixes adb not seeing connected devices on Mac.
2014-09-12 21:26:49 +00:00
f41ee3d5a1
Merge "74602: Fixes adb not seeing connected devices on Mac."
2014-09-12 21:11:14 +00:00
fb1b6daca8
am 522c1d34: am e18ed89e: Merge "Remove makefile cruft."
...
* commit '522c1d340b6c1742d3e47aad27b974e43fad4bc2':
Remove makefile cruft.
2014-09-12 20:08:49 +00:00
c8b4bb0660
am 209dc083: am 870cac61: Merge "Add -std=gnu++11 to test cflags"
...
* commit '209dc083899d45b56627953335ba22029cd96c46':
Add -std=gnu++11 to test cflags
2014-09-12 20:08:48 +00:00
8ac097a036
am e4bf208c: am 082a52b5: Merge "Move libutils over to pthread_gettid_np."
...
* commit 'e4bf208ce8d893634a0f6f63ce34ec6498934d05':
Move libutils over to pthread_gettid_np.
2014-09-12 20:08:48 +00:00
abc75368a8
am e70851f8: am f9b9693b: Merge "liblog: logcat: colored output."
...
* commit 'e70851f8a8aa4c9dfaa442abf812c283ba8d8b6f':
liblog: logcat: colored output.
2014-09-12 20:08:47 +00:00
Mark Salyzyn