2774 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
7915b22e8f am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'a4b20d712b9c6cbc562529d3a41bf8ea1515562a':
2013-03-11 12:28:17 -07:00
Jean-Baptiste Queru
a4b20d712b am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'b8e1033c5b5813cb97d19645075591a357e9f04a':
2013-03-11 12:22:41 -07:00
Jean-Baptiste Queru
b8e1033c5b am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'e5412a9a9597433ae2540b390269c514c46402f1':
2013-03-11 12:19:03 -07:00
Jean-Baptiste Queru
e5412a9a95 Reconcile with jb-mr1-release - do not merge 2013-03-11 12:15:11 -07:00
Naseer Ahmed
940e4c9d92 am f61e5020: msm_mdp: Update header for 4 layer support
* commit 'f61e50201b7d5e793a479979c304d3388ca1405f':
  msm_mdp: Update header for 4 layer support
2012-11-29 12:40:57 -08:00
Naseer Ahmed
f61e50201b msm_mdp: Update header for 4 layer support
Bug: 7626586
Change-Id: I37730470dc09b7a9d6336b1603f87efd98f45e97
Signed-off-by: Iliyan Malchev <malchev@google.com>
android-cts-4.2_r2
2012-11-29 10:47:35 -08:00
The Android Open Source Project
414aadc79d am 3bf2fcf9: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '3bf2fcf9a2bc811bbee194b19f2a00c4cfb24701':
  Revert "Update ion header"
  :Revert "Update ion header"
  Revert "Upgrade to dlmalloc 2.8.5."
  Revert "Restore posix_memalign"
  When compiling with clang, don't "fortify_source" the strlcpy and strlcat.
  When compiling with clang, don't "fortify_source" the strlen.
  Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
  Update msm_camera.h to version that supports instance handle based lookup
  Replace ALL_PREBUILTS with BUILD_PREBUILT
2012-11-06 11:13:52 -08:00
The Android Open Source Project
3bf2fcf9a2 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I8a58a6aebc81829d15af6802f16d956cad2d39c8
2012-11-06 11:12:01 -08:00
The Android Automerger
f29c214d6a merge in jb-mr1-release history after reset to jb-mr1-dev android-4.2.1_r1.2 android-4.2.1_r1.1 android-4.2.1_r1 android-4.2_r1 android-cts-4.2_r1 2012-10-30 20:11:57 -07:00
Elliott Hughes
bd8ee3d35e am a811d7a8: Upgrade to tzdata2012h.
* commit 'a811d7a8e638ca49aee704c613cb9f1e03c3698d':
  Upgrade to tzdata2012h.
2012-10-30 14:30:12 -07:00
Elliott Hughes
a811d7a8e6 Upgrade to tzdata2012h.
The 2012h release reflects the following changes recently circulated
on the tz mailing list:

[Brazil]  Bahia no longer has DST.  (Thanks to Kelley Cook.)

[Brazil]  Tocantins has DST.  (Thanks to Rodrigo Severo.)

[Israel]  Israel has new DST rules next year.  (Thanks to Ephraim Silverberg.)

[Jordan]  Jordan stays on DST this winter.  (Thanks to Steffen Thorsen.)

Bug: 7429010
Change-Id: I82f19ce49f944f928b6dd8dc5a893786266e5cb9
android-sdk-support_r11
2012-10-28 11:33:56 -07:00
The Android Automerger
5ba74660e3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-19 15:45:58 -07:00
Elliott Hughes
bc77942a9a am f0e402db: Upgrade to tzdata2012g.
* commit 'f0e402dbd257ab495eab514b347db4b3d6844826':
  Upgrade to tzdata2012g.
2012-10-19 09:57:49 -07:00
Elliott Hughes
f0e402dbd2 Upgrade to tzdata2012g.
This release reflects the following changes recently circulated on the tz
mailing list:

        Samoa fall 2012 and later.  (Thanks to Nicholas Pereira
        and Robert Elz.)

        Palestine fall 2012.  (Thanks to Steffen Thorsen.)

This release does not reflect the possible changes discussed yesterday
for Tocantins and Bahia.

