48824 Commits

Author SHA1 Message Date
Adam Cohen
f45f5b2715 Fixing build
Change-Id: If18012c03265f3fa02d8743d583668d9e0245845
2011-04-04 12:08:58 -07:00
Andreas Huber
284b831d15 Merge "Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock." 2011-04-04 12:00:20 -07:00
Robert Ly
c474031642 am cbfeda13: am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb
* commit 'cbfeda13e7da5c1cdf6f02e76d81ac5f878b1225':
  Adding package description for android.hardware.usb
2011-04-04 11:55:23 -07:00
Robert Ly
cbfeda13e7 am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb
* commit '6f7e4cb5ae58f5eff6bb4216439c47fd13202b09':
  Adding package description for android.hardware.usb
2011-04-04 11:48:51 -07:00
Andreas Huber
c6e3b27fa1 This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491
Instead of returning 0-filled buffers after EOS from AudioTrack we do this
work in AudioOutput instead. That way the EOS signal (0 frames returned)
is preserved in AudioCache which otherwise would lead to a heap size overflow
filling everything with zeroes.

Change-Id: I7e07429ba887957a4340dd4b21eef4bba76248cd
related-to-bug: 3514073
2011-04-04 11:43:40 -07:00
Robert Ly
6f7e4cb5ae am 3f39f653: Adding package description for android.hardware.usb
* commit '3f39f653a90f9727d13be1e9908f0afb8fe66d6e':
  Adding package description for android.hardware.usb
2011-04-04 11:41:02 -07:00
Andreas Huber
8e64c31f6c Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock.
Change-Id: Idfea452ff661b264e013fe515bcd2a2762bd959c
related-to-bug: 4193552
2011-04-04 11:29:35 -07:00
Adam Cohen
4b6bf80fad Merge "Making StackView res-out and click feedback colors stylable" 2011-04-04 11:27:07 -07:00
Robert Greenwalt
37229514c5 Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 2011-04-04 11:23:51 -07:00
Robert Greenwalt
d685c731bf resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp
Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd
2011-04-04 11:21:23 -07:00
Robert Ly
3f39f653a9 Adding package description for android.hardware.usb
Change-Id: I4d243424c6747531a1ac6ab2230c2af73bad4fed
2011-04-04 11:07:46 -07:00
Brad Fitzpatrick
27e00544ea am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
* commit '9907d161584415c81de1099678f160da172fd1a6':
  Fix data corruption when writing to Bluetooth socket
2011-04-04 11:03:03 -07:00
Gilles Debunne
c5a43594ba IME is no longer shown when an EditText gets focus.
Change-Id: Ife24f83831f97c911e4e800547182a390cda0d75
2011-04-04 10:57:47 -07:00
Brad Fitzpatrick
9907d16158 Merge "Fix data corruption when writing to Bluetooth socket" 2011-04-04 10:49:05 -07:00
Brad Fitzpatrick
9b1b643995 am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
* commit '2ed72048828cf9f617da971e5d2b8a062de08e5b':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
2011-04-04 10:17:43 -07:00
Brad Fitzpatrick
f7a34b1598 am e558a000: Merge "Avoid crash in system server when mounting container"
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
  Avoid crash in system server when mounting container
2011-04-04 10:17:35 -07:00
Brad Fitzpatrick
2ed7204882 Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 2011-04-04 09:41:10 -07:00
Brad Fitzpatrick
e558a00003 Merge "Avoid crash in system server when mounting container" 2011-04-04 09:38:16 -07:00
Mattias Niklewski
114f98a753 Always return a valid index from Rfc822Tokenizer.findTokenEnd()
If an invalid input string ends with a backslash inside a comment
or quoted string, the returned index would be past the end of the
string. In one case this would lead to a runtime exception being
thrown from MultiAutoCompleteTextView.performValidation.

Change-Id: If629372b429716c25cdc25764f088e95d4812d57
2011-04-04 14:52:35 +02:00
Fredrik Helmer
a20c8ef471 Avoid crash in system server when mounting container
A race condition when mounting a container in PackageHelper may cause
the system_server to crash (uncaught exception). Calling methods are
prepared to handle null, so return null instead.

