Commit Graph

3534 Commits

Author SHA1 Message Date
Grace Kloba
01b5351858 am c8ddd37a: (-s ours) Merge change 20779 into donut
Merge commit 'c8ddd37aa0f16540f48b1c4170fbb23d6eb03143'

* commit 'c8ddd37aa0f16540f48b1c4170fbb23d6eb03143':
  DO NOT MERGE. This is merged from master.
2009-08-11 18:12:34 -07:00
Hung-ying Tyan
10d2991a66 am 7b98b666: Merge change 20738 into donut
Merge commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7'

* commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7':
  Fix a bug in getSocketError() in VpnService.
2009-08-11 18:12:11 -07:00
Hung-ying Tyan
7b3be599ea am c22e0c80: Merge change 20719 into donut
Merge commit 'c22e0c8012828474e8aa2e29b441ef02728b0842'

* commit 'c22e0c8012828474e8aa2e29b441ef02728b0842':
  Fix order of setting/saving state in VpnService.
2009-08-11 18:12:07 -07:00
Wu-cheng Li
36689be94a am cb2b2378: Merge change 20729 into donut
Merge commit 'cb2b2378c735e687c15e2af7f908c68ffae5fe90'

* commit 'cb2b2378c735e687c15e2af7f908c68ffae5fe90':
  Fix the bug that EXIF attributes are always cached.
2009-08-11 18:12:00 -07:00
Karl Rosaen
b62e4afaed am abf44279: Fix NPE in SearchDialog (and thereby fix bug 2045398).
Merge commit 'abf44279add64c6f22a40592895225779b8481ea'

* commit 'abf44279add64c6f22a40592895225779b8481ea':
  Fix NPE in SearchDialog (and thereby fix bug 2045398).
2009-08-11 18:11:40 -07:00
Mike LeBeau
18e2c1c192 am 021fa3fa: Merge change 20665 into donut
Merge commit '021fa3fa6fe88c33ad11a3139ebcd3a5be8eb953'

* commit '021fa3fa6fe88c33ad11a3139ebcd3a5be8eb953':
  First update of SearchManager docs to reflect the new Donut Quick Search Box feature.
2009-08-11 18:11:28 -07:00
Jean-Michel Trivi
783a69a675 am 1e1b6b72: Merge change 20514 into donut
Merge commit '1e1b6b7245a0a9212aa3b0366e7919f114895306'

* commit '1e1b6b7245a0a9212aa3b0366e7919f114895306':
  Fix bug 2022435.
2009-08-11 18:11:19 -07:00
Android (Google) Code Review
19e323aa5c Merge change 20865
* changes:
  Fix the build
2009-08-11 17:49:30 -07:00
Android (Google) Code Review
afde41d163 Merge change 20858
* changes:
  Don't let bmgr leave a restore session hanging on error
