Commit graph

5801 commits

Author SHA1 Message Date
The Android Automerger
c0a29aeb85 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-25 05:55:48 -07:00
Jeff Tinker
7629bf19a1 am 9e9ed1b4: am 131ee07b: Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev
* commit '9e9ed1b40010745e709157a6977ba6d053d46c49':
  Add a new group for MediaDrm engine plugins
2013-04-24 21:56:49 -07:00
Jeff Tinker
9e9ed1b400 am 131ee07b: Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev
* commit '131ee07b77e0250c16cebe2b0e226c5bff8e9587':
  Add a new group for MediaDrm engine plugins
2013-04-24 21:55:23 -07:00
Jeff Tinker
131ee07b77 Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev 2013-04-25 04:54:02 +00:00
Benoit Goby
9470c2f1ab adb: Cleanup dead code
dns_service is unused and recover_service has been replaced by adb
sideload

Change-Id: Ie90000d7f672e8299ee1622a9690c7371b214dc1
2013-04-24 21:31:45 -07:00
Nick Kralevich
49edc0acf8 am 4c1840e6: am 5ea58543: Merge "mount: fix incorrect string length calculation"
* commit '4c1840e6547266ba251d8c34905036d73240ff57':
  mount: fix incorrect string length calculation
2013-04-24 17:37:37 -07:00
Nick Kralevich
4c1840e654 am 5ea58543: Merge "mount: fix incorrect string length calculation"
* commit '5ea58543154a97c42c0b7fc58c2639a4fea64f5b':
  mount: fix incorrect string length calculation
2013-04-24 17:36:11 -07:00
Nick Kralevich
5ea5854315 Merge "mount: fix incorrect string length calculation" 2013-04-24 23:38:46 +00:00
Nick Kralevich
29a5298366 mount: fix incorrect string length calculation
Fix bug https://code.google.com/p/android/issues/detail?id=54192
which incorrectly calculated the length of a string.

Fix compiler warning:

system/core/toolbox/mount.c:59:2: warning: initializer-string for array of chars is too long [enabled by default]
system/core/toolbox/mount.c:59:2: warning: (near initialization for 'options[16].str') [enabled by default]

Change-Id: If8663f8311c6348a730fcf731d402b57fee10cb5
2013-04-24 16:31:02 -07:00
Matthew Xie
af1cbd4c10 am 0db6600a: am 7ee2e26e: Remove DBUS from make and header files
* commit '0db6600a60e8d604aaef5e43db9ae52ed7380979':
  Remove DBUS from make and header files
2013-04-24 14:24:30 -07:00
Matthew Xie
0db6600a60 am 7ee2e26e: Remove DBUS from make and header files
* commit '7ee2e26eb98da10eaddf5a8e864d508cceab946b':
  Remove DBUS from make and header files
2013-04-24 14:21:52 -07:00
Nick Kralevich
e18c0d508a fs_mgr: make block devices read-only
When a filesystem is mounted read-only, make the underlying
block device read-only too. This helps prevent an attacker
who is able to change permissions on the files in /dev
(for example, symlink attack) from modifying the block device.

