Commit graph

391 commits

Author SHA1 Message Date
Jeff Brown
331667ffc8 Use #define value of 1 to indicate presence of headers.
strace tests the value of HAVE_TERMIO_H and HAVE_SYS_UIO_H using

Change-Id: If899845503547410cf17d005733d1c0c6741e939
2012-04-28 11:12:53 -07:00
Jean-Baptiste Queru
307d9cfc16 Merge from AOSP
Change-Id: Iedb6ea4e1cf66edda8d91e3d432cb010e697ed44
2012-04-24 17:38:54 -07:00
Jean-Baptiste Queru
980a59b45d Forward compatibility
Change-Id: I51a5eb98fb3fa3e09f2eb75de128068572081046
2012-04-24 16:45:38 -07:00
Eric Laurent
e4e3f20f57 type definition for future compat.
Change-Id: Ifaba69d556ecc2a881293a2217515ea7dc5bb1a9
2012-04-18 18:07:05 -07:00
Steve Block
2ac29d0250 Rename LOG_ASSERT to ALOG_ASSERT
Change-Id: Iff15ac5e7ab226d437c08d23f18fd54e6793e65c
2012-01-17 17:56:20 +00:00
Steve Block
8aeb6e244a Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I52fce957db06c281e2618daa4e2ecba19974f2eb
2012-01-17 17:56:20 +00:00
Steve Block
4f07a1f826 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I6c2a1d56dadb7e5c69e478f4d8c7d9f2127db2af
2012-01-17 17:56:20 +00:00
Steve Block
4163b45949 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I929ea38bc6fe6efeefa7870c8e7e4c19cd0029b3
2012-01-17 17:56:19 +00:00
Steve Block
9786ec417f Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: Ia0476219b71ece949595515ee07ea072ed349d73
2012-01-17 17:56:19 +00:00
Steve Block
66b68757f6 Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: Ia9a357dec5ad12eea93fd03401a3b02b38e4e94f
2012-01-17 17:56:18 +00:00
Steve Block
61fbcbe976 Rename (IF_)LOG() to (IF_)ALOG()
Change-Id: Ifb82ae2c242becaffa3cf19e548b526e6616c2c7
2012-01-17 17:56:18 +00:00
Steve Block
a9b84a7e0b Add ALOG version of LOG_ASSERT
This is now required by some projects.

Change-Id: If4015c6a9f2391b205d2886bcf7f6e51f371ce08
2012-01-09 22:50:36 +00:00
Steve Block
e7e7fac974 Add ALOG versions of LOGD, LOGI, LOGW and LOGE
These are now required by some projects.

Change-Id: I0d51c950178504474d803620a6cd1c9f084804b5
2011-12-29 11:58:24 +00:00
Jesse Hall
3bc5e45280 am 7cd3e0a3: Document ANativeWindow\'s buffer refcounting
* commit '7cd3e0a3a2f9b104cd6c04f699ae62c4577787e2':
  Document ANativeWindow's buffer refcounting
2011-12-13 12:23:14 -08:00
Jesse Hall
7cd3e0a3a2 Document ANativeWindow's buffer refcounting
Change-Id: I5454e90afd1a1b7d4a75c503f8dca712dba33790
2011-12-12 16:54:14 -08:00
Nick Pelly
3d547e0dda am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit 'f9c1fcc505d59fd87392e6af7341b1737f186081':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
2011-11-21 16:05:27 -08:00
Nick Pelly
097b4ed410 Replace vendor specific NfcGoogle.apk with generic Nfc.apk
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I5e178b469e5210cd231ba5f4ea57aa666b3d8893
2011-11-21 14:55:59 -08:00
Steve Block
67b11cba5b am 25a89e77: Fix build
* commit '25a89e771aae292193244852166564e83e36232b':
  Fix build
2011-11-15 11:10:09 -08:00
Steve Block
25a89e771a Fix build
Change-Id: Icbe57024e6018600d47a68132f53f15d7602dc92
2011-11-15 10:58:49 -08:00
Wu-cheng Li
5babfad445 am baad2843: Update camera documentation about face detection.
* commit 'baad2843a1af443aa251be510c4476159d064d20':
  Update camera documentation about face detection.
2011-10-12 21:14:15 -07:00
Wu-cheng Li
baad2843a1 Update camera documentation about face detection.
bug:5169599
Change-Id: I5280137cee5401fadec36cae732ecb78a2d44dc3
2011-10-13 12:07:05 +08:00
Romain Guy
6bcd4d3e73 Add ANDROID_API macro to export symbols
Change-Id: I55294713c8dd1ac32d6013d084f1bb502fc3572f
2011-10-12 13:45:59 -07:00
Wu-cheng Li
8d43cb6edb Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview.
bug:5422679
Change-Id: Ia4a09328bd9e1d36af680be4d065bc08cf0dec0f
2011-10-07 17:19:18 +08:00
Jeffrey Tinker
134959a621 Merge "Create drmrpc group for security services" 2011-10-04 10:53:47 -07:00
Jeffrey Tinker
7005c03754 Create drmrpc group for security services
Bug 4598045

Change-Id: I5550203927146fd6864408b3ac2f5e6f5d2b1d77
2011-09-30 12:40:25 -07:00
David Turner
9892aa5d04 Merge "Fix SocketListener socket leak issue." 2011-09-29 18:44:18 -07:00
Lorenzo Colitti
15c8c3ebf0 Merge "Support adding, deleting, and clearing IPv6 addrs." 2011-09-29 09:04:23 -07:00
Xianzhu Wang
4520246d35 Fix SocketListener socket leak issue.
The problem was: if a socket is shared between SocketListener and another
thread, only if the last reference is removed by SocketListener can the socket
be closed, otherwise the socket will leak. This sometimes happens in netd's
dnsproxyd.

