Commit graph

430 commits

Author SHA1 Message Date
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
The Android Open Source Project
1adbb607d2 merge from open-source master
Change-Id: I8cfc9c0b699eceef77a905ca2f8cbdb1ab06bf1d
2010-06-15 11:33:39 -07:00
André Goddard Rosa
de50fc1a87 AndroidConfig: define HAVE_PTHREAD_SETNAME_NP
It indicates if the underlying libc provides pthread_setname_np().

Change-Id: Ifef7730970033e834daf2fa710919722d64673e1
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
2010-06-10 15:25:33 -03:00
Szymon Jakubczak
c88e09cb98 - 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-06-09 16:11:09 -04:00
Mike Lockwood
203f102028 libusbhost: Added usb_device_get_unique_id
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-01 22:18:04 -04:00
Andy McFadden
f4dd883389 Fix build.
Missing a #define to map android_atomic_swap to its new name.  Worked
fine in the other branches, because nobody was using android_atomic_swap
in the other branches.

Change-Id: I0e730e9823ac5cd2fee5a3f856ce05d36df5d87e
2010-06-01 09:55:18 -07:00
Andy McFadden
8264358f5b am 8dfa47da: Atomic/SMP update, part 2. 2010-05-30 21:20:45 -07:00
Brian Carlstrom
0e67a03748 Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master 2010-05-27 22:38:57 -07:00
Andy McFadden
8dfa47da8c Atomic/SMP update, part 2.
Added new atomic functions, renamed some old ones.  Some #defines have
been added for backward compatibility.

Merged the pre- and post-ARMv6 implementations into a single file.

Renamed the semi-private __android_membar_full_smp to USE_SCREAMING_CAPS
since that's more appropriate for a macro.

Added lots of comments.

Note Mac OS X primitives have not been tested.

Change-Id: If827260750aeb61ad5c2b760e30658e29dbb26f2
2010-05-27 15:29:38 -07:00
Mike Lockwood
cc6ff1071d Merge "libusbhost: Remove global data to allow multiple instances in the same process." 2010-05-25 05:22:26 -07:00
Mike Lockwood
6ac3aa1574 libusbhost: Remove global data to allow multiple instances in the same process.
Change-Id: I977145f44131ec8b588dd274e0afbc563f3aa4c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-25 08:20:32 -04:00
Andy McFadden
62af8f2583 Atomic/SMP update. [manual merge to dalvik-dev]
Added atomic-inline.h.  Added a platform-specific memory barrier call
there.

Added android_atomic_acquire_cmpxchg() and android_atomic_release_store().
Not tested on Mac OS X or SH.

Added memory barrier calls to linux-x86 atomics.  Mac OS X has barrier
functions already.  sh isn't really SMP-ready.  linux-arm needs work
(to be done in a separate change).

Updated the makefile to make the SMP state visible to the code here.
Note that host binaries are NOT built with SMP enabled; while our hosts
are very likely SMP, it's not worth figuring out e.g. whether it's okay
to use the SSE2 mfence instruction or have to use something else.  We
haven't had barriers enabled in host tools before, so there's probably
no need to stat now.

Removed quasiatomic 64-bit calls (now part of Dalvik).

Change-Id: I42ae05f5db2cc9a5b64ad87f15481e2838371f1d
2010-05-21 12:53:51 -07:00
Andy McFadden
0bc248f983 am ac322da6: Atomic/SMP update. 2010-05-21 12:08:03 -07:00
Andy McFadden
ac322da69e Atomic/SMP update.
Added atomic-inline.h.  Added a platform-specific memory barrier call
there.

Added android_atomic_acquire_cmpxchg() and android_atomic_release_store().
Not tested on Mac OS X or SH.

Added memory barrier calls to linux-x86 atomics.  Mac OS X has barrier
functions already.  sh isn't really SMP-ready.  linux-arm needs work
(to be done in a separate change).

Updated the makefile to make the SMP state visible to the code here.
Note that host binaries are NOT built with SMP enabled; while our hosts
are very likely SMP, it's not worth figuring out e.g. whether it's okay
to use the SSE2 mfence instruction or have to use something else.  We
haven't had barriers enabled in host tools before, so there's probably
no need to stat now.

Removed quasiatomic 64-bit calls (now part of Dalvik).

Change-Id: I49e5e6c8abe70f304cdedb9d7b8e6e65f8925815
2010-05-20 21:40:33 -07:00
Dima Zavin
2bdcf63c4c Merge "Don't define __linux__ if it is already defined by the toolchain. This change does not affect existing behavior at all and makes the file compatible with new toolchain." 2010-05-20 00:31:18 -07:00
Jing Yu
165db2a198 Don't define __linux__ if it is already defined by the toolchain.
This change does not affect existing behavior at all and makes
the file compatible with new toolchain.

Change-Id: Ia33bb9372d1705ec538b414bf69773f093e4543c
2010-05-18 10:55:52 -07:00
The Android Open Source Project
e95aad61d8 merge from open-source master
Change-Id: I414c9479f4f913c777ef18b7ff27e410f49d35b9
2010-05-17 08:54:31 -07:00
Mike Lockwood
93ac1559b8 init: Add support for /dev/bus/usb/ file system and add new unix group AID_USB.
init now creates files in /dev/bus/usb/ for user access to USB devices.
Files are chmod 660 with group AID_USB.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-16 16:04:51 -04:00
Mike Lockwood
5e567cb34b libusbhost: add usb_endpoint_get_device()
Change-Id: Ibe4ce0551faca5d2d8bec0fbd21315a393b9f208
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-12 08:53:49 -04:00
Mike Lockwood
30ff2c70ce libusbhost: new library for Linux USB host support.
Supports access to Linux usbdevfs on both device and Linux host.

