10431 Commits

Author SHA1 Message Date
Dianne Hackborn
3612487d61 Fix issue #2174566: HOT STABILITY: NPE in activity manager
- Don't crash if the service's app process doesn't have a thread (this
  can happen if we are currently starting the process and then try to
  start the service again).
- Be more robust about deciding to start a service's process: try each
  time it is started; the startProcess call will take care of ignoring
  it if the process is already started.
- Fix some issues where we would leave dead processes on the low memory
  list.

Change-Id: I490e01ba7b45adc191bab7ace377b6873e284897
2009-10-08 16:22:03 -07:00
Mathias Agopian
f3b37d1bce am 846322a9: Merge change Ib96df854 into eclair
Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-plus-aosp

* commit '846322a9ae5ef8155cca0059d3f64d718516ca13':
  add a way to easily catch and log GL errors (compile time flag)
2009-10-08 16:20:45 -07:00
Android (Google) Code Review
846322a9ae Merge change Ib96df854 into eclair
* changes:
  add a way to easily catch and log GL errors (compile time flag)
2009-10-08 19:10:42 -04:00
Mathias Agopian
b96df8548e add a way to easily catch and log GL errors (compile time flag) 2009-10-08 15:58:11 -07:00
Eric Fischer
98d84337bf am aaa6299b: am 24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f' into eclair-plus-aosp

* commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:10:38 -07:00
Jean-Baptiste Queru
bae297c5f6 am ea110274: am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-plus-aosp

* commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:10:32 -07:00
Mike Lockwood
a4f6c96f1a am 348b92bd: Merge change Iee227ace into eclair
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp

* commit '348b92bd513087369ac682e29620d7829fa1381b':
  GPS: Fix problem with SUPL when SUPL APN is already active.
2009-10-08 15:10:25 -07:00
Eric Fischer
aaa6299bcd am 24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '24c8645a995f58885fefcaade0681dd459452deb' into eclair

* commit '24c8645a995f58885fefcaade0681dd459452deb':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:03:24 -07:00
Jean-Baptiste Queru
ea11027401 am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit 'ac62c84a321e2720ab99e37724aba0b6406f39a6' into eclair

* commit 'ac62c84a321e2720ab99e37724aba0b6406f39a6':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:03:15 -07:00
Android (Google) Code Review
348b92bd51 Merge change Iee227ace into eclair
* changes:
  GPS: Fix problem with SUPL when SUPL APN is already active.
2009-10-08 17:58:11 -04:00
Eric Laurent
935c3eb25b am ff94720b: Merge change I80a6a229 into eclair
Merge commit 'ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-plus-aosp

* commit 'ff94720b8bf9f83f326197cb0cb27576168e9448':
  Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
2009-10-08 14:47:26 -07:00
Andreas Huber
1c83540e38 am 2d295a96: Merge change Iedebfe8d into eclair-mr2
Merge commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5' into eclair-mr2-plus-aosp

* commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5':
  Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
2009-10-08 14:39:12 -07:00
Robert Greenwalt
6036288ad9 am c33623a0: Merge change Iba087ecc into eclair-mr2
Merge commit 'c33623a02483e0fa271f4da6c1d38ba9becfe0c2' into eclair-mr2-plus-aosp

* commit 'c33623a02483e0fa271f4da6c1d38ba9becfe0c2':
  Make FWK start a wifi scan if supplicant forgets.
2009-10-08 14:38:59 -07:00
Andreas Huber
39c923a94c am 23bccd6c: Merge change I729c3938 into eclair-mr2
Merge commit '23bccd6c25f581860487835bf7b5442589897352' into eclair-mr2-plus-aosp

* commit '23bccd6c25f581860487835bf7b5442589897352':
  Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
2009-10-08 14:38:48 -07:00
Brett Chabot
0221ec55ac Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 14:38:45 -07:00
Android (Google) Code Review
ff94720b8b Merge change I80a6a229 into eclair
* changes:
  Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