This change let the SocketClient own the socket and close the socket when
the SocketClient is destructed.

Change-Id: I2865fbfe9ee4d8b3e43d7e02919dbb2d261f70de
2011-09-29 13:42:32 +08:00
Lorenzo Colitti
47ddb515b7 Support adding, deleting, and clearing IPv6 addrs.
- Provide a function to add and delete IPv4/IPv6 addresses
  using netlink.
- Provide a function that clears all IP addresses on an
  interface that can be used by netd.

Also, a couple of cleanups:

- Update the header file to match reality, and include the
  header file in the implementation. Also fix a caller that
  has an incorrect method signature.
- Fix whitespace in Android.mk.

Change-Id: Ifba9d60cdfffb0b7e5c3b9c6ab328f5f77d259c4
2011-09-28 17:12:13 -07:00
Mathias Agopian
918638c775 enable HAVE_DLADDR, since... we have it
Change-Id: I02baa1f7d3383e93a43fa04de1d39f7398e971bc
2011-09-28 12:17:00 -07:00
JP Abgrall
243123fb41 libcutils: qtaguid: Support new functions, add tag resource tracking.
* Add support for
  deleteTagData(tag, uid)
  setCounterSet(counterSetNum, uid)
  setPacifier(on)

* Add resource tracking
(If only kernel process termination had a hook)
Because the xt_qtaguid netfilter module needs to keep track of
tagged sockets, it needs a way to know when the process owning
the socket has died.
Normally the app will untag the sockets. But not on crash.
So the process opens the qtaguid misc dev, which is closed on crash,
at which point the xt_qtaguid can force-untag the processes sockets,
and thus allowing their refcount to go down and release them.

* Add pacifier support
 Add function to enable/disable pacification of the xt_qtaguid
 kernel module. (mostly for debugging)

Change-Id: I7f2228e65208046dd37ec1c7407ee307d5ba9b99
2011-09-14 15:00:40 -07:00
Dima Zavin
f48b23688c core: Add a standalone charger UI binary
This can be launched from an 'on charger' section in init, which
is processed if androidboot.mode=charger is supplied on kernel
command line.

This is a standalone binary that has a simple "user interface"
and allows the standard production kernel to run while charging.
This removes the burden from the bootloader to get low-power mode
working.

Currently, the device will "power-on" (i.e. reboot) into normal
mode if the power key is pressed for X seconds, and will also
power down the device if the usb/ac cable is removed for Y seconds.

Change-Id: I780594b99211cb09de7f8519a69c5962eb91348a
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-04 15:41:36 -07:00
Dima Zavin
da04c52ab1 init/cutils: move list utility code to cutils from init
Change-Id: I357ceee813700297d8343159f22a07659e768d41
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-02 12:11:18 -07:00
Dima Zavin
8f91282ebe init/cutils: move kernel logging interface to libcutils from init
Change-Id: Ia0f91b1fcd6cae69d76bf3dd841340958db938a8
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-02 12:11:17 -07:00
Dima Zavin
2d55e02d0f libcutils/init: move uevent socket opening code to libcutils
Change-Id: I90adf78c0eb6185505f2bf7b62e96e25ab918345
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-02 12:11:17 -07:00
Mathias Agopian
c9b06951e0 another attempt at fixing the SDK build.
Change-Id: I2b96cf7d046b694b232f0699257e4e0608fda660
2011-08-11 22:35:31 -07:00
Mathias Agopian
7934d18aa6 really fix the SDK build and fix THE build
Change-Id: I994cccf01bcafedc9ea11648eafc20300c58878b
2011-08-11 19:26:39 -07:00
Mathias Agopian
33a1d43636 attempt to fix SDK build.
missing cdefs.h include

Change-Id: Ic7dfdfe74976a459f166a7576b077965cd1fda6a
2011-08-11 19:09:33 -07:00
Mathias Agopian
8968195b19 Merge "Add a priority constant in to the graphics HAL header" 2011-08-10 19:40:24 -07:00
Mathias Agopian
5c9be402a4 Add a priority constant in to the graphics HAL header
this is needed if a display/gpu driver needs to create
service threads that can block the main ui thread.
to avoid priority inversions, these must run at
HAL_PRIORITY_URGENT_DISPLAY

Change-Id: I3af592e05a6d1b6f39a2b7885a7c842e54abfce2
2011-08-09 18:55:44 -07:00
Ashish Sharma
9b5c774369 libcutils: qtaguid: support socket untagging, return errors.
- Enable and rename qtaguid_tagSocket()
  - Add qtaguid_untagSocket()
  - Return kernel errors to caller

Change-Id: I8e33c8832b7f6b24ed9081f36ce1ea9ae6b099c0
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
2011-08-07 23:22:59 -07:00
Mathias Agopian
319f4e2793 fix a typo that prevented api_connect/api_disconnect to work
also make the original connect/disconnect inlines be no-ops.

Change-Id: Ic723e21455491c63ccbbcd01d3a47cd7ed788319
2011-08-03 11:37:27 -07:00
Wu-cheng Li
a43546a874 Change CAMERA_MSG_METADATA_FACE to CAMERA_MSG_PREVIEW_METADATA.
bug:4460717

Change-Id: Icb9c54fa35a1af7c4f761d1a25061e6993cfc4af
2011-08-02 13:24:48 +08:00
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