Change-Id: Ie88a5193be3ee715792b10b34b3da32ffc4ca57b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-10 11:37:26 -04:00
Mike Lockwood
b717dc85d8 init: Add support for /dev/bus/usb/ file system and add new unix group AID_USB.
init now creates files in /dev/bus/usb/ for user access to USB devices.
Files are chmod 660 with group AID_USB.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-06 13:40:51 -04:00
Brian Carlstrom
7a5c359054 Merge commit 'b419c35c660d7421e18a9efef38eca11966b44c7' into mm 2010-05-02 10:32:42 -07:00
Raphael
b419c35c66 Fix adb, fastboot to compile in Windows SDK under Linux.
(Merged from master Change I3d0e4cab)

Change-Id: Ib3fd566bdaf09d5893a6b0c66168c76c6b0d92eb
2010-04-23 13:07:17 -07:00
Raphael
fab167850d Fix adb, fastboot to compile in Windows SDK under Linux.
Change-Id: I3d0e4cabd65d9de17036901a22ec3277a6d58e64
2010-04-13 15:28:26 -07:00
Brian Carlstrom
a68049a8cc Merge remote branch 'goog/froyo' into mm 2010-04-06 15:31:23 -07:00
Eric Olsen
3555019d78 Add Bluetooth SCO connection blacklist
Change-Id: Ieb11debfea66ec715f48e8069619c2c15acf2035
Signed-off-by: Eric Olsen <eolsen@android.com>
2010-03-18 10:26:59 -07:00
David 'Digit' Turner
1f4d95296a Add 'run-as' command implementation as set-uid program.
Typical usage is 'run-as <package-name> <command>' to run <command>
in the data directory, and the user id, of <package-name> if, and only
if <package-name> is the name of an installed and debuggable application.

This relies on the /data/system/packages.list file generated by the
PackageManager service.

BEWARE: This is intended to be available on production devices !
2010-03-17 11:02:08 -07:00
Wink Saville
bbf1c64527 Change permissions on pppd-ril
On devices that use a pppd for cellular network access, a pppd-ril
process needs to run as root to configure the connection.  Changing
the process to suid-root in the build image is the only known way
to avoid needing to remount the system image at boot to accomplish
the same thing.

Change-Id: I6c778391b8040ee818343e304891e7d341cc729b
2010-03-11 16:22:44 -08:00
San Mehat
a6391f1006 system: libdiskconfig: Add libdiskconfig
Change-Id: Ie7a7b5d8016dec60cdfb17228c3f519789c98564
Signed-off-by: San Mehat <san@google.com>
2010-03-10 15:19:06 -08:00
Dmitry Shmidt
1159d7f800 sysutils: Increase number of command arguments to 16
Change-Id: I0bba579634b334d24645c2af55ab3fab6da03fc6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-03-09 10:46:29 -08:00
Nick Kralevich
3e1aac6c4d Change netcfg permissions to 2750.
Fix bug 2104034.

