Commit graph

498 commits

Author SHA1 Message Date
Mathias Agopian
ed7f9aaf76 Merge "connect/disconnect is now deprecated." 2011-08-01 16:35:51 -07:00
Mathias Agopian
8ad545297c connect/disconnect is now deprecated.
these hooks are replaced by api_connect/api_disconnect
which serve exactly the same purpose than before.
the old hooks are deprecated because they won't be called
from the gl driver anymore, but instead will be called
by our EGL wrapper. to maintain binary compatibility
it was necessary to introduce these new hooks.

Change-Id: I11756a5d99e3ea3d6fb61b943f82037932dfa56a
2011-07-29 17:52:36 -07:00
Wu-cheng Li
3ac91d178b Change int to int32_t in camera_frame_metadata and camera_face.
bug:4460717
Change-Id: I5c7e4ed117c2b481fb0f7d9db418f98b7459adde
2011-07-30 07:04:01 +08:00
Wu-cheng Li
9d5bfd3541 Add camera frame metadata and face detection structs.
bug:4460717
Change-Id: Ib72abfba080529472cf3fecb712043403bf7295f
2011-07-29 07:07:48 +08:00
Jean-Michel Trivi
c349636c7c Merge "Fix bug 4319552 Use commonly defined channel mask values in native" 2011-07-26 09:27:30 -07:00
Wu-cheng Li
4518e6a299 Merge "Add camera face detection enums." 2011-07-25 19:02:26 -07:00
Wu-cheng Li
de19ea2602 Add camera face detection enums.
bug:4460717
Change-Id: Id5cadcd7cdab9a9978569caf27d2ef2747fa6570
2011-07-26 08:45:50 +08:00
Jean-Michel Trivi
6d4f39754b Fix bug 4319552 Use commonly defined channel mask values in native
The native channel mask values are equal to the Java values, which
 differ from other standards simply for legacy reasons. It is
 preferrable to use commonly used values, and translate from the
 Java constants to the common values when specifying a Java mask.
The new definitions uses the same values and ordering as in
 OpenSL ES and other standards.

Change-Id: I879f64b281714c60684cd8b36fe6ae648a555121
2011-07-25 17:02:11 -07:00
Jean-Michel Trivi
33fad99acf Fix bug 4211099 channel constants and 7.1 mask
Add definitions for the side and elevated channels.

Ccorrect definition of 7.1 mask which uses
 the side channels rather than the front half-pan channels.

Change-Id: I5b6f601f6404d782dc46ef47efac9cc8441fef90
2011-07-24 16:31:03 -07:00
Mathias Agopian
5100916182 support for "Add an ANativeWindow API for SurfaceFlinger to suggest an optimal buffer orientation"
Bug: 4487161
Change-Id: I36708fd155415adbb666137692252381c19abcf6
2011-07-19 17:09:35 -07:00
Mathias Agopian
ae3736a3d1 Add lock/unlock perform codes
these will be used to implement lock/unlock on
surfacetexture.

Change-Id: I75f8d8dd136433bd5d61610caeb763d836f8b4e7
2011-07-13 18:40:38 -07:00
Mathias Agopian
42cc1edfe7 Add setScalingMode to ANativeWindow
Also cleanup the header a bit. Give fixed values to enum
because these can never change. And try to make all
comments C (as opposed to C++)

Change-Id: Ie0914ccd81a0231f32e8c21a8ff730985c5c3607
2011-07-13 15:49:58 -07:00
Jamie Gennis
5423e9e4ce ANativeWindow: add more connectable APIs
This change adds three new possible values for the 'api' argument to
native_window_connect: CPU, MEDIA and CAMERA.

Change-Id: I9305a5c0c87ab06a2c2bd7c585f54c7c7470408a
Bug: 5020877
2011-07-12 13:54:59 -07:00
Ashish Sharma
6dce8322d6 Fix header file inclusion for type uid_t.
Change-Id: I401fc0b41b4b77114fce7240662c9dfe4509e841
2011-07-10 14:04:25 -07:00
Ashish Sharma
8626cce5f3 Add communication support for xt_qtaguid(network traffic accounting) kernel module.
Change-Id: Ie0fb5b593987c53ee6f906fe6e0caab5a581d5a1
2011-07-08 19:17:03 -07:00
Jamie Gennis
6b06f9f48d Merge "ANativeWindow: add setters for dimensions and fmt" 2011-07-08 13:51:31 -07:00
Wink Saville
7da24861ea am 436deea5: am 979203ee: Add reset_mask as parameter to ifc_reset_connections
* commit '436deea5bbd43ae402ca8ee5bbc7fed3daaf3fce':
  Add reset_mask as parameter to ifc_reset_connections
2011-07-08 12:28:18 -07:00
Wink Saville
436deea5bb am 979203ee: Add reset_mask as parameter to ifc_reset_connections
* commit '979203ee34084327bf4f20ad1f878450de94826e':
  Add reset_mask as parameter to ifc_reset_connections
2011-07-08 10:27:09 -07:00
Wink Saville
979203ee34 Add reset_mask as parameter to ifc_reset_connections
The reset_mask allows either IPv4 and or IPv6 connections
of an interface to be reset.

Bug: 4981919
Change-Id: Id2d9ab90e30091d3d0764c66d4b01b73c0edbfcc
2011-07-07 12:16:12 -07:00
Jamie Gennis
208ec5ec56 ANativeWindow: add setters for dimensions and fmt
This change adds two new 'perform' setters to set the dimensions and
pixel format of the buffers that will be dequeued from the
ANativeWindow.  These new setters provide the same functionality as
_SET_BUFFERS_GEOMETRY, but allow the format and dimensions to be set
independently.  The _SET_BUFFERS_GEOMETRY setter is still supported to
maintain backwards compatibility.

Change-Id: Ib49b7798ffebe61eff2c8e4202fc3048cfec7bdd
2011-07-07 11:51:48 -07:00
Glenn Kasten
1f311f2f16 Merge "Bug 4571308 Timestamps are not always monotonic" 2011-07-01 15:02:06 -07:00
Brian Carlstrom
0491893023 Revert "Add keychain user"
This reverts commit 6541ef1562.

Bug:4970237
Change-Id: I23a90eb89c1d19893d2ba7065fc624c0521cb06e
2011-07-01 09:50:31 -07:00
Jeff Sharkey
2e81f58baa Merge "Create groups to protect bandwidth statistics." 2011-06-30 00:19:02 -07:00
Glenn Kasten
c322f67140 Bug 4571308 Timestamps are not always monotonic
Change-Id: Ia4e89a286a514d91d76268235c716e328cd3d0c2
2011-06-27 10:42:39 -07:00
Mike J. Chen
2a56688da9 Workaround Motorola ril.so incompatiblity with Netlink changes
To workaround a binary incompatiblity with Motorola's ril.so, I had to
temporarily provide the old constructor for NetlinkListener as well as
a new contructor that takes an additional format argument.
There's still a slight chance of a problem because the size of the
NetlinkListener has changed with the addition of the
mFormat member, but so far I've not seen any obvious problem with that
incompatiblity.

Another way we could have worked around the incompatiblity is to have
netd (the main user of the new format argument to NetlinkListener) keep
track of the format itself in it's NetlinkHandler (derived from NetlinkListener)
and supply it's own version of onDataAvailable() that's almost 100% identical
to NetlinkListener's except for the decode() call.  That would allow us
not to modify NetlinkListener at all.  Worth considering but I think it's
more properly divided right now and we just have to make Motorola fix their
code (and ideally not use our private APIs).