Change-Id: I852ee21a2d847e37d81c1b900c27ddf94ef24fcb
2011-04-04 14:38:24 +02:00
Mike Playle
36aa8839d5 Fix data corruption when writing to Bluetooth socket
Writes to Bluetooth sockets are handled by writeNative() in
android_bluetooth_BluetoothSocket.cpp. This calls asocket_write()
which is implemented in abort_socket.c.

This latter function sleeps until poll() indicates that the socket is
writeable, then calls write() once, returning the number of bytes
written. However writeNative() just returns this byte count to the
caller; it's eventually ignored in BluetoothOutputStream.java. This
doesn't match the semantics of a Java OutputStream, which is required
to block until all bytes have been written.

This fix adds a loop to writeNative() that repeatedly calls the lower
level write function until all the data has been written (or an error
occurred in which case we should exit the loop early). With this
change it is possible to write large amounts of data to a Bluetooth
socket without experiencing data loss.

Change-Id: I0b464382817e15adec32ba0e3cb37e7d1cccc730
2011-04-04 08:56:22 +01:00
Dirk Dougherty
7f5a026d25 am 9e374cf4: am 826af857: am f9cdf7fe: Doc change: add diff report for API 12.
* commit '9e374cf4941c18059ce47b5eba9ace08d06f57b0':
  Doc change: add diff report for API 12.
2011-04-03 14:07:49 -07:00
Dirk Dougherty
9e374cf494 am 826af857: am f9cdf7fe: Doc change: add diff report for API 12.
* commit '826af8576b27d18997440bec75daa26434033c0c':
  Doc change: add diff report for API 12.
2011-04-03 14:06:00 -07:00
Dirk Dougherty
826af8576b am f9cdf7fe: Doc change: add diff report for API 12.
* commit 'f9cdf7feb47aa142e11862f5694c0a29ac013a51':
  Doc change: add diff report for API 12.
2011-04-03 14:04:20 -07:00
Dirk Dougherty
51b27366be am b079c1f8: am 85709ac8: am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
* commit 'b079c1f8ee41e714b5273189014a5601598a8b62':
  Doc change: update media formats tables with adts/aac and flac
2011-04-03 14:01:40 -07:00
Dirk Dougherty
b079c1f8ee am 85709ac8: am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
* commit '85709ac8e3340fb8114cfff7128a09d64c06cdc1':
  Doc change: update media formats tables with adts/aac and flac
2011-04-03 13:56:07 -07:00
Dirk Dougherty
85709ac8e3 am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
* commit '1676920113d35b66e6e8846ffb7dded7e011c2fa':
  Doc change: update media formats tables with adts/aac and flac
2011-04-03 13:50:48 -07:00
Dirk Dougherty
f9cdf7feb4 Doc change: add diff report for API 12.
Change-Id: I9c7367be204208384aafaa19a8243164024ed1de
2011-04-03 13:50:46 -07:00
Dirk Dougherty
1676920113 Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1 2011-04-03 13:40:48 -07:00
Dirk Dougherty
88a1fc2d79 Doc change: update media formats tables with adts/aac and flac
Change-Id: Ic541f9e4ea1907453041d017d7d3608ead45ed6f
2011-04-03 13:23:24 -07:00
Brian Carlstrom
aedc2a8fcc Merge "Tracking merge of dalvik-dev to master" 2011-04-02 20:39:32 -07:00
Scott Main
d4f4e077ab am e1e46c72: am 342d8fdb: am 90a1befa: am 27690eba: Merge "docs: update device dashboard" into honeycomb
* commit 'e1e46c7263948f5127f618e905fe5fb3ec0b3437':
  docs: update device dashboard
2011-04-01 17:45:41 -07:00
Scott Main
e1e46c7263 am 342d8fdb: am 90a1befa: am 27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '342d8fdbb6ee256da90ada3e48e198bbc9e8d8e3':
  docs: update device dashboard
2011-04-01 17:43:12 -07:00
Scott Main
342d8fdbb6 am 90a1befa: am 27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '90a1befa551a9e6dc8f06b7331e26e6470ab824f':
  docs: update device dashboard
2011-04-01 17:41:40 -07:00
Scott Main
90a1befa55 am 27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '27690ebabc915091956f0331023c9d074177271d':
  docs: update device dashboard
2011-04-01 17:39:05 -07:00
Scott Main
27690ebabc Merge "docs: update device dashboard" into honeycomb 2011-04-01 17:36:42 -07:00
Wink Saville
ef0c34c5b2 am 22cfcaee: am 0b8e313c: Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE
* commit '22cfcaee24829e52c636ca2f5df0285569c6e7c1':
  Data Retry fix after failure due to permanent causes.
