Commit graph

10898 commits

Author SHA1 Message Date
Mark Salyzyn
aaf18b32e8 am b14b958d: am b210403a: am 98d3aa3f: Merge "logcat: tests: deal with -v threadtime default"
* commit 'b14b958d166adfe902cb64335820db9cc839d42e':
2014-09-19 08:27:02 +00:00
Elliott Hughes
b87dc5673f am bdac7202: 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 'bdac7202553a519dc047a39644c9c01fb0e78724':
2014-09-19 08:11:50 +00:00
Paul Lawrence
caad5222c1 am 40b34524: am 40af0929: Fix charger mode on first boot of force encrypt devices
* commit '40b34524bb05cdc6664ba27770c2ca4499280d28':
2014-09-19 07:40:55 +00:00
Daniel Rosenberg
da7fda72aa am aa3ed784: am 81b857f3: Merge "fastboot: Remove tos from flashall" into lmp-dev
* commit 'aa3ed7844a60b08fda8dc6ad371b60612347eeb4':
2014-09-19 07:40:55 +00:00
Esteban de la Canal
d29edf0d94 am 757adc21: am a5ab96eb: 74602: Fixes adb not seeing connected devices on Mac.
* commit '757adc21c373f565827d7d8168051319c830d701':
2014-09-19 07:40:54 +00:00
Kenny Root
b2967dd178 am ebae1bfe: am 46679c1d: am 8d35442b: Merge "fix windows build"
* commit 'ebae1bfeaa11a9fd3a3406ff277b70435c7850bd':
2014-09-19 06:17:05 +00:00
Kenny Root
f1ce3f4f82 am 0a19c517: resolved conflicts for merge of d9714d34 to lmp-mr1-dev-plus-aosp
* commit '0a19c517b775ad0e3a66d896dd8a3b01bb476e08':
2014-09-19 06:16:41 +00:00
Christopher Ferris
63de927490 am 912514ee: am f37bfb32: am 23aeeff5: Merge "Use the correct fuse_init_out structure size."
* commit '912514eeb7bc0e466ecafc5a3d9dda81fc1e5a93':
2014-09-19 06:16:40 +00:00
Mark Salyzyn
c723eb9cec am c7490422: am a9d789dd: am a3e53f1d: Merge "logcat: -v format defaults to threadtime"
* commit 'c7490422987172d9d343092ad2ffcb21da025bfb':
2014-09-19 06:16:38 +00:00
Mark Salyzyn
831b3e7163 am 508a8976: am b210403a: am 98d3aa3f: Merge "logcat: tests: deal with -v threadtime default"
* commit '508a897634f5a25c28db0ac0746b28ac3968a1d4':
  logcat: tests: deal with -v threadtime default
2014-09-18 17:59:02 +00:00
Mark Salyzyn
508a897634 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:29 +00:00
Mark Salyzyn
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
Mark Salyzyn
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
Mark Salyzyn
98d3aa3f0d Merge "logcat: tests: deal with -v threadtime default" 2014-09-18 17:27:56 +00:00
Mark Salyzyn
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
Elliott Hughes
7653e965b3 am f9cdbb1a: 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 'f9cdbb1a308137217f0a9055f967731d00e67fba':
  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:38:56 +00:00
Elliott Hughes
f9cdbb1a30 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:47 +00:00
Elliott Hughes
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
Elliott Hughes
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
Elliott Hughes
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
Paul Lawrence
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
Daniel Rosenberg
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
Esteban de la Canal
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
Varvara Rainchik
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
Paul Lawrence
df1998af7e am 48fb175d: am 40af0929: Fix charger mode on first boot of force encrypt devices
* commit '48fb175d22a80ac39db803a8bb78df876971c64b':
  Fix charger mode on first boot of force encrypt devices
2014-09-16 22:53:18 +00:00
Paul Lawrence
48fb175d22 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-16 22:43:18 +00:00
Paul Lawrence
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
Daniel Rosenberg
4c13769dba am 24e834ab: am 81b857f3: Merge "fastboot: Remove tos from flashall" into lmp-dev
* commit '24e834ab6037cee0d3e8569d5fd45695f86865bd':
  fastboot: Remove tos from flashall
2014-09-16 21:46:37 +00:00
Esteban de la Canal
4a3ed65549 am 6565e612: am a5ab96eb: 74602: Fixes adb not seeing connected devices on Mac.
* commit '6565e61226a3cefe59c4cb417490c8b6c2309ab0':
  74602: Fixes adb not seeing connected devices on Mac.
