summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Collapse)AuthorAgeFilesLines
* am b26ab463: am 10d32a33: Merge change I16dc1411 into eclair-mr2Mike Reed2009-10-283-8/+57
|\ | | | | | | | | | | | | Merge commit 'b26ab4635555dee35b620ffef2aa53cf242b4b02' * commit 'b26ab4635555dee35b620ffef2aa53cf242b4b02': add boundary patch
| * add boundary patchMike Reed2009-10-283-8/+57
| |
* | am fb324e70: am adddd24f: am 78a50aa1: Merge change If3c30fc9 into eclairAndrew Harp2009-10-231-8/+122
|\ \ | |/ | | | | | | | | | | Merge commit 'fb324e706e487738b3edbaca67bdf459fafcd4ea' * commit 'fb324e706e487738b3edbaca67bdf459fafcd4ea': Patching in hidden API to allow app managed preview frame buffers.
| * am 78a50aa1: Merge change If3c30fc9 into eclairAndrew Harp2009-10-231-8/+122
| |\ | | | | | | | | | | | | | | | | | | Merge commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40' into eclair-mr2 * commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40': Patching in hidden API to allow app managed preview frame buffers.
| | * Merge change If3c30fc9 into eclairAndroid (Google) Code Review2009-10-231-8/+122
| | |\ | | | | | | | | | | | | | | | | * changes: Patching in hidden API to allow app managed preview frame buffers.
| | | * Patching in hidden API to allow app managed preview frame buffers.Andrew Harp2009-10-231-8/+122
| | | | | | | | | | | | | | | | Commit-Id: If3c30fc932697afa966cc97b17749e9996de92ee
* | | | am a9046729: am a2ec1f4c: am 8f89a1a3: Merge change Ic620a52b into eclairJack Palevich2009-10-232-0/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'a904672996c60c4ec50439a8d2be04fd9bd6444c' * commit 'a904672996c60c4ec50439a8d2be04fd9bd6444c': Add size checks for glBufferData and glBufferSubData
| * | | am 8f89a1a3: Merge change Ic620a52b into eclairJack Palevich2009-10-232-0/+24
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-mr2 * commit '8f89a1a360465e08e81ceca3cb3042606a98668b': Add size checks for glBufferData and glBufferSubData
| | * | Add size checks for glBufferData and glBufferSubDataJack Palevich2009-10-212-0/+24
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the size checks it's possible for calls to glBufferData and glBufferSubData to read off the end of the Buffer object's data, which can cause page faults. Fix end-of-line characters for the "spec" files. (That's why every line of these files is changed.) Enhance our code emitter to properly handle bounds checks for possibly-null pointers.
* | | am aeed585d: am 43f2b4e9: am 53f33d84: Revert "Remove STOPSHIP comment."Nick Pelly2009-10-141-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'aeed585d19f4db006ca765eed37d629831e4b563' * commit 'aeed585d19f4db006ca765eed37d629831e4b563': Revert "Remove STOPSHIP comment."
| * | am 53f33d84: Revert "Remove STOPSHIP comment."Nick Pelly2009-10-141-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-mr2 * commit '53f33d84776a0bad668e361365a7049b16f8a929': Revert "Remove STOPSHIP comment."
| | * Revert "Remove STOPSHIP comment."Nick Pelly2009-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit 3d0726b4d8a30e57852b70f1dcf4d8d20508cd1e Change-Id: Ie1ce5d09cc0b799ef0799f30eedc95f0ca5d3fad DrNo: jerrryw
* | | am b355695a: am 52cb8557: am a04ca9b4: Merge change I2492bffe into eclairNick Pelly2009-10-141-2/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'b355695a093df11387828b3c588fd05c04b8907b' * commit 'b355695a093df11387828b3c588fd05c04b8907b': Remove STOPSHIP comment.
| * | am a04ca9b4: Merge change I2492bffe into eclairNick Pelly2009-10-141-2/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085' into eclair-mr2 * commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085': Remove STOPSHIP comment.
| | * Remove STOPSHIP comment.Nick Pelly2009-10-141-2/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: I2492bffe57bded65fdbef5cf98e22cef3937e537 DrNo: eastham Bug: 2089423 Joke: Why don't anteaters get sick? Because they're full of anty-bodies!
* | | am 360f21cd: am a4adc798: Merge change I409d9b4a into eclair-mr2Zheng BaoZhong2009-10-131-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca' * commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca': Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
| * | Wifi: Fix runtime crash in when scan results contain KSC 5601 SSIDZheng BaoZhong2009-10-101-1/+3
| |/ | | | | | | | | | | | | bug b/2178462 Change-Id: I409d9b4a163299c3383ec092cd2368a9d24236cb Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am 4c220bd0: Merge branch \'eclair-plus-aosp\' of ↵David 'Digit' Turner2009-10-121-3/+10
|\ \ | |/ | | | | | | | | | | | | | | ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp Merge commit '4c220bd0f32b93314c4c1bff328bd815265ef117' * commit '4c220bd0f32b93314c4c1bff328bd815265ef117': Encourage developers to connect RFCOMM by UUID instead of Channel.
| * Encourage developers to connect RFCOMM by UUID instead of Channel.Nick Pelly2009-10-071-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide createRfcommSocket(int channel) Add createRfcommSocketWithServiceRecord(UUID uuid) Rename listenUsingRfcomm(String,UUID) -> listenUsingRfcommWithServiceRecord(..) Now we have a complete API for developers to make peer-peer RFCOMM connections with hard-coding the limited (30) RFCOMM channels, instead using SDP lookup of an UUID. This commit addresses two serious bugs: - Do not throw IOException on accepting an incoming RFCOMM connection with BluetoothSocket. This was a regression from commit 24bb9b8af4ff6915 - Workaround failure of bluez to update SDP cache when channel changes by trying to use the same RFCOMM channel on the server every time, instead of picking server channels randomly. This is a pretty ugly workaround, and we are still trying to fix the caching issue - but with this workaround we are at least shippable and apps will work at least until they start colliding on the 30 RFCOMM channels. DrNo: eastham Bug: 2158900 Joke: What did the digital watch say to his mom? "Look mom no hands." Change-Id: Ia4879943b83afac06b6f1a3f2391cf1628afce7d
* | am 254d7ecd: Merge branch \'eclair-plus-aosp\' of ↵Jeff Hamilton2009-10-121-0/+6
|\ \ | |/ | | | | | | | | | | | | | | ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp Merge commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9' * commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9': add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
| * add (hidden) setHasAlpha() to allow clients like the view's cache to hint ↵Mike Reed2009-10-071-0/+6
| | | | | | | | | | | | that a bitmap is opaque. Knowing that a 32bit bitmap is opaque is a performance boost for some blits.
* | am 3616d154: am 80fff7a5: am 962f2536: Merge change I547cff66 into eclairWu-cheng Li2009-10-121-0/+28
|\ \ | |/ | | | | | | | | | | Merge commit '3616d15451734bd3b563d73f9c2f25c19d7df75c' * commit '3616d15451734bd3b563d73f9c2f25c19d7df75c': Add zoom functions and sendCommand.
| * Add zoom functions and sendCommand.Wu-cheng Li2009-10-061-0/+28
| | | | | | | | b2060030
* | am a1cb6a64: am 460965c2: am 24bb9b8a: Provide an API for apps to use a ↵Nick Pelly2009-10-122-11/+58
|\ \ | |/ | | | | | | | | | | | | | | dynamic RFCOMM channel and SDP record. Merge commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09' * commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09': Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
| * Provide an API for apps to use a dynamic RFCOMM channel and SDP record.Nick Pelly2009-10-062-11/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide listenUsingRfcommOn(int channel) Add listenUsingRfcomm(String name, ParcelUuid uuid) The new API automatically finds a free RFCOMM channel and registers an SDP record with the given uuid and name. The SDP record is automatically removed when the socket is closed, or if the application dies. Apps are prevented from registering SDP records with the uuid of system Bluetooth profiles, such as A2DP, HFP and OPP. Apps are prevented from removing SDP records that they did not create. This is tracked by pid. TODO: Provide an API for the connecting app to look up an SDP record. Bug: 2158900 DrNo: eastham Joke: "What did the dog say to the tree? bark." Change-Id: Ia92f51c34615a7270a403255ad2b8faa98c4a3f5
* | am f2b80d8c: am d453fe67: Merge change I5dbd1994 into eclairJaikumar Ganesh2009-10-121-2/+2
|\ \ | |/ | | | | | | | | | | Merge commit 'f2b80d8ccc9b8d775eb0171bd8f170f251a7314e' * commit 'f2b80d8ccc9b8d775eb0171bd8f170f251a7314e': Fix rfcomm socket connect return code.
| * Fix rfcomm socket connect return code.Jaikumar Ganesh2009-10-011-2/+2
| | | | | | | | | | | | | | | | The phone would say connected even when powered off. Bug id: 2161890 DrNo: Hiroshi Change-Id: I5dbd19941a80e86c7462670fb844a29cf4eb0908
* | Merge change Ibdced0b5Android (Google) Code Review2009-10-021-2/+0
|\ \ | | | | | | | | | | | | * changes: Remove unused #includes.
| * | Remove unused #includes.Elliott Hughes2009-10-011-2/+0
| | | | | | | | | | | | | | | | | | (Part of removing adb networking support.) Bug: 1122968
* | | am eff77e9a: am 8ad6d524: Merge change I55e15bad into eclairJaikumar Ganesh2009-10-011-11/+13
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7' * commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7': Try to reconnect twice when the rfcomm error code is Connection Refused.
| * | Try to reconnect twice when the rfcomm error code is Connection Refused.Jaikumar Ganesh2009-09-301-11/+13
| | | | | | | | | | | | | | | | | | | | | This happens when the the remote headset is in a bad state or is not accepting connections. Try twice before giving up. Change-Id: I55e15bad6b72904b8e4ccbca89e17e9bd3ddb61e
* | | am ba61cff4: am e5661c40: Merge change I8366852f into eclairZhu Lan2009-10-011-0/+34
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'ba61cff482a048131937d82f0d9652c799383314' * commit 'ba61cff482a048131937d82f0d9652c799383314': Bluetooth A2DP suspend/resume functionality
| * | Bluetooth A2DP suspend/resume functionalityZhu Lan2009-09-291-0/+34
| | | | | | | | | | | | Change-Id: I8366852fa9b6ff9dacf18db00ea1c2be0c00ff34
* | | am 0b03fa8b: am 490d5222: Merge change I6cacaa0d into eclairDianne Hackborn2009-10-011-5/+5
|\ \ \ | |/ / | | / | |/ |/| | | | | Merge commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad' * commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad': Hack to fix issue #2125365: Sports Trivia compatability with Eclair
| * Hack to fix issue #2125365: Sports Trivia compatability with EclairDianne Hackborn2009-09-281-5/+5
| | | | | | | | | | | | | | | | | | Adds a mechanism to tell Paint the scaling factor its target canvas will have, for it to compute font metrics based on the correct font size. Only TextView uses this, but that is enough for the large majority of apps. Change-Id: I6cacaa0dd26d40ee3ad959bed0028678d6e9016e
* | am 3ecb11e0: am 65dea14c: Merge change 27129 into eclairNick Pelly2009-09-281-2/+20
|\ \ | |/ | | | | | | | | | | Merge commit '3ecb11e099e8c0c84381c38775103cc7d42234d6' * commit '3ecb11e099e8c0c84381c38775103cc7d42234d6': Bounds check read and write path in native code.
| * Bounds check read and write path in native code.Nick Pelly2009-09-251-2/+20
| | | | | | | | | | | | Already checked in Java, but requested by security review. Change-Id: I5314dbc32546278b977236a154fba03f38610b1a
* | am b2209a35: am 1a42cfac: Use LM_SECURE when auth && encrypt.Nick Pelly2009-09-251-2/+4
|\ \ | |/ | | | | | | | | | | Merge commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523' * commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523': Use LM_SECURE when auth && encrypt.
| * Use LM_SECURE when auth && encrypt.Nick Pelly2009-09-241-2/+4
| | | | | | | | | | | | LM_SECURE enforces man in the middle (MITM) protection. Change-Id: Ia800bb657b429f8872d72072f7c9450a74028af0
* | am 5e367bfe: am 0665ae22: Merge change 26939 into eclairChih-Chung Chang2009-09-251-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '5e367bfe0726d7d7108279721179dcd6de326ee5' * commit '5e367bfe0726d7d7108279721179dcd6de326ee5': Fix 2101425: Camera crashes spontaneously in preview.
| * Merge change 26939 into eclairAndroid (Google) Code Review2009-09-241-1/+1
| |\ | | | | | | | | | | | | * changes: Fix 2101425: Camera crashes spontaneously in preview.
| | * Fix 2101425: Camera crashes spontaneously in preview.Chih-Chung Chang2009-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is we missed an "obj" parameter while calling postEventFromNative (which put it in a field of a Message object), so a garbage value on stack is used. When the GC tries to follow that "obj" field, expecting to find another object, it crashes.
* | | am e493bf79: am 9251c344: Merge change 26851 into eclairMike Reed2009-09-251-3/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'e493bf7985ad4cac7bafcfa788eb281b694967aa' * commit 'e493bf7985ad4cac7bafcfa788eb281b694967aa': use new setDither on ImageRef to retain that setting for purgeable images
| * | Merge change 26851 into eclairAndroid (Google) Code Review2009-09-241-3/+4
| |\ \ | | |/ | |/| | | | | | | * changes: use new setDither on ImageRef to retain that setting for purgeable images
| | * use new setDither on ImageRef to retain that setting for purgeable imagesMike Reed2009-09-241-3/+4
| | |
* | | am 5ddbc0d5: am de0dfb7b: Fix issue #2125720 Weather Forecast Widget - ↵Dianne Hackborn2009-09-254-9/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | graphics do not scale Merge commit '5ddbc0d59d8143d50a19950624c38fdb8102156b' * commit '5ddbc0d59d8143d50a19950624c38fdb8102156b': Fix issue #2125720 Weather Forecast Widget - graphics do not scale
| * | Fix issue #2125720 Weather Forecast Widget - graphics do not scaleDianne Hackborn2009-09-234-9/+12
| |/ | | | | | | | | | | I forgot to add the new density field to the Bitmaps' parcelable data. Change-Id: I77cf3e93e356297e0caed6fc71b62b5cd8f79124
* | am cd3a0242: am ffe1cf25: Unhide Camera lock and unlock API.Wu-cheng Li2009-09-201-9/+15
|\ \ | |/ | | | | | | | | | | Merge commit 'cd3a02425179ea881f3534d687c143a2ce683684' * commit 'cd3a02425179ea881f3534d687c143a2ce683684': Unhide Camera lock and unlock API.
| * Unhide Camera lock and unlock API.Wu-cheng Li2009-09-211-9/+15
| |
* | am 1781edd2: am 0647b580: Merge change 25970 into eclairJaikumar Ganesh2009-09-201-20/+11
|\ \ | |/ | | | | | | | | | | Merge commit '1781edd28639b23443f9d319d1e5cea41acab8e9' * commit '1781edd28639b23443f9d319d1e5cea41acab8e9': Make removeBond() call async.