Commit Graph

7057 Commits

Author SHA1 Message Date
Colin Cross 21ff8257c6 am bb96da43: am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"
* commit 'bb96da432b129cfa2a680910cda00b6c469caeee':
  ueventd: fix a busy loop while reading uevents
2013-12-28 20:16:15 +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 469035b835 am fed48bb6: am 6604f2d1: am 2dcc2759: Merge "Run the console service shell in the shell domain."
* commit 'fed48bb6de631402876f246d47d87ea1255e83d0':
  Run the console service shell in the shell domain.
2013-12-27 20:26:20 +00:00
Colin Cross fed48bb6de am 6604f2d1: am 2dcc2759: Merge "Run the console service shell in the shell domain."
* commit '6604f2d1ef5e78e7f129f94abe7a763dd0e0dd1d':
  Run the console service shell in the shell domain.
2013-12-27 20:23:09 +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 0191c80107 am 7fa9afed: am 3ccdf0bb: am c3e314a9: Merge changes Ie4b641cd,I5502b71d,I68086ce4
* commit '7fa9afedc1b8cd1d2c5f01693b8ae50c6c212e6d':
  libion: add apache license header to ion_test.c
  libion: initial unit tests
  libion: update ion_test.h
2013-12-27 00:31:16 +00:00
Colin Cross 7fa9afedc1 am 3ccdf0bb: am c3e314a9: Merge changes Ie4b641cd,I5502b71d,I68086ce4
* commit '3ccdf0bbb2bd51530fa674e454ad7a5b279e127c':
  libion: add apache license header to ion_test.c
  libion: initial unit tests
  libion: update ion_test.h
2013-12-27 00:28:53 +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 9f34b141b3 am 85d5d611: am c4f4e5e2: am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd
* commit '85d5d611442f365c17e2109c3b9559a436484213':
  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 22:09:38 +00:00
Colin Cross 85d5d61144 am c4f4e5e2: am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd
* commit 'c4f4e5e2550d730b56a9d27693d23f07a601d5c0':
  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 22:01:07 +00: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 b1e921abf0 am 697c1c32: am 949e2a7c: am dfe747ad: Merge "ion: update struct and type definitions to match kernel header"
* commit '697c1c32cd405edcdbe3b8711c8cd02459e88353':
  ion: update struct and type definitions to match kernel header
2013-12-19 21:24:35 +00:00
Colin Cross 697c1c32cd am 949e2a7c: am dfe747ad: Merge "ion: update struct and type definitions to match kernel header"
* commit '949e2a7c28e61aa1ef43ce7ae59a709fb25af1af':
  ion: update struct and type definitions to match kernel header
2013-12-19 21:23:07 +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 4639ae452e am a0ce4e28: am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."
* commit 'a0ce4e288073b744a02e4301e7ec069346c416d7':
  adb: Check sender's socket id when receiving packets.
2013-12-19 18:42:56 +00:00
Nick Kralevich a0ce4e2880 am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."
* commit '98fdcfa9817bf54a8695c57366f4ff047ceddb85':
  adb: Check sender's socket id when receiving packets.
2013-12-19 18:40:45 +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 137ab19a0a am b37b53bf: am 87942c9a: am b3bfe881: Merge "Make libutils Looper independent of frameworks/native"
* commit 'b37b53bf0775cabdfac05dd1d644f85b6f830005':
  Make libutils Looper independent of frameworks/native
2013-12-19 07:22:47 +00:00
Brian Carlstrom b37b53bf07 am 87942c9a: am b3bfe881: Merge "Make libutils Looper independent of frameworks/native"
* commit '87942c9aace72daf1efb7f912c95c98efefb4edc':
  Make libutils Looper independent of frameworks/native
2013-12-19 07:20:44 +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 796be8f143 am b1a82bcb: am f1da46d2: am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"
* commit 'b1a82bcb116d720ada2247a43d02729b32129f0a':
  toolbox: date: use RTC subsystem on devices without /dev/alarm
2013-12-18 00:32:17 +00:00
Greg Hackmann b1a82bcb11 am f1da46d2: am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"
* commit 'f1da46d293ce25311fe07e21b1e8859ac18653ef':
  toolbox: date: use RTC subsystem on devices without /dev/alarm
2013-12-18 00:29:35 +00:00
Greg Hackmann 619376f41f am e34618a2: am d2ac1d8c: am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"
* commit 'e34618a24cf82374d3f096f5aa6d9e011b16a519':
  toolbox: date: fix parameter type warnings
2013-12-18 00:28:48 +00:00
Greg Hackmann 07dbb562a8 am 9d1de8a8: am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"
* commit '9d1de8a81240e6ede714e8ee67cb079132b3e6de':
  toolbox: uptime: use clock_gettime() on devices without /dev/alarm
2013-12-18 00:28:48 +00:00
Greg Hackmann e75af57454 am 70f22d6b: am 066a3862: am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"
* commit '70f22d6b7620b5a3a11ef1d8136a4d10efe14670':
  toolbox: uptime: fix unused parameter warnings
2013-12-18 00:28:47 +00:00
Greg Hackmann 0f7c043ba8 am 7510fa3e: am d38ca369: am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"
* commit '7510fa3e71e3d42065de44ccf3e0fa50606ecf05':
  SystemClock: use clock_gettime() on devices without /dev/alarm
2013-12-18 00:28:46 +00:00
Greg Hackmann 5ae67bebc4 am c042bb01: am e25864b7: am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"
* commit 'c042bb01df9046a4aa7afeefe6d9b14a5bbc2ca2':
  rootdir: add permissions for /dev/rtc0
2013-12-18 00:28:45 +00: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 e34618a24c am d2ac1d8c: am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"
* commit 'd2ac1d8caa3eaf811df3a4f50c78a281c27f69a2':
  toolbox: date: fix parameter type warnings
2013-12-18 00:26:09 +00:00
Greg Hackmann 9d1de8a812 am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"
* commit '0e23a3d4830e6a45bf9b4968da7553fab79205a8':
  toolbox: uptime: use clock_gettime() on devices without /dev/alarm
2013-12-18 00:26:08 +00:00