This change should be reverted when Motorola's has fixed their ril to
either not use our private APIs or to use our updated ones.

Change-Id: I255cca6908444e56cbbbed7eef1fa0cf1d8f0918
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-06-23 18:59:45 -07:00
Mike J. Chen
17260b1468 Cleanup NetlinkListener and NetlinkEvent
To make it easier to be compatible with older existing code, use
default parameters instead of separate functions for setting.

Also, reintroduce the const usage that was not in the original
changes by Stan.

Also fix some indent spacing.

Change-Id: Ice9ec7f0d5c4a0673037e2e04a764d88a98f68eb
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-06-23 18:59:45 -07:00
Mike J. Chen
ec16b9d47c Revert "Revert "Add NETLINK_ROUTE processing to the netlink client code, so that Ethernet""
This reverts commit 1d504eeb50.

Conflicts:

	libsysutils/src/NetlinkEvent.cpp

Bring back the changes from Stan Chesnutt regarding adding NETLINK_ROUTE
processing.  The original commit message description was:

    Add NETLINK_ROUTE processing to the netlink client code, so that Ethernet
    physical-layer up/down events can be tracked.  Upper layers will use these
    events to enable/disable Ethernet connectivity.

The original change was reverted due to an incompatiblity with Motorola's
ril.so binary.  I'll submit a patch to workaround that incompatiblity
separately.

Change-Id: I4e97ac98833b10543e654c63ecae3b9b8c7db44f
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-06-23 18:59:45 -07:00
Jeff Sharkey
4f1df18766 Create groups to protect bandwidth statistics.
Introduces new "net_bw_stats" group which will protect reading
detailed bandwidth statistics.  Also introduce "net_bw_acct" group
which will enable specific applications to request that their network
traffic be counted against other UIDs.

Change-Id: Ic0ec04e0d2bb9573f3c2a094ebd6d6a8cae0aae6
2011-06-22 10:01:29 -07:00
Jean-Baptiste Queru
b06dfe1425 am 4c78d862: am a08f7ae3: Merge "tweak for forward-compatibility"
* commit '4c78d8620514fe1a704872cba66bc1b14d4e2a66':
  tweak for forward-compatibility
2011-06-20 09:10:23 -07:00
Jean-Baptiste Queru
b6c15de82a tweak for forward-compatibility
Change-Id: I1896be16622b452a3652412af3c64f8c550f71d0
2011-06-18 10:41:31 -07:00
Eric Laurent
da38224875 Fixed some audio helper functions
Make sure audio_is_valid_format() is true only
for formats supported by AudioTrack and AudioRecord.
Generalized audio_is_linear_pcm().
Added audio_bytes_per_sample() function.

Change-Id: If588af6c08f09796ab04bccbbd6e720f1e914412
2011-06-16 21:13:43 -07:00
Dima Zavin
28e08dc581 core: move audio_policy.h here from hardware
Change-Id: I6b8c04c975e01f2502d766ed2b9353d3c83193b3
Signed-off-by: Dima Zavin <dima@android.com>
2011-06-13 17:54:33 -07:00
Eric Laurent
3142a203b3 Merge "Config utils improvement" 2011-05-27 10:20:00 -07:00
Eric Laurent
38d14f7604 Merge "Added PCM formats to audio.h" 2011-05-27 10:19:43 -07:00
jeffhao
2b8f76cdbb Tracking merge of dalvik-dev to master
Reordered bootclasspath to allow verification of all framework methods.
  git cherry-pick --no-commit  ec164a0170955fe63106c2576a65bc4ffb1df425

Address CVE-2011-1090.
  git cherry-pick --no-commit  3365288d3c00072689cd9d733e055561cadc87b5

Change-Id: I6a89bc600ced06a0cb84ae1670cb7a6ea39de9c8
2011-05-27 00:50:44 -07:00
Ken Sumrall
e555f54965 Merge "Crypto changes for devices that don't write ext4 fs on wipe" 2011-05-26 20:01:19 -07:00
Ken Sumrall
b05b0b5d3b Crypto changes for devices that don't write ext4 fs on wipe
This adds a new function to libcutils, partition_wiped().
This is used to determine if a partition is wiped.

Change-Id: Ibb388976c6b5bd3923b62d8f79b2b97748abf6c1
2011-05-26 19:42:32 -07:00
Eric Laurent
c3cf1a8278 Config utils improvement
Added a function to free resources allocated by config node tree.

Change-Id: I2ee8ae642899ec4501fa6e490c5be7efaa2d738e
2011-05-26 13:57:03 -07:00
Eric Laurent
9714b27bb4 Added PCM formats to audio.h
Added formats for 32 bit PCM audio to allow direct use of
common audio formats defined in audio.h by audio effect
API defined in audio_effect.h

Change-Id: I5d58c2db8325ca625ab6d2b10cc0d422ba119ca5
2011-05-26 13:52:47 -07:00
Nick Kralevich
7956d759be Merge "rename uevent_checked_recv to uevent_kernel_multicast_recv" 2011-05-26 10:55:09 -07:00
tedbo
1ffdb38213 Fix broken comment on closing #endif in window.h
The closing #endif comment is missing the comment delimiters. This
change adds them and fixes a compile warning about extra tokens after
endif.

Change-Id: If8295aa6fbb2b21c2b56fe57a467dcde79c65de3
2011-05-24 00:55:33 -07:00
Jamie Gennis
da1a1f629b fix a comment typo in system/graphics.h
Change-Id: Ia6471a1c005cdc13833e6b0444e758add5a990e0
2011-05-18 14:42:46 -07:00
Jean-Baptiste Queru
860f98afe1 am 327b2b70: Merge "move core audio definitions under system/core"
* commit '327b2b709f1c9ed119b2d87cd95d4a5367fe0338':
  move core audio definitions under system/core
2011-05-13 10:47:38 -07:00
Dima Zavin
253b598dc0 move core audio definitions under system/core
Change-Id: I58b7324edff834b3afa4d9c86452e66f8c29c63b
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-13 08:46:13 -07:00
Dima Zavin
e8e4be57aa move core audio definitions under system/core
Change-Id: I58b7324edff834b3afa4d9c86452e66f8c29c63b
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-12 11:58:48 -07:00
Jean-Baptiste Queru
34df17d032 am 7078f776: Merge "cutils: add popcount/popcountl/popcountll static inline definitions"
* commit '7078f776fd658f86ecb249eeffc6e7cb0c4ae66a':
  cutils: add popcount/popcountl/popcountll static inline definitions
2011-05-12 10:44:52 -07:00
Dima Zavin
4af1cf2bd7 cutils: add popcount/popcountl/popcountll static inline definitions
Just pass them through to their specific GCC builtins. If we find
that the builtins are not performing well or have other issues, we can
pull in existing public implementations and/or write arch-specific
helpers if necessary.

Change-Id: I278e6b73d75fac88808ed4546070d288c06f79e0
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-12 08:41:49 -07:00
Nick Kralevich
57de8b8f27 rename uevent_checked_recv to uevent_kernel_multicast_recv
Change-Id: I1839627490080efcbb7269699709064856312f8b
2011-05-11 14:58:24 -07:00
Iliyan Malchev
0ab886bdab move ANativeWindow and friends under system/core
This patch moves the definition of ANativeWindow from frameworks/base into
system/core.  We move ANativeWindow for two reasons.

Firstly, the native-window interface may need to be used by lower-level code
than the framework.  Such code (such as the camera HAL) is not allowed to use
definitions from frameworks/base, since the latter is stacked on top of the
former.  Thus moving (the interface definition) ANativeWindow under system/core
lowers the level at which we can work with windows.

