4661 Commits

Author SHA1 Message Date
Android (Google) Code Review
59d299ce8d 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
Eric Fischer
bd5a8b2adc Add CLDR data files for Norway and Croatia.
The locale picker now wants the locale to always have a country, not just
a language, so having something for the country is necessary to let these
be chosen.
2009-07-10 13:54:02 -07:00
Android (Google) Code Review
9090ff7937 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
c266156a6e Merge change 6805
* changes:
  Changes 203 and 225 from partner repo.
2009-07-10 13:53:17 -07:00
Jean-Michel Trivi
a981013aa7 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:45:47 -07:00
Marco Nelissen
0fc736f321 Don't pass references to temporary objects, and handle the case where we dont have a Surface. 2009-07-10 13:43:41 -07:00
Android (Google) Code Review
889c2d37f7 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
ad94a98364 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
Bob Lee
b8b8f044f4 Uri.EMPTY.toString() was returning null due to an initialization order bug. Fixes internal issue #1957015. 2009-07-10 13:34:37 -07:00
Android (Google) Code Review
b88993f073 Merge change 6797
* changes:
  rename libsgl/libcorecg to libskia
2009-07-10 12:59:40 -07:00
Mike Reed
b5af325fb1 rename libsgl/libcorecg to libskia 2009-07-10 15:33:21 -04:00
Marc Blank
45107e0c32 AbstractSyncableContentProvider must only call onAccountsChanged with GAIA accounts
Currently, ASCP calls onAccountsChanged with an array of ALL accounts, but
ContactsProvider and CalendarProvider assume these are all GAIA accounts.
This can cause a looping crash in acore, so the code has been changed to
only pass an array of GAIA accounts...
2009-07-10 11:40:27 -07:00
Android (Google) Code Review
3cebad052a Merge change 6711
* changes:
  Basic plumbing to retrieve metadata from the native player.
2009-07-10 11:39:29 -07:00
Wink Saville
05b301b9df Changes 203 and 225 from partner repo.
These are combined to save testing time.


Change 225:
    make NV_READY return State.READY.

Change 203:

    CDMA SMS decoding support for Latin and fix for WAP concatenation

    1.  Enabled support for 8bit Latin decoding.
    2.  Change octet decoding to remove an extra pad byte from the payload.
        This caused problems with the concatenation of WAP PUSH messages.
    3.  Decode octet encoded data as if it was Latin. There are devices out
        there that will use 0 instead of 8.
2009-07-10 11:34:33 -07:00
Jean-Michel Trivi
89fe27366b 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
2d070543bb Merge change 6783
* changes:
  turn restore back in in eclair
2009-07-10 11:05:45 -07:00
Joe Onorato
da3cb6a9d5 turn restore back in in eclair 2009-07-10 11:05:23 -07:00
Nicolas Catania
5d55c71198 Basic plumbing to retrieve metadata from the native player.
IMediaPlayer.h
Added a getMetadata method that mirrors the on in MediaPlayer.java.

MediaPlayer.java
Added a native method to get the metadata from the native player.
Parse the parcel into a Metadata object.

Metadata.java
Added a stub to parse the Parcel returned by the native player into
a set of metadata.

android_media_MediaPlayer.cpp
JNI call to forward the getMetadata call.

MediaPlayerService.cpp
MediaPlayerService::Client implements the new getMetadata method added in IMediaPlayer.h
2009-07-10 11:00:42 -07:00
Android (Google) Code Review
f1a43bbc32 Merge change 6735
* changes:
  WifiService: Remove hidden AP counting logic for active/passive scanning mode.
2009-07-10 10:59:45 -07:00
Jean-Michel Trivi
d48ca22b9f Use the TTS queue constants in the TTS service as defined in the
TextToSpeech class.
2009-07-10 10:04:37 -07:00
Android (Google) Code Review
4e42abcc00 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
27835c2740 Merge change 6764
* changes:
  Undo the changes accidentally merged from Donut
2009-07-10 09:57:57 -07:00
Android (Google) Code Review
bdafc9b65f 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
38645ee6d6 Merge change 6759 into donut
* changes:
  Do not merge
2009-07-10 09:57:24 -07:00
Andrei Popescu
15d21453b0 Do not merge
Install an observer for the Location system setting and
move the Gears permission check to a slightly earlier time.
Move the logic into a separate manager class.

