3194 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
5ea89f77ea Fix build: HistoryRecord is now ActivityRecord
Change-Id: Ide07d72abd02aeb7e56695f2e98ae7af1568ad1c
2010-07-30 09:30:31 -07:00
Mattias Larsson
5f5548e82d am 85673d91: am a4fd0078: Clear preferred activities when home process crashes
Merge commit '85673d91681e6b5dede0c72f36ed3b81f5c4bb0d'

* commit '85673d91681e6b5dede0c72f36ed3b81f5c4bb0d':
  Clear preferred activities when home process crashes
2010-07-30 08:51:09 -07:00
Mattias Larsson
85673d9168 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
2010-07-30 08:45:05 -07:00
Mattias Larsson
a4fd0078d1 Clear preferred activities when home process crashes
If the "default" Home application has been replaced with
a third-party app that is repeatedly crashing at start-up,
there is no way for the user to clear the preferred activities
or uninstall the bad application. If we clear the package
preferred activities when the application crashes, the user
will be prompted with the ResolverActivity at the next boot
and can try using the app again or choose to use another
Home application.

Change-Id: I8ba8e95e6752916d50515d96c117d3084fa980fd
2010-07-30 08:36:42 -07:00
Dianne Hackborn
d4e60a1f8e Merge "Maybe fix issue #2881233: reboot loop at boot on stingray" 2010-07-29 19:16:18 -07:00
Dianne Hackborn
154db5f635 Maybe fix issue #2881233: reboot loop at boot on stingray
Change-Id: I4bd88fdd506d061146c441143d39b796a8df2f49
2010-07-29 19:15:19 -07:00
Jean-Baptiste Queru
8f5d160c92 am 0c51c98f: am 4506c62a: fix inaccurate copyrights
Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf'

* commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf':
  fix inaccurate copyrights
2010-07-29 17:54:42 -07:00
Jean-Baptiste Queru
0c51c98fd9 am 4506c62a: fix inaccurate copyrights
Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp

* commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625':
  fix inaccurate copyrights
2010-07-29 17:52:09 -07:00
Jean-Baptiste Queru
4506c62abd fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
2010-07-29 17:35:37 -07:00
Dianne Hackborn
f058088888 am 52075987: am 31b5d548: Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread
Merge commit '52075987c5726c95613f98571aac4c54e8319df4'

