summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix bug 5357295 NPE on display when remote control client diesJean-Michel Trivi2011-09-281-10/+18
| | | | | | | | | | | | | | | | | | When a IRemoteControlClient dies, that client is set to null in the stack of remote control entries (mRCStack). This is done by calling registerRemoteControlClient() with a null client. The bug is that registerRemoteControlClient(), after storing the new client, uses it to let it know what the current remote control display is. When that display is non null, the client is sent the current display. So when a client died when there was a display, the client reference was accessed in the part of the method where we haven't yet checked whether it is null or not. The fix consists in moving the setting of the display on the client (method plugRemoteControlDisplay) only after having checked that the client is non-null. Change-Id: Ic74d6cba9e3a3a16e78cd80a1ae5901abfeb3905
* Merge "Improve docs in BaseAdapter."Adam Powell2011-09-271-3/+8
|\
| * Improve docs in BaseAdapter.Adam Powell2011-09-271-3/+8
| | | | | | | | Change-Id: Idbe19f9b01132c28b4960515c23bd28e3729fd5d
* | Merge "adding packet count and removing extra uid stats that were used for ↵Tsu Chiang Chuang2011-09-271-2/+11
|\ \ | | | | | | | | | debugging."
| * | adding packet count and removing extra uid stats that were used for debugging.Tsu Chiang Chuang2011-09-261-2/+11
| | | | | | | | | | | | Change-Id: I19664ee991760b9515fc129be50be68579f8ce93
* | | Merge changes If97c4d76,I1cd975b1Steve Block2011-09-273-49/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
| * | | Always update the WebView's SSL certificate, regardless of whether a ↵Steve Block2011-09-271-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebViewClient has been set This looks like a copy-paste error from other CallbackProxy methods which call back to the WebViewClient or WebChromeClient, rather than the WebView. Also remove '@hide' annotations. These are superfluous as the class is not public. Bug: 5287216 Change-Id: If97c4d769cf82563b9c182ba09fc742fbb7e08e9
| * | | Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()Steve Block2011-09-272-31/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes style in SslCertLookupTable and WebViewcore.reportSslCertError(). Bug: 5287216 Change-Id: I1cd975b1c8cecf1ca1dad0643be8ab62f7a950bc
* | | | Merge "Fix issue 5373048: AudioCache decode errors"Eric Laurent2011-09-271-2/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix issue 5373048: AudioCache decode errorsEric Laurent2011-09-271-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When decoding a file for the SoundPool, do not reject the entire file in case of error but return what was decoded so far instead. Change-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd
* | | | Merge "Fixed jaggy circles in pattern unlock"Peter Ng2011-09-2723-0/+0
|\ \ \ \
| * | | | Fixed jaggy circles in pattern unlockPeter Ng2011-09-2623-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5349016 Change-Id: I837088b80bd182b415ad1434f88d3b2be9d68ae9
* | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-270-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I9c75782f72a7da6e1e9de183146841f8f4bebc6b
| * \ \ \ \ merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-270-0/+0
| |\ \ \ \ \
| | * \ \ \ \ merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-260-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am 5fd141c2: Merge "Updated stat_sys icons" into ics-factoryromJustin Ho2011-09-2712-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5fd141c245051f2fa84bf2559a417577391e40df': Updated stat_sys icons
| * \ \ \ \ \ \ \ Merge "Updated stat_sys icons" into ics-factoryromJustin Ho2011-09-2712-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Updated stat_sys iconsJustin Ho2011-09-2212-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e656db6f1ad69e5cfbd1cde7a599e971887f4b1
* | | | | | | | | | am abff032e: Draw smaller system status icons without scaling.Daniel Sandler2011-09-271-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'abff032e783398be7a1c6b7e1e25a73a8467adcf': Draw smaller system status icons without scaling.
| * | | | | | | | | Draw smaller system status icons without scaling.Daniel Sandler2011-09-271-0/+3
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5297795 Change-Id: I11dc3a21b2e1111963b1cd9621434747f1757a67
* | | | | | | | | Merge "Double check the permission before setting the Wake Lock"Teng-Hui Zhu2011-09-271-1/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Double check the permission before setting the Wake LockTeng-Hui Zhu2011-09-261-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5361732 Change-Id: Ia9092b25d62c4a14cba885f5e3fac0326d0fde1c
* | | | | | | | | Merge "Switch to cfg based signal_poll command"Irfan Sheriff2011-09-263-36/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Switch to cfg based signal_poll commandIrfan Sheriff2011-09-263-36/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5352916 Change-Id: Id2ba7091a5e4cc4c1e14aa2c49e5b943519019bf
* | | | | | | | | | Merge "docs: fix markup in javadocs Change-Id: ↵Scott Main2011-09-261-3/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I1f9be842f40c813134fbcd5fdbbead5647fb72e5"
| * | | | | | | | | | docs: fix markup in javadocsScott Main2011-09-261-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5
* | | | | | | | | | | am b4f0a9f3: Merge "Fix 5326463: rework sim state handling in lockscreen" ↵Jim Miller2011-09-264-56/+88
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-factoryrom * commit 'b4f0a9f3894c1f039168ad672f4aa194999c7cdd': Fix 5326463: rework sim state handling in lockscreen
| * | | | | | | | | | Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryromJim Miller2011-09-264-56/+88
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix 5326463: rework sim state handling in lockscreenJim Miller2011-09-264-56/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was possible to get an inconsistent state because there were two paths that updated the lock screen sim state. This reworks the data flow to ensure the same path is always used to update the state. KeyguardUpdateMonitor now correctly updates the entire state of the callee whenever a new callback is registered. In addition, KeyguardUpdateMonitor now caches the phone state in order to avoid a round-trip binder call in updateEmergencyCallButtonState(). This avoids a condition that could make lockscreen unresponsive while updating the emergency call button state. KeyguardStatusViewManager also ensures the TransportControlView is hidden when created to ensure we don't inappropriately update the carrier line while waiting for the first callbacks to update the status lines. Change-Id: I6b3975b703a7d90bac8d0fe29fbc0f1d9c5e0e7d
* | | | | | | | | | | | am 7462251b: Merge "Don\'t hang in restore if the transport reports failure" ↵Christopher Tate2011-09-261-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-factoryrom * commit '7462251b0a3f2601236b599bcabf54451143b704': Don't hang in restore if the transport reports failure
| * | | | | | | | | | | Merge "Don't hang in restore if the transport reports failure" into ↵Christopher Tate2011-09-261-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-factoryrom
| | * | | | | | | | | | | Don't hang in restore if the transport reports failureChristopher Tate2011-09-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Casualty of the recent refactoring: in this particular error case, the restore sequence wasn't being directed into the finalization state. Fixes bug 5336295. Change-Id: Ibf5570cd1003e123da8b561685de8479663340ce
* | | | | | | | | | | | | am a200a23a: Merge "Bug 5332065: IOOB in case the suggestionSpan has been ↵Fabrice Di Meglio2011-09-261-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed" into ics-factoryrom * commit 'a200a23af10dfcbbe46d10e868c2eae9f2c794a4': Bug 5332065: IOOB in case the suggestionSpan has been removed
| * | | | | | | | | | | | Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ↵Fabrice Di Meglio2011-09-261-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-factoryrom
| | * | | | | | | | | | | | Bug 5332065: IOOB in case the suggestionSpan has been removedGilles Debunne2011-09-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't understand how the SuggSpan that has been tapped to display the popup can have disappeared when an item is clicked. This problem seems specific to monkey test with a race condition somewhere. Change-Id: I447b6563a1b959dc3c1ead31cde2d9bcad369765
* | | | | | | | | | | | | | am 8632561e: Merge "Make the status and navigation bars OPAQUE." into ↵Mathias Agopian2011-09-262-7/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-factoryrom * commit '8632561e14c5cc546cec39edd213ea8cc7aea2f9': Make the status and navigation bars OPAQUE.
| * | | | | | | | | | | | | Merge "Make the status and navigation bars OPAQUE." into ics-factoryromMathias Agopian2011-09-262-7/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Make the status and navigation bars OPAQUE.Daniel Sandler2011-09-252-7/+2
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5369240 Change-Id: I1c01baa732f441bf7d2c469eb7d3d82d26da07b1
* | | | | | | | | | | | | | am a2a3f1e7: Merge "don\'t clear the framebuffer when the framebuffer is not ↵Mathias Agopian2011-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used" into ics-factoryrom * commit 'a2a3f1e7e6a31f1109a3c25a48c33d3d67cb1adc': don't clear the framebuffer when the framebuffer is not used
| * | | | | | | | | | | | | Merge "don't clear the framebuffer when the framebuffer is not used" into ↵Mathias Agopian2011-09-261-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-factoryrom
| | * | | | | | | | | | | | | don't clear the framebuffer when the framebuffer is not usedMathias Agopian2011-09-261-5/+6
| | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when areas of the FB are undefined (transparent windows on top of nothing), we clear those areas before composition. however, it makes no sense to do this when the FB is not in use (case where hwc handles all layers) Bug: 5360529 Change-Id: I761a7d3664228ebbee0944aca8b0cc278fc94c9c
* | | | | | | | | | | | | | am a7969d91: Merge "Do not blend opaque windows." into ics-factoryromMathias Agopian2011-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7969d91ad7547e5a83d54df835ca6820fef0927': Do not blend opaque windows.
| * | | | | | | | | | | | | Merge "Do not blend opaque windows." into ics-factoryromMathias Agopian2011-09-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Do not blend opaque windows.Romain Guy2011-09-261-1/+1
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change ensures the wallpaper is rendered into an opaque surface which avoids a glClear() in SurfaceFlinger. This should save quite a bit of work on every frame when panning the workspace in launcher. Change-Id: Id43d3498a54c2d60ec4ee3377c92ef79bff55bc1
* | | | | | | | | | | | | | am 781fea80: Region cannot handle malformed Rects. Abort the Region op in ↵Mathias Agopian2011-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that case. * commit '781fea802b6b1c2e33a35dfe24c6ec29ed73a9c2': Region cannot handle malformed Rects. Abort the Region op in that case.
| * | | | | | | | | | | | | Region cannot handle malformed Rects. Abort the Region op in that case.Mathias Agopian2011-09-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5331198, 5334829 Change-Id: I05f2aaa95c55fe9e4a5d23180bb3032896c88151
* | | | | | | | | | | | | | am 04ba6d0e: (-s ours) Make sure Region handles invalid rectanglesMathias Agopian2011-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '04ba6d0ebd6a750d2ab2794af5bc4a8406178f00': Make sure Region handles invalid rectangles
| * | | | | | | | | | | | | Make sure Region handles invalid rectanglesMathias Agopian2011-09-261-0/+5
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the boolean operation code assumes rects are valid and could go into an infinite loop if not. make sure we abort before that happens. Bug: 5331198, 5334829 Change-Id: I8aa42b2e0b37238ec2434b794dd84c1a1b70f163
* | | | | | | | | | | | | am 892ac415: (-s ours) Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque ↵Jamie Gennis2011-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check in lockPageFlip" into ics-factoryrom * commit '892ac4155a7e2f2c824ee9898d4c5cef4bbe1afc': (DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip
| * | | | | | | | | | | | Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip" ↵Jamie Gennis2011-09-261-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-factoryrom
generated by cgit v1.1 at 2025-02-14 20:07:31 +0000