Commit graph

3940 commits

Author SHA1 Message Date
Jeff Sharkey
76e227b4d8 Merge "Ported "grep" from NetBSD to toolbox." 2012-07-13 16:50:28 -07:00
Jeff Sharkey
d2108a5711 Merge "Ported "cp" from NetBSD to toolbox." 2012-07-13 16:40:05 -07:00
Jeff Sharkey
3e8b1581ff Ported "grep" from NetBSD to toolbox.
Bug: 6798417
Change-Id: I581c496a726a4814edaaa3672849c090bac8552c
2012-07-13 16:37:38 -07:00
Jeff Sharkey
57df14c654 Ported "cp" from NetBSD to toolbox.
Bug: 6798417
Change-Id: I716ab459b9edf4c7405bf042adbee0300b6f51c9
2012-07-13 16:26:30 -07:00
Jeff Sharkey
5acf1d6625 am 87314036: am 55b763ff: Grant sdcard_r to ril-daemon.
* commit '873140368613af2d1c06e18ac2fd6fe24623b9bb':
  Grant sdcard_r to ril-daemon.
2012-07-13 12:18:34 -07:00
Jeff Sharkey
8731403686 am 55b763ff: Grant sdcard_r to ril-daemon.
* commit '55b763ff7b779d7ee91f245e0887332db8782afe':
  Grant sdcard_r to ril-daemon.
2012-07-13 12:16:44 -07:00
Jeff Sharkey
55b763ff7b Grant sdcard_r to ril-daemon.
Bug: 6793799
Change-Id: Ife23c98c30d7b08479d75798c7075005bf281119
2012-07-13 11:21:40 -07:00
Ken Sumrall
14c14bfb7e Merge "Add the du command to toolbox" 2012-07-12 18:42:12 -07:00
Wink Saville
557ed7a487 Merge commit 'de016eef' into mit
* commit 'de016eef':
  Add telephony-common and mms-common to BOOTCLASSPATH
2012-07-11 17:54:19 -07:00
Dmitry Shmidt
2d9a6281ca libnl_2: Extend genl_ctrl_resolve() to support "nl80211" name
Change-Id: I46759ba55bdf42baef7c1f43de845b0dc846d502
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-07-10 17:49:22 -07:00
Dmitry Shmidt
de92239055 libnl_2: Add nl_socket_set_cb() and nl_socket_get_cb()
Change-Id: Ibc2b4dc9528bd43d3fc85491c4838a33c916330e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-07-10 10:47:48 -07:00
Ken Sumrall
8103e91483 Add the du command to toolbox
The code is from NetBSD, with the -n and -h options removed to make
porting easy.  Also, removed support for the BLOCKSIZE environment
variable for the same reason.

Change-Id: Ib927ff3527e02802785fdd7f75bab1f05222918e
2012-07-09 17:33:08 -07:00
Wink Saville
de016eef33 Add telephony-common and mms-common to BOOTCLASSPATH
Change-Id: Ib113b8147d20fee1ec69d68cf6a7a02d59ff4df6
2012-07-02 15:49:24 -07:00
Rebecca Schultz Zavin
984410aebe Merge "Modify ion to use new definition of ALLOC ioctl argument" 2012-06-28 14:16:17 -07:00
Rebecca Schultz Zavin
a50fd5568e Modify ion to use new definition of ALLOC ioctl argument
Also add ion_alloc_fd helper for when you only want a filedescriptor
and know you won't need to access this handle again by its ion_handle

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

Change-Id: Ia4bae22946b0078084b62f5447fecbf261dfaa83
2012-06-28 13:43:53 -07:00
Nick Kralevich
3f2b0a506f Add mode when open(O_CREAT) is used.
When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".

This will become a runtime error in a future version of Android.

Change-Id: I00609f37d2ea68e21b6404d542830386be354202
2012-06-26 14:59:36 -07:00
Jamie Gennis
22aec573b7 ANativeWindow: update queue/dequeue/cancel w/ sync
This change deprecates the existing queueBuffer, dequeueBuffer, lockBuffer, and
cancelBuffer functions, and replaces them with a queueBuffer, dequeueBuffer,
and cancelBuffer function that accepts or returns a libsync fence file
descriptor.  It also adds the native_window_dequeue_buffer_and_wait convenience
function.

