6175 Commits

Author SHA1 Message Date
Fred Quintana
64e89a8aff Revert "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 reverts commit 8b76a0ac6fbf07254629ed1ea86af014d5abe050.
2009-08-11 20:49:35 -07:00
Grace Kloba
50cb54ff5c 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
77208f852c 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
cff53466bb 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
2ac8c27988 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
d47fddc5d7 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
6f82aa3f4d 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
8e235b7bac 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
6a332cf7a0 Merge change 20865
* changes:
  Fix the build
2009-08-11 17:49:30 -07:00
Romain Guy
b3c61e7dec Fix the build 2009-08-11 17:49:01 -07:00
Android (Google) Code Review
df1d0ff4ba Merge change 20858
* changes:
  Don't let bmgr leave a restore session hanging on error
2009-08-11 17:28:49 -07:00
Christopher Tate
0e0b4ae5bc Don't let bmgr leave a restore session hanging on error
Specifically, don't wait for the RestoreObserver to be informed that the restore
has completed unless performRestore() ran.  We were winding up in a case where
bmgr was hanging forever waiting on a nonexistent restore process instead of
calling endRestoreSession().

Also improve the documentation, explicitly calling out the need to call
endRestoreSession() even if previous operations on the session were
unsuccessful.
2009-08-11 17:25:12 -07:00
Amith Yamasani
29d85df051 Remove delay for key feedback bubble.
Most users seem to expect the feedback to show up right away. So
remove the delay before the bubble shows up.
2009-08-11 16:45:07 -07:00
Mathias Agopian
8b76a0ac6f 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
c5ea439209 Merge change 20812
* changes:
  Fix possible exception in default live wallpaper
2009-08-11 14:43:02 -07:00
Romain Guy
b4f59bffc0 Fix possible exception in default live wallpaper 2009-08-11 14:42:19 -07:00
Guang Zhu
b028f92e75 Disable Worker in DumpRenderTree until the issue with dumpAsText is fixed. 2009-08-11 14:27:32 -07:00
Android (Google) Code Review
ce6182fa49 Merge change 20788
* changes:
  make private inner classes static
2009-08-11 14:04:32 -07:00
Android (Google) Code Review
1d1449835a Merge change 20775
* changes:
  Fixes #2021442. Prevent app widgets from clobbering Home's view ids.
2009-08-11 14:01:18 -07:00
Cary Clark
7ec19876c9 make private inner classes static
bug found by findbugs
http://b/issue?id=1856695
2009-08-11 16:57:43 -04:00
Android (Google) Code Review
2b7d44ed84 Merge change 20781
* changes:
  replace 'new String()' with ""
2009-08-11 13:14:16 -07:00
Cary Clark
686cf75d5c replace 'new String()' with ""
bug reported by findbugs
http://b/issue?id=1856909
2009-08-11 16:08:52 -04:00
Android (Google) Code Review
c8ddd37aa0 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
Cary Clark
0867e69176 make final constants static
found by findbugs
http://b/issue?id=1857033
2009-08-11 15:44:31 -04:00
Grace Kloba
628e086664 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:43:08 -07:00
Romain Guy
09ddc08b0d Fixes #2021442. Prevent app widgets from clobbering Home's view ids. 2009-08-11 12:10:08 -07:00
Android (Google) Code Review
7d89133364 Merge change 20683
* changes:
  Add operator name in network selection.
2009-08-11 12:07:16 -07:00
Android (Google) Code Review
81df0d9487 Merge change 8575
* changes:
  Support INSTALL_DRM permission
2009-08-11 11:31:34 -07:00
Android (Google) Code Review
f280a1b830 Merge change 20750
* changes:
  remove unused locals
2009-08-11 10:55:24 -07:00
Cary Clark
a589419c04 remove unused locals
found by findbugs
http://b/issue?id=1857022
2009-08-11 13:45:28 -04:00
Android (Google) Code Review
b474b45104 Merge change 20739
* changes:
  Fix issue 2045983 ToneGenerator: fix void statement.
