29602 Commits

Author SHA1 Message Date
Kenny Root
e0e6a0fc8e am b90b9d54: am 6be23712: Merge "Free created FileMap when uncompressing files" into gingerbread
Merge commit 'b90b9d54eb6bbc3a4045ff0bf46d3366822e835e'

* commit 'b90b9d54eb6bbc3a4045ff0bf46d3366822e835e':
  Free created FileMap when uncompressing files
2010-08-24 09:02:28 -07:00
Dianne Hackborn
108ef58d9b am c5794ae7: (-s ours) am baf72cd7: Merge "DO NOT MERGE 2928156 Accessibility event\'s parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread
Merge commit 'c5794ae72547cce6cbae1e58df5d32bc0e2520fd'

* commit 'c5794ae72547cce6cbae1e58df5d32bc0e2520fd':
  DO NOT MERGE 2928156  Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)
2010-08-24 09:02:16 -07:00
Robert Greenwalt
608dbbe76f am 2b05a95b: (-s ours) am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
Merge commit '2b05a95bccafddac15debdfb5c39107aa3418783'

* commit '2b05a95bccafddac15debdfb5c39107aa3418783':
  DO NOT MERGE Fixing Connectivity
2010-08-24 09:02:05 -07:00
Dianne Hackborn
103bff317b am 5474b0f8: am 39792d22: Fix bugs with granting permissions through onNewIntent().
Merge commit '5474b0f8603ee66413c3e44600ca46f162f3089e'

* commit '5474b0f8603ee66413c3e44600ca46f162f3089e':
  Fix bugs with granting permissions through onNewIntent().
2010-08-24 09:01:54 -07:00
James Dong
7802b20586 am 3fc01525: am b755e325: Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread
Merge commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5'

* commit '3fc01525ff33020d4d82a7fb8ade8cf18baaf4f5':
  Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
2010-08-24 09:01:39 -07:00
Wu-cheng Li
eee09313c6 am 346b6126: am 97a56269: Merge "Add camera fps range API." into gingerbread
Merge commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e'

* commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e':
  Add camera fps range API.
2010-08-24 09:01:27 -07:00
Cary Clark
e2d37b03f7 am d93ecb3f: (-s ours) am 581f7861: DO NOT MERGE Refactor find and select dialogs
Merge commit 'd93ecb3fab669bb563fcb903966e854a593ceace'

* commit 'd93ecb3fab669bb563fcb903966e854a593ceace':
  DO NOT MERGE Refactor find and select dialogs
2010-08-24 09:00:53 -07:00
android-build SharedAccount
748795096f Merge commit '7e8f0c7454339d240761684807135fbc490e99f6' 2010-08-24 08:50:35 -07:00
android-build SharedAccount
ce7f03be4c Merge commit '6cf5eb0606ecdc22e7c431971a0c621413564840' 2010-08-24 08:48:56 -07:00
Steve Block
fbc2030426 Merge "Hook up device sensors for DeviceOrientation" 2010-08-24 08:35:03 -07:00
Steve Block
bb9db22fbb Hook up device sensors for DeviceOrientation
Change-Id: Ic7165a07a02e3c38165b2f92e3ec7368d2b60e19
2010-08-24 16:33:46 +01:00
Irfan Sheriff
b43ae28951 Merge "cache configured networks" 2010-08-24 08:30:49 -07:00
Mike Lockwood
8c68865649 Merge "MTP: Check and clear exceptions after calling into Java in MtpDatabase" 2010-08-24 08:28:54 -07:00
Mike Lockwood
0a7fa0a868 MTP: Check and clear exceptions after calling into Java in MtpDatabase
Change-Id: I805858c66fe57208c06aa624d16b72966555e005
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-24 11:25:28 -04:00
Steve Block
f24079a28f Merge "Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html" 2010-08-24 07:51:07 -07:00
Hung-ying Tyan
cf95f5d263 SipProfile: add isOutgoingCallAllowed() and new builder constructor
Change-Id: I7ced47079fd2b00c7160b152eb4c1d34399e39dc
2010-08-24 21:32:10 +08:00
Derek Sollenberger
41d5e93bbd Move APK monitoring into WebView.
This CL adds the monitoring logic that was removed from the Browser
in a companion CL.  This allows applications other than the Browser
to use special features offered by YouTube and plugins. Additionally,
the pluginManager was refactored to prevent code duplication between
the manager and WebView.

