Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,974 Commits 3 Branches 0 Tags
0065f398c1bfa661f620fcf18bf203f5cbed3845
Commit Graph

10487 Commits

Author SHA1 Message Date
Nick Pelly
0065f398c1 am c896d85c: Merge "Add operands to mifare classic increment, decrement." into gingerbread 
* commit 'c896d85c15d8a6c98c93df57d88481b89eb878f5':
  Add operands to mifare classic increment, decrement.
 2011-01-23 22:14:54 -08:00
Nick Pelly
c896d85c15 Merge "Add operands to mifare classic increment, decrement." into gingerbread 2011-01-23 22:12:25 -08:00
Nick Pelly
1e233af3a7 Add operands to mifare classic increment, decrement. 
Change-Id: Ib35f615142bda48a5e33888a09ebae2880624788
 2011-01-23 22:11:44 -08:00
Nick Pelly
12619677b0 am da01b4ab: Merge "Make MifareClassic methods more consistent." into gingerbread 
* commit 'da01b4abb817fcebdf33c27aaa6a1ac4a61beee0':
  Make MifareClassic methods more consistent.
 2011-01-23 21:39:39 -08:00
Nick Pelly
da01b4abb8 Merge "Make MifareClassic methods more consistent." into gingerbread 2011-01-23 21:36:14 -08:00
Nick Pelly
e45083b11b Make MifareClassic methods more consistent. 
Remove method overloading for combinations of sector+block addressing.
Instead provide methods that more closly match the raw commands, and more
efficient helpers to convert between blocks and sectors.

o fix off-by-one bug in getBlockCountInSector()
o add BLOCK_SIZE
o remove DESFIRE not operating in classic emulation (SAK 0x20)
o hide isEmulated(), there is no use case, and the info is available elsewhere
o getTotalBlockCount() -> getBlockCount()
o getBlockCount(int) -> getBlockCountInSector(int)
o introduce blockToSector() and sectorToBlock()
o remove authenticateBlock()
    make it really clear that authentication is per sector, and reduce function
    explosion. blockToSector() allows you to use authenticateSector...
o explicit authenticateSectorWithKeyA() / authenticateSectorWithKeyB()
    get rid of magic boolean
o remove all (int sector, int block) parameters
    always address by absolute block. this makes the API crystal clear, and
    helps reduce function explosion
o validation of all sector and block indices
o dont & 0xff when converting to byte - its redundant
o Remove TYPE_OTHER. Mifare Classic types are well-known and stable.

Change-Id: I3c9f8254ff307f31b388b3d7592c862d5de6afa5
 2011-01-23 21:32:57 -08:00
Jeff Hamilton
535ec16c78 am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread 
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
  Allow null filters for foreground dispatch to act as catch all.
 2011-01-23 19:28:17 -08:00
Jeff Hamilton
e1e70c5761 Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread 2011-01-23 19:17:22 -08:00
Jim Miller
1323ab83e4 am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM. 
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
  Fix 3379239: Catch exceptions from workaround for OOM.
 2011-01-23 14:30:07 -08:00
Jim Miller
42a461570b Fix 3379239: Catch exceptions from workaround for OOM. 
This catches possible exceptions caused by attempting to
unregister a receiver that may have already been unregistered.
This is related to the OOM issue workaround in Change I99a7e0c3.

Change-Id: Ib69a8acc6b12659125c958a03efac0a8a68a3859
 2011-01-23 13:40:31 -08:00
Jeff Hamilton
9f20cd7ff2 Allow null filters for foreground dispatch to act as catch all. 
Change-Id: Idf3d2e344a6e87035ccb5b533ed9e81fec596132
 2011-01-23 12:15:28 -06:00
Jaikumar Ganesh
f643974954 am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread 
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
  Do Not Merge Connect other profiles when priority is auto connect.
 2011-01-21 21:36:32 -08:00
Jaikumar Ganesh
1c9761e30d Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread 2011-01-21 21:25:01 -08:00
Jaikumar Ganesh
40e6c210f8 Do Not Merge Connect other profiles when priority is auto connect. 
ACL auto connection was removed so other profiles
won't auto connect when priority was auto connect.

Reduced connect other profiles time delay.

Bug: 3281016
Change-Id: Ic56ca6e95f618f02bc316d1f80014e58c4b6c3bc
 2011-01-21 19:05:54 -08:00