Secondly, this enables an implementation of ANativeWindow that lies outside of
frameworks, enabling quick initial bringup of graphics.

Change-Id: I851b9bb2834bcec73255b5af82f66411e54bb1a5
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-02 19:19:54 -07:00
Iliyan Malchev
66ea3574b6 move non-HAL definitions to syste/core/include
This patch moves camera- and graphics-related definitions out of the hardware
HAL layer and into system/core.  These definitions are used both by the HAL and
by higher-level code as well.  More functionality (e.g., audio definitions)
will be moved here as well.

Change-Id: I225f12374ce54fa393640dce53738267d0d703e9
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-02 19:18:46 -07:00
Iliyan Malchev
3ffd793a1d native_handle.h: fix declaration
Change-Id: I452a517ee6982995318802eb4bbb23bd79401c4d
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-02 17:27:37 -07:00
Dima Zavin
0e02fcab11 Merge "libcutils: add a simple string parameter parsing ("a=b;c=d;") helper utils" 2011-04-27 17:07:12 -07:00
Nick Kralevich
4682abaaa6 am b0d0e260: resolved conflicts for merge of 2baeb898 to honeycomb-plus-aosp
* commit 'b0d0e260bd6118959fa0e2d3c84037b3e0178551':
  Fold uevent message origin checking from init into libcutils.
2011-04-27 13:49:59 -07:00
Nick Kralevich
b0d0e260bd resolved conflicts for merge of 2baeb898 to honeycomb-plus-aosp
Change-Id: Ib3169b3a36aa13ef413da624355b1737e9b76fd9
2011-04-27 13:09:24 -07:00
Nick Kralevich
2baeb89882 am a2842b68: Merge "Fold uevent message origin checking from init into libcutils."
* commit 'a2842b68548c8cdfbf6b3c14480ab04bab9010ea':
  Fold uevent message origin checking from init into libcutils.
2011-04-27 12:31:55 -07:00
Vernon Tang
3f582e92f0 Fold uevent message origin checking from init into libcutils.
Change-Id: I7cbc0cb840d1b4962e6c360fdad9a9c0ce20e87b
2011-04-28 05:16:21 +10:00
Nick Kralevich
bb738d6727 am de35f274: am 03752be0: am 0c297f5e: Merge "Revert "Fold uevent message origin checking from init into libcutils.""
* commit 'de35f2741c4e32e331a92be99f7c04b92b94beb2':
  Revert "Fold uevent message origin checking from init into libcutils."
2011-04-27 10:37:48 -07:00
Nick Kralevich
de35f2741c am 03752be0: am 0c297f5e: Merge "Revert "Fold uevent message origin checking from init into libcutils.""
* commit '03752be0a437d12e19ac73ebe23385fe6f756e2c':
  Revert "Fold uevent message origin checking from init into libcutils."
2011-04-27 10:35:06 -07:00
Nick Kralevich
03752be0a4 am 0c297f5e: Merge "Revert "Fold uevent message origin checking from init into libcutils.""
* commit '0c297f5ebb5ae7af2854f7c07d97bcdd13c159fc':
  Revert "Fold uevent message origin checking from init into libcutils."
2011-04-27 10:32:00 -07:00
Nick Kralevich
de9e65dd65 Revert "Fold uevent message origin checking from init into libcutils."
This reverts commit 8405ec0e75.

The original change does not compile.
2011-04-27 10:21:24 -07:00
Nick Kralevich
3268eda4dc am e3ab4245: am a7cf7ed9: am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."
* commit 'e3ab42457077ec2a66bac553e59a7fee08d4fa9e':
  Fold uevent message origin checking from init into libcutils.
2011-04-27 10:00:34 -07:00
Nick Kralevich
e3ab424570 am a7cf7ed9: am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."
* commit 'a7cf7ed93486240ca48a407e67c7c3683a3b93aa':
  Fold uevent message origin checking from init into libcutils.
2011-04-27 09:59:14 -07:00
Nick Kralevich
a7cf7ed934 am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."
* commit '282c2ab408d487d0995362d1b9aa97fe30d97ebd':
  Fold uevent message origin checking from init into libcutils.
2011-04-27 09:55:20 -07:00
Vernon Tang
8405ec0e75 Fold uevent message origin checking from init into libcutils.
Change-Id: I1a38e611a7ad990f74306ce453740a1eeed2416d
2011-04-27 14:17:15 +10:00
Dima Zavin
0fad7d023f libcutils: add a simple string parameter parsing ("a=b;c=d;") helper utils
Change-Id: Ifabeb75550fa6e351434e6e6d036b19331daf6c1
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-20 19:04:40 -07:00
Carl Shapiro
b60d9ce1fc Make atomic-inline.h usable from ordinary C++ code.
Change-Id: I18dcba9cb3adc22f26403e94df4b2684f51090ed
2011-04-11 20:00:42 -07:00
Brian Carlstrom
6541ef1562 Add keychain user
Change-Id: Id6738d7c97dd58b2043e2cba018797e3b2b4d77a
2011-04-08 14:06:16 -07:00
Jeff Hamilton
18247d74be am ee3420bc: resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp
* commit 'ee3420bc124613827af474684c3015d12742c70d':
  Make the NFC UID forward compatible.
2011-04-05 10:42:19 -07:00
Jeff Hamilton
ee3420bc12 resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp
Change-Id: I9f77e84d887dbe84bb94de0fdd369d8de24fbec3
2011-04-05 12:32:50 -05:00
Jeff Hamilton
65475f89e1 am 336bc321: Make the NFC UID forward compatible.
* commit '336bc321a6e978a273098148e13a82c5e7ec3be5':
  Make the NFC UID forward compatible.
2011-04-04 14:42:38 -07:00
Jeff Hamilton
336bc321a6 Make the NFC UID forward compatible.
Change-Id: Icfa302c22151b3d722ad0da7e58806f74730e1a3
2011-04-01 13:43:01 -05:00
Alexandre Elias
412514ea60 Add ifndef guards to remaining logging macros.
Change-Id: I5fce9bffdb9e52d50059034fd1cc05ba7f0e3b87
2011-03-29 16:24:45 -07:00
Brad Fitzpatrick
4fecade5f2 am cb1e616e: am 7c556549: Merge changes Icdefb5ff,Icd7f5f03
* commit 'cb1e616e3c108a9c8b159bb95c3356acf5797ba2':
  Fix potential race introduced in Icd7f5f03
  SocketClient: add optional reference counting
2011-03-29 08:45:04 -07:00
Jeff Hamilton
be61f39a6b am a6a36c0b: Update the value for the NFC shared UID.
* commit 'a6a36c0b799b84d06b695027d205f21d13a3275b':
  Update the value for the NFC shared UID.
2011-03-24 20:23:35 -07:00
Jeff Hamilton
a6a36c0b79 Update the value for the NFC shared UID.
Change-Id: I47edf39dbdf2ebd41f44ca69aac250d8991dec4c
2011-03-24 21:40:43 -05:00
Brad Fitzpatrick
3549b0dc28 Fix potential race introduced in Icd7f5f03
Digit wrote:

"You probably don't want to close the socket here without updating
c->socket as well. Otherwise, another thread holding a handle to the
client after the c->decRef() could end up sending a message to a
different socket, if the file descriptor index is reused by another
client in the meantime."

Change-Id: Icdefb5ffc0c7607325d7db761e1f04e5d868bfb7
2011-03-22 14:03:11 -07:00
Brad Fitzpatrick
13aa8ad445 SocketClient: add optional reference counting
Needed to fix a race in netd.

