summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.Sylvain Fonteneau2011-01-291-2/+16
| |\ \ \ \ | | |/ / /
| | * | | Handle mock tags in android.nfc.Tag conversion to Parcel.Sylvain Fonteneau2011-01-241-2/+16
| * | | | Merge c896d85c from gingerbreadJean-Baptiste Queru2011-01-291-12/+19
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add operands to mifare classic increment, decrement." into gingerbreadNick Pelly2011-01-231-12/+19
| | |\ \ \
| | | * | | Add operands to mifare classic increment, decrement.Nick Pelly2011-01-231-12/+19
| * | | | | Merge da01b4ab from gingerbreadJean-Baptiste Queru2011-01-291-189/+186
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Make MifareClassic methods more consistent." into gingerbreadNick Pelly2011-01-231-189/+186
| | |\ \ \ \ | | | |/ / /
| | | * | | Make MifareClassic methods more consistent.Nick Pelly2011-01-231-189/+186
| * | | | | am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catc...Jeff Hamilton2011-01-291-5/+11
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Allow null filters for foreground dispatch to act as catch all." into ...Jeff Hamilton2011-01-231-5/+11
| | |\ \ \ \
| | | * | | | Allow null filters for foreground dispatch to act as catch all.Jeff Hamilton2011-01-231-5/+11
| * | | | | | am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.Jim Miller2011-01-291-2/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix 3379239: Catch exceptions from workaround for OOM.Jim Miller2011-01-231-2/+10
| | |/ / / /
| | * | | | Merge "Do Not Merge Connect other profiles when priority is auto connect." in...Jaikumar Ganesh2011-01-211-5/+9
| | |\ \ \ \
| | | * | | | Do Not Merge Connect other profiles when priority is auto connect.Jaikumar Ganesh2011-01-211-5/+9
| | * | | | | Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbreadJohn Reck2011-01-211-3/+7
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | DO NOT MERGE - Create db path if it doesn't exitJohn Reck2011-01-211-3/+7
| * | | | | | resolved conflicts for merge of dc54a8c7 to honeycomb-mergeJeff Hamilton2011-01-2814-160/+252
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "API changes for NFC." into gingerbreadJeff Hamilton2011-01-2114-160/+252
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | API changes for NFC.Jeff Hamilton2011-01-2114-160/+252
| | * | | | | Merge "Bug 3365937 notify TTS initialization listener of binding errors" into...Jean-Michel Trivi2011-01-211-5/+16
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Bug 3365937 notify TTS initialization listener of binding errorsJean-Michel Trivi2011-01-201-5/+16
| | * | | | | Fix issue #3373438: Update GBMR versionsDianne Hackborn2011-01-201-1/+6
| | |/ / / /
| | * | | | Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerb...Jeff Brown2011-01-192-7/+11
| | |\ \ \ \
| | | * | | | Never drag scroll views with no children. (DO NOT MERGE)Jeff Brown2011-01-192-7/+11
| * | | | | | resolved conflicts for merge of a314f32b to honeycomb-mergeJeff Hamilton2011-01-281-6/+17
| * | | | | | resolved conflicts for merge of b7d6ffd7 to honeycomb-mergeNick Pelly2011-01-271-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Change signature of MifareClassic.authenticate*() to throw IOException.Nick Pelly2011-01-181-2/+2
| * | | | | | am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbreadNick Pelly2011-01-276-6/+160
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Support for TagLostException (API).Martijn Coenen2011-01-186-6/+160
| | |/ / / /
| * | | | | am b735aa0b: Merge "Fix javadoc which broke build." into gingerbreadNick Pelly2011-01-271-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix javadoc which broke build.Nick Pelly2011-01-181-1/+1
| * | | | | am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)."...Nick Pelly2011-01-271-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerb...Nick Pelly2011-01-181-1/+1
| | |\ \ \ \
| | | * | | | hange the default IsoDep timeout to 300ms (docs update).Martijn Coenen2011-01-181-1/+1
| | | |/ / /
| * | | | | am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports ac...Mathias Agopian2011-01-271-3/+26
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNR...Mathias Agopian2011-01-181-3/+26
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLEMathias Agopian2011-01-161-3/+26
| * | | | | am 07e6f616: Check NDEF before calling makeReadOnly().Martijn Coenen2011-01-271-12/+17
| |\ \ \ \ \ | | |/ / / /
| | * | | | Check NDEF before calling makeReadOnly().Martijn Coenen2011-01-181-12/+17
| * | | | | resolved conflicts for merge of a701cf85 to honeycomb-mergeNick Pelly2011-01-272-0/+33
| |\ \ \ \ \ | | |/ / / /
| | * | | | Implement IsoDep timeout handling (API).Martijn Coenen2011-01-182-0/+33
| * | | | | resolved conflicts for merge of 0716ea14 to honeycomb-mergeJeff Hamilton2011-01-2714-194/+274
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Javadoc updates for NFC." into gingerbreadJeff Hamilton2011-01-1814-194/+274
| | |\ \ \ \
| | | * | | | Javadoc updates for NFC.Jeff Hamilton2011-01-1814-194/+274
| * | | | | | resolved conflicts for merge of 3a223404 to honeycomb-mergeJeff Hamilton2011-01-272-10/+66
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "New APIs for NDEF Push Protocol." into gingerbreadJeff Hamilton2011-01-182-10/+66
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | New APIs for NDEF Push Protocol.Jeff Hamilton2011-01-172-10/+66
| | * | | | | Revert "Add the {get,set}PackageObbPaths calls to API"Kenny Root2011-01-173-50/+0
| | | |/ / / | | |/| | |
| * | | | | resolved conflicts for merge of 6687ecb4 to honeycomb-mergeJeff Hamilton2011-01-271-38/+62
| |\ \ \ \ \ | | |/ / / /