2009-10-08 17:36:18 -04:00
Mike Lockwood
03d246779e GPS: Fix problem with SUPL when SUPL APN is already active.
Use ConnectivityManager.CONNECTIVITY_ACTION broadcast in LocationManagerService
to notify GPS when SUPL connection is ready instead of TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED,
which is not sent in all cases.
Expand LocationProvider.updateNetworkState() to include NetworkInfo object.

Fixes bug b/2155661

Change-Id: Iee227ace7d536b36cf7973e3e6a8b7a621ce6565
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-08 17:24:21 -04:00
Android (Google) Code Review
2d295a9601 Merge change Iedebfe8d into eclair-mr2
* changes:
  Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
2009-10-08 17:23:21 -04:00
Andreas Huber
3f42707c62 Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this. 2009-10-08 14:21:58 -07:00
Android (Google) Code Review
c33623a024 Merge change Iba087ecc into eclair-mr2
* changes:
  Make FWK start a wifi scan if supplicant forgets.
2009-10-08 17:21:07 -04:00
Android (Google) Code Review
23bccd6c25 Merge change I729c3938 into eclair-mr2
* changes:
  Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
2009-10-08 17:19:10 -04:00
Jaikumar Ganesh
bfbe8522a7 am 9d5b5899: Merge change Ie5d93b7e into eclair
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-plus-aosp

* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
  Set the Bond State to NONE when we receive a Agent Cancel.
2009-10-08 13:18:30 -07:00
Robert Greenwalt
b106118c2c Make FWK start a wifi scan if supplicant forgets.
Waits 15sec after getting a DISCONNECTED or INACTIVE state.  Also tracks
the number of supplicant state transitions.  After the period is up
if we haven't received any more supplicant state transitions, it requests a scan.

bug: 2168081
2009-10-08 13:12:05 -07:00
Android (Google) Code Review
9d5b58991e Merge change Ie5d93b7e into eclair
* changes:
  Set the Bond State to NONE when we receive a Agent Cancel.
2009-10-08 16:11:13 -04:00
Eric Fischer
24c8645a99 Import revised translations. DO NOT MERGE
Change-Id: I70d32c0d002d1ba3d08813c1e8985421fca81790
2009-10-08 12:16:00 -07:00
Eric Laurent
80a6a229b3 Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Added a workarouond to request the A2DP output standby directly to audio hardware when the sink is suspended as it seems that the suspend request often fails.

Also take into account resume requests received while a suspend request is pending.
2009-10-08 12:03:51 -07:00
John Wang
c6726351a6 am 33e21fcc: Control H icon display in Status bar.
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-plus-aosp

* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
  Control H icon display in Status bar.
2009-10-08 11:57:11 -07:00
John Wang
33e21fcc99 Control H icon display in Status bar.
Bug 2138275. Add a config setting to control if status bar
should show different icons for UMTS and HSPA connnection.
2009-10-08 11:46:53 -07:00
Romain Guy
1086329f00 am 3b36ed09: Merge change I95319bde into eclair
Merge commit '3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-plus-aosp

* commit '3b36ed09293965e7e5dc20dfa514422388e796d6':
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
2009-10-08 11:19:14 -07:00
Daisuke Miyakawa
4cdb554d19 am 387e73bd: Merge change Ib977f2bd into eclair
Merge commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-plus-aosp

* commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7':
  Make vCard import Photo from vCard file :(
2009-10-08 11:19:08 -07:00
Tadashi G. Takaoka
7c270311f7 am 50b11ec6: Merge change I4d828c3a into eclair-mr2
Merge commit '50b11ec6d955f098c2b8f9cd0573e494442cfc24' into eclair-mr2-plus-aosp

* commit '50b11ec6d955f098c2b8f9cd0573e494442cfc24':
  QuickContactBadge: Make lookup key query asynchronous.
2009-10-08 11:17:14 -07:00
Android (Google) Code Review
50b11ec6d9 Merge change I4d828c3a into eclair-mr2
* changes:
  QuickContactBadge: Make lookup key query asynchronous.
2009-10-08 14:11:30 -04:00
Tadashi G. Takaoka
01fd4e1226 QuickContactBadge: Make lookup key query asynchronous.
Internal Bug: http://b/2130588
2009-10-08 11:06:39 -07:00
Android (Google) Code Review
3b36ed0929 Merge change I95319bde into eclair
* changes:
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
2009-10-08 13:53:54 -04:00
Joshua Bartel
7ff3831949 am 41ae5d5a: am bd324c9b: Merge change I50a321c9 into eclair
Merge commit '41ae5d5adda1987316b02d123a5698180abb1899' into eclair-mr2-plus-aosp

* commit '41ae5d5adda1987316b02d123a5698180abb1899':
2009-10-08 10:53:27 -07:00
Daisuke Miyakawa
5f836334e3 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 10:53:26 -07:00
Android (Google) Code Review
387e73bd8f Merge change Ib977f2bd into eclair
* changes:
  Make vCard import Photo from vCard file :(
2009-10-08 13:49:39 -04:00
Romain Guy
a62e4705d5 Fixes #2175599. Prevents an NPE when AttachInfo is null.
This bug was introduced by a change made to query the window's opacity.

Approved by mcleron.

Change-Id: I95319bde72b0faade095bbbbb317e84b9be8efa8
2009-10-08 10:48:54 -07:00
Joshua Bartel
cd6c33dec9 am bd324c9b: Merge change I50a321c9 into eclair
Merge commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694' into eclair-plus-aosp

* commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694':
  LocationManagerService: Fix race when removing LocationListener
2009-10-08 10:41:13 -07:00
Joshua Bartel
41ae5d5add am bd324c9b: Merge change I50a321c9 into eclair
Merge commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694' into eclair-mr2

* commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694':
  LocationManagerService: Fix race when removing LocationListener
2009-10-08 10:33:51 -07:00
Jean-Baptiste Queru
ac62c84a32 DO NOT MERGE merge from donut-gms 2009-10-08 10:00:40 -07:00
Android (Google) Code Review
bd324c9bd3 Merge change I50a321c9 into eclair
* changes:
  LocationManagerService: Fix race when removing LocationListener
2009-10-08 12:58:48 -04:00
Andreas Huber
a6b76c35a4 am cd74c0d5: The vendor is about to check in a fix for this issue, the workaround is no longer needed
Merge commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9' into eclair-mr2-plus-aosp

* commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9':
  The vendor is about to check in a fix for this issue, the workaround is no longer needed
2009-10-08 09:22:29 -07:00
Andreas Huber
cd74c0d56c The vendor is about to check in a fix for this issue, the workaround is no longer needed 2009-10-08 09:12:11 -07:00
Andreas Huber
729c39381d Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
Since we cannot tell how long it'll take until surface flinger
has displayed the data onscreen, we'll just have to guess...
We must not return the buffer to the decoder before it's been displayed.
2009-10-08 08:41:11 -07:00
San Mehat
c18d869629 am 4f9a7d42: am e9296876: Merge change Ib7c34cec into eclair
Merge commit '4f9a7d426b8be986947f6bf77e4ed90bf3f613e3' into eclair-mr2-plus-aosp

* commit '4f9a7d426b8be986947f6bf77e4ed90bf3f613e3':
2009-10-08 08:32:19 -07:00
Bryan Mawhinney
296f3b048d am 07e6da0b: am f81ecc1f: Merge change I29232f2a into eclair
Merge commit '07e6da0b7a342433850875b4d4d223cbb9d08d0b' into eclair-mr2-plus-aosp

* commit '07e6da0b7a342433850875b4d4d223cbb9d08d0b':
2009-10-08 08:32:13 -07:00
Marc Blank
3c5600eccc Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 08:32:12 -07:00
San Mehat
4f9a7d426b am e9296876: Merge change Ib7c34cec into eclair
Merge commit 'e9296876140ba055d311f3f11af25beae652e6d8' into eclair-mr2

* commit 'e9296876140ba055d311f3f11af25beae652e6d8':
  dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
2009-10-08 08:24:16 -07:00
San Mehat
a1b22b6ee0 am e9296876: Merge change Ib7c34cec into eclair
Merge commit 'e9296876140ba055d311f3f11af25beae652e6d8' into eclair-plus-aosp

* commit 'e9296876140ba055d311f3f11af25beae652e6d8':
  dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
2009-10-08 08:23:02 -07:00