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

4119 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jean-Baptiste Queru
96539e8153 am ee0d281a: am c95c15b1: Merge "Char device /dev/dri/card0 was not created during startup." 
* commit 'ee0d281a3e5fe611bdda23db18fa0e5684ee43ed':
  Char device /dev/dri/card0 was not created during startup.
 2012-08-14 08:41:16 -07:00
Jean-Baptiste Queru
ee0d281a3e am c95c15b1: Merge "Char device /dev/dri/card0 was not created during startup." 
* commit 'c95c15b1923611f48c44c18ad158e57b9d915fdf':
  Char device /dev/dri/card0 was not created during startup.
 2012-08-14 08:39:22 -07:00
Jean-Baptiste Queru
c95c15b192 Merge "Char device /dev/dri/card0 was not created during startup." 2012-08-14 08:06:44 -07:00
Jeff Sharkey
70e995fb8c Merge "Source and destination paths for sdcard." into jb-mr1-dev 2012-08-13 17:06:21 -07:00
Jeff Sharkey
e169bd05ec Source and destination paths for sdcard. 
Enables init.rc to provide both paths, instead of hard-coding the
destination.

Bug: 6925012
Change-Id: I666cde710baad965b98619b68fcbcbb104973da3
 2012-08-13 16:58:39 -07:00
Jean-Baptiste Queru
93be76f5c0 am e8e73b01: am 311a4758: Merge "Remove system/core\'s remnants of SH support." 
* commit 'e8e73b01399e8d3c3fc6b94d26ef9cc49b33dda8':
  Remove system/core's remnants of SH support.
 2012-08-13 16:03:30 -07:00
Kenny Root
ba822edb30 am 02e9f8d5: am 53dab583: Merge "Make setenforce usage function static." 
* commit '02e9f8d5aa390d89f79b2b3bb8630af4062b4d2c':
  Make setenforce usage function static.
 2012-08-13 16:03:25 -07:00
Stephen Hines
2a1067d144 am 753b96cf: am dd56039c: Merge "Fixed an unused param warning in logcat" 
* commit '753b96cf67f3eaf716510600516c3c593a1ae5e1':
  Fixed an unused param warning in logcat
 2012-08-13 16:03:19 -07:00
Jean-Baptiste Queru
e8e73b0139 am 311a4758: Merge "Remove system/core\'s remnants of SH support." 
* commit '311a47585cb14984d2169c7e8f59949cec30fd85':
  Remove system/core's remnants of SH support.
 2012-08-13 15:19:12 -07:00
Jean-Baptiste Queru
311a47585c Merge "Remove system/core's remnants of SH support." 2012-08-13 14:48:33 -07:00
Kenny Root
02e9f8d5aa am 53dab583: Merge "Make setenforce usage function static." 
* commit '53dab583c448ae97c3472c06609c2c31d6549c07':
  Make setenforce usage function static.
 2012-08-13 14:12:34 -07:00
Kenny Root
53dab583c4 Merge "Make setenforce usage function static." 2012-08-13 13:36:17 -07:00
Stephen Hines
753b96cf67 am dd56039c: Merge "Fixed an unused param warning in logcat" 
* commit 'dd56039c881db2efebfa7df6491579e3ae01748f':
  Fixed an unused param warning in logcat
 2012-08-13 13:06:29 -07:00
Matt Finifter
492051ed2a Make setenforce usage function static. 
Change-Id: I6de204dc072418805160a35d799b8948ecb39251
 2012-08-13 12:56:23 -07:00
Stephen Hines
dd56039c88 Merge "Fixed an unused param warning in logcat" 2012-08-13 12:03:51 -07:00
Jeff Sharkey
84dcf09148 Collapse IMS tags into a prefix check. 
Bug: 6497974
Change-Id: I7fba1a07e2552ce16131b81f30d18eb3192de7ef
 2012-08-13 11:27:54 -07:00
Jean-Baptiste Queru
9a7b9aab08 am 79e30b6c: am ae8927aa: Merge "Fix a print format warning" 
* commit '79e30b6c798b482115efb94c2d9978d20c1d4a54':
  Fix a print format warning
 2012-08-13 10:58:49 -07:00
Jean-Baptiste Queru
79e30b6c79 am ae8927aa: Merge "Fix a print format warning" 
* commit 'ae8927aa05adf9e5a00760b45e4634eecf6340e3':
  Fix a print format warning
 2012-08-13 10:55:49 -07:00
