Commit Graph

8621 Commits

Author SHA1 Message Date
The Android Automerger
c8b86c1add merge in ics-mr1-release history after reset to ics-mr1 2012-01-11 16:28:10 -08:00
Katie McCormick
6588fb68ec am 811d1dd3: am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1
* commit '811d1dd339adc9f005d34611ffbf0d4ded4c9fa8':
  Doc change: updated index page for HDP sample.
2012-01-11 16:07:33 -08:00
Katie McCormick
811d1dd339 am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1
* commit 'e065fd6209926814df312623a2a8230518e738c0':
  Doc change: updated index page for HDP sample.
2012-01-11 16:05:06 -08:00
Katie McCormick
e065fd6209 Merge "Doc change: updated index page for HDP sample." into ics-mr1 2012-01-11 16:02:50 -08:00
Jesse Hall
5bad48a65e EmuGL: handle NULL data in glBufferData
The data pointer argument to glBufferData can be NULL; this
[re]allocates the buffer while leaving the contents undefined.

Bug: 5833436

Change-Id: Ia1ddf62e2cd2c59d3d631e01d23d7c557ca5a52e
2012-01-11 15:40:29 -08:00
Dianne Hackborn
d2f0e4667f am 2492079b: am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
* commit '2492079bb859b689adc1ff5504bfc274a9ba07ee':
  Fix notification sample to follow current UI guidelines.
2012-01-11 10:56:42 -08:00
Dianne Hackborn
2492079bb8 am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1
* commit '0b6b4f2d195f8224e19b66e5c266a7fd798f321d':
  Fix notification sample to follow current UI guidelines.
2012-01-11 10:54:42 -08:00
Dianne Hackborn
0b6b4f2d19 Merge "Fix notification sample to follow current UI guidelines." into ics-mr1 2012-01-11 10:53:25 -08:00
David 'Digit' Turner
af4519e953 ndk: Fix ipv6 related headers
This fixes two minor issues with recent updates to the IPv6 related headers:

- add missing <linux/ipv6.h> kernel header
- avoid conflict in netinet/in6.h, the macro is already defined by <linux/in6.h>

Change-Id: Ibd0d44fd801affc6ca405e96982a73f9a630bdba
2012-01-11 17:36:09 +01:00
David 'Digit' Turner
e56aece818 ndk: API level 14: Add C library symbol files
Symbols for both arm and x86.

+ missing declarations for getpwnam_r and getpwuid_r which were implemented
  in Android 4.0.1. This didn't appear in previous comparison because the
  platform header always declare these in <pwd.h>, so it never changed
  when the functions were added. They appear in libc.so.functions.txt though.

The arm symbols are generated from the library files extracted from the
'yakju' platform build for 4.0.1 a.k.a. ITL41D.

The x86 symbols are generated by building the corresponding libraries
for the full_x86-eng product, using the same Bionic sources.

+ x86: Add missing symbols for "siglongjmp" and "sigsetjmp" which are not
  exported by the gingerbread version of full_x86-eng libc.so. This was
  checked with a fresh build of the product from the current gingerbread
  tree on the AOSP server. Probably a bug, but a minor one.

Change-Id: I41d3eb28cecc1989e1bec4a00ac236c4b262c2be
2012-01-11 15:55:11 +01:00
David 'Digit' Turner
c8357964fc ndk: API level 12: Add ARM libc symbol files
Extracted from the tervigon build for android-3.1_r1 a.k.a. HMJ37

Change-Id: Idd914b3a4879174f98569b3a9bbb6cf3d48ef221
2012-01-11 15:53:50 +01:00
David 'Digit' Turner
7d8f5ae269 ndk: API level 11: Add libc.so + libm.so symbol files
Only for arm, since oneycomb isn't supported on x86
(i.e. API levels 11 to 13).

Change-Id: I662400ed7e222ea070dd1f9f6681c21971b589e1

ndk: API level 11: Add libm.so symbols for ARM

Change-Id: I5688b57557ad7021d49f458e1b9519e8800d795e
2012-01-11 15:48:37 +01:00
David 'Digit' Turner
485ea2e3d2 ndk: <sys/stat.h>: Add utimensat() to API level 12
Change-Id: If7e0ac5890c3dd2288f2d7541f6f92cd695bff97
2012-01-11 11:29:11 +01:00
David 'Digit' Turner
a58e7602fe ndk: arm: Update <asm/ptrace.h> and <asm/user.h>
This is a minor update to two ARM-specific kernel headers.

- <asm/ptrace.h>: Add two new constants
- <asm/user.h>: Add 'struct vfp_user' and 'struct vfp_user_exc'

Change-Id: I25d31bb33a9102e3c74a169c28dce66211ced636
2012-01-11 11:29:11 +01:00
David 'Digit' Turner
21fc12da17 ndk: libc: Add RLIM_RTTIME to <asm-generic/resource.h>
This is a back-port of a fix that was performed in 4.0.1 to all previous platforms.

