Commit Graph

5678 Commits

Author SHA1 Message Date
Android (Google) Code Review
c40ca463b7 Merge change 26349 into eclair
* changes:
  Fix issue 2116700: Ringer screwy while connected over Bluetooth.
2009-09-22 12:20:38 -04:00
Android (Google) Code Review
1f3c744750 Merge change 26315 into eclair
* changes:
  VpnService: use Credentials instead of CertTool.
2009-09-22 12:02:39 -04:00
Mike Reed
1516dd4043 am 585c67f7: Merge change 26300 into eclair
Merge commit '585c67f70f18b8879ced854c5865141d6c650cd8' into eclair-plus-aosp

* commit '585c67f70f18b8879ced854c5865141d6c650cd8':
  experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on
2009-09-22 05:01:25 -07:00
Android (Google) Code Review
96a1b05478 Merge change 26300 into eclair
* changes:
  experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on exact pixel boundaries when we walk the inverse matrix (e.g. 2/3, 1+1/3, 2, 2+2/3, 3+1/3, 4, ...).
2009-09-22 07:55:58 -04:00
Bjorn Bringert
7dc051e5cd am 976e363f: Merge change 26260 into eclair
Merge commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d' into eclair-plus-aosp

* commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d':
  Add search_mode flag to intents launched by QSB suggestions
2009-09-22 03:02:48 -07:00
Android (Google) Code Review
e6450c179e Merge change 26260 into eclair
* changes:
  Add search_mode flag to intents launched by QSB suggestions
2009-09-22 05:54:31 -04:00
Eric Laurent
aef692f50f Fix issue 2116700: Ringer screwy while connected over Bluetooth.
There was a regression introduced in AudioFlinger by change 24114 for suspended output:
The suspended output was not reading and mixing audio tracks.
When the phone is ringing, the A2DP output is suspended if the SCO headset and A2DP headset are the same. As the ringtone is played over the duplicated output, the fact that the A2DP output was not reading data was causing the hardware output to be stalled from time to time.
2009-09-22 00:35:48 -07:00
Chung-yih Wang
2ba4a60a1e am 5f55d8c9: Fix the incorrect field name in EAP wifi network.
Merge commit '5f55d8c9d447f492aed955ac29454e0c482a4956' into eclair-plus-aosp

* commit '5f55d8c9d447f492aed955ac29454e0c482a4956':
  Fix the incorrect field name in EAP wifi network.
2009-09-22 00:35:20 -07:00
Chung-yih Wang
b749c18cce am 2e2f6b5e: Merge change 26328 into eclair
Merge commit '2e2f6b5e6866cdba632bdd599cadbf235b80546f' into eclair-plus-aosp

* commit '2e2f6b5e6866cdba632bdd599cadbf235b80546f':
  Fix the issue of 'Wifi framework is not aware of state change'
2009-09-21 23:09:48 -07:00
Android (Google) Code Review
31c0719961 Merge change 26328 into eclair
* changes:
  Fix the issue of 'Wifi framework is not aware of state change'
2009-09-22 02:02:04 -04:00
Jeff Sharkey
6d6bd2fb62 am 9cea89c1: Basic API for third-party apps to define custom Data rows.
Merge commit '9cea89c103bc876bb083a9ac1b845534dca6172b' into eclair-plus-aosp

* commit '9cea89c103bc876bb083a9ac1b845534dca6172b':
  Basic API for third-party apps to define custom Data rows.
2009-09-21 21:45:26 -07:00
Jeff Sharkey
24fa9febb4 am a25c9b28: Remove unused type attribute.
Merge commit 'a25c9b280e3d14e5c8b443b1592d2ab6069efdc3' into eclair-plus-aosp

* commit 'a25c9b280e3d14e5c8b443b1592d2ab6069efdc3':
  Remove unused type attribute.
2009-09-21 21:32:54 -07:00
Mike Lockwood
08e866c008 am 94db928d: PowerManager: Require proximity sensor value be less than Sensor.getMaximumRange()
Merge commit '94db928d8cf5a69e8c2907fc33a6d656045f263d' into eclair-plus-aosp

* commit '94db928d8cf5a69e8c2907fc33a6d656045f263d':
  PowerManager: Require proximity sensor value be less than Sensor.getMaximumRange()
2009-09-21 21:32:42 -07:00
Jeff Sharkey
8e43b2e2bf am 3f0476a4: Basic API for third-party apps to define custom Data rows.
Merge commit '3f0476a4e283ce4e55caac016293dafe9dca11fa' into eclair-plus-aosp

* commit '3f0476a4e283ce4e55caac016293dafe9dca11fa':
  Basic API for third-party apps to define custom Data rows.
2009-09-21 21:11:32 -07:00
Jason Sams
25fd3418c8 am cd263b5c: Merge change 26322 into eclair
Merge commit 'cd263b5c072703e80fe43e46baa831304441369b' into eclair-plus-aosp

* commit 'cd263b5c072703e80fe43e46baa831304441369b':
  Implement more type checks on Allocations.