John Reck
3cc8a3a47e am 398a589c: Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread 
* commit '398a589ccea744556732b25097412dbb22c51271':
  DO NOT MERGE - Create db path if it doesn't exit
 2011-01-21 14:06:08 -08:00
John Reck
398a589cce Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbread 2011-01-21 14:03:30 -08:00
Jeff Hamilton
446aea40eb API changes for NFC. 
Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668
 2011-01-21 12:33:49 -08:00
John Reck
bf8af78973 DO NOT MERGE - Create db path if it doesn't exit 
Bug: 3241808
 Make sure the directory the caller is trying to open the icon db
 in actually exists and create it if it doesn't.

Change-Id: Icc0a67b0ceba03a746ac2cd3b84fc34c2c8b4fe2
 2011-01-21 11:42:15 -08:00
Jeff Hamilton
dc54a8c742 Merge "API changes for NFC." into gingerbread 2011-01-21 11:34:20 -08:00
Jeff Hamilton
4e21e1d21a API changes for NFC. 
Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668
 2011-01-21 13:32:58 -06:00
Jean-Michel Trivi
3ebade5d42 am a314f32b: Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread 
* commit 'a314f32ba92d46687aef9f420eb61491eff485cf':
  Bug 3365937 notify TTS initialization listener of binding errors
 2011-01-21 09:15:02 -08:00
Jean-Michel Trivi
a314f32ba9 Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread 2011-01-21 09:09:30 -08:00
Dianne Hackborn
19fdccfdf8 am 11576102: Fix issue #3373438: Update GBMR versions 
* commit '11576102a9794ef964a08bc372dc09803f58997a':
  Fix issue #3373438: Update GBMR versions
 2011-01-20 18:18:32 -08:00
Jeff Brown
9cc55346ec am d0725eef: Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread 
* commit 'd0725eef671c059b8e26d900fee655747f506dbe':
  Never drag scroll views with no children. (DO NOT MERGE)
 2011-01-20 17:41:08 -08:00
Jean-Michel Trivi
1e13a02320 Bug 3365937 notify TTS initialization listener of binding errors 
The creation of a TextToSpeech object causes the TTS service to
 start, and the initialization listener to be called when the
 service is connected. But the listener is never called when
 the service binding failed to be notified of this error.
The fix consists in checking the result of the bind to service
 operation, and notify the listener in case of an error.

More log was added in case speak() and synthesizeToFile() are
 called but the service is not known to have started.

Change-Id: I7dcc1fa44be31fee3177ec6215fca3306377b934
 2011-01-20 17:25:48 -08:00
Dianne Hackborn
11576102a9 Fix issue #3373438: Update GBMR versions 
Change-Id: Ic4b4f1b0534fd2fbd6322eae01a4cb9d5a67cc6f
 2011-01-20 12:16:43 -08:00
Jeff Brown
d0725eef67 Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread 2011-01-19 17:03:03 -08:00
Jeff Brown
39bc6197ba Never drag scroll views with no children. (DO NOT MERGE) 
Fixes a regression from Froyo.  Previously, when a scroll view
had no children, its onTouchEvent would return because the scroll
view would only start dragging if the user touched one of its children.
In Gingerbread, the user can drag from anywhere within the scroll
view, not just by touching a child.  However, it makes no sense
to drag a scroll view that has no children so an empty scroll view
should just ignore touches like any other empty view group would.

This change fixes applications that for some reason or other happen
to have empty scroll views in strange places.

Bug: 3246230
Change-Id: I76c6136d3cd74968983033014d60deec1718ce30
 2011-01-19 11:20:46 -08:00
Nick Pelly
e5099cd3f5 am b7d6ffd7: Merge "Change signature of MifareClassic.authenticate*() to throw IOException." into gingerbread 
* commit 'b7d6ffd76f6c47af488494f5de9560ec490e8241':
  Change signature of MifareClassic.authenticate*() to throw IOException.
 2011-01-18 18:56:45 -08:00
Nick Pelly
8216044435 am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread 
* commit '50d0bcb45beb30746271b620ab23ad4d69fd9d5b':
  Support for TagLostException (API).
 2011-01-18 18:56:41 -08:00
Nick Pelly
0316d4a24f Change signature of MifareClassic.authenticate*() to throw IOException. 
Update API for this and the previous commit.

