OSDN Git Service
Robert Greenwalt [Thu, 7 Apr 2011 20:02:28 +0000 (13:02 -0700)]
Merge "Add external dependency API." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:44:14 +0000 (12:44 -0700)]
Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:44:04 +0000 (12:44 -0700)]
Merge "Make LinkProperties comparable." into honeycomb-LTE
John Wang [Mon, 4 Apr 2011 19:41:36 +0000 (12:41 -0700)]
Refactor onSetupConnectionCompleted.
Refactor the part of setting linkProperties based
on data call responses.
Bug:
3501569
Change-Id: I02bf0558e2f8a5924197b8c06f19673279dec815
John Wang [Mon, 4 Apr 2011 19:35:42 +0000 (12:35 -0700)]
Make LinkProperties comparable.
Add equals() and hashcode() to LinkProperties and related fields.
Bug:
3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
Robert Greenwalt [Fri, 25 Mar 2011 20:09:25 +0000 (13:09 -0700)]
Add external dependency API.
An APN will not be connected to if some external dependency is not met.
bug:
3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
Wink Saville [Thu, 7 Apr 2011 16:35:18 +0000 (09:35 -0700)]
Merge "Add a 4G icon for LTE." into honeycomb-LTE
Wink Saville [Thu, 7 Apr 2011 16:32:50 +0000 (09:32 -0700)]
Add a 4G icon for LTE.
This replaces an icon which said 3g and as such was
useful. This needs to be replaced with an official
icon but is better than the current version.
bug:
4260327
Change-Id: I59674464d510ae205020008383d60a984db2c9d0
Teng-Hui Zhu [Thu, 7 Apr 2011 16:07:52 +0000 (09:07 -0700)]
am
b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
* commit '
b25181aaccb00fee405251bf3575ce1d40badf46':
Fix the issue the video can't start to play
Teng-Hui Zhu [Thu, 7 Apr 2011 15:52:45 +0000 (08:52 -0700)]
Merge "Fix the issue the video can't start to play" into honeycomb-mr1
Teng-Hui Zhu [Thu, 7 Apr 2011 01:09:27 +0000 (18:09 -0700)]
Fix the issue the video can't start to play
In full screen mode, we shall not always rely on the auto start info.
If the auto start is false, it will prevent the video from playing.
The auto start should always happen inline mode when prepared.
If we switch into full screen mode while playing, we will also do auto start.
bug:
4260063
Change-Id: I4b13c30b1f2c219951dc8edd659e221a21c86c2b
Wink Saville [Thu, 7 Apr 2011 00:52:22 +0000 (17:52 -0700)]
Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
Roman Nurik [Thu, 7 Apr 2011 00:21:21 +0000 (17:21 -0700)]
am
b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
* commit '
b17cc8a83fd819efcb79d78d005e16b3f04d08df':
Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.
Roman Nurik [Thu, 7 Apr 2011 00:18:47 +0000 (17:18 -0700)]
Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
Wink Saville [Wed, 6 Apr 2011 23:55:39 +0000 (16:55 -0700)]
Add getCdmaSubscriptionSource to CommandsInterface.
This was accidentally not added previously and it had an
extra parameter.
Change-Id: Ic48ab9e637a5343b63d3e03377acd2679b0f77e0
Roman Nurik [Wed, 6 Apr 2011 21:52:00 +0000 (14:52 -0700)]
Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.
Change-Id: I2a1a4b31fe546eddfb8d6e8b8ab5f4a3900734d4
Eric Fischer [Wed, 6 Apr 2011 21:12:31 +0000 (14:12 -0700)]
am
9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
9f2f650f26941a7cd4931afc66f39918e7c2817c':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 21:09:32 +0000 (14:09 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Bill Gruber [Wed, 6 Apr 2011 20:58:34 +0000 (13:58 -0700)]
am
3bd37307: am
48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '
3bd373079ed2599e5e07aa1cf702c7f8386765c3':
IAB docs: fixes line break issues
Eric Fischer [Wed, 6 Apr 2011 20:47:57 +0000 (13:47 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I30c20fa78fc821c943d947a058f482e87d70dbd6
Bill Gruber [Wed, 6 Apr 2011 20:20:27 +0000 (13:20 -0700)]
am
48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '
48a1b52bc736acfe9c4723abf6db7c8befc5e43b':
IAB docs: fixes line break issues
Bill Gruber [Wed, 6 Apr 2011 19:52:41 +0000 (12:52 -0700)]
Merge "IAB docs: fixes line break issues" into honeycomb
Xavier Ducrohet [Wed, 6 Apr 2011 19:41:17 +0000 (12:41 -0700)]
am
c5aeac7f: LayoutLib: Fix issue with rendering mode.
* commit '
c5aeac7f157e3cb9e29ab8c126f74e26493501f5':
LayoutLib: Fix issue with rendering mode.
Xavier Ducrohet [Wed, 6 Apr 2011 03:19:17 +0000 (20:19 -0700)]
LayoutLib: Fix issue with rendering mode.
When the layout content is embedded inside a decor layout
to emulate system bar (top or bottom) and title bar (or action bar)
then the code computing the full required size based on the RenderingMode
would fail because the decor layout would prevents the content layout to
take as much room as possible.
There is also an issue with the way we know render dialogs as the
dialogs usually as a frame with some padding and the previous measurements
would not take into account the dialog padding when increasing the
screen size.
This fix makes the code measure the size of the content layout in the
normal rendering, and then separately from the root layout with the proper
MeasureSpec to let the content grown. The difference in size is then added
to the screen size.
Bug: http://code.google.com/p/android/issues/detail?id=15892
Change-Id: Ibb9ca2a67c6c450d10d9f9a8050536e094650f8b
Bill Gruber [Tue, 5 Apr 2011 22:54:21 +0000 (15:54 -0700)]
IAB docs: fixes line break issues
Change-Id: Iad795520a4544638bd26c354b4a8718afb28646a
Scott Main [Tue, 5 Apr 2011 21:28:23 +0000 (14:28 -0700)]
am
e4cafabb: am
a90eb8fe: docs: fix the TOC in a few docs
* commit '
e4cafabbcc4b69479217d1a167926b79c37e5ded':
docs: fix the TOC in a few docs
Scott Main [Tue, 5 Apr 2011 21:21:36 +0000 (14:21 -0700)]
am
a90eb8fe: docs: fix the TOC in a few docs
* commit '
a90eb8fec1c67177b614b945bcc4a4b14aaabaff':
docs: fix the TOC in a few docs
Scott Main [Tue, 5 Apr 2011 21:05:03 +0000 (14:05 -0700)]
docs: fix the TOC in a few docs
Change-Id: Iff2b91701ba39e17cc0d88804f3eb3f658e13c27
Adam Powell [Tue, 5 Apr 2011 18:14:27 +0000 (11:14 -0700)]
am
030b38ff: Merge "Fix bug
4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
* commit '
030b38ffc21ef3962b31d5bac5170531293b6046':
Fix bug
4207704 - Gestures can be lost when Flash is enabled
Adam Powell [Tue, 5 Apr 2011 17:45:25 +0000 (10:45 -0700)]
Merge "Fix bug
4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
Adam Powell [Mon, 4 Apr 2011 21:27:12 +0000 (14:27 -0700)]
Fix bug
4207704 - Gestures can be lost when Flash is enabled
Pre-queue WebView touch events as we send them to webkit so that we
can run them through WebView later if webkit or hosted plugins go out
to lunch.
Change-Id: Id4e9f56beeb0c1d55e77233423844b15f6f00aef
Bill Gruber [Tue, 5 Apr 2011 00:31:23 +0000 (17:31 -0700)]
am
63ac0379: am
d36bc32e: Merge "SDK doc updates" into honeycomb
* commit '
63ac03794df9ca383416c3a782812b9a9c03456d':
SDK doc updates
Bill Gruber [Tue, 5 Apr 2011 00:21:25 +0000 (17:21 -0700)]
am
d36bc32e: Merge "SDK doc updates" into honeycomb
* commit '
d36bc32ea9a109596308a0516b3e0898c82cebc5':
SDK doc updates
Bill Gruber [Tue, 5 Apr 2011 00:15:08 +0000 (17:15 -0700)]
Merge "SDK doc updates" into honeycomb
Bill Gruber [Mon, 4 Apr 2011 19:11:49 +0000 (12:11 -0700)]
SDK doc updates
Change-Id: Iaf24235cf40a4e22a4c8ee787f0b18ce8f5cb61e
Roman Nurik [Mon, 4 Apr 2011 20:44:23 +0000 (13:44 -0700)]
am
5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1
* commit '
5a41a8a0fda21d5332f1355832550fcfffbb9975':
Document support for .TS video containers.
Roman Nurik [Mon, 4 Apr 2011 20:41:11 +0000 (13:41 -0700)]
Merge "Document support for .TS video containers." into honeycomb-mr1
Roman Nurik [Mon, 4 Apr 2011 18:27:21 +0000 (11:27 -0700)]
Document support for .TS video containers.
Change-Id: I99a2da97ce2bbb79beb4a7b5847ad3de90a6b7af
Robert Ly [Mon, 4 Apr 2011 18:41:02 +0000 (11:41 -0700)]
am
3f39f653: Adding package description for android.hardware.usb
* commit '
3f39f653a90f9727d13be1e9908f0afb8fe66d6e':
Adding package description for android.hardware.usb
Robert Ly [Mon, 4 Apr 2011 17:50:19 +0000 (10:50 -0700)]
Adding package description for android.hardware.usb
Change-Id: I4d243424c6747531a1ac6ab2230c2af73bad4fed
Dirk Dougherty [Sun, 3 Apr 2011 21:04:20 +0000 (14:04 -0700)]
am
f9cdf7fe: Doc change: add diff report for API 12.
* commit '
f9cdf7feb47aa142e11862f5694c0a29ac013a51':
Doc change: add diff report for API 12.
Dirk Dougherty [Sun, 3 Apr 2011 20:50:48 +0000 (13:50 -0700)]
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
Dirk Dougherty [Wed, 23 Mar 2011 18:45:38 +0000 (11:45 -0700)]
Doc change: add diff report for API 12.
Change-Id: I9c7367be204208384aafaa19a8243164024ed1de
Dirk Dougherty [Sun, 3 Apr 2011 20:40:48 +0000 (13:40 -0700)]
Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
Dirk Dougherty [Fri, 1 Apr 2011 22:55:28 +0000 (15:55 -0700)]
Doc change: update media formats tables with adts/aac and flac
Change-Id: Ic541f9e4ea1907453041d017d7d3608ead45ed6f
Scott Main [Sat, 2 Apr 2011 00:41:40 +0000 (17:41 -0700)]
am
90a1befa: am
27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '
90a1befa551a9e6dc8f06b7331e26e6470ab824f':
docs: update device dashboard
Scott Main [Sat, 2 Apr 2011 00:39:05 +0000 (17:39 -0700)]
am
27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '
27690ebabc915091956f0331023c9d074177271d':
docs: update device dashboard
Scott Main [Sat, 2 Apr 2011 00:36:42 +0000 (17:36 -0700)]
Merge "docs: update device dashboard" into honeycomb
Wink Saville [Fri, 1 Apr 2011 23:34:51 +0000 (16:34 -0700)]
Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE
Scott Main [Fri, 1 Apr 2011 23:22:35 +0000 (16:22 -0700)]
am
6261861a: am
cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '
6261861a94448e4fbc26e313ce1410a184a10914':
docs: update homepage announcement for Google IO
Scott Main [Fri, 1 Apr 2011 23:19:30 +0000 (16:19 -0700)]
am
cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '
cb719a48a2f2e9bc47b317f75ebb8320f6ce877c':
docs: update homepage announcement for Google IO
Scott Main [Fri, 1 Apr 2011 23:17:40 +0000 (16:17 -0700)]
Merge "docs: update homepage announcement for Google IO" into honeycomb
Scott Main [Fri, 1 Apr 2011 21:38:36 +0000 (14:38 -0700)]
docs: update device dashboard
Change-Id: I0c94a8fabf85c5acb6195aae9f87d3d6ca5dadb8
Scott Main [Thu, 31 Mar 2011 19:01:48 +0000 (12:01 -0700)]
docs: update homepage announcement for Google IO
Change-Id: I0421f1ae8731fdeb96145ebd82df1298389a5af5
Wink Saville [Fri, 1 Apr 2011 21:45:49 +0000 (14:45 -0700)]
Data Retry fix after failure due to permanent causes.
Change-Id: I86d5a2dc9394dac93c4350159f4d99cf19aedec9
Mike Lockwood [Fri, 1 Apr 2011 18:34:39 +0000 (11:34 -0700)]
am
11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
* commit '
11dd5ae97b1cd5889bb66862fd12718da62a9c75':
Improve Javadoc for USB Manager and MTP/PTP support.
Mike Lockwood [Fri, 1 Apr 2011 18:00:08 +0000 (14:00 -0400)]
Improve Javadoc for USB Manager and MTP/PTP support.
Bug:
4091519
Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
Wink Saville [Fri, 1 Apr 2011 17:28:22 +0000 (10:28 -0700)]
Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
Wink Saville [Fri, 1 Apr 2011 17:11:09 +0000 (10:11 -0700)]
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
Wink Saville [Fri, 1 Apr 2011 00:57:25 +0000 (17:57 -0700)]
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
Scott Main [Fri, 1 Apr 2011 02:10:56 +0000 (19:10 -0700)]
am
1ccdc235: am
e979332f: docs: fix markup bugs
* commit '
1ccdc235716715e7c6f13cab42e4195454e04615':
docs: fix markup bugs
Scott Main [Fri, 1 Apr 2011 02:06:33 +0000 (19:06 -0700)]
am
e979332f: docs: fix markup bugs
* commit '
e979332f38e677db4c9d89f695352ed41052553d':
docs: fix markup bugs
Scott Main [Fri, 1 Apr 2011 00:08:24 +0000 (17:08 -0700)]
docs: fix markup bugs
Change-Id: I230d16e6dc0fe166a61a30a92b2666e0856298a0
Wink Saville [Thu, 31 Mar 2011 22:51:07 +0000 (15:51 -0700)]
Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
Wink Saville [Thu, 31 Mar 2011 22:46:25 +0000 (15:46 -0700)]
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
Wink Saville [Thu, 31 Mar 2011 20:16:41 +0000 (13:16 -0700)]
Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
Glenn Kasten [Thu, 31 Mar 2011 18:06:41 +0000 (11:06 -0700)]
Wink Saville [Thu, 31 Mar 2011 17:23:11 +0000 (10:23 -0700)]
Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE
Glenn Kasten [Thu, 31 Mar 2011 01:50:41 +0000 (18:50 -0700)]
Bug
4167061
Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
Dianne Hackborn [Thu, 31 Mar 2011 00:50:29 +0000 (17:50 -0700)]
am
53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
* commit '
53df89c74fb3a31a874ad575467c5d498a53646e':
Expand screen documentation with explicit screen size dimensions.
Dianne Hackborn [Thu, 31 Mar 2011 00:43:17 +0000 (17:43 -0700)]
Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
Dianne Hackborn [Tue, 29 Mar 2011 01:28:35 +0000 (18:28 -0700)]
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
Justin Ho [Wed, 30 Mar 2011 22:59:19 +0000 (15:59 -0700)]
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
Justin Ho [Wed, 30 Mar 2011 22:57:42 +0000 (15:57 -0700)]
Merge "Replacing browser playback controls for inactive videos Bug:
4136024" into honeycomb-mr1
Trevor Johns [Wed, 30 Mar 2011 22:29:10 +0000 (15:29 -0700)]
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.
Trevor Johns [Wed, 30 Mar 2011 22:26:38 +0000 (15:26 -0700)]
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.
Andreas Huber [Wed, 30 Mar 2011 22:19:46 +0000 (15:19 -0700)]
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
Andreas Huber [Wed, 30 Mar 2011 22:16:36 +0000 (15:16 -0700)]
Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
Andreas Huber [Wed, 30 Mar 2011 21:45:22 +0000 (14:45 -0700)]
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
Eric Fischer [Wed, 30 Mar 2011 21:42:30 +0000 (14:42 -0700)]
am
91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
91c482b2351db1221308fe90800b8ef8bddbed90':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 30 Mar 2011 21:39:25 +0000 (14:39 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Wed, 30 Mar 2011 21:25:28 +0000 (14:25 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic87b36ba6dcc6cea8ef713b47c334156a7dd0f65
Justin Ho [Wed, 30 Mar 2011 21:21:28 +0000 (14:21 -0700)]
Replacing browser playback controls for inactive videos
Bug:
4136024
Change-Id: I1c48023005d711d5080fa17a695f709705e362b6
Trevor Johns [Wed, 30 Mar 2011 18:30:09 +0000 (11:30 -0700)]
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".
Ramesh Sudini [Mon, 28 Mar 2011 22:33:06 +0000 (17:33 -0500)]
Telephony: Cleanup of SIM handling in CdmaLteSST.
Change-Id: I41ae595bae035b2dfd2e32e4d54a754c27962567
Ramesh Sudini [Mon, 28 Mar 2011 19:39:13 +0000 (14:39 -0500)]
Telephony: Update LTE RILConstants to match ril.h
Change-Id: I3abc88a98f3ce152df1d8de27da1132c05ee136f
Scott Main [Wed, 30 Mar 2011 19:12:15 +0000 (12:12 -0700)]
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
Scott Main [Wed, 30 Mar 2011 19:10:13 +0000 (12:10 -0700)]
Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
Andreas Huber [Wed, 30 Mar 2011 16:27:14 +0000 (09:27 -0700)]
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.
Andreas Huber [Wed, 30 Mar 2011 16:12:04 +0000 (09:12 -0700)]
Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
Mike Lockwood [Wed, 30 Mar 2011 05:16:17 +0000 (22:16 -0700)]
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
Mike Lockwood [Wed, 30 Mar 2011 05:14:27 +0000 (22:14 -0700)]
Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
Mike Lockwood [Tue, 29 Mar 2011 23:49:42 +0000 (16:49 -0700)]
UsbService: Make USB disconnect handling for accessory mode more robust
Handle the case where the kernel driver is in accessory mode but we failed
to initialize it at the framework level. On disconnnect, check to see if the
accessory kernel driver is enabled rather than checking mCurrentAccessory.
That way we will restore the USB state in the kernel even if mCurrentAccessory
is null.
Change-Id: I35d458f21a8b21611946da523d0f53723cab0540
Signed-off-by: Mike Lockwood <lockwood@android.com>
Scott Main [Tue, 29 Mar 2011 23:25:16 +0000 (16:25 -0700)]
docs: update makefile to show javadocs diffs for api level 12
Change-Id: I1ac584db778ec14b18129785126159f692459158
Wink Saville [Tue, 29 Mar 2011 21:44:56 +0000 (14:44 -0700)]
Merge "Cleanup DataConnectionTracker" into honeycomb-LTE
Eric Fischer [Tue, 29 Mar 2011 21:15:22 +0000 (14:15 -0700)]
am
0664a4b1: am
b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
0664a4b18c3dcea82891a7389976a9d62ac7bc61':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:07:14 +0000 (14:07 -0700)]
am
b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
b42e83b1eccfd1fa1e02cd0c30edfc06e05de995':
Import revised translations. DO NOT MERGE
Amith Yamasani [Tue, 29 Mar 2011 21:06:29 +0000 (14:06 -0700)]
am
7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
* commit '
7171f5b7d16e9a0c861cc249188864385877077f':
Fix the javadoc for LocationManager.requestSingleUpdate()
Amith Yamasani [Tue, 29 Mar 2011 20:55:19 +0000 (13:55 -0700)]
Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
Eric Fischer [Tue, 29 Mar 2011 20:45:03 +0000 (13:45 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb