OSDN Git Service
Mike Lockwood [Tue, 15 Jun 2010 01:01:01 +0000 (18:01 -0700)]
Merge "MTP device: Read manufacturer name and serial number from system properties."
Vasu Nori [Tue, 15 Jun 2010 00:11:20 +0000 (17:11 -0700)]
Merge "fix bugs introduced by I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591"
Jeff Brown [Tue, 15 Jun 2010 00:06:56 +0000 (17:06 -0700)]
am
e0e5da0d: am
96e59eb8: Merge "Support for multiple tests" into gingerbread
Merge commit '
e0e5da0d648f4167e2a12ea02f4794f81a057da7'
* commit '
e0e5da0d648f4167e2a12ea02f4794f81a057da7':
Support for multiple tests
Jeff Brown [Mon, 14 Jun 2010 23:32:28 +0000 (16:32 -0700)]
am
96e59eb8: Merge "Support for multiple tests" into gingerbread
Merge commit '
96e59eb8f34e999deb9eb4974cbfc07c71df3cab' into gingerbread-plus-aosp
* commit '
96e59eb8f34e999deb9eb4974cbfc07c71df3cab':
Support for multiple tests
Jeff Brown [Mon, 14 Jun 2010 22:49:57 +0000 (15:49 -0700)]
Merge "Support for multiple tests" into gingerbread
Jeff Brown [Mon, 14 Jun 2010 22:44:41 +0000 (15:44 -0700)]
Support for multiple tests
The build system enforces some invariants that were being ignored
before.
Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8
Brad Fitzpatrick [Mon, 14 Jun 2010 22:25:09 +0000 (15:25 -0700)]
am
92dd85d0: am
742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Merge commit '
92dd85d02af60b001f1ae6919eeb11bcf38e64c8'
* commit '
92dd85d02af60b001f1ae6919eeb11bcf38e64c8':
StrictMode: implement the log-to-DropBox option
Brad Fitzpatrick [Mon, 14 Jun 2010 22:21:21 +0000 (15:21 -0700)]
am
742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Merge commit '
742b282e1168ed3820cb549a89753f39f4de0fa6' into gingerbread-plus-aosp
* commit '
742b282e1168ed3820cb549a89753f39f4de0fa6':
StrictMode: implement the log-to-DropBox option
Brad Fitzpatrick [Mon, 14 Jun 2010 22:19:51 +0000 (15:19 -0700)]
Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Fabrice Di Meglio [Mon, 14 Jun 2010 22:10:19 +0000 (15:10 -0700)]
Merge "Fix bug #
1661857 (switch from using meta feed to the new allcalendars feed)"
Dianne Hackborn [Mon, 14 Jun 2010 21:44:17 +0000 (14:44 -0700)]
am
13792057: am
7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '
13792057e4fef30c9b6fe2b8249b246841508164'
* commit '
13792057e4fef30c9b6fe2b8249b246841508164':
Update build version information.
James Dong [Mon, 14 Jun 2010 21:43:57 +0000 (14:43 -0700)]
am
814f430c: am
dca66e1c: Fixed a typo - maybe we should do comparison ignoring the case?
Merge commit '
814f430cb5e313316600fd6694ed338edd5fff7d'
* commit '
814f430cb5e313316600fd6694ed338edd5fff7d':
Fixed a typo - maybe we should do comparison ignoring the case?
Dianne Hackborn [Mon, 14 Jun 2010 21:13:07 +0000 (14:13 -0700)]
am
7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '
7e900cbf1d600a8895e63a0247f45c116ff05172' into gingerbread-plus-aosp
* commit '
7e900cbf1d600a8895e63a0247f45c116ff05172':
Update build version information.
Dianne Hackborn [Mon, 14 Jun 2010 21:10:43 +0000 (14:10 -0700)]
Merge "Update build version information." into gingerbread
Shih-wei Liao [Mon, 14 Jun 2010 20:39:33 +0000 (13:39 -0700)]
Merge "To enable the reflection of rs_mesh etc. Side benefit: Better type checking. Double-checked with Nick that the extra "struct" is enabling reflection and type checking without incurring overhead."
James Dong [Mon, 14 Jun 2010 20:20:54 +0000 (13:20 -0700)]
am
dca66e1c: Fixed a typo - maybe we should do comparison ignoring the case?
Merge commit '
dca66e1c3bc8842b0d44e0cb004e507a456e4b8f' into gingerbread-plus-aosp
* commit '
dca66e1c3bc8842b0d44e0cb004e507a456e4b8f':
Fixed a typo - maybe we should do comparison ignoring the case?
The Android Open Source Project [Mon, 14 Jun 2010 18:39:26 +0000 (11:39 -0700)]
am
864c68ea: merge from froyo-plus-aosp
Merge commit '
864c68ea452baa0f4f298faf2155af45a9b6d60c'
* commit '
864c68ea452baa0f4f298faf2155af45a9b6d60c':
Added an addAll to the ArrayAdapter
WLAN: Reset power save mode to startup value after DHCP response.
Add PageUp and PageDown hot keys
Should accept "application/vnd.wap.multipart.alternative" message.
replaced deprecated getIntent with parseURI
The Android Open Source Project [Mon, 14 Jun 2010 18:35:51 +0000 (11:35 -0700)]
merge from froyo-plus-aosp
Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489
The Android Open Source Project [Mon, 14 Jun 2010 18:07:32 +0000 (11:07 -0700)]
merge from open-source master
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
The Android Open Source Project [Mon, 14 Jun 2010 18:06:33 +0000 (11:06 -0700)]
merge from open-source master
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
The Android Open Source Project [Mon, 14 Jun 2010 18:02:30 +0000 (11:02 -0700)]
merge from open-source master
Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e
The Android Open Source Project [Mon, 14 Jun 2010 17:57:53 +0000 (10:57 -0700)]
merge from open-source master
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
Jean-Baptiste Queru [Mon, 14 Jun 2010 17:28:23 +0000 (10:28 -0700)]
Merge "replaced deprecated getIntent with parseURI"
Brad Fitzpatrick [Mon, 14 Jun 2010 16:36:12 +0000 (09:36 -0700)]
am
6b9b8806: am
60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '
6b9b8806afb06e393203450bda8a53af08952590'
* commit '
6b9b8806afb06e393203450bda8a53af08952590':
Dropbox: remove redundant Entry construction.
Brad Fitzpatrick [Mon, 14 Jun 2010 16:34:22 +0000 (09:34 -0700)]
am
60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '
60e8c33d6f6caad2e963e91abca16a85cd3be82a' into gingerbread-plus-aosp
* commit '
60e8c33d6f6caad2e963e91abca16a85cd3be82a':
Dropbox: remove redundant Entry construction.
Steve Block [Mon, 14 Jun 2010 16:32:38 +0000 (09:32 -0700)]
Merge "Add the basic outline of the web runtime used to display installed web applications"
Brad Fitzpatrick [Mon, 14 Jun 2010 16:32:26 +0000 (09:32 -0700)]
Merge "Dropbox: remove redundant Entry construction." into gingerbread
Jean-Baptiste Queru [Mon, 14 Jun 2010 16:27:14 +0000 (09:27 -0700)]
Merge "Added an addAll to the ArrayAdapter"
Eric Laurent [Mon, 14 Jun 2010 16:10:32 +0000 (09:10 -0700)]
am
184a3ff6: am
e0219539: am
01f7ac64: Merge "Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '
184a3ff64ba71e7e860b70b9a836c0132b447138'
* commit '
184a3ff64ba71e7e860b70b9a836c0132b447138':
Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI.
Eric Laurent [Mon, 14 Jun 2010 16:07:03 +0000 (09:07 -0700)]
am
e0219539: am
01f7ac64: Merge "Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '
e0219539c6c3e60de4a35cd836df3b68c963e9e0' into gingerbread-plus-aosp
* commit '
e0219539c6c3e60de4a35cd836df3b68c963e9e0':
Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI.
Eric Laurent [Mon, 14 Jun 2010 16:04:33 +0000 (09:04 -0700)]
am
01f7ac64: Merge "Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '
01f7ac64488027492b2909b99d70491e7a391015' into gingerbread
* commit '
01f7ac64488027492b2909b99d70491e7a391015':
Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI.
Eric Laurent [Mon, 14 Jun 2010 16:02:13 +0000 (09:02 -0700)]
Merge "Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Jean-Baptiste Queru [Mon, 14 Jun 2010 15:56:49 +0000 (08:56 -0700)]
Merge "Should accept "application/vnd.wap.multipart.alternative" message."
Chih-Chung Chang [Mon, 14 Jun 2010 11:17:59 +0000 (04:17 -0700)]
am
da755ad3: am
f1cefa91: am
724c5224: Correct the setDisplayOrientation sample code.
Merge commit '
da755ad331aa77fb3780b84c384a27d0217bf410'
* commit '
da755ad331aa77fb3780b84c384a27d0217bf410':
Correct the setDisplayOrientation sample code.
Chih-Chung Chang [Mon, 14 Jun 2010 11:14:09 +0000 (04:14 -0700)]
am
f1cefa91: am
724c5224: Correct the setDisplayOrientation sample code.
Merge commit '
f1cefa916712dafc8b47f6eb8132a688892d4995' into gingerbread-plus-aosp
* commit '
f1cefa916712dafc8b47f6eb8132a688892d4995':
Correct the setDisplayOrientation sample code.
Chih-Chung Chang [Mon, 14 Jun 2010 11:11:00 +0000 (04:11 -0700)]
am
724c5224: Correct the setDisplayOrientation sample code.
Merge commit '
724c52244423feced2677fbd1f905e0b8b0639f2' into gingerbread
* commit '
724c52244423feced2677fbd1f905e0b8b0639f2':
Correct the setDisplayOrientation sample code.
Jeff Brown [Mon, 14 Jun 2010 03:28:29 +0000 (20:28 -0700)]
am
4166aec5: am
28a6c8e9: am
d890cbf7: Remove PollLoop from host build.
Merge commit '
4166aec567b6fa4aa725a20d7c0a6dc5866c9f7b'
* commit '
4166aec567b6fa4aa725a20d7c0a6dc5866c9f7b':
Remove PollLoop from host build.
Jeff Brown [Mon, 14 Jun 2010 03:26:54 +0000 (20:26 -0700)]
am
28a6c8e9: am
d890cbf7: Remove PollLoop from host build.
Merge commit '
28a6c8e9b366ecfc3518e6b0fb1d1bc46cf823e8' into gingerbread-plus-aosp
* commit '
28a6c8e9b366ecfc3518e6b0fb1d1bc46cf823e8':
Remove PollLoop from host build.
Jeff Brown [Mon, 14 Jun 2010 03:25:29 +0000 (20:25 -0700)]
am
d890cbf7: Remove PollLoop from host build.
Merge commit '
d890cbf700695c869e6b45cddf7f132484697588' into gingerbread
* commit '
d890cbf700695c869e6b45cddf7f132484697588':
Remove PollLoop from host build.
Jeff Brown [Mon, 14 Jun 2010 03:21:19 +0000 (20:21 -0700)]
Remove PollLoop from host build.
We can't build (and we don't need) PollLoop in the SDK on all platforms.
Change-Id: I3b0f327bbb8bc58b9b8630b0161cf360403fea68
Jeff Brown [Mon, 14 Jun 2010 03:03:20 +0000 (20:03 -0700)]
Jeff Brown [Mon, 14 Jun 2010 03:01:47 +0000 (20:01 -0700)]
am
5e95930b: am
43a9527c: Fix include paths.
Merge commit '
5e95930bd87b98b01ffe48075fa13c234c2ed08f' into gingerbread-plus-aosp
* commit '
5e95930bd87b98b01ffe48075fa13c234c2ed08f':
Fix include paths.
Jeff Brown [Mon, 14 Jun 2010 02:59:26 +0000 (19:59 -0700)]
am
43a9527c: Fix include paths.
Merge commit '
43a9527c54b71cb17515591af37eeeef6c22e3ff' into gingerbread
* commit '
43a9527c54b71cb17515591af37eeeef6c22e3ff':
Fix include paths.
Jeff Brown [Mon, 14 Jun 2010 02:35:19 +0000 (19:35 -0700)]
Fix include paths.
Change-Id: Ifda45688f9f02710a74d5d7a7d902bacf1441e2e
Jeff Brown [Mon, 14 Jun 2010 02:16:55 +0000 (19:16 -0700)]
resolved conflicts for merge of
9e660c82 to master
Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43
Jeff Brown [Mon, 14 Jun 2010 00:59:04 +0000 (17:59 -0700)]
am
7c8aa44f: am
46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '
7c8aa44f320f45e8417f0aba9ca67af6a67a5cf7' into gingerbread-plus-aosp
* commit '
7c8aa44f320f45e8417f0aba9ca67af6a67a5cf7':
Native input dispatch rewrite work in progress.
Jeff Brown [Mon, 14 Jun 2010 00:55:28 +0000 (17:55 -0700)]
am
46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '
46b9ac0ae2162309774a7478cd9d4e578747bfc2' into gingerbread
* commit '
46b9ac0ae2162309774a7478cd9d4e578747bfc2':
Native input dispatch rewrite work in progress.
Jeff Brown [Fri, 23 Apr 2010 01:58:52 +0000 (18:58 -0700)]
Native input dispatch rewrite work in progress.
The old dispatch mechanism has been left in place and continues to
be used by default for now. To enable native input dispatch,
edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy.
Includes part of the new input event NDK API. Some details TBD.
To wire up input dispatch, as the ViewRoot adds a window to the
window session it receives an InputChannel object as an output
argument. The InputChannel encapsulates the file descriptors for a
shared memory region and two pipe end-points. The ViewRoot then
provides the InputChannel to the InputQueue. Behind the
scenes, InputQueue simply attaches handlers to the native PollLoop object
that underlies the MessageQueue. This way MessageQueue doesn't need
to know anything about input dispatch per-se, it just exposes (in native
code) a PollLoop that other components can use to monitor file descriptor
state changes.
There can be zero or more targets for any given input event. Each
input target is specified by its input channel and some parameters
including flags, an X/Y coordinate offset, and the dispatch timeout.
An input target can request either synchronous dispatch (for foreground apps)
or asynchronous dispatch (fire-and-forget for wallpapers and "outside"
targets). Currently, finding the appropriate input targets for an event
requires a call back into the WindowManagerServer from native code.
In the future this will be refactored to avoid most of these callbacks
except as required to handle pending focus transitions.
End-to-end event dispatch mostly works!
To do: event injection, rate limiting, ANRs, testing, optimization, etc.
Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
Brad Fitzpatrick [Sat, 12 Jun 2010 01:30:09 +0000 (18:30 -0700)]
am
11bd9d1e: am
94f14aec: Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Merge commit '
11bd9d1ec20ce3bbd3791b537faad429a1ca87e7'
* commit '
11bd9d1ec20ce3bbd3791b537faad429a1ca87e7':
More StrictMode work, handling violations in ActivityManagerService.
Brad Fitzpatrick [Sat, 12 Jun 2010 01:28:57 +0000 (18:28 -0700)]
am
94f14aec: Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Merge commit '
94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2' into gingerbread-plus-aosp
* commit '
94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2':
More StrictMode work, handling violations in ActivityManagerService.
Brad Fitzpatrick [Sat, 12 Jun 2010 01:27:20 +0000 (18:27 -0700)]
Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Dirk Dougherty [Sat, 12 Jun 2010 00:00:47 +0000 (17:00 -0700)]
am
c59793e1: am
3a010fa6: am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
c59793e13146d81daec912d1fb91cff9c958e04b'
* commit '
c59793e13146d81daec912d1fb91cff9c958e04b':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:58:34 +0000 (16:58 -0700)]
am
3a010fa6: am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
3a010fa6192f09121fc920810c5a8366b5b09f46' into gingerbread-plus-aosp
* commit '
3a010fa6192f09121fc920810c5a8366b5b09f46':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:57:45 +0000 (16:57 -0700)]
am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b' into froyo-plus-aosp
* commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:56:04 +0000 (16:56 -0700)]
am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b' into gingerbread
* commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:49:14 +0000 (16:49 -0700)]
Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Andreas Huber [Fri, 11 Jun 2010 23:01:34 +0000 (16:01 -0700)]
am
df60830a: am
126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit '
df60830a42580af976b0fc88784d1d32191bd1d7'
* commit '
df60830a42580af976b0fc88784d1d32191bd1d7':
Must hold lock here...
Andreas Huber [Fri, 11 Jun 2010 22:59:30 +0000 (15:59 -0700)]
am
126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit '
126ca6f9ecab6f912ea9f4f00af35c410aae504b' into gingerbread-plus-aosp
* commit '
126ca6f9ecab6f912ea9f4f00af35c410aae504b':
Must hold lock here...
Andreas Huber [Fri, 11 Jun 2010 22:58:19 +0000 (15:58 -0700)]
Merge "Must hold lock here..." into gingerbread
Irfan Sheriff [Fri, 11 Jun 2010 22:32:24 +0000 (15:32 -0700)]
am
a4fb8b3d: am
c2bc66d4: Merge "Dont persist config on failure" into gingerbread
Merge commit '
a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc'
* commit '
a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc':
Dont persist config on failure
Irfan Sheriff [Fri, 11 Jun 2010 22:30:36 +0000 (15:30 -0700)]
am
c2bc66d4: Merge "Dont persist config on failure" into gingerbread
Merge commit '
c2bc66d40510be99e748697cb12c2609cc0e23fc' into gingerbread-plus-aosp
* commit '
c2bc66d40510be99e748697cb12c2609cc0e23fc':
Dont persist config on failure
Irfan Sheriff [Fri, 11 Jun 2010 22:28:24 +0000 (15:28 -0700)]
Merge "Dont persist config on failure" into gingerbread
Irfan Sheriff [Fri, 11 Jun 2010 22:11:54 +0000 (15:11 -0700)]
merge from open-source master
Change-Id: I8a950276787e9439420db396d0e32f88bd6e04cc
Mike Lockwood [Fri, 11 Jun 2010 22:14:16 +0000 (15:14 -0700)]
Merge "CameraBrowser: Support for deleting pictures."
Mike Lockwood [Fri, 11 Jun 2010 22:13:38 +0000 (15:13 -0700)]
Merge "MTP: Add host support for deleting objects."
James Dong [Fri, 11 Jun 2010 21:34:09 +0000 (14:34 -0700)]
am
ae2c4774: am
f62c57d6: Merge "Initial checkin for pause and resume control" into kraken
Merge commit '
ae2c47746b5fda636a157c4fdb0365a67d4604c3'
* commit '
ae2c47746b5fda636a157c4fdb0365a67d4604c3':
Initial checkin for pause and resume control
James Dong [Fri, 11 Jun 2010 21:31:49 +0000 (14:31 -0700)]
am
f62c57d6: Merge "Initial checkin for pause and resume control" into kraken
Merge commit '
f62c57d684b83df7d2817db976c0afdb500ae92a' into gingerbread-plus-aosp
* commit '
f62c57d684b83df7d2817db976c0afdb500ae92a':
Initial checkin for pause and resume control
James Dong [Fri, 11 Jun 2010 21:28:55 +0000 (14:28 -0700)]
Merge "Initial checkin for pause and resume control" into kraken
The Android Open Source Project [Fri, 11 Jun 2010 20:08:02 +0000 (13:08 -0700)]
merge from open-source master
Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0
Jean-Baptiste Queru [Fri, 11 Jun 2010 18:12:15 +0000 (11:12 -0700)]
Merge "WLAN: Reset power save mode to startup value after DHCP response."
Dianne Hackborn [Fri, 11 Jun 2010 18:00:53 +0000 (11:00 -0700)]
am
4d4f265e: am
9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken
Merge commit '
4d4f265e6b6ccfc239150bd71aa2ce2b8de6237f'
* commit '
4d4f265e6b6ccfc239150bd71aa2ce2b8de6237f':
Adjust activity manager process OOM adj.
Andreas Huber [Fri, 11 Jun 2010 18:00:44 +0000 (11:00 -0700)]
am
0905ba7b: am
f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Merge commit '
0905ba7ba62567c1d1b5b0567827c35d40390b52'
* commit '
0905ba7ba62567c1d1b5b0567827c35d40390b52':
Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
Dianne Hackborn [Fri, 11 Jun 2010 17:58:48 +0000 (10:58 -0700)]
am
9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken
Merge commit '
9f8cc518e14c7a34bc52da712afbf02d84585f67' into gingerbread-plus-aosp
* commit '
9f8cc518e14c7a34bc52da712afbf02d84585f67':
Adjust activity manager process OOM adj.
Andreas Huber [Fri, 11 Jun 2010 17:58:44 +0000 (10:58 -0700)]
am
f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Merge commit '
f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9' into gingerbread-plus-aosp
* commit '
f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9':
Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
Dianne Hackborn [Fri, 11 Jun 2010 17:53:16 +0000 (10:53 -0700)]
Merge "Adjust activity manager process OOM adj." into kraken
Andreas Huber [Fri, 11 Jun 2010 17:52:00 +0000 (10:52 -0700)]
Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Andreas Huber [Fri, 11 Jun 2010 17:16:39 +0000 (10:16 -0700)]
am
b165719e: am
e577e87a: Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Merge commit '
b165719e93dd390b4f71f5d5e993880529cc841f'
* commit '
b165719e93dd390b4f71f5d5e993880529cc841f':
Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Andreas Huber [Fri, 11 Jun 2010 17:12:59 +0000 (10:12 -0700)]
am
e577e87a: Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Merge commit '
e577e87a2d80890190f14edc4a5caf70d7c566bf' into gingerbread-plus-aosp
* commit '
e577e87a2d80890190f14edc4a5caf70d7c566bf':
Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Vasu Nori [Fri, 11 Jun 2010 16:55:41 +0000 (09:55 -0700)]
Merge "sqlite error "unsupported file format" = corruption"
Chih-Chung Chang [Fri, 11 Jun 2010 10:39:17 +0000 (03:39 -0700)]
am
dac5e001: am
b8bb78f5: Change camera interface to support multiple cameras.
Merge commit '
dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9'
* commit '
dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9':
Change camera interface to support multiple cameras.
Chih-Chung Chang [Fri, 11 Jun 2010 10:27:30 +0000 (03:27 -0700)]
am
b8bb78f5: Change camera interface to support multiple cameras.
Merge commit '
b8bb78f54b48868465a9d69d65fda08524ab5ae1' into gingerbread-plus-aosp
* commit '
b8bb78f54b48868465a9d69d65fda08524ab5ae1':
Change camera interface to support multiple cameras.
Chih-Chung Chang [Thu, 10 Jun 2010 05:32:16 +0000 (13:32 +0800)]
Change camera interface to support multiple cameras.
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
Wu-cheng Li [Fri, 11 Jun 2010 07:35:06 +0000 (00:35 -0700)]
am
e5dd62e8: am
2fd73a45: Unhide camera metering mode API.
Merge commit '
e5dd62e873448fd8c1fd8e80739b58bda649a6e7'
* commit '
e5dd62e873448fd8c1fd8e80739b58bda649a6e7':
Unhide camera metering mode API.
Wu-cheng Li [Fri, 11 Jun 2010 07:33:37 +0000 (00:33 -0700)]
am
2fd73a45: Unhide camera metering mode API.
Merge commit '
2fd73a452268d2acb6e72a1d23a422085ed3c510' into gingerbread-plus-aosp
* commit '
2fd73a452268d2acb6e72a1d23a422085ed3c510':
Unhide camera metering mode API.
Irfan Sheriff [Fri, 11 Jun 2010 02:04:25 +0000 (19:04 -0700)]
am
749defb0: am
f4f614f5: am
9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Irfan Sheriff [Fri, 11 Jun 2010 02:02:23 +0000 (19:02 -0700)]
am
f4f614f5: am
9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Irfan Sheriff [Fri, 11 Jun 2010 02:02:13 +0000 (19:02 -0700)]
am
9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b' into froyo-plus-aosp
* commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b':
Remove indefinite DHCP retries
Irfan Sheriff [Fri, 11 Jun 2010 01:59:42 +0000 (18:59 -0700)]
am
9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken
* commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b':
Remove indefinite DHCP retries
Irfan Sheriff [Fri, 11 Jun 2010 01:56:04 +0000 (18:56 -0700)]
Merge "Remove indefinite DHCP retries" into froyo
Romain Guy [Fri, 11 Jun 2010 01:52:47 +0000 (18:52 -0700)]
Merge "Refactor HardwareRenderer to allow the use of OpenGL ES 2.0."
Vasu Nori [Fri, 11 Jun 2010 00:52:24 +0000 (17:52 -0700)]
Merge "NPE in database corruption handler if attached database list is null"
Mathias Agopian [Fri, 11 Jun 2010 00:17:19 +0000 (17:17 -0700)]
am
5b669581: am
9d8e8dcc: Merge "fix [
2757903] Crash in EGL when creating an EGLSurface" into kraken
Mathias Agopian [Fri, 11 Jun 2010 00:15:12 +0000 (17:15 -0700)]
am
9d8e8dcc: Merge "fix [
2757903] Crash in EGL when creating an EGLSurface" into kraken
Mathias Agopian [Fri, 11 Jun 2010 00:12:42 +0000 (17:12 -0700)]
Merge "fix [
2757903] Crash in EGL when creating an EGLSurface" into kraken
Dmitri Plotnikov [Thu, 10 Jun 2010 23:52:53 +0000 (16:52 -0700)]
Merge "Reimplement the PhoneNumberFormattingTextWatcher"
Romain Guy [Thu, 10 Jun 2010 23:19:51 +0000 (16:19 -0700)]
Merge "Fix native crash when enabling hardware acceleration."
Mike Lockwood [Thu, 10 Jun 2010 23:13:50 +0000 (16:13 -0700)]
am
799f0e50: am
4001120e: am
f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
Andreas Huber [Thu, 10 Jun 2010 23:13:37 +0000 (16:13 -0700)]
am
627a0019: am
4d61f602: Switch stagefright\'s approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.
Andreas Huber [Thu, 10 Jun 2010 23:13:29 +0000 (16:13 -0700)]
am
32d8b25f: am
a6ef19a8: Merge "Simplify the code in the stagefright commandline utility." into kraken
Andreas Huber [Thu, 10 Jun 2010 23:13:24 +0000 (16:13 -0700)]
am
566e64af: am
fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken