Commit graph

4018 commits

Author SHA1 Message Date
Dima Zavin
35fc46d8e3 am 018227f5: am ce76e2d0: Merge "Modify init.rc and init.goldfish.rc for SE Android."
* commit '018227f5394c3126f4a858596cb85dee1893b895':
  Modify init.rc and init.goldfish.rc for SE Android.
2012-08-01 09:52:28 -07: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
Ed Heyl
3cac204d35 Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev 2012-07-28 11:48:12 -07:00
The Android Open Source Project
ce8ffda063 am aeec25da: Reconcile with jb-mr0-release
* commit 'aeec25dabd57ec39208b7e3adefab649e51b86e0':
2012-07-27 15:43:29 -07:00
The Android Open Source Project
aeec25dabd Reconcile with jb-mr0-release
Change-Id: I0fa1791c1e0a7c501af9e0d87f1263207e134310
2012-07-27 14:53:36 -07:00
Benoit Goby
0245e15bb7 rootdir: Create /data/misc/adb on boot
Change-Id: I0f8d11391cdcfbaa50f87f637a2962c6663b2767
2012-07-27 14:00:02 -07:00
Benoit Goby
0574d6b077 init.rc: Add socket for adbd
Change-Id: Ic97fd464440ff4a29fc9da7ad15949ac5215ade3
2012-07-26 19:01:16 -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
Ken Sumrall
4e499ef474 am 0d36b260: am 228fc48a: am 5dc5bfef: Mount/unmount filesystems before running e2fsck
* commit '0d36b2600697c4248add0003c00e8c5542a747b5':
  Mount/unmount filesystems before running e2fsck
2012-07-25 23:00:26 -07:00
Doug Zongker
56ede7fac5 Merge "support e=65537 for libmincrypt, DumpPublicKey" 2012-07-25 15:25:24 -07:00
Ken Sumrall
0d36b26006 am 228fc48a: am 5dc5bfef: Mount/unmount filesystems before running e2fsck
* commit '228fc48a5698a1897ee24c99db9e69db6d743430':
  Mount/unmount filesystems before running e2fsck
2012-07-25 15:06:03 -07: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
Ken Sumrall
c2dcdc2024 am 5dc5bfef: Mount/unmount filesystems before running e2fsck
* commit '5dc5bfefa078f2aded34f85db4613ba91ad49b76':
  Mount/unmount filesystems before running e2fsck
2012-07-25 14:30:26 -07:00
Doug Zongker
35d9ad5ae7 support e=65537 for libmincrypt, DumpPublicKey
The output produced by DumpPublicKey now has a version tag on each
line (ie, each key).  The existing keys are retroactively dubbed
"version 1", and we add a version 2 for 2048-bit e=65537 keys.

Change-Id: I204ec615c8f2346670220a1aeb99269e4abd5f81
2012-07-25 13:09:17 -07:00
Colin Cross
a7a64579c2 am 36f2e2ac: am 23ee469c: Merge "fastboot: change default sparse limit to disabled"
* commit '36f2e2ac96f8b2163a37773f5cb92cfff75dede2':
  fastboot: change default sparse limit to disabled
2012-07-24 18:54:18 -07:00
Colin Cross
a2b3ded589 am cecc3186: am f650c075: Merge "fastboot: check argc before using argv"
* commit 'cecc3186ca18ddf7a2d43a12353c45a81ab2baca':
  fastboot: check argc before using argv
2012-07-24 18:54:17 -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
Jeff Sharkey
c4236c8b72 Merge "Force IMS logging into radio log." 2012-07-24 17:17:27 -07:00
Colin Cross
8fb6e06ba4 fastboot: check argc before using argv
"fastboot -w" would segfault because *argv was invalid when no
non-option arguments were specified.  Check argc > 0 before
dereferencing argv.

Change-Id: I822a799e6a38e4e5c0a4eca48c6343b8a08a6185
2012-07-24 16:37:52 -07:00
Colin Cross
308bc52d33 ueventd: fixup /sys permissions on change uevents
Change uevents may be triggered after new files are created on a device
in /sys, run the sys permissions fixup when they occur.

