summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am cbf0983e: Merge "Final final final Gingerbread MR API changes." into ginge...Nick Pelly2011-02-012-120/+68
|\
| * Final final final Gingerbread MR API changes.Nick Pelly2011-02-012-120/+68
* | am 113834c5: Commit the final API for level 10.Jeff Hamilton2011-01-311-0/+2128
|\ \ | |/
| * Commit the final API for level 10.Jeff Hamilton2011-01-311-0/+2128
* | am d350dc04: Merge "API: Make close() throw an IOException." into gingerbreadNick Pelly2011-01-271-0/+6
|\ \ | |/
| * API: Make close() throw an IOException.Nick Pelly2011-01-271-0/+6
* | am eab0e97b: Merge "Clean up MifareUltralight API." into gingerbreadNick Pelly2011-01-271-10/+21
|\ \ | |/
| * Clean up MifareUltralight API.Nick Pelly2011-01-271-10/+21
* | am c33acae9: Merge "Fix the build, proper current.xml." into gingerbreadJeff Hamilton2011-01-251-1/+1
|\ \ | |/
| * Fix the build, proper current.xml.Jeff Hamilton2011-01-251-1/+1
* | am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into ginge...Jeff Hamilton2011-01-251-14/+5
|\ \ | |/
| * Use classnames instead of ints for NFC techs.Jeff Hamilton2011-01-251-14/+5
* | am c896d85c: Merge "Add operands to mifare classic increment, decrement." int...Nick Pelly2011-01-231-0/+4
|\ \ | |/
| * Add operands to mifare classic increment, decrement.Nick Pelly2011-01-231-0/+4
* | am da01b4ab: Merge "Make MifareClassic methods more consistent." into gingerb...Nick Pelly2011-01-231-81/+43
|\ \ | |/
| * Make MifareClassic methods more consistent.Nick Pelly2011-01-231-81/+43
| * API changes for NFC.Jeff Hamilton2011-01-211-137/+129
* | API changes for NFC.Jeff Hamilton2011-01-211-137/+129
* | am 11576102: Fix issue #3373438: Update GBMR versionsDianne Hackborn2011-01-201-0/+11
|\ \ | |/
| * Fix issue #3373438: Update GBMR versionsDianne Hackborn2011-01-201-0/+11
* | am b7d6ffd7: Merge "Change signature of MifareClassic.authenticate*() to thro...Nick Pelly2011-01-181-8/+39
|\ \ | |/
| * Change signature of MifareClassic.authenticate*() to throw IOException.Nick Pelly2011-01-181-8/+39
* | am a701cf85: Implement IsoDep timeout handling (API).Martijn Coenen2011-01-181-0/+13
|\ \ | |/
| * Implement IsoDep timeout handling (API).Martijn Coenen2011-01-181-0/+13
* | am 0716ea14: Merge "Javadoc updates for NFC." into gingerbreadJeff Hamilton2011-01-181-201/+82
|\ \ | |/
| * Merge "Javadoc updates for NFC." into gingerbreadJeff Hamilton2011-01-181-201/+82
| |\
| | * Javadoc updates for NFC.Jeff Hamilton2011-01-181-201/+82
* | | am 3a223404: Merge "New APIs for NDEF Push Protocol." into gingerbreadJeff Hamilton2011-01-181-1/+29
|\ \ \ | |/ /
| * | 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
* | | am 524133cc: Remove API that snuck into MockPackageManagerKenny Root2011-01-173-45/+0
|\ \ \ | |/ /
| * | Remove API that snuck into MockPackageManagerKenny Root2011-01-173-45/+0
* | | am 34d2b41e: Revert "Add the {get,set}PackageObbPaths calls to API"Kenny Root2011-01-171-56/+0
|\ \ \ | |/ /
| * | Revert "Add the {get,set}PackageObbPaths calls to API"Kenny Root2011-01-171-56/+0
| |/
* | merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-141-0/+379
|\ \ | |/
| * 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
* | | am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into...Jaikumar Ganesh2011-01-141-0/+32
|\ \ \ | |/ /
| * | 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
* | | | am 52d3203e: Add dispatching overrides for foreground apps.Jeff Hamilton2011-01-131-0/+30
|\ \ \ \ | |/ / /
| * | | Add dispatching overrides for foreground apps.Jeff Hamilton2011-01-131-0/+30
* | | | am 61d9ffbf: Merge "Do not merge." into gingerbreadWei-Ta Chen2011-01-131-1/+151
|\ \ \ \ | |/ / /
| * | | Merge "Do not merge." into gingerbreadWei-Ta Chen2011-01-131-1/+151
| |\ \ \ | | |_|/ | |/| |
| | * | Do not merge.Wei-Ta Chen2011-01-111-1/+151
* | | | am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into ginge...Kenny Root2011-01-121-0/+56
|\ \ \ \ | |/ / /
| * | | 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
| | |/
* | | am ca36d863: Update API current.xml to unbreak build.Nick Pelly2011-01-101-11/+11
|\ \ \ | |/ /
| * | Update API current.xml to unbreak build.Nick Pelly2011-01-101-11/+11