Commit Graph

17758 Commits

Author SHA1 Message Date
Andreas Huber
3087ca8681 Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread 2010-08-24 15:01:14 -07:00
Dianne Hackborn
ab07f8103f am 4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerbread
Merge commit '4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp

* commit '4af0cfad5305c8827c6235ca86e7db63b534ad68':
  Verify that onPause() calls its superclass.
2010-08-24 14:47:46 -07:00
Dianne Hackborn
6f4b2fbdb9 Merge "Verify that onPause() calls its superclass." into gingerbread 2010-08-24 14:44:42 -07:00
Gilles Debunne
dea27daeab am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp

* commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
  Fix for an NPE in TextView.
2010-08-24 14:25:57 -07:00
Gilles Debunne
734f574e81 Merge "Fix for an NPE in TextView." into gingerbread 2010-08-24 14:23:37 -07:00
Brad Fitzpatrick
016a98d8f2 am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread
Merge commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp

* commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7':
  Some StrictMode API changes.
2010-08-24 14:18:26 -07:00
Brad Fitzpatrick
85e027d237 Merge "Some StrictMode API changes." into gingerbread 2010-08-24 14:15:30 -07:00
Daisuke Miyakawa
19455eece8 am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread
Merge commit '88bff62c35e570a0c86eb55ded79d4600730226b' into gingerbread-plus-aosp

* commit '88bff62c35e570a0c86eb55ded79d4600730226b':
  Fix vCard so that it looks at IM correctly.
2010-08-24 13:39:42 -07:00
Daisuke Miyakawa
1543ffc428 am 6dd19ca5: Merge "Make VCardTestsBase public." into gingerbread
Merge commit '6dd19ca5cb78008d6793d0a223a6189786c5c62f' into gingerbread-plus-aosp

* commit '6dd19ca5cb78008d6793d0a223a6189786c5c62f':
  Make VCardTestsBase public.
2010-08-24 13:39:37 -07:00
Daisuke Miyakawa
5090002867 Merge "Fix vCard so that it looks at IM correctly." into gingerbread 2010-08-24 13:37:02 -07:00
Daisuke Miyakawa
c5c4078cb4 Merge "Make VCardTestsBase public." into gingerbread 2010-08-24 13:36:43 -07:00
Robert Greenwalt
71cc43b8cb am 6d734693: Merge "Send all Connectivity broadcasts." into gingerbread
Merge commit '6d7346933580c107f461885dc273d7298a46b0df' into gingerbread-plus-aosp

* commit '6d7346933580c107f461885dc273d7298a46b0df':
  Send all Connectivity broadcasts.
2010-08-24 12:04:52 -07:00
Robert Greenwalt
bb6ddcb112 Merge "Send all Connectivity broadcasts." into gingerbread 2010-08-24 12:01:50 -07:00
Gilles Debunne
aef5507a7e am 2703a42d: When an EditText gains focus by tapping, move the insertion point where tapped.
Merge commit '2703a42d16af0e62da1bba02b6c935d98debf936' into gingerbread-plus-aosp

* commit '2703a42d16af0e62da1bba02b6c935d98debf936':
  When an EditText gains focus by tapping, move the insertion point where tapped.
2010-08-24 10:30:09 -07:00
Eric Laurent
a57fcb8ab7 am b6d71351: Merge "LVM release 1.05 delivery" into gingerbread
Merge commit 'b6d71351c074d5c0bc13a91544d776f1524eaabd' into gingerbread-plus-aosp

* commit 'b6d71351c074d5c0bc13a91544d776f1524eaabd':
  LVM release 1.05 delivery
2010-08-24 09:58:23 -07:00
Eric Laurent
75e9fadbf8 Merge "LVM release 1.05 delivery" into gingerbread 2010-08-24 09:50:13 -07:00
Hung-ying Tyan
7055d2fc7e am 3294d44b: Add confcall management to SIP calls
Merge commit '3294d44b96f63f647fba3a03604eb028e28a42bc' into gingerbread-plus-aosp

* commit '3294d44b96f63f647fba3a03604eb028e28a42bc':
  Add confcall management to SIP calls
2010-08-24 05:00:11 -07:00
Chia-chi Yeh
7ebabee05e am a83987d2: Merge "RTP: integrate the echo canceller from speex." into gingerbread
Merge commit 'a83987d2ccc6b235dd3dd5cc6206c257dfe9e0a8' into gingerbread-plus-aosp