Change-Id: I30bcc41f33623cadc63693fd54206ccbb1886a5a
2010-03-08 11:36:10 -08:00
Joe Onorato
e2bf2ea4d2 Make logcat print both the main and system buffers by default. Make SLOGx macros work. 2010-03-01 13:03:19 -08:00
San Mehat
1bfb4803ea Merge "system: Add support for getting/setting i/o priorities and include a userspace tool" 2010-02-26 10:03:26 -08:00
Jaikumar Ganesh
eafdd86f4d Update bluetooth data files path. 2010-02-25 19:46:29 -08:00
San Mehat
10d469bff9 system: Add support for getting/setting i/o priorities and include a userspace tool
Signed-off-by: San Mehat <san@google.com>
2010-02-25 14:02:55 -08:00
Mathias Agopian
fa36f2c3b7 fix [2448319] out of bounds array index in fog 2010-02-16 21:01:12 -08:00
Mathias Agopian
5dca849345 remove unused YUV constants 2010-02-16 16:54:53 -08:00
Dima Zavin
8e4f143d45 pixelflinger: add defines for nv12_tiled semi-planar and nv21 semi-planar
Change-Id: Ib56c19f3c5a71730dd7a7a82b10a59c2bb9b5de8
Signed-off-by: Dima Zavin <dima@android.com>
2010-02-16 15:14:26 -08:00
Carl Shapiro
b99a099cad Add a new method to export the extent of the break, akin to return
value of sbrk(0) in UNIX.  In terms of dlmalloc and our proprietary
contiguous mspace class, this is the highest address returned by its
morecore method.
2010-02-16 14:37:43 -08:00
Carl Shapiro
63b396d89c Eliminate the stdint.h include. In retrospect, it seems that the
source of the aforementioned build breakage was then errant include of
this header when stddef.h was intended.  Nothing in this file uses any
of the symbols exported from stdint.h, only symbols from stddef.h.
2010-02-12 15:53:31 -08:00
Carl Shapiro
143b370748 Include stddef.h to make the size_t visible. Resolves a simulator
build break caused by a use of ashmem.h in an environment without
size_t.
2010-02-12 12:45:28 -08:00
Barry Hayes
17128f6e43 Break out create_contiguous_mspace_with_base
This routine allows creating a contiguous mspace from raw mapped memory.
In turn, this will enable preallocation of the 3 heap spaces, which will help
remembered sets and zygote/app checks given pointer values.
2010-02-09 10:23:25 -08:00
Barry Hayes
2dcf1fb9ff Merge "Break out create_contiguous_mspace_with_base This routine allows creating a contiguous mspace from raw mapped memory. In turn, this will enable preallocation of the 3 heap spaces, which will help remembered sets and zygote/app checks given pointer values." 2010-02-08 20:46:41 -08:00
Dima Zavin
157bf769be Remove libjnigraphics. moved to frameworks/base/native
Change-Id: Ieb65ab1428198a82e583059f75661808f350ea2b
Signed-off-by: Dima Zavin <dima@android.com>
2010-02-04 15:32:07 -08:00
Jean-Baptiste Queru
4544a9f7b4 resolved conflicts for merge of c8472186 to master
Change-Id: I41acaaa3a5d6aeb6873472f17db4cfa756b2d23f
2010-01-27 16:12:23 -08:00
Barry Hayes
b17772dcc8 Break out create_contiguous_mspace_with_base
This routine allows creating a contiguous mspace from raw mapped memory.
In turn, this will enable preallocation of the 3 heap spaces, which will help
remembered sets and zygote/app checks given pointer values.
2010-01-26 13:35:20 -08:00
Andy McFadden
cf63d5d00f Implementation of open_memstream().
POSIX seems to have chosen open_memstream() over the BSD variant.  We
want something for Dalvik that will work on both GNU/Linux and Android,
so this is open_memstream() implemented in terms of BSD funopen().

For Windows there's just a stub that calls abort().

I'm putting this in libcutils since it seems inappropriate for bionic
(which provides the BSD alternatives) but isn't Dalvik-specific.
2010-01-25 15:06:03 -08:00
Kenny Root
91a54c11cb Add x86-64 checking for Darwin
Detect byte endianness when compiled in x86-64 mode in Mac OS X 10.6
Snow Leopard environments or above. Allows compilation of host binaries
in these environments without any changes from its default stock
configuration.

This change doesn't require that the binaries be built in 64-bit, but it
does allow this. One could still use "gcc_select 4.0" with the 10.4 SDK
installed on Snow Leopard to compile in 32-bit mode.

Change-Id: I155a531a9bff450dd6c077b5275652731c59a908
2010-01-21 11:27:10 -06:00
San Mehat
d674413ff4 sysutils: Add dump() to NetlinkEvent
Signed-off-by: San Mehat <san@google.com>
2009-12-24 07:20:36 -08:00
Mike Reed
83782909a3 am 31b5d4b9: am 45e5ca1c: Merge change I0deb0117 into eclair-mr2
Merge commit '31b5d4b98e8079a1d97aff8dc3e0824b95d1e294'

* commit '31b5d4b98e8079a1d97aff8dc3e0824b95d1e294':
  NDK header for accessing pixels of a java bitmap
2009-12-07 18:30:48 -08:00
Mike Reed
31b5d4b98e am 45e5ca1c: Merge change I0deb0117 into eclair-mr2
Merge commit '45e5ca1c7047b20d36bd31b30b7d2a4786baab0f' into eclair-mr2-plus-aosp

* commit '45e5ca1c7047b20d36bd31b30b7d2a4786baab0f':
  NDK header for accessing pixels of a java bitmap
2009-12-07 06:18:51 -08:00
Mike Reed
22078f2c05 NDK header for accessing pixels of a java bitmap 2009-12-04 09:40:42 -05:00
Dan Bornstein
303254eb67 Define HAVE_SYS_SENDFILE_H.
Platforms differ on whether sys/sendfile.h or sys/socket.h is where to
find the declaration for sendfile().

Change-Id: Ib6e882534b7dc605d30aefed55732dc1ee2b6772
2009-11-17 14:34:12 -08:00
Jean-Baptiste Queru
333a80cf9f merge from eclair 2009-11-15 12:07:12 -08:00
Jean-Baptiste Queru
4b29fe640a eclair snapshot 2009-11-12 18:46:23 -08:00
Dan Bornstein
43ba23f308 Define HAVE_SYS_SENDFILE_H.
Platforms differ on whether sys/sendfile.h or sys/socket.h is where to
find the declaration for sendfile().

Change-Id: Ib6e882534b7dc605d30aefed55732dc1ee2b6772
2009-10-30 17:15:13 -07:00
San Mehat
5f64815d8a am 38b2ddc4: am 17bfbd3c: am c0dfca7a: cutils: Add support for reading a processes scheduler policy
Merge commit '38b2ddc4a7cf1c47397af118a6d466d45f59da04'

* commit '38b2ddc4a7cf1c47397af118a6d466d45f59da04':
  cutils: Add support for reading a processes scheduler policy
