Leon Scroggins
f180bdac0f
Merge "Pass keys to plugin while shift is held down."
2010-03-08 10:42:42 -08:00
Patrick Scott
72cbb9fe72
Merge "If both cookies have null values, use the name difference."
2010-03-08 09:54:08 -08:00
Mike LeBeau
4d17c435fd
Merge "Adding support for passing HTTP headers to a Browser"
2010-03-08 09:41:10 -08:00
Eric Laurent
59bfca0cc1
Merge "Fix issue 2317760: Change the priority between wired headset and A2DP."
2010-03-08 09:40:15 -08:00
San Mehat
864dd7608e
Merge "dumpstate: Add secure container + mounted filesystems to bugreport"
2010-03-08 09:05:44 -08:00
Amith Yamasani
1f63783b10
Merge "Fix a SettingsProvider test : 2377540"
2010-03-08 09:02:31 -08:00
Patrick Scott
9f9b5d6c07
Merge "Cookies like "a=b" were broken due to my previous change."
2010-03-08 08:22:59 -08:00
Steve Block
d278d97a53
Merge "For synchronous loads, load file URLs in the WebCore thread, rather than in the new WebViewWorker thread"
2010-03-08 08:16:41 -08:00
Bjorn Bringert
ddc7f16a29
Merge "Fixing: Position of right button edge is different for VS"
2010-03-08 07:16:16 -08:00
Eric Laurent
219795f5d0
Fix issue 2317760: Change the priority between wired headset and A2DP.
...
Modified audio policy manager so that wired headset has precedence over A2DP headset.
2010-03-08 06:50:44 -08:00
Mike Lockwood
ef70c8971c
Merge "location: dump LocationProvider internal state"
2010-03-08 06:47:49 -08:00
Mike Reed
eb90a5a9b2
Merge "hidden api sameAs() to compare the pixels of 2 bitmaps for equality"
2010-03-08 05:54:42 -08:00
Bjorn Bringert
42b444025a
Merge "Hide Go button in browser when no text is entered"
2010-03-08 05:45:42 -08:00
Mike Lockwood
5e56a199ec
Merge "Disable car mode should not require DISABLE_KEYGUARD permission"
2010-03-08 04:12:28 -08:00
Chia-chi Yeh
0755483539
keystore: allow '\0's in keys and add guards for cplusplus.
...
Change-Id: I0af6ed7c5d51ce4ca39cb837e475942800cf6e2d
2010-03-08 17:21:35 +08:00
Raphael
eb8e5e45f8
Merge "ADT: Mark WebView as a Widget. Eclipse/ADT will display it in the GUI creator."
2010-03-06 10:45:36 -08:00
Jack Palevich
2706bde10b
Merge "Fix inverted release-EGLContext-on-pause logic."
2010-03-06 10:41:19 -08:00
Amith Yamasani
220a56fccf
Merge "Update keyboard key assets."
2010-03-05 21:40:23 -08:00
Adam Powell
6b738ebb68
Merge "Fixed a regression setting ListView selection mode without an adapter"
2010-03-05 19:57:09 -08:00
Adam Powell
43ad2726ae
Merge "Fix for badly rebased current.xml"
2010-03-05 18:54:38 -08:00
Christopher Tate
d3a50f3248
Rename cleanspec => CleanSpec to match the build rule
...
Change-Id: I9cc9027ea82a90af5f369976823f0feb0a1eeda0
2010-03-05 18:48:59 -08:00
Christopher Tate
5cbf93675a
Merge "Fix up missed refactoring in JNI reg and preloaded-classes"
2010-03-05 18:27:37 -08:00
Christopher Tate
a121ca234a
Fix up missed refactoring in JNI reg and preloaded-classes
...
Change-Id: I079bdf4edfb9083eba3e15d8e4dbf3b2bad9190c
2010-03-05 18:26:41 -08:00
Romain Guy
572e5aa70a
Merge "Correctly validate numbers when pasted in NumberPicker. Bug #2258525 "
2010-03-05 17:34:10 -08:00
Christopher Tate
137e32fc35
Merge "Fix doc references to "android.backup" to the new "android.app.backup""
2010-03-05 17:32:52 -08:00
Chih-Chung Chang
7d17d478e3
Merge "Still do dump() if we cannot get mServiceLock for a while."
2010-03-05 17:24:52 -08:00
Christopher Tate
85a5084833
Merge "Refactor android.backup => android.app.backup"
2010-03-05 16:29:04 -08:00
Christopher Tate
21c145e7f3
Refactor android.backup => android.app.backup
...
Change-Id: I0b21316ff890d7f3c7d4b82837bb60670724c2e8
2010-03-05 16:27:15 -08:00
Wink Saville
6e671e1d53
Merge "Allow the configuration string to have quotes."
2010-03-05 16:22:55 -08:00
Amith Yamasani
3be04d5d9c
Merge "Logging to track down an elusive bug with Messaging app losing IME focus in landscape."
2010-03-05 16:06:50 -08:00
Eric Laurent
194e485dd1
Merge "Fix issue 2428563: Camera rendered inoperable by voice call interruption."
2010-03-05 16:01:47 -08:00
Chih-Chung Chang
f0252f278b
Still do dump() if we cannot get mServiceLock for a while.
2010-03-05 15:21:02 -08:00
Adam Powell
61a2c93ad9
Merge "Added accessors for view overscroll modes"
2010-03-05 14:48:06 -08:00
Suchi Amalapurapu
61de036dae
Merge "Add null checks for strings"
2010-03-05 13:24:06 -08:00
Mark Wagner
3a5706dcf1
Merge "don't assume Cursor.getExtras returns non-null"
2010-03-05 13:08:13 -08:00
Mike Lockwood
ba52760f2b
Merge "Keep screen on when in car mode and the device is powered."
2010-03-05 13:07:10 -08:00
Grace Kloba
0f29209a05
Merge "Adding over scroll to webview. We will always apply over scroll vertically. In horizontal direction, if the page can't be zoomed and the current content just fit, we will not do over scroll."
2010-03-05 13:06:15 -08:00
Brad Fitzpatrick
fd6c035b83
Merge "Add "call" method on ContentProvider."
2010-03-05 12:19:50 -08:00
Mike Lockwood
47dd4e9be4
Merge "Disable the keyguard when in car mode"
2010-03-05 12:07:25 -08:00
Ed Heyl
a884f4d0f6
Merge "Change an aapt "warning" from "*** " to "**** " (from three to four stars). "*** " (three stars and a space) is the 'magic make error string'; so this change makes it easier to find the real issues/errors in build logs. Besides, other aapt messages are "**** "."
2010-03-05 11:59:58 -08:00
Eric Laurent
4f1fcc2890
Fix issue 2428563: Camera rendered inoperable by voice call interruption.
...
The problem is that AudioRecord never exits read() when a timeout occurs while trying
to get new PCM data from audio hardware input buffer: it just keeps waiting and retrying until stop() is called.
In the same time, opencore AndroidAudioInput::audin_thread_func() loop cannot be exited when stuck
in AudioRecord::read() because the iExitAudioThread flag can only be sampled when AudioRecord::read()
returns. We remain stuck with the audio input thread running.
The fix consists in modifying AudioRecord behavior in case of timeout when getting new PCM samples.
We now wait only one timeout period and try to restart audio record, in case the problem is due to a media_server
process crash. If this fails, we exit read() with a number of bytes read equals to 0 so that
AndroidAudioInput::audin_thread_func() loop can exit.
Also modified Audioflinger::RecordThread() loop so that we attempt to recover from HAL read errors.
In case of read error, the input stream is forced to standby so that next read attempt does a
reconfiguration and restart of the audio input device.
2010-03-05 11:54:23 -08:00
Xavier Ducrohet
2fcfbf3e6c
Merge "Fix potential aapt crash when processing overlay."
2010-03-05 11:22:40 -08:00
Andreas Huber
479562b21a
Merge "Instead of allocating the decoder instances in response to a call to setDataSource, postpone allocation to the preparation phase where it belongs."
2010-03-05 11:00:36 -08:00
Dianne Hackborn
2856c5b19a
Refactor car mode.
...
Extract all UI behavior from dock observer and ACTION_DOCK_EVENT.
Also introduce a desk type to go along with the car type all through
the resource system, since we now need to have corresponding high-level
broadcasts for desk dock mode. As part of that I also reworked some
of the logic for switching modes to all funnel through a single
update() call that looks all of the current state to decide what to
do next, and fixed various locking issues.
In addition I found there were bugs in the configuration change
handling causing us to only switch into the car mode config and
then never get out of it. Unfortunately now that we are actually
changing the configuration for each mode change, the transitions
between them are really crummy as we restart all kinds of
activities. :(
2010-03-05 10:57:47 -08:00
Suchi Amalapurapu
51edc0fb69
Merge "Fix persisting flags for apps with data only Force gc's before deleting containers.:"
2010-03-05 10:36:15 -08:00
Christopher Tate
30f82b8c52
Merge "Calculate bitmask array sizes correctly in the EventHub"
2010-03-05 10:22:35 -08:00
Gloria Wang
9872e95969
Merge "Release mediaplayer if the current state is not suspending. Fix for bug 2480093."
2010-03-05 10:22:04 -08:00
Vasu Nori
d1f3601dc9
Merge "provide databasename to the logging func registration func"
2010-03-05 10:06:48 -08:00
Ben Murdoch
0bcad9b1dc
Merge "It is possible that we may get a call from WebCore that the first layout has completed before we've successfully syncd the webview dimensions from Java to native and in this case, we end up syncing a height of 0 to WebKit. This causes hit detection to fail, as WebKit thinks we have a 0-height visible area. This patch fixes this scenario by syncing the height of the webview back to WebKit in the case that the first layout comes back before we've sent our dimensions."
2010-03-05 09:42:06 -08:00
Shimeng (Simon) Wang
344ae7d820
Merge "Squashed commit of the following:"
2010-03-05 09:40:42 -08:00
