Commit graph

3894 commits

Author SHA1 Message Date
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
Kenny Root
297f802f25 Merge "Add support for reloading policy from /data/system." 2012-08-13 09:10:32 -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
605f8706c8 Merge "Add Mips architecture to system/core/include" 2012-08-11 09:56:47 -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
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
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
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
Stephen Hines
f442cf27c5 am b3a5343e: Merge "Fixed a discarded const qualifier warning"
* commit 'b3a5343e3ef705e2493a2a8546f6e416d41b1c77':
  Fixed a discarded const qualifier warning
2012-08-08 16:02:45 -07:00
Stephen Hines
7accfc2ffd am f889f0db: Merge "Trivial signed/unsigned warning fix for adbd"
* commit 'f889f0dba404d0dfb75fb33ad1df152129b0a7d2':
  Trivial signed/unsigned warning fix for adbd
2012-08-08 16:02:44 -07:00
Stephen Hines
e7b2a43638 am e551055e: Merge "Fix signed/unsigned comparison warning"
* commit 'e551055e17dae5d37f5cb428d63ddcae2e9341a2':
  Fix signed/unsigned comparison warning
2012-08-08 16:02:42 -07:00
Stephen Hines
02adb534da am 80bcb489: Merge "Fixed un-initialized variable warnings"
* commit '80bcb4893058be698bae1bef59c4b28edda6c744':
  Fixed un-initialized variable warnings
2012-08-08 16:02:41 -07:00
Stephen Hines
d25b8502ea Merge "Fix unused param warning" 2012-08-08 15:27:45 -07:00
Stephen Hines
65c37c81ba Merge "Fixed an unused param warning" 2012-08-08 15:27:34 -07:00
Stephen Hines
b3a5343e3e Merge "Fixed a discarded const qualifier warning" 2012-08-08 15:27:25 -07:00
Stephen Hines
f889f0dba4 Merge "Trivial signed/unsigned warning fix for adbd" 2012-08-08 15:27:17 -07:00
Stephen Hines
e551055e17 Merge "Fix signed/unsigned comparison warning" 2012-08-08 15:27:09 -07:00
Stephen Hines
80bcb48930 Merge "Fixed un-initialized variable warnings" 2012-08-08 15:26:49 -07:00
Jean-Baptiste Queru
faad67fac6 am ef3f7fa3: Merge "Set the SELinux security label on new directories."
* commit 'ef3f7fa32b451bd6f180c4c1586a98cee41aa296':
  Set the SELinux security label on new directories.
2012-08-08 14:04:22 -07:00
Jean-Baptiste Queru
b9994d2227 am 8261d271: Merge "restorecon tombstone directory."
* commit '8261d27115746f58a6bbf37e6dcf18a093ee8c85':
  restorecon tombstone directory.
2012-08-08 14:04:21 -07:00
Elliott Hughes
c5db017cc3 am 63b2c577: Merge "Conditionally use SIGSTKFLT"
* commit '63b2c577526d0c7ae4e90e54bf0f0befb0294456':
  Conditionally use SIGSTKFLT
2012-08-08 14:04:20 -07:00
Jean-Baptiste Queru
b2a32cb990 am 8fb0caa7: Merge "config_mbr: Fix integer overflow"
* commit '8fb0caa73b947ec801a5ae975f46560fb813baed':
  config_mbr: Fix integer overflow
2012-08-08 14:04:09 -07:00
Jean-Baptiste Queru
ef3f7fa32b Merge "Set the SELinux security label on new directories." 2012-08-08 13:42:20 -07:00
Jean-Baptiste Queru
8261d27115 Merge "restorecon tombstone directory." 2012-08-08 13:41:41 -07:00
Elliott Hughes
63b2c57752 Merge "Conditionally use SIGSTKFLT" 2012-08-08 13:40:17 -07:00
Jean-Baptiste Queru
8fb0caa73b Merge "config_mbr: Fix integer overflow" 2012-08-08 13:18:29 -07:00
Edwin Vane
62f9ffac1a Fix unused param warning
libsuspend had only a single warning in the clang build. Fixing it to
make the build clean.

Change-Id: Iaac5f9144b6e6cb122141c6416056c1b2c9aa98e
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
2012-08-02 10:40:12 -04:00
Edwin Vane
a5db95da38 Fixed an unused param warning
libnetutils had a single warning. Fixed it to make it clean.

