OSDN Git Service
Andreas Huber [Wed, 16 Feb 2011 21:20:02 +0000 (13:20 -0800)]
DO NOT MERGE: Respond to RTSP server->client requests.
Even if it's just to tell them that we don't support any (this is optional).
Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655
related-to-bug:
3353752
Robert Greenwalt [Wed, 16 Feb 2011 18:44:26 +0000 (10:44 -0800)]
Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
Alon Albert [Wed, 16 Feb 2011 18:20:13 +0000 (10:20 -0800)]
Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
Alon Albert [Tue, 15 Feb 2011 23:07:59 +0000 (15:07 -0800)]
DO NOT MERGE - Clear backoffs on reconnect
Slightly modified backport from HC
Bug:
3460736
Change-Id: I155dfd34bb7abb76a10b5b58fe9a32af2449d4f1
daniel_tomas [Thu, 6 Jan 2011 23:44:10 +0000 (15:44 -0800)]
New API added in NfcAdapter to enable/disable SE card emulation
Change-Id: Ia0c123873ba9265b45e847d1a30c1300de3c1346
Nick Pelly [Tue, 15 Feb 2011 21:34:38 +0000 (13:34 -0800)]
Minor doc update.
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
Andreas Huber [Wed, 16 Feb 2011 16:50:37 +0000 (08:50 -0800)]
Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
Robert Ly [Wed, 16 Feb 2011 01:44:56 +0000 (17:44 -0800)]
Merge "Adding package summary for nfc.tech package" into gingerbread
Robert Ly [Tue, 15 Feb 2011 21:10:07 +0000 (13:10 -0800)]
Adding package summary for nfc.tech package
Change-Id: Ibbf55c21dcaf48b4eb369e78c54fb1023abb3cb3
Andreas Huber [Tue, 15 Feb 2011 21:32:42 +0000 (13:32 -0800)]
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
and continue even if we were unable to poke a hole into the firewall.
Change-Id: I5757a2521b8d81a42d03cca379179ce2c9ee46e7
related-to-bug:
3457201
John Wang [Tue, 15 Feb 2011 20:34:37 +0000 (12:34 -0800)]
Merge "Only decode EXT1 tag when it is available." into gingerbread
Andreas Huber [Tue, 15 Feb 2011 18:39:48 +0000 (10:39 -0800)]
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
In this particular case these RTSP servers were implemented as local services,
retransmitting live streams via a local RTSP server instance.
They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session
description, wrong case of the format description, relative base URLs...
Change-Id: I502a04a7e1d690fd461b7ecf0b56c6a6c2ac1325
related-to-bug:
3452103
John Wang [Tue, 15 Feb 2011 01:36:42 +0000 (17:36 -0800)]
Only decode EXT1 tag when it is available.
Normally ADN record is stored in two tags, EFADN_TAG and EFEXT1_TAG. But if the EFEXT1_TAG is not set in EF_PBR entry,
it shouldn't be decoded otherwise it causes NullPointerException in readAdnFileAndWait().
bug:
3376954
Change-Id: I744cf5cb8662c75be1e7c6219fa92c67bdda82f2
Scott Main [Mon, 14 Feb 2011 16:56:06 +0000 (08:56 -0800)]
fix md5sum for windows installer
Change-Id: I85a3f5c9c39b0bb5d9c8654c8b7702e7bd0235f2
Robert Greenwalt [Sat, 12 Feb 2011 01:32:58 +0000 (17:32 -0800)]
DO NOT MERGE - backport of l92a02b31 from master
Fix handling of multiple possible default networks.
bug:
3328196
Change-Id: I994f1621ff82de454192945a9cae961e1710d537
Robert Ly [Thu, 10 Feb 2011 21:42:13 +0000 (13:42 -0800)]
Doc change: nfc dev guide
Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
Gilles Debunne [Wed, 9 Feb 2011 22:17:22 +0000 (14:17 -0800)]
Text selection is broken.
Bug
3439569
Lazy initialization code was not back-ported.
Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
Mathias Agopian [Wed, 9 Feb 2011 21:06:00 +0000 (13:06 -0800)]
Merge "fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
Scott Main [Wed, 9 Feb 2011 18:17:08 +0000 (10:17 -0800)]
add 2.3.3 announcement to site home page
Change-Id: I4323a1a30fad8a67cce55baba9f7a89c4bdd4494
Jeff Hamilton [Wed, 9 Feb 2011 08:34:22 +0000 (00:34 -0800)]
Merge "More documentation updates for NFC." into gingerbread
Jeff Hamilton [Wed, 9 Feb 2011 08:26:47 +0000 (17:26 +0900)]
More documentation updates for NFC.
Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
Dirk Dougherty [Wed, 9 Feb 2011 07:24:22 +0000 (23:24 -0800)]
Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
Nick Pelly [Mon, 7 Feb 2011 08:04:21 +0000 (17:04 +0900)]
Document NFC permissions.
Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
Dirk Dougherty [Tue, 8 Feb 2011 01:32:11 +0000 (17:32 -0800)]
Doc change: Add version notes for Android 2.3.3.
Change-Id: I32dffaee15079a3dffb30dcdff6587be03378fc5
Jeff Hamilton [Wed, 9 Feb 2011 03:30:47 +0000 (19:30 -0800)]
Merge "Improve the docs a bit for foreground dispatch." into gingerbread
Jeff Hamilton [Wed, 9 Feb 2011 03:27:01 +0000 (12:27 +0900)]
Improve the docs a bit for foreground dispatch.
Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
Eric Fischer [Tue, 8 Feb 2011 18:00:24 +0000 (10:00 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Scott Main [Tue, 8 Feb 2011 17:37:47 +0000 (09:37 -0800)]
rename SIP doc title
Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8
Scott Main [Tue, 8 Feb 2011 02:35:49 +0000 (18:35 -0800)]
docs: move the SIP guide into guide/network/
Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f
Katie McCormick [Sat, 5 Feb 2011 01:41:07 +0000 (17:41 -0800)]
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2
Doc change: Adding new docs for SIP API
Change-Id: I62bedbcaab3900edcc49d67b59279c5025977a95
Dirk Dougherty [Tue, 8 Feb 2011 01:21:56 +0000 (17:21 -0800)]
Merge "Doc change: Add diff report for api 10." into gingerbread
Eric Fischer [Mon, 7 Feb 2011 21:17:26 +0000 (13:17 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I9fe35888f8aa02c559949ad8395e8e4f4dffb669
Gilles Debunne [Sat, 5 Feb 2011 00:50:01 +0000 (16:50 -0800)]
Fix for multiple merge problem.
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
Gilles Debunne [Tue, 12 Oct 2010 00:12:39 +0000 (17:12 -0700)]
Double tap triggers text selection in a TextView. DO NOT MERGE
This is a convenient way to switch to selection mode without the
context menu. Context menu is still available and offerts Select Input method option.
Browser overloads touch events and this feature is not available in Browser which
limits the conflict with double tap zoom in browser.
Change-Id: I286504cf03733d5c2fb9bc01765f713d14bbd2f4
Gilles Debunne [Fri, 4 Feb 2011 23:46:15 +0000 (15:46 -0800)]
Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:46:11 +0000 (15:46 -0800)]
Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:46:06 +0000 (15:46 -0800)]
Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
Joe Onorato [Fri, 4 Feb 2011 02:05:20 +0000 (18:05 -0800)]
Merge "Managed dialogs should run on the same thread as their activity." into gingerbread
Joe Onorato [Fri, 4 Feb 2011 01:44:47 +0000 (17:44 -0800)]
Managed dialogs should run on the same thread as their activity.
Bug:
3418998
Change-Id: I9b1cf73f9d6f8a5594f405546fcaa3cfd6f03c45
Mathias Agopian [Thu, 3 Feb 2011 22:52:47 +0000 (14:52 -0800)]
fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep
when an app dies, make sure to disable all sensors that process
is connected to, regardless of wether this was the LAST connection
to this sensor.
Change-Id: I400fa1c1389b2bd05a1d19abea8a35ec5bcba273
Nick Pelly [Fri, 4 Feb 2011 00:27:51 +0000 (16:27 -0800)]
Merge "Fix docs type that broke build." into gingerbread
Nick Pelly [Fri, 4 Feb 2011 00:06:53 +0000 (16:06 -0800)]
Fix docs type that broke build.
Change-Id: I5b5a2fc5baf95ace74bf90ff2c750ba890054d64
Scott Main [Thu, 3 Feb 2011 23:24:40 +0000 (15:24 -0800)]
Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread
Nick Pelly [Thu, 3 Feb 2011 23:23:17 +0000 (15:23 -0800)]
Merge "NFC documentation overhaul." into gingerbread
Scott Main [Thu, 3 Feb 2011 02:20:19 +0000 (18:20 -0800)]
cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91
update dashboard
Change-Id: Iea5d441e417fc1a407c623ec2faf0cff90059592
Nick Pelly [Thu, 3 Feb 2011 06:37:40 +0000 (22:37 -0800)]
NFC documentation overhaul.
Change-Id: I45dca95a24b2d0327e080436fbcc7b1dad79de02
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:05:14 +0000 (14:05 -0800)]
Merge from open-source gingerbread
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:02:59 +0000 (14:02 -0800)]
Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread
Sang-Jun Park [Thu, 3 Feb 2011 21:24:25 +0000 (06:24 +0900)]
Fix the Multi-page SMS sending error to several receipents
Change-Id: Iefde94b638413e3c1761f17c3065b20a044e5958
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:41:49 +0000 (12:41 -0800)]
Merge from open-source gingerbread
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:17:47 +0000 (12:17 -0800)]
Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
Scott Main [Thu, 3 Feb 2011 01:43:24 +0000 (17:43 -0800)]
fix broken links, update the dev guide intro, and update sitemap file
Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a
Dirk Dougherty [Thu, 3 Feb 2011 01:32:00 +0000 (17:32 -0800)]
Doc change: Add diff report for api 10.
Change-Id: Id0f3ce36463c2aba6be9e162aa513532f7f1d52d
Scott Main [Thu, 3 Feb 2011 00:38:25 +0000 (16:38 -0800)]
Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
Scott Main [Fri, 28 Jan 2011 17:34:27 +0000 (09:34 -0800)]
cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2
update OEM driver list with new fujitsu and kyocera
Change-Id: Ice11a179fe6a4eb220509fc784ac6f6af5a2fa5e
Scott Main [Wed, 2 Feb 2011 23:57:03 +0000 (15:57 -0800)]
wholesale manual merge of docs from gingerbread-docs to gingerbread
includes misc changes that occured for preview sdk and shortly after
plus misc older stuff that got missed
Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6
Bill Gruber [Wed, 2 Feb 2011 07:01:16 +0000 (23:01 -0800)]
cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83
Initial posting of in-app billing docs
Change-Id: I26adb5480e556d8f914a3443f1b75c220742245d
Scott Main [Wed, 2 Feb 2011 19:24:56 +0000 (11:24 -0800)]
cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821
add notice about large screen devices and the "mobile" string in user agent
Change-Id: I2e6a3f2c4fced2cf06bb996c1135c042682cdf8f
Scott Main [Wed, 2 Feb 2011 23:08:22 +0000 (15:08 -0800)]
cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680
fix market link on homepage
Change-Id: I1d617c9737e6a3293372bbe70aff0cfa88dfba8c
Irfan Sheriff [Wed, 2 Feb 2011 20:34:08 +0000 (12:34 -0800)]
two digit number handling in croatia and serbia
If users dial 92-96, dial them normally and not treat
as USSD
Change-Id: If3b6cb37b7ec0ff99d76cb10cba53368094a0b5d
Signed-off-by: sj2202.park@samsung.com
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:45:19 +0000 (09:45 -0800)]
Merge from open-source gingerbread
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:44:16 +0000 (09:44 -0800)]
Merge "fix for supporting 3 digits MNC code" into gingerbread
Sang-Jun Park [Wed, 2 Feb 2011 10:12:31 +0000 (19:12 +0900)]
fix for supporting 3 digits MNC code
Default Android MNC value has a 2 digit but it should be supported a 3 digit
MNC in India. (should be supported both 2 and 3 digits MNC)
Change-Id: I69373d196b29bccd06653841f24cbfe3886834fb
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
Eric Laurent [Tue, 25 Jan 2011 19:51:46 +0000 (11:51 -0800)]
Allow TTY mode for GSM Phones
TTY mode should not be restricted to CDMA phones as some GSM carriers
support it.
TTY support is enabled by overlaying the tty_enabled boolean property
in packages/apps/Phones/res/values/config.xml
Also corrected wrong comments on TTY methods.
Change-Id: I48dbc2be51c3dcdaedc1838b85134edc7012be3c
Sang-Jun Park [Mon, 31 Jan 2011 09:44:37 +0000 (18:44 +0900)]
Fix delivery report error with PENDING status in SMS
1. According to TS 23.040, TP-Status values is changed properly.
2. When processing Status Report, it should be checked whether tpStatus is PENDING or FAILED.
Change-Id: I91c315cfb363f3e4b936c6b6b1a01083687a580f
Nick Pelly [Tue, 1 Feb 2011 17:39:31 +0000 (09:39 -0800)]
Merge "Final final final Gingerbread MR API changes." into gingerbread
Nick Pelly [Tue, 1 Feb 2011 07:27:37 +0000 (23:27 -0800)]
Final final final Gingerbread MR API changes.
This is it. I promise.
ACTION_TECHNOLOGY_DISCOVERED -> ACTION_TECH_DISCOVERED
This was missed in our technology->tech rename.
Hide TagTechnology.reconnect()
This is used to reset any per-connection state in a tag, by reconnecting
to it. The first problem is that it belongs on Tag, not TagTechnology. The
second problem is that it may become redundant once we add Tag.rediscover()
which will also reconnect to the tag, and will also return a new Tag with
newly created technologies enumerated. And the third and most significant
problem is that you can already achieve the same result by just calling
close() followed by connect().
Hide Tag.createMockTag()
This API cannot be used reliably. First it requires using int[] for the
technology list, but those int constants are now hidden. Second it requires
knowledge of the extras parcel used to fill technology specific data - also
not public.
Introduce TagTechnology.isConnected()
Every child class already impelmented this, and given that connect() and
close() are defined on the interface, then isConnected() should be there
too.
Modify Ndef.getType to return a string (not int)
Allows more flexibility in adding new NDEF types. Current public strings are
org.nfcforum.ndef.type1
org.nfcforum.ndef.type2
org.nfcforum.ndef.type3
org.nfcforum.ndef.type4
com.nxp.ndef.mifareclassic
Add NdefFormatable.formatReadOnly()
This allows you to make the tag read-only at the same time as performing
format and write. It is important because we currently don't have any
public API to re-enumerate a tag technology list after making a tag
NDEF compatible, so you can't perform the format as a seperate step
without physically removing the tag from field and returning it.
Modify Readonly -> ReadOnly
Make Tag class final
Change-Id: Icf306aeb37b936ca3007e4868e99b6baceac4aff
Dianne Hackborn [Tue, 1 Feb 2011 01:41:54 +0000 (17:41 -0800)]
Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
Kenny Root [Tue, 1 Feb 2011 00:25:25 +0000 (16:25 -0800)]
Do not check features in PackageManagerService DO NOT MERGE
PackageManagerService shouldn't check features that a package declares
that it uses because this will cause problems in the future when we add
more features that older phones didn't explicitly declare. We must rely
on markets to know about phones and filter them for us to avoid this
situation.
Bug:
3409434
Change-Id: I0d51b2de33d8110edc6824af4b5b8c901f96077f
Eric Fischer [Tue, 1 Feb 2011 00:08:52 +0000 (16:08 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Dianne Hackborn [Mon, 31 Jan 2011 20:34:56 +0000 (12:34 -0800)]
DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
The "resizeable" attribute of supports-screens was never well documented,
so many apps don't set it. Assuming that if they are explicitly saying
they support large or xlarge screens then they are also implying that they
are resizeable.
Change-Id: Ibce45539d8910dfddb4f548da5464b31ac4a3a89
Eric Fischer [Mon, 31 Jan 2011 20:17:36 +0000 (12:17 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I07d18c234d74184a6bc83894a3e874ce1ae782da
Jeff Hamilton [Mon, 31 Jan 2011 17:46:29 +0000 (11:46 -0600)]
Commit the final API for level 10.
Change-Id: I56140f79ff599c1a9d03c0f53d700df402234bf1
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:29:52 +0000 (15:29 -0800)]
Merge from open-source gingerbread
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:17:33 +0000 (15:17 -0800)]
Merge "fix failing thread object run" into gingerbread
Dianne Hackborn [Sun, 30 Jan 2011 06:20:05 +0000 (22:20 -0800)]
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
Dianne Hackborn [Sat, 29 Jan 2011 21:22:02 +0000 (13:22 -0800)]
DO NOT MERGE: Fix screen size compatibility mode.
Cherry-picked from HC.
Change-Id: Icce2a64f187a56deefcddc3d9b22fa94effce431
Jean-Baptiste Queru [Sat, 29 Jan 2011 20:53:52 +0000 (12:53 -0800)]
Tweak to make merges easier
Bug:
3364311
Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
Robert Greenwalt [Sat, 29 Jan 2011 14:38:35 +0000 (06:38 -0800)]
Merge "Add some network types that OEM's are asking for." into gingerbread
Robert Greenwalt [Fri, 28 Jan 2011 22:48:37 +0000 (14:48 -0800)]
Add some network types that OEM's are asking for.
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values. Will mark them unhidden in a future sdk release.
bug:
3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
Eric Fischer [Fri, 28 Jan 2011 22:10:43 +0000 (14:10 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 28 Jan 2011 21:16:00 +0000 (13:16 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Id8afb303d2ecfc6270d1af1abd189c0ef0bf2314
Dirk Dougherty [Fri, 28 Jan 2011 19:57:42 +0000 (11:57 -0800)]
Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
Andreas Huber [Fri, 28 Jan 2011 17:19:12 +0000 (09:19 -0800)]
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Change-Id: If5a00f1e29dbc12956e1fb000dac859706d19791
related-to-bug:
3217210
Eric Laurent [Fri, 28 Jan 2011 02:37:04 +0000 (18:37 -0800)]
Merge "Fix issue
2988031." into gingerbread
Jim Miller [Fri, 28 Jan 2011 02:22:14 +0000 (18:22 -0800)]
Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
Jim Miller [Wed, 26 Jan 2011 01:46:47 +0000 (17:46 -0800)]
Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Some devices that use LiPo batteries do not charge them to 100%
as a safety margin and to preserve battery longevity. This change
allows KeyguardUpdateMonitor to determine when the battery state should be
reported as "Charged", provided the device sets BATTERY_STATUS_FULL in
that case.
Change-Id: Iac6cb78e24f9a696017459cc773c38ef7fe7779f
Dirk Dougherty [Fri, 28 Jan 2011 01:55:35 +0000 (17:55 -0800)]
Doc change: Add time-lapse video to 3.0 highlights.
Change-Id: I5fb9cb76a544a502cd2f67bc1902b2c02a2a52a8
Nick Pelly [Fri, 28 Jan 2011 00:23:35 +0000 (16:23 -0800)]
Merge "API: Make close() throw an IOException." into gingerbread
Nick Pelly [Thu, 27 Jan 2011 22:47:02 +0000 (14:47 -0800)]
API: Make close() throw an IOException.
IOException on close() can be useful to indicate that in-progress transactions
were canceled.
I also audited all of our tech classes to make sure every function that needs
to throw IOException does so.
Change-Id: Iaa9c43d79d59ff85772d5c3e4b4d57a6fa8df4cf
Eric Fischer [Thu, 27 Jan 2011 22:56:29 +0000 (14:56 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Nick Pelly [Thu, 27 Jan 2011 22:07:50 +0000 (14:07 -0800)]
Fix build - javadoc.
Change-Id: I0168fb4a75f4dff88e347c0dfd1f0b39e2dba0d6
Eric Fischer [Thu, 27 Jan 2011 21:57:31 +0000 (13:57 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I1cf12c4a061a7982666176b42ac68d6dedd207ed
Scott Main [Thu, 27 Jan 2011 21:25:10 +0000 (13:25 -0800)]
Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final" into gingerbread
Nick Pelly [Thu, 27 Jan 2011 20:23:53 +0000 (12:23 -0800)]
Merge "Clean up MifareUltralight API." into gingerbread
Nick Pelly [Thu, 27 Jan 2011 18:04:04 +0000 (10:04 -0800)]
Clean up MifareUltralight API.
o Some javadoc updates
o writeBlock -> writePages (Block means something else in NFC Forum).
o validate page offset
Change-Id: Icae54db3397d57aaa451caaa86d56e8ba82507f2
Scott Main [Thu, 27 Jan 2011 19:26:29 +0000 (11:26 -0800)]
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d
revise info about emulator snapshots to indicate it's not final
Change-Id: Ica1584fce9d55deb224937e16696127718e501da
Eric Laurent [Thu, 27 Jan 2011 19:32:34 +0000 (11:32 -0800)]
Fix issue
2988031.
Limit SYSTEM stream volume when a headset is connected and music is playing.
Change-Id: Ieb44ae5bb53ffa9cd5fe8e317798eed279b78df8
Robert Greenwalt [Thu, 27 Jan 2011 18:17:33 +0000 (10:17 -0800)]
Merge "Update networktype before sending state change." into gingerbread
Dirk Dougherty [Thu, 27 Jan 2011 18:00:48 +0000 (10:00 -0800)]
Doc change: fix adt archive filename.
Change-Id: I1cf33678e52b4e85dca472763bfe53b7ecfcfb8b