3565 Commits

Author SHA1 Message Date
Android (Google) Code Review
2387208c9e am 3d7b8d1a: Merge change 5158 into donut
Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282'

* commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282':
  Use a ref-counted callback interface for Camera.
2009-06-24 13:54:09 -07:00
Bjorn Bringert
ffcdad9faa am 544450b4: Fix NPE in SuggestionsAdapter when cursor is null.
Merge commit '544450b4eee175c78a1ca8647a3bfaca4aecf47a'

* commit '544450b4eee175c78a1ca8647a3bfaca4aecf47a':
  Fix NPE in SuggestionsAdapter when cursor is null.
2009-06-24 13:54:05 -07:00
Bjorn Bringert
43cc2bac7e am 5f80605a: Include user query in search intents
Merge commit '5f80605a0b866f34c74955e190909bd6ab5d992e'

* commit '5f80605a0b866f34c74955e190909bd6ab5d992e':
  Include user query in search intents
2009-06-24 13:53:55 -07:00
Android (Google) Code Review
5310745b14 am 82a32714: Merge change 5190 into donut
Merge commit '82a32714f07d25259b91163d383ccdb74a166d2d'

* commit '82a32714f07d25259b91163d383ccdb74a166d2d':
  Fix 1933269: startPreview failed.
2009-06-24 13:53:24 -07:00
Romain Guy
2ac3412001 resolved conflicts for merge of 5a42b083 to master 2009-06-24 13:51:26 -07:00
Android (Google) Code Review
567c2e22aa am 9efba9d2: Merge change 5176 into donut
Merge commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9'

* commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9':
  Export the output to a text file and save to sdcard
2009-06-24 13:12:37 -07:00
Android (Google) Code Review
3d7b8d1aa6 Merge change 5158 into donut
* changes:
  Use a ref-counted callback interface for Camera. This allows the camera service to hang onto the callback interface until all callbacks have been processed. This prevents problems where pending callbacks in binder worker threads are processed after the Java camera object and its associated native resources have been released. Bug 1884362
2009-06-24 08:34:34 -07:00
Nicolas Catania
20cb94eeb5 Direct api to the native media player.
MediaPlayer.java has 3 new methods:
* newRequest creates a Parcel that can be used to send data to the
  native player using invoke.
* invoke issues synchronous calls to the native player using opaque
  parcels for the request and reply.

IMediaPlayer.h has 1 new abstract method:
* invoke

The Midi and Vorbis players have a stub for these. So far only PV
makes use of that new feature.

To avoid any copy overhead, the JNI interface uses Parcel as a java
object (no serialization/copy happens at the JNI layer).

The remote interface token is inserted when the Parcel is constructed
in java. That way the parcel is already routable when it reaches
 IMediaPlayer.cpp (proxy). No extra copy is needed there.
2009-06-24 08:22:52 -07:00
Dave Sparks
5e27115995 Use a ref-counted callback interface for Camera.
This allows the camera service to hang onto the callback interface
until all callbacks have been processed. This prevents problems
where pending callbacks in binder worker threads are processed
after the Java camera object and its associated native resources
have been released.
Bug 1884362
2009-06-24 07:58:27 -07:00
Bjorn Bringert
544450b4ee Fix NPE in SuggestionsAdapter when cursor is null.
Fixes http://b/issue?id=1940013
2009-06-24 15:16:30 +01:00
Jacek Surazski
5a12373277 Add exception line number to ApplicationErrorReport 2009-06-24 16:12:42 +02:00
Bjorn Bringert
5f80605a0b Include user query in search intents
This change adds a new intent extra field USER_QUERY set in intents
launched by the search dialog. It contains the query as typed by
the user, unaffected by query jamming or search suggestions.

Fixes http://b/issue?id=1939592
2009-06-24 12:54:28 +01:00
Android (Google) Code Review
82a32714f0 Merge change 5190 into donut
* changes:
  Fix 1933269: startPreview failed.