Also delete some whitespace and fix some style issues.
2009-07-10 17:54:32 +01:00
Android (Google) Code Review
d2cad2951f Merge change 6734 into donut
* changes:
  Adding tagging to utterances to track which app said what.
2009-07-10 09:47:37 -07:00
Charles Chen
a9c5e4bf26 Adding tagging to utterances to track which app said what. 2009-07-10 09:43:03 -07:00
Andrei Popescu
972acd0c33 Undo the changes accidentally merged from Donut 2009-07-10 16:58:13 +01:00
Bjorn Bringert
88588d137b 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
Bjorn Bringert
0e01ea41b2 Deprecate DialogInterface methods in SearchManager
android.app.SearchManager implements
DialogInterface.OnDismissListener and DialogInterface.OnCancelListener
and thus exposes the methods onCancel(DialogInterface dialog) and
onDismiss(DialogInterface dialog). This was used by the SearchManager
to register itself as a listener on the search dialog, but is no
longer used.

This was an implementation detail that leaked into the public
API. Removing them would change the API, so they are deprecated instead.

Fixes http://b/issue?id=1962203
2009-07-10 07:16:47 +01:00
Android (Google) Code Review
679353dab9 Merge change 6742
* changes:
  fix [1969200] Uninitialized double passed to Math.sqrt()
2009-07-09 22:12:36 -07:00
Mathias Agopian
cafec03250 fix [1969200] Uninitialized double passed to Math.sqrt() 2009-07-09 22:11:57 -07:00
Mike Lockwood
622f82a0c7 WifiService: Remove hidden AP counting logic for active/passive scanning mode.
Apparently this code was not 100% correct, and now the Wifi driver is responsible
for setting the scan mode to active for hidden networks, so this is no longer needed.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-09 23:39:01 -04:00
Mathias Agopian
07e456d871 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
320a34aa4f Merge change 6725
* changes:
  do not merge - add a big flag to turn off backup
2009-07-09 19:19:11 -07:00
Joe Onorato
76ad319b5e do not merge - add a big flag to turn off backup 2009-07-09 18:48:03 -07:00
Mathias Agopian
4d2dbebf3d fix for [1885684] E/SurfaceFlinger( 60): not enough memory for layer bitmap size=4294938624 2009-07-09 18:16:43 -07:00
Dianne Hackborn
854060af30 Fix bug #1873249i: Apps can DoS/brick device
This is the problem where various things are listening for broadcasts
(such as battery status, PIN/PUK/Network) that an application can send
to cause harm to the system.

Solving this is tricky because many of these broadcasts are sticky,
and I have never figured out how to do permissions with sticky
broadcasts in a sane way.  So instead, I am going to punt on the
general problem and just brute force it:

There is new a way for system components to declare specific
broadcast actions to be protected, which means that only the system
and the phone can send them.  This is good enough for now.  None
of it is exposed in the public API so we can make something a little
less stupid in the future if we ever need to.
2009-07-09 18:14:31 -07:00
Android (Google) Code Review
2eedb2515b 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
46e28db881 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
ab1cf3efd3 fix for [1969185] valgrind errors in new gl stuff 2009-07-09 17:33:15 -07:00
Android (Google) Code Review
e7622f3901 Merge change 6712
* changes:
  fix for [1969185] valgrind errors in new gl stuff
2009-07-09 17:31:24 -07:00
Mathias Agopian
05dab6f127 fix for [1969185] valgrind errors in new gl stuff 2009-07-09 17:30:43 -07:00
Android (Google) Code Review
12f7a7b5c3 Merge change 6679
* changes:
  remove the accounts table from the ContactsProvider2
2009-07-09 17:08:15 -07:00
Mathias Agopian
5583dc630f fix [1968839] tap on phonetop search couple of times will cause the runtime restart
ViewRoot wasn't calling Surface.clear() when releasing the Surface.
2009-07-09 16:43:11 -07:00
Android (Google) Code Review
7978ce3f87 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
5c2e622c9a 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
13725324a7 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
Android (Google) Code Review
dded214eb9 Merge change 6689 into donut
* changes:
  Don't crash the app when restore agent bringup throws
2009-07-09 15:58:39 -07:00
Joe Onorato
baea01b92f do not merge - add a big flag to turn off backup 2009-07-09 15:53:18 -07:00