29423 Commits

Author SHA1 Message Date
Chia-chi Yeh
3f6855ba6c am a102871c: am b80e610b: Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread
Merge commit 'a102871c7cbb74ebddc53231a871145de61351b0'

* commit 'a102871c7cbb74ebddc53231a871145de61351b0':
  Visualizer: replace the FFT implementation with a faster one.
2010-08-24 11:19:28 -07:00
Kenny Root
14ee4cf305 resolved conflicts for merge of d51a933b to master
Change-Id: Ibc02613d129b0bdbb579c1a4e58147d720301acc
2010-08-24 11:16:28 -07:00
Irfan Sheriff
b1c96fc137 am b65444df: (-s ours) am 80db4381: Merge "DO NOT MERGE Enable all networks on screen on" into gingerbread
Merge commit 'b65444df013020000a0d60491e9cf14c950c9500'

* commit 'b65444df013020000a0d60491e9cf14c950c9500':
  DO NOT MERGE Enable all networks on screen on
2010-08-24 11:02:08 -07:00
Steve Howard
15a4a2cb8e am 6d895fdb: am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread
Merge commit '6d895fdbc023743f3870042e73a5614764e4165b'

* commit '6d895fdbc023743f3870042e73a5614764e4165b':
  Make ProgressBar.setVisibility() remotable.
2010-08-24 11:01:14 -07:00
Trevor Johns
e79486fed8 am 63f05fe4: am bb75aa90: am ca9d51b1: Disabling AccessibilityService sample from build system.
Merge commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3'

* commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3':
  Disabling AccessibilityService sample from build system.
2010-08-24 11:01:02 -07:00
Gilles Debunne
01b5571020 Merge "Added new Holo assets for Check boxes and Radio buttons." 2010-08-24 10:57:20 -07:00
Wink Saville
a334e7c724 Allow reliable detection of a message that is in use.
Because the standard Looper.loop code calls Message#recycle it is
imperative that Handler#handleMessage code not attempt to resue
a message it receives. If allowed to do so it will cause bugs that
could be difficult to diagnois.

This change adds Message#flags and uses one bit to reliably detect
a message is in use and throws an error in MessageQueue#enqueueMessage.
This allows early detection of this bug.

Note: This is not new functionality, but the current implementation does
not detect messages that are in use because it uses Message#when != 0
as the detection mechanism. The problem is that a Message#when value of 0
is valid value used to place a message at the front of the queue and is
thus unreliable.

Another option is to change the setting of Message#when in Message#enqueueMessage
so that it is never 0, although that does change subtly a publicly accessible
field.

Yet another option would be to use other fields but all candidates have
similar problems as when in that they are publicly accessible or even
settable such as Message#target.

Change-Id: I040d6e546376f7b1ed1e4daa0d5644cce8bf333a
2010-08-24 10:56:30 -07:00
Jean-Baptiste Queru
a4ddf42673 resolved conflicts for merge of c64b916e to master
Change-Id: I31b84d72186a918f19e0c9dee8fdebc83f661cc1
2010-08-24 10:45:16 -07:00
Gilles Debunne
9765b2a01d am 2703a42d: When an EditText gains focus by tapping, move the insertion point where tapped.
Merge commit '2703a42d16af0e62da1bba02b6c935d98debf936' into gingerbread-plus-aosp

* commit '2703a42d16af0e62da1bba02b6c935d98debf936':
  When an EditText gains focus by tapping, move the insertion point where tapped.
2010-08-24 10:30:09 -07:00
Gilles Debunne
b0b18b8de1 Added new Holo assets for Check boxes and Radio buttons.
Change-Id: I9e7e95f16367b2bd20ec1c9231a04834f6f8e8f5
2010-08-24 10:26:17 -07:00
Jean-Baptiste Queru
0a5699654f am f235a519: am ec58dff0: Fix build - remove dead doc link
Merge commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f'

* commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f':
  Fix build - remove dead doc link
2010-08-24 10:25:00 -07:00
Gilles Debunne
2703a42d16 When an EditText gains focus by tapping, move the insertion point where tapped.
The previous behavior was to move cursor at the end of the first line,
which feels weird.

Change-Id: I5a72f9871ed79ee2c521698ea642ba126537f4f9
2010-08-24 10:18:31 -07:00
Jean-Baptiste Queru
1770b21ab5 am 0460e26a: resolved conflicts for merge of 691be97f to gingerbread-plus-aosp
Merge commit '0460e26a4c9915f77c915d2cc3540969802b02fa'

* commit '0460e26a4c9915f77c915d2cc3540969802b02fa':
  add new sensor types for handling gyro data and device orientation
2010-08-24 10:17:03 -07:00
Wink Saville
b422ca809c am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2'

* commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
2010-08-24 10:16:42 -07:00
Jean-Baptiste Queru
0fc1b793b6 am b13c9bc5: manual merge
Merge commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6'

* commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6':
  BluetoothHeadset.java:
2010-08-24 10:16:28 -07:00
Romain Guy
104422039b am 5a14271a: am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread
Merge commit '5a14271aacb932ba0d52978c939f74e4c685f7d6'

* commit '5a14271aacb932ba0d52978c939f74e4c685f7d6':
  Load bitmaps in the correct format.
2010-08-24 10:15:51 -07:00
Vasu Nori
4077d7a75d Merge "SQLiteOpenHelper should discard closed singleton database objects" 2010-08-24 10:08:13 -07:00
Eric Laurent
33e0d83431 am b6d71351: Merge "LVM release 1.05 delivery" into gingerbread
Merge commit 'b6d71351c074d5c0bc13a91544d776f1524eaabd' into gingerbread-plus-aosp

* commit 'b6d71351c074d5c0bc13a91544d776f1524eaabd':
  LVM release 1.05 delivery
2010-08-24 09:58:23 -07:00
Kenny Root
53e75ea847 resolved conflicts for merge of 485de781 to master
Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f
2010-08-24 09:57:33 -07:00
Eric Laurent
b6d71351c0 Merge "LVM release 1.05 delivery" into gingerbread 2010-08-24 09:50:13 -07:00
Nipun Kwatra
d820714e30 am 701b710c: am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration." into gingerbread
Merge commit '701b710c194181765616520f6d89d450b4b6c1f5'

* commit '701b710c194181765616520f6d89d450b4b6c1f5':
  setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
2010-08-24 09:03:55 -07:00
Dianne Hackborn
37a1e2370f am a3ece8bd: am 32519259: Merge "Fix a few small battery stats problems:" into gingerbread
Merge commit 'a3ece8bde37acd81b08c4e3c1cb0e6d006ade3e0'

* commit 'a3ece8bde37acd81b08c4e3c1cb0e6d006ade3e0':
  Fix a few small battery stats problems:
2010-08-24 09:03:45 -07:00
Brian Carlstrom
07d39e9150 am 005f0d08: am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread
Merge commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa'

* commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa':
  Tracking merge of dalvik-dev to gingerbread
2010-08-24 09:03:29 -07:00
Dianne Hackborn
cc5239b78b am 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread
Merge commit '8b569c8d49924d849793513a5418ef0350320962'

* commit '8b569c8d49924d849793513a5418ef0350320962':
  Fix aapt dump badging to support xlarge screens.
2010-08-24 09:02:43 -07:00
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