2009-06-24 01:02:46 -07:00
Chih-Chung Chang
6fcba313e9 Fix 1933269: startPreview failed.
The reason we need this count is a new CameraService::connect() request may
come in while the previous Client's destructor has not been run or is still
running. If the last strong reference of the previous Client is gone but
destructor has not been run, we should not allow the new Client to be created
because we need to wait for the previous Client to tear down the hardware
first.
2009-06-24 15:50:57 +08:00
Android (Google) Code Review
5a42b08389 Merge change 5188 into donut
* changes:
  Fixes #1905761. Updates the height of ACTV's drop down whenever the IME changes.
2009-06-23 22:46:29 -07:00
Android (Google) Code Review
6b3ade68e0 am 4133751d: Merge change 5129 into donut
Merge commit '4133751d51a04172aa65e24658b4207ef764de91'

* commit '4133751d51a04172aa65e24658b4207ef764de91':
  Improve RelativeLayout by allowing dependencies to be declared in a random
2009-06-23 21:39:28 -07:00
Romain Guy
e29f064383 Fixes #1905761. Updates the height of ACTV's drop down whenever the IME changes. 2009-06-23 21:27:02 -07:00
Android (Google) Code Review
9efba9d29f Merge change 5176 into donut
* changes:
  Export the output to a text file and save to sdcard
2009-06-23 19:51:00 -07:00
Yu Shan Emily Lau
f16da13585 Export the output to a text file and save to sdcard 2009-06-23 19:36:43 -07:00
Android (Google) Code Review
4133751d51 Merge change 5129 into donut
* changes:
  Improve RelativeLayout by allowing dependencies to be declared in a random order.
2009-06-23 17:48:11 -07:00
Romain Guy
725015a9cd Improve RelativeLayout by allowing dependencies to be declared in a random
order.

The new implementation uses a dually topologically sorted graph of the child
views. The graph of dependencies is sorted once for the rules that impact the
horizontal axis (toLeftOf, alignRight, etc.) and once for the rules that impact
the vertical axis (above, below, etc.)

Doing so gives the ability to declare dependencies in any order, allows for
partial cycles in the graph (given view1 and view2, view1 can be toRightOf=view2
and view2 can be above=view1) and probably gets rid of most surprising behaviors
of RelativeLayout.
2009-06-23 17:45:44 -07:00
Roy West
2fb4aa1135 am 3fbd946b: Edits to SD card notification strings to shorten them.
Merge commit '3fbd946bacdc202dc23c84887d2ad47402b5015b'

* commit '3fbd946bacdc202dc23c84887d2ad47402b5015b':
  Edits to SD card notification strings to shorten them.
2009-06-23 16:35:27 -07:00
Roy West
3fbd946bac Edits to SD card notification strings to shorten them.
They are now very short and blunt. The real fix is to make
 them marquee or open another dialog or something as discussed in the bug.
 I hope these are short enough for Donut so all essential text is visible
in the notification.
Bug 1760196
2009-06-23 16:28:57 -07:00
Android (Google) Code Review
8931802561 Merge change 5102
* changes:
  - clean up the sync settings names to:    (get|set)SyncAutomatically    (get|set)MasterSyncAutomatically - change SYNC_EXTRAS_FORCE to SYNC_EXTRAS_MANUAL to mace clear that   this overrides the .*SyncAutomatically settings - make ContentResolver methods that call the sync controls methods   in IContentService so that SDK users can use them - rename startSync to requestSync to reinforce the fact that a sync   is not immediately or always started when this method is called - add an Account parameter to all the sync settings and control methods - change the sync control methods to take a String authority rather than a Uri uri
2009-06-23 15:54:43 -07:00
Fred Quintana
ac9385ef31 - clean up the sync settings names to:
(get|set)SyncAutomatically
   (get|set)MasterSyncAutomatically
- change SYNC_EXTRAS_FORCE to SYNC_EXTRAS_MANUAL to mace clear that
  this overrides the .*SyncAutomatically settings
- make ContentResolver methods that call the sync controls methods
  in IContentService so that SDK users can use them
- rename startSync to requestSync to reinforce the fact that a sync
  is not immediately or always started when this method is called
- add an Account parameter to all the sync settings and control methods
- change the sync control methods to take a String authority rather than a Uri uri
2009-06-23 15:53:16 -07:00
Android (Google) Code Review
99d2370337 am 2a3cd364: Merge change 5119 into donut
Merge commit '2a3cd3643fcfa40fc447485a2db4b4333e10c652'

* commit '2a3cd3643fcfa40fc447485a2db4b4333e10c652':
  Adding support for pitch changes of the synthesized text in Text-To-Speech.
2009-06-23 15:52:29 -07:00
Android (Google) Code Review
2a3cd3643f Merge change 5119 into donut
* changes:
  Adding support for pitch changes of the synthesized text in Text-To-Speech.
2009-06-23 15:50:43 -07:00
Jean-Michel Trivi
2ea5349583 Adding support for pitch changes of the synthesized text in Text-To-Speech. 2009-06-23 15:26:57 -07:00
Satish Sampath
f86a58ff3d am 41282a35: EnhancedGoogleSearch overrides GoogleSearch if present.
Merge commit '41282a35568b51270440450c46bb31aa00e52caa'

* commit '41282a35568b51270440450c46bb31aa00e52caa':
  EnhancedGoogleSearch overrides GoogleSearch if present.
2009-06-23 14:18:21 -07:00
Satish Sampath
41282a3556 EnhancedGoogleSearch overrides GoogleSearch if present.
This is to fix bug http://b/issue?id=1929993. If user had GoogleSearch
earlier and that was the default, it will get overridden by
EnhancedGoogleSearch when the user installs the latter from the market.
2009-06-23 22:15:09 +01:00
Android (Google) Code Review
cf01aa3cff am 1bee98af: Merge change 5100 into donut
Merge commit '1bee98af6532eba3c6cda636eee890530c95a2a7'

* commit '1bee98af6532eba3c6cda636eee890530c95a2a7':
  Fill in CDMA gaps and clean up ToneGenerator code
2009-06-23 13:42:41 -07:00
Android (Google) Code Review
1bee98af65 Merge change 5100 into donut
* changes:
  Fill in CDMA gaps and clean up ToneGenerator code
2009-06-23 13:38:34 -07:00
Christopher Tate
9bfd5f495b am 11b15779: Add file mode to the file-backup saved state blobs
Merge commit '11b157790234d3d2f116ce4c7ed1d3d00fb78bc3'

* commit '11b157790234d3d2f116ce4c7ed1d3d00fb78bc3':
  Add file mode to the file-backup saved state blobs
2009-06-23 13:28:41 -07:00
Dianne Hackborn
3618160a1a am 2e418428: Possibly fix an issue where we thought an app was always using GPS.
Merge commit '2e418428987132ea66533cbc05f9c526eb59519a'

* commit '2e418428987132ea66533cbc05f9c526eb59519a':
  Possibly fix an issue where we thought an app was always using GPS.
2009-06-23 13:08:40 -07:00
Karl Rosaen
03e53b4a66 am 61ab270c: Add missing \'break\'s in switch statement, fixing bug 1876430
Merge commit '61ab270c17094ef1373f54d8fb9ade6d287c3a60'

* commit '61ab270c17094ef1373f54d8fb9ade6d287c3a60':
  Add missing 'break's in switch statement, fixing bug 1876430
2009-06-23 13:08:34 -07:00
Android (Google) Code Review
6922f19d30 am 843f5eb3: Merge change 5054 into donut
Merge commit '843f5eb36a67367ae76800f74e184f00af50ef54'

* commit '843f5eb36a67367ae76800f74e184f00af50ef54':
  Rollback the number of loop in the memory stress test
2009-06-23 13:08:18 -07:00
Android (Google) Code Review
458134509d am 864ef233: Merge change 4878 into donut
Merge commit '864ef2337554cd0ca4166873bc8145d21ccf2286'