Bug: 3438459
Change-Id: Icd7f5f035510235f733a25c0621479d3e644b152
2011-03-22 14:03:08 -07:00
David 'Digit' Turner
100c0e2dab libsysutils: Fix race condition in SocketListener thread.
+ Handle EINTR in accept(), write() and select()
+ Fix a memory leak when deleting the mClients list
+ Fix typo in SocketListener.h

Change-Id: Ie68bb3e2dbefe0dfdaa22a5cd06a42dbc4c0f8aa
2011-03-22 14:02:51 -07:00
Brad Fitzpatrick
4be4e69f01 Fix potential race introduced in Icd7f5f03
Digit wrote:

"You probably don't want to close the socket here without updating
c->socket as well. Otherwise, another thread holding a handle to the
client after the c->decRef() could end up sending a message to a
different socket, if the file descriptor index is reused by another
client in the meantime."

Change-Id: Icdefb5ffc0c7607325d7db761e1f04e5d868bfb7
2011-03-17 17:14:46 -07:00
Brad Fitzpatrick
648ebad883 SocketClient: add optional reference counting
Needed to fix a race in netd.

Bug: 3438459
Change-Id: Icd7f5f035510235f733a25c0621479d3e644b152
2011-03-17 15:50:02 -07:00
Dima Zavin
29d1f53a56 Merge "cutils: add popcount/popcountl/popcountll static inline definitions" 2011-03-14 14:14:49 -07:00
Ken Sumrall
bb889dde13 am 276df093: am 70987108: Merge "Try to unmount writable filesystems when rebooting" into honeycomb-mr1
* commit '276df0936dbf438b32ab099b04f69f01d7f1eed7':
  Try to unmount writable filesystems when rebooting
2011-03-10 19:29:39 -08:00
Ken Sumrall
e3aeeb4de3 Try to unmount writable filesystems when rebooting
Ext4 filesystems like to be unmounted before rebooting.  The Android system
doesn't have a traditional Linux init setup, and shutting down the system
was not much more than calling sync(2) and reboot(2).  This adds a new
function to libcutils called android_reboot().  By default, it calls sync()
and then remounts all writable filesystems as read-only and marks them clean.
There is a flag parameter in which the caller can ask for sync() not to be
called, or to not remount the filesystems as read-only.  Then it will call
reboot(2) as directed by the other parameters.  This change also updates
adb, init and toolbox to call the new android_reboot() function.
Fixes bugs 3350709 and 3495575.

Change-Id: I16d71ffce3134310d7a260f61ec6f4dd204124a7
2011-03-10 18:11:46 -08:00
Dima Zavin
5a809b90e9 cutils: add popcount/popcountl/popcountll static inline definitions
Just pass them through to their specific GCC builtins. If we find
that the builtins are not performing well or have other issues, we can
pull in existing public implementations and/or write arch-specific
helpers if necessary.

Change-Id: I278e6b73d75fac88808ed4546070d288c06f79e0
Signed-off-by: Dima Zavin <dima@android.com>
2011-03-10 15:09:16 -08:00
Raphael
1e47832909 Revert "Define O_BINARY for non-Windows platforms."
This reverts commit bd70e4aca5.
2011-03-02 16:49:34 -08:00
Raphael Moll
879dd27b2b am e24624da: am 733e4701: am fa5f2ad4: am bd8f4a85: Merge "Define O_BINARY for non-Windows platforms."
* commit 'e24624da7d29374ad59d20312ca0e0ea2ea5596b':
  Define O_BINARY for non-Windows platforms.
2011-03-02 15:33:12 -08:00
Raphael Moll
e24624da7d am 733e4701: am fa5f2ad4: am bd8f4a85: Merge "Define O_BINARY for non-Windows platforms."
* commit '733e47011023787cf996b1b4f232453b2324e303':
  Define O_BINARY for non-Windows platforms.
2011-03-02 11:38:35 -08:00
Brad Fitzpatrick
8d1c6e7685 Make optional valgrind binaries +x.
Change-Id: If3417e0c8728c7c74badb12de734cf06e794619d
2011-03-01 15:12:11 -08:00
Raphael Moll
bd70e4aca5 Define O_BINARY for non-Windows platforms.
All tools (aapt, aidl, dexdump, etc.) need this flag to open()
binary files, or they risk reading corrupted data on Windows.

A bunch of these tools just conditionaly define O_BINARY in
their C files. Seems it would just make sense to define it globally.

Change-Id: Ia5c0a59e9e77bbdcbce235233555f611207abed8
2011-02-16 13:36:42 -08:00
Mike Lockwood
b5d68a3c28 libusbhost: Save endpoint ID in usb_request struct
Change-Id: I2cf189cee67c2efbcf919c8bae1447a6cb112f02
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-14 08:05:40 -05:00
Paul Eastham
4fe0bc5cf6 am 57cd87d9: am 1ace223f: Set default permissions for preloaded /data/media aka /sdcard content.
* commit '57cd87d9ccf57a2c874fafd1a0b8cab7ebea646f':
  Set default permissions for preloaded /data/media aka /sdcard content.
2011-02-07 11:38:50 -08:00
Paul Eastham
1ace223fcb Set default permissions for preloaded /data/media aka /sdcard content.
Change-Id: Ia67cbdbfbcd423cf163f0fce5c6edc215564e782
2011-02-03 17:14:00 -08:00
Robert Greenwalt
09dd819d27 Stop using netmask in the framework
This pushes prefixLength down as far as we can.

bug:2542681
Change-Id: I94b7cde9d10e97ee2c071d92f25555cff5934f0b
2011-02-02 14:18:44 -08:00
Mike Lockwood
120b57a3d9 libusbhost: Add call for synchronous bulk transfers
Also clean up and add timeout to control request transfer

Change-Id: Ibc2d8ac64d0fa90e0a23e6225ce2c49b23bb0d97
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-27 16:21:56 -08:00
Dmitry Shmidt
b42db825e1 Merge "libnetutils: Clean all IPs assigned to the interface on cleaning" 2011-01-27 15:59:52 -08:00
Dmitry Shmidt
9092b91cca libnetutils: Clean all IPs assigned to the interface on cleaning
Change-Id: Ic285bbb4b224fc4e62e88e76b8b448edbe814a17
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-01-27 14:16:20 -08:00
Robert Greenwalt
faab26d542 Change our dhcp interface to be IPv6 compat.
Doesn't do IPv6, but removes v4-specific structures from the framework
(netmask, ints for addrs)
bug:2542681

Change-Id: I1110e6f32d42a472b104835a4298e18b391db0a7
2011-01-25 11:21:04 -08:00
Carl Shapiro
f59ed65c47 am 3b093369: am 1147407b: Merge "Remove unconditional swap from the android atomic operations suite." into honeycomb
* commit '3b093369d85f2d248799073152ece79987d4b30b':
  Remove unconditional swap from the android atomic operations suite.
2011-01-24 16:46:45 -08:00
Carl Shapiro
0a16d83969 Remove unconditional swap from the android atomic operations suite.
Bug: 3381237
Change-Id: I7bdc7c8eb4c1cc6303d96e40ca2f196a007c4dd2
2011-01-23 14:09:17 -08:00
Glenn Kasten
328c0d4a89 Merge "Bug 3361124 Remove drmioserver" 2011-01-23 09:45:24 -08:00
Mike Lockwood
ec9e7b1c18 libusbhost: Add usb_device_connect_kernel_driver()
This can be used to ask the kernel to disconnect its driver for a device
so usb_device_claim_interface() can claim it instead.

