OSDN Git Service
Jason parks [Wed, 3 Nov 2010 02:00:12 +0000 (19:00 -0700)]
am
73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
* commit '
73eba2a6bcf39eb20d815517ed11e1a7fb7a2c39':
Return a zero length byte from toByteArray instead of null.
Jason parks [Wed, 3 Nov 2010 01:58:09 +0000 (18:58 -0700)]
Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
Jason parks [Wed, 3 Nov 2010 01:03:52 +0000 (20:03 -0500)]
Return a zero length byte from toByteArray instead of null.
Change-Id: I67b388099c72a0d2ec6b429caea8f29bf8f7a75a
Dirk Dougherty [Wed, 3 Nov 2010 00:47:20 +0000 (17:47 -0700)]
am
4e4d0d5f: am
36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
* commit '
4e4d0d5f207421b0a2ce134fe17d7c78defc9dac':
Doc change: Update uses-feature and permissions docs.
Dirk Dougherty [Wed, 3 Nov 2010 00:43:54 +0000 (17:43 -0700)]
am
36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
* commit '
36a1bcee76d35636b4050674eb98285c3a3a6c2f':
Doc change: Update uses-feature and permissions docs.
Dirk Dougherty [Wed, 3 Nov 2010 00:40:27 +0000 (17:40 -0700)]
Merge "Doc change: Update uses-feature and permissions docs." into froyo
Dirk Dougherty [Wed, 28 Jul 2010 15:19:45 +0000 (08:19 -0700)]
Doc change: Update uses-feature and permissions docs.
Change-Id: I80b45840d83e0622a7b5efeed00a3c659d80ca9b
Brad Fitzpatrick [Tue, 2 Nov 2010 22:00:06 +0000 (15:00 -0700)]
am
9df48a03: Merge "NotificationManager: droiddoc documentation improvements"
* commit '
9df48a0305818122298a86ae9949f6688814928b':
NotificationManager: droiddoc documentation improvements
Gloria Wang [Tue, 2 Nov 2010 21:59:51 +0000 (14:59 -0700)]
am
ef8a810b: Merge "Update of DRM framework"
* commit '
ef8a810b3b11d177a64111125eaa44bb76624414':
Update of DRM framework
Brad Fitzpatrick [Tue, 2 Nov 2010 21:55:21 +0000 (14:55 -0700)]
Merge "NotificationManager: droiddoc documentation improvements"
Nick Pelly [Tue, 2 Nov 2010 21:49:35 +0000 (14:49 -0700)]
am
38e561dd: Merge "Remove timeout support." into gingerbread
* commit '
38e561dd3cd72160035d8b3002fc9bbaf3071374':
Remove timeout support.
Nick Pelly [Tue, 2 Nov 2010 21:46:46 +0000 (14:46 -0700)]
Merge "Remove timeout support." into gingerbread
Gloria Wang [Tue, 2 Nov 2010 21:45:02 +0000 (14:45 -0700)]
Merge "Update of DRM framework"
Jean-Baptiste Queru [Tue, 2 Nov 2010 21:18:07 +0000 (14:18 -0700)]
am
bbd212d7: Merge "Document per-implementation behaviors of native get* methods"
* commit '
bbd212d77852be155a815a0d2ad1da0df2c0dfe1':
Document per-implementation behaviors of native get* methods
Jean-Baptiste Queru [Tue, 2 Nov 2010 21:18:02 +0000 (14:18 -0700)]
am
715f8610: Merge "Clarify documentation of Cursor get* methods."
* commit '
715f86107763ee95e7d6558dd8da390a63da63e2':
Clarify documentation of Cursor get* methods.
Nick Pelly [Tue, 2 Nov 2010 21:13:52 +0000 (16:13 -0500)]
Remove timeout support.
The implementation was guarenteed to cause deadlock when a timeout was set.
Change-Id: I59444ea784eb9057c6c4c9e9123f558b3ef5eef6
Signed-off-by: Nick Pelly <npelly@google.com>
Gloria Wang [Tue, 2 Nov 2010 21:05:13 +0000 (14:05 -0700)]
Merge "resolved conflicts for merge of
c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp
Gloria Wang [Tue, 2 Nov 2010 21:02:59 +0000 (14:02 -0700)]
resolved conflicts for merge of
c1c45a4d to gingerbread-plus-aosp
Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
Jean-Baptiste Queru [Tue, 2 Nov 2010 20:27:36 +0000 (13:27 -0700)]
Merge "Document per-implementation behaviors of native get* methods"
Joe Malin [Tue, 2 Nov 2010 20:18:47 +0000 (13:18 -0700)]
am
c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread
* commit '
c1fad4a2e39ca5d5f2dbb45a67686f3423b8fe2d':
DOC CHANGE: Add entry for monkeyrunner to tools index page.
Joe Malin [Tue, 2 Nov 2010 20:17:16 +0000 (13:17 -0700)]
Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread
Jean-Baptiste Queru [Tue, 2 Nov 2010 20:11:56 +0000 (13:11 -0700)]
Merge "Clarify documentation of Cursor get* methods."
Raphael [Tue, 2 Nov 2010 18:45:07 +0000 (11:45 -0700)]
am
46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread
* commit '
46468dde8d7f9bd42ad180c2882bff6ef98685cd':
Support for <compatible-screens><screen> in ADT.
Raphael [Tue, 2 Nov 2010 18:43:11 +0000 (11:43 -0700)]
Merge "Support for <compatible-screens><screen> in ADT." into gingerbread
Gilles Debunne [Tue, 2 Nov 2010 17:08:27 +0000 (10:08 -0700)]
am
18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbread
* commit '
18149c47bfc87c88798e6820d7153e588b374ed3':
Rescaled/updated mdpi assets added.
Gilles Debunne [Tue, 2 Nov 2010 17:05:55 +0000 (10:05 -0700)]
am
94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbread
* commit '
94da7f983cc33d10bf1560bb32ec19400437a42a':
Rescaled/updated mdpi assets added.
Gilles Debunne [Tue, 2 Nov 2010 17:05:52 +0000 (10:05 -0700)]
Merge "Rescaled/updated mdpi assets added." into gingerbread
Gilles Debunne [Tue, 2 Nov 2010 17:04:40 +0000 (10:04 -0700)]
Merge "Rescaled/updated mdpi assets added." into gingerbread
Daniel Trebbien [Sun, 31 Oct 2010 19:21:05 +0000 (12:21 -0700)]
Document per-implementation behaviors of native get* methods
Change-Id: I5d20d7796b85ce62750dd50dd79e47d76716b24c
Daniel Trebbien [Sun, 31 Oct 2010 19:19:07 +0000 (12:19 -0700)]
Clarify documentation of Cursor get* methods.
Make clear in the Javadoc comments of the `Cursor` get* methods that
implementations thereof can have implementation-defined behavior. In some cases,
these changes actually correct the documentation. For example, in the case of
`getShort` and the `SQLiteCursor` implementation thereof, non-numeric data is
*not* converted to a `short` via Short#valueOf or even in a functionally-
equivalent manner.
Change-Id: Ib2f81811a603680b52fc482eb9c0f3195447566f
Jeff Brown [Tue, 2 Nov 2010 04:02:05 +0000 (21:02 -0700)]
am
a87ea46c: Fix bugs related to cheek event suppression.
* commit '
a87ea46cb023763e0a9b0222da20b0a354f79d8d':
Fix bugs related to cheek event suppression.
Jeff Brown [Tue, 2 Nov 2010 03:35:46 +0000 (20:35 -0700)]
Fix bugs related to cheek event suppression.
Two issues:
1. First, due to an inverted conditional in the input dispatcher, we were
reporting touches as long touches and vice-versa to the power manager.
2. Power manager user activity cheek event suppression also suppresses touch
events (but not long touch or up events). As a result, if cheek event
suppression was enabled, touches would not poke the user activity timer.
However due to the above logic inversion, this actually affected long
touches. Net result, if cheek suppression was enabled in the power manager
and you held your thumb on the screen long enough, the phone would
go to sleep!
Cheek event suppression is commonly turned on when making a phone call.
Interestingly, it does not seem to get turned off afterward...
This change fixes the logic inversion and exempts touches from the cheek
suppression. The reason we do the latter is because the old behavior
was actually harmful in other ways too: a touch down would be suppressed
but not a long touch or the touch up. This would cause bizarre behavior
if you touched the screen while it was dimmed. Instead of brightening
immediately, it would brighten either when you lifted your finger or
300ms later, whichever came first.
Bug:
3154895
Change-Id: Ied9ccec6718fbe86506322ff47a4e3eb58f81834
Gloria Wang [Tue, 2 Nov 2010 03:38:51 +0000 (20:38 -0700)]
Merge "- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled."
Neal Nguyen [Tue, 2 Nov 2010 02:42:22 +0000 (19:42 -0700)]
am
5dda76a7: Adding some StorageManager integration test infrastructure and some basic tests.
* commit '
5dda76a72e8bb4630fb5fd38a42e7bceb5b9c954':
Adding some StorageManager integration test infrastructure and some basic tests.
Neal Nguyen [Mon, 11 Oct 2010 00:50:52 +0000 (17:50 -0700)]
Adding some StorageManager integration test infrastructure and some basic tests.
More interesting tests to come in the form of host-based tests.
Change-Id: Ifdedf7ef26ed9889871c902af20164df0498cf07
Neal Nguyen [Tue, 2 Nov 2010 00:41:24 +0000 (17:41 -0700)]
am
bd06f02d: Cleaning up some more flakiness in DownloadManager tests.
* commit '
bd06f02d02e07ca15e420ee9e50e35253646ba64':
Cleaning up some more flakiness in DownloadManager tests.
Joe Malin [Tue, 2 Nov 2010 00:19:40 +0000 (17:19 -0700)]
DOC CHANGE: Add entry for monkeyrunner to tools index page.
Change-Id: I6487521c3ab7cdf641242598dee6e2752f46fa7a
Gilles Debunne [Tue, 2 Nov 2010 00:18:10 +0000 (17:18 -0700)]
Rescaled/updated mdpi assets added.
Change-Id: Idce2f1a3fb66565abe2c710281dab1ec6650d0c2
Gilles Debunne [Tue, 2 Nov 2010 00:01:56 +0000 (17:01 -0700)]
Rescaled/updated mdpi assets added.
Change-Id: Ifd179b6850e04a785aef588c2f0f4fd80fc5c8fe
Neal Nguyen [Thu, 21 Oct 2010 00:43:15 +0000 (17:43 -0700)]
Cleaning up some more flakiness in DownloadManager tests.
A couple of logic fixes (synchronization, poll time), and adding a little more test
logging info.
Change-Id: I8da71f87fd1e211913f84ec517762dca81f87292
Joe Malin [Mon, 1 Nov 2010 23:30:59 +0000 (16:30 -0700)]
am
a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
* commit '
a7fda21c8298d8f316564280d702206147207005':
DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
Joe Malin [Tue, 19 Oct 2010 00:07:45 +0000 (17:07 -0700)]
DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
Change-Id: I049c5f70c47077c51fefbae32633592e80068df2
Gloria Wang [Fri, 29 Oct 2010 17:09:47 +0000 (10:09 -0700)]
- Move the business rule management down to DRM agents.
- Do not register DRM sniffer because drmserver is not enabled.
Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
Dan Bornstein [Mon, 1 Nov 2010 23:09:44 +0000 (16:09 -0700)]
am
ccb75a88: Merge "Update the API file." into gingerbread
* commit '
ccb75a882f670f8928f13a485c0c29b8b8b93af3':
Update the API file.
Dan Bornstein [Mon, 1 Nov 2010 23:08:14 +0000 (16:08 -0700)]
Merge "Update the API file." into gingerbread
Takeshi Aimi [Fri, 8 Oct 2010 14:05:49 +0000 (23:05 +0900)]
Update of DRM framework
- Overload openDecryptSession() with uri parameter
in order to accept URI of DRM content,
Following API is added,
DecryptHandle*openDecryptSession(const char* uri);.
- Unify texisting three event types of processDrmInfo()
so that caller of DRM framework does not have to handle many event types.
- Let DrmManagerService call load/unload plugins API so that
client of DRM framework does not have to manage plug-in load/unload.
- Trivial fix in DrmManagerClient.java is also incorporated.
Changes are made by Sony Corporation.
Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
Scott Main [Mon, 1 Nov 2010 23:00:43 +0000 (16:00 -0700)]
am
fea07c60: am
eda78cea: docs: update dashboard
* commit '
fea07c60963abc5caaf5a59b99936d79aa9fc1b9':
docs: update dashboard
Scott Main [Mon, 1 Nov 2010 22:57:38 +0000 (15:57 -0700)]
am
eda78cea: docs: update dashboard
* commit '
eda78ceaffb234c37b11e69602d020e4bb28ca83':
docs: update dashboard
Scott Main [Mon, 1 Nov 2010 22:10:06 +0000 (15:10 -0700)]
docs: update dashboard
Change-Id: Icf0c2076484f4aed2d3bf3fc24b751e14eeeafe1
Leon Scroggins [Mon, 1 Nov 2010 21:51:00 +0000 (14:51 -0700)]
am
3073646f: Merge "Update insertion handler for WebTextView." into gingerbread
* commit '
3073646f61dcbbfe5c9e65b8e3a1d9266c3f7276':
Update insertion handler for WebTextView.
Leon Scroggins [Mon, 1 Nov 2010 21:49:47 +0000 (14:49 -0700)]
Merge "Update insertion handler for WebTextView." into gingerbread
Dan Bornstein [Mon, 1 Nov 2010 21:08:01 +0000 (14:08 -0700)]
Update the API file.
My previous change was api-compatible, but some of the incidental data
in the API file (like parameter names) changed. It looks like there
were probably a couple other similar changes too, that hadn't
previously been propagated to the API file; all I did to generate this
change was say "make update-api".
Change-Id: I427a9ceb51212fde515df007613b8687b7228ce7
Jean-Baptiste Queru [Mon, 1 Nov 2010 20:30:49 +0000 (13:30 -0700)]
am
5b4d0e84: Merge "TabWidget orientation"
* commit '
5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630':
TabWidget orientation
Jean-Baptiste Queru [Mon, 1 Nov 2010 20:19:02 +0000 (13:19 -0700)]
Merge "TabWidget orientation"
Dianne Hackborn [Mon, 1 Nov 2010 19:49:51 +0000 (12:49 -0700)]
am
42679cea: Merge "Fix issue #
3152415: Various confusions in docs about Application" into gingerbread
* commit '
42679cea5d8bc4b235b290b97805b86c8c7cbca5':
Fix issue #
3152415: Various confusions in docs about Application
Dianne Hackborn [Mon, 1 Nov 2010 19:47:02 +0000 (12:47 -0700)]
Merge "Fix issue #
3152415: Various confusions in docs about Application" into gingerbread
Leon Scroggins [Mon, 1 Nov 2010 19:45:37 +0000 (15:45 -0400)]
Update insertion handler for WebTextView.
Bug:
3152629
Change-Id: If2a33eb5456493fb9b3b2c54fcc4f5348fe129e1
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:53:09 +0000 (10:53 -0700)]
am
b6db2d51: Merge "Bluetooth OBEX timeout problem."
* commit '
b6db2d5125511284ee0962dd85d9be0099e51b22':
Bluetooth OBEX timeout problem.
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:46:36 +0000 (10:46 -0700)]
Merge "Bluetooth OBEX timeout problem."
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:39:01 +0000 (10:39 -0700)]
am
b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (code.google.com/p/android/issues/detail?id=7907)."
* commit '
b1fa549a49fd8fa2fe67ee30d107cc2d1486645f':
Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:29:22 +0000 (10:29 -0700)]
Merge "Fixes Issue 7907 in the public bugs database (code.google.com/p/android/issues/detail?id=7907)."
Dianne Hackborn [Mon, 1 Nov 2010 16:49:37 +0000 (09:49 -0700)]
Fix issue #
3152415: Various confusions in docs about Application
Change-Id: Ie1b480ed7a47a3eb6ffff76bef0dcd7b2b845e83
Romain Guy [Sun, 31 Oct 2010 18:21:24 +0000 (11:21 -0700)]
Romain Guy [Sun, 31 Oct 2010 18:12:51 +0000 (11:12 -0700)]
Merge "fix typo"
Daniel Trebbien [Sun, 31 Oct 2010 14:42:35 +0000 (07:42 -0700)]
Fixes Issue 7907 in the public bugs database (code.google.com/p/android/issues/detail?id=7907).
The Javadoc comment for class `android.content.UriMatcher` had four issues:
1. The example calls to `addURI` should not be using a leading forward slash in
the path parameter (reported by Ester Ytterbrink).
2. The sample code to construct a `UriMatcher` was incorrect because the
`UriMatcher` constructor takes a parameter (reported by Ross Light).
3. The code example for using `match` was incorrect because it showed two
parameters being passed, when `match` only takes one (reported by
Ross Light).
4. The sample `getType` implementations were incorrect because `getType` takes
a `Uri` object, not an array of `String`s.
Change-Id: I560bff6f021c13cabf736f40ff0f47a205074291
Uwe Voelker [Sun, 31 Oct 2010 09:08:04 +0000 (10:08 +0100)]
fix typo
Change-Id: Ib36aabc68128d1b2b8c41b965a10be2ab2f4cd93
Dianne Hackborn [Sat, 30 Oct 2010 02:03:03 +0000 (19:03 -0700)]
am
70a2c15e: Final SDK API 9. DO NOT MERGE.
* commit '
70a2c15ecfd4e8cd8581699d5df8a219c7d5cdb1':
Final SDK API 9. DO NOT MERGE.
Dianne Hackborn [Wed, 27 Oct 2010 19:31:34 +0000 (12:31 -0700)]
Final SDK API 9. DO NOT MERGE.
Change-Id: I3e2fc2ebc52eecb26ac3a6bb466447f378fb5de6
Scott Main [Sat, 30 Oct 2010 00:21:07 +0000 (17:21 -0700)]
am
38fd3948: am
579db096: docs: remove another "new" tag
* commit '
38fd394815a992c8874f73389e8ca849782e5fcd':
docs: remove another "new" tag
Scott Main [Sat, 30 Oct 2010 00:16:57 +0000 (17:16 -0700)]
am
579db096: docs: remove another "new" tag
* commit '
579db096fa05bd077fadb04876ecf99e3ccd02b9':
docs: remove another "new" tag
Scott Main [Sat, 30 Oct 2010 00:12:37 +0000 (17:12 -0700)]
docs: remove another "new" tag
Change-Id: I54d56f2090dee856741ea23028b51c85e526c46b
Neal Nguyen [Sat, 30 Oct 2010 00:10:12 +0000 (17:10 -0700)]
am
06875afa: Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
* commit '
06875afad6101892a735f79aeb2c7bdbb58c26fa':
A little tweaking of DL Manager tests and adding better debugging output.
Neal Nguyen [Sat, 30 Oct 2010 00:07:59 +0000 (17:07 -0700)]
Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
Scott Main [Fri, 29 Oct 2010 22:37:17 +0000 (15:37 -0700)]
am
6e8d6bd0: Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
* commit '
6e8d6bd09facabcc0f868960e6453b8f79cd9136':
docs: Update various SDK docs for GB platform and tools
Scott Main [Fri, 29 Oct 2010 22:34:00 +0000 (15:34 -0700)]
Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
Neal Nguyen [Mon, 25 Oct 2010 01:02:45 +0000 (18:02 -0700)]
A little tweaking of DL Manager tests and adding better debugging output.
Adding more detail to the output logging to help track down issues, fixing some
download completed notification counter flakiness and making reboot test more
robust, and reducing the number of concurrent downloads in testMultipleDownloads()
to 10. After talking with Vasu, this is probably more appropriate as it is
closer to typical usage scenarios, and as a side effect should trim some
time from the test runs. Large numbers of downloads will be left for stress
testing.
Change-Id: Ie337cfe9b8d27299d70553e39c60e241ff3afe66
Leon Clarke [Fri, 29 Oct 2010 21:49:07 +0000 (14:49 -0700)]
am
5ccbe059: DO NOT MERGE. Add assets for <select>
* commit '
5ccbe05945325dc77d543d44b69a7f80196d8cb9':
DO NOT MERGE. Add assets for <select>
Leon Clarke [Thu, 18 Mar 2010 13:42:56 +0000 (13:42 +0000)]
DO NOT MERGE. Add assets for <select>
Bug:
3133784
Cherry-picking to GB from master.
Change-Id: I7d37c22f555d0e7c59a58fdad1516d3d77bf6d14
Scott Main [Fri, 29 Oct 2010 17:24:04 +0000 (10:24 -0700)]
am
1112632a: Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread
* commit '
1112632a41462c5dd34c7af9f67b88188a520517':
docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs
Scott Main [Fri, 29 Oct 2010 17:03:36 +0000 (10:03 -0700)]
Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread
Joe Onorato [Fri, 29 Oct 2010 15:16:20 +0000 (08:16 -0700)]
am
ed3c7be8: Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
* commit '
ed3c7be84255d48fe7f0454bdd51b3955698cafe':
Report the new size to wallpapers when the requested size changed.
Nick Pelly [Fri, 29 Oct 2010 15:15:48 +0000 (08:15 -0700)]
am
4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
* commit '
4bf4b491be3fbd0f71bb87749a0e31f817b91e08':
Hide some NFC API's.
Scott Main [Thu, 28 Oct 2010 07:02:31 +0000 (00:02 -0700)]
docs: Update various SDK docs for GB platform and tools
Change-Id: I8ccb296e5fba57743197bec140e9c79750f0d4f6
Joe Onorato [Fri, 29 Oct 2010 01:18:52 +0000 (18:18 -0700)]
Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
Joe Onorato [Fri, 29 Oct 2010 01:03:23 +0000 (18:03 -0700)]
Report the new size to wallpapers when the requested size changed.
We were telling the app, but we weren't saving the data for ourselves.
This also tells them to re-scroll when there's a new size.
Bug:
3144373
Change-Id: I9d12b714119ff02dd7d7f1cfa997d8a44475b9e9
Nick Pelly [Thu, 28 Oct 2010 23:47:31 +0000 (16:47 -0700)]
Merge "Hide some NFC API's." into gingerbread
Scott Main [Fri, 22 Oct 2010 18:29:57 +0000 (11:29 -0700)]
docs: revise javadocs for sip
add a package description, revise class descriptions and edit some method docs
Change-Id: Ice969a99c830349674c65d99e4b7a6f1d2f24a7e
Nick Pelly [Thu, 28 Oct 2010 20:39:37 +0000 (13:39 -0700)]
Hide some NFC API's.
We are leaving enough API so that you can see when any Tag is discovered,
get its ID, and get its NDEF messages.
But for advanced use - creating tag connections and writing messages - we have
2 problems. Firstly a lot of the code is untested
(RawTagConnection.transceive()), or in some cases known not to work
(NdefTagConnection.write()). Secondly, there is still debate about how to
best expose information about Tags.
The set of data/methods exposed for a Tag changes completely depending on the
tag technology. There may be multiple sets of technology implemented in a
single tag. Tag A may have technology X and Y, Tag B may have technology Y
and Z. Furthermore, some NFC controllers will be not be able to use all
technologies, and so Android Device 1 may see technology X and Y on Tag A but
Android device 2 may only see technology X. So we have a pretty challenging
set of constraints to work under, and we are not convinced the current Tag and
NdefTag class is the best approach going forwards.
The Tag application should be able to remain unbundled, since it just needs to
get incoming NDEF Messages.
Change-Id: Ic09f094f33794e10f8d730fffe011c9a5957e0ac
Signed-off-by: Nick Pelly <npelly@google.com>
Mike Lockwood [Thu, 28 Oct 2010 21:30:34 +0000 (14:30 -0700)]
am
c9fa90f9: Merge "GPS: remove some logging" into gingerbread
* commit '
c9fa90f94b664589d584bb433e748e2b01b368c9':
GPS: remove some logging
Mike Lockwood [Thu, 28 Oct 2010 21:28:46 +0000 (14:28 -0700)]
Merge "GPS: remove some logging" into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 21:03:40 +0000 (14:03 -0700)]
am
bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
* commit '
bd8ff5b5d4f4c74889ce20a0c7a2f8e0ab7b6ea9':
DO NOT MERGE. Fix asset file descriptor for pipe based fds.
Jeff Hamilton [Thu, 28 Oct 2010 21:01:21 +0000 (14:01 -0700)]
Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 20:05:27 +0000 (15:05 -0500)]
DO NOT MERGE. Fix asset file descriptor for pipe based fds.
Change-Id: Ic366d01f91017109abfcfa65bd2231dd7416ce71
Justin Ho [Thu, 28 Oct 2010 17:30:10 +0000 (10:30 -0700)]
am
9112b8eb: DO NOT MERGE - Ringtone bugfixes (round 1)
* commit '
9112b8ebd22ce5c83081066bea8a424eda8bda9d':
DO NOT MERGE - Ringtone bugfixes (round 1)
Justin Ho [Thu, 28 Oct 2010 17:23:33 +0000 (10:23 -0700)]
DO NOT MERGE - Ringtone bugfixes (round 1)
Change-Id: Idb72659b9cb00ec141b1229f42951e0a6e0b9a9a
Mike Lockwood [Thu, 28 Oct 2010 11:34:47 +0000 (07:34 -0400)]
GPS: remove some logging
Change-Id: Ib2dca53364c9da207a87f2664b54d2ec1d1bd8d9
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mathias Agopian [Thu, 28 Oct 2010 06:46:25 +0000 (23:46 -0700)]
am
7d452f69: Merge "really fix [
3118445] Transform * Transform does not work as expected" into gingerbread
Mathias Agopian [Thu, 28 Oct 2010 06:44:07 +0000 (23:44 -0700)]
Merge "really fix [
3118445] Transform * Transform does not work as expected" into gingerbread
Jaikumar Ganesh [Thu, 28 Oct 2010 06:44:02 +0000 (23:44 -0700)]
am
025f78eb: Merge "DO NOT MERGE Fix auto connection with headsets which don\'t send incoming connections for all profiles." into gingerbread
Jaikumar Ganesh [Thu, 28 Oct 2010 06:42:43 +0000 (23:42 -0700)]
Merge "DO NOT MERGE Fix auto connection with headsets which don't send incoming connections for all profiles." into gingerbread