summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 4e3fadd0 to eclair-mr2Jack Palevich2009-11-061-7/+8
|\
| * Merge change Ia4424950 into eclairAndroid (Google) Code Review2009-11-061-1/+1
| |\ | | | | | | | | | | | | * changes: Fix stupid bug in GLThreadManager implementation.
| | * Fix stupid bug in GLThreadManager implementation.Jack Palevich2009-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code intended to copy the old value of a field, before the field was updated. However, what the code was actually doing was copying the new value of the field, after the field was updated. The fix was to move the copy to before the update. This is work towards fixing bug 2228262
* | | Merge change I72749815 into eclair-mr2Android (Google) Code Review2009-11-0622-2476/+1410
|\ \ \ | | | | | | | | | | | | | | | | * changes: Import revised translations. DO NOT MERGE
| * | | Import revised translations. DO NOT MERGEEric Fischer2009-11-0622-2476/+1410
| | | |
* | | | am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdkScott Main2009-11-063-167/+261
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | Merge commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b' into eclair-mr2 * commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b': docs: add new document for the win usb driver;
| * | am 0e08055a: Merge change I14a9acd3 into eclair-sdkScott Main2009-11-063-167/+261
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0e08055aa31c752732005fc48b09ee470a2c4822' into eclair * commit '0e08055aa31c752732005fc48b09ee470a2c4822': docs: add new document for the win usb driver;
| | * \ Merge change I14a9acd3 into eclair-sdkAndroid (Google) Code Review2009-11-063-167/+261
| | |\ \ | | | | | | | | | | | | | | | | | | | | * changes: docs: add new document for the win usb driver; remove usb guide from the device document.
| | | * | docs: add new document for the win usb driver;Scott Main2009-11-063-167/+261
| | | | | | | | | | | | | | | | | | | | remove usb guide from the device document.
* | | | | am 7ab900ed: Merge change Ic8093c11 into eclairDave Sparks2009-11-061-7/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3' into eclair-mr2 * commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3': Hold a lock while we access the preview heap.
| * | | | Merge change Ic8093c11 into eclairAndroid (Google) Code Review2009-11-061-7/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Hold a lock while we access the preview heap.
| | * | | | Hold a lock while we access the preview heap.Dave Sparks2009-11-061-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | copyFrameAndPostCopiedFrame was not holding a lock while it accessed the preview heap. If the client process is torn down while the heap is accessed, the memcpy could access memory that was deallocated. This patch creates a local sp reference to the preview heap while holding the lock, then releases the lock. This should prevent the heap from being pulled out from underneath us.
* | | | | | am 2b3970a2: Merge change Idc1396c8 into eclairEvan Millar2009-11-061-2/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-mr2 * commit '2b3970a2956152a508254aa2675b68df363d46c1': Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
| * | | | | Merge change Idc1396c8 into eclairAndroid (Google) Code Review2009-11-061-2/+5
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * changes: Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
| | * | | | Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.Evan Millar2009-11-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fixes http://b/issue?id=2178591
* | | | | | am 8d51f710: Merge change Icdd2864e into eclairMichael Chan2009-11-061-4/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-mr2 * commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91': b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
| * | | | | Merge change Icdd2864e into eclairAndroid (Google) Code Review2009-11-061-4/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
| | * | | | | b/2234854 Fixed Bluetooth API return codes for requesting permission to ↵Michael Chan2009-11-051-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | enable bluetooth
* | | | | | | am b90a187d: Merge change Ie994c0e8 into eclairjsh2009-11-061-0/+23
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595' into eclair-mr2 * commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595': Update CdmaSmsTest unit test.
| * | | | | | Merge change Ie994c0e8 into eclairAndroid (Google) Code Review2009-11-061-0/+23
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Update CdmaSmsTest unit test.
| | * | | | | | Update CdmaSmsTest unit test.jsh2009-11-061-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to do this with previous check in. Now that calculateLength() has been fixed to match the actual encoding (ie, doesn't support single-segment EMS), test case needs to be updated. Fixes b/2244483
* | | | | | | | am b8933665: Merge change I3f0ded49 into eclairMike Lockwood2009-11-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b8933665376905c91069eb29fa78c029aa790ce9' into eclair-mr2 * commit 'b8933665376905c91069eb29fa78c029aa790ce9': Increase light sensor delay from one to two seconds.
| * | | | | | | Merge change I3f0ded49 into eclairAndroid (Google) Code Review2009-11-061-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Increase light sensor delay from one to two seconds.
| | * | | | | | | Increase light sensor delay from one to two seconds.Mike Lockwood2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3f0ded49cb447835133cf8d5d693260e8312aa89 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | am 49fa9e00: Merge change Ibf6e51b7 into eclairChristopher Tate2009-11-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-mr2 * commit '49fa9e00986993f5cf05f1092c30479cb98eb254': Set argv[0] from the main thread of an app, not a random binder thread
| * | | | | | | | Merge change Ibf6e51b7 into eclairAndroid (Google) Code Review2009-11-061-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Set argv[0] from the main thread of an app, not a random binder thread
| | * | | | | | | | Set argv[0] from the main thread of an app, not a random binder threadChristopher Tate2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf6e51b7975cdb5e6aa97591a571c599ecf84020
* | | | | | | | | | Merge change I2effb21e into eclair-mr2Android (Google) Code Review2009-11-061-0/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add UPDATE_ACTION to Gservices, used by the new checkin service.
| * | | | | | | | | | Add UPDATE_ACTION to Gservices, used by the new checkin service.Dan Egnor2009-11-051-0/+7
| | | | | | | | | | |
* | | | | | | | | | | am 7e4a0047: Merge change I97b30e2f into eclairEvan Millar2009-11-061-5/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7e4a004799eae347f1be227ecba6850d1b386bd2' into eclair-mr2 * commit '7e4a004799eae347f1be227ecba6850d1b386bd2': Revert jparks code from IPCThreadState.
| * | | | | | | | | | Merge change I97b30e2f into eclairAndroid (Google) Code Review2009-11-061-5/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Revert jparks code from IPCThreadState.
| | * | | | | | | | | Revert jparks code from IPCThreadState.Evan Millar2009-11-061-5/+0
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | am 3cba7288: Merge change I6ccd2ebc into eclairCharles Mendis2009-11-065-9/+41
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2 * commit '3cba72880b78b81cda2868136462c9e261a3e403': Expose PowerManager.isScreenOn in the public api.
| * | | | | | | | | Merge change I6ccd2ebc into eclairAndroid (Google) Code Review2009-11-065-9/+41
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Expose PowerManager.isScreenOn in the public api.
| | * | | | | | | | Expose PowerManager.isScreenOn in the public api.Charles Mendis2009-11-065-9/+41
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6ccd2ebcbf3f8ad9ffa4b86a9c037cb0c25a7b78
* | | | | | | | | am 45011f2d: (-s ours) Merge change I4e9fe62b into eclairCary Clark2009-11-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-mr2 * commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80': do not merge -- original checkin to mr2 here:
| * | | | | | | | Merge change I4e9fe62b into eclairAndroid (Google) Code Review2009-11-061-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * changes: do not merge -- original checkin to mr2 here:
| | * | | | | | | do not merge -- original checkin to mr2 here:Cary Clark2009-11-061-0/+4
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/#change,30204 check for native initialization before calling public function Added more checks where it is possible to call a native function after creating a WebView but before the native side is initialized. These cases can be triggered by the monkey. Fixes http://b/issue?id=2187719
* | | | | | | | Merge change I9a50fdf4 into eclair-mr2Android (Google) Code Review2009-11-061-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
| * | | | | | | | Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and ↵Andreas Huber2009-11-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hoping for the best) instead of asserting.
* | | | | | | | | Merge change I29a3be5b into eclair-mr2Android (Google) Code Review2009-11-061-18/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Calendar: add CALLER_IS_SYNCADAPTER parameter.
| * | | | | | | | | Calendar: add CALLER_IS_SYNCADAPTER parameter.Ken Shirriff2009-11-051-18/+27
| | | | | | | | | |
* | | | | | | | | | am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants.Xavier Ducrohet2009-11-061-0/+66
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed' into eclair-mr2 * commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed': New API 4 with new CDMA constants.
| * | | | | | | | | am 91bb62f0: New API 4 with new CDMA constants.Xavier Ducrohet2009-11-061-0/+66
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9' into eclair * commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9': New API 4 with new CDMA constants.
| | * | | | | | | | New API 4 with new CDMA constants.Xavier Ducrohet2009-11-051-0/+66
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | am fde273ba: Merge change Ic997acac into eclairAndreas Huber2009-11-062-3/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-mr2 * commit 'fde273baf6592a5fde15ee4dd4d798d90368e440': Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
| * | | | | | | Merge change Ic997acac into eclairAndroid (Google) Code Review2009-11-062-3/+21
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * changes: Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
| | * | | | | | Make AudioPlayer a little less verbose, defer starting audio playback until ↵Andreas Huber2009-11-052-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after the first video frame has been decoded (if there's video at all).
* | | | | | | | am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before ↵Jared Suttles2009-11-061-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | waiting Merge commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f' into eclair-mr2 * commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f': jni: GpsLocationProvider: Check for pending callbacks before waiting
| * | | | | | | jni: GpsLocationProvider: Check for pending callbacks before waitingJared Suttles2009-11-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a corner case where a callback may not get handled until a second callback arrives. This can happen because there is a significant section of the wait_for_event function where the mutex is not locked, and the sPendingCallbacks member could be updated. We now check to see if there is a pending callback to handle before we wait for another callback. Change-Id: I20cfae1e780944bb74133940dda032efc4c55540 Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com> Signed-off-by: Jared Suttles <jared.suttles@motorola.com> Signed-off-by: Mike Lockwood <lockwood@android.com>
generated by cgit v1.1 at 2024-09-11 15:18:49 +0000