Change-Id: Ie37f248c8edd9d06ae1fd6675dd5f06f04774b09
http://b/2834603
2010-08-24 09:31:59 -04:00
Hung-ying Tyan
1537637cc4 am 3294d44b: Add confcall management to SIP calls
Merge commit '3294d44b96f63f647fba3a03604eb028e28a42bc' into gingerbread-plus-aosp

* commit '3294d44b96f63f647fba3a03604eb028e28a42bc':
  Add confcall management to SIP calls
2010-08-24 05:00:11 -07:00
Kristian Monsen
f52435569c Merge "Java calls to get Android specific files." 2010-08-24 04:50:12 -07:00
Iain Merrick
558f7dcf05 Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html
This patch modifies the old-style hard-coded ignore list. The new-style
text file (in external/webkit/LayoutTests/platform/android) has been
modified separately, as part of the normal WebKit merge process.

Test added in http://trac.webkit.org/changeset/64613
Needs clearAllApplicationCaches() callback. See http://b/issue?id=2944196

Change-Id: I31655c363c93eada40d01123e9c14c0d03bdba7b
2010-08-24 12:15:54 +01:00
Hung-ying Tyan
3294d44b96 Add confcall management to SIP calls
and fix the bug of re-assigning connectTime's in SipConnection,
and adding synchronization for SipPhone to be thread-safe,
and set normal audio mode when call not on hold instead of on hold in SipAudioCallImpl,
and fix re-entrance problem in CallManager.setAudioMode() for in-call mode.

Change-Id: I54f39dab052062de1ce141e5358d892d30453a3a
2010-08-24 17:54:47 +08:00
Chia-chi Yeh
2ac479faeb am a83987d2: Merge "RTP: integrate the echo canceller from speex." into gingerbread
Merge commit 'a83987d2ccc6b235dd3dd5cc6206c257dfe9e0a8' into gingerbread-plus-aosp

* commit 'a83987d2ccc6b235dd3dd5cc6206c257dfe9e0a8':
  RTP: integrate the echo canceller from speex.
2010-08-24 02:30:14 -07:00
Chia-chi Yeh
a83987d2cc Merge "RTP: integrate the echo canceller from speex." into gingerbread 2010-08-24 02:28:41 -07:00
Chia-chi Yeh
4ae6ec428f RTP: integrate the echo canceller from speex.
Currently the filter_length is set to one second.
Will change that when we have a better idea.

Change-Id: Ia942a8fff00b096de8ff0049a448816ea9a68068
2010-08-24 16:04:18 +08:00
Chia-chi Yeh
50246cd5df am 5b1f0c9f: Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread
Merge commit '5b1f0c9f6416719ef6194dd0c4e0f626ec84082c' into gingerbread-plus-aosp

* commit '5b1f0c9f6416719ef6194dd0c4e0f626ec84082c':
  RTP: reduce the latency by overlapping AudioRecord and AudioTrack.
2010-08-23 23:37:49 -07:00
Brad Fitzpatrick
0b7b980761 am d132892a: Merge "Don\'t touch the VFS during window relayout." into gingerbread
Merge commit 'd132892a75532557bb18af14eab6081704b7fa6d' into gingerbread-plus-aosp

* commit 'd132892a75532557bb18af14eab6081704b7fa6d':
  Don't touch the VFS during window relayout.
2010-08-23 23:37:17 -07:00
Jean-Baptiste Queru
bacc3aa85e am 97b5b765: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '97b5b7650236dd102fa48b51d9361289724a50e9' into gingerbread-plus-aosp