2009-10-28 23:50:51 -07:00
San Mehat
38b2ddc4a7 am 17bfbd3c: am c0dfca7a: cutils: Add support for reading a processes scheduler policy
Merge commit '17bfbd3ccbb798aa4068cd59150ce712660a62a4' into eclair-mr2-plus-aosp

* commit '17bfbd3ccbb798aa4068cd59150ce712660a62a4':
  cutils: Add support for reading a processes scheduler policy
2009-10-28 11:52:39 -07:00
San Mehat
c0dfca7ae1 cutils: Add support for reading a processes scheduler policy
Signed-off-by: San Mehat <san@google.com>
2009-10-27 12:27:42 -07:00
Jean-Baptiste Queru
573463c31c am 62f39c10: merge from open-source master
Merge commit '62f39c105af8789fd9308fa6a5b91f0963a7c59b'

* commit '62f39c105af8789fd9308fa6a5b91f0963a7c59b':
  adb: Add "adb disconnect" command for disconnecting TCP/IP devices.
  Add support for Acer devices
  adb: Add USB Vendor IDs for LG and Huawei
  Add NOTICE file and license tag for adb
  adb: Clean up argument passing for create_service_thread()
  Revert "adb: Another attempted workaround for the adb disconnect problem."
  libsysutils: Fix some bugs in NetlinkListener and NetlinkEvent
  added SuperH atomic support to libcutils
2009-10-14 16:12:21 -07:00
Jean-Baptiste Queru
b029e92428 merge from open-source master 2009-10-14 08:19:24 -07:00
Jean-Baptiste Queru
7b5f63f8ab am f184b94a: am b084929f: Make AudioPara4 world-readable
Merge commit 'f184b94ad32c50ccf5bb1792a963551b5841e772'

* commit 'f184b94ad32c50ccf5bb1792a963551b5841e772':
  Make AudioPara4 world-readable
2009-10-12 11:08:19 -07:00
San Mehat
ebfe3db361 libsysutils: Fix some bugs in NetlinkListener and NetlinkEvent
Signed-off-by: San Mehat <san@android.com>
2009-10-10 17:39:10 -07:00
Jean-Baptiste Queru
f184b94ad3 am b084929f: Make AudioPara4 world-readable
Merge commit 'b084929f5dd57b878f6debe6567a6c8888061fa0' into eclair

* commit 'b084929f5dd57b878f6debe6567a6c8888061fa0':
  Make AudioPara4 world-readable
2009-10-04 15:05:49 -07:00
Elliott Hughes
67a2ea3dea Now all the callers are gone, remove adb_networking.*.
(This is the final patch removing adb networking.)

Bug: 1122968
2009-10-02 13:29:47 -07:00
Jean-Baptiste Queru
b084929f5d Make AudioPara4 world-readable
This way adb pull can get to it on user builds.

BUG=1869158
2009-10-02 11:25:58 -07:00
Raphael
0384a98d6f Disable sched_policy under Windows.
This introduces a new HAVE_SCHED_H arch define, which is used
to prevent from building sched_policy.c during the Windows SDK.

Change-Id: I3667857a4ae7d6baaf1efd1cd187a5baf91419d8
2009-09-15 17:10:17 -07:00
San Mehat
493dad9663 libcutils: Add abstracted support for setting scheduler policies
Also changes the background policy to use SCHED_BATCH. IDLEPRIO
can cause 100% starvation.

Signed-off-by: San Mehat <san@google.com>
2009-09-12 10:48:03 -07:00
Jack Palevich
d5315573d7 Move ARM disassembler out of libacc and into the acc command-line tool. 2009-09-09 13:19:34 -07:00
Doug Zongker
90b06ac786 only use faster SHA-1 code on machines with good libc
Macs don't have byteswap.h or endian.h.  Change conditionals to only
use the faster SHA-1 code on little-endian machines with byteswap.h.
2009-08-21 11:08:25 -07:00
Doug Zongker
a6de77de17 add optimized SHA1 algorithm
This optimized implementation of the SHA1 algorithm is about 28%
faster than the old one (on sapphire hardware) but assumes
little-endianness.  Add it, but continue using the old implementation
on big-endian hardware.
2009-08-17 15:38:31 -07:00
Andy McFadden
656a816298 Added defines for <stdint.h> and <stdbool.h>.
This adds HAVE_STDINT_H and HAVE_STDBOOL_H to the configuration.  We've
been using HAVE_STDINT_H for a while but just never bothered to define
it, and we're about to start using HAVE_STDBOOL_H.

I enabled them for the linux and darwin targets, and left it undefined
for freebsd/windows.
2009-08-05 14:14:32 -07:00
Shin-ichiro KAWASAKI
c6af9114fc added SuperH atomic support to libcutils 2009-08-04 19:14:22 +09:00
Jean-Baptiste Queru
96d58f4f52 Merge korg/donut into korg/master 2009-07-25 18:07:41 -07:00
Jack Palevich
8c246a9dc2 Add accRegisterSymbolCallback API to control external symbol linkage.
Until now dlsym was used to lookup external symbols. Now you can
register your own function to be called when an undefined symbol is
used.
2009-07-14 21:14:10 -07:00
San Mehat
c4a895b709 nexus: Rollup update for nexus
nexus: Change field separator from : to ' '

Signed-off-by: San Mehat <san@google.com>

