45048 Commits

Author SHA1 Message Date
Dirk Dougherty
fa67d647d4 am 58dacceb: am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
* commit '58dacceb789929c0d870649c5c0c2cab1045b898':
  Doc change: Add version notes for Android 2.3.3.
2011-02-10 13:56:52 -08:00
Nick Pelly
e49448f715 am cc47600d: am 47dac545: am 39cf3a44: Document NFC permissions.
* commit 'cc47600d4d7850f2903d2d59cc7f44528d40c8e5':
  Document NFC permissions.
2011-02-10 13:56:46 -08:00
Jeff Hamilton
40bbeeb409 am 510ced64: am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
* commit '510ced64f4316702cea07a55d1d473bdc07b2c86':
  Improve the docs a bit for foreground dispatch.
2011-02-10 13:56:41 -08:00
Eric Fischer
da4efd3488 am bdf587e8: (-s ours) am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'bdf587e8b9247fbf8e544f330cf0ec9efb1194db':
  Import revised translations.  DO NOT MERGE
2011-02-10 13:56:36 -08:00
Scott Main
e75d8a7c9e am 51d94b26: am 129c7372: am 3c01a139: rename SIP doc title
* commit '51d94b268a63d0ffffce92aa7cb822ae99529d84':
  rename SIP doc title
2011-02-10 13:56:29 -08:00
Wink Saville
48fe5c3a86 am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit 'bdce3d2c3516612bfd3a9e5f259a892d1a595f19':
  Telephony: Fix cb sms implementation
2011-02-10 13:53:10 -08:00
Mathias Agopian
b624eea70c am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
* commit 'd0f27f435eb8a2c7e5841da68760d1f023fcf919':
  fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-10 13:53:01 -08:00
Scott Main
0d66a2ec42 am b605869c: am 07cefd3c: add 2.3.3 announcement to site home page
* commit 'b605869cd36c7498ca99cc00bad5d0dfbf237c43':
  add 2.3.3 announcement to site home page
2011-02-10 13:52:57 -08:00
Jeff Hamilton
9e5ffb55e8 am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
* commit 'c1cc9ba6d1e2b7f1e213d215e3edb97acea79901':
  More documentation updates for NFC.
2011-02-10 13:52:48 -08:00
Dirk Dougherty
58dacceb78 am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
* commit '8d56f6decf9efd29b286e02c549510d681b7573d':
  Doc change: Add version notes for Android 2.3.3.
2011-02-10 13:52:40 -08:00
Nick Pelly
cc47600d4d am 47dac545: am 39cf3a44: Document NFC permissions.
* commit '47dac545da6468e5b46e940917eb6711c02b8e84':
  Document NFC permissions.
2011-02-10 13:52:34 -08:00
Jeff Hamilton
510ced64f4 am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
* commit '1ac35411f186dca346e8d9078a4fd2d570bb8a97':
  Improve the docs a bit for foreground dispatch.
2011-02-10 13:52:23 -08:00
Scott Main
4eccd96f4a am c06e7abe: resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
* commit 'c06e7abe6f37d1d8bc4f1c228964229d9f101d70':
  docs: move the SIP guide into guide/network/
2011-02-10 13:51:30 -08:00
Eric Fischer
bdf587e8b9 am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'c1c314334757e0ab3c244023aec1b24433b66b48':
  Import revised translations.  DO NOT MERGE
2011-02-10 13:50:51 -08:00
Scott Main
51d94b268a am 129c7372: am 3c01a139: rename SIP doc title
* commit '129c73723f2241f762f485a9b5421bfae3cbbdcd':
  rename SIP doc title
2011-02-10 13:50:44 -08:00
Jesse Wilson
34895b09db Document that LruCache is threadsafe.
Change-Id: Iae1421b8c768000e56806f6cd74aef7c69a78973
http://b/3184897
2011-02-10 13:50:24 -08:00
Scott Main
c06e7abe6f resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
2011-02-10 13:47:32 -08:00
Jesse Wilson
ed6d936eca Merge "Remove SSLPerformanceTest and DatabaseSessionCache." 2011-02-10 13:44:56 -08:00
Robert Ly
322891c689 Doc change: nfc dev guide
Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
2011-02-10 13:42:13 -08:00
Eric Laurent
a25c5d88d1 Fix issue 3435692
The problem is that the AudioService is not notified of the death of
IAudioFlinger binder interface because no methods was called on AudioFlinger
from system_server since the device booted. Therefore, AudioSystem did not created any
IAudioFlinger interface in the system_server process.
The root cause was always present but more likely to happen on a tablet than on a phone
as for instance no beeps are played when volume is adjusted.

The fix consists in having AudioSystem explicitly call a method on AudioFlinger when a
callback is installed to make sure that an IAudioFlinger binder interface is created
regardless of any other activity in the client process.

Change-Id: I9df34a36825af0b25cd0246dd02edbd712263f41
2011-02-10 13:24:04 -08:00
Vasu Nori
e7dea4ec24 bug:3443154 fix database tests after disabling sqlite wal
sqlite wal is disabled in Change-Id: I283ad26ba7e1793772a372aa8e24df0cb96ce2ef