2014-09-16 21:46:37 +00:00
Daniel Rosenberg
24e834ab60 am 81b857f3: Merge "fastboot: Remove tos from flashall" into lmp-dev
* commit '81b857f3a21f3ae96a5ec72e54982fe30278049f':
  fastboot: Remove tos from flashall
2014-09-16 21:34:45 +00:00
Esteban de la Canal
6565e61226 am a5ab96eb: 74602: Fixes adb not seeing connected devices on Mac.
* commit 'a5ab96eb50f27989240ab8917e8ebf3a028bcdfb':
  74602: Fixes adb not seeing connected devices on Mac.
2014-09-16 21:34:34 +00:00
Daniel Rosenberg
81b857f3a2 Merge "fastboot: Remove tos from flashall" into lmp-dev 2014-09-16 20:08:01 +00:00
Kenny Root
bf222de3dd am 3e5e615f: am 46679c1d: am 8d35442b: Merge "fix windows build"
* commit '3e5e615f75ec08b9c6522e552ea98c0615146924':
  fix windows build
2014-09-16 19:57:03 +00:00
Kenny Root
ebf75d8b21 am 2173582b: resolved conflicts for merge of d9714d34 to lmp-dev-plus-aosp
* commit '2173582b5ab0bdda79c2f4ba784fe2fe12eaa7eb':
  adb: fix 64-bit build
  add sideload-host mode to adb
2014-09-16 19:57:02 +00:00
Christopher Ferris
f9252d49cd am 9d859fee: am f37bfb32: am 23aeeff5: Merge "Use the correct fuse_init_out structure size."
* commit '9d859fee5ebd5eda19c3a1c4e1c320903c679d43':
  Use the correct fuse_init_out structure size.
2014-09-16 19:57:01 +00:00
Mark Salyzyn
3ab617e013 am 0537416d: am a9d789dd: am a3e53f1d: Merge "logcat: -v format defaults to threadtime"
* commit '0537416da52e1ec2da4b4c1bf1270893cddd6a60':
  logcat: -v format defaults to threadtime
2014-09-16 19:57:00 +00:00
Kenny Root
3e5e615f75 am 46679c1d: am 8d35442b: Merge "fix windows build"
* commit '46679c1dce8dff027e1f87acb9bcfc81c0613721':
  fix windows build
2014-09-16 19:53:07 +00:00
Kenny Root
2173582b5a resolved conflicts for merge of d9714d34 to lmp-dev-plus-aosp
Change-Id: I1c29b6cbed8a012f271c16b4875b954d2bddf648
2014-09-16 12:46:38 -07:00
Christopher Ferris
9d859fee5e 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 19:42:53 +00:00
Mark Salyzyn
0537416da5 am a9d789dd: am a3e53f1d: Merge "logcat: -v format defaults to threadtime"
* commit 'a9d789dd8a7c1cfe58793d77af80bb457fca3cf2':
  logcat: -v format defaults to threadtime
2014-09-16 19:42:53 +00:00
Kenny Root
ebae1bfeaa am 46679c1d: am 8d35442b: Merge "fix windows build"
* commit '46679c1dce8dff027e1f87acb9bcfc81c0613721':
  fix windows build
2014-09-16 18:20:08 +00:00
Kenny Root
46679c1dce am 8d35442b: Merge "fix windows build"
* commit '8d35442b18e9dddfdde89c81e0cc910c70a12202':
  fix windows build
2014-09-16 18:12:06 +00:00
Kenny Root
8d35442b18 Merge "fix windows build" 2014-09-16 18:00:47 +00:00
Doug Zongker
edda73d0c8 fix windows build
(cherry-picked from commit 4b39c6aca9)

Change-Id: Ia7b236f1a915630fe85d488072efb9784ba10dad
2014-09-16 10:59:49 -07:00
Kenny Root
0a19c517b7 resolved conflicts for merge of d9714d34 to lmp-mr1-dev-plus-aosp
Change-Id: I11b38509c1e82f2a3d22be23ec45bfb023e0ee18
2014-09-16 10:55:08 -07:00
Christopher Ferris
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
Kenny Root
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
Christopher Ferris
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
Kenny Root
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
Colin Cross
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)

Change-Id: I11e84a7b62c935162abc0aba910d14e63d11efd3
2014-09-16 10:31:30 -07:00