17984 Commits

Author SHA1 Message Date
Nicolas Roard
493bcdda3b Fix memory leak with layers.
This fix bug http://b/2394813
This is a two-parts CL (needs C++ modifs)
2010-01-26 18:36:51 +00:00
Nick Pelly
651284d049 Merge "Revert "Fix failure to open AVRCP input device due to EPERM."" 2010-01-26 10:36:44 -08:00
Nick Pelly
c8b60d1932 Revert "Fix failure to open AVRCP input device due to EPERM."
This reverts commit e6b1bbd8acca3f6e174c24cf4eb23a66db2d08a2.
2010-01-26 10:28:52 -08:00
Patrick Scott
9521e257bc am 5b7ea014: (-s ours) am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Merge commit '5b7ea0146dcfd5564d894d4cf0104919775feb36'

* commit '5b7ea0146dcfd5564d894d4cf0104919775feb36':
  DO NOT MERGE
2010-01-26 10:27:12 -08:00
Grace Kloba
7168231a40 am c811cd91: am caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up)
Merge commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db'

* commit 'c811cd916f7264f11ba4c96fcd8b88e5d58e04db':
  Delay resetting mPreventDrag flags so that the Plugin
2010-01-26 10:27:06 -08:00
Grace Kloba
79015fd263 am cf0957ce: am 77dc179b: As embedded and full screen shares the same view, we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout.
Merge commit 'cf0957ce4b0ba45b6c66c726710a5126c6a57542'

* commit 'cf0957ce4b0ba45b6c66c726710a5126c6a57542':
  As embedded and full screen shares the same view,
2010-01-26 10:26:57 -08:00
Patrick Scott
5b7ea0146d am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Merge commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4' into eclair-mr2-plus-aosp

* commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4':
  DO NOT MERGE
2010-01-26 10:11:30 -08:00
Robert Greenwalt
09ac3c3cbc resolved conflicts for merge of 1f2f23bd to master 2010-01-26 10:09:52 -08:00
Grace Kloba
c811cd916f am caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up)
Merge commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62' into eclair-mr2-plus-aosp

* commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62':
  Delay resetting mPreventDrag flags so that the Plugin
2010-01-26 10:09:52 -08:00
Grace Kloba
cf0957ce4b am 77dc179b: As embedded and full screen shares the same view, we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout.
Merge commit '77dc179baa7b8fb405633fd46324e336285d10e2' into eclair-mr2-plus-aosp

* commit '77dc179baa7b8fb405633fd46324e336285d10e2':
  As embedded and full screen shares the same view,
2010-01-26 10:09:39 -08:00
Patrick Scott
e7b2845d68 Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2 2010-01-26 10:07:23 -08:00
Andreas Huber
996dddff64 Support for audio recording into AMR NB/WB files as well as audio tracks in MPEG4 files.
related-to-bug: 2295449
2010-01-26 09:10:33 -08:00
Mark Vandevoorde
a3d5e0c5e3 Unhide the secure setting for LocationProviderEnabled
The unbundled NetworkLocationProvider needs to get/set the enabled bit
from the settings database.
2010-01-26 08:42:10 -08:00
San Mehat
03b58bdf0e Merge "NetworkManagementService: Start service when SystemServer starts up" 2010-01-26 07:59:08 -08:00
San Mehat
d1df8ac6d0 NetworkManagementService: Start service when SystemServer starts up
Signed-off-by: San Mehat <san@google.com>
2010-01-26 07:51:05 -08:00
Mike Reed
ab4a0c164b add API to change default config on image decoders.
May be called by the browser to get high-quality images when running in a 32bit window
2010-01-26 10:18:32 -05:00
Patrick Scott
8d9eb9f681 Merge "Set a flag that indicates a response is pending." 2010-01-26 07:08:17 -08:00
Daniel Sandler
9d8b876c61 Add android.provider.Settings.ACTION_DEVICE_INFO_SETTINGS.
Maps to "android.settings.DEVICE_INFO_SETTINGS", which
launches the DeviceInfoSettings activity in Settings.
2010-01-26 09:59:35 -05:00
San Mehat
0c8569f2a3 Merge "MountService: Add support for renaming secure containers" 2010-01-26 06:19:21 -08:00
Patrick Scott
74f6c03bb2 Set a flag that indicates a response is pending.
This will keep track of multiple calls to proceed/cancel. If an error has
occurred and the client calls proceed or cancel more than once, the loader may
be null. Set the flag during the callback and reset after a response.