* commit '52075987c5726c95613f98571aac4c54e8319df4':
  Fix a bug where we cleaned an apps external data when upgrading it. :(
2010-07-29 14:17:30 -07:00
Dianne Hackborn
52075987c5 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. :(
2010-07-29 14:12:17 -07:00
Dianne Hackborn
31b5d5485f Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread 2010-07-29 14:07:14 -07:00
Dianne Hackborn
fb1f103191 Fix a bug where we cleaned an apps external data when upgrading it. :(
Change-Id: I0eee1e7062d334c66d6daa3c43e11a292263aada
2010-07-29 13:58:32 -07:00
Jeff Brown
b0a57502c6 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.
2010-07-29 13:09:07 -07:00
Dianne Hackborn
5132b37018 Fix issue #2859543: PhoneStatusBar appears at startup after wipe
Change-Id: I63c8fcd7152a99ba7f2c3d57a5ad9ceaf05529d7
2010-07-29 13:05:34 -07:00
Jeff Brown
6ec402b5ae 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
Jeff Brown
bbda99d208 Fixed StatusBar ANRs due to input event injection on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.

Change-Id: I0464f70ff5cbd519dbb02686b2cb5d810fe7dbb2
2010-07-29 12:19:08 -07:00
Mike Lockwood
81cf771478 am 7522cac5: am 8dc16c27: Fix typo in GPS mode logic.
Merge commit '7522cac555bd8010d6603cfe0ad831a6f1c1af4f'

* commit '7522cac555bd8010d6603cfe0ad831a6f1c1af4f':
  Fix typo in GPS mode logic.
2010-07-29 09:06:10 -07:00
Mike Lockwood
7522cac555 am 8dc16c27: Fix typo in GPS mode logic.
Merge commit '8dc16c27e23dae5bdf65fd2a2ced97c2f645a633' into gingerbread-plus-aosp

* commit '8dc16c27e23dae5bdf65fd2a2ced97c2f645a633':
  Fix typo in GPS mode logic.
2010-07-29 08:58:54 -07:00
Mike Lockwood
8dc16c27e2 Fix typo in GPS mode logic.
MS-Assisted support should not be required for using MS-Based mode.

Change-Id: Ia6ee219674de3e9cc13190b753f8776305a4fa90
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-29 11:39:55 -04:00
Eric Laurent
efd58e5fd0 am ba676a00: am a54d7d3d: Fixed underrun in audioflinger mixer.
Merge commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd'

* commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd':
  Fixed underrun in audioflinger mixer.
2010-07-29 07:46:03 -07:00
Eric Laurent
ba676a00c1 am a54d7d3d: Fixed underrun in audioflinger mixer.
Merge commit 'a54d7d3d7dd691334189aab20d23c65710092869' into gingerbread-plus-aosp

* commit 'a54d7d3d7dd691334189aab20d23c65710092869':
  Fixed underrun in audioflinger mixer.
2010-07-29 07:43:10 -07:00
Eric Laurent
a54d7d3d7d Fixed underrun in audioflinger mixer.
When all audio tracks have been disabled and the mixer is running idle before the output stream is placed in standby,
the mixer sometimes fails to write to the output stream on time to avoid underrun.

This is because the sleep period used to wait before the next write to output stream is too close to the actual buffer duration.
In fact this sleep time is not critical as if we write too early to the output stream, the kernel driver will wait for free buffers
from the audio DSP DMA and we will sleep anyways.

The fix consists in dividing the calculated wait period by 2 to increase the margin.

Change-Id: I5730887dc2ccce2a511bc858494a6f7da6b392a0
2010-07-29 06:50:24 -07:00
Eric Laurent
e199f1dddb am 45dc4f82: am 493941b8: Allow creation of an audio effect on a session with no audio tracks.
Merge commit '45dc4f82a00e52b12389b22a7cfbbee5609e8e28'

* commit '45dc4f82a00e52b12389b22a7cfbbee5609e8e28':
  Allow creation of an audio effect on a session with no audio tracks.
2010-07-29 05:22:10 -07:00
Eric Laurent
45dc4f82a0 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.
2010-07-29 03:35:52 -07:00
Eric Laurent
493941b8d8 Allow creation of an audio effect on a session with no audio tracks.
This is necessary to allow creating and enabling an effect attached to a particular player
session before the playback is started. As a matter of fact, the implementation of the mediaplayer
does not create the AudioTrack before playback starts.

Change-Id: I1266e8885f9d756acc949303321aaac0fbf83e34
2010-07-29 02:34:40 -07:00
Mathias Agopian
fdbb58cb11 am 9362ea76: am 9f2a91bc: Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
Merge commit '9362ea760f565389f5accce7e17476d05510ed59'

* commit '9362ea760f565389f5accce7e17476d05510ed59':
  fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
2010-07-28 16:36:08 -07:00
Mathias Agopian
9362ea760f 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.
2010-07-28 16:33:23 -07:00
Mathias Agopian
9f2a91bc2b 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
Mike Lockwood
03a545e5ed Merge changes I00d6980a,I814221b4,Id88603a5
* changes:
  CameraBrowser: Launch itself when a camera is attached to USB.
  Send Intents when PTP compatible devices are connected/disconnected to USB
  Give system server permission to access USB.
2010-07-28 14:59:45 -07:00
Kenny Root
048391511e am bba1eede: am f369a9b5: Remove stale temporary ASEC containers
Merge commit 'bba1eede35b356a50dfe12692c2ff30cd5de152d'

* commit 'bba1eede35b356a50dfe12692c2ff30cd5de152d':
  Remove stale temporary ASEC containers
2010-07-28 14:54:21 -07:00
Kenny Root
a8ec0459ab am 4b812738: am 56c02dc3: Merge "Fix getTempContainerId()" into gingerbread
Merge commit '4b812738c70be53e79ba8a6b9c93de14388d1311'

* commit '4b812738c70be53e79ba8a6b9c93de14388d1311':
  Fix getTempContainerId()
2010-07-28 14:54:16 -07:00
Kenny Root
bba1eede35 am f369a9b5: Remove stale temporary ASEC containers
Merge commit 'f369a9b5f7b2ae75875753caf90ec68fd9dbc144' into gingerbread-plus-aosp

* commit 'f369a9b5f7b2ae75875753caf90ec68fd9dbc144':
  Remove stale temporary ASEC containers
2010-07-28 14:51:33 -07:00
Kenny Root
4b812738c7 am 56c02dc3: Merge "Fix getTempContainerId()" into gingerbread
Merge commit '56c02dc3d325bab8549ec34b9d6aa7c62ef742d0' into gingerbread-plus-aosp

* commit '56c02dc3d325bab8549ec34b9d6aa7c62ef742d0':
  Fix getTempContainerId()
2010-07-28 14:51:29 -07:00
Kenny Root
f369a9b5f7 Remove stale temporary ASEC containers
When a temporary container is created, its existence should be
ephemeral. However, if there is an error that causes system_server to be
killed during the process of creating a finalized ASEC, delete the stale
containers on the next start-up of system_server.

Change-Id: I7be8f94638a824295474c9a95960594848cb726b
2010-07-28 14:48:58 -07:00
Kenny Root
56c02dc3d3 Merge "Fix getTempContainerId()" into gingerbread 2010-07-28 14:48:40 -07:00
Kenny Root
c78a807974 Fix getTempContainerId()
getTempContainerId() would always return "smdl2tmp1" unless you had
MAX_CONTAINERS number of SD card SDKs, because of an array sort that put
all the zeros at the beginning.

Switch from trying to find a hole in the series of numbers to just
getting a number that's one larger than the previous. This reduces the
algorithmic complexity and the memory requirements.

Bug: 2832580
Change-Id: I32dc75ef5a6645f594ea47b032d7402e8860ebcd
2010-07-28 14:45:14 -07:00
Jeff Brown
2279971b6f am 9795a25d: am 6d0fec2d: Refactor input reader to support new device types more easily.
Merge commit '9795a25da060f9a7df87da8ab43fb1086d4322a5'

* commit '9795a25da060f9a7df87da8ab43fb1086d4322a5':
  Refactor input reader to support new device types more easily.
2010-07-28 14:27:55 -07:00
Jeff Brown
9795a25da0 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.
2010-07-28 14:25:05 -07:00
Jeff Brown
6d0fec2de3 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
2010-07-28 14:16:15 -07:00
Joe Onorato
17350886d0 am d3f6c1fa: 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 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188'

* commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
2010-07-28 11:05:29 -07:00
Mike Lockwood
ff0aff1914 Merge "Add new system service CountryDetector" 2010-07-28 11:04:18 -07:00
Joe Onorato
d3f6c1fa45 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.
2010-07-28 10:16:39 -07:00
Joe Onorato
0c39b6c65b Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread 2010-07-28 09:53:12 -07:00
Eric Laurent
ba2709583d am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread
Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf'

* commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf':
  Audio effects: modified command() parameter types.
2010-07-28 07:53:24 -07:00
Eric Laurent
6fa8888254 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.
2010-07-28 07:51:02 -07:00
Eric Laurent
62d83a0c89 Merge "Audio effects: modified command() parameter types." into gingerbread 2010-07-28 07:48:49 -07:00
Eric Laurent
a4c72acfbc Audio effects: modified command() parameter types.
The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command()
function have been modified from int to uint32_t. This is more consistent with their role.

Change-Id: I84d289fc262d6753747910f06f485597dfee6591
2010-07-28 05:49:21 -07:00
Mike Lockwood
d8aad91d8c am d5786b98: am c40d714c: Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b'

* commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b':
  Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
2010-07-28 04:18:10 -07:00
Mike Lockwood
d5786b982c 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
2010-07-28 04:11:03 -07:00