Jean-Baptiste Queru
ae8927aa05 Merge "Fix a print format warning" 2012-08-13 10:37:56 -07:00
Kenny Root
2fec4de5c7 am 11c783f1: am 9494f297: Merge "Implement SELinux/MAC checks for property service." 
* commit '11c783f1ead9f276e8854cb1adaebeed8517e8a1':
  Implement SELinux/MAC checks for property service.
 2012-08-13 10:22:57 -07:00
Kenny Root
605103fb55 resolved conflicts for merge of 4dcd52ab to jb-mr1-dev 
Change-Id: Ibd0c03a7883a2e31adab18543c016776b7b36866
 2012-08-13 10:21:35 -07:00
Edwin Vane
80b221cb22 Fixed an unused param warning in logcat 
Changed a function to actually use its parameter instead of a global
variable. All callers of the function pass the global variable as an
argument anyway so behaviour is unchanged.

Change-Id: Ib84d45c17d2213c4d441bf2f423feca14e7aa2f4
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
 2012-08-13 12:59:36 -04:00
Kenny Root
11c783f1ea am 9494f297: Merge "Implement SELinux/MAC checks for property service." 
* commit '9494f2975b32b04b1460a03f5e1285b2721863a7':
  Implement SELinux/MAC checks for property service.
 2012-08-13 09:50:01 -07:00
Kenny Root
4dcd52ab11 am 297f802f: Merge "Add support for reloading policy from /data/system." 
* commit '297f802f25d093274c1f5fb890ee8dfacfbf159e':
  Add support for reloading policy from /data/system.
 2012-08-13 09:50:00 -07:00
Edwin Vane
8d9aa37a50 Fix a print format warning 
Change-Id: I30a6a9835073a7c0f5751fc34aed958c91a050ee
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
 2012-08-13 12:29:46 -04:00
Kenny Root
9494f2975b Merge "Implement SELinux/MAC checks for property service." 2012-08-13 09:19:35 -07:00
Kenny Root
297f802f25 Merge "Add support for reloading policy from /data/system." 2012-08-13 09:10:32 -07:00
Elliott Hughes
98ebf1975f am 2ff60998: am 605f8706: Merge "Add Mips architecture to system/core/include" 
* commit '2ff6099854691e3406a17797d4aa83624174e6f4':
  Add Mips architecture to system/core/include
 2012-08-11 11:53:08 -07:00
Elliott Hughes
2ff6099854 am 605f8706: Merge "Add Mips architecture to system/core/include" 
* commit '605f8706c88b2cd5d024b0a6b7253a78d968ba72':
  Add Mips architecture to system/core/include
 2012-08-11 11:51:40 -07:00
Elliott Hughes
6521a41dcf Remove system/core's remnants of SH support. 
SH support is long dead.

Change-Id: I6be2763ca9f1ad8b3f9b09a8ad2f1d67f1e7f802
 2012-08-11 10:04:00 -07:00
Elliott Hughes
605f8706c8 Merge "Add Mips architecture to system/core/include" 2012-08-11 09:56:47 -07:00
Jean-Baptiste Queru
3016e34beb am 697b6379: am 7b682c47: Merge "Add Mips support to libpixelflinger" 
* commit '697b6379c1b0440594eaaa6fa550ed1d0501e13a':
  Add Mips support to libpixelflinger
 2012-08-10 15:35:32 -07:00
Jean-Baptiste Queru
697b6379c1 am 7b682c47: Merge "Add Mips support to libpixelflinger" 
* commit '7b682c4787e06be193ac3d2a1071e0feb5e4ba58':
  Add Mips support to libpixelflinger
 2012-08-10 15:34:07 -07:00
Jean-Baptiste Queru
7b682c4787 Merge "Add Mips support to libpixelflinger" 2012-08-10 15:20:00 -07:00
Jouni Malinen
831cbc9d29 libnl: Add nla_put_u8/u16/u32/u64() wrapper 
Change-Id: I9c07bbff1f678b5c406dbd455c830363af093703
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2012-08-09 14:38:47 -07:00
Jason Simmons
845999d232 Merge "Allow adb to listen both on usb and tcp." into jb-mr1-dev 2012-08-09 13:56:15 -07:00
Mike J. Chen
1dd55c53af Allow adb to listen both on usb and tcp. 
(cherry picked from commit ae868a4045 in master)

