gcondra@google.com
ac5cf925f8
am 683aa89b
: Merge "Remove /system from the dirs to relabel." into jb-mr2-dev
...
* commit '683aa89bfdf2439d1c5d9a4dc240d6a673678a98':
Remove /system from the dirs to relabel.
2013-05-07 19:19:50 -07:00
repo sync
683aa89bfd
Merge "Remove /system from the dirs to relabel." into jb-mr2-dev
2013-05-08 02:18:20 +00:00
repo sync
3d4d07b2fa
Remove /system from the dirs to relabel.
...
Bug: 8841348
Change-Id: Ia1545288e8a8184feffaaa6158faad62f95cbcce
2013-05-07 19:05:08 -07:00
Jamie Gennis
6e46a3b8e6
am a1ee12ca
: Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev
...
* commit 'a1ee12ca3a0ec44bb8a3eb917d13c0b5178075d9':
libcutils: add a trace tag for Dalvik
2013-05-07 18:16:28 -07:00
Jamie Gennis
a1ee12ca3a
Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev
2013-05-08 01:12:19 +00:00
Jamie Gennis
2b68e0675b
libcutils: add a trace tag for Dalvik
...
This change adds a trace tag bit for Dalvik. It also allows the ATRACE_*
macros to be called from code compiled for the host with no effect.
Bug: 8856374
Change-Id: I9c17129d6cc170cae00b6500485b5b5fa4b5e647
2013-05-07 15:19:34 -07:00
Ying Wang
6119cffa63
am 7382459e
: Merge "Host builds: add fastboot and adb"
...
* commit '7382459eca9632168b9d393bc77fb62bc21bb67a':
Host builds: add fastboot and adb
2013-05-02 10:53:18 -07:00
Ying Wang
7382459eca
Merge "Host builds: add fastboot and adb"
2013-05-02 16:52:45 +00:00
Kenny Root
928116ceef
Host builds: add fastboot and adb
...
Add fastboot and adb host utilities to debug builds for debugging
and development purposes.
Change-Id: If77699a27497b8641998930f14d4ee418b856080
2013-05-02 09:51:53 -07:00
The Android Automerger
2f8b6a036b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-01 05:56:12 -07:00
Colin Cross
cb4b9605cb
am 8794b2ee
: Merge "Fix perms on /data/security"
...
* commit '8794b2eeb2bbd717ca18b8bef5d853f99334aabc':
Fix perms on /data/security
2013-04-30 21:12:29 -07:00
Colin Cross
803eda6a2d
am f69cc564
: Merge "Update ueventd set the SELinux context on sysfs"
...
* commit 'f69cc564f4129ad7f223bb7d83ebec9fe3438b62':
Update ueventd set the SELinux context on sysfs
2013-04-30 21:12:28 -07:00
Colin Cross
55d69a9681
am 032be7a4
: Merge "Log an error if property pool is exhausted"
...
* commit '032be7a4c5be8c015063084d162d1f394279aa3d':
Log an error if property pool is exhausted
2013-04-30 21:12:28 -07:00
Colin Cross
8794b2eeb2
Merge "Fix perms on /data/security"
2013-05-01 03:49:47 +00:00
Colin Cross
f69cc564f4
Merge "Update ueventd set the SELinux context on sysfs"
2013-05-01 03:48:41 +00:00
Colin Cross
032be7a4c5
Merge "Log an error if property pool is exhausted"
2013-05-01 03:47:19 +00:00
gcondra@google.com
63577d9280
am fee250d2
: Reload policy after setting up the data partition.
...
* commit 'fee250d27a9c03af1ba439047b976d89563b1887':
Reload policy after setting up the data partition.
2013-04-30 17:04:53 -07:00
repo sync
fee250d27a
Reload policy after setting up the data partition.
...
This forces a policy reload + fixcon to deal with dynamically
delivered policy changing labels on device nodes.
It's implemented as a new keyword in init.
Bug: 8702843
Change-Id: I803cf1ecf6ff8318ce25dcc5cda4f292adc9738c
2013-04-30 11:40:22 -07:00
Kenny Root
d14586e35a
resolved conflicts for merge of a69af5af
to jb-mr2-dev-plus-aosp
...
Change-Id: If41560f0fef3103cad2172061a7988ceb5556377
2013-04-29 23:20:37 -07:00
Kenny Root
a69af5af3d
Merge "Track change to JSSE provider"
2013-04-30 04:01:39 +00:00
Kenny Root
ca0404b83e
Track change to JSSE provider
...
Change-Id: Iff9103fff3591983f2b172f83fd2a6e924986aa7
2013-04-29 14:20:43 -07:00
The Android Automerger
97de3e8c46
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-29 05:56:19 -07:00
Johan Redestig
fd7ffb1089
Log an error if property pool is exhausted
...
Failing to set properties due to an exhausted pool leads
to difficult to debug problems. This change adds an
error log to make the situation a bit easier to handle.
Change-Id: Icc1d97a80882fb23e74428a0195f1d28dba68fa8
2013-04-29 13:07:40 +02:00
gcondra@google.com
14ad786183
am 538b5d4e
: Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
...
* commit '538b5d4e8e4c480b2120aa957fe3e11a2836a1b3':
Add persistent property for SELinux enforcment status.
2013-04-26 13:37:52 -07:00
repo sync
538b5d4e8e
Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
2013-04-26 20:31:21 +00:00
repo sync
b89bdfde42
Add persistent property for SELinux enforcment status.
...
Also adds triggers for going between enforcing and
permissive status.
Bug: 8702843
Change-Id: I841d80999b96acf6b6fd0a5408fb074952d6ae72
2013-04-25 14:19:16 -07:00
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
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
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
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
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
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
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
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
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
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
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
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