2009-08-11 17:28:49 -07:00
Mathias Agopian
df37b62c62 SurfaceFlinger will now allocate buffers based on the usage specified by the clients. This allows to allocate the right kind of buffer automatically, without having the user to specify anything.
This change makes SurfaceHolder.setType(GPU) obsolete (it's now ignored).
Added an API to android_native_window_t to allow extending the functionality without ever breaking binary compatibility. This is used to implement the new set_usage() API. This API needs to be called by software renderers because the default is to use usage flags suitable for h/w.
2009-08-11 16:12:56 -07:00
Android (Google) Code Review
d779f052b4 Merge change 20812
* changes:
  Fix possible exception in default live wallpaper
2009-08-11 14:43:02 -07:00
Android (Google) Code Review
5057318ead Merge change 20788
* changes:
  make private inner classes static
2009-08-11 14:04:32 -07:00
Android (Google) Code Review
52655f6322 Merge change 20775
* changes:
  Fixes #2021442. Prevent app widgets from clobbering Home's view ids.
2009-08-11 14:01:18 -07:00
Android (Google) Code Review
1b3288b726 Merge change 20781
* changes:
  replace 'new String()' with ""
2009-08-11 13:14:16 -07:00
Android (Google) Code Review
328357bf69 Merge change 20779 into donut
* changes:
  DO NOT MERGE. This is merged from master. Fix couple of bugs in the meminfo report.  . added the new "/data/dalvik-cache/" to dalvik heap  . shortened the starting line's length from 40 to 30 to handle the case where there is no name  . fixed the pri/shared for others. It was swapped.
2009-08-11 12:47:36 -07:00
Android (Google) Code Review
15d4c4ecd4 Merge change 20683
* changes:
  Add operator name in network selection.
2009-08-11 12:07:16 -07:00
Android (Google) Code Review
6da2503c44 Merge change 8575
* changes:
  Support INSTALL_DRM permission
2009-08-11 11:31:34 -07:00
Android (Google) Code Review
6a361723ad Merge change 20750
* changes:
  remove unused locals
2009-08-11 10:55:24 -07:00
Android (Google) Code Review
107aeb448b Merge change 20739
* changes:
  Fix issue 2045983 ToneGenerator: fix void statement.
2009-08-11 10:18:07 -07:00
Android (Google) Code Review
d30f8b3392 Merge change 20663
* changes:
  Update getNumberFromIntent() to read from both providers.
2009-08-11 10:11:31 -07:00
Android (Google) Code Review
e045928086 Merge change 20738 into donut
* changes:
  Fix a bug in getSocketError() in VpnService.
2009-08-11 10:01:18 -07:00
Android (Google) Code Review
4c1fc64a3e Merge change 20719 into donut
* changes:
  Fix order of setting/saving state in VpnService.
2009-08-11 09:44:26 -07:00
Eric Laurent
f5aba82cb7 Fix issue 2046140: master: media_server crash when powering down A2DP headset while a ringtone is playing.
This is because the AudioFlinger duplicating thread is closed while the output tracks are still active. This cause the output tracks objects to be destroyed at a time where they can be in use by the destination output mixer.

The fix consists in adding the OutputTrack to the track list (mTracks) of its destination thread so that a strong reference is help during the mixer processed and the track is detroyed only when safe by destination thread.

Also added detection of problems when creating the output track (e.g. no more tracks in mixer). In this case the output track is not added to output track list of duplicating thread.
2009-08-11 09:43:09 -07:00
Eric Laurent
9e7b81943b Fix issue 2043314: Recorded audio is choppy.
Fixed cut/paste error causing constant reset of current frame index in input buffer.
2009-08-11 09:07:44 -07:00
Android (Google) Code Review
b61bc0c19e Merge change 20729 into donut
* changes:
  Fix the bug that EXIF attributes are always cached.
2009-08-11 08:54:10 -07:00
Android (Google) Code Review
0ecc6d9232 Merge change 20632
* changes:
  call super.finalize() from WebView
2009-08-11 08:17:43 -07:00
Eric Laurent
454409cb1b resolved conflicts for merge of 8af63bc9 to master 2009-08-11 00:01:01 -07:00
Android (Google) Code Review
544542bbb9 Merge change 20699
* changes:
  enable HW acceleration for the Dim Surface on 8k devices
2009-08-10 21:22:00 -07:00
Mathias Agopian
af0b0f09bb enable HW acceleration for the Dim Surface on 8k devices 2009-08-10 21:13:06 -07:00
Android (Google) Code Review
a60d3c8f1d Merge change 20686
* changes:
  fix the build
2009-08-10 17:46:27 -07:00
Android (Google) Code Review
dfe5d23889 Merge change 20627
* changes:
  Add ro.telephony.disable-call check in dialing.
2009-08-10 17:13:06 -07:00
Android (Google) Code Review
91b8d70cb5 Merge change 20674
* changes:
  Add a new setting for controling how much time to wait before discarding uphill operations
2009-08-10 17:00:20 -07:00
Android (Google) Code Review
706e069c54 Merge change 20677
* changes:
  workaround a bug in the SGX driver that would prevent eglGetConfig to work properly
2009-08-10 16:50:40 -07:00
Mathias Agopian
1d3bcd6e21 workaround a bug in the SGX driver that would prevent eglGetConfig to work properly 2009-08-10 16:48:22 -07:00
Android (Google) Code Review
3d3c180d51 Merge change 20665 into donut
* changes:
  First update of SearchManager docs to reflect the new Donut Quick Search Box feature. This simply cleans up any inconsistencies or weirdnesses, we still need to add the new info for QSB.
2009-08-10 16:38:00 -07:00
Android (Google) Code Review
e55fd71b31 Merge change 20660
* changes:
  add the deleted flag to the Groups table
2009-08-10 16:30:16 -07:00
Android (Google) Code Review
70b38f2176 Merge change 20607
* changes:
  Limit AudioFlinger mixer track sampling rate.
2009-08-10 16:04:29 -07:00
Android (Google) Code Review
f693677737 Merge change 20643
* changes:
  Add calendar_sync_window_days setting to control calendar sync window.
2009-08-10 15:53:46 -07:00
Android (Google) Code Review
494118d09f Merge change 20668
* changes:
  Print restore tokens in hex
2009-08-10 15:44:30 -07:00
Android (Google) Code Review
bb1f5e1e83 Merge change 20514 into donut
* changes:
  Fix bug 2022435. Add new intent and matching extra to signal the completion of the language pack installer. This is used by CL 20513.
2009-08-10 15:23:39 -07:00
Android (Google) Code Review
326fd5b9a8 Merge change 20657
* changes:
  Fix possible NPE when mutating a DrawableContainer
2009-08-10 15:12:04 -07:00
Android (Google) Code Review
f0eecceaf7 Merge change 20654
* changes:
  The build system knows how to deal with lex files, but it treats them as c++, so make spec.lex conform to that.
2009-08-10 15:02:36 -07:00
Android (Google) Code Review
7823b401f1 Merge change 20640
* changes:
  build libRS
2009-08-10 14:06:22 -07:00
Andreas Huber
e186431c33 Expose a variation of the createRenderer API that works on a plain Surface. 2009-08-10 12:58:05 -07:00
Android (Google) Code Review
fc40bc2e35 Merge change 20622
* changes:
  Remove unused member mHeaderValueIndex
2009-08-10 11:28:39 -07:00
Android (Google) Code Review
e1bcd0c343 Merge change 20611
* changes:
  Deprecate/remove now unused socketpair ipc communication in favour of exclusive binder use.
2009-08-10 11:03:56 -07:00
Eric Laurent
878c0e1d68 Limit AudioFlinger mixer track sampling rate.
When changing the audio output stream sampling rate with setParameters() make sure that all tracks have a sampling rate less or equal to 2 times the new output sampling rate.
2009-08-10 08:15:12 -07:00
Android (Google) Code Review
ae07aadd26 Merge change 20095
* changes:
  Fix network order for marshalling in keystore interface.
2009-08-10 03:11:28 -07:00
repo sync
74c332f184 Fix network order for marshalling in keystore interface.
This will fix the endian issue for heterogeneous architectures in keystore marshalling interface.
2009-08-10 16:13:00 +08:00
Android (Google) Code Review
983f1ea3f7 Merge change 20586
* changes:
  Let java put #defines into renderscript
2009-08-09 23:01:04 -07:00