Commit Graph

2600 Commits

Author SHA1 Message Date
Android (Google) Code Review
b2cfccd3b3 Merge change 6890
* changes:
  CDMA: Add Network ID and System ID to CdmaCellLocation.
2009-07-12 11:38:41 -07:00
Android (Google) Code Review
e343c24b20 am 086bd7fe: Merge change 6846 into donut
Merge commit '086bd7fed122f636e210b03eb114051a489f347b'

* commit '086bd7fed122f636e210b03eb114051a489f347b':
  Avoid memcpy's by using GetPrimitiveArrayCritical.
2009-07-12 06:06:54 -07:00
Android (Google) Code Review
a4b456430c am 1c9fb40c: Merge change 6845 into donut
Merge commit '1c9fb40cb6dbfeee58c41a43852c5b94a1b83613'

* commit '1c9fb40cb6dbfeee58c41a43852c5b94a1b83613':
  Use MeasureSpec.getWidth instead of default display in lock pattern widget.
2009-07-12 06:06:49 -07:00
Android (Google) Code Review
1316f368f5 am 2d791055: Merge change 6820 into donut
Merge commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7'

* commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7':
  Fixed NPE bugs in Uri. Fixes internal issue #1724719.
2009-07-12 06:06:31 -07:00
Android (Google) Code Review
b6ce346bcb am 7cd43797: Merge change 6806 into donut
Merge commit '7cd43797ae41406792f70a5623bb6d207e575526'

* commit '7cd43797ae41406792f70a5623bb6d207e575526':
  Add CLDR data files for Norway and Croatia.
2009-07-12 06:06:25 -07:00
Satish Sampath
e5ed5f24a2 am b1665f2e: Fix regression in handling the \'Go\' button
Merge commit 'b1665f2e15439f693b1ef75cb1c07593f99edde7'

* commit 'b1665f2e15439f693b1ef75cb1c07593f99edde7':
  Fix regression in handling the 'Go' button
2009-07-12 06:06:21 -07:00
Android (Google) Code Review
6be1cf285e am a11fe86d: Merge change 6813 into donut
Merge commit 'a11fe86d77e0fd57944e5615acb58b41a4fb4e93'

* commit 'a11fe86d77e0fd57944e5615acb58b41a4fb4e93':
  Fixes #1972421. Prevents crash in ScrollView/HorizontalScrollView.
2009-07-12 06:06:08 -07:00
Android (Google) Code Review
344a58db23 am 59d299ce: Merge change 6789 into donut
Merge commit '59d299ce8d66f6f3091fca33d3741c0b24d678f6'

* commit '59d299ce8d66f6f3091fca33d3741c0b24d678f6':
  Add support in TextToSpeech for an audio stream type param and utterance
2009-07-12 06:06:03 -07:00
Android (Google) Code Review
6ab0e573c0 Merge change 6846 into donut
* changes:
  Avoid memcpy's by using GetPrimitiveArrayCritical.
2009-07-10 16:55:24 -07:00
Android (Google) Code Review
e6ac69fe15 Merge change 6841
* changes:
  resolved conflicts for merge of 889c2d37 to master
2009-07-10 16:46:26 -07:00
Android (Google) Code Review
8e83ff2a8a Merge change 6823
* changes:
  wifi: Keep the WLAN network interface up whenever wifi is enabled.
2009-07-10 16:29:20 -07:00
Android (Google) Code Review
37042c30e9 Merge change 6845 into donut
* changes:
  Use MeasureSpec.getWidth instead of default display in lock pattern widget.
2009-07-10 16:28:03 -07:00
Dianne Hackborn
93e55b499b resolved conflicts for merge of 889c2d37 to master 2009-07-10 16:05:59 -07:00
Android (Google) Code Review
0e6a5c5c7f Merge change 6827
* changes:
  resolved conflicts for merge of ad94a983 to master
2009-07-10 15:17:33 -07:00
Android (Google) Code Review
26b4cbd12d Merge change 6820 into donut
* changes:
  Fixed NPE bugs in Uri. Fixes internal issue #1724719. Modified getQueryParameter() to use the encoded query string. Fixes internal issue #1749094.