Bug: 2371305
2010-01-26 08:17:18 -05:00
Valentin Kravtsov
79896bd123 Adding Recognition Service and Listener wrappers
Change-Id: Ib5068fb6d42b6752d09b0828964b6cbe92d015d3
2010-01-26 11:23:52 +00:00
Yu Shan Emily Lau
eea6ecdfce Add the new golden thumbnail image as the PV and stagefright implementations in capturing thumbnail is different. 2010-01-25 20:49:08 -08:00
Christopher Tate
80202c8cb8 Move towards a formal public API for backup and restore
This commit makes a few changes towards establishing a formal application
interface for interacting with the backup/restore mechanism:

1. Introduce public wrapper classes around the various binder interfaces; 3rd
party code will never see the binders directly.

2. Progress update callbacks during a restore sequence now occur on the main
thread, not in a binder thread [and not with system-process permissions!].

3. Rename the BackupManagerService's inner "RestoreSession" class to avoid
ambiguity with the new public "RestoreSession" class.
2010-01-25 19:41:23 -08:00
Irfan Sheriff
c30ffda0d8 resolved conflicts for merge of d0514347 to master 2010-01-25 19:10:31 -08:00
Robert Greenwalt
3e22907620 am cc4b4016: Fix the reporting of NO_CONNECTIVITY.
Merge commit 'cc4b4016e4b86db012f94bb889e5ca61ff362171' into eclair-plus-aosp

* commit 'cc4b4016e4b86db012f94bb889e5ca61ff362171':
  Fix the reporting of NO_CONNECTIVITY.
2010-01-25 18:56:32 -08:00
Mike LeBeau
199566045d Unhide RecognizerIntent.ACTION_VOICE_SEARCH_SETTINGS, which our voice search
(or other voice search implementations) can use to implement settings in the
system settings.
2010-01-25 21:48:08 -05:00
Grace Kloba
caf0ce3ca2 Delay resetting mPreventDrag flags so that the Plugin
will have more time to respond whether it wants to
handle the touch events. (not have to return the
value from WebViewCore before the first tap is up)

Fix a potential null pointer exception.
2010-01-25 18:36:48 -08:00
Grace Kloba
a98ae1f7d6 am e5b9beae: (-s ours) am f6aed0e0: Merge "DO NOT MERGE" into eclair
Merge commit 'e5b9beae260b451cb3d60583c800b0d223ae256f'

* commit 'e5b9beae260b451cb3d60583c800b0d223ae256f':
  DO NOT MERGE
2010-01-25 18:13:29 -08:00
Grace Kloba
f96a91abb6 am 5b745762: am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.
Merge commit '5b74576218055f1c9d31d9559255e8cf504cd662'

* commit '5b74576218055f1c9d31d9559255e8cf504cd662':
  ScaleGestureDetector needs to query the displaymetrics
2010-01-25 18:13:12 -08:00
Nick Pelly
a667fda9f5 am 425324e9: am e834722f: Merge "Fix failure to open AVRCP input device due to EPERM." into eclair
Merge commit '425324e97bba75cd69bb6c81de6248529540e6fe'

* commit '425324e97bba75cd69bb6c81de6248529540e6fe':
  Fix failure to open AVRCP input device due to EPERM.
2010-01-25 18:12:47 -08:00
Grace Kloba
5dffc6bb2a am aeeb1a84: (-s ours) am 8681df90: DO NOT MERGE
Merge commit 'aeeb1a84aae2c7400b2edd90cea8306565225275'

* commit 'aeeb1a84aae2c7400b2edd90cea8306565225275':
  DO NOT MERGE
2010-01-25 18:12:31 -08:00
Mike Reed
221cb2a6ca am 6dc9232c: (-s ours) am a66baccc: Merge "Do not merge" into eclair
Merge commit '6dc9232c1c9a7ddffba24d4bd218e46894f8414d'

* commit '6dc9232c1c9a7ddffba24d4bd218e46894f8414d':
  Do not merge
2010-01-25 18:12:08 -08:00
Xavier Ducrohet
cda4d7bea2 am 48edf7c0: am d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3."
Merge commit '48edf7c00201f2bc6186e07dbc614976642682e4'

* commit '48edf7c00201f2bc6186e07dbc614976642682e4':
  Revert "SDK doc change: Add doc update for NDKr3."
