summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1Ed Heyl2011-03-091-7/+5
|\
| * UsbManager: Fix broken Javadoc linksMike Lockwood2011-03-091-7/+5
| | | | | | | | | | Change-Id: Ia8ec7b29a7532feb00a28d6d325c129a9e041d2b Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1Eric Laurent2011-03-092-4/+12
|\ \
| * | Fix issue 3439872: video chat and bluetooth SCOEric Laurent2011-03-082-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the stability problems experienced when using a bluetooth headset supporting both A2DP and SCO. Problems occur when starting the video chat at which time the A2DP output is being stopped to start SCO. At that time, active AudioTracks are invalidated by AudioFlinger so that a new AudioTrack binder interface can be recreated by the client process on the new mixer thread with correct parameters. The problem was that the process to restore the binder interface was not protected against concurrent requests which caused 2 binder interfaces to be created sometimes. This could lead to permanent client deadlock if one of the client threads was waiting for a condition of the first created binder interface while the second one was created (as the AudioFlinger would only signal conditions on the last one created). This concurrent request situation is more likely to happen when a client uses the JAVA AudioTrack as the JNI implementation uses simultaneously the native AudioTrack callback and write push mechanisms. By doing so, the code that checks if the binder interface should be restored (in obtainBuffer()) is much more likely to be called concurrently from two different threads. The fix consists in protecting the critical binder interface restore phase with a flag in the AudioTrack control block. The first thread acting upon the binder interface restore request will raise the flag and the second thread will just wait for a condition to be signaled when the restore process is complete. Also protected all accesses to the AudioTrack control block by a mutex to prevent access while the track is being destroyed and restored. If a mutex cannot be held (e.g because we call a callback function), acquire a strong reference on the IAudioTrack to prevent its destruction while the cblk is being accessed. Modified AudioTrack JNI to use GetByteArrayElements() instead of GetPrimitiveArrayCritical() when writing audio buffers. Entering a critical section would cause the JNI to abort if a mediaserver crash occurs during a write due to the AudioSystem callback being called during the critical section when media server process restarts. Anyway with current JNI implementation, either versions do not copy data most of the times and the criticial version does not guaranty no data copy. The same modifications have been made to AudioRecord. Change-Id: Idc5aa711a04c3eee180cdd03f44fe17f3c4dcb52
* | | Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1Shimeng (Simon) Wang2011-03-091-2/+3
|\ \ \ | |_|/ |/| |
| * | Consider mInitialScale when setting min zoom scale.Shimeng (Simon) Wang2011-03-081-2/+3
| | | | | | | | | | | | | | | | | | | | | This fixes CTS test failure. issue: 4056256 Change-Id: Iee4adba2e462f5e0e79cf359e5b6a1531eafcdd8
* | | Change UsbManager.requestPermission to only grant permission temporarilyMike Lockwood2011-03-094-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user approves an application to access a USB device or accessory without choosing it as the default application, then permission is granted only until the device or accessory is disconnected. Only applications chosen as the default choice have permissions assigned persistently. BUG: 4061035 Change-Id: Ic4f6271a91b2fc56bbeef82c579e26d88c63ae56 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Merge "Pass the auto login header information to the app." into honeycomb-mr1Patrick Scott2011-03-093-2/+49
|\ \ \
| * | | Pass the auto login header information to the app.Patrick Scott2011-03-083-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new callback to handle auto login requests. Bug: 3367381 Change-Id: I2ee8038cdf8a4ff9d1d3de0c871a0c60f1769655
* | | | Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into ↵Kristian Monsen2011-03-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | honeycomb-mr1
| * | | | Fix for bug 3469242 Turn of extra debugging before shippingKristian Monsen2011-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverting 3469242 Turn of extra debugging before shipping manually since that was done in master. Change-Id: I0e6ec7dd22ec07e09af7d7270c05ad2b6cc624bb
* | | | | Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1Mike Lockwood2011-03-094-13/+117
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Close USB dialogs if their corresponding accessory or device has disconnected USB: Add API and dialog for apps to request permissions for USB devices and accessories UsbService: Automatically use system apps by default if it is the only choice
| * | | | | USB: Add API and dialog for apps to request permissions for USB devices and ↵Mike Lockwood2011-03-084-13/+117
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accessories New APIs: UsbManager.hasPermission returns true if the caller has permission for the given device or accessory UsbManager.requestPermission poses a dialog to allow the user to give the caller permission for the device or accessory. Result is returned via a PendingIntent. No dialog is displayed if the caller already has permission. Also moved UsbResolverActivity to SystemUI package BUG: 4069037 Change-Id: I93be769501a8776b49ac26e468af19f8fa2114c9
* | | | | Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be ↵Adam Powell2011-03-092-7/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | consistent with the "up" indicator" into honeycomb-mr1
| * | | | | Fix bug 4065021 - Adjust spacing of the "home" action bar item to beAdam Powell2011-03-092-7/+64
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent with the "up" indicator Make sure that the "home" affordance in the action bar always occupies the same amount of space regardless of whether or not the "up" indicator is visible. This means centering the application icon/logo in the remaining space after the "up" indicator has been added. Change-Id: I3c81cfe8255546d4dd676af913895713baba4f13
* | | | | Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1Romain Guy2011-03-081-1/+1
|\ \ \ \ \
| * | | | | Prevents NPE when a View was detachedRomain Guy2011-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #4068284 Change-Id: Ied1c9b8d32a3e9957c6b165642ba40bbdaf35d53
* | | | | | Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1Adam Powell2011-03-082-10/+12
|\ \ \ \ \ \
| * | | | | | Bug 3509417 - Refine touch event serializationAdam Powell2011-03-082-10/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue with single-touch events handled by webkit. Change-Id: Ief4e9ec91cda7dd3940241c684d0907cb8c9890f
* | | | | | Merge "Partial invalidation of the browser textures" into honeycomb-mr1Nicolas Roard2011-03-081-9/+4
|\ \ \ \ \ \
| * | | | | | Partial invalidation of the browser texturesNicolas Roard2011-03-081-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corresponding webkit CL: https://android-git.corp.google.com/g/#change,100673 bug:3461349 bug:3464483 Change-Id: I913b07a27129e37d8d949dd62e71d350ed119569
* | | | | | | Merge "Searchview layout cleanup. Some more tweaks required for Market." ↵Amith Yamasani2011-03-082-18/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr1
| * | | | | | | Searchview layout cleanup. Some more tweaks required for Market.Amith Yamasani2011-03-082-18/+26
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3321263 Submit area should be visible when the field has focus, irrespective of text content. Make sure that the fields get highlighted when focused. Also fix an issue with hint not being applied from the SearchableInfo. Bug: 3470348 Change-Id: If399d9551f89312c19485e249043f5823a862499
* | | | | | | Merge "Updated text cursor assets" into honeycomb-mr1Justin Ho2011-03-084-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Updated text cursor assetsJustin Ho2011-03-084-0/+0
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: Ib3f7fc4f835957c07b6c3b045cb5b3131034dde3
* | | | | | | Merge "Fixing inconsistency between invalidate region and draw region" into ↵Adam Cohen2011-03-081-5/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1
| * | | | | | | Fixing inconsistency between invalidate region and draw regionAdam Cohen2011-03-081-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84458b31b4d3e8c305d64eb25e352fc4aba933d0
* | | | | | | | Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1Andy Stadler2011-03-082-4/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Clarify rules about encryption of emulated storage.Andy Stadler2011-03-072-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3351426 Change-Id: I3a8fcd369862f3eab1781699108e29fe7ab474a0
* | | | | | | | | Merge "Correctly handle opaque fading views Bug #3475554" into honeycomb-mr1Romain Guy2011-03-082-3/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Correctly handle opaque fading viewsRomain Guy2011-03-082-3/+3
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #3475554 Change-Id: Ia4915ada67046486103dfc6f08e4dac8564f85dd
* | | | | | | | Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1Huahui Wu2011-03-081-1/+49
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | b/3307761 Tuning two fingers pan.Huahui Wu2011-03-081-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User reports jumpy when trying two fingers pan. This change keeps track of the previous movements of the fingers' middle point, compares to the change of the fingers' distance, and decides to pan or zoom or do both. Change-Id: I8a6a8e9259db85b0e820b6e25ba0822ed289fb45
* | | | | | | | Merge "In xlarge, use "tab" instead of "window"" into honeycomb-mr1John Reck2011-03-081-0/+24
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | In xlarge, use "tab" instead of "window"John Reck2011-03-081-0/+24
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4027268 Use "tab" instead of "window" in incognito welcome page in xlarge. Change-Id: I7582b845d5848db742a2884e65161ca7c00d1fd8
* | | | | | | Merge "Text handles positions' are correctly updated." into honeycomb-mr1Gilles Debunne2011-03-082-129/+99
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Text handles positions' are correctly updated.Gilles Debunne2011-03-072-129/+99
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 3510106 The CAB animation does not fire events, which does not update the handles' positions. The solution is to make the handle update their position before any draw traversal, using an onPreDrawListener. The ScrollingPopupWindow onScroll listener is no longer needed with this change. This is also a more robust solution since other events (such as animations) may change the TextView's position. The cost is a recomputation of the Handles' positions at each redraw which was not necessary with listeners. But as mentioned before, not all possible events provide listeners or will in the future. Change-Id: I0f46118de5f660a75d95eecb2cf987fcb4b3b322
* | | | | | Merge "Do not attempt to start action mode if there is no parent." into ↵Leon Scroggins2011-03-081-2/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | honeycomb-mr1
| * | | | | Do not attempt to start action mode if there is no parent.Leon Scroggins2011-03-081-2/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Bug:3514747 Change-Id: Id4c5c803bfb8bb2f5f81fa15599784e808e0d223
* | | | | Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1Jesse Wilson2011-03-072-25/+8
|\ \ \ \ \
| * | | | | Remove deprecated and unused entryEvicted method.Jesse Wilson2011-03-072-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30ccf3d798a3ebfc88a1b340efaaacf524d56fae http://b/3461302
* | | | | | Merge "Add support for partial invalidates in WebView Bug #3461349" into ↵Romain Guy2011-03-076-25/+44
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | honeycomb-mr1
| * | | | | Add support for partial invalidates in WebViewRomain Guy2011-03-076-25/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #3461349 This change also fixes two bugs that prevented partial invalidates from working with other views. Both bugs were in our EGL implementation: they were preventing the caller from comparing the current context/surface with another context/surface. This was causing HardwareRenderer to always redraw the entire screen. Change-Id: I33e096b304d4a0b7e6c8f92930f71d2ece9bebf5
* | | | | | Merge "Fix issue #3515088: Don't be so aggressive trying to reclaim memory" ↵Dianne Hackborn2011-03-071-7/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr1
| * | | | | | Fix issue #3515088: Don't be so aggressive trying to reclaim memoryDianne Hackborn2011-03-071-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8184306fa8c27a41b8bcfcad8d96985be8f0c9aa
* | | | | | | Merge "Restore save/restore calls removed recently" into honeycomb-mr1Chet Haase2011-03-071-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Restore save/restore calls removed recentlyChet Haase2011-03-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls thought to be duplicates were removed, which caused rendering problems for Browser as well as crashes in the widget list and music. Change-Id: I6364aaa362619ea3dd368990304d61d84bbe2a90
* | | | | | | | Merge "Fix EGL JNI bugs Bug #3461349" into honeycomb-mr1Romain Guy2011-03-071-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fix EGL JNI bugsRomain Guy2011-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #3461349 Before this change, eglGetCurrent*() could not be used to compare contexts, displays and surfaces at the Dalvik level. Change-Id: I442037dae37bc357b64810ab10c779b5754e9153
* | | | | | | | Merge "Fix bug 3506292 - Add guards against bad event streams to ↵Adam Powell2011-03-071-0/+25
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | ScaleGestureDetector" into honeycomb-mr1
generated by cgit v1.1 at 2025-02-08 21:04:20 +0000