47841 Commits

Author SHA1 Message Date
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
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
0b8e313c7f Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE 2011-04-01 16:34:51 -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
Scott Main
248f68de40 docs: update device dashboard
Change-Id: I0c94a8fabf85c5acb6195aae9f87d3d6ca5dadb8
2011-04-01 15:20:41 -07:00
Scott Main
0e3df2b9f9 docs: update homepage announcement for Google IO
Change-Id: I0421f1ae8731fdeb96145ebd82df1298389a5af5
2011-04-01 15:04:24 -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
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
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
Wink Saville
0198fff904 Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
This allows the system property to be updated at runtime and
for testing.

Change-Id: I75788e5fa70efdbb9186b9f03baac1d9e6b3febd
2011-04-01 08:53:12 -07:00
Scott Main
77de14d64f am 1ccdc235: am e979332f: docs: fix markup bugs
* commit '1ccdc235716715e7c6f13cab42e4195454e04615':
  docs: fix markup bugs
2011-03-31 19:10:56 -07:00
Scott Main
1ccdc23571 am e979332f: docs: fix markup bugs
* commit 'e979332f38e677db4c9d89f695352ed41052553d':
  docs: fix markup bugs
2011-03-31 19:06:33 -07:00
Scott Main
e979332f38 docs: fix markup bugs
Change-Id: I230d16e6dc0fe166a61a30a92b2666e0856298a0
2011-03-31 17:08:24 -07:00
Wink Saville
b90f9c370e Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE 2011-03-31 15:51:07 -07:00
Wink Saville
261306889e Telephony: Add Powerdown Cause to PDP Deactivate Message.
Modem needs to know if PDP deactivation is due to UE power down so that it can do detach.

Change-Id: Ie63f90f005845fcd6bfab421f193058b6e2e78d5
2011-03-31 15:46:25 -07:00
Wink Saville
11feacb348 Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE 2011-03-31 13:16:41 -07:00
Glenn Kasten
4ed59de640 am ffa670b5: Bug 4167061
* commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894':
  Bug 4167061
2011-03-31 11:06:41 -07:00
Wink Saville
b136aa6c9a Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE 2011-03-31 10:23:11 -07:00
Glenn Kasten
ffa670b5b0 Bug 4167061
Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
2011-03-30 18:50:41 -07:00
Dianne Hackborn
a5b308e74c am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
* commit '53df89c74fb3a31a874ad575467c5d498a53646e':
  Expand screen documentation with explicit screen size dimensions.
2011-03-30 17:50:29 -07:00
Dianne Hackborn
53df89c74f Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 2011-03-30 17:43:17 -07:00
Dianne Hackborn
2f98f26708 Expand screen documentation with explicit screen size dimensions.
This updates the various documentation on screen sizes to discuss
the exact screen dimensions that are now associated with each size.
In addition, the screen sizes vs. densities table is updated to
include a number of additional representative screens.

Change-Id: Id07491148b1857e0265cef7139e564e190f38e03
2011-03-30 16:19:02 -07:00
Justin Ho
0b251aec43 am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
* commit '01b13a11e6492ebba66c496eaefdb008f2638870':
  Replacing browser playback controls for inactive videos Bug: 4136024
2011-03-30 15:59:19 -07:00
Justin Ho
01b13a11e6 Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 2011-03-30 15:57:42 -07:00
Trevor Johns
f829305f87 am e1cc88cc: am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService.
* commit 'e1cc88ccaf5fec2671c2f50bd850e7c56b03f286':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
2011-03-30 15:29:10 -07:00
Trevor Johns
e1cc88ccaf am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService.
* commit 'eb344a69fa728c010425fb1e18fc8f5774693986':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
2011-03-30 15:26:38 -07:00
Andreas Huber
06ac039962 am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
* commit 'b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b':
  When http streaming and Content-Length is unknown, make sure to return all
2011-03-30 15:19:46 -07:00
Andreas Huber
b676b73e39 Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 2011-03-30 15:16:36 -07:00
Andreas Huber
45ad57aab3 When http streaming and Content-Length is unknown, make sure to return all
data that we successfully received before signalling the error.

Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce
related-to-bug: 4190765
2011-03-30 15:00:34 -07:00
Eric Fischer
acf48255aa am 91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '91c482b2351db1221308fe90800b8ef8bddbed90':
  Import revised translations.  DO NOT MERGE
2011-03-30 14:42:30 -07:00
Eric Fischer
91c482b235 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-30 14:39:25 -07:00
Eric Fischer
446b247834 Import revised translations. DO NOT MERGE
Change-Id: Ic87b36ba6dcc6cea8ef713b47c334156a7dd0f65
2011-03-30 14:25:28 -07:00
Justin Ho
c7de6dd483 Replacing browser playback controls for inactive videos
Bug: 4136024

Change-Id: I1c48023005d711d5080fa17a695f709705e362b6
2011-03-30 14:21:28 -07:00
Trevor Johns
eb344a69fa Fixing line in Market IAB docs that explains how to bind to the
MarketService.

We use the IMarketBillingService, which is incorrect. It should be
"com.android.vending.billing.MarketBillingService.BIND".
2011-03-30 14:19:40 -07:00
Ramesh Sudini
e80d327676 Telephony: Cleanup of SIM handling in CdmaLteSST.
Change-Id: I41ae595bae035b2dfd2e32e4d54a754c27962567
2011-03-30 12:15:38 -07:00
Ramesh Sudini
afaf4c8fa9 Telephony: Update LTE RILConstants to match ril.h
Change-Id: I3abc88a98f3ce152df1d8de27da1132c05ee136f
2011-03-30 12:14:48 -07:00
Scott Main
5c35c05909 am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
* commit '5b68c655a1f56dce1ffd6f175e991dd542d415cf':
  docs: update makefile to show javadocs diffs for api level 12
2011-03-30 12:12:15 -07:00
Scott Main
5b68c655a1 Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 2011-03-30 12:10:13 -07:00
Andreas Huber
8de5df4392 am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
* commit 'ebf6a72b3536646ade389c7afa828e316eb93c21':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
2011-03-30 09:27:14 -07:00
Andreas Huber
ebf6a72b35 Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 2011-03-30 09:12:04 -07:00
Mike Lockwood
cd90d1f117 am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
* commit '44e4b99f823a6d6131f94e67389b705d3b124c0a':
  UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:16:17 -07:00
Mike Lockwood
44e4b99f82 Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 2011-03-29 22:14:27 -07:00