Change-Id: Ie4da3564913c22e815e37b1b000080b9bd06e3ad
2012-01-11 11:29:11 +01:00
David 'Digit' Turner
fe012f597f ndk: <dlfcn.h>: dladdr() takes a 'const void*' parameter, not 'void*'
This is a back-port to API level 8 of a non-ABI-breaking change of the declaration.

Change-Id: I4f573da12c9cbd908afb5b646f018033bbe82503
2012-01-11 11:29:11 +01:00
David 'Digit' Turner
8e2862730a ndk: <wchar.h>: Add wcscasecmp and wcsncasecmp for API level 11
Change-Id: Ibb399798b159405f4e059c823601d600a7953f0d
2012-01-11 11:29:11 +01:00
David 'Digit' Turner
47c55f4af2 ndk: <unistd.h>: Update for API level 11 + minor cleanup
- Add pread64(), pwrite64(), ftruncate64() for API level 11
- Cleanup declaration of lseek64() to use off64_t instead of loff_t
- Cleanup declaration of prctl() to use variable number of arguments

The cleanups are performed to better match upstream.

Change-Id: Ic9e44c0ea3dc1202d3c3478bdb2b6006e83b08dc
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
bca6402398 ndk: <time.h>: Add new time functions to API level 11
This patch adds timegm(), timelocal(), time2posix() and posix2time()
to this standard library header.

Change-Id: Ic7b42eece8c11eb040d0522ed8b54d36b7404f9a
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
3970aef4d3 ndk: <stdlib.h>: Add mkdtemp() for API level 11
Change-Id: Ic51ba2fe06e2a62c8ca467e88cef9988c50849df
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
fed3dfbb08 ndk: <signal.h>: Increase _NSIG definition to 64
This is a minor update to this NDK header to better match the upstream definition.

Change-Id: I7b7e84b65f7a45d6395ba9831ee72ad120f989db
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
aa566ea256 ndk: <sched.h>: Add cpu_set_t and related functions to API level 11
Add the following definitions related to cpu affinity to <sched.h>:

- cpu_set_t and associated macros: CPU_ZERO, CPU_SET, CPU_CLR, CPU_ISSET, CPU_EQUAL,
  CPU_COUNT, CPU_AND, CPU_OR, CPU_XOR.

- sched_getcpu(), sched_getaffinity() and sched_setaffinity()

- define macros for dynamically-sized cpu_set_t variables, i.e.:
   CPU_ALLOC_SIZE, CPU_ALLOC, CPU_FREE, CPU_ZERO_S, CPU_SET_S, CPU_CLR_S,
   CPU_ISSET_S, CPU_EQUAL_S, CPU_COUNT_S

NOTE: You must define _GNU_SOURCE before including the header to get them.

Change-Id: I37338573c7af092118e7987420f6a930b6cc24b1
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
bea05255de ndk: <sys/cdefs.h> minor update
This patch fixes some formatting issues in <sys/cdefs.h>:

- change '#if __STDC_VERSION__ > xxx' into '#if defined(__STDC_VERSION__) && __STDC_VERSION > xxx'
- add __LIBC_HIDDEN__ definition (not technically required, but makes comparing the headers with upstream easier)

Change-Id: I5fd13224181e2f757fb01cb99c93508c3a6d9e13
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
e4f252821e ndk: <pthread.h>: formatting + updates
This patch improves the formatting of <pthread.h> as exposed by the NDK:

- change '#if __cplusplus' into '#ifdef __cplusplus'
- change C++-style comment into C-style comment

It also adds pthread_atfork() for API level 11 (3.0)

Change-Id: Ie814208335ed102d4c178a4c373e6963e5dcc9dd
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
42dddab4d6 ndk: minor header update
<net/ethernet.h>: new header
<netdb.h>: add EAI_ADDRFAMILY definition

Change-Id: Ib29d28adcde6fdb5167d3b7b05913ef2eed22412
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
15af16fdf2 ndk: minor update to <netinet/...> headers.
This patch contains a minor update to the netinet headers from the C library.
Most of the changes come from later platform release, but can be safely back-ported
to previous API levels since they don't change the ABI:

- <netinet/icmp6.h>, <netinet/ip6.h>: new headers
- <netinet/in.h>: now always include <linux/ipv6.h> by default
- <netinet/in6.h>: add macros: IN6_IS_ADDR_ULA, IN6ADDR_LOOPBACK_INIT
- <netinet/ip.h>: add macro: IPTOS_MINCOST
- <net/if_ether.h>: always include <sys/types.h> by default.

Change-Id: Icaf38205389d2b49f0e9235c07df752da01a0167
2012-01-11 11:29:10 +01:00
David 'Digit' Turner
e0ff98803f ndk: android-9: Add missing <sys/eventfd.h> header
For some reason, the header was missing from previous NDK releases.
Note: the function symbols are properly listed in arch-$ARCH/symbols/libc.so.functions.txt