2009-07-10 15:12:57 -07:00
Android (Google) Code Review
0918b5016e Merge change 6806 into donut
* changes:
  Add CLDR data files for Norway and Croatia.
2009-07-10 14:42:41 -07:00
Android (Google) Code Review
2be78efbe5 Merge change 6814
* changes:
  Change 107 and 146 from partner repo.
2009-07-10 14:19:58 -07:00
Bob Lee
839a2b73af resolved conflicts for merge of ad94a983 to master 2009-07-10 14:13:37 -07:00
Android (Google) Code Review
1e7931ab9e Merge change 6813 into donut
* changes:
  Fixes #1972421. Prevents crash in ScrollView/HorizontalScrollView.
2009-07-10 14:12:17 -07:00
Android (Google) Code Review
6c081eb656 Merge change 6789 into donut
* changes:
  Add support in TextToSpeech for an audio stream type param and utterance ID specified as a hashmap param in the synthesis calls. Fix a bug where the cached parameters were not passed to the service when synthesizing to a file.
2009-07-10 13:54:58 -07:00
Android (Google) Code Review
8cceb2e67e Merge change 6766
* changes:
  Don't pass references to temporary objects, and handle the case where we dont have a Surface.
2009-07-10 13:53:35 -07:00
Android (Google) Code Review
25a032b60b Merge change 6805
* changes:
  Changes 203 and 225 from partner repo.
2009-07-10 13:53:17 -07:00
Android (Google) Code Review
4e69b55b3f Merge change 6718 into donut
* changes:
  Fix bug #1873249i: Apps can DoS/brick device
2009-07-10 13:42:51 -07:00
Android (Google) Code Review
a43d929c95 Merge change 6801 into donut
* changes:
  Uri.EMPTY.toString() was returning null due to an initialization order bug. Fixes internal issue #1957015.
2009-07-10 13:40:02 -07:00
Android (Google) Code Review
5692903144 Merge change 6797
* changes:
  rename libsgl/libcorecg to libskia
2009-07-10 12:59:40 -07:00
Mike Reed
e0528ba71b rename libsgl/libcorecg to libskia 2009-07-10 15:33:21 -04:00
Android (Google) Code Review
fac84ff8b3 Merge change 6711
* changes:
  Basic plumbing to retrieve metadata from the native player.
2009-07-10 11:39:29 -07:00
Jean-Michel Trivi
6d269be7f3 am d48ca22b: Use the TTS queue constants in the TTS service as defined in the TextToSpeech class.
Merge commit 'd48ca22b9fcea38b112aedb4126f3d030594af47'

* commit 'd48ca22b9fcea38b112aedb4126f3d030594af47':
  Use the TTS queue constants in the TTS service as defined in the
2009-07-10 11:20:27 -07:00
Android (Google) Code Review
9470c78ba9 Merge change 6783
* changes:
  turn restore back in in eclair
2009-07-10 11:05:45 -07:00
Android (Google) Code Review
f4f368fd0a Merge change 6735
* changes:
  WifiService: Remove hidden AP counting logic for active/passive scanning mode.
2009-07-10 10:59:45 -07:00
Android (Google) Code Review
733422dbec am 38645ee6: (-s ours) Merge change 6759 into donut
Merge commit '38645ee6d61368f59b2d83256f2612bdaa38ff49'

* commit '38645ee6d61368f59b2d83256f2612bdaa38ff49':
  Do not merge
2009-07-10 09:59:01 -07:00
Android (Google) Code Review
a81d4d80d6 Merge change 6764
* changes:
  Undo the changes accidentally merged from Donut
2009-07-10 09:57:57 -07:00
Android (Google) Code Review
e0cfa503c3 am d2cad295: Merge change 6734 into donut
Merge commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71'

* commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71':
  Adding tagging to utterances to track which app said what.
