Commit Graph

32730 Commits

Author SHA1 Message Date
Andreas Huber
cd4e79b166 Merge "This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491" 2011-04-04 12:45:23 -07:00
Adam Cohen
458c89ec88 Merge "Fixing build" 2011-04-04 12:12:25 -07:00
Andreas Huber
1e8cc7b1f1 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
2df1d33f68 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
bfba112c17 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
Robert Ly
f73bad5173 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
Adam Cohen
aa996ca3ea Merge "Making StackView res-out and click feedback colors stylable" 2011-04-04 11:27:07 -07:00
Dirk Dougherty
974e21c066 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
bc3afc3053 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
88772c4a44 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
9051917e46 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
a2a0d25ab5 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
49cbaf290c 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
f084673183 Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1 2011-04-03 13:40:48 -07:00
Brian Carlstrom
46619a89bb Merge "Tracking merge of dalvik-dev to master" 2011-04-02 20:39:32 -07:00
Scott Main
7620355317 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
f5a6e2bac9 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
0a4c44aa6d 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
5d539a12dc 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
03226aa1e9 Merge "docs: update device dashboard" into honeycomb 2011-04-01 17:36:42 -07:00
Wink Saville
007f1adb8d 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
8301d0fcb3 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
6d01167df4 Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE 2011-04-01 16:34:51 -07:00
Jeff Brown
884f344137 Merge "Fix dispatcher crash when input monitoring enabled. Also ensure that we actually log assertion failures." 2011-04-01 16:33:40 -07:00
Scott Main
304fa07898 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
753fdd692d 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
60d4f1268e 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
59a50e129b 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
ac8b122389 Merge "docs: update homepage announcement for Google IO" into honeycomb 2011-04-01 16:17:40 -07:00
Jeff Brown
23e0c8c1a1 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
Mathias Agopian
27fd410be4 Merge "SurfaceTexture can now force the client to request a buffer" 2011-04-01 14:58:43 -07:00
Mathias Agopian
bf59b168f4 Merge "ANativeWindow_setBuffersGeometry now returns proper error codes" 2011-04-01 14:45:34 -07:00
Mathias Agopian
a5c75c0162 SurfaceTexture can now force the client to request a buffer
SurfaceTexture now has the concept of default size a new method,
setDefaultBufferSize() to set it. When the default size is
changed, dequeueBuffer() will return a value telling the
client that it must ask for a new buffer.

The above only applies if the client has not
overriden the buffer size with setGeometry.

Change-Id: I520dc40363054b7e37fdb67d6a2e7bce70326e81
2011-04-01 14:43:35 -07:00
Chet Haase
b629948766 Merge "Fix the build - change a reference to a namespace specification" 2011-04-01 14:34:16 -07:00
James Dong
ade41d686a Merge "ISurfaceTexture does not have a method getIdentity()" 2011-04-01 14:06:56 -07:00
Andreas Huber
6335a33034 Merge "Remove legacy hack to only drop frames every other late frame" 2011-04-01 14:02:06 -07:00
Andreas Huber
37a0c7f20f Merge "Fix a webm-seek issue introduced when adding support for streaming webm" 2011-04-01 14:01:09 -07:00
Chet Haase
20cc028bac Merge "Add logging of graphics acceleration info to bugreports" 2011-04-01 13:28:10 -07:00
Jeff Brown
02988ec716 Merge "Add a little input event consistency verifier." 2011-04-01 12:56:35 -07:00
Robert Greenwalt
38a0a853a3 Merge "Fix a bad merge." 2011-04-01 11:39:02 -07:00
Mike Lockwood
009e05584b am 1c56976a: am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
* commit '1c56976a774434bd279b6181c4fc3c555c4648c2':
  Improve Javadoc for USB Manager and MTP/PTP support.
2011-04-01 11:38:52 -07:00
Mike Lockwood
2983e3bb9e am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
* commit '38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2':
  Improve Javadoc for USB Manager and MTP/PTP support.
2011-04-01 11:37:05 -07:00
Mike Lockwood
d50605b686 am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
* commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75':
  Improve Javadoc for USB Manager and MTP/PTP support.
2011-04-01 11:34:39 -07:00
Wink Saville
c629a89a2e am 7c6f532a: am dacb8090: Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
* commit '7c6f532ae9b90734edcfe68f8dee078ea8c4b8a5':
  Airplane mode on always timed out when camping on LTE
2011-04-01 10:40:57 -07:00
Wink Saville
b6b83d0b82 am 4aff3e36: am 0198fff9: Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
* commit '4aff3e363cae550a95c8082ec153bc739fe97db4':
  Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
2011-04-01 10:38:40 -07:00
Wink Saville
0586ba6e83 am dacb8090: Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
* commit 'dacb80901dfbd7cc18a6f1ede6ca334ed42c038f':
  Airplane mode on always timed out when camping on LTE
2011-04-01 10:32:37 -07:00
Wink Saville
8ee9ebcbca am 0198fff9: Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
* commit '0198fff90430d9f974b0284fc3659434406c751b':
  Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
2011-04-01 10:30:44 -07:00
Wink Saville
ff47ce57ad Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE 2011-04-01 10:28:22 -07:00
Jean-Baptiste Queru
4160f1379e am 789d4ade: ignore from gingerbread-plus-aosp
* commit '789d4ade299e0c986b9652542b7adf26d38816f4':
  Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
2011-03-31 20:10:59 -07:00
Jean-Baptiste Queru
5b2138ab38 ignore from gingerbread-plus-aosp
Change-Id: I80fc76acaa18aae7b313bb19489f277ce4700368
2011-03-31 20:08:04 -07:00