* commit 'a83987d2ccc6b235dd3dd5cc6206c257dfe9e0a8':
  RTP: integrate the echo canceller from speex.
2010-08-24 02:30:14 -07:00
Chia-chi Yeh
cb82742e58 Merge "RTP: integrate the echo canceller from speex." into gingerbread 2010-08-24 02:28:41 -07:00
Chia-chi Yeh
3bec60494f am 5b1f0c9f: Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread
Merge commit '5b1f0c9f6416719ef6194dd0c4e0f626ec84082c' into gingerbread-plus-aosp

* commit '5b1f0c9f6416719ef6194dd0c4e0f626ec84082c':
  RTP: reduce the latency by overlapping AudioRecord and AudioTrack.
2010-08-23 23:37:49 -07:00
Brad Fitzpatrick
4f4ae2aebd am d132892a: Merge "Don\'t touch the VFS during window relayout." into gingerbread
Merge commit 'd132892a75532557bb18af14eab6081704b7fa6d' into gingerbread-plus-aosp

* commit 'd132892a75532557bb18af14eab6081704b7fa6d':
  Don't touch the VFS during window relayout.
2010-08-23 23:37:17 -07:00
Jean-Baptiste Queru
763c8ddd8f am 97b5b765: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '97b5b7650236dd102fa48b51d9361289724a50e9' into gingerbread-plus-aosp