Also increased size of descriptor buffer and added some debugging logs

Change-Id: I4945196d957fb8493716eb9b7e5463c06b168ef1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-22 14:10:04 -08:00
Glenn Kasten
b29b33841b Bug 3361124 Remove drmioserver
Change-Id: Ie3b20b487c1466737921567ab2d043e230356bf4
Note: safe to re-use the drmio uid/gid as no files were ever created.
2011-01-20 07:45:27 -08:00
David 'Digit' Turner
cf9e1003ce libsysutils: Fix race condition in SocketListener thread.
+ Handle EINTR in accept(), write() and select()
+ Fix a memory leak when deleting the mClients list
+ Fix typo in SocketListener.h

Change-Id: Ie68bb3e2dbefe0dfdaa22a5cd06a42dbc4c0f8aa
2011-01-19 02:18:40 +01:00
Mike Lockwood
af7bdc6460 Add separate permission and group for access to MTP USB driver
Since the "usb" group and ACCESS_USB permission will be used by regular apps
to access USB devices in host mode, we need a separate permission for the
device side MTP driver.

Change-Id: Ibb546b8726d61e041fc7c273f71929624ad1575b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-10 08:22:30 -05:00
Mike Lockwood
be1def8d43 libusbhost: Tweak comments.
Change-Id: I45fdba7a94438f7c15fbca5dd65f07df9b522fb3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-07 11:31:58 -05:00
Brad Fitzpatrick
a2a1f3149f Let SocketClient users write binary data to clients.
This is a dependency for the DNS proxy CLs.

This CL also adds a new socket for the netd process to inherit which
is owned by the inet group.  (so only apps with the INTERNET
permission can use the DNS proxy...)

Change-Id: I8a51924e0ed56c6066f77e6f1b02d39bdadac51e
2011-01-06 11:09:55 -08:00
Mike Lockwood
e533c5f100 libusbhost: Support for multiple pending requests on a single endpoint
Add new usb_request struct to replace usb_endpoint, which is no longer needed.

Change-Id: Ia3637b3431a3597caced41bfec677ef0b044a453
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-06 09:21:13 -05:00
Mike Lockwood
7d700f8bdc libusbhost: Add usb_device_get_name_from_unique_id()
This allows converting from unique IDs to USB device names

Change-Id: I8e3b300790c01383aed8e3d4f547b54bcb7c2cd4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-29 09:27:16 -05:00
Mike Lockwood
50372073d2 libusbhost: Add accessor for the USB device descriptor
Change-Id: Ic3a54e2a06f3b4fa72f99b64025a911fbf525daf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 19:08:27 -08:00
Mike Lockwood
cd185f23cc libusbhost: Add support for creating a usb_device struct from an existing fd
We will use this for sharing USB file descriptors across address spaces via Binder

Change-Id: Iadbd3e0a4178f79d1d778fdfd5175f6fe0e2aaf5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 19:08:14 -08:00
Erik Gilling
67ebdce982 Merge changes I4dcadf8e,I166d2859
* changes:
  libusbhost: add usb chapter 9 include to usbhost.h
  toolbox: add lsusb command
2010-12-09 15:53:03 -08:00
Erik Gilling
3af05b09eb libusbhost: add usb chapter 9 include to usbhost.h
Change-Id: I4dcadf8e8d9b25782351c9aeefb0d2cea81bbc9e
2010-12-09 15:28:06 -08:00
Kenny Root
cfb61c2720 Cygwin needs HAVE_OFF64_T and fix description
During testing of compilation, it was discovered that Cygwin actually
has off64_t.

Also the description was wrong for HAVE_OFF64_T

Change-Id: I6eb73d13da5a53fb03bf99ab7de82bfb6acab058
2010-12-08 11:19:11 -08:00
Kenny Root
07ad9961ae Add HAVE_OFF64_T to AndroidConfig.h
For platforms that have _FILE_OFFSET_BITS=32 and need to access large
files, we need some way to access 64-bit file APIs. This adds a hint to
allow programs to choose alternate APIs if possible.

Change-Id: Ifdc204df269350a22f52c0e4221e9d7d3b7a57fe
2010-12-06 15:20:54 -08:00
Mike Lockwood
2e0047bdc0 Add new AID_MEDIA_RW group to control write access to /data/media
BUG: 3113970

Change-Id: I233bd57e36d1e65847ead503e378304a958f492d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-29 10:55:54 -04:00
Brad Fitzpatrick
8c5669f9f9 Let SocketClient users write binary data to clients.
This is a dependency for the DNS proxy CLs.

This CL also adds a new socket for the netd process to inherit which
is owned by the inet group.  (so only apps with the INTERNET
permission can use the DNS proxy...)

Change-Id: Ic3475c697913ba85805b4e49801b65e7a1d59289
2010-10-27 10:27:34 -07:00
Jean-Baptiste Queru
43e21849da am ec70a9e1: am f2ff2112: Merge "Add config header file for Linux/PPC."
Merge commit 'ec70a9e1b5c12cde090749dc07e29b396b12f656'

* commit 'ec70a9e1b5c12cde090749dc07e29b396b12f656':
  Add config header file for Linux/PPC.
2010-10-21 13:45:44 -07:00
Jean-Baptiste Queru
ec70a9e1b5 am f2ff2112: Merge "Add config header file for Linux/PPC."
Merge commit 'f2ff2112309d03674b88433276a57500b723fa9e' into gingerbread-plus-aosp

* commit 'f2ff2112309d03674b88433276a57500b723fa9e':
  Add config header file for Linux/PPC.
2010-10-20 15:40:50 -07:00
Jean-Baptiste Queru
457ce8f672 am 67672e04: Merge a775965b from gingerbread
Merge commit '67672e04111a6cfdf572023a154675749c3fb550'

* commit '67672e04111a6cfdf572023a154675749c3fb550':
  Add AID_NFC for use by the NFC service.
2010-10-17 11:10:36 -07:00
Marcus Comstedt
b08f7d896a Add config header file for Linux/PPC.
Change-Id: I892e9d922ba4b4090bdb5de00d8cc7adf0123cfe
2010-10-16 14:35:48 +02:00
Jean-Baptiste Queru
67672e0411 Merge a775965b from gingerbread
Change-Id: I8c08cca033ef3efe6badd2a7ba4674dfb02d6b60
2010-10-15 17:46:44 -07:00
Raphael Moll
dc8827ee23 am 7e65ede6: am 9cd8057b: Merge "Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin." into gingerbread
Merge commit '7e65ede62065925e29b5b18f253758bb280f9383'

* commit '7e65ede62065925e29b5b18f253758bb280f9383':
  Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin.
2010-10-15 16:48:13 -07:00
Nick Pelly
85905a6ab4 Add AID_NFC for use by the NFC service.
Change-Id: I5b92f87dbacb9d855d99e10b3811f290fb64a144
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:16:05 -07:00
Raphael Moll
7e65ede620 am 9cd8057b: Merge "Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin." into gingerbread
Merge commit '9cd8057b6e8f5fc1254a4ed19e8127b5091b5dce' into gingerbread-plus-aosp

* commit '9cd8057b6e8f5fc1254a4ed19e8127b5091b5dce':
  Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin.
2010-10-14 13:41:46 -07:00
Raphael Moll
bb8ebabfd4 Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin.
This is used by build\libs\host\CopyFile.c

Also define HAVE_PRINTF_ZD since printf %zd is not
supported on MinGW/Cygwin.
This is used by frmk/base/libs/utils/ZipFileRO.cpp

