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
a1ee12ca3a
Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-dev
2013-05-08 01:12:19 +00:00
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
e00a12bf8a
cutils: first pass at cleaning up legacy/obsolete code in cutils
...
Removed unused code and moved libraries with single clients
near their respective users.
Change-Id: I65f90f8659f27bd0f44ca5ddf33da2bce14674c1
Signed-off-by: Dima Zavin <dima@android.com>
2013-05-07 00:19:44 -07:00
8da4fa3504
am 6119cffa: am 7382459e: Merge "Host builds: add fastboot and adb"
...
* commit '6119cffa63d1b5d49c23a25353fc40ad0d99f82e':
Host builds: add fastboot and adb
2013-05-02 10:56:09 -07:00
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
7382459eca
Merge "Host builds: add fastboot and adb"
2013-05-02 16:52:45 +00:00
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
2f8b6a036b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-01 05:56:12 -07:00
69e9b17fa1
am cb4b9605: am 8794b2ee: Merge "Fix perms on /data/security"
...
* commit 'cb4b9605cb923d071a546b444d10cbe21367d878':
Fix perms on /data/security
2013-04-30 21:13:47 -07:00
72b1ffd375
am 803eda6a: am f69cc564: Merge "Update ueventd set the SELinux context on sysfs"
...
* commit '803eda6a2dfcb50f61dd4a6a616e560a87453cb0':
Update ueventd set the SELinux context on sysfs
2013-04-30 21:13:47 -07:00
51ef5882e7
am 55d69a96: am 032be7a4: Merge "Log an error if property pool is exhausted"
...
* commit '55d69a9681061b97d6bdcc0b1b92a7de63d0a07b':
Log an error if property pool is exhausted
2013-04-30 21:13:46 -07:00
cb4b9605cb
am 8794b2ee: Merge "Fix perms on /data/security"
...
* commit '8794b2eeb2bbd717ca18b8bef5d853f99334aabc':
Fix perms on /data/security
2013-04-30 21:12:29 -07:00
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
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
8794b2eeb2
Merge "Fix perms on /data/security"
2013-05-01 03:49:47 +00:00
f69cc564f4
Merge "Update ueventd set the SELinux context on sysfs"
2013-05-01 03:48:41 +00:00
032be7a4c5
Merge "Log an error if property pool is exhausted"
2013-05-01 03:47:19 +00:00
efbe7fc6cc
am 63577d92: am fee250d2: Reload policy after setting up the data partition.
...
* commit '63577d9280e7919bfb7221030d211b833e66bb1e':
Reload policy after setting up the data partition.
2013-04-30 17:18:05 -07:00
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
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
152a432151
am d14586e3: resolved conflicts for merge of a69af5af to jb-mr2-dev-plus-aosp
...
* commit 'd14586e35a3df39cc3aa6aff6a54463270a5e1a7':
Track change to JSSE provider
2013-04-30 09:01:42 -07:00
d14586e35a
resolved conflicts for merge of a69af5af to jb-mr2-dev-plus-aosp
...
Change-Id: If41560f0fef3103cad2172061a7988ceb5556377
2013-04-29 23:20:37 -07:00
a69af5af3d
Merge "Track change to JSSE provider"
2013-04-30 04:01:39 +00:00
ca0404b83e
Track change to JSSE provider
...
Change-Id: Iff9103fff3591983f2b172f83fd2a6e924986aa7
2013-04-29 14:20:43 -07:00
97de3e8c46
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-29 05:56:19 -07:00
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
ada3291c8d
am 14ad7861: am 538b5d4e: Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
...
* commit '14ad786183455ad9c8298e24946d4da0f24458d7':
Add persistent property for SELinux enforcment status.
2013-04-26 13:39:40 -07:00
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
538b5d4e8e
Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
2013-04-26 20:31:21 +00:00
15e84ad042
Merge "adb: Handle adb connect in a thread"
2013-04-25 22:43:54 +00:00
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
44a5fb5704
Merge "fs_mgr: make block devices read-only"
2013-04-25 20:22:20 +00:00
1c45ee92e2
adb: Handle adb connect in a thread
...
adb connect calls connect() in the event loop. If you pass a wrong ip
address or the server is slow to respond, this will block the event loop
and you can't even kill the adb server with adb kill-server. Handle connect
requests in a service thread instead.
Change-Id: I2ee732869a3dc22a6d3b87cf8ac80acaa7790037
2013-04-25 12:34:49 -07:00
db50747c93
Merge "adb: Cleanup dead code"
2013-04-25 19:33:34 +00:00
c0a29aeb85
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-25 05:55:48 -07:00
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
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
131ee07b77
Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev
2013-04-25 04:54:02 +00:00
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
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
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
5ea5854315
Merge "mount: fix incorrect string length calculation"
2013-04-24 23:38:46 +00:00
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
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
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
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
072ee01430
Merge "Make init handle reboots"
2013-04-24 15:43:10 +00:00
08d64308b9
Add a new group for MediaDrm engine plugins
...
bug: 8702754
Change-Id: I3b7988b64b1dcf4685624e4c1af938e132b82696
2013-04-23 19:54:17 -07:00
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
Jamie Gennis