In particular, this change would have stopped the LG Thrill / Optimus
3D rooting exploit
(http://vulnfactory.org/blog/2012/02/26/rooting-the-lg-thrill-optimus-3d/)
as that exploit modified the raw block device corresponding to /system.

This change also makes UID=0 less powerful. Block devices cannot
be made writable again without CAP_SYS_ADMIN, so an escalation
to UID=0 by itself doesn't give full root access.

adb/mount: Prior to mounting something read-write, remove the
read-only restrictions on the underlying block device. This avoids
messing up developer workflows.

Change-Id: I135098a8fe06f327336f045aab0d48ed9de33807
2013-04-24 08:53:26 -07:00
Nick Kralevich
072ee01430 Merge "Make init handle reboots" 2013-04-24 15:43:10 +00:00
Jeff Tinker
08d64308b9 Add a new group for MediaDrm engine plugins
bug: 8702754
Change-Id: I3b7988b64b1dcf4685624e4c1af938e132b82696
2013-04-23 19:54:17 -07:00
Elliott Hughes
6d8ffa8845 am 82081f71: am cb6a842c: Merge "Add a stack overflow test to crasher, and document all the options."
* commit '82081f71f69bdca08f382e5e212005dbaa301b35':
  Add a stack overflow test to crasher, and document all the options.
2013-04-23 19:31:53 -07:00
Elliott Hughes
82081f71f6 am cb6a842c: Merge "Add a stack overflow test to crasher, and document all the options."
* commit 'cb6a842c6e2048e6cd3c5a2d478113347c75d7aa':
  Add a stack overflow test to crasher, and document all the options.
2013-04-23 19:29:40 -07:00
Elliott Hughes
cb6a842c6e Merge "Add a stack overflow test to crasher, and document all the options." 2013-04-24 01:27:41 +00:00
Elliott Hughes
3808c4ecb4 Add a stack overflow test to crasher, and document all the options.
Change-Id: Iebe80c24ef43f08d258881e7847516d414436931
2013-04-23 17:14:56 -07:00
Matthew Xie
7ee2e26eb9 Remove DBUS from make and header files
DBUS had been needed by bluetooth bluz stack. It is not needed after
we replaced bluez stack with bluedroid stack.
bug 6872904

Change-Id: I3fa41c1dd4ac80bc679d5950b3b20c7f6d12265f
2013-04-23 14:02:16 -07:00
Nick Kralevich
ca8e66a8b0 Make init handle reboots
Move the responsibility for rebooting the system from the
reboot command to init. Init is in a better position to take
actions to bring the system down cleanly, including making sure
filesystems are mounted read-only.

The only UIDs which can perform an init triggered reboot are
root, system, and shell.

Modify the reboot command so that it calls into init to perform
the reboot. The reboot command no longer requires CAP_SYS_BOOT.

Remove the -n reboot option and code which supports it.  Anyone needing
to do an unclean shutdown can just do a 'echo c > /proc/sysrq-trigger'.

Modify adb so that it calls into init to perform a shutdown.

Bug: 8646621
Change-Id: I84c0513acb549720cb0e8c9fcbda0050f5c396f5
2013-04-23 13:21:40 -07:00
Todd Poynor
451a6ba829 klog: error handling fixups
Change-Id: I9014e62010c589ec30d5e99eef420353e35418b5
2013-04-22 11:07:14 -07:00
The Android Automerger
fc1906de15 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-22 05:56:17 -07:00
Colin Cross
ba4ac0cc3a am 03546553: am b73a0ef4: Merge "use lseek64 to resolve offset oveflow"
* commit '03546553205b56fc1ba0318b146971f43f54a155':
  use lseek64 to resolve offset oveflow
2013-04-18 15:25:54 -07:00
Colin Cross
0354655320 am b73a0ef4: Merge "use lseek64 to resolve offset oveflow"
* commit 'b73a0ef4d05ad594ba07b98e1f4aa7fe66a18c2e':
  use lseek64 to resolve offset oveflow
2013-04-18 15:20:54 -07:00
Christopher Tate
82fe6dae6a am 7b329880: am b3478f4a: Merge "Fix regression: log mem maps around native fault address" into jb-mr2-dev
* commit '7b3298804c6ac57bce9eb4f590f22ac836818a8b':
  Fix regression: log mem maps around native fault address
2013-04-18 14:50:39 -07:00
Christopher Tate
7b3298804c am b3478f4a: Merge "Fix regression: log mem maps around native fault address" into jb-mr2-dev
* commit 'b3478f4a50fc44bf573dc4caf4f7e1ddcc4f0eea':
  Fix regression: log mem maps around native fault address
2013-04-18 14:46:17 -07:00
Christopher Tate
b3478f4a50 Merge "Fix regression: log mem maps around native fault address" into jb-mr2-dev 2013-04-18 21:44:38 +00:00
Christopher Tate
300fd6fdbc Fix regression: log mem maps around native fault address
Restore the logging of the mem maps around the fault address along
with the rest of the faulting thread's information.  (It was still
being written to the tombstone file, but the logging got dropped on
the floor in the refactoring around AM report integration).

Bug 8654694

Change-Id: Id8851fa765dfe6b6ce41ccfc39e85eaac0acc629
2013-04-18 14:12:31 -07:00
Alex Ray
4fcd7af279 am 3d35db33: am ca0cb785: Merge "graphics: add Android flexible YCbCr format" into jb-mr2-dev
* commit '3d35db33eb9e5b0769732d4baa43729fac50d467':
  graphics: add Android flexible YCbCr format
2013-04-18 13:45:13 -07:00
Alex Ray
3d35db33eb am ca0cb785: Merge "graphics: add Android flexible YCbCr format" into jb-mr2-dev
* commit 'ca0cb785cb6a2316e9102059993e0a173220c92d':
  graphics: add Android flexible YCbCr format
2013-04-18 13:42:22 -07:00
Alex Ray
ca0cb785cb Merge "graphics: add Android flexible YCbCr format" into jb-mr2-dev 2013-04-18 20:39:33 +00:00
Colin Cross
b73a0ef4d0 Merge "use lseek64 to resolve offset oveflow" 2013-04-18 20:25:18 +00:00
Colin Cross
5192363226 am b544da0b: am d7cab8bf: Merge "adb : add missing connection states"
* commit 'b544da0be42cdd1e28d6562a26215d57c51b2f2b':
  adb : add missing connection states
