391 Commits

Author SHA1 Message Date
Andrew Harp
4572edb287 am fb324e70: am adddd24f: am 78a50aa1: Merge change If3c30fc9 into eclair
Merge commit 'fb324e706e487738b3edbaca67bdf459fafcd4ea'

* commit 'fb324e706e487738b3edbaca67bdf459fafcd4ea':
  Patching in hidden API to allow app managed preview frame buffers.
2009-10-23 19:39:01 -07:00
Andrew Harp
adddd24f31 am 78a50aa1: Merge change If3c30fc9 into eclair
Merge commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40' into eclair-mr2

* commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40':
  Patching in hidden API to allow app managed preview frame buffers.
2009-10-23 19:17:59 -07:00
Android (Google) Code Review
78a50aa1db Merge change If3c30fc9 into eclair
* changes:
  Patching in hidden API to allow app managed preview frame buffers.
2009-10-23 22:08:30 -04:00
Jack Palevich
31f4c2d653 am a9046729: am a2ec1f4c: am 8f89a1a3: Merge change Ic620a52b into eclair
Merge commit 'a904672996c60c4ec50439a8d2be04fd9bd6444c'

* commit 'a904672996c60c4ec50439a8d2be04fd9bd6444c':
  Add size checks for glBufferData and glBufferSubData
2009-10-23 17:55:49 -07:00
Jack Palevich
a2ec1f4cea am 8f89a1a3: Merge change Ic620a52b into eclair
Merge commit '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-mr2

* commit '8f89a1a360465e08e81ceca3cb3042606a98668b':
  Add size checks for glBufferData and glBufferSubData
2009-10-23 17:39:47 -07:00
Andrew Harp
94927dffce Patching in hidden API to allow app managed preview frame buffers.
Commit-Id: If3c30fc932697afa966cc97b17749e9996de92ee
2009-10-23 01:44:47 -04:00
Jack Palevich
c620a52b69 Add size checks for glBufferData and glBufferSubData
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.
2009-10-21 11:02:44 -07:00
Nick Pelly
2cd5250abb am aeed585d: am 43f2b4e9: am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit 'aeed585d19f4db006ca765eed37d629831e4b563'

* commit 'aeed585d19f4db006ca765eed37d629831e4b563':
  Revert "Remove STOPSHIP comment."
2009-10-14 15:51:13 -07:00
Nick Pelly
43f2b4e9c6 am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-mr2

* commit '53f33d84776a0bad668e361365a7049b16f8a929':
  Revert "Remove STOPSHIP comment."
2009-10-14 12:37:06 -07:00
Nick Pelly
53f33d8477 Revert "Remove STOPSHIP comment."
This reverts commit 3d0726b4d8a30e57852b70f1dcf4d8d20508cd1e

Change-Id: Ie1ce5d09cc0b799ef0799f30eedc95f0ca5d3fad
DrNo: jerrryw
2009-10-14 12:25:29 -07:00
Nick Pelly
09897fb287 am b355695a: am 52cb8557: am a04ca9b4: Merge change I2492bffe into eclair
Merge commit 'b355695a093df11387828b3c588fd05c04b8907b'

* commit 'b355695a093df11387828b3c588fd05c04b8907b':
  Remove STOPSHIP comment.
2009-10-14 12:17:39 -07:00
Nick Pelly
52cb855752 am a04ca9b4: Merge change I2492bffe into eclair
Merge commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085' into eclair-mr2

* commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085':
  Remove STOPSHIP comment.
2009-10-14 12:03:19 -07:00
Nick Pelly
3d0726b4d8 Remove STOPSHIP comment.
Change-Id: I2492bffe57bded65fdbef5cf98e22cef3937e537
DrNo: eastham
Bug: 2089423
Joke: Why don't anteaters get sick? Because they're full of anty-bodies!
2009-10-14 11:46:18 -07:00
Zheng BaoZhong
416dd8e60a am 360f21cd: am a4adc798: Merge change I409d9b4a into eclair-mr2
Merge commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca'

* commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca':
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
2009-10-13 16:59:28 -07:00
David 'Digit' Turner
de553351bf am 4c220bd0: Merge branch \'eclair-plus-aosp\' of 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.
2009-10-12 12:36:03 -07:00
Jeff Hamilton
1d4eb8843e am 254d7ecd: Merge branch \'eclair-plus-aosp\' of 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.
2009-10-12 12:33:44 -07:00
Wu-cheng Li
83a880065f am 3616d154: am 80fff7a5: am 962f2536: Merge change I547cff66 into eclair
Merge commit '3616d15451734bd3b563d73f9c2f25c19d7df75c'