Change-Id: I9297e556657a38dbdd7d1d0ac4bc3574801d5ac9
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
2012-08-02 10:40:12 -04:00
Edwin Vane
de7f1ad86f Fixed a discarded const qualifier warning
Change-Id: I9007924d0bf49705363aa130e6e588a9e0ccdc31
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
2012-08-02 09:20:51 -04:00
Edwin Vane
ae06933cde Trivial signed/unsigned warning fix for adbd
Change-Id: Icd674006bb2b526166960b4f90eb274030d80439
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
2012-08-02 09:17:53 -04:00
Chris Dearman
7ac420972a Conditionally use SIGSTKFLT
Change-Id: I555b33b5a93df332c556944a1c00fff417825247
2012-08-01 15:51:09 -07:00
Edwin Vane
97d2aef6d2 Fix signed/unsigned comparison warning
Trivial warning fix.

Change-Id: I93b905b34155214fc2d211a0d9319f06b67fa193
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
2012-08-01 16:36:06 -04:00
Tareq A. Siraj
8bcfb8bcff Fixed un-initialized variable warnings
These un-initialized variables were being used before initialized.

Change-Id: I80c94c5e0c2e959834b99618549377bfb3607272
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
2012-08-01 15:15:11 -04:00
Dima Zavin
018227f539 am ce76e2d0: Merge "Modify init.rc and init.goldfish.rc for SE Android."
* commit 'ce76e2d00e63339083ea693db33de05cbba5600e':
  Modify init.rc and init.goldfish.rc for SE Android.
2012-08-01 09:49:59 -07:00
Dima Zavin
ce76e2d00e Merge "Modify init.rc and init.goldfish.rc for SE Android." 2012-08-01 09:14:42 -07:00
The Android Open Source Project
aeec25dabd Reconcile with jb-mr0-release
Change-Id: I0fa1791c1e0a7c501af9e0d87f1263207e134310
2012-07-27 14:53:36 -07:00
The Android Automerger
ca38f2c7cd merge in jb-mr0-release history after reset to jb-dev 2012-07-26 17:50:01 -07:00
Stephen Smalley
1eee419e7a Modify init.rc and init.goldfish.rc for SE Android.
Set the security context for the init process.
Restore the security contexts of /cache and /data in case they were reset.
Specify the security context for services launched from the rootfs since
we cannot label their executables.
If on the emulator, set a policy boolean and restore the context of
/sys/qemu_trace to allow accesses not normally permitted on a device.

Change-Id: I166ffc267e8e0543732e7118eb0fd4b031efac3b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2012-07-26 15:37:45 -04:00
Andrew Boie
0b344e7f11 config_mbr: Fix integer overflow
The values need to be converted to loff_t *before* performing
the multiplication, else any sector offset past MAX_INT
bytes will overflow.

Change-Id: Ib8992f28aa4119ac7b4ad354b2448c4b0cfaf846
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2012-07-26 10:18:14 -07:00
Stephen Smalley
e096e36e50 Set the SELinux security label on new directories.
Automatically set the SELinux security label on directories created
by init.rc.  This avoids the need to separately call restorecon on
each such directory from the init.rc file.  Also restorecon /dev
and /dev/socket after initial policy load so that they are labeled
correctly before any other dev nodes or sockets are created.

Change-Id: If6af6c4887cdead949737cebdd673957e9273ead
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2012-07-26 09:01:22 -04:00
Ken Sumrall
228fc48a56 am 5dc5bfef: Mount/unmount filesystems before running e2fsck
* commit '5dc5bfefa078f2aded34f85db4613ba91ad49b76':
  Mount/unmount filesystems before running e2fsck
2012-07-25 14:30:54 -07:00
Colin Cross
36f2e2ac96 am 23ee469c: Merge "fastboot: change default sparse limit to disabled"
* commit '23ee469c4b790634959e5ccf83134f44e73fb72b':
  fastboot: change default sparse limit to disabled
2012-07-24 18:51:55 -07:00
Colin Cross
cecc3186ca am f650c075: Merge "fastboot: check argc before using argv"
* commit 'f650c07586d65ee655eba6d297ebaacffedae29e':
  fastboot: check argc before using argv
2012-07-24 18:51:54 -07:00
Colin Cross
23ee469c4b Merge "fastboot: change default sparse limit to disabled" 2012-07-24 18:21:52 -07:00
Colin Cross
0bbfb3976e fastboot: change default sparse limit to disabled
Change the default sparse limit to disabled to prevent resparsing files
unless the bootloader or user specifies a sparse limit.  Some
bootloaders issue an erase before every flash command, which causes
earlier parts of the downloaded image to get erased.

Change-Id: Iac6f3b05580aba8b82ed0f2f800979a49c33c691
2012-07-24 18:07:18 -07:00
Colin Cross
f650c07586 Merge "fastboot: check argc before using argv" 2012-07-24 18:07:06 -07:00
Ken Sumrall
5dc5bfefa0 Mount/unmount filesystems before running e2fsck
This works around a performance problem in the firmware of
some emmc chips.

Change-Id: Ia414b4604d11e47ce9cb3f86ac82602e081bb09e
2012-07-24 17:24:04 -07:00