2011-04-01 16:38:43 -07:00
Wink Saville
22cfcaee24 am 0b8e313c: Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE
* commit '0b8e313c7f97f9cb34e2ba555182621889b69a16':
  Data Retry fix after failure due to permanent causes.
2011-04-01 16:36:25 -07:00
Wink Saville
0b8e313c7f Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE 2011-04-01 16:34:51 -07:00
Jeff Brown
7b465b0990 Merge "Fix dispatcher crash when input monitoring enabled. Also ensure that we actually log assertion failures." 2011-04-01 16:33:40 -07:00
Adam Cohen
26f072c3ee Making StackView res-out and click feedback colors stylable
Change-Id: Ia6241b1b66dc510b22bcf342d775f98eb7c86871
2011-04-01 16:28:51 -07:00
Scott Main
6063b6de74 am 03d4dc3b: am 0fa1d66c: am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '03d4dc3b75c28ee3f502c983fcb8304d556db063':
  docs: update homepage announcement for Google IO
2011-04-01 16:27:19 -07:00
Scott Main
03d4dc3b75 am 0fa1d66c: am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '0fa1d66cccc6041bcc55cf39e77970edbe89109f':
  docs: update homepage announcement for Google IO
2011-04-01 16:25:14 -07:00
Scott Main
0fa1d66ccc am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '6261861a94448e4fbc26e313ce1410a184a10914':
  docs: update homepage announcement for Google IO
2011-04-01 16:22:35 -07:00
Scott Main
6261861a94 am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit 'cb719a48a2f2e9bc47b317f75ebb8320f6ce877c':
  docs: update homepage announcement for Google IO
2011-04-01 16:19:30 -07:00
Scott Main
cb719a48a2 Merge "docs: update homepage announcement for Google IO" into honeycomb 2011-04-01 16:17:40 -07:00
Jeff Brown
b6110c2de0 Fix dispatcher crash when input monitoring enabled.
Also ensure that we actually log assertion failures.

Bug: 4203092
Change-Id: I5c14bc41b2255f876858121f5572e2de75cabcc3
2011-04-01 16:15:13 -07:00
Brian Carlstrom
08065b9f09 Tracking merge of dalvik-dev to master
git cherry-pick --no-commit  a80febd83c8bf0b6717da2a7136179bdc906a5b7

git cherry-pick --no-commit  5e642b41cf44c5da7afdd95ab3d5e2bdbf7b31dd

git cherry-pick --no-commit  4886db14c9eee4b6fee69bd54c57c5af04709c4c

git cherry-pick --no-commit  560c685e448769904047507b9484ce8111967d7e

git cherry-pick --no-commit  63dde7a2fcfa53dc531558635b64cea613d3cdb4

git cherry-pick --no-commit  74e5cb91060a379d98dd3a333b5f231bfb4f502e

git cherry-pick --no-commit  1cc8c9708b555e2e338b7798d38887a2fefcfea6

git cherry-pick --no-commit  09625a21f5abe0c0db15757f58585d552d62c3d7

git cherry-pick --no-commit  fcb02dfe0f5a2bb7c07e6d6fc69f756a484b5458

git cherry-pick --no-commit  a68cb7fa3ab42854768b8145ff85231663770292

git cherry-pick --no-commit  716beb1c131dd2c6b805d4f681debaa20075010c

git cherry-pick --no-commit  8c29b1097a7afe3a77e27546a56e396f3620a4ec

git cherry-pick --no-commit  9c6a1a55d1c8086c1cc57464eea43725694ff70c

git cherry-pick --no-commit  b14f5ea5c57acdd009ba5b51f1bbe430f3d353b8

Change-Id: I8cc94175441b009e23549762d6baee1dbace4881
2011-04-01 16:00:23 -07:00
Scott Main
248f68de40 docs: update device dashboard
Change-Id: I0c94a8fabf85c5acb6195aae9f87d3d6ca5dadb8
2011-04-01 15:20:41 -07:00
Chet Haase
905787a7c9 Fix the build: break due to no OPENGL in some builds
Change-Id: Ibceb501d2361df9b74dc1964ff6b92ec8452f219
2011-04-01 15:18:25 -07:00