The Android Automerger
d76921e7be
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-05-07 01:33:49 -07:00
Irfan Sheriff
91a9b45215
DO NOT MERGE DHCP changes from master
...
Pick dhcp changes from master for the renewal fixes
Bug: 3344732
Change-Id: I42596513f3ef936ef7160d954e3bd26bc51662c8
2011-05-06 16:16:51 -07:00
The Android Automerger
387f6904d1
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-05-05 17:04:51 -07:00
The Android Automerger
5f14f4f52a
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-05-05 15:28:53 -07:00
The Android Automerger
69e26b8f30
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-05-04 15:57:22 -07:00
The Android Automerger
16293716e3
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-05-03 13:54:15 -07:00
Iliyan Malchev
0ab886bdab
move ANativeWindow and friends under system/core
...
This patch moves the definition of ANativeWindow from frameworks/base into
system/core. We move ANativeWindow for two reasons.
Firstly, the native-window interface may need to be used by lower-level code
than the framework. Such code (such as the camera HAL) is not allowed to use
definitions from frameworks/base, since the latter is stacked on top of the
former. Thus moving (the interface definition) ANativeWindow under system/core
lowers the level at which we can work with windows.
Secondly, this enables an implementation of ANativeWindow that lies outside of
frameworks, enabling quick initial bringup of graphics.
Change-Id: I851b9bb2834bcec73255b5af82f66411e54bb1a5
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-02 19:19:54 -07:00
Iliyan Malchev
66ea3574b6
move non-HAL definitions to syste/core/include
...
This patch moves camera- and graphics-related definitions out of the hardware
HAL layer and into system/core. These definitions are used both by the HAL and
by higher-level code as well. More functionality (e.g., audio definitions)
will be moved here as well.
Change-Id: I225f12374ce54fa393640dce53738267d0d703e9
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-02 19:18:46 -07:00
Iliyan Malchev
3ffd793a1d
native_handle.h: fix declaration
...
Change-Id: I452a517ee6982995318802eb4bbb23bd79401c4d
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-02 17:27:37 -07:00
Irfan Sheriff
cd28c40841
am c951695e: (-s ours) am 3746be26: DHCP changes from master
...
* commit 'c951695ede6636955965d358454a23752c554da6':
DHCP changes from master
2011-05-02 12:20:21 -07:00
Irfan Sheriff
c951695ede
am 3746be26: DHCP changes from master
...
* commit '3746be268c1b70ebbf0dee6ed21b7efb479414c9':
DHCP changes from master
2011-05-02 12:03:12 -07:00
Irfan Sheriff
3746be268c
DHCP changes from master
...
Pick dhcp changes from master for the renewal fixes
Bug: 3344732
Change-Id: Ie49cd11f74cf89e9edf2d1c788a699ce0996190d
2011-04-30 12:59:51 -07:00
Nick Kralevich
531312e491
NetlinkListener: eliminate duplicate code
...
The checks in this code duplicate uevent_checked_recv().
Use that instead.
Change-Id: I2c48bcf4372f0975c27a63d929cae73e16422faf
2011-04-29 16:49:22 -07:00
Nick Kralevich
fdbbdc4ecd
am 943ae2ce: am fe6bfb12: am a8728ee0: (-s ours) Merge "libsysutils: only accept uevents from the kernel."
...
* commit '943ae2ceb7260236fd3cbcc0877edcee48bed4a1':
libsysutils: only accept uevents from the kernel.
2011-04-29 15:11:14 -07:00
The Android Automerger
6e90ecf2d3
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-04-29 15:09:21 -07:00
Nick Kralevich
943ae2ceb7
am fe6bfb12: am a8728ee0: (-s ours) Merge "libsysutils: only accept uevents from the kernel."
...
* commit 'fe6bfb1285f8c784e0700d03f0f3657ba126e6c4':
libsysutils: only accept uevents from the kernel.
2011-04-29 14:54:40 -07:00
David 'Digit' Turner
affee0eb10
am 7db617ef: resolved conflicts for merge of b013bfc1
to honeycomb-plus-aosp
...
* commit '7db617efc079ccc1f384ef7939f7e8c444dfff7a':
ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc
2011-04-29 12:58:31 -07:00
David 'Digit' Turner
7db617efc0
resolved conflicts for merge of b013bfc1
to honeycomb-plus-aosp
...
Change-Id: I159dd58c403bc38f9637163d8cd5e6270e4f201c
2011-04-29 13:31:31 +02:00
The Android Automerger
2d7a35fb78
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-04-28 16:12:57 -07:00
Erik Gilling
b3d7785217
Merge "add r to eng and userdebug builds"
2011-04-28 15:58:44 -07:00
Erik Gilling
b76f0ff700
add r to eng and userdebug builds
...
Change-Id: Ia52a4897e300568dad2c8c1c7af1fe228d058eaf
2011-04-28 14:23:26 -07:00
Nick Kralevich
fe6bfb1285
am a8728ee0: (-s ours) Merge "libsysutils: only accept uevents from the kernel."
...
* commit 'a8728ee0f2e7927d7300a673946926ff82dd8ef3':
libsysutils: only accept uevents from the kernel.
2011-04-28 11:21:17 -07:00
Nick Kralevich
a8728ee0f2
Merge "libsysutils: only accept uevents from the kernel."
2011-04-28 10:58:34 -07:00
David 'Digit' Turner
b013bfc171
am 52a64057: Merge "ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc"
...
* commit '52a64057b60b0ad242e95fdc285ec60e0191d5b5':
ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc
2011-04-28 02:30:33 -07:00
David 'Digit' Turner
52a64057b6
Merge "ueventd.rc: Move /dev/qemu_trace to ueventd.goldfish.rc"
2011-04-28 02:20:17 -07:00
Dima Zavin
14fc0c2765
libcutils: build str_parms test for target instead of host
...
Change-Id: Ic1cd1c26b86b051c25db2521bd90b58731e29135
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 22:26:23 -07:00
Dima Zavin
0e02fcab11
Merge "libcutils: add a simple string parameter parsing ("a=b;c=d;") helper utils"
2011-04-27 17:07:12 -07:00
Dima Zavin
c5ae7dbf4c
Merge "libcutils: hashmap: save next pointer in forEach before calling callback"
2011-04-27 17:06:53 -07:00
Christopher Tate
d2f5415c60
Add 'adb backup' for pulling a full backup tarfile to the host
...
The direct command interfaces with the 'bu' binary in /system/bin
on the device.
Change-Id: I4cd69eedfe5144c47277573c5626c6ad8755d70b
2011-04-27 15:27:23 -07:00
The Android Automerger
b71bbcbaba
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-04-27 14:19:18 -07:00
Nick Kralevich
4682abaaa6
am b0d0e260: resolved conflicts for merge of 2baeb898
to honeycomb-plus-aosp
...
* commit 'b0d0e260bd6118959fa0e2d3c84037b3e0178551':
Fold uevent message origin checking from init into libcutils.
2011-04-27 13:49:59 -07:00
Nick Kralevich
b0d0e260bd
resolved conflicts for merge of 2baeb898
to honeycomb-plus-aosp
...
Change-Id: Ib3169b3a36aa13ef413da624355b1737e9b76fd9
2011-04-27 13:09:24 -07:00
Nick Kralevich
2baeb89882
am a2842b68: Merge "Fold uevent message origin checking from init into libcutils."
...
* commit 'a2842b68548c8cdfbf6b3c14480ab04bab9010ea':
Fold uevent message origin checking from init into libcutils.
2011-04-27 12:31:55 -07:00
Nick Kralevich
a2842b6854
Merge "Fold uevent message origin checking from init into libcutils."
2011-04-27 12:24:47 -07:00
Vernon Tang
80b0162910
libsysutils: only accept uevents from the kernel.
...
Addresses CVE-2011-1823.
Change-Id: I393c21da749a6a6491d6719767bc1ff3df647ebe
2011-04-28 05:16:47 +10:00
Vernon Tang
3f582e92f0
Fold uevent message origin checking from init into libcutils.
...
Change-Id: I7cbc0cb840d1b4962e6c360fdad9a9c0ce20e87b
2011-04-28 05:16:21 +10:00
Conley Owens
ee07501b25
am 66acffad: am c4eaebbe: am ab6e55f7: Merge "Enlarge USB bulk transfer size for faster downloads"
...
* commit '66acffad765add93c8fc74592725eec901867393':
Enlarge USB bulk transfer size for faster downloads
2011-04-27 11:41:05 -07:00
Conley Owens
66acffad76
am c4eaebbe: am ab6e55f7: Merge "Enlarge USB bulk transfer size for faster downloads"
...
* commit 'c4eaebbe7a0c125663f74e3961b62de8d3611a51':
Enlarge USB bulk transfer size for faster downloads
2011-04-27 11:38:29 -07:00
Conley Owens
c4eaebbe7a
am ab6e55f7: Merge "Enlarge USB bulk transfer size for faster downloads"
...
* commit 'ab6e55f72b975b4fc61c436d4540ba7416166262':
Enlarge USB bulk transfer size for faster downloads
2011-04-27 11:32:42 -07:00
Conley Owens
ab6e55f72b
Merge "Enlarge USB bulk transfer size for faster downloads"
2011-04-27 11:20:50 -07:00
Nick Kralevich
bb738d6727
am de35f274: am 03752be0: am 0c297f5e: Merge "Revert "Fold uevent message origin checking from init into libcutils.""
...
* commit 'de35f2741c4e32e331a92be99f7c04b92b94beb2':
Revert "Fold uevent message origin checking from init into libcutils."
2011-04-27 10:37:48 -07:00
Nick Kralevich
de35f2741c
am 03752be0: am 0c297f5e: Merge "Revert "Fold uevent message origin checking from init into libcutils.""
...
* commit '03752be0a437d12e19ac73ebe23385fe6f756e2c':
Revert "Fold uevent message origin checking from init into libcutils."
2011-04-27 10:35:06 -07:00
Nick Kralevich
03752be0a4
am 0c297f5e: Merge "Revert "Fold uevent message origin checking from init into libcutils.""
...
* commit '0c297f5ebb5ae7af2854f7c07d97bcdd13c159fc':
Revert "Fold uevent message origin checking from init into libcutils."
2011-04-27 10:32:00 -07:00
Nick Kralevich
0c297f5ebb
Merge "Revert "Fold uevent message origin checking from init into libcutils.""
2011-04-27 10:23:46 -07:00
Nick Kralevich
de9e65dd65
Revert "Fold uevent message origin checking from init into libcutils."
...
This reverts commit 8405ec0e75
.
The original change does not compile.
2011-04-27 10:21:24 -07:00
Nick Kralevich
3268eda4dc
am e3ab4245: am a7cf7ed9: am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."
...
* commit 'e3ab42457077ec2a66bac553e59a7fee08d4fa9e':
Fold uevent message origin checking from init into libcutils.
2011-04-27 10:00:34 -07:00
Nick Kralevich
e3ab424570
am a7cf7ed9: am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."
...
* commit 'a7cf7ed93486240ca48a407e67c7c3683a3b93aa':
Fold uevent message origin checking from init into libcutils.
2011-04-27 09:59:14 -07:00
Nick Kralevich
2084da4c0f
am 02c8a9cf: am 18f6d964: am f819d023: Merge "libsysutils: SocketListener: handle recv errors more gracefully."
...
* commit '02c8a9cf594d8a074a707e06553a230a690124c4':
libsysutils: SocketListener: handle recv errors more gracefully.
2011-04-27 09:57:48 -07:00
Nick Kralevich
02c8a9cf59
am 18f6d964: am f819d023: Merge "libsysutils: SocketListener: handle recv errors more gracefully."
...
* commit '18f6d964cbee483106da5c96a8c067a948324da7':
libsysutils: SocketListener: handle recv errors more gracefully.
2011-04-27 09:55:31 -07:00
Nick Kralevich
a7cf7ed934
am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."
...
* commit '282c2ab408d487d0995362d1b9aa97fe30d97ebd':
Fold uevent message origin checking from init into libcutils.
2011-04-27 09:55:20 -07:00