Change-Id: I19275a5d00081bd0f00afea59a2b673344a32954
 2011-01-18 18:52:37 -08:00
Martijn Coenen
bf34061bb4 Support for TagLostException (API). 
Change-Id: Idf2c3253f7bc5f371133c4f18bfc2afde69c3010
 2011-01-18 18:32:50 -08:00
Nick Pelly
ccc9a9e582 am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread 
* commit 'b735aa0b6fabb72097191923d8787b43fa52531e':
  Fix javadoc which broke build.
 2011-01-18 17:10:33 -08:00
Nick Pelly
a8ca533d34 Fix javadoc which broke build. 
Change-Id: Ie3cac9bec04e80defae44ba02086ad0cdfd301a9
 2011-01-18 17:07:05 -08:00
Nick Pelly
4d3ac03ade am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread 
* commit 'e4dd154c08b04090bad8f450450e13163d5fef9b':
  hange the default IsoDep timeout to 300ms (docs update).
 2011-01-18 16:16:36 -08:00
Mathias Agopian
b92a40ebfa am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread 
* commit '12d014fdf40f69512e59e84914b230a2d3e7b8eb':
  fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
 2011-01-18 16:14:13 -08:00
Nick Pelly
e4dd154c08 Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread 2011-01-18 16:11:14 -08:00
Mathias Agopian
12d014fdf4 Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread 2011-01-18 16:10:08 -08:00
Martijn Coenen
cbec3fb285 hange the default IsoDep timeout to 300ms (docs update). 
Change-Id: I4fe5a6bf9fd42a28c9619e6e0bf11885bcc43f91
 2011-01-18 15:35:14 -08:00
Brad Fitzpatrick
02bbbc1122 am 069e810c: Merge "Fixing memory leak in PreferenceScreen." 
* commit '069e810c6a5efc0b33fbe8c29a2d11f7c342a4d8':
  Fixing memory leak in PreferenceScreen.
 2011-01-18 13:39:07 -08:00
Brad Fitzpatrick
069e810c6a Merge "Fixing memory leak in PreferenceScreen." 2011-01-18 13:23:13 -08:00
Brad Fitzpatrick
4bb180d62f am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager" 
* commit 'ded2b00643c788a96ce8adc1a4cc0f7619a4c606':
  frameworks/base: remove redundant code in WindowManager
 2011-01-18 13:20:06 -08:00
Vairavan Srinivasan
3f6875f143 frameworks/base: remove redundant code in WindowManager 
Change-Id: I8a356ca36129645977d33129e0d56c1b89f97fb0
 2011-01-18 12:20:16 -08:00
Martijn Coenen
c4eee776ad am 07e6f616: Check NDEF before calling makeReadOnly(). 
* commit '07e6f616d122496342a5bae51323bb218d88f7f2':
  Check NDEF before calling makeReadOnly().
 2011-01-18 11:40:51 -08:00
Martijn Coenen
3d06b1e0e9 am a701cf85: Implement IsoDep timeout handling (API). 
* commit 'a701cf85a0167a6bb623343388a7dca6f2b61ac5':
  Implement IsoDep timeout handling (API).
 2011-01-18 11:38:28 -08:00
Martijn Coenen
07e6f616d1 Check NDEF before calling makeReadOnly(). 
Change-Id: Iadbaf5c29821eff78ad487b248af529febcdc4ce
 2011-01-18 11:35:46 -08:00
Martijn Coenen
a701cf85a0 Implement IsoDep timeout handling (API). 
Added a method for setting the timeout on IsoDep transactions.

Change-Id: Ie627e7a826556e46295fefe69b9be83ebf911d93
 2011-01-18 11:35:46 -08:00
Jeff Hamilton
97ac293507 am 0716ea14: Merge "Javadoc updates for NFC." into gingerbread 
* commit '0716ea144d94b9dfce4670e90a849db19a492da9':
  Javadoc updates for NFC.
 2011-01-18 11:26:39 -08:00
Jeff Hamilton
8c1cd157fb am 3a223404: Merge "New APIs for NDEF Push Protocol." into gingerbread 
* commit '3a223404e7589831a901cb16c5ce97685bc1f3f8':
  New APIs for NDEF Push Protocol.
 2011-01-18 11:26:22 -08:00
Jeff Hamilton
0716ea144d Merge "Javadoc updates for NFC." into gingerbread 2011-01-18 11:01:55 -08:00