* commit '97b5b7650236dd102fa48b51d9361289724a50e9':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
  Amend previous ndc commit
  Add a method to let a properly permissioned app directly
  Changed SyncOperation.toKey() to not rely on the implementation of
  Squashed commit of the following:
  Add more error checking for ndc
  PackageManagerService: always install native binaries from .apk
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
  Fix a bug where we cleaned an apps external data when upgrading it. :(
  Skip hostname verification when using insecure factory
  Flush binder buffer after setting raw heap to avoid leaking a reference.
  Fix issue #2834005: Android Settings.Secure bypass
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
  Verify hostname where possible, and clarify where not.
2010-08-23 23:37:06 -07:00
Chia-chi Yeh
5b1f0c9f64 Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread 2010-08-23 23:28:45 -07:00
Chia-chi Yeh
2880ef86e5 RTP: reduce the latency by overlapping AudioRecord and AudioTrack.
Change-Id: I00d750ee514ef68d5b2a28bd1893417ed70ef1fc
2010-08-24 13:58:12 +08:00
Banavathu, Srinivas Naik
f3ee6f87a3 Telephony: Remove references to mExitECMRunnable object.
Free mExitECMRunnable object while destroying CDMA phone.

Change-Id: I411b3e5e41a9cc76c3571a98f13f91d84523f623
2010-08-23 22:03:28 -07:00
Chih-Chung Chang
27b257dbcd am 3a59ddc6: (-s ours) am dc2eabd1: Merge "Don\'t recycle native bitmap after the finalizer is called." into gingerbread
Merge commit '3a59ddc67c6ad33c01d36338603586f90d94e71b'

* commit '3a59ddc67c6ad33c01d36338603586f90d94e71b':
  Don't recycle native bitmap after the finalizer is called.
2010-08-23 19:56:34 -07:00
Brad Fitzpatrick
d132892a75 Merge "Don't touch the VFS during window relayout." into gingerbread 2010-08-23 19:38:16 -07:00
Jean-Baptiste Queru
97b5b76502 merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e
2010-08-23 19:08:27 -07:00
Dianne Hackborn
6e549d1c99 am f467ca08: Merge "More watermark work." into gingerbread
Merge commit 'f467ca08dda9efece674efb0cc70c45fab4973a6' into gingerbread-plus-aosp

* commit 'f467ca08dda9efece674efb0cc70c45fab4973a6':
  More watermark work.
2010-08-23 19:01:03 -07:00
Dianne Hackborn
f467ca08dd Merge "More watermark work." into gingerbread 2010-08-23 18:57:37 -07:00
Dianne Hackborn
214a7fde36 Merge "Make Theme.Holo the default theme for new apps." 2010-08-23 18:53:06 -07:00
Dianne Hackborn
3e6d50cc48 Make Theme.Holo the default theme for new apps.
Also change Holo to have an action bar, instead of a title bar.

Change-Id: I45c2f06938509ae02cde99d1c06c228f86e8e3e8
2010-08-23 18:51:26 -07:00
Jaikumar Ganesh
d9a3d1c215 Merge "Add BNEP_SVC UUID for incoming tethering connections." 2010-08-23 18:33:18 -07:00
Jaikumar Ganesh
34536183f4 Add BNEP_SVC UUID for incoming tethering connections.
Change-Id: I90c24edfd133ac9fa89c3467383cd61fa23954c6
2010-08-23 18:32:03 -07:00
Brad Fitzpatrick
9088100518 Don't touch the VFS during window relayout.
yaffs2 is single-threaded and any disk access during window drawing
(or animation in this case) can cause UI stutters / unresponsiveness
for hundreds of milliseconds.

BUG=2941119

Change-Id: Ifdce8337027ab25d1ea844934fa787ffe68263c4
2010-08-23 18:30:08 -07:00
Adam Powell
208e3c586d Merge "Fix some issues with touch event splitting around event timing" 2010-08-23 18:20:56 -07:00
Adam Powell
816c3be1d7 Fix some issues with touch event splitting around event timing
Change-Id: I15d04d226c218ad7b8a5fe43a55c33c3ade2128d
2010-08-23 18:00:14 -07:00
Dirk Dougherty
976b71e2e0 am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp

* commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:52:41 -07:00
Dirk Dougherty
afdc85f65d am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit '397c0f5a18281e3880b9359feab683a13d271a03' into gingerbread

* commit '397c0f5a18281e3880b9359feab683a13d271a03':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:49:49 -07:00
Dirk Dougherty
397c0f5a18 Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo 2010-08-23 17:40:46 -07:00
Dirk Dougherty
1ba62882e4 Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Change-Id: I9e04c54ed3e4d10afddedd6e6e35761e67652cd8
2010-08-23 17:38:35 -07:00
Jamie Gennis
8d920850c8 Merge "Add the setPreviewWindow camera HAL API to the camera stub." 2010-08-23 17:26:57 -07:00
Jamie Gennis
c8536d1952 Add the setPreviewWindow camera HAL API to the camera stub.
Change-Id: Ic669f9d5f5ae8f1fe5bd055f55aa4a18fa6d84cd
2010-08-23 17:25:55 -07:00
Jaikumar Ganesh
33696164ed Merge "Revert "Allow reliable detection of a message that is in use."" 2010-08-23 17:12:17 -07:00
Vasu Nori
cc6f54910d SQLiteOpenHelper should discard closed singleton database objects
bug:2943028
Change-Id: I4b6263cc25413995363158c976d3c723231cc050
2010-08-23 17:08:41 -07:00