Joe Onorato
b293194aaf
Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread
2010-06-24 17:51:22 -07:00
Dianne Hackborn
d5715e00b0
Merge "Make bad notifications crash their application." into gingerbread
2010-06-24 17:28:13 -07:00
Dianne Hackborn
d965b79268
am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
...
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread
* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
Properly note the current active restore set's token
2010-06-24 16:01:39 -07:00
Dianne Hackborn
2f90b21533
Merge "Properly note the current active restore set's token" into froyo
2010-06-24 16:00:06 -07:00
Andreas Huber
e0bdac3197
Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread
2010-06-24 13:14:38 -07:00
Dianne Hackborn
68b8f3aeae
Merge "Add APIs for finding heavy-weight apps." into gingerbread
2010-06-24 12:41:01 -07:00
Nick Pelly
76d0df9956
am d19c397b: (-s ours) Merge "Do not log AT command traffic by default." into froyo
...
Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into gingerbread
* commit 'd19c397b04f485e0af5990f3541e703934869290':
Do not log AT command traffic by default.
2010-06-24 12:15:29 -07:00
Nick Pelly
7ed4deb035
Merge "Do not log AT command traffic by default." into froyo
2010-06-24 11:52:39 -07:00
James Dong
82ee5fd209
Merge "Fixed the software AAC encoder" into gingerbread
2010-06-24 09:46:48 -07:00
Mike Lockwood
169e475b38
Merge changes I11495d03,If5816721 into gingerbread
...
* changes:
Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
DO NOT MERGE Add new permission to allow access to USB devices
2010-06-24 09:26:55 -07:00
Andreas Huber
efc4b45cb7
Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread
2010-06-24 09:05:08 -07:00
Joe Onorato
23bb7aae2e
Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread
2010-06-23 17:46:46 -07:00
Christopher Tate
cc61ac50a8
Merge "Remember to initialize timestamps in the dispatch allocator" into gingerbread
2010-06-23 16:52:37 -07:00
Christopher Tate
d974e00697
Remember to initialize timestamps in the dispatch allocator
...
Change-Id: I83a2d353c34ff84a7d130e602c6dedc6a5541944
2010-06-23 16:51:07 -07:00
Joe Onorato
9ff7d34ad3
Merge "Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though." into gingerbread
2010-06-23 16:08:06 -07:00
James Dong
53e314a214
Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread
2010-06-23 15:13:55 -07:00
Mike Lockwood
d7a5f0b7e2
Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread
2010-06-23 13:14:47 -07:00
Andreas Huber
c05f26c3fc
Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
2010-06-23 13:14:16 -07:00
Adam Powell
e595ffb218
Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread
2010-06-23 10:26:44 -07:00
Scott Main
98f8bc0669
am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
...
Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into gingerbread
* commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b':
docs: update backup dev guide with Android Backup Service registration info
2010-06-23 10:07:37 -07:00
Scott Main
0d168d31d4
Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
2010-06-23 09:57:46 -07:00
Eric Laurent
dc872f5ec5
Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread
2010-06-22 18:29:57 -07:00
Chia-chi Yeh
014c9c78ea
Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread
2010-06-22 17:20:44 -07:00
Eric Laurent
d237cebac3
Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread
2010-06-22 17:08:55 -07:00
James Dong
04d287b6e0
Merge "Single track optimization" into gingerbread
2010-06-22 14:28:15 -07:00
Dianne Hackborn
64b74fb3bd
Merge "First stab at attaching native event dispatching." into gingerbread
2010-06-22 11:22:37 -07:00
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
Dianne Hackborn
4d96bb6ae3
First stab at attaching native event dispatching.
...
Provides the basic infrastructure for a
NativeActivity's native code to get an object representing
its event stream that can be used to read input events.
Still work to do, probably some API changes, and reasonable
default key handling (so that for example back will still
work).
Change-Id: I6db891bc35dc9683181d7708eaed552b955a077e
2010-06-22 11:21:50 -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