Change-Id: Iec2725c9f8a032e5124190444edaf189a766b0b2
2012-07-24 12:36:40 -07:00
Dmitry Shmidt
237c80bf4c Merge "dhcp_utils: Add -f dhcpcd.conf processing" 2012-07-24 10:59:51 -07:00
Colin Cross
8edbbde249 am 34fd8596: am f58f62eb: Merge "libsparse: fix 32 bit overflow when calculating last chunk"
* commit '34fd8596463832c1ce670f436b31ed851552c8f4':
  libsparse: fix 32 bit overflow when calculating last chunk
2012-07-23 19:53:20 -07:00
Colin Cross
9630ca7dce am d4725517: am ec7d9dc7: Merge "Avoid zombies on androidscreencast"
* commit 'd47255175ede1af31aee9132914e5d14549ba577':
  Avoid zombies on androidscreencast
2012-07-23 19:52:34 -07:00
Colin Cross
34fd859646 am f58f62eb: Merge "libsparse: fix 32 bit overflow when calculating last chunk"
* commit 'f58f62eb31afb59a74566f60683cbbd1099e3111':
  libsparse: fix 32 bit overflow when calculating last chunk
2012-07-23 17:48:05 -07:00
Dmitry Shmidt
62d6f74863 dhcp_utils: Add -f dhcpcd.conf processing
Change-Id: Idd5c8734fafd27c76f61820f223627af4c71a271
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-07-23 17:39:30 -07:00
Colin Cross
f58f62eb31 Merge "libsparse: fix 32 bit overflow when calculating last chunk" 2012-07-23 17:26:32 -07:00
Colin Cross
f1ec8ac84a libsparse: fix 32 bit overflow when calculating last chunk
last_block * s->block_size can overflow when writing large filesystems,
cast to 64 bits before multiplying.

Change-Id: I3e54097852ce7d0fd271eab53d65e666284898e4
2012-07-23 17:11:29 -07:00
Dmitry Shmidt
22bb8fc5fe netutils: Make visible prefixLengthToIpv4Netmask() function
Change-Id: I316b192ce753daa838ea44001f899ea508adf75c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-07-23 15:41:54 -07:00
Colin Cross
d47255175e am ec7d9dc7: Merge "Avoid zombies on androidscreencast"
* commit 'ec7d9dc713322bd41b1e348c0ea3b1304a13dba9':
  Avoid zombies on androidscreencast