nexus: Add some prototypes for stuff to come

Signed-off-by: San Mehat <san@google.com>

nexus: Add some TODOs

Signed-off-by: San Mehat <san@google.com>

libsysutils: Put a proper token parser into the FrameworkListener which
supports minimal \ escapes and quotes

Signed-off-by: San Mehat <san@google.com>

nexus: Fix a lot of bugs

Signed-off-by: San Mehat <san@google.com>

libsysutils: Remove some debugging
Signed-off-by: San Mehat <san@google.com>

nexus: Send broadcasts for supplicant state changes

Signed-off-by: San Mehat <san@google.com>

nexus: Plumb DHCP listener state changes to NetworkManager

Signed-off-by: San Mehat <san@google.com>

nexus: Make the SupplicantState strings more parsable

Signed-off-by: San Mehat <san@google.com>

nexus: Broadcast a message when dhcp state changes.

Signed-off-by: San Mehat <san@google.com>

nexus: Add a few new response codes

Signed-off-by: San Mehat <san@google.com>

nexus: Rename ErrorCode -> ResponseCode

Signed-off-by: San Mehat <san@google.com>

nexus: Add DHCP event broadcasting. Also adds the framework for
tracking supplicant 'searching-for-AP' state

Signed-off-by: San Mehat <san@google.com>

nexus: REmove WifiScanner

Signed-off-by: San Mehat <san@google.com>

nexus: Change the way scanning works. scanmode can now be selected
independantly of triggering a scan. Also adds rxfilter support

Signed-off-by: San Mehat <san@google.com>

nexus: Add support for configuring bluetooth coexistence scanning and modes

Signed-off-by: San Mehat <san@google.com>

nexus: use case insensitive match for property names

Signed-off-by: San Mehat <san@google.com>

nexus: Rollup of a bunch of stuff:
    - 'list' command now takes an argument to match against
    - InterfaceConfig has been moved into the Controller base (for now)
    - DhcpClient now has some rudimentry locking
    - process 'ADDRINFO' messages from dhcpcd
    - Drop tertiary dns

Signed-off-by: San Mehat <san@google.com>

nexus: Clean up some of the supplicant variable parsing and add 'wifi.current'

Signed-off-by: San Mehat <san@google.com>

nexus: Add driver-stop/start, initial suspend support

Signed-off-by: San Mehat <san@google.com>

nexus: Add Controller suspend/resume callbacks, as well as locking

Signed-off-by: San Mehat <san@google.com>

nexus: Make ARP probing configurable for DhcpClient

Signed-off-by: San Mehat <san@google.com>

nexus: Add linkspeed / rssi retrieval

Signed-off-by: San Mehat <san@google.com>

nexus: Add WifiStatusPoller to track RSSI/linkspeed when associated

Signed-off-by: San Mehat <san@google.com>

nexus: Disable some debugging and add 'wifi.netcount' property

Signed-off-by: San Mehat <san@google.com>

nexus: Replace the hackish property system with something more flexible with namespaces

Signed-off-by: San Mehat <san@google.com>

libsysutils: Fix a few bugs in SocketListener

Signed-off-by: San Mehat <san@google.com>

nexus: PropertyManager: Add array support

Signed-off-by: San Mehat <san@google.com>

nexus: Clean up properties
Signed-off-by: San Mehat <san@google.com>

nexus: WifiController: Change name of 'CurrentNetwork' property

Signed-off-by: San Mehat <san@google.com>
2009-07-10 14:23:51 -07:00
Mathias Agopian
bfa833c0b7 Merge commit 'goog/master' into merge_master 2009-07-01 18:33:22 -07:00
repo sync
60a4cd5e34 resolved conflicts for merge of abb08550 to master 2009-06-30 11:09:06 +08:00
Chia-chi Yeh
88dc657d50 Add device, property, directory, and file permissions for VPN. 2009-06-19 15:53:28 +08:00
Mathias Agopian
a10fd8df95 Merge commit 'goog/master' into merge_master 2009-06-16 12:39:01 -07:00
Android (Google) Code Review
338df9da54 am 2d0a6ca2: Merge change 4227 into donut
Merge commit '2d0a6ca27c6f75eb0ec881fe4ad0b4f478d941c0'

* commit '2d0a6ca27c6f75eb0ec881fe4ad0b4f478d941c0':
  nexctl: Refactor so Nexus can be tested from scripts easily.
  libsysutils: Move to a null terminated string protocol using space as a field separator.
2009-06-15 14:41:33 -07:00
San Mehat
c73a3a5771 libsysutils: Move to a null terminated string protocol using space as a field separator.
Also removes some debugging

Signed-off-by: San Mehat <san@google.com>
2009-06-15 14:06:03 -07:00
Jaikumar Ganesh
1d36696821 Bluez4 changes
Rename hcid to bluetoothd and change permissions.
2009-06-09 17:21:38 -07:00
Chung-yih Wang
50900772ed am 1f75d709: Add VPN and Keystore services and data directories.
Merge commit '1f75d709c10f49d2e2390b888e766bcfd17da860'

* commit '1f75d709c10f49d2e2390b888e766bcfd17da860':
  Add VPN and Keystore services and data directories.
