ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10693 commits 1 branch 0 tags 217 MiB
Commit graph

10693 commits

This branch
This branch
All branches
Author SHA1 Message Date
Elliott Hughes
0ab784d470 am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)." 
* commit '790e7c0ac46bca5ad511ba8764bbb0e9646c6f2a':
  Switch adb to epoll(2).
 2014-09-23 18:57:33 +00:00
Elliott Hughes
790e7c0ac4 am 3772545c: Merge "Switch adb to epoll(2)." 
* commit '3772545c22fb28e27d150c97f88dd3b7c0a7c741':
  Switch adb to epoll(2).
 2014-09-23 18:45:35 +00:00
Elliott Hughes
3772545c22 Merge "Switch adb to epoll(2)." 2014-09-23 18:36:24 +00:00
Elliott Hughes
67de1557b0 Switch adb to epoll(2). 
Bug: 17588403
Change-Id: I2590f5e7dd4e178ff4f743609c5ef0155b1015a1
 2014-09-23 10:40:51 -07:00
Elliott Hughes
830b77bc5c am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)." 
* commit 'fbb4188cfac18b457801cf3e304bfa39dd29dde8':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).
 2014-09-23 16:05:18 +00:00
Elliott Hughes
fbb4188cfa am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)." 
* commit 'd559d6c72a411d14c7a964dad1eb7f6e229314cb':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).
 2014-09-23 15:59:01 +00:00
Elliott Hughes
d559d6c72a Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)." 2014-09-23 15:51:10 +00:00
Elliott Hughes
cb3d65323d defined(HAVE_OFF_T) is really just !defined(__APPLE__). 
Change-Id: I83c271bfe24b777acf293d2b4ac5af2cce8398b9
 2014-09-22 20:50:54 -07:00
Elliott Hughes
2e826dc2b1 am ae3a8961: am fed0f06b: Merge "init: Fix memory corruption when sanitizing platform paths" 
* commit 'ae3a8961f01e436a70cab569483b8ebcc1f56c0c':
  init: Fix memory corruption when sanitizing platform paths
 2014-09-23 02:16:48 +00:00
Elliott Hughes
ae3a8961f0 am fed0f06b: Merge "init: Fix memory corruption when sanitizing platform paths" 
* commit 'fed0f06bf04c6de90ae7b2f8ae9158ab2200498e':
  init: Fix memory corruption when sanitizing platform paths
 2014-09-23 02:05:55 +00:00
Elliott Hughes
fed0f06bf0 Merge "init: Fix memory corruption when sanitizing platform paths" 2014-09-23 01:55:08 +00:00
Christopher R. Palmer
07f3fee164 init: Fix memory corruption when sanitizing platform paths 
This commit fixes code that incorrectly increments s when it
hits the terminator character of the string being sanitized.
This means it will randomly start trashing memory beyond the
end of the string being sanitized until it happens to hit two
NULs (\0\0) which will break it out of the loop.

Change-Id: I76553d7f183236a78a0bc7b408e92559b98f732f
 2014-09-22 20:42:25 -04:00
Dan Albert
dcf2eb9e24 am ffbb05e6: am fbe58079: Merge "Fix warning for uninitialized variable." 
* commit 'ffbb05e6744e8de1bfc40fde17aae401217ea003':
  Fix warning for uninitialized variable.
 2014-09-22 23:23:23 +00:00
Dan Albert
ffbb05e674 am fbe58079: Merge "Fix warning for uninitialized variable." 
* commit 'fbe58079b4ac12462f1ad7a23ff745919621b8dd':
  Fix warning for uninitialized variable.
 2014-09-22 23:11:29 +00:00
Dan Albert
fbe58079b4 Merge "Fix warning for uninitialized variable." 2014-09-22 23:01:12 +00:00
Dan Albert
5c957e2d4f Fix warning for uninitialized variable. 
Change-Id: I78e6a20562419dcc2fb3f579089b32aeb5538f8b
 2014-09-22 15:26:39 -07:00
Mark Salyzyn
8b9140679d am 7e2af0cc: am 810814d0: Merge "logd: auditd: kmsg priority" 
* commit '7e2af0ccc3dec0b461977738cabb2e48b9597295':
  logd: auditd: kmsg priority
 2014-09-19 19:28:30 +00:00
Mark Salyzyn
7e2af0ccc3 am 810814d0: Merge "logd: auditd: kmsg priority" 
* commit '810814d09b7e4da9744fc5991ee49b9d8e7c9755':
  logd: auditd: kmsg priority
 2014-09-19 19:14:37 +00:00
Mark Salyzyn
810814d09b Merge "logd: auditd: kmsg priority" 2014-09-19 19:07:30 +00:00
Mark Salyzyn
6bdeee0ce6 logd: auditd: kmsg priority 
Change-Id: I2016fe140e2daf6c69efbd10aef205fffb931aa1
 2014-09-19 11:59:42 -07: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
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
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
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
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
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
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
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
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
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
Christopher Ferris
23aeeff510 Merge "Use the correct fuse_init_out structure size." 2014-09-16 17:29:20 +00:00
Doug Zongker
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)

Change-Id: I5adaedd8243dc3b76414bba0149879ca2bbf35fa
 2014-09-16 10:27:38 -07:00
Mark Salyzyn
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
Mark Salyzyn
a3e53f1dfe Merge "logcat: -v format defaults to threadtime" 2014-09-16 16:53:39 +00:00
Mark Salyzyn
649fc605f8 logcat: -v format defaults to threadtime 
Change-Id: Iafddf83b0507a667e0395d38ec9afaed67319018
 2014-09-16 09:27:37 -07:00
Christopher Ferris
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