2012-07-23 14:26:17 -07:00
Colin Cross
ec7d9dc713 Merge "Avoid zombies on androidscreencast" 2012-07-23 14:16:21 -07:00
Yuriy Zabroda
5a536efa5b Avoid zombies on androidscreencast
When using a third party screen capture program called androidscreencast
(http://code.google.com/p/androidscreencast/) to get the framebuffer of
the device, there are tons of screencap zombie processes got left behind.
The issue is also mentioned here: http://code.google.com/p/android/issues/detail?id=22836.
The cause of the issue is that adbd spawns off screencap processes,
and these child processes were not waited to be finished.
This change fixes the issue.

Change-Id: Ife928d65ecf6a2ff39b8b72ddba930fda6733a00
Signed-off-by: Yuriy Zabroda <yuriy.zabroda@ti.com>
2012-07-23 15:23:20 +03:00
Glenn Kasten
8542f44f68 Merge "Declare audio_devices_t as uint32_t & enum consts" 2012-07-19 09:32:49 -07:00
The Android Open Source Project
7ae3779c76 am c2a229fb: Reconcile with jb-mr0-release jb-release
* commit 'c2a229fb376395a3216a20b3db920297f2569b8a':
  Grant sdcard_r to ril-daemon.
2012-07-19 08:52:34 -07:00
The Android Open Source Project
c2a229fb37 Reconcile with jb-mr0-release jb-release
Change-Id: I4a3e1815d4b0b12ace6ee6fc9e3c1711f3edcf63
2012-07-19 08:42:09 -07:00
Dan Zhang
4997ed8094 Merge "Add Kobo's USB vendor ID to adb" 2012-07-18 16:41:44 -07:00
Colin Cross
9a70e5c338 resolved conflicts for merge of 4d72d881 to master
Change-Id: Ic092d27d3fc2bcc4db8a375bbcb5b86c111bf062
2012-07-17 23:35:49 -07:00
Colin Cross
4d72d8818e am f694ba5f: Merge changes I6c59381c,I0da088fc,I883572f5,Idc2cfe20,I1a156d10,I177abdb9,I18707bd9,I26744c74,I266f70e1,I75f10db2,I95aa2317,I2f21355b,I5d4ab07f,Ic138ad58,I012d8a42,If664e4fc
* commit 'f694ba5f7fa81f250045c107e919888661a734ae':
  fastboot: add support for auto-resparsing large files
  fastboot: add fb_getvar
  fastboot: use getopt_long
  libsparse: rename symbols that conflict with libext4_utils
  libsparse: add sparse_file_len
  libsparse: add function to resparse a file and a utility to use it
  libsparse: add callback output file type
  libsparse: pseudo-subclass output_file for normal and gz files
  libsparse: add sparse_file read and convert tools to use it
  libsparse: fix windows image writing
  libsparse: merge adjacent blocks of the same type
  libsparse: add error reporting functions
  libsparse: add support for including fds
  libsparse: cleanups
  libsparse: remove static variables
  system/core: move libsparse into system/core
2012-07-17 19:40:39 -07:00
Colin Cross
f694ba5f7f Merge changes I6c59381c,I0da088fc,I883572f5,Idc2cfe20,I1a156d10,I177abdb9,I18707bd9,I26744c74,I266f70e1,I75f10db2,I95aa2317,I2f21355b,I5d4ab07f,Ic138ad58,I012d8a42,If664e4fc
* changes:
  fastboot: add support for auto-resparsing large files
  fastboot: add fb_getvar
  fastboot: use getopt_long
  libsparse: rename symbols that conflict with libext4_utils
  libsparse: add sparse_file_len
  libsparse: add function to resparse a file and a utility to use it
  libsparse: add callback output file type
  libsparse: pseudo-subclass output_file for normal and gz files
  libsparse: add sparse_file read and convert tools to use it
  libsparse: fix windows image writing
  libsparse: merge adjacent blocks of the same type
  libsparse: add error reporting functions
  libsparse: add support for including fds
  libsparse: cleanups
  libsparse: remove static variables
  system/core: move libsparse into system/core
2012-07-17 18:36:41 -07:00
Wink Saville
4be2c38884 am 6a575430: (-s ours) am b3a67938: (-s ours) Add telephony-common and mms-common to BOOTCLASSPATH - DO NOT MERGE
* commit '6a575430e4697c5879457e6ecf6486e313890173':
  Add telephony-common and mms-common to BOOTCLASSPATH - DO NOT MERGE
2012-07-17 14:08:52 -07:00
Wink Saville
6a575430e4 am b3a67938: (-s ours) Add telephony-common and mms-common to BOOTCLASSPATH - DO NOT MERGE
* commit 'b3a679386d26677290a09fdf4e3406c57e835fd0':
  Add telephony-common and mms-common to BOOTCLASSPATH - DO NOT MERGE
2012-07-17 12:37:03 -07:00
The Android Automerger
3da69b48e0 merge in jb-mr0-release history after reset to jb-dev 2012-07-17 12:32:14 -07:00
Wink Saville
b3a679386d Add telephony-common and mms-common to BOOTCLASSPATH - DO NOT MERGE
Change-Id: Ib113b8147d20fee1ec69d68cf6a7a02d59ff4df6
2012-07-17 12:23:40 -07:00
Jeff Sharkey
44e95651dd Force IMS logging into radio log.
Bug: 6497974
Change-Id: I4691f287b0abdce03ff211bd5b5b0037b8818ec9
2012-07-17 11:32:21 -07:00