Change-Id: I980c7c5e8affbc8627d17b1d9303b002adcdb29a
Signed-off-by: Mike J. Chen <mjchen@google.com>

Conflicts:

	adb/adb.c
 2012-08-09 11:43:52 -07:00
Jean-Baptiste Queru
7c7c1b0d8a am 5f6d2529: am 8076b212: Merge "Decode DHCP netmask option correctly" 
* commit '5f6d2529bb0657235b56e9abef3787a5ff4d5531':
  Decode DHCP netmask option correctly
 2012-08-09 11:42:23 -07:00
Jean-Baptiste Queru
5f6d2529bb am 8076b212: Merge "Decode DHCP netmask option correctly" 
* commit '8076b212574afe39ed6152ddf88a3c8c63b0c87c':
  Decode DHCP netmask option correctly
 2012-08-09 11:39:58 -07:00
Jean-Baptiste Queru
8076b21257 Merge "Decode DHCP netmask option correctly" 2012-08-09 10:51:40 -07:00
rpcraig
63207cd20f Implement SELinux/MAC checks for property service. 
This is a set of changes to the init property service
implementation to apply a SELinux check over who can
change what properties. Also included control hooks
for the 'ctl' keys.

Change-Id: I5a18809bf5536f6459a36b6bf0d622b9f5061aa0
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2012-08-09 10:05:49 -04:00
Stephen Smalley
ae6f3d7c05 Add support for reloading policy from /data/system. 
To support runtime policy management, add support for reloading
policy from /data/system.  This can be triggered by setting the
selinux.loadpolicy property to 1, whether from init.rc after
mounting /data or from the system_server (e.g. upon invocation of
a new device admin API for provisioning policy). ueventd and
installd are restarted upon policy reloads to pick up the new
policy configurations relevant to their operation.

Change-Id: I97479aecef8cec23b32f60e09cc778cc5520b691
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2012-08-09 09:59:10 -04:00
Stephen Hines
30f52fea05 am 67bdfa98: am d25b8502: Merge "Fix unused param warning" 
* commit '67bdfa9823dd954fdfaa01721da17d8252fc05d1':
  Fix unused param warning
 2012-08-08 17:44:07 -07:00
Stephen Hines
278cded6be am d2e826b5: am 65c37c81: Merge "Fixed an unused param warning" 
* commit 'd2e826b5192f3b964c893b8230cee1d8bdb84071':
  Fixed an unused param warning
 2012-08-08 17:44:05 -07:00
Stephen Hines
4900f43670 am f442cf27: am b3a5343e: Merge "Fixed a discarded const qualifier warning" 
* commit 'f442cf27c5d1229eb32973cb499578ccd63ba727':
  Fixed a discarded const qualifier warning
 2012-08-08 17:44:04 -07:00
Stephen Hines
5f73a6863f am 7accfc2f: am f889f0db: Merge "Trivial signed/unsigned warning fix for adbd" 
* commit '7accfc2ffd3d0fb6e6e8985349e8773f1977df59':
  Trivial signed/unsigned warning fix for adbd
 2012-08-08 17:44:03 -07:00
Stephen Hines
5d3cf721f4 am e7b2a436: (-s ours) am e551055e: Merge "Fix signed/unsigned comparison warning" 
* commit 'e7b2a43638956250d329a9ddb4eda21cd0a16ac7':
  Fix signed/unsigned comparison warning
 2012-08-08 17:44:01 -07:00
Stephen Hines
58b6a130c5 am 02adb534: am 80bcb489: Merge "Fixed un-initialized variable warnings" 
* commit '02adb534dafbd955e3470b8f370b108c5b11ce37':
  Fixed un-initialized variable warnings
 2012-08-08 16:03:57 -07:00
Stephen Hines
67bdfa9823 am d25b8502: Merge "Fix unused param warning" 
* commit 'd25b8502ea2c1294c0afab97bf7f14fbd2087efd':
  Fix unused param warning
 2012-08-08 16:02:47 -07:00
Stephen Hines
d2e826b519 am 65c37c81: Merge "Fixed an unused param warning" 
* commit '65c37c81ba64f7ec803dcec976a768d3aac9e6c3':
  Fixed an unused param warning
 2012-08-08 16:02:46 -07:00