48693 Commits

Author SHA1 Message Date
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
Scott Main
0e3df2b9f9 docs: update homepage announcement for Google IO
Change-Id: I0421f1ae8731fdeb96145ebd82df1298389a5af5
2011-04-01 15:04:24 -07:00
Mathias Agopian
756484c2bb Merge "SurfaceTexture can now force the client to request a buffer" 2011-04-01 14:58:43 -07:00
Wink Saville
44ff718f62 Data Retry fix after failure due to permanent causes.
Change-Id: I86d5a2dc9394dac93c4350159f4d99cf19aedec9
2011-04-01 14:45:49 -07:00
Mathias Agopian
9aa26ee3bc Merge "ANativeWindow_setBuffersGeometry now returns proper error codes" 2011-04-01 14:45:34 -07:00
Mathias Agopian
e5a1bffd91 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
222e479278 Merge "Fix the build - change a reference to a namespace specification" 2011-04-01 14:34:16 -07:00
Chet Haase
0865d33d97 Fix the build - change a reference to a namespace specification
Change-Id: I79c8b571e6555451611b825669963f042d901f1a
2011-04-01 14:33:02 -07:00
Stephen Hines
ef353dde08 Make BaseObj a public class.
BUG=4156151

Change-Id: Ia5d5ae08ab8e176ad3ca1f38c2c33ef4e9551213
2011-04-01 14:22:35 -07:00
Alex Sakhartchouk
8e90f2bc1f First draft of fbo in renderscript.
Updating samples and benchmark

Change-Id: I469bf8b842fca72b59475c8fa024c12cf0e14954
2011-04-01 14:19:01 -07:00
Robert Greenwalt
92d72ca01b Fix bad merge.
Add host route for a default gateway before adding the default route.
Also fixing bug were "already active" condtion of APN failed to
propagate the default gateway info, resulting in a loss of that address.

bug:4175328
Change-Id: I38f9d108693382a43e6605d56ca3963adf4eb6f4
2011-04-01 14:11:30 -07:00
James Dong
55311e8d13 Merge "ISurfaceTexture does not have a method getIdentity()" 2011-04-01 14:06:56 -07:00
Andreas Huber
1aebc47141 Merge "Remove legacy hack to only drop frames every other late frame" 2011-04-01 14:02:06 -07:00
Andreas Huber
5e9c3de539 Merge "Fix a webm-seek issue introduced when adding support for streaming webm" 2011-04-01 14:01:09 -07:00
Andreas Huber
21796929d3 Fix a webm-seek issue introduced when adding support for streaming webm
Change-Id: I52ec841832077603ee035f7a648316349513e978
related-to-bug: 4199894
2011-04-01 13:36:53 -07:00
James Dong
a93f84e067 ISurfaceTexture does not have a method getIdentity()
Change-Id: I81e6b0335747bd5c2c4b15c9f8c99100842a06c1
2011-04-01 13:29:27 -07:00
Chet Haase
09bc5f5b57 Merge "Add logging of graphics acceleration info to bugreports" 2011-04-01 13:28:10 -07:00
Andreas Huber
2334d82073 Remove legacy hack to only drop frames every other late frame
Change-Id: I197e568d292341c330efb394c41aa9af0e74b081
related-to-bug: 4203195
2011-04-01 13:27:42 -07:00
Chet Haase
9c1e23baf5 Add logging of graphics acceleration info to bugreports
Change-Id: I9fa4cda6ccf92df9d1c644ccdc0e7274a30106e0
2011-04-01 13:24:53 -07:00
Jeff Brown
bc2278b95f Merge "Add a little input event consistency verifier." 2011-04-01 12:56:35 -07:00
Robert Greenwalt
165121f64a Merge "Fix a bad merge." 2011-04-01 11:39:02 -07:00
Mike Lockwood
8538149572 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
1c56976a77 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
38f04c0f28 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
Mike Lockwood
11dd5ae97b Improve Javadoc for USB Manager and MTP/PTP support.
Bug: 4091519

Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-01 14:11:50 -04:00
Robert Greenwalt
13ec406381 Fix a bad merge.
Re-add change 103769 (Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f) from gingerbread
after the bad merge was reverted by master change 104487
(Change-Id: I8fad7ee11f4b26630f3cc4b31cc9cafbe66b3bf4).

bug:4157610
Change-Id: I96a75d71220cc7886a5b186b415d8dacf6951ca6
2011-04-01 10:51:22 -07:00
Wink Saville
d9dc236454 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
19bb5bc4ad 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
7c6f532ae9 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
4aff3e363c 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
dacb80901d Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE 2011-04-01 10:28:22 -07:00
Wink Saville
95bc2b7564 Airplane mode on always timed out when camping on LTE
While on LTE, GsmDataConnectionTracker is implicitly associated with CdmaServiceTracker.
CdmaServiceTracker asynchronously waits for the disconnection of data before turning off
the Radio but GsmDataConnection does not notify the disconnection due to different logic
in GsmServiceTracker.

This fix is to have common airplane mode toggle logic on both GSM and CDMA flavors.

Change-Id: I67ff82a59a2243856ae3e7c5e37b5726bcbf3c94
2011-04-01 10:11:18 -07:00