2009-06-08 20:01:48 -07:00
Chung-yih Wang
1f75d709c1 Add VPN and Keystore services and data directories.
-- changed the default mode to 0770 for keystore with the new user 'keystore'.
-- add the keystore service providing the basic key lookup/install/remove, but
  only keystore user can access the key content.
2009-06-09 10:49:39 +08:00
Mathias Agopian
ce51b3b55f break dependency on utils/Endian.h 2009-06-07 02:13:02 -07:00
Mathias Agopian
af20325a45 Merge commit 'goog/master' into merge_master 2009-06-05 15:45:43 -07:00
Jack Palevich
eedf9d2083 Add support for #pragma foo(bar)
Report unsupported/unknown preprocessor directives.
Report line number of error rather than character offset.
2009-06-04 16:38:35 -07:00
Android (Google) Code Review
baf83e0250 am 3f627205: Merge change 2875 into donut
Merge commit '3f6272056275a00c30c07394d63bbe81cc9c5eba'

* commit '3f6272056275a00c30c07394d63bbe81cc9c5eba':
  Added ashmem_get_size_region() function.
2009-06-02 05:30:08 -07:00
Bjorn Bringert
7be52b1a0e Added ashmem_get_size_region() function.
This is needed by the MemoryFile changes in
https://android-git.corp.google.com/g/2714
where it is used to find out whether a file descriptor
refers to an ashmem region.
2009-06-02 00:55:30 +01:00
Mathias Agopian
e26cbeacaf Merge commit 'goog/master' into merge_master 2009-05-31 01:14:49 -07:00
Nick Pelly
260f48a917 Helper to perform abortable blocking operations on a socket:
asocket_connect()
   asocket_accept()
   asocket_read()
   asocket_write()
 These calls are similar to the regular syscalls, but can be aborted with:
   asocket_abort()

Calling close() on a regular POSIX socket does not abort blocked syscalls on
that socket in other threads.

After calling asocket_abort() the socket cannot be reused.

Call asocket_destory() *after* all threads have finished with the socket to
finish closing the socket and free the asocket structure.

The helper is implemented by setting the socket non-blocking to initiate
syscalls connect(), accept(), read(), write(), then using a blocking poll()
on both the primary socket and a local pipe. This makes the poll() abortable
by writing a byte to the local pipe in asocket_abort().

asocket_create() sets the fd to non-blocking mode. It must not be changed to
blocking mode.

Using asocket will triple the number of file descriptors required per
socket, due to the local pipe. It may be possible to use a global pipe per
process rather than per socket, but we have not been able to come up with a
race-free implementation yet.

All functions except asocket_init() and asocket_destroy() are thread safe.
2009-05-29 16:10:16 -07:00
David 'Digit' Turner
730c8d7c03 am ebefc48e: Expose the stable/frozen log-related definitions of <cutils/logd.h> into a new header: <android/log.h>
Merge commit 'ebefc48e61a7d5cf2a3228e6c8729feeeb42d1b4'

* commit 'ebefc48e61a7d5cf2a3228e6c8729feeeb42d1b4':
  Expose the stable/frozen log-related definitions of <cutils/logd.h> into a new header: <android/log.h>
2009-05-29 06:03:27 -07:00
David 'Digit' Turner
ebefc48e61 Expose the stable/frozen log-related definitions of <cutils/logd.h> into a new header: <android/log.h>
This is in order to expose the correponding functions in the 1.5 Native Development Kit, to allow
applicative native code to send messages to the log.
2009-05-29 14:45:04 +02:00
Mathias Agopian
1edfd382ba Merge commit 'goog/master' into merge_master 2009-05-27 14:25:54 -07:00
Jack Palevich
1cdef20774 Convert libacc into a shared library.
Document internal CodeGenerator interface

Move license to a separate license file.

Define a public API for calling libacc.

Update the "acc" test program to use the public API.
Move "main.cpp" and test scripts into the tests subdirectory.
Move test data from tests to tests/data
Remove stale test data.
2009-05-22 12:09:55 -07:00
Mathias Agopian
67667115c5 merge master to master_gl 2009-05-22 01:08:01 -07:00
Mathias Agopian
d2362c2b20 am fee77ec0: don\'t use cdefs.h as it breaks the windows build.
Merge commit 'fee77ec093f78c1bb0ce85aa16d7ee8e8fa06f8a'

* commit 'fee77ec093f78c1bb0ce85aa16d7ee8e8fa06f8a':
  don't use cdefs.h as it breaks the windows build.
2009-05-21 13:11:11 -07:00
Mathias Agopian
fee77ec093 don't use cdefs.h as it breaks the windows build. 2009-05-21 13:08:39 -07:00
San Mehat
e7ada79392 am db017545: libsysutils: const correctness fixes + remove some debugging
Merge commit 'db017545796747115b8797f03e662b0f398a7c7b'

* commit 'db017545796747115b8797f03e662b0f398a7c7b':
  libsysutils: const correctness fixes + remove some debugging
2009-05-20 17:36:18 -07:00
Mathias Agopian
3fc51ba17d move native_handle stuff from master_gl 2009-05-20 17:22:13 -07:00
San Mehat
db01754579 libsysutils: const correctness fixes + remove some debugging
Signed-off-by: San Mehat <san@google.com>
2009-05-20 17:16:05 -07:00
Nick Pelly
92a7541bce Helper to perform abortable blocking operations on a socket:
asocket_connect()
   asocket_accept()
   asocket_read()
   asocket_write()
 These calls are similar to the regular syscalls, but can be aborted with:
   asocket_abort()