* commit '3616d15451734bd3b563d73f9c2f25c19d7df75c':
  Add zoom functions and sendCommand.
2009-10-12 11:44:39 -07:00
Nick Pelly
4c08b8b5b8 am a1cb6a64: am 460965c2: am 24bb9b8a: Provide an API for apps to use a 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.
2009-10-12 11:38:32 -07:00
Jaikumar Ganesh
178447e633 am f2b80d8c: am d453fe67: Merge change I5dbd1994 into eclair
Merge commit 'f2b80d8ccc9b8d775eb0171bd8f170f251a7314e'

* commit 'f2b80d8ccc9b8d775eb0171bd8f170f251a7314e':
  Fix rfcomm socket connect return code.
2009-10-12 11:19:15 -07:00
Zheng BaoZhong
038e315cde Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
bug b/2178462

Change-Id: I409d9b4a163299c3383ec092cd2368a9d24236cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-10 16:26:33 -04:00
Nick Pelly
16fb88a673 Encourage developers to connect RFCOMM by UUID instead of Channel.
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
2009-10-07 23:25:24 +02:00
Mike Reed
a78b0a2d9e add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
Knowing that a 32bit bitmap is opaque is a performance boost for some blits.
2009-10-07 11:38:05 -07:00
Wu-cheng Li
36f68b8f24 Add zoom functions and sendCommand.
b2060030
2009-10-06 13:25:10 -07:00
Nick Pelly
24bb9b8af4 Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
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
2009-10-06 05:57:50 -07:00
Android (Google) Code Review
88d32062bc Merge change Ibdced0b5
* changes:
  Remove unused #includes.
2009-10-02 13:47:48 -04:00
Jaikumar Ganesh
a01a4479a1 Fix rfcomm socket connect return code.
The phone would say connected even when powered off.
Bug id: 2161890
DrNo: Hiroshi

Change-Id: I5dbd19941a80e86c7462670fb844a29cf4eb0908
2009-10-01 19:12:18 -07:00
Elliott Hughes
bdced0b58c Remove unused #includes.
(Part of removing adb networking support.)

Bug: 1122968
2009-10-01 17:50:23 -07:00
Jaikumar Ganesh
0865a3adf9 am eff77e9a: am 8ad6d524: Merge change I55e15bad into eclair
Merge commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7'

* commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7':
  Try to reconnect twice when the rfcomm error code is Connection Refused.
2009-10-01 13:45:43 -07:00
Zhu Lan
e7b2d93f22 am ba61cff4: am e5661c40: Merge change I8366852f into eclair
Merge commit 'ba61cff482a048131937d82f0d9652c799383314'

* commit 'ba61cff482a048131937d82f0d9652c799383314':
  Bluetooth A2DP suspend/resume functionality
2009-10-01 12:13:57 -07:00
Dianne Hackborn
a085d5e747 am 0b03fa8b: am 490d5222: Merge change I6cacaa0d into eclair
Merge commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad'

* commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad':
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair
2009-10-01 11:16:09 -07:00
Jaikumar Ganesh
54172d92af Try to reconnect twice when the rfcomm error code is Connection Refused.
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
2009-09-30 17:46:17 -07:00
Zhu Lan
f9bbe1e71a Bluetooth A2DP suspend/resume functionality
Change-Id: I8366852fa9b6ff9dacf18db00ea1c2be0c00ff34
2009-09-29 20:50:02 -07:00
Dianne Hackborn
afa78967b8 Hack to fix issue #2125365: Sports Trivia compatability with Eclair
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
2009-09-28 17:33:54 -07:00
Nick Pelly
15039f91d0 am 3ecb11e0: am 65dea14c: Merge change 27129 into eclair
Merge commit '3ecb11e099e8c0c84381c38775103cc7d42234d6'

* commit '3ecb11e099e8c0c84381c38775103cc7d42234d6':
  Bounds check read and write path in native code.
2009-09-28 01:12:24 -07:00
Nick Pelly
57a2292bff Bounds check read and write path in native code.
Already checked in Java, but requested by security review.