Change-Id: I2b370c65390a9293e4a82f650c9cee8023b861d7
2011-02-10 13:18:23 -08:00
Jesse Wilson
74815d332c Remove SSLPerformanceTest and DatabaseSessionCache.
These aren't being run.

Change-Id: I9afc617a424c675578185ac66a4f6ac3af9afacf
2011-02-10 13:17:24 -08:00
Jason Sams
cbcd93352b Merge "Basic 101 level compute example for RS." into honeycomb 2011-02-10 13:06:16 -08:00
Katie McCormick
360e40ef21 am ce7c05e8: resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
* commit 'ce7c05e842d4e35ce180d398ecb969aad18f3460':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
2011-02-10 13:03:27 -08:00
Xavier Ducrohet
aa0d2124d5 Merge "LayoutLib: remove some exceptions." 2011-02-10 13:01:34 -08:00
Katie McCormick
ce7c05e842 resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
2011-02-10 12:38:07 -08:00
Andreas Huber
8cdc31f76a Merge "Fix the build." 2011-02-10 12:35:06 -08:00
Andreas Huber
c2f9a26b1e Fix the build.
Change-Id: I9b777ffb260eb0f3790ae0907e4a443d33fa3f2f
2011-02-10 12:34:25 -08:00
Mathias Agopian
b66b7a2c18 Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb 2011-02-10 12:29:19 -08:00
Marco Nelissen
4fd18e6310 Merge "Better genre support." 2011-02-10 12:23:11 -08:00
Steve Block
fb40a64d80 Merge "Increase DRT timeout while waiting for WebView to dump as text" 2011-02-10 12:13:27 -08:00
Marco Nelissen
cb613a04c1 Better genre support.
Expand the list of genres, and support genres that look like "(192)CustomGenre".
b/3349415

Change-Id: I617ea7dfeace708bbd0d9c00ff04de72fa2d383e
2011-02-10 12:09:16 -08:00
Adam Powell
96bad13901 Merge "Fix bug 3440372 - Spinner measurement issues with new rules" 2011-02-10 12:07:38 -08:00
Adam Powell
b70c727b2e Fix bug 3440372 - Spinner measurement issues with new rules
Change-Id: I3633239dc42277eb6447cf7f0907f35f4b45e873
2011-02-10 12:04:59 -08:00
Dirk Dougherty
12244c5796 Merge "Doc change: changes for 3.0 SDK" into honeycomb 2011-02-10 12:02:38 -08:00
Dirk Dougherty
6d9cf27460 Doc change: changes for 3.0 SDK
Change-Id: If94d2bd65f396491d0f5de333dfe30d18628edc9
2011-02-10 12:01:21 -08:00
Andreas Huber
8e6f60d9bb Merge "Change timestamp handling in RTSP, remove unused, experimental, gtalk support" 2011-02-10 11:55:22 -08:00
Jesse Wilson
34ee52e60c Adopt LruCache in WifiStateMachine.
Change-Id: I2d2f07e8b9895ae2fd05299033336fbca047373f
http://b/3184897
2011-02-10 11:54:05 -08:00
Andreas Huber
b2934b16ea Change timestamp handling in RTSP, remove unused, experimental, gtalk support
related-to-bug: 3216447

NTP timestamp handling is now done at a higher layer than before.

Change-Id: I9fb23f1335110ec59e534f9aa0fe6f6a6406dd52
2011-02-10 11:53:54 -08:00
John Reck
c943cd123e Merge "Fix spacing issue" 2011-02-10 11:53:10 -08:00
John Reck
e4fee50558 Fix spacing issue
Bug: 3432069

Change-Id: If58d19cacb99f3ab7fdc4d8fdbb86f0853010ed1
2011-02-10 11:33:35 -08:00
Xavier Ducrohet
138a54cb20 Merge "LayoutLib: Annotate the custom delegate methods." 2011-02-10 11:27:27 -08:00
Steve Block
8e8cf732d1 Increase DRT timeout while waiting for WebView to dump as text
This avoids problems with LayoutTests fast/frames/lots-of-iframes.html and fast/frames/lots-of-objects.html

Bug: 3440578
Change-Id: Ic045141f986baf779ffc9eec804ba994ce0d0fbe
2011-02-10 11:11:22 -08:00
Robert Ly
bbdc4ce254 Merge "clean up and add javadocs" into honeycomb 2011-02-10 10:15:14 -08:00
Alex Sakhartchouk
efc48eea15 Merge "HelloWorld graphics sample for Renderscript." into honeycomb 2011-02-10 09:53:30 -08:00
Alex Sakhartchouk
f1ff8b2fd6 Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb 2011-02-10 09:51:34 -08:00
Santosh Madhava
adca6840e3 Merge "Fix for 3431967: Memory leak from video editor engine in JNI" 2011-02-10 09:41:27 -08:00
Chet Haase
c77d7b42ab Merge "Fix animation and layoutTransition issues." 2011-02-10 09:16:56 -08:00
Daniel Sandler
c1afcf06f8 Put the pocket back in my pocket for later.
Change-Id: Ifa6b540abede35ba92ab6721274655aef1458fbc
2011-02-10 11:53:29 -05:00
Chih-Chung Chang
d7db70123f Fix a bug that the condition for play/pause was reversed.
Change-Id: I462ca5b910de98a875d7f54b4a937176f88474d0
2011-02-10 18:17:38 +08:00