2009-08-11 10:18:07 -07:00
Android (Google) Code Review
dcbc531be2 Merge change 20663
* changes:
  Update getNumberFromIntent() to read from both providers.
2009-08-11 10:11:31 -07:00
Jeff Sharkey
f28ca902ad Update getNumberFromIntent() to read from both providers.
This method is used by the Phone app to decode ACTION_CALL
Intents, resolving to a real phone number.  Because the
columns are changing with the new provider, I added logic
to query using the correct columns for the authority of the
requested Uri.
2009-08-11 10:11:03 -07:00
Jeff Sharkey
ad2eaf208d Added long-press hooks to Contact header widget.
To match Contacts edit UI mocks, the user long-presses on
the photo or display name to select a new primary.  This
change provides the hooks needed over in Contacts.
2009-08-11 10:09:42 -07:00
Android (Google) Code Review
7b98b666ec Merge change 20738 into donut
* changes:
  Fix a bug in getSocketError() in VpnService.
2009-08-11 10:01:18 -07:00
Eric Laurent
c4e58c0f31 Fix issue 2045983 ToneGenerator: fix void statement.
There is a void statement at line 917 of ToneGenerator.cpp: mState == TONE_IDLE;
This problem is harmless as in current code this execution path is never taken; it can only happen if a "new" operator fails in prepareWave() which is a case we usually consider as unlikely in android audio framework.
2009-08-11 09:57:45 -07:00
Hung-ying Tyan
0daf9d0612 Fix a bug in getSocketError() in VpnService. 2009-08-12 00:53:36 +08:00
Android (Google) Code Review
c22e0c8012 Merge change 20719 into donut
* changes:
  Fix order of setting/saving state in VpnService.
2009-08-11 09:44:26 -07:00
Eric Laurent
6c30a71122 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
33bb0c9f2a 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
cb2b2378c7 Merge change 20729 into donut
* changes:
  Fix the bug that EXIF attributes are always cached.
2009-08-11 08:54:10 -07:00
Wu-cheng Li
b826bf9182 Fix the bug that EXIF attributes are always cached.
b2039501
2009-08-11 23:37:01 +08:00
Hung-ying Tyan
a2a29b0c8e Fix order of setting/saving state in VpnService.
and also refactor code making sure a thread won't grab two locks (which
may cause deadlocks in some corner cases).
2009-08-11 23:28:59 +08:00
Android (Google) Code Review
44224695de Merge change 20632
* changes:
  call super.finalize() from WebView
2009-08-11 08:17:43 -07:00
Dianne Hackborn
c8a0a75e1c Implement support for scrolling a wallpaper.
This currently only works for a wallpaper that is larger than the
screen.  Set the scroll position with the new wallpaper API.  Right
now only does jump scrolls.
2009-08-11 10:03:16 -04:00
Eric Laurent
2ce89adde4 resolved conflicts for merge of 8af63bc9 to master 2009-08-11 00:01:01 -07:00
Android (Google) Code Review
c8707a91cd Merge change 20699
* changes:
  enable HW acceleration for the Dim Surface on 8k devices
2009-08-10 21:22:00 -07:00
Mathias Agopian
4523b76803 enable HW acceleration for the Dim Surface on 8k devices 2009-08-10 21:13:06 -07:00
Jeff Sharkey
08b75b1ffb New ContentProviderOperation to assert values during batch.
When performing a set of batch operations, some callers need
to enforce that a query has specific values.  For example,
when persisting edited Contact values, we need to assert
that the RawContacts.VERSION matches the version we read out
through queryEntities().

This change adds a new TYPE_ASSERT that uses withValues()
and withSelection(), and checks all values when applying the
batch operation, bailing if any values don't match.
2009-08-10 20:59:20 -07:00
Android (Google) Code Review
3afaaf7ade Merge change 20686
* changes:
  fix the build
2009-08-10 17:46:27 -07:00