2009-09-21 19:50:47 -07:00
Android (Google) Code Review
29cf9d6860 Merge change 26322 into eclair
* changes:
  Implement more type checks on Allocations. Add tracking for allocations created using the "sized" helper. Add more param validation for data upload calls.
2009-09-21 22:42:28 -04:00
Dan Egnor
93b3ecc365 am 9bbd5ee4: Merge change 26290 into eclair
Merge commit '9bbd5ee49f4a26b87273c40a955557e63f10da3b' into eclair-plus-aosp

* commit '9bbd5ee49f4a26b87273c40a955557e63f10da3b':
  Make IBackupTransport.finishBackup() also return an int code, since it too can
2009-09-21 19:31:54 -07:00
Jack Palevich
3766b96c5e am 1167b43c: Merge change 26317 into eclair
Merge commit '1167b43c3d1ca232c9b4e0a75343b6b3cb90f0df' into eclair-plus-aosp

* commit '1167b43c3d1ca232c9b4e0a75343b6b3cb90f0df':
  Allow GLSurfaceView clients to customize EGL Surfaces and Contexts.
2009-09-21 19:31:42 -07:00
Android (Google) Code Review
93de13a123 Merge change 26290 into eclair
* changes:
  Make IBackupTransport.finishBackup() also return an int code, since it too can return TRANSPORT_NOT_INITIALIZED (in fact that's typically how it comes).
2009-09-21 22:26:35 -04:00
Android (Google) Code Review
265def61cf Merge change 26317 into eclair
* changes:
  Allow GLSurfaceView clients to customize EGL Surfaces and Contexts.
2009-09-21 22:22:18 -04:00
Dmitri Plotnikov
a79bf5eab6 am 0fc0244e: [Issue 2097207] Adding filtering capability to aggregation suggestions
Merge commit '0fc0244e808925e848ee9e350a3a213bd7574249' into eclair-plus-aosp

* commit '0fc0244e808925e848ee9e350a3a213bd7574249':
  [Issue 2097207] Adding filtering capability to aggregation suggestions
2009-09-21 18:53:37 -07:00
Dianne Hackborn
ef43400b6c am fe2bddfa: Don\'t wake up the screen as soon as the lid opens.
Merge commit 'fe2bddfae1b8c2375f58216871d923cbfe267dd3' into eclair-plus-aosp

* commit 'fe2bddfae1b8c2375f58216871d923cbfe267dd3':
  Don't wake up the screen as soon as the lid opens.
2009-09-21 18:29:39 -07:00
Dianne Hackborn
099c78fcc0 am 7f3fb7de: Merge change 26130 into eclair
Merge commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce' into eclair-plus-aosp

* commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce':
  Turn animations on by default.
2009-09-21 17:40:06 -07:00
Android (Google) Code Review
350ef93bca Merge change 26130 into eclair
* changes:
  Turn animations on by default.
2009-09-21 20:34:30 -04:00
Jaikumar Ganesh
056d92f21d am 9197081f: Merge change 26275 into eclair
Merge commit '9197081f8feca110455740874e06e05771f462c8' into eclair-plus-aosp

* commit '9197081f8feca110455740874e06e05771f462c8':
  Send the address of the device with the UUID intent.
2009-09-21 17:10:46 -07:00
Yong Zhang
8fa0dd0126 am 6e81a40d: Merge change 26286 into eclair
Merge commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9' into eclair-plus-aosp

* commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9':
  Resolve race conditions with disconnect of CDMA data and airplane mode
2009-09-21 17:10:34 -07:00
Android (Google) Code Review
90a0e82db5 Merge change 26275 into eclair
* changes:
  Send the address of the device with the UUID intent.
2009-09-21 20:04:54 -04:00
Android (Google) Code Review
14e02f02cf Merge change 26286 into eclair
* changes:
  Resolve race conditions with disconnect of CDMA data and airplane mode
2009-09-21 20:01:55 -04:00
Jaikumar Ganesh
b10d6a958f am a7719af3: Merge change 26217 into eclair
Merge commit 'a7719af31290bea50d822b535b6a886ba7a88097' into eclair-plus-aosp

* commit 'a7719af31290bea50d822b535b6a886ba7a88097':
  Cache the remote device's service channel.
2009-09-21 16:09:57 -07:00
Jack Palevich
b2e7900839 am 5222a957: Merge change 26270 into eclair
Merge commit '5222a9571ea2538c989608d376ac71eabe0f09d4' into eclair-plus-aosp

* commit '5222a9571ea2538c989608d376ac71eabe0f09d4':
  Fix GLSurfaceView to sync surfaceDestroyed with GL rendering thread
2009-09-21 16:09:45 -07:00
Android (Google) Code Review
c2cd3f21ca Merge change 26217 into eclair
* changes:
  Cache the remote device's service channel.
2009-09-21 19:00:40 -04:00
Android (Google) Code Review
f9b8d70aa2 Merge change 26270 into eclair
* changes:
  Fix GLSurfaceView to sync surfaceDestroyed with GL rendering thread
2009-09-21 19:00:37 -04:00
Wu-cheng Li
a5d3f7f0a1 am 36322db5: Add focus API and FLASH_MODE_VIDEO_LIGHT.
Merge commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5' into eclair-plus-aosp

* commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5':
  Add focus API and FLASH_MODE_VIDEO_LIGHT.
2009-09-21 15:40:13 -07:00
Andy McFadden
ddda6b6b56 am dbe8bad1: Merge change 26253 into eclair
Merge commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede' into eclair-plus-aosp

* commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede':
  Work around gcc 4.0.3 bug.
2009-09-21 15:22:06 -07:00
Android (Google) Code Review
7e986a795f Merge change 26253 into eclair
* changes:
  Work around gcc 4.0.3 bug.
2009-09-21 18:12:31 -04:00
Wei Huang
7706678aea am 31a12429: Merge change 26254 into eclair
Merge commit '31a12429b77e87b5047589d251642b975ad35b9a' into eclair-plus-aosp

* commit '31a12429b77e87b5047589d251642b975ad35b9a':
  fix bug 2134685: fix tests for PhoneNumberUtilsTest.
2009-09-21 14:50:01 -07:00
Android (Google) Code Review
8cf378f7b3 Merge change 26254 into eclair
* changes:
  fix bug 2134685: fix tests for PhoneNumberUtilsTest.
2009-09-21 17:43:20 -04:00
Andy McFadden
2944a2b360 Work around gcc 4.0.3 bug.
This appears to fix the sim-eng build on the gDapper build machines.

Basic problem is that LayerBuffer::OverlaySource has a constructor that
calls SurfaceFlinger.signalEvent().  SurfaceFlinger lists LayerBuffer
as a friend, but that's not enough to convince gcc that the embedded
OverlaySource class is also a friend.  I don't see a way to make them
friendly, so I marked signalEvent() as public.
2009-09-21 14:33:20 -07:00
Yu Shan Emily Lau
1dc2f22294 am c2f97178: Merge change 26111 into eclair
Merge commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558' into eclair-plus-aosp

* commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558':
  Added a workaround to clear the browser cache.
2009-09-21 14:04:26 -07:00
Android (Google) Code Review
e4a632af0e Merge change 26111 into eclair
* changes:
  Added a workaround to clear the browser cache.
2009-09-21 16:58:35 -04:00
Mark Wagner
ee908aa1f4 am fe6104fb: When manually setting the uri pass it through to the badge widget.
Merge commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449' into eclair-plus-aosp

* commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449':
  When manually setting the uri pass it through to the badge widget.
2009-09-21 13:53:37 -07:00
Jeff Sharkey
918acb9d76 am 88a83d3f: Update getDisplayLabel() API to support new types.
Merge commit '88a83d3f108dcf01443b241439e14eedbd9615f5' into eclair-plus-aosp

* commit '88a83d3f108dcf01443b241439e14eedbd9615f5':
  Update getDisplayLabel() API to support new types.
2009-09-21 13:36:58 -07:00
Christopher Tate
4e5f696f10 am 9568fb21: Merge change 26164 into eclair
Merge commit '9568fb21766684083ec256303a6ed7949ada7d9f' into eclair-plus-aosp

* commit '9568fb21766684083ec256303a6ed7949ada7d9f':
  Reset backup tracking in response to transport data-wipe notification
2009-09-21 13:21:40 -07:00
Android (Google) Code Review
24aa451138 Merge change 26164 into eclair
* changes:
  Reset backup tracking in response to transport data-wipe notification
2009-09-21 16:13:48 -04:00
Leon Scroggins
3ab54b8bd1 am d3997e55: Make scrolling textfields work better in the browser.
Merge commit 'd3997e556eb0509248c72b668c2cd955b7842b55' into eclair-plus-aosp

* commit 'd3997e556eb0509248c72b668c2cd955b7842b55':
  Make scrolling textfields work better in the browser.
2009-09-21 13:11:45 -07:00
Jaikumar Ganesh
3813093c80 am 163be61c: Merge change 25412 into eclair
Merge commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e' into eclair-plus-aosp

* commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e':
  Make ParcelUuid helper functions consistent.
2009-09-21 12:46:08 -07:00
Chia-chi Yeh
680e945278 am e3578d60: Merge change 26190 into eclair
Merge commit 'e3578d60c6fbe17c116048a6b4de60b0ac42961f' into eclair-plus-aosp

* commit 'e3578d60c6fbe17c116048a6b4de60b0ac42961f':
  KeyStore: rename scan() to saw().
2009-09-21 12:45:58 -07:00
Android (Google) Code Review
5f61d2f647 Merge change 25412 into eclair
* changes:
  Make ParcelUuid helper functions consistent.
2009-09-21 15:37:21 -04:00
Android (Google) Code Review
bb8f33277a Merge change 26190 into eclair
* changes:
  KeyStore: rename scan() to saw().
2009-09-21 15:06:18 -04:00
Chia-chi Yeh
ec102d90d8 am e045e129: Merge change 26188 into eclair
Merge commit 'e045e129a98ae3a4e396abe377f1b00dff6a2460' into eclair-plus-aosp

* commit 'e045e129a98ae3a4e396abe377f1b00dff6a2460':
  keystore: rename scan() to saw().
2009-09-21 12:04:55 -07:00