summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. ↵Marco Nelissen2010-10-271-9/+12
|\ | | | | | | b/3137511" into gingerbread
| * Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" ↵Marco Nelissen2010-10-271-9/+12
| |\ | | | | | | | | | into gingerbread
| | * Fix off-by-two and other bugs in the visualization code.Marco Nelissen2010-10-271-9/+12
| | | | | | | | | | | | | | | | | | b/3137511 Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
* | | am 6d55e134: Make best effort attempt to recover NFC service when it dies.Nick Pelly2010-10-273-36/+81
|\ \ \ | |/ /
| * | Make best effort attempt to recover NFC service when it dies.Nick Pelly2010-10-273-36/+81
| |/ | | | | | | | | | | | | Retrieve the service again from ServiceManager on RemoteException. Change-Id: Ie227b52019e7deafeab712af1addd6d957f7a8ee Signed-off-by: Nick Pelly <npelly@google.com>
* | am 2088e371: Merge "Assume that all of the decoded vorbis audio data is ↵Andreas Huber2010-10-261-6/+14
|\ \ | |/ | | | | valid unless the source indicates otherwise." into gingerbread
| * Merge "Assume that all of the decoded vorbis audio data is valid unless the ↵Andreas Huber2010-10-261-6/+14
| |\ | | | | | | | | | source indicates otherwise." into gingerbread
| | * Assume that all of the decoded vorbis audio data is valid unless the source ↵Andreas Huber2010-10-261-6/+14
| | | | | | | | | | | | | | | | | | indicates otherwise. Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
* | | am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as ↵Justin Ho2010-10-261-5/+5
|\ \ \ | |/ / | | | | | | notifications" into gingerbread
| * | Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" ↵Justin Ho2010-10-261-5/+5
| |\ \ | | |/ | |/| | | | into gingerbread
| | * DO NOT MERGE - Fixing ringtones that were put in as notificationsJustin Ho2010-10-261-5/+5
| | | | | | | | | | | | Change-Id: I09a8a0f369604a6332b921b9e944a800ec4d6677
* | | am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its ↵Mathias Agopian2010-10-261-0/+11
|\ \ \ | |/ / | | | | | | buffers format" into gingerbread
| * | Merge "Updade Surface (ANativeWindow) format based on its buffers format" ↵Mathias Agopian2010-10-261-0/+11
| |\ \ | | | | | | | | | | | | into gingerbread
| | * | Updade Surface (ANativeWindow) format based on its buffers formatMathias Agopian2010-10-251-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is to allow applications to change the format of a surface's buffer, and have it reflected in EGL; which is needed for EGLConfig validation. Change-Id: Iee074c30ad765881e2409c1d37450b05e561c44d
* | | | am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbreadMathias Agopian2010-10-262-3/+3
|\ \ \ \ | |/ / /
| * | | Merge "add format parameter to setBufferGeometry" into gingerbreadMathias Agopian2010-10-262-3/+3
| |\ \ \ | | |/ /
| | * | add format parameter to setBufferGeometryMathias Agopian2010-10-252-3/+3
| | | | | | | | | | | | | | | | Change-Id: I7cc2acdc6e65e9468ecfd5b2f22e6b495a383be9
* | | | am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into ↵Mathias Agopian2010-10-261-4/+7
|\ \ \ \ | |/ / / | | | | | | | | gingerbread
| * | | Merge "fix eglChooseConfig() for special attributes." into gingerbreadMathias Agopian2010-10-261-4/+7
| |\ \ \
| | * | | fix eglChooseConfig() for special attributes.Mathias Agopian2010-10-251-4/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | affects software renderer (emu) only. per EGL spec: If EGL_MAX_PBUFFER_WIDTH, EGL_MAX_PBUFFER_HEIGHT, EGL_MAX_PBUFFER_PIXELS, or EGL_NATIVE_VISUAL_ID are specified in attrib list, then they are ignored Change-Id: I3d5214ce896986da2f11d2eb1889afc41731eaa6
* | | | am d8cf2125: Merge "Add a way to get a string for an error code." into ↵Jeff Hamilton2010-10-261-0/+28
|\ \ \ \ | |/ / / | | | | | | | | gingerbread
| * | | Merge "Add a way to get a string for an error code." into gingerbreadJeff Hamilton2010-10-261-0/+28
| |\ \ \
| | * | | Add a way to get a string for an error code.Jeff Hamilton2010-10-261-0/+28
| | | |/ | | |/| | | | | | | | | Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
* | | | am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse ↵Xavier Ducrohet2010-10-263-11/+104
|\ \ \ \ | |/ / / | | | | | | | | editors." into gingerbread
| * | | Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into ↵Xavier Ducrohet2010-10-263-11/+104
| |\ \ \ | | |/ / | |/| | | | | | gingerbread
| | * | Fix rendering of digitalClock/Gallery in Eclipse editors.Xavier Ducrohet2010-10-263-11/+104
| | | | | | | | | | | | | | | | Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
* | | | 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 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 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
* | | | | | 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 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 "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" ↵Jean-Baptiste Queru2010-10-251-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread-plus-aosp
| * \ \ \ \ \ \ resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aospJean-Baptiste Queru2010-10-251-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
| | * \ \ \ \ \ \ Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"Jean-Baptiste Queru2010-10-251-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | frameworks/base: Handle null from topRunningNonDelayedActivityLockedVairavan Srinivasan2010-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | startActivityUncheckedLocked tries to move the target task to front when it is not at front. topRunningNonDelayedActivityLocked is used to find the current task, however null value isn't handled. This null causes an unhandled exception leading to the android framework reboot. Change-Id: I2a43cda50483e28a4456846d8b3ccb30d7cf110e
* | | | | | | | | | am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from ↵Scott Main2010-10-253-76/+72
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | / / / / / / | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK and Resources nav items Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp * commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4': update featured videos
| * | | | | | | | am c9ac1079: update featured videos also remove "new" tags from SDK and ↵Scott Main2010-10-253-76/+72
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resources nav items Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread * commit 'c9ac1079696b93a294f504c6561397ef731a46f9': update featured videos
| | * | | | | | | update featured videosScott Main2010-10-253-76/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also remove "new" tags from SDK and Resources nav items Change-Id: I75e16fc6dda5a7cbcd4ff8e4ebb2189860e884d5
* | | | | | | | | am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into ↵Justin Ho2010-10-2548-0/+72
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp * commit '044df235c86ac69bb0e56cb4387e111ec276276e': DO NOT MERGE - Updated ringtone assets for crespo
| * | | | | | | | Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbreadJustin Ho2010-10-2548-0/+72
| |\ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-11-26 19:54:40 +0000