Calling close() on a regular POSIX socket does not abort blocked syscalls on
that socket in other threads.

After calling asocket_abort() the socket cannot be reused.

Call asocket_destory() *after* all threads have finished with the socket to
finish closing the socket and free the asocket structure.

The helper is implemented by setting the socket non-blocking to initiate
syscalls connect(), accept(), read(), write(), then using a blocking poll()
on both the primary socket and a local pipe. This makes the poll() abortable
by writing a byte to the local pipe in asocket_abort().

asocket_create() sets the fd to non-blocking mode. It must not be changed to
blocking mode.

Using asocket will triple the number of file descriptors required per
socket, due to the local pipe. It may be possible to use a global pipe per
process rather than per socket, but we have not been able to come up with a
race-free implementation yet.

All functions except asocket_init() and asocket_destroy() are thread safe.
2009-05-20 15:20:30 -07:00
Mathias Agopian
8f13782e7b move native_handle stuff from master_gl 2009-05-20 14:51:48 -07:00
Android (Google) Code Review
85246fee85 am b48acb0e: Merge change 1795 into donut
Merge commit 'b48acb0ebdc64d2f44cf869ac69aebbba2de192d'

* commit 'b48acb0ebdc64d2f44cf869ac69aebbba2de192d':
  Make /system/xbin/tcpdump setuid root.
2009-05-18 23:56:52 -07:00
Android (Google) Code Review
b48acb0ebd Merge change 1795 into donut
* changes:
  Make /system/xbin/tcpdump setuid root.
2009-05-18 16:35:27 -07:00
David 'Digit' Turner
34c22c5ba9 am 414ff7d9: Move fdevent from libcutils into adb directory. ADB is the only client of this API, and I intend to modify it extensively to clean its codebase soon.
Merge commit '414ff7d98ac8d7610a26206335954ad15f43f3ac'

* commit '414ff7d98ac8d7610a26206335954ad15f43f3ac':
  Move fdevent from libcutils into adb directory. ADB is the only client of this API, and I intend to modify it extensively to clean its codebase soon.
2009-05-18 08:37:02 -07:00
David 'Digit' Turner
414ff7d98a Move fdevent from libcutils into adb directory. ADB is the only client of this API, and I intend to modify it extensively to clean its codebase soon. 2009-05-18 17:07:46 +02:00
San Mehat
d99d1445fd resolved conflicts w/ b415390e74 merge 2009-05-15 13:02:13 -07:00
Dan Egnor
328a4fb535 Make /system/xbin/tcpdump setuid root. 2009-05-15 12:57:58 -07:00
Android (Google) Code Review
fc1ceb63d5 am dee68663: Merge change 1693 into donut
Merge commit 'dee68663724c7117a51eb3af3d9390e00af832f5'

* commit 'dee68663724c7117a51eb3af3d9390e00af832f5':
  libsysutils: Introduce 'ServiceManager', for starting/stopping init services
2009-05-15 11:51:34 -07:00
Android (Google) Code Review
b415390e74 Merge change 1778 into donut
* changes:
  init: Create new 'vpn' user/group and set owner of '/dev/tun' to it.
2009-05-15 10:47:22 -07:00
Android (Google) Code Review
dee6866372 Merge change 1693 into donut
* changes:
  libsysutils: Introduce 'ServiceManager', for starting/stopping init services
2009-05-15 10:44:06 -07:00
San Mehat
4a6f2321e7 init: Create new 'vpn' user/group and set owner of '/dev/tun' to it.
Signed-off-by: San Mehat <san@google.com>
2009-05-15 10:40:29 -07:00
San Mehat
c41d1c8074 libsysutils: Introduce 'ServiceManager', for starting/stopping init services
Signed-off-by: San Mehat <san@google.com>
2009-05-15 10:40:23 -07:00
Eric Fischer
035b427c70 am 722a5c04: Add support for "standalone months" to tztime\'s strftime().
Merge commit '722a5c0462f38827f4097065bfc3826b9e0e9fb4'

* commit '722a5c0462f38827f4097065bfc3826b9e0e9fb4':
  Add support for "standalone months" to tztime's strftime().
2009-05-15 10:15:18 -07:00
Mathias Agopian
b862ab74c9 Merge commit 'goog/master' into merge_master 2009-05-14 22:32:16 -07:00
Eric Fischer
722a5c0462 Add support for "standalone months" to tztime's strftime().
The idea here is that some languages need a different form of the month
name in constructions like "January 2" than in "January 2009", since the
one in the "January 2" case really means "of January."  So with this change,
a format string of "%-B" will use the standalone month, while "%B" will
continue to use the format month.
2009-05-14 17:22:20 -07:00
San Mehat
294449dd6e am d768066: libsysutils: Tweak SocketListener and friends
Merge commit 'd768066ef54270a0d3ccfccd50ae8238db5a2cdd'

* commit 'd768066ef54270a0d3ccfccd50ae8238db5a2cdd':
  libsysutils: Tweak SocketListener and friends
