James Dong
c59e3d21c8
Merge "File writer has a designated writer thread now" into gingerbread
2010-08-03 10:35:55 -07:00
James Dong
902e2d3d1a
Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
2010-08-03 09:59:11 -07:00
James Dong
8535375e2e
Merge "Add lost frame handling in AudioSource" into gingerbread
2010-08-02 18:13:54 -07:00
Scott Main
5e11d7ad9f
am 5aa4680e: update device dashboard
...
Merge commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d' into gingerbread
* commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d':
update device dashboard
2010-08-02 17:42:11 -07:00
Steve Howard
c56eae725e
Merge "New secure setting for mobile download size limit." into gingerbread
2010-08-02 16:49:22 -07:00
John Wang
156abdaf99
Merge changes Ic30e2801,I387bab4d into gingerbread
...
* changes:
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
2010-08-02 15:31:37 -07:00
Christopher Tate
47890f3257
Merge "Mute a common-case progress log about input injection" into gingerbread
2010-08-02 15:14:44 -07:00
Kenny Root
2a4e1249de
Merge "Do not deference before null check" into gingerbread
2010-08-02 12:33:40 -07:00
Wink Saville
10375734e1
am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
...
Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread
* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:02:42 -07:00
Scott Main
aa57958f88
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.
2010-08-02 09:23:50 -07:00
Scott Main
1cf67def06
Merge "Doc change: Add nexus one to dev phones." into froyo
2010-08-02 09:16:30 -07:00
Dianne Hackborn
64a74f6537
Merge "Make the systemui process persistent." into gingerbread
2010-07-30 19:10:01 -07:00
Mathias Agopian
3efd03a3c2
Merge "remove copybit hack from software opengl (libagl)" into gingerbread
2010-07-30 18:01:25 -07:00
Dirk Dougherty
6e6cc2014f
am 2ff1ba01: Doc change: Cleanup for licensing doc.
...
Merge commit '2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread
* commit '2ff1ba012c59169c9719cfab4516b9149414380b':
Doc change: Cleanup for licensing doc.
2010-07-30 17:37:39 -07:00
Kenny Root
20f352905f
Merge "Only install after MCS success" into gingerbread
2010-07-30 16:55:37 -07:00
Brad Fitzpatrick
36b022e7c2
Merge "StrictMode: time violations in Binder calls" into gingerbread
2010-07-30 15:20:28 -07:00
James Dong
6c9c4ea978
Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
2010-07-30 14:49:23 -07:00
Jeff Brown
68e491d5da
Merge "Improve thread safety of input mappers." into gingerbread
2010-07-30 14:48:25 -07:00
Jeff Brown
b51719b9ae
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
2010-07-30 14:43:58 -07:00
James Dong
1ec47739f6
Merge "Lower the lower bound for max file duration check" into gingerbread
2010-07-30 14:28:26 -07:00
Xia Wang
7cfd5ebcc7
Merge "DO NOT MERGE" into gingerbread
2010-07-30 13:44:23 -07:00
Andreas Huber
f94c59413e
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.
2010-07-30 12:15:02 -07:00
Jean-Baptiste Queru
8fb1869d39
resolved conflicts for merge of 27eecb70 to gingerbread
...
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
2010-07-30 12:08:31 -07:00
Gilles Debunne
c080e5e523
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.
2010-07-30 11:53:21 -07:00
Gilles Debunne
55c65ca3f1
am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
...
Merge commit '83884db9dc0fbddb6ece566284259f6b941beb33' into gingerbread
* commit '83884db9dc0fbddb6ece566284259f6b941beb33':
Fixed doc typos in HeterogeneousExpandableList.java.
2010-07-30 11:53:16 -07:00
Steve Howard
174ff06028
Merge "Update Context.getSystemService() docs for download manager." into gingerbread
2010-07-30 11:09:48 -07:00
Andreas Huber
3d4ba7f573
Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
2010-07-30 08:05:56 -07:00
Mathias Agopian
bb0628d9de
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
2010-07-29 23:28:03 -07:00
Mathias Agopian
3a8e497f3b
Merge "fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread
2010-07-29 20:52:26 -07:00
Mathias Agopian
a48bcf62b6
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
2010-07-29 18:18:00 -07:00
The Android Open Source Project
7b8a2361ce
Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD
2010-07-29 17:45:56 -07:00
Jean-Baptiste Queru
d80c3e2f3c
fix inaccurate copyrights
...
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
2010-07-29 17:41:35 -07:00
Gilles Debunne
81213d6a60
Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
2010-07-29 17:39:32 -07:00
Gilles Debunne
e2ca0e83c9
Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
2010-07-29 17:39:18 -07:00
The Android Open Source Project
27065359e3
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. :(
2010-07-29 15:46:48 -07:00
The Android Open Source Project
b5a0d4b2df
Merge from open-source froyo
...
Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76
2010-07-29 15:38:49 -07:00
Dianne Hackborn
8766192cf1
Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread
2010-07-29 14:07:14 -07:00
Christopher Tate
a58452270b
Merge "Attempt to fix the SDK build" into gingerbread
2010-07-29 13:53:37 -07:00
Christopher Tate
6c6a3fbd9d
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
2010-07-29 13:42:45 -07:00
Jeff Brown
82de2fcdd0
Fix touch input in landscape mode.
...
Change-Id: I7d47e9b02e6443ed604a6bf842028a5db934d90d
2010-07-29 13:05:52 -07:00
Jeff Brown
f67c53eee3
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
2010-07-29 12:54:27 -07:00
Andreas Huber
302dd91b86
am 16263d9f: Squashed commit of the following:
...
Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread
* commit '16263d9f8cc01392c2f3678b381ce897647c8c81':
Squashed commit of the following:
2010-07-29 11:07:49 -07:00
Chris Tate
7fd86dea00
Merge "Change unistd.h to stddef.h to be correct" into gingerbread
2010-07-28 18:14:51 -07:00
Adam Powell
01467048a0
Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread
2010-07-28 16:56:13 -07:00
Kenny Root
0832a31d54
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
2010-07-28 16:46:12 -07:00
Kenny Root
8e8ca37747
Merge "Add stdint.h to fix sim-eng" into gingerbread
2010-07-28 16:41:49 -07:00
Kenny Root
28282dc4e6
Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread
2010-07-28 16:37:20 -07:00
Kenny Root
937cd1b707
Add unistd.h for size_t typedef to fix sim-eng
...
Change-Id: Ida4f1742547f39539b601f13182c722aa7cf863e
2010-07-28 16:31:24 -07:00
Mathias Agopian
edae28809a
Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
2010-07-28 16:30:56 -07:00
Christopher Tate
46f28d328a
Merge "Support streaming of compressed assets > 1 megabyte" into gingerbread
2010-07-28 15:36:48 -07:00