* commit '97b5b7650236dd102fa48b51d9361289724a50e9':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
  Amend previous ndc commit
  Add a method to let a properly permissioned app directly
  Changed SyncOperation.toKey() to not rely on the implementation of
  Squashed commit of the following:
  Add more error checking for ndc
  PackageManagerService: always install native binaries from .apk
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
  Fix a bug where we cleaned an apps external data when upgrading it. :(
  Skip hostname verification when using insecure factory
  Flush binder buffer after setting raw heap to avoid leaking a reference.
  Fix issue #2834005: Android Settings.Secure bypass
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
  Verify hostname where possible, and clarify where not.
2010-08-23 23:37:06 -07:00
Chia-chi Yeh
d184a090d5 Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread 2010-08-23 23:28:45 -07:00
Brad Fitzpatrick
78c70ae79c Merge "Don't touch the VFS during window relayout." into gingerbread 2010-08-23 19:38:16 -07:00
Jean-Baptiste Queru
7912d8bd00 merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e
2010-08-23 19:08:27 -07:00
Dianne Hackborn
f362260d34 am f467ca08: Merge "More watermark work." into gingerbread
Merge commit 'f467ca08dda9efece674efb0cc70c45fab4973a6' into gingerbread-plus-aosp

* commit 'f467ca08dda9efece674efb0cc70c45fab4973a6':
  More watermark work.
2010-08-23 19:01:03 -07:00
Dianne Hackborn
ab80f2aea5 Merge "More watermark work." into gingerbread 2010-08-23 18:57:37 -07:00
Dirk Dougherty
1f4f571329 am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp

* commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:52:41 -07:00
Dirk Dougherty
63301fe5b0 am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit '397c0f5a18281e3880b9359feab683a13d271a03' into gingerbread

* commit '397c0f5a18281e3880b9359feab683a13d271a03':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:49:49 -07:00
Dirk Dougherty
560e1154dd Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo 2010-08-23 17:40:46 -07:00
Gilles Debunne
a73e14ee50 am 3e05a0be: Hysteresis effect in Text selection.
Merge commit '3e05a0beb2fad0b21558019d2adf6805da70e10e' into gingerbread-plus-aosp

* commit '3e05a0beb2fad0b21558019d2adf6805da70e10e':
  Hysteresis effect in Text selection.
2010-08-23 15:26:51 -07:00
Jean-Baptiste Queru
dba0f1677e resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp
Change-Id: I2741766c359bed3040fa3b787d72483eb028fb6d
2010-08-23 14:20:47 -07:00
Jean-Baptiste Queru
2e469b827d am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call."
Merge commit '6864b3e2f4e67be847b2ae054f2f9c388f115722' into gingerbread-plus-aosp

* commit '6864b3e2f4e67be847b2ae054f2f9c388f115722':
  Adds the ability to Android to initiate a 2 Digit Call.
2010-08-23 14:14:45 -07:00
Mathias Agopian
f9e75180b6 am 0c76c7c5: Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread
Merge commit '0c76c7c5eedf90b5fa1a95b6a9944b4e58747007' into gingerbread-plus-aosp

* commit '0c76c7c5eedf90b5fa1a95b6a9944b4e58747007':
  add new sensor types for handling gyro data and device orientation
2010-08-23 13:56:22 -07:00
Mathias Agopian
af2ac558a4 Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread 2010-08-23 13:54:17 -07:00
Robert Greenwalt
209638b621 Merge "Add an API to request route to an IPv6 host." 2010-08-23 13:54:04 -07:00
Jean-Baptiste Queru
a2239f61d2 Merge "Crash when powering off." 2010-08-23 13:24:19 -07:00
Jean-Baptiste Queru
7eea71bf43 Merge "Adds the ability to Android to initiate a 2 Digit Call." 2010-08-23 13:22:00 -07:00
Sean McNeil
1608ea46d3 am 40a87586: Only monitor recognized uevent devices.
Merge commit '40a87586761450f80ad44f948a35266e87f326de' into gingerbread-plus-aosp

* commit '40a87586761450f80ad44f948a35266e87f326de':
  Only monitor recognized uevent devices.
2010-08-23 13:07:59 -07:00
Sean McNeil
39f04ee5cf Only monitor recognized uevent devices.
system_server can potentially monitor uevent devices that are
of no use to it. For instance, an accelerometer implementation
as uevents. This would cause the process to be busy when
unnecessary. If a device cannot be classified, don't monitor it.

Change-Id: I489cc453bdce7cb376102cba67a9ea470e13292d
2010-08-23 12:54:30 -07:00
Scott Main
3faddf6d78 am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9' into gingerbread-plus-aosp

* commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9':
  docs: add dev guide for getting user location
2010-08-23 12:44:18 -07:00
Scott Main
fab418483e am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit '5a98fef352ed835406fa74a5563eadd9708f7cf9' into gingerbread

* commit '5a98fef352ed835406fa74a5563eadd9708f7cf9':
  docs: add dev guide for getting user location
2010-08-23 12:41:45 -07:00
Scott Main
943100901d Merge "docs: add dev guide for getting user location" into froyo 2010-08-23 12:32:51 -07:00
Andreas Huber
9174467f2d am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread
Merge commit '3e22ef1e111966df6ad527632fdc35d105c73916' into gingerbread-plus-aosp

* commit '3e22ef1e111966df6ad527632fdc35d105c73916':
  Better handling of rtsp connection and disconnection.
2010-08-23 12:28:26 -07:00
Andreas Huber
29c889f5ea Merge "Better handling of rtsp connection and disconnection." into gingerbread 2010-08-23 12:26:31 -07:00
James Dong
de5d38fe59 am 3f51fa78: Runtime dump support for MediaWriter
Merge commit '3f51fa78ada0e064d23db5961337280c267cc2c0' into gingerbread-plus-aosp

* commit '3f51fa78ada0e064d23db5961337280c267cc2c0':
  Runtime dump support for MediaWriter
2010-08-23 10:50:29 -07:00
Chia-chi Yeh
e2cf0f9165 am b80e610b: Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread
Merge commit 'b80e610b070c2cec98a228a8aec450dc24a5f90a' into gingerbread-plus-aosp

* commit 'b80e610b070c2cec98a228a8aec450dc24a5f90a':
  Visualizer: replace the FFT implementation with a faster one.
2010-08-22 18:38:29 -07:00
Chia-chi Yeh
82af40b505 Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread 2010-08-22 18:31:15 -07:00
Chih-Chung Chang
c9c7153ac7 am 72ecb00a: Merge "Revert "Don\'t recycle native bitmap after the finalizer is called."" into gingerbread
Merge commit '72ecb00a89b7a49eadb9c3bb880102eef97c8eb6' into gingerbread-plus-aosp

* commit '72ecb00a89b7a49eadb9c3bb880102eef97c8eb6':
  Revert "Don't recycle native bitmap after the finalizer is called."
2010-08-22 04:31:38 -07:00
Chih-Chung Chang
eed79068c3 Merge "Revert "Don't recycle native bitmap after the finalizer is called."" into gingerbread 2010-08-22 04:23:51 -07:00