Change-Id: I570ac5dd0a5b256ee67ad62433f1226597da3ea4
2010-10-13 21:54:56 -07:00
Kenny Root
d9387cfc95 am 6be460d5: Add HAVE_PREAD definition to platforms
Merge commit '6be460d5b0b60aca4e8d649e2254f8a8920f4d98' into gingerbread-plus-aosp

* commit '6be460d5b0b60aca4e8d649e2254f8a8920f4d98':
  Add HAVE_PREAD definition to platforms
2010-10-04 15:49:01 -07:00
Kenny Root
6be460d5b0 Add HAVE_PREAD definition to platforms
ZipFileRO uses pread() to guarantee atomic reads at an offset, so use
the HAVE_PREAD flag to trigger off of. The only platform that doesn't
implement it directly is Windows.

Change-Id: Ic927611dc45b75ff8f672ed59afee5be1ad07ab4
2010-10-04 15:13:49 -07:00
Kenny Root
8adcde9534 Add HAVE_PREAD definition to platforms
ZipFileRO uses pread() to guarantee atomic reads at an offset, so use
the HAVE_PREAD flag to trigger off of. The only platform that doesn't
implement it directly is Windows.

Change-Id: I52d4e61010bb97e2d50af09943a2e94c0417bb5f
2010-10-04 14:46:59 -07:00
Andy McFadden
2bf937e6bb Use DMB ST for store fence.
Change-Id: Ic713f30fcec0f2d2eb486c549917575ff0afa82f
2010-10-01 11:29:48 -07:00
Carl Shapiro
a417657880 am df2f5a07: am d55f0adf: Qualify the source argument of atomic loads as a const pointer.
Merge commit 'df2f5a07aecac7be4ac2d1100668a0396fd256e7'

* commit 'df2f5a07aecac7be4ac2d1100668a0396fd256e7':
  Qualify the source argument of atomic loads as a const pointer.
2010-09-28 17:38:03 -07:00
Carl Shapiro
df2f5a07ae am d55f0adf: Qualify the source argument of atomic loads as a const pointer.
Merge commit 'd55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa' into gingerbread-plus-aosp

* commit 'd55f0adfb5ec4202ad5bd5d188e66c0f6a27b0aa':
  Qualify the source argument of atomic loads as a const pointer.
2010-09-28 14:20:54 -07:00
Carl Shapiro
d55f0adfb5 Qualify the source argument of atomic loads as a const pointer.
Also normalizes the opening brace placment in a few locations.

Change-Id: I8f518e933094337d5d3371321326ffc03b3a5f5a
2010-09-28 14:06:00 -07:00
Mike Lockwood
b07c78aa94 am d1971c4c: resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp
Merge commit 'd1971c4cac37fccdccd105f78f7252582685ccd9'

* commit 'd1971c4cac37fccdccd105f78f7252582685ccd9':
  Add AID_GPS user ID for GPS daemon
2010-09-27 11:46:54 -07:00
Mike Lockwood
d1971c4cac resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp
Change-Id: I860b7690c40428839e45e2c2b122661b00d47e0e
2010-09-27 14:16:44 -04:00
Mike Lockwood
c29919c8d7 Add AID_GPS user ID for GPS daemon
Change-Id: I2f8ffba40e3f5145b37296f19c698e08d768ce59
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-27 08:01:58 -04:00
Brian Carlstrom
464431e65f Add definitions for store barrier.
I usually call this a "store/store barrier" for maximum clarity, but
the common way of describing it is "store barrier" or "store fence".

This doesn't use "dmb st" yet since we're waiting on the toolchain
update, but it gets the various macros and inline functions in place
so we can use them in the VM.

Bug 3003477

git cherry-pick 2ba5eec3972b4ce46feb677116534fcd3d136e0a

Change-Id: Ifd2d3588be96aa529d490789436cf48c962021ba
2010-09-24 10:56:43 -07:00
Brian Swetland
d06df51bcd resolved conflicts for merge of 3b5214a6 to master
Change-Id: Id73c53c6c2e9c21eb9b1d1e624aaeb25097ea7a4
2010-09-19 04:35:19 -07:00
Brian Swetland
3b5214a67f am 02863b95: add /vendor support
Merge commit '02863b957cfbfc302d3136ed78c0cba86accacd8' into gingerbread-plus-aosp

* commit '02863b957cfbfc302d3136ed78c0cba86accacd8':
  add /vendor support
2010-09-19 03:49:43 -07:00
Brian Swetland
02863b957c add /vendor support
- look in /vendor/firmware/... in addition to /system/etc/firmware/... for firmware loading
- add /vendor/bin to path before /system/bin
- add /vendor/lib to ldpath before /system/lib
- configure appropriate permissions for /system/vendor/bin
- symlink /vendor -> /system/vendor

Change-Id: I0c06ca1e38a44f0c7024cee6cea8907aa93a4532
2010-09-19 03:36:39 -07:00
Kenny Root
3000e4f9c4 am 1db75e7b: am 6fd75635: Merge "Fetch peer credentials for local sockets" into gingerbread
Merge commit '1db75e7b9b5159fa3bcf1cfdc4efba62c570d860'

* commit '1db75e7b9b5159fa3bcf1cfdc4efba62c570d860':
  Fetch peer credentials for local sockets
2010-09-15 12:17:44 -07:00
Kenny Root
1db75e7b9b am 6fd75635: Merge "Fetch peer credentials for local sockets" into gingerbread
Merge commit '6fd75635d820754295557c300ccee89c643864cc' into gingerbread-plus-aosp

* commit '6fd75635d820754295557c300ccee89c643864cc':
  Fetch peer credentials for local sockets
2010-09-14 14:39:18 -07:00
Kenny Root
30abb7234d Fetch peer credentials for local sockets
Fetch the PID, UID, and GID of the remote side of a local socket
connection in case any users of this library class want to check it.

Change-Id: Ia3230e6bc68ab6f93160df9f5996d2bf744b872c
2010-09-14 14:35:10 -07:00
Jean-Baptiste Queru
a5220b24d1 am 26ce6e0e: manual merge from readonly-korg-master
Merge commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1'

* commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1':
  - Add drm and drmio service
2010-09-10 11:30:33 -07:00
Jean-Baptiste Queru
26ce6e0e16 manual merge from readonly-korg-master
Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548
2010-09-10 10:43:36 -07:00
Jean-Baptiste Queru
bb130ba799 Merge "- Add drm and drmio service - Add /data/drm directory for storing DRM related data" 2010-09-09 14:13:01 -07:00
Jason Sams
14b91a829a Merge "Remove ACC which has been replaced with llvm. Free up space in build." 2010-09-03 11:48:52 -07:00
Dan Bornstein
dad578642b am 556f09c4: am f74af26d: It seems that Windows actually does have a header for <stdbool.h>.
Merge commit '556f09c426084b62c34742ee0810fc97ae37abf7'

* commit '556f09c426084b62c34742ee0810fc97ae37abf7':
  It seems that Windows actually does have a header for <stdbool.h>.
2010-09-01 17:19:17 -07:00
Dan Bornstein
deb9188f4f It seems that Windows actually does have a header for <stdbool.h>.
Change-Id: I25d7846c066135f0af1fef2995bcb86397b23226
2010-09-01 17:03:43 -07:00
Dan Bornstein
556f09c426 am f74af26d: It seems that Windows actually does have a header for <stdbool.h>.
Merge commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c' into gingerbread-plus-aosp

* commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c':
  It seems that Windows actually does have a header for <stdbool.h>.
