Commit graph

6804 commits

Author SHA1 Message Date
Nick Kralevich
49264407de am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"
* commit '7139b0c7f8b3c86c866096cb8621a0d866af1614':
  toolbox-ls: re-introduce clobbered error message
2014-01-02 21:18:04 -08:00
Nick Kralevich
7139b0c7f8 Merge "toolbox-ls: re-introduce clobbered error message" 2014-01-03 05:13:28 +00:00
William Roberts
ded3464a10 toolbox-ls: re-introduce clobbered error message
commit 403b1955 clobbered the error message on lstat()
calls.

Change-Id: Idbd24b648e3a85079b8f8541c0798bf944485ca1
2014-01-03 02:52:34 +00:00
Elliott Hughes
a345b25371 am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."
* commit 'dfc48139c9afc8366184a1a7bc2f3762c0c82ea2':
  Switch ARM back to libcorkscrew temporarily.
2014-01-02 15:31:13 -08:00
Elliott Hughes
dfc48139c9 Merge "Switch ARM back to libcorkscrew temporarily." 2014-01-02 23:26:51 +00:00
Elliott Hughes
3c67fe9039 Switch ARM back to libcorkscrew temporarily.
We're seeing major stack trace generation performance
regression and want to find out whether it's libunwind.

Bug: 12181612
Change-Id: I3866ea956859f5cbdfe4f1ee6f20a2b6d39962c4
2014-01-02 15:25:21 -08:00
Nick Kralevich
6bec36ecc9 am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."
* commit '5b8abdf6278a4142736d918d1371d10c54c91db3':
  Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
2014-01-02 13:03:03 -08:00
Nick Kralevich
5b8abdf627 Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls." 2014-01-02 20:58:35 +00:00
Colin Cross
bb96da432b am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"
* commit '268cc54089cbdeb0c2ea955448bb16a0858c4538':
  ueventd: fix a busy loop while reading uevents
2013-12-28 12:13:22 -08:00
Colin Cross
268cc54089 Merge "ueventd: fix a busy loop while reading uevents" 2013-12-28 20:09:53 +00:00
Colin Cross
6604f2d1ef am 2dcc2759: Merge "Run the console service shell in the shell domain."
* commit '2dcc275936aefbb5badf3b4822d492260077144d':
  Run the console service shell in the shell domain.
2013-12-27 12:21:24 -08:00
Colin Cross
2dcc275936 Merge "Run the console service shell in the shell domain." 2013-12-27 20:16:49 +00:00
Colin Cross
3ccdf0bbb2 am c3e314a9: Merge changes Ie4b641cd,I5502b71d,I68086ce4
* commit 'c3e314a93c4ee76f1fd46444e52aab3abe70565f':
  libion: add apache license header to ion_test.c
  libion: initial unit tests
  libion: update ion_test.h
2013-12-26 16:26:26 -08:00
Colin Cross
c3e314a93c Merge changes Ie4b641cd,I5502b71d,I68086ce4
* changes:
  libion: add apache license header to ion_test.c
  libion: initial unit tests
  libion: update ion_test.h
2013-12-27 00:22:55 +00:00
Stephen Smalley
5e1461dc90 Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
If checkreqprot == 1, SELinux only checks the protection flags passed
by the application, even if the kernel internally adds PROT_EXEC for
READ_IMPLIES_EXEC personality flags.  Switch to checkreqprot == 0
to check the final protection flags applied by the kernel.

Change-Id: Ic39242bbbd104fc9a1bcf2cd2ded7ce1aeadfac4
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-23 16:29:25 -05:00
Stephen Smalley
610653fe93 Run the console service shell in the shell domain.
This allows it to be permissive in userdebug/eng builds
but confined/enforcing in user builds.

Change-Id: Ie322eaa0acdbefea2de4e71ae386778c929d042b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-23 14:11:44 -05:00
Colin Cross
735ead6e68 libion: add apache license header to ion_test.c
Change-Id: Ie4b641cd62b56f713178932cc5c08083c0d2452a
2013-12-19 19:31:46 -08:00
Colin Cross
363441b120 libion: initial unit tests
Change-Id: I5502b71d0c7c24d7fd59e4880033657f840b341a
2013-12-19 19:31:46 -08:00
Colin Cross
b04f75ab12 libion: update ion_test.h
Update ion_test.h to include a padding word to keep the same
struct size on 32-bit and 64-bit.

Change-Id: I68086ce49ca4cc4ed8e251752eaed331a35fbbd2
2013-12-19 19:31:19 -08:00
Colin Cross
c4f4e5e255 am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd
* commit 'cd8b953ede50f68dff5ea049e72aee130dc4a3cb':
  libion: update to latest uapi header
  libion: return -errno from ion_close
  libion: add include for size_t
  libion: add NULL checks
  libion: clean up whitespace
  libion: move ion.h into local include directory
2013-12-19 13:55:17 -08:00
Colin Cross
cd8b953ede Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd
* changes:
  libion: update to latest uapi header
  libion: return -errno from ion_close
  libion: add include for size_t
  libion: add NULL checks
  libion: clean up whitespace
  libion: move ion.h into local include directory
2013-12-19 21:49:48 +00:00
Colin Cross
949e2a7c28 am dfe747ad: Merge "ion: update struct and type definitions to match kernel header"
* commit 'dfe747ada3ec58d104d0ea57bf4f86692cd8a4fe':
  ion: update struct and type definitions to match kernel header
2013-12-19 13:21:44 -08:00
Colin Cross
dfe747ada3 Merge "ion: update struct and type definitions to match kernel header" 2013-12-19 21:18:51 +00:00
Nick Kralevich
98fdcfa981 am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."
* commit '67cb61ee5a8b8f5c967361430fff250e76c3a1dc':
  adb: Check sender's socket id when receiving packets.
