Dirk Dougherty
8c47239db5
am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
...
Merge commit '17ae646586663c59ad360bb72884beded7475687' into gingerbread
* commit '17ae646586663c59ad360bb72884beded7475687':
Doc change: Fix description of certificate matching requirement for app updates.
2010-06-22 11:22:12 -07:00
Dirk Dougherty
0f63401fb8
Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
2010-06-22 11:13:48 -07:00
Daniel Sandler
bbc1e52b77
Merge "Fix javadocs." into gingerbread
2010-06-22 11:08:40 -07:00
Andreas Huber
7339c132f4
Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread
2010-06-22 10:11:15 -07:00
Andreas Huber
77d235857d
Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread
2010-06-22 10:11:04 -07:00
James Dong
5158e88db1
Merge "Audio/video sync during recording (second part)" into gingerbread
2010-06-22 10:05:02 -07:00
Mike Lockwood
4acbc54dda
Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread
2010-06-22 06:44:03 -07:00
Jack Palevich
b3ffef9dfe
Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
...
Change-Id: Id0069535e97fe96eef74e4d0c1d19b010061fe3b
2010-06-22 20:08:40 +08:00
Mathias Agopian
3f3a74a53a
remove unused YUV formats
...
Change-Id: Id0ae28b1700cf771cdbe0ca27b139d32cab90b2a
2010-06-21 18:22:09 -07:00
James Dong
0ed252d4f4
Merge "AmrInputStream refresh: eliminate the dependency upon OpenCore's code" into gingerbread
2010-06-21 17:35:27 -07:00
Brad Fitzpatrick
03bd2484c8
Merge "Start of work on passing around StrictMode policy over Binder calls." into gingerbread
2010-06-21 15:31:01 -07:00
Mathias Agopian
f955be995d
fix [2785833] valgrind error in android::Layer::requestBuffer
...
fix uninitialized variable
Change-Id: I99e1b619ae8c88dd9d77b3abf4762f801019047e
2010-06-21 15:19:26 -07:00
Mathias Agopian
b16fa651dd
Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread
2010-06-21 15:11:18 -07:00
Mathias Agopian
06a7cd44e1
Merge "Improve SensorManager documentation" into gingerbread
2010-06-21 15:10:13 -07:00
Jeff Brown
51d45a710e
More native input event dispatching.
...
Added ANRs handling.
Added event injection.
Fixed a NPE ActivityManagerServer writing ANRs to the drop box.
Fixed HOME key interception.
Fixed trackball reporting.
Fixed pointer rotation in landscape mode.
Change-Id: I50340f559f22899ab924e220a78119ffc79469b7
2010-06-21 13:59:34 -07:00
Brad Fitzpatrick
702ea9d42f
Start of work on passing around StrictMode policy over Binder calls.
...
This is (intendend to be) a no-op change.
At this stage, Binder RPCs just have an additional uint32 passed around
in the header, right before the interface name. But nothing is actually
done with them yet. That value should right now always be 0.
This now boots and seems to work.
Change-Id: I135b7c84f07575e6b9717fef2424d301a450df7b
2010-06-21 12:56:35 -07:00
Evan Millar
a2f89660b4
Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread
2010-06-21 12:09:40 -07:00
Kenny Root
5adc399c76
am 30cf330f: Import revised translations
...
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into gingerbread
* commit '30cf330fae137587d51aa4c026459db146705ba9':
Import revised translations
2010-06-21 11:17:07 -07:00
Kenny Root
46d6c07da7
am c4e38577: Import revised translations
...
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into gingerbread
* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
Import revised translations
2010-06-21 09:02:13 -07:00
Chia-chi Yeh
8e0ebcac64
am bd240c27: media: add AudioTrack::getMinFrameCount().
...
Merge commit 'bd240c2737913d6ed1982788699f93bbc52330c0' into gingerbread
* commit 'bd240c2737913d6ed1982788699f93bbc52330c0':
media: add AudioTrack::getMinFrameCount().
2010-06-21 08:54:19 -07:00
Daniel Sandler
f9b7c243a4
Merge "Fix SDK docs build." into gingerbread
2010-06-17 19:14:44 -07:00
Dianne Hackborn
089ae94ae4
am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
...
Merge commit '57f4503e1a129d6a648f2378d36a060998a577a0' into gingerbread
* commit '57f4503e1a129d6a648f2378d36a060998a577a0':
Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
2010-06-17 18:43:31 -07:00
Scott Main
337062fd3f
am 5f11e95f: docs: small edits to catchup to edits made in html pushed live
...
Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into gingerbread
* commit '5f11e95f0041e163e8aa9e429aec92c8ee942233':
docs: small edits to catchup to edits made in html pushed live
2010-06-17 18:43:13 -07:00
James Dong
ae80ffa8ae
am 39e876ad: (-s ours) Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
...
Merge commit '39e876ad743f203fe005333947c61383772b0d14' into gingerbread
* commit '39e876ad743f203fe005333947c61383772b0d14':
When filling the cache, we always time out waiting for a condition that won't occur.
2010-06-17 18:43:10 -07:00
Jeff Brown
f4a4ec2063
Even more native input dispatch work in progress.
...
Added more tests.
Fixed a regression in Vector.
Fixed bugs in pointer tracking.
Fixed a starvation issue in PollLoop when setting or removing callbacks.
Fixed a couple of policy nits.
Modified the internal representation of MotionEvent to be more
efficient and more consistent.
Added code to skip/cancel virtual key processing when there are multiple
pointers down. This helps to better disambiguate virtual key presses
from stray touches (such as cheek presses).
Change-Id: I2a7d2cce0195afb9125b23378baa94fd2fc6671c
2010-06-17 13:27:16 -07:00
Daniel Sandler
e85dafb4d6
Merge "New API for "immersive" activity windows." into gingerbread
2010-06-17 13:24:01 -07:00
Daniel Sandler
ca3cb3d702
Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread
2010-06-17 13:23:59 -07:00
Dave Sparks
a02e07d879
am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro
...
Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into gingerbread
* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:37:15 -07:00
Scott Main
be6c121108
am 821ca518: docs: edits to resources doc
...
Merge commit '821ca51857f4d21b231cd9ead786227b771fe759' into gingerbread
* commit '821ca51857f4d21b231cd9ead786227b771fe759':
docs: edits to resources doc
2010-06-17 12:37:06 -07:00
Scott Main
e79243be84
am bccedb03: docs: update dashboard again
...
Merge commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222' into gingerbread
* commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222':
docs: update dashboard again
2010-06-17 12:36:31 -07:00
Dan Morrill
2beceb7f98
am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
...
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread
* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:36:17 -07:00
James Dong
5c362805cc
Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
2010-06-17 11:25:19 -07:00
James Dong
748ad2b542
Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
2010-06-16 16:10:52 -07:00
Brett Chabot
9bdf9d6a53
Merge "Move out all framework-tests classes." into gingerbread
2010-06-16 14:39:41 -07:00
Dave Sparks
e9a36f1e11
Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into froyo
2010-06-16 14:11:40 -07:00
Scott Main
b49ec28380
am cdeae439: Merge "docs: update dashboard" into froyo
...
Merge commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8' into gingerbread
* commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8':
docs: update dashboard
2010-06-15 19:39:32 -07:00
Scott Main
b7310b28e2
Merge "docs: update dashboard" into froyo
2010-06-15 19:33:03 -07:00
Mathias Agopian
0a91775c4d
Added support for the GL_TEXTURE_EXTERNAL target
...
This will allow us to support YUV surfaces.
Change-Id: I2d4da75f1006a5285bdc552695d4caeecccf2183
2010-06-15 17:31:17 -07:00
Jeff Brown
c10612c77a
Merge "More work in progress on native events." into gingerbread
2010-06-15 16:44:23 -07:00
Jeff Brown
54bc281639
More work in progress on native events.
...
Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher. Also added some plumbing
that will be used to notify the framework about ANRs.
Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
2010-06-15 16:43:18 -07:00
Wei Huang
f497908767
Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
2010-06-15 15:34:06 -07:00
Ying Wang
596843dc11
am 6567adf8: Move android-common to framework/ex
...
Merge commit '6567adf8b637c36817625cd38d64cd4b8510b097' into gingerbread
* commit '6567adf8b637c36817625cd38d64cd4b8510b097':
Move android-common to framework/ex
2010-06-15 15:32:10 -07:00
Ying Wang
98294e50d7
Move android-common to framework/ex
...
This is one necessary step by unbundling.
Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
2010-06-15 15:28:42 -07:00
Joe Onorato
abc03adbca
am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
...
Merge commit '27357fc08802d796a6b6a1111ac5534d75fc8be7' into gingerbread
* commit '27357fc08802d796a6b6a1111ac5534d75fc8be7':
Use the droidcore goal with dist-for-goals.
2010-06-15 15:21:21 -07:00
Joe Onorato
0986125347
am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
...
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread
* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
2010-06-15 15:21:14 -07:00
Joe Onorato
d103af4f4e
Merge "Use the droidcore goal with dist-for-goals." into froyo
2010-06-15 13:59:10 -07:00
Joe Onorato
fa5f5bc4a6
Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo
2010-06-15 13:58:33 -07:00
James Dong
8600d2eaf9
Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread
2010-06-15 10:48:58 -07:00
Scott Main
ef277ade60
am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
...
Merge commit '457738e628ee4d165014996bcf4e8d1983ac5929' into gingerbread
* commit '457738e628ee4d165014996bcf4e8d1983ac5929':
docs: add information about known issues in resource matching
2010-06-15 10:43:10 -07:00
Scott Main
5e6e10f4f8
am 322e7e47: Merge "docs: fix markup error" into froyo
...
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into gingerbread
* commit '322e7e477d89aca18d65cbd289343e716c45a699':
docs: fix markup error
2010-06-15 10:42:52 -07:00