Change-Id: I72bf307ccaf55c9b8fc344f5bbfa7b44ba673d62
2012-01-11 11:29:10 +01:00
Dianne Hackborn
174f61c0e9 Fix notification sample to follow current UI guidelines.
Lots of clean up on the messaging notification sample to show the real
correct way to do things.  Also mark up a bunch of the sample for use
in the documentation.

Change-Id: I3a29a944c2971e142c33b29aff94b1ba0b40ae0e
2012-01-10 15:53:32 -08:00
Adam Powell
30e2c473e8 Merge "Catch IOException for close" 2012-01-10 14:11:49 -08:00
Steve Block
7d47e55717 Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 2012-01-10 14:08:30 -08:00
Adam Powell
e882d4c266 Catch IOException for close
Change-Id: I23115f6fa4f54fd4e1de59f3bb781dcf28e1371b
2012-01-10 14:07:23 -08:00
Adam Powell
87376a45e4 Merge "Add code sample for ShareCompat" 2012-01-10 13:31:09 -08:00
Brian Muramatsu
cc90809c26 Merge "Fix runtest for CTS Tests" 2012-01-10 12:27:23 -08:00
Brian Muramatsu
95cbc9e1ec Fix runtest for CTS Tests
The CTS packages use CTS-specific Makefiles rules like
BUILD_CTS_PACKAGE instead of BUILD_PACKAGE. Update runtest
to include CtsBuild.mk which defines all of these.

Change-Id: I6ea6c77b4f2ab113126319141e5120e016055c9d
2012-01-10 12:06:12 -08:00
Jean-Baptiste Queru
86034fd496 am a93b8f1d: am b8cc9bcd: am e4ee58f3: Reference kernels in new location
* commit 'a93b8f1d6dd52679d3c6a2ddffdb018406047364':
  Reference kernels in new location
2012-01-09 17:53:46 -08:00
Jean-Baptiste Queru
a93b8f1d6d am b8cc9bcd: am e4ee58f3: Reference kernels in new location
* commit 'b8cc9bcda92f4afbcaf654dae6ce51e19a1972b1':
  Reference kernels in new location
2012-01-09 17:51:33 -08:00
Jean-Baptiste Queru
b8cc9bcda9 am e4ee58f3: Reference kernels in new location
* commit 'e4ee58f3cb786dca4efccb090428a4429cc751c9':
  Reference kernels in new location
2012-01-09 17:49:23 -08:00
Jesse Hall
5633539268 am d23522e6: am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1
* commit 'd23522e614c517a50222796286a7fffb6c11bd14':
  EmuGL: misc small cleanups
2012-01-09 16:37:28 -08:00
Jesse Hall
8a5b5242a4 am 19b03e4e: am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1
* commit '19b03e4ef1e7861b938dd7c52356af5396f456b3':
  EmuGL: fix GL view position in window on OS X
2012-01-09 16:37:27 -08:00
Jesse Hall
d23522e614 am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1
* commit 'f0baef2fed555e87a0910e5aab6b8b763487b350':
  EmuGL: misc small cleanups
2012-01-09 15:53:49 -08:00
Jesse Hall
19b03e4ef1 am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1
* commit '409c49c526508b5fa36f8bc6edc1fc70cba5a3e1':
  EmuGL: fix GL view position in window on OS X
2012-01-09 15:53:48 -08:00
Jesse Hall
f0baef2fed Merge "EmuGL: misc small cleanups" into ics-mr1 2012-01-09 15:52:15 -08:00
Jesse Hall
409c49c526 Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1 2012-01-09 15:51:40 -08:00
Steve Block
8ad367c36d Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I2eb298dae73ccfd8e9ee8350344d9f5c96f5c422
2012-01-09 21:35:44 +00:00
Jean-Baptiste Queru
e4ee58f3cb Reference kernels in new location
Change-Id: Ic2eae2fef0900e8a8f74cff00e427b99c970f036
2012-01-09 12:09:01 -08:00
Jean-Baptiste Queru
1c4a74c9eb Merge "Reference kernels in new location" 2012-01-09 12:03:56 -08:00
Jean-Baptiste Queru
07ffdd5c31 Reference kernels in new location
Change-Id: Ic2eae2fef0900e8a8f74cff00e427b99c970f036
2012-01-09 10:57:13 -08:00
Steve Block
5a622cba8c Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic6cac56d137f705dfa7266f21e9b0269219bd5d1
2012-01-09 10:39:43 +00:00
The Android Open Source Project
2a184c2ce5 am 98e5d57a: Reconcile with ics-mr1-release
* commit '98e5d57aa95640f5e6ee282067cc994f3ea4dd46':
2012-01-06 18:16:28 -08:00
The Android Open Source Project
98e5d57aa9 Reconcile with ics-mr1-release
Change-Id: Ide3a3c13469bf86114acbe443efe02f5b86743b8
2012-01-06 18:14:59 -08:00