OSDN Git Service
John Wang [Mon, 2 Aug 2010 22:33:47 +0000 (15:33 -0700)]
am
8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread
Merge commit '
8bffa72b9c711fec231108977ad9f2ba72678a82' into gingerbread-plus-aosp
* commit '
8bffa72b9c711fec231108977ad9f2ba72678a82':
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
John Wang [Mon, 2 Aug 2010 22:31:37 +0000 (15:31 -0700)]
Merge changes Ic30e2801,I387bab4d into gingerbread
* changes:
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
Christopher Tate [Mon, 2 Aug 2010 22:19:19 +0000 (15:19 -0700)]
am
a213ce02: Merge "Mute a common-case progress log about input injection" into gingerbread
Merge commit '
a213ce02ced6511edf02e29c45057f344bfe8636' into gingerbread-plus-aosp
* commit '
a213ce02ced6511edf02e29c45057f344bfe8636':
Mute a common-case progress log about input injection
Christopher Tate [Mon, 2 Aug 2010 22:14:44 +0000 (15:14 -0700)]
Merge "Mute a common-case progress log about input injection" into gingerbread
Kenny Root [Mon, 2 Aug 2010 20:29:01 +0000 (13:29 -0700)]
am
739cdab7: Merge "Do not deference before null check" into gingerbread
Merge commit '
739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp
* commit '
739cdab7cb63d53440bb411fa2d558e2114b4c81':
Do not deference before null check
Kenny Root [Mon, 2 Aug 2010 19:33:40 +0000 (12:33 -0700)]
Merge "Do not deference before null check" into gingerbread
Wink Saville [Mon, 2 Aug 2010 19:06:34 +0000 (12:06 -0700)]
am
1540a7ea: am
c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
Merge commit '
1540a7ea1afcb772b5fcf90f635153f6489eb8ed' into gingerbread-plus-aosp
* commit '
1540a7ea1afcb772b5fcf90f635153f6489eb8ed':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
Wink Saville [Mon, 2 Aug 2010 19:02:42 +0000 (12:02 -0700)]
am
c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
Merge commit '
c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread
* commit '
c69f5be0ed3529564e5db6874de52775c2c99007':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
Scott Main [Mon, 2 Aug 2010 16:29:49 +0000 (09:29 -0700)]
am
d3579580: am
9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit '
d3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp
* commit '
d3579580df0cea7e37334d83ef7a9aa85ad70368':
Doc change: Add nexus one to dev phones.
Scott Main [Mon, 2 Aug 2010 16:23:50 +0000 (09:23 -0700)]
am
9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit '
9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread
* commit '
9cd797902ec8404c5958214fc078d75e87248bf3':
Doc change: Add nexus one to dev phones.
Scott Main [Mon, 2 Aug 2010 16:16:30 +0000 (09:16 -0700)]
Merge "Doc change: Add nexus one to dev phones." into froyo
Brad Fitzpatrick [Mon, 2 Aug 2010 15:02:05 +0000 (08:02 -0700)]
am
ee34a49f: Add missing word from docs.
Merge commit '
ee34a49ffc92590cb59f3e17a3df136b67701529' into gingerbread-plus-aosp
* commit '
ee34a49ffc92590cb59f3e17a3df136b67701529':
Add missing word from docs.
Dianne Hackborn [Sat, 31 Jul 2010 02:12:50 +0000 (19:12 -0700)]
am
543f250d: Merge "Make the systemui process persistent." into gingerbread
Merge commit '
543f250d9cb05ebca4fb4dacce37545c0bb9a8ca' into gingerbread-plus-aosp
* commit '
543f250d9cb05ebca4fb4dacce37545c0bb9a8ca':
Make the systemui process persistent.
Dianne Hackborn [Sat, 31 Jul 2010 02:10:01 +0000 (19:10 -0700)]
Merge "Make the systemui process persistent." into gingerbread
Mathias Agopian [Sat, 31 Jul 2010 01:03:17 +0000 (18:03 -0700)]
am
4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread
Merge commit '
4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp
* commit '
4d7fc3651bd93d588d2b8580010414b59bc67729':
remove copybit hack from software opengl (libagl)
Mathias Agopian [Sat, 31 Jul 2010 01:01:25 +0000 (18:01 -0700)]
Merge "remove copybit hack from software opengl (libagl)" into gingerbread
Dirk Dougherty [Sat, 31 Jul 2010 00:40:28 +0000 (17:40 -0700)]
am
483b20e5: am
2ff1ba01: Doc change: Cleanup for licensing doc.
Merge commit '
483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp
* commit '
483b20e5ae65495d841de1844d97d79fbc0c1866':
Doc change: Cleanup for licensing doc.
Dirk Dougherty [Sat, 31 Jul 2010 00:37:39 +0000 (17:37 -0700)]
am
2ff1ba01: Doc change: Cleanup for licensing doc.
Merge commit '
2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread
* commit '
2ff1ba012c59169c9719cfab4516b9149414380b':
Doc change: Cleanup for licensing doc.
Kenny Root [Sat, 31 Jul 2010 00:00:01 +0000 (17:00 -0700)]
am
8b61b68b: Merge "Only install after MCS success" into gingerbread
Merge commit '
8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp
* commit '
8b61b68b648985df37197de204398f608c4ad8b1':
Only install after MCS success
Kenny Root [Fri, 30 Jul 2010 23:55:37 +0000 (16:55 -0700)]
Merge "Only install after MCS success" into gingerbread
Brad Fitzpatrick [Fri, 30 Jul 2010 22:23:19 +0000 (15:23 -0700)]
am
d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread
Merge commit '
d2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp
* commit '
d2165cfce7911dac66d1195ed9123e79b086d22b':
StrictMode: time violations in Binder calls
Brad Fitzpatrick [Fri, 30 Jul 2010 22:20:28 +0000 (15:20 -0700)]
Merge "StrictMode: time violations in Binder calls" into gingerbread
James Dong [Fri, 30 Jul 2010 21:52:05 +0000 (14:52 -0700)]
am
f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
Merge commit '
f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp
* commit '
f0aa24d91d23195f811e317c4cc4ddbe06db8974':
Added damr box for AMR (NB and WB) sample entry
Jeff Brown [Fri, 30 Jul 2010 21:49:43 +0000 (14:49 -0700)]
am
00e5c613: Merge "Improve thread safety of input mappers." into gingerbread
Merge commit '
00e5c61366d3d3d62c259277823ea15a14f68ad4' into gingerbread-plus-aosp
* commit '
00e5c61366d3d3d62c259277823ea15a14f68ad4':
Improve thread safety of input mappers.
James Dong [Fri, 30 Jul 2010 21:49:23 +0000 (14:49 -0700)]
Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
Jeff Brown [Fri, 30 Jul 2010 21:48:25 +0000 (14:48 -0700)]
Merge "Improve thread safety of input mappers." into gingerbread
Jeff Brown [Fri, 30 Jul 2010 01:18:33 +0000 (18:18 -0700)]
Improve thread safety of input mappers.
Also fixed bug where old touch screen size could be reported by
getMotionRange if an orientation change occurred but the user has not
yet touched the screen.
Bug:
2877345
Change-Id: I7878f47458f310ed6ebe6a5d1b2c9bec2c598ab9
James Dong [Fri, 30 Jul 2010 21:30:31 +0000 (14:30 -0700)]
am
d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread
Merge commit '
d973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp
* commit '
d973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
Lower the lower bound for max file duration check
James Dong [Fri, 30 Jul 2010 21:28:26 +0000 (14:28 -0700)]
Merge "Lower the lower bound for max file duration check" into gingerbread
Xia Wang [Fri, 30 Jul 2010 20:46:24 +0000 (13:46 -0700)]
am
131ce67d: Merge "DO NOT MERGE" into gingerbread
Merge commit '
131ce67d276416e3cb23a5e31121fdff1a8bf290' into gingerbread-plus-aosp
* commit '
131ce67d276416e3cb23a5e31121fdff1a8bf290':
DO NOT MERGE
Xia Wang [Fri, 30 Jul 2010 20:44:23 +0000 (13:44 -0700)]
Merge "DO NOT MERGE" into gingerbread
Andreas Huber [Fri, 30 Jul 2010 19:18:58 +0000 (12:18 -0700)]
am
432c5b6c: am
7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Merge commit '
432c5b6c1d4181194cb82a14107b6d10105231a9' into gingerbread-plus-aosp
* commit '
432c5b6c1d4181194cb82a14107b6d10105231a9':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Andreas Huber [Fri, 30 Jul 2010 19:15:02 +0000 (12:15 -0700)]
am
7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Merge commit '
7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6' into gingerbread
* commit '
7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Jean-Baptiste Queru [Fri, 30 Jul 2010 19:13:43 +0000 (12:13 -0700)]
am
154a3200: resolved conflicts for merge of
27eecb70 to gingerbread
Merge commit '
154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp
* commit '
154a320069a316491c25b716f2aeea8c51a758e8':
fix inaccurate copyrights
Jean-Baptiste Queru [Fri, 30 Jul 2010 19:08:31 +0000 (12:08 -0700)]
resolved conflicts for merge of
27eecb70 to gingerbread
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
Jean-Baptiste Queru [Fri, 30 Jul 2010 18:58:25 +0000 (11:58 -0700)]
am
0f0dd448: Merge "Fix a bug that prevented the creation of EGL shared contexts."
Merge commit '
0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916' into gingerbread-plus-aosp
* commit '
0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916':
Fix a bug that prevented the creation of EGL shared contexts.
Gilles Debunne [Fri, 30 Jul 2010 18:56:36 +0000 (11:56 -0700)]
am
4609b0a8: am
3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
Merge commit '
4609b0a8fcfbed9b893301232dfa3b70bb30e4e2' into gingerbread-plus-aosp
* commit '
4609b0a8fcfbed9b893301232dfa3b70bb30e4e2':
Fixes regarding densities in "Providing Resources" documentation page.
Gilles Debunne [Fri, 30 Jul 2010 18:56:24 +0000 (11:56 -0700)]
am
628be513: am
83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Merge commit '
628be513e67ce6c61884b1baaf0379abfc56100b' into gingerbread-plus-aosp
* commit '
628be513e67ce6c61884b1baaf0379abfc56100b':
Fixed doc typos in HeterogeneousExpandableList.java.
Gilles Debunne [Fri, 30 Jul 2010 18:53:21 +0000 (11:53 -0700)]
am
3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
Merge commit '
3d8d9440d844816f065d2b10eb75bb693683cdad' into gingerbread
* commit '
3d8d9440d844816f065d2b10eb75bb693683cdad':
Fixes regarding densities in "Providing Resources" documentation page.
Gilles Debunne [Fri, 30 Jul 2010 18:53:16 +0000 (11:53 -0700)]
am
83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Merge commit '
83884db9dc0fbddb6ece566284259f6b941beb33' into gingerbread
* commit '
83884db9dc0fbddb6ece566284259f6b941beb33':
Fixed doc typos in HeterogeneousExpandableList.java.
Jean-Baptiste Queru [Fri, 30 Jul 2010 18:42:09 +0000 (11:42 -0700)]
Merge "Fix a bug that prevented the creation of EGL shared contexts."
Steve Howard [Fri, 30 Jul 2010 18:12:28 +0000 (11:12 -0700)]
am
7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Merge commit '
7c600369c9695de73ca37db552eb81b8b89d5e76' into gingerbread-plus-aosp
* commit '
7c600369c9695de73ca37db552eb81b8b89d5e76':
Update Context.getSystemService() docs for download manager.
Steve Howard [Fri, 30 Jul 2010 18:09:48 +0000 (11:09 -0700)]
Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Alex Yakavenka [Fri, 30 Jul 2010 18:05:26 +0000 (11:05 -0700)]
am
a27353c1: Cat: Generalize stk into cat
Merge commit '
a27353c1965911f69be8d02a01b15389189eab9d' into gingerbread-plus-aosp
* commit '
a27353c1965911f69be8d02a01b15389189eab9d':
Cat: Generalize stk into cat
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:55:02 +0000 (10:55 -0700)]
am
3d9e1696: Merge "Cat: Move Stk imlpementation into Cat folder"
Merge commit '
3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c' into gingerbread-plus-aosp
* commit '
3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c':
Cat: Move Stk imlpementation into Cat folder
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:54:59 +0000 (10:54 -0700)]
am
d8d03c89: Merge "Ccat: Initial CCAT implementation"
Merge commit '
d8d03c890b03f063bdb669e25742b4f4c69d2bcf' into gingerbread-plus-aosp
* commit '
d8d03c890b03f063bdb669e25742b4f4c69d2bcf':
Ccat: Initial CCAT implementation
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:44:00 +0000 (10:44 -0700)]
Merge "Cat: Move Stk imlpementation into Cat folder"
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:42:15 +0000 (10:42 -0700)]
Merge "Ccat: Initial CCAT implementation"
Eric Laurent [Fri, 30 Jul 2010 16:52:40 +0000 (09:52 -0700)]
am
92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Merge commit '
92e847ed8e455dca3b2d33d92999e3960404d9af' into gingerbread-plus-aosp
* commit '
92e847ed8e455dca3b2d33d92999e3960404d9af':
Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Mattias Larsson [Fri, 30 Jul 2010 15:45:05 +0000 (08:45 -0700)]
am
a4fd0078: Clear preferred activities when home process crashes
Merge commit '
a4fd0078d138b433d2250a74833ee3cc6424143a' into gingerbread-plus-aosp
* commit '
a4fd0078d138b433d2250a74833ee3cc6424143a':
Clear preferred activities when home process crashes
Andreas Huber [Fri, 30 Jul 2010 15:05:56 +0000 (08:05 -0700)]
Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Mathias Agopian [Fri, 30 Jul 2010 06:28:03 +0000 (23:28 -0700)]
remove copybit hack from software opengl (libagl)
h/w acceleration is not supported through software gl + copybit anylonger,
instead, h/w opengl must be used. in the system compositor, a new h/w
composition api will be introduced to allow h/w accelerated composition with
overlays and/or 2D blocks.
Change-Id: I04949cb074ba8c4d637319ace23497c16a58d5bf
Mathias Agopian [Fri, 30 Jul 2010 03:54:12 +0000 (20:54 -0700)]
am
55a76dd8: Merge "fix [
2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread
Merge commit '
55a76dd8d9996c1e93762d7611789aea696d536c' into gingerbread-plus-aosp
* commit '
55a76dd8d9996c1e93762d7611789aea696d536c':
fix [
2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
Mathias Agopian [Fri, 30 Jul 2010 03:52:26 +0000 (20:52 -0700)]
Merge "fix [
2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread
Mathias Agopian [Fri, 30 Jul 2010 01:21:03 +0000 (18:21 -0700)]
am
04d7e83e: Added SensorManager.getAltitude()
Merge commit '
04d7e83e65e246e154b5b346e3eb0081b741ae88' into gingerbread-plus-aosp
* commit '
04d7e83e65e246e154b5b346e3eb0081b741ae88':
Added SensorManager.getAltitude()
Mathias Agopian [Fri, 30 Jul 2010 01:20:51 +0000 (18:20 -0700)]
am
050b5624: Added SensorManager.getMinDelay()
Merge commit '
050b56244ff46d43e4886018d7cd20f0b1dc02b9' into gingerbread-plus-aosp
* commit '
050b56244ff46d43e4886018d7cd20f0b1dc02b9':
Added SensorManager.getMinDelay()
Mathias Agopian [Thu, 29 Jul 2010 23:51:38 +0000 (16:51 -0700)]
Added SensorManager.getMinDelay()
Exposed the new "min delay" sensor property through native and
java sensor apis. This allows the caller to know what is the
maximum rate at which a sensor can return events, or, if a sensor
works in "update" mode (events returned only when the value changes).
Also augmented SensorManager.regusterSensorEvent() so that it can
accept a value in microsecond in addition to the 4 constants already
defined.
Change-Id: If425e9979892666df8c989d7de3c362230fa19e0
Jamie Gennis [Fri, 2 Jul 2010 18:39:12 +0000 (11:39 -0700)]
Fix a bug that prevented the creation of EGL shared contexts.
Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
Jean-Baptiste Queru [Fri, 30 Jul 2010 00:52:09 +0000 (17:52 -0700)]
am
4506c62a: fix inaccurate copyrights
Merge commit '
4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp
* commit '
4506c62abd5767d6d42a97e8e87793a1b3bcb625':
fix inaccurate copyrights
The Android Open Source Project [Fri, 30 Jul 2010 00:45:56 +0000 (17:45 -0700)]
Merge branch 'froyo' of git://android.git./platform/frameworks/base into HEAD
Jean-Baptiste Queru [Fri, 30 Jul 2010 00:35:37 +0000 (17:35 -0700)]
fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
Gilles Debunne [Fri, 30 Jul 2010 00:39:32 +0000 (17:39 -0700)]
Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
Gilles Debunne [Fri, 30 Jul 2010 00:39:18 +0000 (17:39 -0700)]
Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Jean-Baptiste Queru [Thu, 29 Jul 2010 22:59:10 +0000 (15:59 -0700)]
am
9150cff6: Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"
Merge commit '
9150cff64abc79927ade28061ac99a1ebf812905' into gingerbread-plus-aosp
* commit '
9150cff64abc79927ade28061ac99a1ebf812905':
Replaced /sdcard with Environment.getExternalStorageDirectory()
The Android Open Source Project [Thu, 29 Jul 2010 22:49:11 +0000 (15:49 -0700)]
am
3fb62752: am
392edec1: Merge from open-source froyo
Merge commit '
3fb627525e077fa5452a99ac1e2a7e9c41995044' into gingerbread-plus-aosp
* commit '
3fb627525e077fa5452a99ac1e2a7e9c41995044':
Fix a bug where we cleaned an apps external data when upgrading it. :(
The Android Open Source Project [Thu, 29 Jul 2010 22:46:48 +0000 (15:46 -0700)]
am
392edec1: Merge from open-source froyo
Merge commit '
392edec1162e9d00bcb66b271f43908f75d42ace' into gingerbread
* commit '
392edec1162e9d00bcb66b271f43908f75d42ace':
Fix a bug where we cleaned an apps external data when upgrading it. :(
The Android Open Source Project [Thu, 29 Jul 2010 22:38:41 +0000 (15:38 -0700)]
Merge from open-source froyo
Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76
Jean-Baptiste Queru [Thu, 29 Jul 2010 22:01:24 +0000 (15:01 -0700)]
Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"
Jean-Baptiste Queru [Thu, 29 Jul 2010 21:53:42 +0000 (14:53 -0700)]
am
f0fa8416: Merge "Make hasIccCard return true if RUIM card is present."
Merge commit '
f0fa8416e13b2885b858b6974b101c70833e4729' into gingerbread-plus-aosp
* commit '
f0fa8416e13b2885b858b6974b101c70833e4729':
Make hasIccCard return true if RUIM card is present.
Jean-Baptiste Queru [Thu, 29 Jul 2010 21:37:48 +0000 (14:37 -0700)]
Merge "Make hasIccCard return true if RUIM card is present."
Romain Guy [Thu, 29 Jul 2010 21:32:34 +0000 (14:32 -0700)]
am
ce3ac5f0: Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Merge commit '
ce3ac5f02970fcab91e16ecb573931d209b1985c' into gingerbread-plus-aosp
* commit '
ce3ac5f02970fcab91e16ecb573931d209b1985c':
Corrected buffer overflow when parsing /proc/wakelocks
Romain Guy [Thu, 29 Jul 2010 21:32:29 +0000 (14:32 -0700)]
am
e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)"
Merge commit '
e53fe4a465a014788e3b93ca9f30f229481bc4e5' into gingerbread-plus-aosp
* commit '
e53fe4a465a014788e3b93ca9f30f229481bc4e5':
Fixed a documentation Bug (Issue 9236)
Dianne Hackborn [Thu, 29 Jul 2010 21:12:17 +0000 (14:12 -0700)]
am
31b5d548: Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread
Merge commit '
31b5d5485f7336639d252da7ba979234dbd2f1e1' into gingerbread-plus-aosp
* commit '
31b5d5485f7336639d252da7ba979234dbd2f1e1':
Fix a bug where we cleaned an apps external data when upgrading it. :(
Dianne Hackborn [Thu, 29 Jul 2010 21:07:14 +0000 (14:07 -0700)]
Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread
Romain Guy [Thu, 29 Jul 2010 21:00:48 +0000 (14:00 -0700)]
Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Romain Guy [Thu, 29 Jul 2010 21:00:02 +0000 (14:00 -0700)]
Merge "Fixed a documentation Bug (Issue 9236)"
Christopher Tate [Thu, 29 Jul 2010 20:58:00 +0000 (13:58 -0700)]
am
571180c4: Merge "Attempt to fix the SDK build" into gingerbread
Merge commit '
571180c4c72e0bb4f930f8971edf000a652f10f6' into gingerbread-plus-aosp
* commit '
571180c4c72e0bb4f930f8971edf000a652f10f6':
Attempt to fix the SDK build
Christopher Tate [Thu, 29 Jul 2010 20:53:37 +0000 (13:53 -0700)]
Merge "Attempt to fix the SDK build" into gingerbread
Christopher Tate [Thu, 29 Jul 2010 20:16:38 +0000 (13:16 -0700)]
Attempt to fix the SDK build
On the assumption that the local min() function declaration is in
conflict with some 'min' #define floating around, rename the local
function to min_of().
Change-Id: I62aa27f213c6093cc78805de611cf4aa75f0eef2
Jeff Brown [Thu, 29 Jul 2010 20:13:38 +0000 (13:13 -0700)]
am
aab985b9: Fix touch input in landscape mode.
Merge commit '
aab985b951c4cf5ec2753ffbec516164b3c03c3a' into gingerbread-plus-aosp
* commit '
aab985b951c4cf5ec2753ffbec516164b3c03c3a':
Fix touch input in landscape mode.
Jeff Brown [Thu, 29 Jul 2010 20:09:07 +0000 (13:09 -0700)]
am
6ec402b5: DO NOT MERGE: Fix input event injection ANRs on UI thread.
Merge commit '
6ec402b5ae33c8927694d8522b4cc6a5c8ba974e' into gingerbread-plus-aosp
* commit '
6ec402b5ae33c8927694d8522b4cc6a5c8ba974e':
DO NOT MERGE: Fix input event injection ANRs on UI thread.
Jeff Brown [Thu, 29 Jul 2010 20:05:52 +0000 (13:05 -0700)]
Fix touch input in landscape mode.
Change-Id: I7d47e9b02e6443ed604a6bf842028a5db934d90d
Jeff Brown [Wed, 28 Jul 2010 22:48:59 +0000 (15:48 -0700)]
DO NOT MERGE: Fix input event injection ANRs on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.
Change-Id: Ia4aa04fd9b75ea2461a844c5b7933c831c1027e6
Andreas Huber [Thu, 29 Jul 2010 18:11:46 +0000 (11:11 -0700)]
am
6dea6f4e: am
16263d9f: Squashed commit of the following:
Merge commit '
6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp
* commit '
6dea6f4e71b53e421564d783c227cbe0a2469183':
Squashed commit of the following:
Andreas Huber [Thu, 29 Jul 2010 18:07:49 +0000 (11:07 -0700)]
am
16263d9f: Squashed commit of the following:
Merge commit '
16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread
* commit '
16263d9f8cc01392c2f3678b381ce897647c8c81':
Squashed commit of the following:
Mike Lockwood [Thu, 29 Jul 2010 15:58:54 +0000 (08:58 -0700)]
am
8dc16c27: Fix typo in GPS mode logic.
Merge commit '
8dc16c27e23dae5bdf65fd2a2ced97c2f645a633' into gingerbread-plus-aosp
* commit '
8dc16c27e23dae5bdf65fd2a2ced97c2f645a633':
Fix typo in GPS mode logic.
Eric Laurent [Thu, 29 Jul 2010 14:43:10 +0000 (07:43 -0700)]
am
a54d7d3d: Fixed underrun in audioflinger mixer.
Merge commit '
a54d7d3d7dd691334189aab20d23c65710092869' into gingerbread-plus-aosp
* commit '
a54d7d3d7dd691334189aab20d23c65710092869':
Fixed underrun in audioflinger mixer.
Eric Laurent [Thu, 29 Jul 2010 10:35:52 +0000 (03:35 -0700)]
am
493941b8: Allow creation of an audio effect on a session with no audio tracks.
Merge commit '
493941b8d8a12ee843d9823c0177f8005a7be54f' into gingerbread-plus-aosp
* commit '
493941b8d8a12ee843d9823c0177f8005a7be54f':
Allow creation of an audio effect on a session with no audio tracks.
Chris Tate [Thu, 29 Jul 2010 01:16:14 +0000 (18:16 -0700)]
am
7b40518e: Merge "Change unistd.h to stddef.h to be correct" into gingerbread
Merge commit '
7b40518e56a3238b28b24a786a2ff22d5a425765' into gingerbread-plus-aosp
* commit '
7b40518e56a3238b28b24a786a2ff22d5a425765':
Change unistd.h to stddef.h to be correct
Chris Tate [Thu, 29 Jul 2010 01:14:51 +0000 (18:14 -0700)]
Merge "Change unistd.h to stddef.h to be correct" into gingerbread
Brett Chabot [Thu, 29 Jul 2010 00:11:01 +0000 (17:11 -0700)]
am
5f866a4a: Make FrameworkCoreHostTests use ddmlib-prebuilt.
Merge commit '
5f866a4ac389a18613180b056d946ae5a7b84e10' into gingerbread-plus-aosp
* commit '
5f866a4ac389a18613180b056d946ae5a7b84e10':
Make FrameworkCoreHostTests use ddmlib-prebuilt.
Adam Powell [Wed, 28 Jul 2010 23:58:45 +0000 (16:58 -0700)]
am
a0ae8bc5: Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread
Merge commit '
a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a' into gingerbread-plus-aosp
* commit '
a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a':
Fix a bug that could cause flings to last too long using a Scroller
Adam Powell [Wed, 28 Jul 2010 23:56:13 +0000 (16:56 -0700)]
Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread
Kenny Root [Wed, 28 Jul 2010 23:46:12 +0000 (16:46 -0700)]
Change unistd.h to stddef.h to be correct
size_t should be defined through inclusion of stddef.h instead of unistd.h
Change-Id: Ieaadacfca1e1c44c2533ea95f73fc060c1519b52
Kenny Root [Wed, 28 Jul 2010 23:43:08 +0000 (16:43 -0700)]
am
3de27d5a: Merge "Add stdint.h to fix sim-eng" into gingerbread
Merge commit '
3de27d5a56f4b9e3d76ac71445b33e47c635d207' into gingerbread-plus-aosp
* commit '
3de27d5a56f4b9e3d76ac71445b33e47c635d207':
Add stdint.h to fix sim-eng
Kenny Root [Wed, 28 Jul 2010 23:41:49 +0000 (16:41 -0700)]
Merge "Add stdint.h to fix sim-eng" into gingerbread
Kenny Root [Wed, 28 Jul 2010 23:39:52 +0000 (16:39 -0700)]
am
8c5d9430: Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread
Merge commit '
8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6' into gingerbread-plus-aosp
* commit '
8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6':
Add unistd.h for size_t typedef to fix sim-eng
Kenny Root [Wed, 28 Jul 2010 23:37:20 +0000 (16:37 -0700)]
Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread
Mathias Agopian [Wed, 28 Jul 2010 23:33:23 +0000 (16:33 -0700)]
am
9f2a91bc: Merge "fix [
2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
Merge commit '
9f2a91bc2b01c2cc60f73a0bae673225fdddec09' into gingerbread-plus-aosp
* commit '
9f2a91bc2b01c2cc60f73a0bae673225fdddec09':
fix [
2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
Kenny Root [Wed, 28 Jul 2010 23:31:24 +0000 (16:31 -0700)]
Add unistd.h for size_t typedef to fix sim-eng
Change-Id: Ida4f1742547f39539b601f13182c722aa7cf863e