Commit Graph

2696 Commits

Author SHA1 Message Date
Saurabh Shah
204b26b440 bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
This change adds msm_mdp.h header changes to bionic.

This IOCTL is a substitute for PAN on external panel.  It waits for DMAE to
finish before returning and avoid delays in the PAN path.

Bug: 7249589
Acked-by: Arun Kumar K.R <akumarkr@codeaurora.org>
Change-Id: I4b04a4538919ffcb994699a432c4322e9f94e870
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-28 13:46:13 -07:00
Elliott Hughes
f4b34b6c39 DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
This reverts commit 3a936a4980.

We don't want this in jb-mr1.
2012-09-24 10:13:12 -07:00
Elliott Hughes
6c0e373d38 am ec432608: am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
* commit 'ec4326084ed2a717b3e318f36c2675ef033c30ff':
  Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:40:18 -07:00
Elliott Hughes
ec4326084e am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
* commit '0c24effd01736e533fd082b2cf1de8926b0fe880':
  Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 08:55:27 -07:00
Elliott Hughes
ecf67e152a am 2d51dddf: am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."
* commit '2d51dddf1a649c73f207ecf48d419fea8a8ed4de':
  Use hidden visibility for several internal-use-only functions.
2012-09-24 08:52:15 -07:00
Elliott Hughes
d2eea0e6d6 am baa74eff: am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
* commit 'baa74eff0dd56b1dbf8e8a233a82e6382828ad72':
  [MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 08:52:14 -07:00
Elliott Hughes
2d51dddf1a am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."
* commit '85049ead251b0af9411ada3ad1db0f6b75f8e4a8':
  Use hidden visibility for several internal-use-only functions.
2012-09-24 08:43:45 -07:00
Elliott Hughes
baa74eff0d am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
* commit '882c6af953e5b3fd4b9f4fe74a68128ea16fba3b':
  [MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 08:43:44 -07:00
Elliott Hughes
0c24effd01 Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic." 2012-09-24 08:41:55 -07:00
Elliott Hughes
85049ead25 Merge "Use hidden visibility for several internal-use-only functions." 2012-09-23 11:08:19 -07:00
Elliott Hughes
95a7a64ac8 Use hidden visibility for several internal-use-only functions.
Change-Id: Ibeea6963ff0cc06479d0a3ed7e868eeece8c55a0
2012-09-21 18:27:40 -07:00
Elliott Hughes
882c6af953 Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro." 2012-09-21 18:20:03 -07:00
Raghu Gandham
988ff8ff9f [MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS.
Some of the required structure definitons are defined under this macro.

Change-Id: I7a9a986e371381697dcb56bd8ea362856ffa7509
2012-09-21 17:14:05 -07:00
Naseer Ahmed
f707007435 bionic: Update MDP header for sync
Change-Id: I5e13cdc9132fd99b8072b2e0836b9a92bc54f9c3
2012-09-20 18:29:45 -07:00
Rebecca Schultz Zavin
a9dca77315 Update ion header to add FLAG_CACHED_NEEDS_SYNC
Bug: 6854979
Change-Id: Ic94c1b7b10ab750a6b4b0db83d2fb1fa073d91b9
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2012-09-20 09:47:37 -07:00
Iliyan Malchev
4430aa6aaa Merge "Update headers for Adreno graphics driver" into jb-mr1-dev 2012-09-18 20:27:34 -07:00
Jeff Boody
02e06782fc Update headers for Adreno graphics driver
Change-Id: Ic66de698667c8c8607b2c19712a8626a4651da7f
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-18 19:52:01 -07:00
Elliott Hughes
0ef0009044 am 30289f0d: am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
* commit '30289f0dd6ab644290bfb37b22b03b7d006628f4':
  Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 17:18:39 -07:00
Elliott Hughes
30289f0dd6 am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
* commit '47dc4d431017e701239dd7d9a16333e0ad56a0ac':
  Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2012-09-18 17:13:15 -07:00
Elliott Hughes
47dc4d4310 Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326" 2012-09-18 16:56:45 -07:00
Dave Burke
88f1ea8f82 Make pthread_create more forgiving of invalid sched_policy.
Bug: 7005326

(cherry-pick of e58303249b9e799a4fe84c5a2dfe71518441a6ec.)

Change-Id: Ie81494e0f6a71caa6fd9fabbcfc47a23077554d6
2012-09-18 16:55:24 -07:00
Dave Burke
e58303249b Make pthread_create more forgiving of invalid sched_policy.
Bug: 7005326

Change-Id: I4e33d8e7d70fbfcf8a1bcc0e4c33279b42092a0a
2012-09-17 21:55:24 -07:00
Elliott Hughes
2aceb4bcb3 am e2a17ef4: am 77ac158e: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
* commit 'e2a17ef444e1d3b3e27e649440a320139038d1d9':
  Don't copy strerror(3) or strsignal(3) strings if we can share.
2012-09-17 15:53:22 -07:00
Elliott Hughes
e2a17ef444 am 77ac158e: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
* commit '77ac158e90712a975f61b7559b8de558f644f48d':
  Don't copy strerror(3) or strsignal(3) strings if we can share.
2012-09-17 15:50:18 -07:00
Elliott Hughes
77ac158e90 Merge "Don't copy strerror(3) or strsignal(3) strings if we can share." 2012-09-17 15:36:27 -07:00
Elliott Hughes
4198fa4c23 Don't copy strerror(3) or strsignal(3) strings if we can share.
Change-Id: Ic405269f63b945c6fb347e7c4346cd6f104aff35
2012-09-17 15:23:35 -07:00
Elliott Hughes
4b3ff1f0fa am f8902bf7: am 047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
* commit 'f8902bf7079be1a7ad51b82ebb24556ff40a1fff':
  Fix <sys/klog.h> to correspond to the kernel operations.
2012-09-14 16:21:18 -07:00
Elliott Hughes
f8902bf707 am 047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
* commit '047a285d41e3fe0b1a8071ec19f436baf6f187b2':
  Fix <sys/klog.h> to correspond to the kernel operations.
2012-09-14 16:18:00 -07:00
Elliott Hughes
047a285d41 Merge "Fix <sys/klog.h> to correspond to the kernel operations." 2012-09-14 16:14:48 -07:00
Elliott Hughes
b67d4ec5ba am 950a3c01: am 51519521: Merge "Add tty defaults to bionic"
* commit '950a3c010cfbb18bb5974a78040ab9946370e553':
  Add tty defaults to bionic
2012-09-14 16:04:30 -07:00
Elliott Hughes
950a3c010c am 51519521: Merge "Add tty defaults to bionic"
* commit '51519521979c2daa417f6ca50c175e631c55dfb0':
  Add tty defaults to bionic
2012-09-14 16:01:19 -07:00
Elliott Hughes
5151952197 Merge "Add tty defaults to bionic" 2012-09-14 15:45:46 -07:00
Elliott Hughes
e249b05963 Fix <sys/klog.h> to correspond to the kernel operations.
This makes the constants correspond to those in the Linux kernel's
include/linux/syslog.h, but keeping our old badly-named constants for
source compatibility.

Change-Id: Ia47d1299205754cbfffd29ed48b497b53d1edaae
2012-09-14 15:42:30 -07:00
Elliott Hughes
b2af8b6848 am 66a97ea9: am 4e9d953a: Merge "libc: add ftw / nftw functions"
* commit '66a97ea9fbc96c8ebf7f9aae8c2512ec3ffbdb80':
  libc: add ftw / nftw functions
2012-09-13 17:12:40 -07:00
Elliott Hughes
1eaa3e6f72 am 77fd7075: am e895e6de: Merge "Update libc/NOTICE and record the incantation."
* commit '77fd70758ae579aadf153124f7c26494e4a54988':
  Update libc/NOTICE and record the incantation.
2012-09-13 17:12:39 -07:00
Elliott Hughes
66a97ea9fb am 4e9d953a: Merge "libc: add ftw / nftw functions"
* commit '4e9d953a0e9334c0f3519f470b97973c31da5bb6':
  libc: add ftw / nftw functions
2012-09-13 17:09:51 -07:00
Elliott Hughes
77fd70758a am e895e6de: Merge "Update libc/NOTICE and record the incantation."
* commit 'e895e6deaab620f874b3e9f196eb6b67f58dc278':
  Update libc/NOTICE and record the incantation.
2012-09-13 17:09:50 -07:00
Elliott Hughes
4e9d953a0e Merge "libc: add ftw / nftw functions" 2012-09-13 16:55:39 -07:00
Nick Kralevich
5e58ea07d4 libc: add ftw / nftw functions
Please see "man 3 ftw" for a description of the
ftw / nftw functions.

This code is taken directly from netbsd unmodified.

Change-Id: Ia4879ac57212b424adf5281b5e92858e216d0f14
2012-09-13 16:54:57 -07:00
Elliott Hughes
e895e6deaa Merge "Update libc/NOTICE and record the incantation." 2012-09-13 16:52:35 -07:00
Elliott Hughes
965b867512 Update libc/NOTICE and record the incantation.
Change-Id: I0673d6263de2c5a21cd549f18c0648d0fa4bb40f
2012-09-13 16:51:57 -07:00
Kenny Root
2b270a0cac am a4ea1a3d: am f7e403d6: Merge changes I06ee0b67,I914d2205
* commit 'a4ea1a3d2e12f8b240a70d90ddf1f54af06c286c':
  Print out shared app gids correctly
  Add tests for Android-specific stubs
2012-09-13 15:33:57 -07:00
Elliott Hughes
155a70b93f am de9db8f7: am fa36875d: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
* commit 'de9db8f7efb10cdab1c81f1d3164f3b55e5f08e9':
  Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
2012-09-13 15:33:57 -07:00
Elliott Hughes
c7fda6a96d am d4623e56: am b338ea30: Merge "Upgrade to tzdata2012f."
* commit 'd4623e56fb61b38e2c436f214a1282252908b93b':
  Upgrade to tzdata2012f.
2012-09-13 15:33:56 -07:00
Kenny Root
a4ea1a3d2e am f7e403d6: Merge changes I06ee0b67,I914d2205
* commit 'f7e403d66355faed93bb1472f6961acd380796d1':
  Print out shared app gids correctly
  Add tests for Android-specific stubs
2012-09-13 15:30:35 -07:00
Elliott Hughes
de9db8f7ef am fa36875d: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
* commit 'fa36875df423af968d053c584c0de18a2448516b':
  Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
2012-09-13 15:30:34 -07:00
Elliott Hughes
d4623e56fb am b338ea30: Merge "Upgrade to tzdata2012f."
* commit 'b338ea30b299099a2b26a4e8a6b2ccd7bfac631a':
  Upgrade to tzdata2012f.
2012-09-13 15:30:33 -07:00
Kenny Root
f7e403d663 Merge changes I06ee0b67,I914d2205
* changes:
  Print out shared app gids correctly
  Add tests for Android-specific stubs
2012-09-13 15:26:13 -07:00
Kenny Root
8a05a01de7 Print out shared app gids correctly
For applications that share resources across users such as
forward-locked applications, print out their group name correctly.

Change-Id: I06ee0b67e4325cfa415ffd7a03e301700399a66d
2012-09-13 15:25:09 -07:00
Kenny Root
2a54e5ecd0 Add tests for Android-specific stubs
Also fix problem with multi-user IDs that the home directory was
returned as "/data" instead of "/" unlike all the other uids.

Change-Id: I914d22052e5a86552989f8969b85aadbc748c65d
2012-09-13 15:25:09 -07:00