* commit '864ef2337554cd0ca4166873bc8145d21ccf2286':
  Add smalltest annotation to HardwareServicePermissionTest.
2009-06-23 13:08:15 -07:00
Bjorn Bringert
e85fbcb3cd am b0ae27f4: Store correct state in SearchDialog.onSaveInstanceState()
Merge commit 'b0ae27f4e10a9e5fe56b9ca549718051fe342bba'

* commit 'b0ae27f4e10a9e5fe56b9ca549718051fe342bba':
  Store correct state in SearchDialog.onSaveInstanceState()
2009-06-23 13:08:01 -07:00
Christopher Tate
11b1577902 Add file mode to the file-backup saved state blobs
This change puts the file's access mode into the saved-state blob used by the
file backup helpers.  The tests have been updated for the new blob content
format.

What this change *doesn't* do is actually backup/restore the file mode.  This
change is a prerequisite for that, but mode preservation in backup/restore will
require adding metadata to the backup data stream itself, so will be approached
a bit more carefully.

(Also fixed one outright bug in the test program: ReadEntityData() had been
changed to return a ssize_t union of either a byte-count or a negative number
indicating error, but the test program was still assuming that nonzero == error,
and was spuriously failing.)
2009-06-23 13:07:47 -07:00
Dianne Hackborn
2e41842898 Possibly fix an issue where we thought an app was always using GPS.
There may be some race conditions in the gps provider where it can cause a uid
to be double booked for gps usage and never released.  Address this by tweaking
some locking (so mLocation and the uid array are protected by a lock both when
reading and writing).  Also add some code to log a warning if someone tries to
note a particular uid multiple times, since the code will break in that case.

Finally, fix a problem in the battery stats where we weren't allowing a new Uid
structure to be created in many cases for calls coming in.
2009-06-23 12:51:06 -07:00
David Krause
b6d90ca129 Fill in CDMA gaps and clean up ToneGenerator code 2009-06-23 12:32:12 -07:00
Android (Google) Code Review
494bb21480 Merge change 5097
* changes:
  Cleanup logging and fix a startup race condition that manifested on Firestone.
2009-06-23 12:23:19 -07:00
Jason Sams
f29ca50d80 Cleanup logging and fix a startup race condition that manifested on Firestone. 2009-06-23 12:22:47 -07:00
Karl Rosaen
61ab270c17 Add missing 'break's in switch statement, fixing bug 1876430 2009-06-23 11:10:25 -07:00
Android (Google) Code Review
843f5eb36a Merge change 5054 into donut
* changes:
  Rollback the number of loop in the memory stress test
2009-06-23 10:09:03 -07:00
Android (Google) Code Review
fc542816ba Merge change 4939
* changes:
  mods so that we can search mms messages
2009-06-23 10:04:38 -07:00
Android (Google) Code Review
864ef23375 Merge change 4878 into donut
* changes:
  Add smalltest annotation to HardwareServicePermissionTest.
2009-06-23 09:52:21 -07:00
Android (Google) Code Review
89c352cf44 Merge change 5045
* changes:
  remove deprecated use of porterduff
2009-06-23 06:48:32 -07:00
Bjorn Bringert
b0ae27f4e1 Store correct state in SearchDialog.onSaveInstanceState()
Adds this to the instance state bundle:
- mStoredComponentName
- mStoredAppSearchData
- mPreviousComponents

All the UI selection fields that were previously saved were removed.
It's not necessarily useful to restore the
selection, and it's hard to get right. The old code was buggy
(see http://b/issue?id=1911660) and did not restore the
list selection because that's quite hard.

Fixes http://b/issue?id=1926174
2009-06-23 13:47:31 +01:00
Android (Google) Code Review
1b28d26ae9 am 4fb69770: Merge change 5024 into donut
Merge commit '4fb69770e70352c987cc79414db7a03b52296ca7'

* commit '4fb69770e70352c987cc79414db7a03b52296ca7':
  Remove opengl tests from tests build
2009-06-22 22:04:57 -07:00