summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* @hide DPM global proxy settingsAndy Stadler2011-02-162-78/+0
* Revert "Merge "bug:3414192 new API to designate a download to be OTA update" ...Vasu Nori2011-02-032-22/+0
* bug:3414192 new API to designate a download to be OTA updateVasu Nori2011-02-022-0/+22
* DO NOT MERGENick Pelly2011-02-013-180/+102
* Merge from gingerbread: Commit the final API for level 10. DO NOT MERGEJeff Hamilton2011-01-311-0/+2128
* Fix issue #3381489: IllegalStateException: attempt to re-open...Dianne Hackborn2011-01-302-26/+66
* Fix issue #3404571: Commit final APIsDianne Hackborn2011-01-301-1/+1549
* Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-301-0/+1382
|\
| * Merge d350dc04 from gingerbreadJean-Baptiste Queru2011-01-291-0/+6
| |\
| | * API: Make close() throw an IOException.Nick Pelly2011-01-271-0/+6
| * | Merge eab0e97b from gingerbreadJean-Baptiste Queru2011-01-291-10/+21
| |\ \ | | |/
| | * Clean up MifareUltralight API.Nick Pelly2011-01-271-10/+21
| | * Fix the build, proper current.xml.Jeff Hamilton2011-01-251-1/+1
| * | Merge f126ad3b from gingerbreadJean-Baptiste Queru2011-01-291-14/+5
| |\ \ | | |/
| | * Use classnames instead of ints for NFC techs.Jeff Hamilton2011-01-251-14/+5
| * | Merge c896d85c from gingerbreadJean-Baptiste Queru2011-01-291-0/+4
| |\ \ | | |/
| | * Add operands to mifare classic increment, decrement.Nick Pelly2011-01-231-0/+4
| * | Merge da01b4ab from gingerbreadJean-Baptiste Queru2011-01-291-81/+43
| |\ \ | | |/
| | * Make MifareClassic methods more consistent.Nick Pelly2011-01-231-81/+43
| * | resolved conflicts for merge of dc54a8c7 to honeycomb-mergeJeff Hamilton2011-01-281-137/+129
| |\ \ | | |/
| | * API changes for NFC.Jeff Hamilton2011-01-211-137/+129
| | * Fix issue #3373438: Update GBMR versionsDianne Hackborn2011-01-201-0/+11
| * | resolved conflicts for merge of b7d6ffd7 to honeycomb-mergeNick Pelly2011-01-271-0/+31
| |\ \ | | |/
| | * Change signature of MifareClassic.authenticate*() to throw IOException.Nick Pelly2011-01-181-8/+39
| * | resolved conflicts for merge of a701cf85 to honeycomb-mergeNick Pelly2011-01-271-0/+13
| |\ \ | | |/
| | * Implement IsoDep timeout handling (API).Martijn Coenen2011-01-181-0/+13
| * | resolved conflicts for merge of 0716ea14 to honeycomb-mergeJeff Hamilton2011-01-271-201/+82
| |\ \ | | |/
| | * Merge "Javadoc updates for NFC." into gingerbreadJeff Hamilton2011-01-181-201/+82
| | |\
| | | * Javadoc updates for NFC.Jeff Hamilton2011-01-181-201/+82
| * | | resolved conflicts for merge of 3a223404 to honeycomb-mergeJeff Hamilton2011-01-271-0/+28
| |\ \ \ | | |/ /
| | * | Merge "New APIs for NDEF Push Protocol." into gingerbreadJeff Hamilton2011-01-181-1/+29
| | |\ \ | | | |/
| | | * New APIs for NDEF Push Protocol.Jeff Hamilton2011-01-171-1/+29
| | * | Remove API that snuck into MockPackageManagerKenny Root2011-01-173-45/+0
| | * | Revert "Add the {get,set}PackageObbPaths calls to API"Kenny Root2011-01-171-56/+0
| | |/
| | * Merge "Squash commits of the following patches, cherry-picked from other bran...James Dong2011-01-141-0/+379
| | |\
| | | * Squash commits of the following patches, cherry-picked from other branch - do...James Dong2011-01-121-0/+379
| | * | Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbreadJaikumar Ganesh2011-01-141-0/+32
| | |\ \
| | | * | Do Not Merge: Expose insecure rfcomm Bluetooth API.Jaikumar Ganesh2011-01-141-0/+32
| * | | | resolved conflicts for merge of 52d3203e to honeycomb-mergeJeff Hamilton2011-01-261-0/+30
| |\ \ \ \ | | |/ / /
| | * | | Add dispatching overrides for foreground apps.Jeff Hamilton2011-01-131-0/+30
| | * | | Merge "Do not merge." into gingerbreadWei-Ta Chen2011-01-131-1/+151
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Do not merge.Wei-Ta Chen2011-01-111-1/+151
| | * | | Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbreadKenny Root2011-01-121-0/+56
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add the {get,set}PackageObbPaths calls to APIKenny Root2011-01-091-0/+56
| | | |/
| * | | resolved conflicts for merge of ca36d863 to honeycomb-mergeJeff Hamilton2011-01-261-11/+11
| |\ \ \ | | |/ /
| | * | Update API current.xml to unbreak build.Nick Pelly2011-01-101-11/+11
| * | | resolved conflicts for merge of d64d711d to honeycomb-mergeNick Pelly2011-01-251-15/+15
| |\ \ \ | | |/ /
| | * | Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)Nick Pelly2011-01-101-15/+15
| | |/
| * | resolved conflicts for merge of 0aea1836 to honeycomb-mergeJeff Hamilton2011-01-251-0/+1433
| |\ \ | | |/
| | * Make the new NFC APIs public.Jeff Hamilton2011-01-061-0/+1433
generated by cgit v1.1 at 2024-09-10 07:47:58 +0000