OSDN Git Service
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
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
Mathias Agopian [Wed, 28 Jul 2010 23:30:56 +0000 (16:30 -0700)]
Merge "fix [
2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
Christopher Tate [Wed, 28 Jul 2010 22:38:38 +0000 (15:38 -0700)]
am
bae6fe24: Merge "Support streaming of compressed assets > 1 megabyte" into gingerbread
Merge commit '
bae6fe242ff9a97840ff0c5d9d87c0575d261682' into gingerbread-plus-aosp
* commit '
bae6fe242ff9a97840ff0c5d9d87c0575d261682':
Support streaming of compressed assets > 1 megabyte
Christopher Tate [Wed, 28 Jul 2010 22:36:48 +0000 (15:36 -0700)]
Merge "Support streaming of compressed assets > 1 megabyte" into gingerbread
Christopher Tate [Mon, 26 Jul 2010 18:24:18 +0000 (11:24 -0700)]
Support streaming of compressed assets > 1 megabyte
Compressed assets larger than one megabyte are now decompressed on demand
rather than being decompressed in their entirety and held in memory. Reading
the data in order is relatively efficient, as is seeking forward in the stream.
Seeking backwards is supported, but requires reprocessing the compressed data
from the beginning, so is very inefficient.
In addition, the size limit on compressed assets has been eliminated.
Change-Id: I6e68247957e6c53e7e8ba70d12764695f1723bad
James Dong [Wed, 28 Jul 2010 22:31:09 +0000 (15:31 -0700)]
am
bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
Merge commit '
bc1daf016020ce022ceb971f09e862da5ee82b1d' into gingerbread-plus-aosp
* commit '
bc1daf016020ce022ceb971f09e862da5ee82b1d':
Eliminate the linear cost associated with mSampleSizes.size()
James Dong [Wed, 28 Jul 2010 22:28:54 +0000 (15:28 -0700)]
Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
Kenny Root [Wed, 28 Jul 2010 21:51:33 +0000 (14:51 -0700)]
am
f369a9b5: Remove stale temporary ASEC containers
Merge commit '
f369a9b5f7b2ae75875753caf90ec68fd9dbc144' into gingerbread-plus-aosp
* commit '
f369a9b5f7b2ae75875753caf90ec68fd9dbc144':
Remove stale temporary ASEC containers
Kenny Root [Wed, 28 Jul 2010 21:51:29 +0000 (14:51 -0700)]
am
56c02dc3: Merge "Fix getTempContainerId()" into gingerbread
Merge commit '
56c02dc3d325bab8549ec34b9d6aa7c62ef742d0' into gingerbread-plus-aosp
* commit '
56c02dc3d325bab8549ec34b9d6aa7c62ef742d0':
Fix getTempContainerId()
Kenny Root [Wed, 28 Jul 2010 21:48:40 +0000 (14:48 -0700)]
Merge "Fix getTempContainerId()" into gingerbread
Scott Main [Wed, 28 Jul 2010 21:27:13 +0000 (14:27 -0700)]
am
b1bb7180: am
3bf5c4cd: Merge "fix markup error bug:
2871538" into froyo
Merge commit '
b1bb7180ec3446208ea717d96f6a507ea9955a13' into gingerbread-plus-aosp
* commit '
b1bb7180ec3446208ea717d96f6a507ea9955a13':
fix markup error
Jeff Brown [Wed, 28 Jul 2010 21:25:05 +0000 (14:25 -0700)]
am
6d0fec2d: Refactor input reader to support new device types more easily.
Merge commit '
6d0fec2de3601821f4f44eeb7d7deedebb2b7117' into gingerbread-plus-aosp
* commit '
6d0fec2de3601821f4f44eeb7d7deedebb2b7117':
Refactor input reader to support new device types more easily.
Scott Main [Wed, 28 Jul 2010 21:23:16 +0000 (14:23 -0700)]
am
3bf5c4cd: Merge "fix markup error bug:
2871538" into froyo
Merge commit '
3bf5c4cd30f8bd598842d8ded5f1655406b5c27a' into gingerbread
* commit '
3bf5c4cd30f8bd598842d8ded5f1655406b5c27a':
fix markup error
Scott Main [Wed, 28 Jul 2010 21:20:18 +0000 (14:20 -0700)]
Merge "fix markup error bug:
2871538" into froyo
Jeff Brown [Sat, 24 Jul 2010 04:28:06 +0000 (21:28 -0700)]
Refactor input reader to support new device types more easily.
Refactored the input reader so that each raw input protocol is handled
by a separate subclass of the new InputMapper type. This way, behaviors
pertaining to keyboard, trackballs, touchscreens, switches and other
devices are clearly distinguished for improved maintainability.
Added partial support for describing capabilities of input devices
(incomplete and untested for now, will be fleshed out in later commits).
Simplified EventHub interface somewhat since InputReader is taking over
more of the work.
Cleaned up some of the interactions between InputManager and
WindowManagerService related to reading input state.
Fixed swiping finger from screen edge into display area.
Added logging of device information to 'dumpsys window'.
Change-Id: I17faffc33e3aec3a0f33f0b37e81a70609378612
Dan Egnor [Wed, 28 Jul 2010 19:42:16 +0000 (12:42 -0700)]
am
b350bec5: am
17876aa5: Minor changes to ContentProvider javadoc to improve consistency.
Merge commit '
b350bec514eb9fee473e4ef62680c53e992dc49b' into gingerbread-plus-aosp
* commit '
b350bec514eb9fee473e4ef62680c53e992dc49b':
Minor changes to ContentProvider javadoc to improve consistency.
Dan Egnor [Wed, 28 Jul 2010 19:40:16 +0000 (12:40 -0700)]
am
17876aa5: Minor changes to ContentProvider javadoc to improve consistency.
Merge commit '
17876aa586cc9acfb3e5b909c14b9e73537a1a8d' into gingerbread
* commit '
17876aa586cc9acfb3e5b909c14b9e73537a1a8d':
Minor changes to ContentProvider javadoc to improve consistency.
James Dong [Wed, 28 Jul 2010 19:19:33 +0000 (12:19 -0700)]
am
7e397842: Reduce memory usage by the MP4 file writer - Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested
Merge commit '
7e397842d53a4242a019daa4b234910273121c30' into gingerbread-plus-aosp
* commit '
7e397842d53a4242a019daa4b234910273121c30':
Reduce memory usage by the MP4 file writer
James Dong [Wed, 28 Jul 2010 19:00:58 +0000 (12:00 -0700)]
am
5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
Merge commit '
5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp
* commit '
5587bb7e375c17c1320918e6f473625af1f5e5ac':
Interleave the audio and video by default
James Dong [Wed, 28 Jul 2010 18:58:12 +0000 (11:58 -0700)]
Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
Joe Onorato [Wed, 28 Jul 2010 17:16:39 +0000 (10:16 -0700)]
am
0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread
Merge commit '
0c39b6c65bcb96ed6438c7d792a67708409d8f0f' into gingerbread-plus-aosp
* commit '
0c39b6c65bcb96ed6438c7d792a67708409d8f0f':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Joe Onorato [Wed, 28 Jul 2010 16:53:12 +0000 (09:53 -0700)]
Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread
Eric Laurent [Wed, 28 Jul 2010 14:51:02 +0000 (07:51 -0700)]
am
62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread
Merge commit '
62d83a0c894b72d9abda1340d278d2aeec11e0fb' into gingerbread-plus-aosp
* commit '
62d83a0c894b72d9abda1340d278d2aeec11e0fb':
Audio effects: modified command() parameter types.
Eric Laurent [Wed, 28 Jul 2010 14:48:49 +0000 (07:48 -0700)]
Merge "Audio effects: modified command() parameter types." into gingerbread
Mike Lockwood [Wed, 28 Jul 2010 11:11:03 +0000 (04:11 -0700)]
am
c40d714c: Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit '
c40d714ca520257bcb5ef2e03e83ea3273d3a0ec' into gingerbread-plus-aosp
* commit '
c40d714ca520257bcb5ef2e03e83ea3273d3a0ec':
Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
Mike Lockwood [Wed, 28 Jul 2010 11:04:18 +0000 (04:04 -0700)]
Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Mathias Agopian [Wed, 28 Jul 2010 03:11:35 +0000 (20:11 -0700)]
fix [
2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
this situation happened when the last buffer needed to be resized
(or allocated, the first time). the assumption was that the buffer
was in use by SF itself as the current buffer (obviously, this
assumption made no sense when the buffer had never been allocated, btw).
the system would wait until some other buffer became the "front" buffer.
we fix this problem by entirely removing the requirement that the
buffer being resized cannot be the front buffer. instead, we just
allocate a new buffer and replace the front buffer by the new one.
the downside is that this uses more memory (an extra buffer) for a
brief amount of time while the old buffer is being reallocated and
before it has actually been replaced.
Change-Id: I022e4621209474ceb1c671b23deb4188eaaa7285
Brad Fitzpatrick [Wed, 28 Jul 2010 01:37:20 +0000 (18:37 -0700)]
am
b7304593: Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread
Merge commit '
b73045935cd8ec5d1a1c5e7a7ca800448b5789ea' into gingerbread-plus-aosp
* commit '
b73045935cd8ec5d1a1c5e7a7ca800448b5789ea':
Cap the size of StrictMode buffering we do before calling DropBox.
Brad Fitzpatrick [Wed, 28 Jul 2010 01:34:08 +0000 (18:34 -0700)]
Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread
Steve Howard [Tue, 27 Jul 2010 23:56:52 +0000 (16:56 -0700)]
am
9b8e5566: Merge "One last change to current.xml for new download manager API" into gingerbread
Merge commit '
9b8e5566f99c55222db4127719440272f63a5361' into gingerbread-plus-aosp
* commit '
9b8e5566f99c55222db4127719440272f63a5361':
One last change to current.xml for new download manager API
Steve Howard [Tue, 27 Jul 2010 23:55:14 +0000 (16:55 -0700)]
Merge "One last change to current.xml for new download manager API" into gingerbread
Brad Fitzpatrick [Tue, 27 Jul 2010 23:54:40 +0000 (16:54 -0700)]
am
4d544376: am
86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Merge commit '
4d5443762bd2b44b28edc2f2f75728911d70eac1' into gingerbread-plus-aosp
* commit '
4d5443762bd2b44b28edc2f2f75728911d70eac1':
COMMENT ONLY change to clarify ContentProvider documentation.
Brad Fitzpatrick [Tue, 27 Jul 2010 23:52:12 +0000 (16:52 -0700)]
am
86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Merge commit '
86c035f0d176be9cb06b1e4f2390c25701417586' into gingerbread
* commit '
86c035f0d176be9cb06b1e4f2390c25701417586':
COMMENT ONLY change to clarify ContentProvider documentation.
Brad Fitzpatrick [Tue, 27 Jul 2010 23:44:53 +0000 (16:44 -0700)]
Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Steve Howard [Tue, 27 Jul 2010 23:37:39 +0000 (16:37 -0700)]
am
7feab347: Merge "Un-@hide new download manager public API." into gingerbread
Merge commit '
7feab3470156c7864fe159115d575c16f0974493' into gingerbread-plus-aosp
* commit '
7feab3470156c7864fe159115d575c16f0974493':
Un-@hide new download manager public API.
Steve Howard [Tue, 27 Jul 2010 23:29:37 +0000 (16:29 -0700)]
Merge "Un-@hide new download manager public API." into gingerbread
Brad Fitzpatrick [Tue, 27 Jul 2010 22:21:30 +0000 (15:21 -0700)]
am
10f7c1b8: Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread
Merge commit '
10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885' into gingerbread-plus-aosp
* commit '
10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885':
Explicitly mention again that startCommand() runs on the main thread.
Brad Fitzpatrick [Tue, 27 Jul 2010 22:19:08 +0000 (15:19 -0700)]
Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread
Brad Fitzpatrick [Tue, 27 Jul 2010 21:02:01 +0000 (14:02 -0700)]
am
84c924a6: Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread
Merge commit '
84c924a6c53cb63ca018013c9fda0077413d0005' into gingerbread-plus-aosp
* commit '
84c924a6c53cb63ca018013c9fda0077413d0005':
Replace several IPCThreadState::get() lookups with one.
Brad Fitzpatrick [Tue, 27 Jul 2010 20:59:47 +0000 (13:59 -0700)]
Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread
Brad Fitzpatrick [Tue, 27 Jul 2010 16:49:11 +0000 (09:49 -0700)]
Replace several IPCThreadState::get() lookups with one.
Also, make StrictMode's ThreadLocal final.
Change-Id: I08d400ed254fa67bb7a3dae1227f205a54c00df0
Dan Egnor [Tue, 27 Jul 2010 17:28:38 +0000 (10:28 -0700)]
am
499bee34: Merge "Remove a log message Jason doesn\'t like" into gingerbread
Merge commit '
499bee34c40945f898b7561ca7792ded5b974852' into gingerbread-plus-aosp
* commit '
499bee34c40945f898b7561ca7792ded5b974852':
Remove a log message Jason doesn't like
Dan Egnor [Tue, 27 Jul 2010 17:22:58 +0000 (10:22 -0700)]
Merge "Remove a log message Jason doesn't like" into gingerbread
Joe Onorato [Tue, 27 Jul 2010 16:19:48 +0000 (09:19 -0700)]
am
76d9bf52: am
8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone
Merge commit '
76d9bf52f31b8f31f64348b736422861c90ab463' into gingerbread-plus-aosp
* commit '
76d9bf52f31b8f31f64348b736422861c90ab463':
Add a method to let a properly permissioned app directly
Joe Onorato [Tue, 27 Jul 2010 16:14:42 +0000 (09:14 -0700)]
am
8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." i
Merge commit '
8c65ee2d509db7dcb50ce4530d52eb5bdca3f917' into gingerbread
* commit '
8c65ee2d509db7dcb50ce4530d52eb5bdca3f917':
Add a method to let a properly permissioned app directly
Joe Onorato [Tue, 27 Jul 2010 16:05:05 +0000 (09:05 -0700)]
Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." into froyo
Eric Laurent [Tue, 27 Jul 2010 08:54:30 +0000 (01:54 -0700)]
am
ca57d1cc: Audio Effects: added methods to effects java classes to store and load current effect settings in a single call.
Merge commit '
ca57d1cc89d65dfbd59c749c5736574cd08c7bd3' into gingerbread-plus-aosp
* commit '
ca57d1cc89d65dfbd59c749c5736574cd08c7bd3':
Audio Effects: added methods to effects java classes to store and load current effect settings in
Dirk Dougherty [Tue, 27 Jul 2010 03:04:28 +0000 (20:04 -0700)]
am
2b989e1f: am
0ac8ac30: Doc change: Add docs for licensing service.
Merge commit '
2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1' into gingerbread-plus-aosp
* commit '
2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1':
Doc change: Add docs for licensing service.
Dirk Dougherty [Tue, 27 Jul 2010 03:01:12 +0000 (20:01 -0700)]
am
0ac8ac30: Doc change: Add docs for licensing service.
Merge commit '
0ac8ac301d056604485aeca9ffe5ce8d1e63ef19' into gingerbread
* commit '
0ac8ac301d056604485aeca9ffe5ce8d1e63ef19':
Doc change: Add docs for licensing service.
Brad Fitzpatrick [Tue, 27 Jul 2010 02:46:45 +0000 (19:46 -0700)]
am
eacf0ecd: Merge "Fix StrictMode for Binder.dump()" into gingerbread
Merge commit '
eacf0ecd00f77718ac4570077d729e33b6c320f4' into gingerbread-plus-aosp
* commit '
eacf0ecd00f77718ac4570077d729e33b6c320f4':
Fix StrictMode for Binder.dump()
Brad Fitzpatrick [Tue, 27 Jul 2010 02:44:50 +0000 (19:44 -0700)]
Merge "Fix StrictMode for Binder.dump()" into gingerbread
Jean-Michel Trivi [Tue, 27 Jul 2010 00:53:57 +0000 (17:53 -0700)]
am
4a60d618: Fix NPE in TextToSpeech with setLanguage(null)
Merge commit '
4a60d61887a20d349e5eb38900dfbcaab06630fc' into gingerbread-plus-aosp
* commit '
4a60d61887a20d349e5eb38900dfbcaab06630fc':
Fix NPE in TextToSpeech with setLanguage(null)
Eric Laurent [Mon, 26 Jul 2010 19:25:37 +0000 (12:25 -0700)]
am
00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
Merge commit '
00de721859ca291d0e212a6970f0bd8b3a2f8428' into gingerbread-plus-aosp
* commit '
00de721859ca291d0e212a6970f0bd8b3a2f8428':
Fixed bug in vlm effect bunde wrapper effect init function.
Mike Lockwood [Mon, 26 Jul 2010 19:25:31 +0000 (12:25 -0700)]
am
70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread
Merge commit '
70736a6d92767258543bb03ac22a705535d86341' into gingerbread-plus-aosp
* commit '
70736a6d92767258543bb03ac22a705535d86341':
Avoid starting multiple threads in ShutdownThread
Eric Laurent [Mon, 26 Jul 2010 19:25:24 +0000 (12:25 -0700)]
am
739bf285: Merge "LVM release 1.04." into gingerbread
Merge commit '
739bf285be7a154b92e74b069dff7dc8f7ffc2f3' into gingerbread-plus-aosp
* commit '
739bf285be7a154b92e74b069dff7dc8f7ffc2f3':
LVM release 1.04.
Dianne Hackborn [Mon, 26 Jul 2010 19:24:57 +0000 (12:24 -0700)]
am
14bfa398: Infrastructure to report running services to developer.
Merge commit '
14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp
* commit '
14bfa398a4e8697ce5822861a684b7d1245e4a85':
Infrastructure to report running services to developer.
Dianne Hackborn [Mon, 26 Jul 2010 19:24:39 +0000 (12:24 -0700)]
am
3ac8eb72: Update app label.
Merge commit '
3ac8eb7278e3603d1a35fdbd2fff540a235da2ab' into gingerbread-plus-aosp
* commit '
3ac8eb7278e3603d1a35fdbd2fff540a235da2ab':
Update app label.
Dianne Hackborn [Mon, 26 Jul 2010 19:24:21 +0000 (12:24 -0700)]
am
46730fc7: Fix handling of application disabled state.
Merge commit '
46730fc78388607fd562044cbaaa26ffc9f65337' into gingerbread-plus-aosp
* commit '
46730fc78388607fd562044cbaaa26ffc9f65337':
Fix handling of application disabled state.
Dianne Hackborn [Mon, 26 Jul 2010 19:24:16 +0000 (12:24 -0700)]
am
3bee5af8: Battery stats: start removing last stats, keep total discharge.
Merge commit '
3bee5af8162c177f8c8f4199489a401058ab26a9' into gingerbread-plus-aosp
* commit '
3bee5af8162c177f8c8f4199489a401058ab26a9':
Battery stats: start removing last stats, keep total discharge.
Mathias Agopian [Mon, 26 Jul 2010 19:24:00 +0000 (12:24 -0700)]
am
eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread
Merge commit '
eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d' into gingerbread-plus-aosp
* commit '
eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d':
Report sensor events to BatteryStats service
Mathias Agopian [Mon, 26 Jul 2010 19:23:55 +0000 (12:23 -0700)]
am
f88ed6c2: Merge "SensorService handles last known state properly" into gingerbread
Merge commit '
f88ed6c2ce750fcf7fb23778286e15557de758f9' into gingerbread-plus-aosp
* commit '
f88ed6c2ce750fcf7fb23778286e15557de758f9':
SensorService handles last known state properly
Steve Howard [Mon, 26 Jul 2010 19:23:48 +0000 (12:23 -0700)]
am
a13a02cd: New permission for non-purgeable cache downloads.
Merge commit '
a13a02cd0ec6c0584fc2423feb974d77d0945964' into gingerbread-plus-aosp
* commit '
a13a02cd0ec6c0584fc2423feb974d77d0945964':
New permission for non-purgeable cache downloads.
Xavier Ducrohet [Mon, 26 Jul 2010 18:43:07 +0000 (11:43 -0700)]
am
f72181c6: Fix hosttests to use the new ddmlib API.
Merge commit '
f72181c60943dcfb642aac1dc5fa5416c1bb566e' into gingerbread-plus-aosp
* commit '
f72181c60943dcfb642aac1dc5fa5416c1bb566e':
Fix hosttests to use the new ddmlib API.
Gilles Debunne [Mon, 26 Jul 2010 18:41:46 +0000 (11:41 -0700)]
am
8cd48574: Fixed bug in BitmapFactory.decodeStream
Merge commit '
8cd48574a755bea86243e9f9eabaee341ecf9c60' into gingerbread-plus-aosp
* commit '
8cd48574a755bea86243e9f9eabaee341ecf9c60':
Fixed bug in BitmapFactory.decodeStream
Jean-Baptiste Queru [Mon, 26 Jul 2010 17:22:58 +0000 (10:22 -0700)]
resolved conflicts for merge of
b237bdb6 to gingerbread-plus-aosp
Change-Id: Ibd9f488a0331c472a852054af5db06f8e7d35e76
Eric Laurent [Mon, 26 Jul 2010 17:09:54 +0000 (10:09 -0700)]
Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
Jean-Baptiste Queru [Mon, 26 Jul 2010 17:05:23 +0000 (10:05 -0700)]
am
c7ab09ed: Merge "Fix build."
Merge commit '
c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b' into gingerbread-plus-aosp
* commit '
c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b':
Fix build.
Jean-Baptiste Queru [Mon, 26 Jul 2010 17:01:19 +0000 (10:01 -0700)]
Merge "move native services under services/"
Jean-Baptiste Queru [Mon, 26 Jul 2010 16:56:10 +0000 (09:56 -0700)]
Merge "Fix build."
Mike Lockwood [Mon, 26 Jul 2010 15:11:54 +0000 (08:11 -0700)]
Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread
Eric Laurent [Mon, 26 Jul 2010 09:17:52 +0000 (02:17 -0700)]
Merge "LVM release 1.04." into gingerbread
Jean-Baptiste Queru [Sat, 24 Jul 2010 00:48:11 +0000 (17:48 -0700)]
am
7cdd26ce: Merge "Enables writing to USIM phonebook (fixes issue 8976)."
Merge commit '
7cdd26ce30e61a108e4def932b96aca9f031e5d2' into gingerbread-plus-aosp
* commit '
7cdd26ce30e61a108e4def932b96aca9f031e5d2':
Enables writing to USIM phonebook (fixes issue 8976).
Jean-Baptiste Queru [Sat, 24 Jul 2010 00:35:13 +0000 (17:35 -0700)]
Merge "Enables writing to USIM phonebook (fixes issue 8976)."
Mathias Agopian [Sat, 24 Jul 2010 00:03:43 +0000 (17:03 -0700)]
Merge "Report sensor events to BatteryStats service" into gingerbread
Mathias Agopian [Fri, 23 Jul 2010 23:39:34 +0000 (16:39 -0700)]
Merge "SensorService handles last known state properly" into gingerbread