Change-Id: Ifaac91164d014993d7d1d96e0303e04e429f4d00
2012-06-19 09:52:24 -07:00
Jamie Gennis
3be33e4618 libsync: remove linux includes from sync/sync.h
This change removes the #includes of "linux/*.h" headers from the libsync
header.  It currently does this by copying the needed structs that are in the
linux headers.  This is intended to be a temporary solution.

Change-Id: Ie7e1a8e05fcf8809ba4aa0e2427efe141dae5327
2012-06-19 09:52:24 -07:00
The Android Open Source Project
4d4cc9ecc7 am 2177c79b: Reconcile with jb-release
* commit '2177c79bddc66e295599d87007d4cbec549e1cac':
2012-06-19 06:20:11 -07:00
The Android Open Source Project
2177c79bdd Reconcile with jb-release
Change-Id: If15d22c16a727b5a57edb82572fef50bab8f28a3
2012-06-19 06:13:58 -07:00
Arve Hjønnevåg
b52e91acf1 Merge "Add watchdogd" 2012-06-14 17:12:56 -07:00
Arve Hjønnevåg
d97d9074ba Add watchdogd
"/sbin/watchdogd <interval> <margin>" will open /dev/watchdog, try
to set the timeout to <interval>+<margin> then write to it every
<interval> seconds to reset the watchdog.

Change-Id: I15571980cdb868ec19f20e80bf8274b32107d36d
2012-06-14 15:43:23 -07:00
Colin Cross
45eabdf2da Merge "libsuspend: wait for earlysuspend transition to finish" 2012-06-14 15:31:29 -07:00
Colin Cross
f25dd878df libsuspend: wait for earlysuspend transition to finish
Wait for the early suspend transition to finish to the point where
surfaceflinger would previously have synchronized.  This is important
during screen on, to ensure the display early suspend handlers have
completed before surfaceflinger unblanks.

Change-Id: I91ac0253d9655c3f1ae3dd7f1a918c279568b23e
2012-06-14 15:13:10 -07:00
Eino-Ville Talvala
b59676547f Merge "Add HAL_PIXEL_FORMAT_BLOB" 2012-06-13 16:50:24 -07:00
Eino-Ville Talvala
0a052487f4 Add HAL_PIXEL_FORMAT_BLOB
This format describes buffers that are not structured like normal
image data, and can only be meaningfully understood by the endpoints.

As an example, this format is used for transporting JPEG-compressed
image buffers from the Camera HAL to the framework/apps.

Buffers of this format must have a height of 1 and a width equal to
their size in bytes. Otherwise their interpretation is up to the two
endpoints.

Bug: 6243944
Change-Id: Ia81015694cbf3a89e29bfbf3624c3ea2ef4f66fd
2012-06-13 11:53:57 -07:00
The Android Automerger
29f26a8dc7 merge in jb-release history after reset to jb-dev 2012-06-13 08:49:09 -07:00
Benoit Goby
66086a586f am 504dccec: am aeceb517: adb: Fix adb tcpip command
* commit '504dccec97c12283f348838ba0bf88536322ee6b':
  adb: Fix adb tcpip command
2012-06-12 16:46:48 -07:00
Benoit Goby
504dccec97 am aeceb517: adb: Fix adb tcpip command
* commit 'aeceb5174502659cb4fff6de924b54ef7e6cdae7':
  adb: Fix adb tcpip command
2012-06-12 16:44:11 -07:00
Benoit Goby
aeceb51745 adb: Fix adb tcpip command
When running "adb tcpip 5555", adb create a service socket named
"tcpip:5555". Only compare the 6 first chars "tcpip:" to decide if
we enable exit_on_close.

Bug: 6650130
Change-Id: I0835973de044f1cfde0e859ff0277c0ccc2630a3
2012-06-12 16:14:58 -07:00
Geremy Condra
d3eb825c4e Merge "Added logtags for errors in bionic." 2012-06-12 15:36:49 -07:00
Jamie Gennis
c06be8a15d am 1e96e16f: am 0f3974c3: Merge "Enable tracing on user builds" into jb-dev
* commit '1e96e16f81ce46adf5329b1db4662b53b927d4e2':
  Enable tracing on user builds