2013-12-19 10:38:02 -08:00
Nick Kralevich
67cb61ee5a Merge "adb: Check sender's socket id when receiving packets." 2013-12-19 18:33:56 +00:00
Brian Carlstrom
87942c9aac am b3bfe881: Merge "Make libutils Looper independent of frameworks/native"
* commit 'b3bfe8818ae9cec129cf6d3ed30e5bb39e614fdb':
  Make libutils Looper independent of frameworks/native
2013-12-18 23:18:18 -08:00
Brian Carlstrom
b3bfe8818a Merge "Make libutils Looper independent of frameworks/native" 2013-12-19 07:13:00 +00:00
Brian Carlstrom
1693d7e48f Make libutils Looper independent of frameworks/native
Change-Id: I1dacca10a3cd7601abc3451b69ed761bf71c38fe
2013-12-18 22:32:13 -08:00
Colin Cross
dd6770bd49 libion: update to latest uapi header
Pull the uapi headers from android-3.10 directly into libion.
No other modules should be directly calling ion kernel
interfaces, so there is no reason to have those interfaces
exposed.

Change-Id: I2d3fef08f6bb381522ecf7bcffea2b8280d5e737
2013-12-18 18:43:22 -08:00
Colin Cross
aab47b293f libion: return -errno from ion_close
Return -errno from ion_close instead of -1 on error.

Change-Id: Idb828aa4b4d1a660b79d2dba8be32f306eac959d
2013-12-18 18:27:57 -08:00
Colin Cross
51b6e42231 libion: add include for size_t
Add sys/types.h include for size_t

Change-Id: Ica764b1f5eca2df21d82c86493fc4e0d70b6628a
2013-12-18 18:27:57 -08:00
Colin Cross
7496318486 libion: add NULL checks
Check for NULL in any library function that takes a pointer.

Change-Id: I9ae8887b5ae0f231583173ee6a9dfd2f8c4611ec
2013-12-18 18:27:57 -08:00
Colin Cross
92d7ca6af3 libion: clean up whitespace
Convert everything to 4 space indents, no tabs.

Change-Id: I376fad866864f0579b91ffad406e872fcce566ad
2013-12-18 18:27:54 -08:00
Rom Lemarchand
969eac8161 ion: update struct and type definitions to match kernel header
- Replacing struct ion_handle * with ion_user_handle_t
- Replacing heap_mask field name with heap_id_mask

Change-Id: Iaba1ccc62b9398a7b37c5a734bc21a9ecbbc8277
2013-12-18 18:24:50 -08:00
Colin Cross
03c932dffa libion: move ion.h into local include directory
Export it to users of libion with LOCAL_C_EXPORT_INCLUDE_DIRS

Change-Id: I4d00a9dd2e99953723994d0304ca77e0ad50a3a9
2013-12-18 18:24:50 -08:00
Greg Hackmann
f1da46d293 am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"
* commit 'd27498cbef862fccb857d7d8970418b893f550ca':
  toolbox: date: use RTC subsystem on devices without /dev/alarm
2013-12-17 16:26:57 -08:00
Greg Hackmann
d2ac1d8caa am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"
* commit 'eb3e9dafbd7f1c4f13bdcafe1a30f9da3bed9108':
  toolbox: date: fix parameter type warnings
2013-12-17 16:23:34 -08:00
Greg Hackmann
0e23a3d483 am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"
* commit '215f78ae55b479ca6a78f9762ea9920fea16cf45':
  toolbox: uptime: use clock_gettime() on devices without /dev/alarm
2013-12-17 16:23:33 -08:00
Greg Hackmann
066a3862a3 am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"
* commit '83a766373f4ee2036fe3824623b7881156fd2ee8':
  toolbox: uptime: fix unused parameter warnings
2013-12-17 16:23:32 -08:00
Greg Hackmann
d38ca369c0 am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"
* commit '9ade11c1c57edaaf0b9be8a3cb9445ae7fed3337':
  SystemClock: use clock_gettime() on devices without /dev/alarm
2013-12-17 16:23:32 -08:00
Greg Hackmann
e25864b752 am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"
* commit '537f53b682eb0d99e90da2a3e7389ea474bc583d':
  rootdir: add permissions for /dev/rtc0
2013-12-17 16:23:31 -08:00
Greg Hackmann
d27498cbef Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm" 2013-12-18 00:19:21 +00:00
Greg Hackmann
eb3e9dafbd Merge "toolbox: date: fix parameter type warnings" 2013-12-18 00:18:24 +00:00
Greg Hackmann
215f78ae55 Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm" 2013-12-18 00:18:03 +00:00
Greg Hackmann
83a766373f Merge "toolbox: uptime: fix unused parameter warnings" 2013-12-18 00:17:36 +00:00
Greg Hackmann
9ade11c1c5 Merge "SystemClock: use clock_gettime() on devices without /dev/alarm" 2013-12-18 00:17:26 +00:00
Greg Hackmann
537f53b682 Merge "rootdir: add permissions for /dev/rtc0" 2013-12-18 00:17:01 +00:00
Greg Hackmann
4a7bc60071 toolbox: date: use RTC subsystem on devices without /dev/alarm
Change-Id: I48c0fd1f4cffef936afb8d48d6d93babf006004d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Greg Hackmann
c057503aaf toolbox: date: fix parameter type warnings
Change-Id: I810a9abee8bc0061c5007fe08197384f2b85754b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Greg Hackmann
fa66f1e494 toolbox: uptime: use clock_gettime() on devices without /dev/alarm
Change-Id: Id7287ca179cc0b8390c054803a25a961dd550a34
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00