2010-09-01 16:51:24 -07:00
Dan Bornstein
f74af26d18 It seems that Windows actually does have a header for <stdbool.h>.
Change-Id: I443929d07972389a8c9837926a4b7df37bd6a16a
2010-09-01 16:21:09 -07:00
Jason Sams
54adc5e8a1 Remove ACC which has been replaced with llvm.
Free up space in build.

Change-Id: Ic5cc48bacca47b45809b9bc649ae5b629b7427ed
2010-09-01 12:33:06 -07:00
Nick Kralevich
c34f195149 am 095a6a6e: am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread
Merge commit '095a6a6ecb8039067c077db381bd02abc2496422'

* commit '095a6a6ecb8039067c077db381bd02abc2496422':
  get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
2010-08-31 17:50:15 -07:00
Nick Kralevich
095a6a6ecb am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread
Merge commit '739cd9d2d4718913889a15d95c840506a2af04d1' into gingerbread-plus-aosp

* commit '739cd9d2d4718913889a15d95c840506a2af04d1':
  get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
2010-08-31 17:47:49 -07:00
Nick Kralevich
4688ac5b73 get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
Change-Id: If365bd88f735d425f37d61bcd5a6903f99f6a454
2010-08-31 09:44:43 -07:00
Jean-Baptiste Queru
3d092d0a89 am bdcf98dd: Manual merge
Merge commit 'bdcf98ddbf2022ef894dfd7f9278e6f345e2c2df'

* commit 'bdcf98ddbf2022ef894dfd7f9278e6f345e2c2df':
  Add API to add a route to IPv4/IPv6 host/gateway.
2010-08-25 09:59:50 -07:00
Szymon Jakubczak
feb391d4be am 8c85a00d: - creates proper ifc.h and dhcp.h headers for libnetutils - adds ifc_set_hwaddr - adds hwaddr command to netcfg - code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing - consistency: use net.XXX.dnsX properties in favor of dhcp.XX
Merge commit '8c85a00db6da092ec3766facd49132fa4fc319a1'

* commit '8c85a00db6da092ec3766facd49132fa4fc319a1':
  - creates proper ifc.h and dhcp.h headers for libnetutils
2010-08-25 09:59:45 -07:00
Jean-Baptiste Queru
bdcf98ddbf Manual merge
Change-Id: Ic71ed9c392c5dee4a5a9be184d071eb688741f6f
2010-08-25 09:25:12 -07:00
Szymon Jakubczak
8c85a00db6 - creates proper ifc.h and dhcp.h headers for libnetutils
- adds ifc_set_hwaddr
- adds hwaddr command to netcfg
- code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing
- consistency: use net.XXX.dnsX properties in favor of dhcp.XXX.dnsX properties
  (see related change to WifiStateTracker)
- updated system/core/nexus to use new headers, although not sure if
anybody still uses nexus

Change-Id: Idd70c0ac6e89b38e86816578c33eff805d30cac4
2010-08-25 08:13:42 -07:00
Danica Chang
7002edeb3d Merge "added network.conf to android_filesystem_config" 2010-08-18 16:47:10 -07:00
Jean-Baptiste Queru
7f7047eb6b am 58b64ace: Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"
Merge commit '58b64acef07e6426914a8cb2d972778fbe138655'

* commit '58b64acef07e6426914a8cb2d972778fbe138655':
  Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"
2010-08-18 13:28:30 -07:00
Jean-Baptiste Queru
58b64acef0 Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"
This reverts commit c88e09cb98.
2010-08-18 11:16:00 -07:00
Banavathu, Srinivas Naik
8984bb9691 Add API to add a route to IPv4/IPv6 host/gateway.
Add API to create a route to an IPv4/IPv6 host/gateway through a particular
interface.

Change-Id: I0ab5d2d211e0fc05f65ee6bb202b7f435cccae2a
2010-08-17 21:50:41 -07:00
Jean-Baptiste Queru
8fa95f9660 am 838336fa: am 5dfd90e5: Merge "pixelflinger: Fix function naming typo: gglBitBlti"
Merge commit '838336fa61f2f06898322f059570708def823398'

* commit '838336fa61f2f06898322f059570708def823398':
  pixelflinger: Fix function naming typo: gglBitBlti
2010-08-17 07:51:28 -07:00
Jean-Baptiste Queru
838336fa61 am 5dfd90e5: Merge "pixelflinger: Fix function naming typo: gglBitBlti"
Merge commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34' into gingerbread-plus-aosp

* commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34':
  pixelflinger: Fix function naming typo: gglBitBlti
2010-08-17 07:48:42 -07:00
Danica Chang
78fdd23c92 added network.conf to android_filesystem_config
Change-Id: I393720a2c1632c311f794e14c17b197083a70621
2010-08-12 18:04:57 -07:00
Jim Huang
6e1a9430e8 pixelflinger: Fix function naming typo: gglBitBlti
From the functionality, the function gglBitBlti() implemented bit-block
(image) transfer operation in which several bitmaps are combined into
one using a raster operator.  Renaming to gglBitBlit() should be
explicit.

Change-Id: I23886623b5421131cf7c7bfb8ec67c3809566c93
2010-08-10 02:56:47 +08:00
Brian Carlstrom
3c659a8d64 am f2af88e8: Tracking merge of dalvik-dev to gingerbread
Merge commit 'f2af88e81af5efb2d585963507f798d5a8b93d67' into gingerbread-plus-aosp

* commit 'f2af88e81af5efb2d585963507f798d5a8b93d67':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:39:18 -07:00
Brian Carlstrom
f2af88e81a Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit b99a099c
git cherry-pick --no-commit 9811671e02
git cherry-pick --no-commit d0645bf0cc

Change-Id: Ie70fecaeaba97a25f114cd2717e381b5107533b1
2010-08-04 15:45:52 -07:00
Mike Lockwood
07eb4af174 libusbhost: add usb_device_get_unique_id_from_name()
Change-Id: Idce54fc26d0432d4dc46f605623c4960c0e8690f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-27 19:05:33 -04:00
aimitakeshi
e572d596b3 - Add drm and drmio service
- Add /data/drm directory for storing DRM related data

Change-Id: Ifd8922a3de109dbf5cd3f9cabbf4e5689b16c1d7
2010-07-27 08:38:35 +09:00
Mike Lockwood
cb0d07b0e0 Merge "libusbhost: Add usb_device_send_control for sending raw commands on endpoint 0." 2010-07-24 11:56:15 -07:00
Mike Lockwood
1b7d991b43 libusbhost: Add usb_device_send_control for sending raw commands on endpoint 0.
Change-Id: If883f2690c4031b9ba4d5cf943b5bf5c13193bce
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-24 13:57:57 -04:00
Bruce Beare
d16de9fd2e am 1298bb79: am 96a2bb62: Set the modes for rc.* files in /system/etc
Merge commit '1298bb79938cb1f4cf920433b86716bd4108de0f'

* commit '1298bb79938cb1f4cf920433b86716bd4108de0f':
  Set the modes for rc.* files in /system/etc
2010-07-23 11:06:35 -07:00
Bruce Beare
1298bb7993 am 96a2bb62: Set the modes for rc.* files in /system/etc
Merge commit '96a2bb622d38f3c875997e4cacb423fa9ef4ea76' into gingerbread-plus-aosp

* commit '96a2bb622d38f3c875997e4cacb423fa9ef4ea76':
  Set the modes for rc.* files in /system/etc