2009-05-12 14:15:22 -07:00
San Mehat
d768066ef5 libsysutils: Tweak SocketListener and friends
Signed-off-by: San Mehat <san@google.com>
2009-05-12 14:02:32 -07:00
Android (Google) Code Review
e1156972e1 am c73d9e4: Merge changes 1341,1342 into donut
Merge commit 'c73d9e43a0c98a87222ef0c8749d6abba06c7778'

* commit 'c73d9e43a0c98a87222ef0c8749d6abba06c7778':
  libsysutils: Add multiple client support and fix some bugs
  nexus: Implement wifi scanner and fix a lot of bugs
2009-05-11 09:03:29 -07:00
San Mehat
fa644ffe94 libsysutils: Add multiple client support and fix some bugs 2009-05-10 09:26:42 -07:00
Mathias Agopian
ab15ac0881 Merge commit 'goog/master' into merge_master 2009-05-07 17:46:47 -07:00
Android (Google) Code Review
9399844278 am 747baad: Merge change 1092 into donut
Merge commit '747baadddb37737b0ecf83f6147a5e3252a34b12'

* commit '747baadddb37737b0ecf83f6147a5e3252a34b12':
  libsysutils: New C++ system convenience library
2009-05-07 07:06:55 -07:00
San Mehat
168415b822 libsysutils: New C++ system convenience library
This library contains re-usable classes for common
    system level daemons. Initial consumers of this library
    are 'nexus' and 'vold2'

Signed-off-by: San Mehat <san@google.com>
2009-05-06 15:12:02 -07:00
Mathias Agopian
8cd81ab3f2 get rid of native_handle_{dup|copy} since they were not used any longer 2009-05-02 00:06:41 -07:00
Mathias Agopian
f313711450 Merge commit 'goog/master' into merge_master 2009-04-30 14:08:52 -07:00
Android (Google) Code Review
9fe0f0d14d am 6181f70: Merge change 484 into donut
Merge commit '6181f70bd40fd020661841923e725df75a3a2793'

* commit '6181f70bd40fd020661841923e725df75a3a2793':
  filesystem: Add new group 'sdcard_rw' for restricting sd card write access
2009-04-29 15:17:35 -07:00
San Mehat
6e1f21584f filesystem: Add new group 'sdcard_rw' for restricting sd card write access
Signed-off-by: San Mehat <san@google.com>
2009-04-23 09:15:08 -07:00
Mathias Agopian
cccf42773a fix copyright notice 2009-04-17 15:16:02 -07:00
Mathias Agopian
b5fbd75f6c add a compiler.h to libcutils. it's intended to define compiler-dependent macros.
currently, it defines CC_LIKELY and CC_UNLIKELY.
2009-04-17 14:43:36 -07:00
Mathias Agopian
61d8e487e6 Merge commit 'goog/master' into master_gl 2009-04-10 14:26:14 -07:00
Mathias Agopian
1d3faaf72f Integrate from //sandbox/mathias/donut/...@145728
SurfaceFlinger rework for new EGL driver model support.
2009-04-10 14:24:31 -07:00
The Android Open Source Project
455a6dffd4 Merge branch 'open_source' into google_internal 2009-03-29 08:55:26 -07:00
The Android Open Source Project
b1487e4c58 auto import //branches/master/...@140412 2009-03-18 22:20:28 -07:00
Jean-Baptiste Queru
83b65486be Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
	init/devices.c
	libpixelflinger/Android.mk
2009-03-18 09:29:29 -07:00
The Android Open Source Project
dd7bc3319d auto import from //depot/cupcake/@135843 2009-03-03 19:32:55 -08:00
The Android Open Source Project
e54eebbf1a auto import from //depot/cupcake/@135843 2009-03-03 18:29:04 -08:00
The Android Open Source Project
1b8e5a6b14 auto import from //branches/cupcake/...@131421 2009-02-13 12:57:54 -08:00
The Android Open Source Project
13f797da7f auto import from //branches/cupcake/...@130745 2009-02-10 15:44:07 -08:00
The Android Open Source Project
1b6345894e Merge branch 'cupcake' 2009-01-20 14:05:44 -08:00
The Android Open Source Project
8ac3a13816 auto import from //branches/cupcake/...@127101 2009-01-20 14:04:01 -08:00
The Android Open Source Project
038862e152 Merge branch 'cupcake' 2009-01-09 18:04:23 -08:00
The Android Open Source Project
5ae090ed94 auto import from //branches/cupcake/...@125939 2009-01-09 17:51:25 -08:00
Jean-Baptiste Queru
77d0c65b95 Merge commit 'remotes/korg/cupcake'
Conflicts:
	init/devices.c
	logwrapper/logwrapper.c
	mountd/AutoMount.c
2008-12-19 08:15:15 -08:00
The Android Open Source Project
35237d1358 Code drop from //branches/cupcake/...@124589 2008-12-17 18:08:08 -08:00
Alexey Tarasov
abb9638e36 1. added macro definitions to AndroidConfig.h
2. removed unnecessary include of <alloca.h>
2008-11-07 11:44:22 +10:00
Alexey Tarasov
57401dc849 Added AndroidConfig.h for FreeBSD 2008-11-03 03:19:27 +10:00
The Android Open Source Project
4f6e8d7a00 Initial Contribution 2008-10-21 07:00:00 -07:00