Change-Id: I52d9d2cd6e8e755885dc258200c014bee75527c9
2012-10-18 16:34:48 -07:00
The Android Automerger
b5f1e03079 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-11 08:18:46 -07:00
The Android Automerger
7cc2dec82e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 14:06:19 -07:00
Ying Wang
ecbded40ff am 2c287e95: Set up the private variables.
* commit '2c287e9510ec1d379b3cd779651b595dafb6a2ff':
  Set up the private variables.
2012-10-10 13:51:30 -07:00
Ying Wang
2c287e9510 Set up the private variables.
Now we use private variables in transform-o-to-executable to support
build executables against the NDK.
Cherry-picked from master.

Bug: 7170098
Change-Id: Ic8f1d36a116fce24f3ea6a3ff5e9bfab6cafee99
2012-10-10 10:25:13 -07:00
Ying Wang
b04598a63c Set up the private variables.
Now we use private variables in transform-o-to-executable to support
build executables against the NDK.

Bug: 7170098
Change-Id: I6e505b33001b76f4b11fcbbb1d35392c4ddf4c70
2012-10-08 14:12:56 -07:00
The Android Automerger
956092e07c merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-03 06:59:12 -07:00
Naseer Ahmed
6b1ba1184a am 3ef4fecd: bionic: update processed msm_mdp.h
* commit '3ef4fecd30c22f3c17c1dadfce4527e858b42e7e':
  bionic: update processed msm_mdp.h
2012-10-03 00:57:49 -07:00
Naseer Ahmed
3ef4fecd30 bionic: update processed msm_mdp.h
-- Has display commit ioctl

Bug: 7274951
Change-Id: If2d47edf3ada418e8c61a2acc7b79fb3422f3473
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-02 23:37:34 -07:00
Andy McFadden
7c67e4e423 am 98957db5: Merge "Test flags before using "info"" into jb-mr1-dev
* commit '98957db5536e93724c2e9e6bd19d5063f9d4dc2c':
  Test flags before using "info"
2012-10-02 15:24:25 -07:00
Andy McFadden
98957db553 Merge "Test flags before using "info"" into jb-mr1-dev 2012-10-02 15:23:20 -07:00
Andreas Huber
cafbc94043 am 2e0452cb: bionic: update processed msm_vidc_enc.h
* commit '2e0452cbd1f5b981fbadb4021198d2c27ec1cde3':
  bionic: update processed msm_vidc_enc.h
2012-10-02 14:40:02 -07:00
Andreas Huber
2e0452cbd1 bionic: update processed msm_vidc_enc.h
Updated kernel headers to support a video encoder ioctl to preprend each IDR
frame with SPS/PPS.

related-to-bug: 7245308
Change-Id: I7244c521690d69a905deb19940a04fd4f2e06935
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-02 14:34:03 -07:00
Andy McFadden
f84bc8d6f6 Test flags before using "info"
Our debugger signal catcher expects to receive three args, but if
somebody cleared SA_SIGINFO we only get one, and bad things happen
when we try to use the second one.  Test to see if SA_SIGINFO is
still set before we try to use the argument.

Bug: 7272866
Change-Id: If682a2262fe8a575f3802fb0c60a53eea3082456
2012-10-02 14:30:41 -07:00
The Android Automerger
f27642c082 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-30 06:59:14 -07:00
Saurabh Shah
52b4ccbc49 am 204b26b4: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
* commit '204b26b4402249566e0190154cddb2cfc2cf42a7':
  bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 14:59:36 -07:00
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
The Android Automerger
9014818f61 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-25 06:59:12 -07:00
Elliott Hughes
a9a1d8a5d2 am f4b34b6c: (-s ours) DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
* commit 'f4b34b6c3942be273ad7298a40be0d312b183aab':
  DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 10:16:43 -07:00
Elliott Hughes
f4b34b6c39 DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
This reverts commit 3a936a4980046a7eeb8d53a3296058d8f3a1f770.

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
The Android Automerger
cc95d69c25 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-22 09:41:22 -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
The Android Automerger
e0a00a8a2c merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-21 06:59:14 -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
The Android Automerger
8ab03a28d0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-19 07:01:27 -07:00
Iliyan Malchev
4430aa6aaa Merge "Update headers for Adreno graphics driver" into jb-mr1-dev 2012-09-18 20:27:34 -07:00