2010-07-23 11:04:38 -07:00
Bruce Beare
96a2bb622d Set the modes for rc.* files in /system/etc
Change-Id: I0897897cdffa66afa4f818f7ebcf0a9b70c517ea
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-23 10:52:32 -07:00
Mike Lockwood
a805519cee libusbhost: Add callback to usb_host_run to notify when initial device discovery is done
This can be used to eliminate race conditions in clients that operate immediately
on the currently connected device list.

Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: I14954b9fcc84239950ead6bdc1a0a888882c2226
2010-07-20 09:50:56 -04:00
The Android Open Source Project
4e246965bb am 64ba76c1: merge from open-source master
Merge commit '64ba76c1431afe17c1f4553f1dbc595db064316e'

* commit '64ba76c1431afe17c1f4553f1dbc595db064316e':
  Fixed LOG_ASSERT() compilation errors in native debug builds.
2010-07-16 13:34:53 -07:00
The Android Open Source Project
64ba76c143 merge from open-source master
Change-Id: I612711a84996e22e826e4920be29c204cf5d7d44
2010-07-16 13:32:03 -07:00
Chris Pearson
1929990434 Fixed LOG_ASSERT() compilation errors in native debug builds.
Invoking LOG_ASSERT, LOG_ALWAYS_FATAL or LOG_ALWAYS_FATAL_IF variadic macros
without the printf format string arg caused compilation errors because the
variable arg list (__VA_ARGS__) was eventually passed to
__android_log_assert() func in place of a required parameter. This error
only occured in debug builds because LOG_ASSERT() is a no-op in release
builds.  This change allows debug builds to succeed.

Change-Id: I7e7b7de3e501133468ce083e0e0d6e699dd59667
Signed-off-by: Chris Pearson <christopherx.c.pearson@intel.com>
2010-07-16 07:56:03 -07:00
The Android Open Source Project
c0c799c660 am 0796f618: merge from open-source master
Merge commit '0796f618775b34e14ff624bcfca828d55183b4c5'

* commit '0796f618775b34e14ff624bcfca828d55183b4c5':
  DBUS is not fully implemented. Disable it for now
2010-07-02 12:09:18 -07:00
The Android Open Source Project
0796f61877 merge from open-source master
Change-Id: I1be135f087795bf1789dbf911c585a606bf25778
2010-07-02 11:45:02 -07:00
Carl Shapiro
64e76cc637 Merge "Remove an obsolete compatibility macro." 2010-07-01 13:30:48 -07:00
Andy McFadden
7ae24be753 am 635dc574: am 57dbb2cb: Merge "Add a HAVE define for pthread_setname_np()." into gingerbread
Merge commit '635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9'

* commit '635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9':
  Add a HAVE define for pthread_setname_np().
2010-07-01 11:56:13 -07:00
Andy McFadden
635dc574e9 am 57dbb2cb: Merge "Add a HAVE define for pthread_setname_np()." into gingerbread
Merge commit '57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6' into gingerbread-plus-aosp

* commit '57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6':
  Add a HAVE define for pthread_setname_np().
2010-07-01 09:08:28 -07:00
Andy McFadden
57dbb2cb37 Merge "Add a HAVE define for pthread_setname_np()." into gingerbread 2010-07-01 09:05:51 -07:00
Mike Lockwood
7a96ba436c libusbhost: The client is now responsible for creating the thread that monitors the bus
This is to allow using a thread that is capable of calling through JNI to Java code
to report USB device attached/removed events.

Change-Id: Ia58592607a2c1f4357b31072044f5db5617d7f5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-01 11:33:41 -04:00
Andy McFadden
efca22636f am cc4d11c2: Merge "Fix sim-eng build." into gingerbread
Merge commit 'cc4d11c245d5b514ba758cc095a59cd481c92cae' into gingerbread-plus-aosp

* commit 'cc4d11c245d5b514ba758cc095a59cd481c92cae':
  Fix sim-eng build.
2010-07-01 07:33:21 -07:00
Andy McFadden
8e9d5c972e Add a HAVE define for pthread_setname_np().
Due to conflicts with recent WebKit, we need to call it
HAVE_ANDROID_PTHREAD_SETNAME_NP.

https://review.source.android.com/#change,15227 has the original
change, which was reverted after the conflict was found.

Change-Id: I7111960a16505558338756dba91eb50cadb582ff
2010-06-30 22:23:21 -07:00
Andy McFadden
9f6d28dc45 Fix sim-eng build.
Include <stddef.h> to get definition of size_t.  Remove inclusion
of <stdint.h>, which doesn't seem to be needed.

Change-Id: Ib7ff231b5ec4b8c672084801fbb294a50cb7c3d7
2010-06-30 22:20:49 -07:00
Carl Shapiro
a3405403a0 Remove an obsolete compatibility macro.
Change-Id: Ibeae0986b6c68f40e414917405a31cc0ad810fc4
2010-06-30 16:49:08 -07:00
Bruce Beare
e94df975ff DBUS is not fully implemented. Disable it for now
Change-Id: I2286064bffc7e9fa7381aa04d5d20abf11c3aab7
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-06-24 14:35:30 -07:00
Carl Shapiro
3de5dba559 am 2c4676de: am 93b0cb40: Define inline atomic operations for x86 and ARM.
Merge commit '2c4676de62cf8ca7e3759f7f709e29c623495f55'

* commit '2c4676de62cf8ca7e3759f7f709e29c623495f55':
  Define inline atomic operations for x86 and ARM.
2010-06-23 14:30:38 -07:00
Carl Shapiro
2c4676de62 am 93b0cb40: Define inline atomic operations for x86 and ARM.
Merge commit '93b0cb40c18cae594c931677be2b9214420610b7' into gingerbread-plus-aosp

* commit '93b0cb40c18cae594c931677be2b9214420610b7':
  Define inline atomic operations for x86 and ARM.
2010-06-23 14:29:18 -07:00
Carl Shapiro
93b0cb40c1 Define inline atomic operations for x86 and ARM.
This change moves the ARM definitions into GCC extended inline
assembler.  In addition, the same set of x86 definitions are now
shared among all x86 targets.

Change-Id: I6e5aa3a413d0af2acbe5d32994983d35a01fdcb3
2010-06-23 12:51:26 -07:00
The Android Open Source Project
ec219a2ee7 merge from open-source master
Change-Id: I01315984e45ecc0261ea35b5370cbe624cc90cea
2010-06-22 15:30:47 -07:00
Jean-Baptiste Queru
d05d26893d Revert "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"
This reverts commit de50fc1a87.
2010-06-22 15:01:31 -07:00
The Android Open Source Project
6d4113f859 merge from open-source master
Change-Id: Ibc43e8da821400022726b119940708efb052908b
2010-06-22 14:21:21 -07:00
Andy McFadden
424875b818 Merge "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP" 2010-06-22 13:15:28 -07:00
The Android Open Source Project
fbd0827372 am 67e6fcd1: merge from froyo-plus-aosp
Merge commit '67e6fcd19533f54ca37cbe72425f55a40a7f0333'

* commit '67e6fcd19533f54ca37cbe72425f55a40a7f0333':
  added vendor ID for http://www.onthegovideo.com/
  Fix build - cpu-features is ARM-specific
  eliminate a compiler warning: signed/unsigned length
  adb: optimize socket-list-walking code
  adb: remove unneeded assignment of id to zero
  adb: clean up 0 --> NULL for pointers
  - creates proper ifc.h and dhcp.h headers for libnetutils
  Adds support for UBFX to JIT and Disassembler
2010-06-21 11:52:24 -07:00
The Android Open Source Project
67e6fcd195 merge from froyo-plus-aosp
Change-Id: Ie231effb4d9dfd63aa98ec08b269c31ce32aa1c0
2010-06-21 11:50:42 -07:00