2010-01-25 18:11:20 -08:00
Grace Kloba
8ad96ae820 am f8c7d06f: am 89e3c1ab: Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
Merge commit 'f8c7d06ffa67015516b822a992513ab86aad1ad5'

* commit 'f8c7d06ffa67015516b822a992513ab86aad1ad5':
  Fix the sloppy detection in the ScaleGestureDetector.
2010-01-25 18:11:02 -08:00
Xavier Ducrohet
0481170a85 am a0ecd4fb: am 38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclair
Merge commit 'a0ecd4fbe65ffb00afb3043584a3d08ee41b0870'

* commit 'a0ecd4fbe65ffb00afb3043584a3d08ee41b0870':
  SDK doc change: Add doc update for NDKr3.
2010-01-25 18:10:42 -08:00
Scott Main
1ce80a4d7a am bfb86068: am 2a79defa: Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair
Merge commit 'bfb8606831d5a5776301733cde3650d237870453'

* commit 'bfb8606831d5a5776301733cde3650d237870453':
  docs: add guide to copying and installing the Dev Tools app
2010-01-25 18:10:13 -08:00
Yang Li
a54bec599a Added comments for GestureUtilities. 2010-01-25 17:59:15 -08:00
Robert Greenwalt
cc4b4016e4 Fix the reporting of NO_CONNECTIVITY.
A refactoring of handleDisconnect instroduced a bug - we were reporting
NO_CONNECTIVITY after any non-primary network (supl, mms, hipri) was lost.

bug:2395006

Change-Id: Ifa9e008872ec646981a35f2c316120cb9685a6a4
2010-01-25 17:54:29 -08:00
Eric Laurent
473bd77675 Merge "Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active." 2010-01-25 17:16:05 -08:00
Robert Greenwalt
6d626d41e9 am 5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair
Merge commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750' into eclair-plus-aosp

* commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750':
  Refine fix I53e91db7 to apply only to wifi network
2010-01-25 16:54:28 -08:00
Scott Main
9985fecaa0 am d243bc71: Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair
Merge commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e' into eclair-plus-aosp

* commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e':
  docs: reference the history JS file with docRoot in order to
2010-01-25 16:54:20 -08:00
Robert Greenwalt
5381e4ef4e Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair 2010-01-25 16:50:10 -08:00
Fred Quintana
307da1a46b enhance the sync manager backoff logic and add support for retry-after
moved SyncQueue and SyncOperation into their own top-level classes
to ease maintainability and testing6

removed some dead code
2010-01-25 16:41:58 -08:00
Romain Guy
e0560e484b Merge "Made GestureUtilities's several methods public; Changed GestureStroke's smoothening threshold." 2010-01-25 16:30:37 -08:00
Robert Greenwalt
6e6dec2843 Refine fix I53e91db7 to apply only to wifi network
The original fix eliminated duplicate wifi connectivity changes stemming from
location provder scan's for APs.  These would generate two DISCONNECTED broadcasts every
two minutes and many apps mis-interpreted them.

The fix was to ignore notifications where the major state was the same as the previous one
for each network.  Unfortunately the state of per-apn notifications on cellular is hacky
and so the wifi fix was breaking mms (mms when you're on cellular with a common default+mms apn does
not generate a disconnect notification (apn still connected) so subsequent connect notifications
get dropped as duplicates).

This change refines the previous change so that it only applies to wifi networks.

bug:2392061
Change-Id: I05d8a46a4b55f8d28df8af12e05284e5e68bfc02
drno: ryanpc
2010-01-25 16:23:56 -08:00
Andreas Huber
e2b3886326 Merge "Initial checkin of AudioSource and AMRWriter, a pair of classes supporting pure-audio recording in stagefright." 2010-01-25 16:18:58 -08:00
Andreas Huber
07bf09da4a Initial checkin of AudioSource and AMRWriter, a pair of classes supporting pure-audio recording in stagefright.
related-to-bug: 2295449
2010-01-25 16:17:40 -08:00
Scott Main
d243bc710c Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair 2010-01-25 15:39:46 -08:00
Yang Li
c7f930f5a9 Made GestureUtilities's several methods public; Changed GestureStroke's smoothening threshold. 2010-01-25 15:15:55 -08:00
Scott Main
d644edb6d8 docs: reference the history JS file with docRoot in order to
make offline doc searches work. (I think this was a regression
due to a missed merge.)
Bug: 1909300
2010-01-25 14:47:46 -08:00