2012-06-12 13:05:49 -07:00
Jamie Gennis
1e96e16f81 am 0f3974c3: Merge "Enable tracing on user builds" into jb-dev
* commit '0f3974c3d0ee2ffe5e0cb9a56658ba18d511f6ea':
  Enable tracing on user builds
2012-06-12 12:41:25 -07:00
The Android Automerger
26ef0f99cd merge in jb-release history after reset to jb-dev 2012-06-12 11:25:53 -07:00
Jean-Baptiste Queru
60f3d65c83 am 2a2e10fb: am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"
* commit '2a2e10fbb38e4f4d7759f619275fa4ebd596259a':
  toolbox: rmmod: fix module unloading
2012-06-11 15:28:12 -07:00
Jean-Baptiste Queru
2a2e10fbb3 am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"
* commit '16d2b6ae4050b1232fd164cef1dbade532fe29a4':
  toolbox: rmmod: fix module unloading
2012-06-11 15:25:44 -07:00
Jean-Baptiste Queru
16d2b6ae40 am 91e5551f: Merge "toolbox: rmmod: fix module unloading"
* commit '91e5551f88aea5aa64e1b4f8b4b52d7be2b28b64':
  toolbox: rmmod: fix module unloading
2012-06-11 15:23:56 -07:00
Jean-Baptiste Queru
91e5551f88 Merge "toolbox: rmmod: fix module unloading" 2012-06-11 15:16:07 -07:00
Geremy Condra
e2c01bc7b9 Added logtags for errors in bionic.
Specifically, this adds tags for errors in FORTIFY_SOURCE'd parts
of bionic and for some indications of DNS spoofing.

Change-Id: I186ee36ae42cb6ba4fd5729ede84e2dcd4a56468
2012-06-11 12:22:37 -07:00
Jamie Gennis
0f3974c3d0 Merge "Enable tracing on user builds" into jb-dev 2012-06-11 12:04:27 -07:00
The Android Open Source Project
ef9d8d9b0c am a6f4e65b: Reconcile with jb-release
* commit 'a6f4e65bc430e2481bf8e1aaff4b2743bfb261dd':
2012-06-11 09:25:45 -07:00
The Android Open Source Project
a6f4e65bc4 Reconcile with jb-release
Change-Id: Ic8df0fdb3f0a3e9eb54bbd37a929b04c394beb28
2012-06-11 09:22:54 -07:00
The Android Automerger
7452db9890 merge in jb-release history after reset to jb-dev 2012-06-11 07:05:20 -07:00
Jeff Brown
d010d7df29 am f87d9c86: am 9cec175c: Remove a stray newline in the backtrace output.
* commit 'f87d9c86982f8873b7f449029d702ba33569e629':
  Remove a stray newline in the backtrace output.
2012-06-08 15:33:30 -07:00
Jeff Brown
f87d9c8698 am 9cec175c: Remove a stray newline in the backtrace output.
* commit '9cec175c66100d9edbb1054f3f2977a5c3f80af2':
  Remove a stray newline in the backtrace output.
2012-06-08 15:30:33 -07:00
Jeff Brown
aff4466118 am 536b81af: resolved conflicts for merge of 053b8654 to jb-dev-plus-aosp
* commit '536b81afed42ba6be1f824cf90d9a1e17a913c9c':
  Enhance native stack dumps.
2012-06-08 15:30:28 -07:00
Jeff Brown
536b81afed resolved conflicts for merge of 053b8654 to jb-dev-plus-aosp
Change-Id: Idfef8c26b7a9e1a1a202e21dc5d34022bbaa92cc
2012-06-08 15:27:01 -07:00
Jamie Gennis
1279013dee Enable tracing on user builds
This change adds init.rc steps to:
 * allow kernel tracing to be enabled via adb
 * allow a limited set of kernel trace events to be enabled via adb
 * allow the kernel trace to be read via adb
 * allow all users to write to the kernel trace from userland

Bug: 6513400
Change-Id: Ic3c189b5697aa5edf88d2f507c932971bed6caff
2012-06-08 14:26:29 -07:00
Jeff Brown
9cec175c66 Remove a stray newline in the backtrace output.
Bug: 6615693
Change-Id: I1ac1746286afb77c3f5c4042c4592333ebb08a51
2012-06-08 14:21:51 -07:00
Colin Cross
38547c3a54 Merge "libsuspend: always unblock early suspend" 2012-06-08 14:14:20 -07:00