summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix debug statements and aapt assert.Patrick Scott2010-10-262-5/+1
| | | | | | ENABLE_PSEUDOLOCALIZE seems to not exist. Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543
* Merge "Fix the viewport height to view height when title bar is visible."Shimeng (Simon) Wang2010-10-261-1/+1
|\
| * Fix the viewport height to view height when title bar is visible.Shimeng (Simon) Wang2010-10-251-1/+1
| | | | | | | | | | issue: 3097787 Change-Id: Ie685a94262cecd94f32dbb94991fea76ceb43b94
* | Merge "Add two creation flags to OMXCodec::Create()"James Dong2010-10-262-1/+15
|\ \
| * | Add two creation flags to OMXCodec::Create()James Dong2010-10-252-1/+15
| | | | | | | | | | | | | | | | | | | | | o This allows to force to use software codecs or hardware codecs o If request cannot be fullfilled, Create() returns NULL. Change-Id: I02b56a9229abb56d49703fe80ac18571d33f3748
* | | am cc8de576: (-s ours) am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ↵Justin Ho2010-10-260-0/+0
|\ \ \ | | | | | | | | | | | | ringtone metadata only" into gingerbread
| * \ \ am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata ↵Justin Ho2010-10-2611-0/+0
| |\ \ \ | | | | | | | | | | | | | | | only" into gingerbread
| | * \ \ Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into ↵Justin Ho2010-10-2611-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | DO NOT MERGE - Fixing capitalized ringtone metadata onlyJustin Ho2010-10-2611-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib16ca195356b6cbb3d3926f6d5a3de366eaa980e
* | | | | | am 1b571bd3: am 1d28a840: Merge "Location Manager: Fix ↵Mike Lockwood2010-10-261-6/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | LocationManager.getBestProvider filtering." into gingerbread
| * | | | | am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider ↵Mike Lockwood2010-10-261-6/+7
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | filtering." into gingerbread
| | * | | | Merge "Location Manager: Fix LocationManager.getBestProvider filtering." ↵Mike Lockwood2010-10-261-6/+7
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | Location Manager: Fix LocationManager.getBestProvider filtering.Mike Lockwood2010-10-261-6/+7
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getBestProvider should only return location providers that the client has permission to use. BUG: 3124614 Change-Id: I065091d0445092563bc53fb4f7d93a1ab6bebb9a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into ↵Eric Laurent2010-10-261-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | gingerbread
| * | | | | am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbreadEric Laurent2010-10-261-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Partial fix for issue 3124895." into gingerbreadEric Laurent2010-10-261-1/+1
| | |\ \ \ \
| | | * | | | Partial fix for issue 3124895.Eric Laurent2010-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a SIP call is put on hold and no other call is active, the audio mode should not be switched to incall. Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
* | | | | | | Merge "Update WebView useragent string for merge to WebKit r70209"Ben Murdoch2010-10-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update WebView useragent string for merge to WebKit r70209Ben Murdoch2010-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I127d530ca027509cd4570f508ce98bc03ddb6a68
* | | | | | | | am 6a49bff5: am 79fb6449: Merge "Make some contructors public but hidden." ↵Jeff Hamilton2010-10-262-2/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | into gingerbread
| * | | | | | | am 79fb6449: Merge "Make some contructors public but hidden." into gingerbreadJeff Hamilton2010-10-262-2/+4
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Make some contructors public but hidden." into gingerbreadJeff Hamilton2010-10-262-2/+4
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Make some contructors public but hidden.Jeff Hamilton2010-10-262-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows them to be used from within the NFC stack process internally. Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
* | | | | | | | am a1e74744: am 11e2e9b0: Merge "Don\'t turn the button backlights on if the ↵Joe Onorato2010-10-261-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | screen is off. Part 2." into gingerbread
| * | | | | | am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is ↵Joe Onorato2010-10-261-0/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | off. Part 2." into gingerbread
| | * | | | | Merge "Don't turn the button backlights on if the screen is off. Part 2." ↵Joe Onorato2010-10-251-0/+8
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | | Don't turn the button backlights on if the screen is off. Part 2.Joe Onorato2010-10-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are the logs from when I just reproduced it here. This means that we got an event after the screen turned off. So isScreenTurningOffLocked() is working, but we need to also check that we're not off. This bug is happening because lightSensorChangedLocked is calling mButtonLight.setBrightness() directly instead of going through updateLightsLocked, which is where I added that check to not turn the buttons on of the screen is off. D/PowerManagerService( 1243): onSensorChanged: light value: 1280 I/power ( 1243): *** set_screen_state 0 D/PowerManagerService( 1243): enableLightSensor false D/PowerManagerService( 1243): onSensorChanged: light value: 320 D/PowerManagerService( 1243): lightSensorChangedLocked 320 D/PowerManagerService( 1243): lcdValue 55 D/PowerManagerService( 1243): buttonValue 255 D/PowerManagerService( 1243): keyboardValue 0 D/SurfaceFlinger( 1243): About to give-up screen, flinger = 0x8dcf! 0 Bug: 3117801 Change-Id: I722d66cafba71b183cc987b7383d4ad7e171ba82
* | | | | | | | Merge "DisplayList optimizations and fixes."Chet Haase2010-10-268-116/+80
|\ \ \ \ \ \ \ \
| * | | | | | | | DisplayList optimizations and fixes.Chet Haase2010-10-268-116/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use a copy of SkPaint objects to avoid having it changed from under us. We reuse copies that have not changed. We also copy the SkMatrix every time to avoid the same problem. Change-Id: If3fd80698f2d43ea16d23302063e0fd8d0549027
* | | | | | | | | A temporary fix for "Waiting for service drm.drmManager".Gloria Wang2010-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I554c9bbec8c63c3c8dbc5b5374614c1101f6d1d9
* | | | | | | | | Merge "Add logs to debug incoming A2DP connection issue."Jaikumar Ganesh2010-10-261-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add logs to debug incoming A2DP connection issue.Jaikumar Ganesh2010-10-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbdd625ec8dc50544990a1ddbd87284285f3f2d2
* | | | | | | | | | Merge "Clean up some logging to make it more useful to debug."Jaikumar Ganesh2010-10-262-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Clean up some logging to make it more useful to debug.Jaikumar Ganesh2010-10-262-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic30210ea6886b1c4630d7671a4b01736512e9da8
* | | | | | | | | | Merge "Fix 3117937: Add simplified "recent apps"."Jim Miller2010-10-256-21/+289
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix 3117937: Add simplified "recent apps".Jim Miller2010-10-256-21/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a simplified recents view for devices that don't handle 3D well. Change-Id: I8307cd340caf1d65c8fce80eaf55a1d21bc64312
* | | | | | | | | | | Merge "Implement ACTION_CONNECTION_STATE_CHANGED intent."Jaikumar Ganesh2010-10-253-1/+80
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Implement ACTION_CONNECTION_STATE_CHANGED intent.Jaikumar Ganesh2010-10-253-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b5783c189c9796ebd85d9d54bdcb07949bef27e
* | | | | | | | | | | Merge "Do not exit the GLSurfaceView thread when detached from a window."Jack Palevich2010-10-251-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Do not exit the GLSurfaceView thread when detached from a window.Jack Palevich2010-10-251-1/+0
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows a GLSurfaceView to be removed from a window and later reattached to a window. Change-Id: I2b44f35d0c95404b13912782df8877953609a5d0
* | | | | | | | | | Check before and after media item referenceGil Dobjanschi2010-10-251-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9abc017896ed82f069479a468e1b0b9d3303e3a6
* | | | | | | | | | Merge "Transition bug fix"Gil Dobjanschi2010-10-251-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Transition bug fixGil Dobjanschi2010-10-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0999aca3b341e4d6a4303ef84da8f5e541310bf0
* | | | | | | | | | | Merge "Tweak log messages a bit."Jeff Brown2010-10-251-2/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Tweak log messages a bit.Jeff Brown2010-10-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifadf78c1ab8db49106216c70086f98860795c65f
* | | | | | | | | | | | Merge "Small cleanup."Romain Guy2010-10-253-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Small cleanup.Romain Guy2010-10-253-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes unnecessary forward class declaration, make Caches::currentBuffer private instead of public. Change-Id: Idba6325c8c602d89239e667cb8ec87e7943f8e75
* | | | | | | | | | | | | Merge "Don't change texture unit when not needed."Romain Guy2010-10-251-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Don't change texture unit when not needed.Romain Guy2010-10-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifa84426d234f2122402cb13533cb5964f1ce95ec
* | | | | | | | | | | | | Merge "Don't change textures wrap modes on every draw."Romain Guy2010-10-256-30/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | / / / / / / / / / | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
generated by cgit v1.1 at 2025-11-26 17:02:14 +0000