2009-07-10 09:57:38 -07:00
Android (Google) Code Review
b8232aeb77 Merge change 6759 into donut
* changes:
  Do not merge
2009-07-10 09:57:24 -07:00
Android (Google) Code Review
4030d85f86 Merge change 6734 into donut
* changes:
  Adding tagging to utterances to track which app said what.
2009-07-10 09:47:37 -07:00
Bjorn Bringert
bb9abf1828 am 0e01ea41: Deprecate DialogInterface methods in SearchManager
Merge commit '0e01ea41b215941128a4ea8dee454e6b35a4e798'

* commit '0e01ea41b215941128a4ea8dee454e6b35a4e798':
  Deprecate DialogInterface methods in SearchManager
2009-07-10 00:50:45 -07:00
Android (Google) Code Review
829cb1304b Merge change 6742
* changes:
  fix [1969200] Uninitialized double passed to Math.sqrt()
2009-07-09 22:12:36 -07:00
Mathias Agopian
80d7a764fc fix [1969200] Uninitialized double passed to Math.sqrt() 2009-07-09 22:11:57 -07:00
Mathias Agopian
4860b74b47 am 4d2dbebf: fix for [1885684] E/SurfaceFlinger( 60): not enough memory for layer bitmap size=4294938624
Merge commit '4d2dbebf3d08209f751585d8cc367369e2f6e32f'

* commit '4d2dbebf3d08209f751585d8cc367369e2f6e32f':
  fix for [1885684] E/SurfaceFlinger( 60): not enough memory for layer bitmap size=4294938624
2009-07-09 20:05:11 -07:00
Android (Google) Code Review
3943342796 Merge change 6725
* changes:
  do not merge - add a big flag to turn off backup
2009-07-09 19:19:11 -07:00
Mathias Agopian
6e2d6483fe fix for [1885684] E/SurfaceFlinger( 60): not enough memory for layer bitmap size=4294938624 2009-07-09 18:16:43 -07:00
Android (Google) Code Review
2521f47c4d am 46e28db8: Merge change 6713 into donut
Merge commit '46e28db8818332e3cda4cc410cc89a1ed7ce4db6'

* commit '46e28db8818332e3cda4cc410cc89a1ed7ce4db6':
  fix for [1969185] valgrind errors in new gl stuff
2009-07-09 17:35:26 -07:00
Android (Google) Code Review
7278a129fc Merge change 6713 into donut
* changes:
  fix for [1969185] valgrind errors in new gl stuff
2009-07-09 17:33:54 -07:00
Mathias Agopian
dacd7a33c4 fix for [1969185] valgrind errors in new gl stuff 2009-07-09 17:33:15 -07:00
Android (Google) Code Review
6ee4f3543f Merge change 6712
* changes:
  fix for [1969185] valgrind errors in new gl stuff
2009-07-09 17:31:24 -07:00
Mathias Agopian
84f6814af4 fix for [1969185] valgrind errors in new gl stuff 2009-07-09 17:30:43 -07:00
Android (Google) Code Review
8190366da1 Merge change 6679
* changes:
  remove the accounts table from the ContactsProvider2
2009-07-09 17:08:15 -07:00
Android (Google) Code Review
0d7e7db880 am 5c2e622c: (-s ours) Merge change 6700 into donut
Merge commit '5c2e622c9aa4f7e08374cfc54d11dab5a7474153'

* commit '5c2e622c9aa4f7e08374cfc54d11dab5a7474153':
  do not merge - add a big flag to turn off backup
2009-07-09 16:38:44 -07:00
Android (Google) Code Review
e288fff39d Merge change 6700 into donut
* changes:
  do not merge - add a big flag to turn off backup
2009-07-09 16:36:31 -07:00
Android (Google) Code Review
ba3da84452 am dded214e: Merge change 6689 into donut
Merge commit 'dded214eb92cebdd7fb2e6405173ffc1932e795a'

* commit 'dded214eb92cebdd7fb2e6405173ffc1932e795a':
  Don't crash the app when restore agent bringup throws
2009-07-09 16:00:24 -07:00