2013-04-17 15:13:27 -07:00
Colin Cross
b544da0be4 am d7cab8bf: Merge "adb : add missing connection states"
* commit 'd7cab8bff1334ba48620a16d1b98f2ae623fee7d':
  adb : add missing connection states
2013-04-17 15:11:39 -07:00
Colin Cross
d7cab8bff1 Merge "adb : add missing connection states" 2013-04-17 21:45:45 +00:00
Jongrak Kwon
c05aae4ac4 use lseek64 to resolve offset oveflow
The offset variable in lseek is 32 bit and get easily overflow
when accessing with large offset in dd command.
Use lseek64 to resolve it.

Change-Id: Ib75d9dcb587004a6851365ab5bb8584ce1010b57
2013-04-17 14:05:55 -07:00
Elliott Hughes
50970341bf am ac76c1f1: am ffc5a4a5: Merge "Add OUYA VID to known VID list"
* commit 'ac76c1f16f889140ec5c56faccd676c2ff15d7bc':
  Add OUYA VID to known VID list
2013-04-17 09:30:59 -07:00
Elliott Hughes
ac76c1f16f am ffc5a4a5: Merge "Add OUYA VID to known VID list"
* commit 'ffc5a4a529338c834954e58de2701572eb0752f0':
  Add OUYA VID to known VID list
2013-04-17 09:27:37 -07:00
Elliott Hughes
ffc5a4a529 Merge "Add OUYA VID to known VID list" 2013-04-17 16:20:42 +00:00
Al Sutton
21ec0516cf Add OUYA VID to known VID list
Add the OUYA VID to the list of known USB VIDs to allow developers with OUYA
consoles to have their device automatically recognized.

Change-Id: I499114d8071747b972c24681fc0771f000ad9f9d
2013-04-17 09:20:05 -07:00
trevd
a5ad539cff adb : add missing connection states
Both CS_RECOVERY and CS_SIDELOAD where not being checked by
connection_state_name which resulted in adb get-state returning
unknown when a device is in those modes.

Change-Id: I00716024d6a0bdb68d6e2380c8cd7b5d056bd15f
Signed-off-by: trevd <trevd1234@gmail.com>
2013-04-17 14:34:23 +01:00
The Android Automerger
05e178af2b merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-17 05:55:59 -07:00
Jamie Gennis
dcbe6b4b17 am b7b2c71b: am 25538257: Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev
* commit 'b7b2c71bf8bf685af4c716e78d5c70decab98b54':
  cutils: add a way to disable tracing for a process
2013-04-16 15:21:50 -07:00
Jamie Gennis
b7b2c71bf8 am 25538257: Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev
* commit '2553825797c40b14981b1b24e44475e07b02267f':
  cutils: add a way to disable tracing for a process
2013-04-16 15:18:29 -07:00
Jamie Gennis
2553825797 Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev 2013-04-16 22:12:47 +00:00
The Android Automerger
11e1bb5eec merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-16 05:55:51 -07:00
Jamie Gennis
b13ea45a04 cutils: add a way to disable tracing for a process
This change adds the atrace_set_tracing_enabled call to libcutils.  The call
can be used to disable all tracing (of the atrace variety) for the current
process.  This is to be used to disable tracing in the Zygote process, as there
is no way for Zygote to be notified of changes to the enabled trace tags.

Change-Id: I0b691cc0dcfc65b16e3d17e1db2866a4deb253a7
2013-04-15 18:50:22 -07:00
Geremy Condra
e6a1f57b03 am 7e25fa18: am ebcf93e3: Add logic to fixup file contexts after a policy update.
* commit '7e25fa1859c5bccdc6599fbbd4f6344bc5bf7998':
  Add logic to fixup file contexts after a policy update.
2013-04-15 16:16:06 -07:00
Geremy Condra
7e25fa1859 am ebcf93e3: Add logic to fixup file contexts after a policy update.
* commit 'ebcf93e3bf92bf46c54c8e0f2ec8936bb2db6aea':
  Add logic to fixup file contexts after a policy update.
2013-04-15 16:13:53 -07:00
Geremy Condra
ebcf93e3bf Add logic to fixup file contexts after a policy update.
Bug: 8116902

(cherry picked from commit 47677a506f)

Change-Id: I2a50f68a53aee2c94d03d3e5ced1ea36337fde33
2013-04-15 14:59:42 -07:00