Change-Id: I5314dbc32546278b977236a154fba03f38610b1a
2009-09-25 14:13:49 -07:00
Nick Pelly
561837422a am b2209a35: am 1a42cfac: Use LM_SECURE when auth && encrypt.
Merge commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523'

* commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523':
  Use LM_SECURE when auth && encrypt.
2009-09-25 11:16:24 -07:00
Chih-Chung Chang
0cff245456 am 5e367bfe: am 0665ae22: Merge change 26939 into eclair
Merge commit '5e367bfe0726d7d7108279721179dcd6de326ee5'

* commit '5e367bfe0726d7d7108279721179dcd6de326ee5':
  Fix 2101425: Camera crashes spontaneously in preview.
2009-09-25 11:15:04 -07:00
Mike Reed
ec44a6932a am e493bf79: am 9251c344: Merge change 26851 into eclair
Merge commit 'e493bf7985ad4cac7bafcfa788eb281b694967aa'

* commit 'e493bf7985ad4cac7bafcfa788eb281b694967aa':
  use new setDither on ImageRef to retain that setting for purgeable images
2009-09-25 11:05:07 -07:00
Dianne Hackborn
466ccfd9ef am 5ddbc0d5: am de0dfb7b: Fix issue #2125720 Weather Forecast Widget - graphics do not scale
Merge commit '5ddbc0d59d8143d50a19950624c38fdb8102156b'

* commit '5ddbc0d59d8143d50a19950624c38fdb8102156b':
  Fix issue #2125720 Weather Forecast Widget - graphics do not scale
2009-09-25 10:52:48 -07:00
Nick Pelly
1a42cfac15 Use LM_SECURE when auth && encrypt.
LM_SECURE enforces man in the middle (MITM) protection.

Change-Id: Ia800bb657b429f8872d72072f7c9450a74028af0
2009-09-24 19:36:27 -07:00
Android (Google) Code Review
0665ae22aa Merge change 26939 into eclair
* changes:
  Fix 2101425: Camera crashes spontaneously in preview.
2009-09-24 19:59:08 -04:00
Chih-Chung Chang
6157de0e2d Fix 2101425: Camera crashes spontaneously in preview.
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.
2009-09-24 15:38:18 -07:00
Android (Google) Code Review
9251c34459 Merge change 26851 into eclair
* changes:
  use new setDither on ImageRef to retain that setting for purgeable images
2009-09-24 12:38:23 -04:00
Mike Reed
17154417e8 use new setDither on ImageRef to retain that setting for purgeable images 2009-09-24 12:35:27 -04:00
Dianne Hackborn
de0dfb7b65 Fix issue #2125720 Weather Forecast Widget - graphics do not scale
I forgot to add the new density field to the Bitmaps' parcelable data.

Change-Id: I77cf3e93e356297e0caed6fc71b62b5cd8f79124
2009-09-23 14:26:02 -07:00
Wu-cheng Li
8f7bd3031a am cd3a0242: am ffe1cf25: Unhide Camera lock and unlock API.
Merge commit 'cd3a02425179ea881f3534d687c143a2ce683684'

* commit 'cd3a02425179ea881f3534d687c143a2ce683684':
  Unhide Camera lock and unlock API.
2009-09-20 17:18:03 -07:00
Wu-cheng Li
ffe1cf251a Unhide Camera lock and unlock API. 2009-09-21 07:28:44 +08:00
Jaikumar Ganesh
34e4f6267e am 1781edd2: am 0647b580: Merge change 25970 into eclair
Merge commit '1781edd28639b23443f9d319d1e5cea41acab8e9'

* commit '1781edd28639b23443f9d319d1e5cea41acab8e9':
  Make removeBond() call async.
2009-09-20 13:30:06 -07:00
Jaikumar Ganesh
995ae82f38 Make removeBond() call async.
This call has been synchronus since Bluez3.36.
However, since the semantics for all Bluetooth API calls are
asynchronous make this so too. It does fix an occasional ANR
seen while unpairing.

Change-Id: If81f8ec262ea1f6f62775282ab33855a8669c41a
2009-09-20 11:28:34 -07:00
Jaikumar Ganesh
f1aa097ddc am 480a353f: am ac810e53: Merge change 25779 into eclair
Merge commit '480a353f589035b62a81e2981cfba325ad1264f2'

* commit '480a353f589035b62a81e2981cfba325ad1264f2':
  Add new API for fetching UUIDs using SDP.
2009-09-19 11:47:16 -07:00