Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,591 Commits 3 Branches 0 Tags
5f3ba16de02de7e36b11117d455e1c64e231cd3f
Commit Graph

14361 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
0044b4ad6a Merge d350dc04 from gingerbread 
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
 2011-01-29 10:57:48 -08:00
Nick Pelly
4226be3f04 am 21d0a173: Fix build - javadoc. 
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
  Fix build - javadoc.
 2011-01-29 10:40:07 -08:00
Jean-Baptiste Queru
0440cc1fb7 Merge eab0e97b from gingerbread 
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
 2011-01-29 10:38:09 -08:00
Kenny Root
c68a657f12 am 138757db: Merge "Make OBB results a one-way call" into gingerbread 
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
  Make OBB results a one-way call
 2011-01-29 09:48:07 -08:00
Jean-Baptiste Queru
962d556a12 Merge f126ad3b from gingerbread 
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
 2011-01-29 09:37:44 -08:00
Nick Pelly
1ac6d08a05 am b134223f: Make Mifare Classic increment/decrement operands little endian 
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
  Make Mifare Classic increment/decrement operands little endian
 2011-01-29 09:31:56 -08:00
Arnaud Ferir
c5e35fd246 am 5e81a6e2: Fix trace mismatch. 
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
  Fix trace mismatch.
 2011-01-29 07:30:07 -08:00
Sylvain Fonteneau
addd46c658 am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel. 
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
 2011-01-29 07:29:56 -08:00
Jean-Baptiste Queru
86e1c5b9f6 Merge c896d85c from gingerbread 
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
 2011-01-29 07:27:06 -08:00
Jean-Baptiste Queru
ac983353e6 Merge da01b4ab from gingerbread 
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
 2011-01-29 07:17:22 -08:00
Jeff Hamilton
6d904e7039 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-29 07:09:21 -08:00
Jim Miller
4485edce05 am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM. 
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
  Fix 3379239: Catch exceptions from workaround for OOM.
 2011-01-29 07:08:58 -08:00
Jeff Hamilton
df5d015ae2 resolved conflicts for merge of dc54a8c7 to honeycomb-merge 
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
 2011-01-28 20:41:42 -06:00
Jeff Hamilton
dac3063adb resolved conflicts for merge of a314f32b to honeycomb-merge 
Change-Id: I98d37ee8666d9d3f195d2b23d50dc851f1ef6500
 2011-01-28 13:16:46 -08:00
Nick Pelly
2478e617c4 resolved conflicts for merge of b7d6ffd7 to honeycomb-merge 
Change-Id: If5553e0b51513687c4012600d92323617190fb6c
 2011-01-27 18:35:19 -08:00
Nick Pelly
51ee9c1367 am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread 
* commit '50d0bcb45beb30746271b620ab23ad4d69fd9d5b':
  Support for TagLostException (API).
 2011-01-27 18:29:13 -08:00
Nick Pelly
4990b515c8 am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread 
* commit 'b735aa0b6fabb72097191923d8787b43fa52531e':
  Fix javadoc which broke build.
 2011-01-27 18:28:25 -08:00
Nick Pelly
16fad45bb5 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-27 17:29:59 -08:00
Mathias Agopian
14f3d86267 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-27 17:28:47 -08:00
Martijn Coenen
216a5e72a1 am 07e6f616: Check NDEF before calling makeReadOnly(). 
* commit '07e6f616d122496342a5bae51323bb218d88f7f2':
  Check NDEF before calling makeReadOnly().
 2011-01-27 17:03:19 -08:00
Nick Pelly
0cad3d23d3 resolved conflicts for merge of a701cf85 to honeycomb-merge 
Change-Id: I81a63599649a61fc73bf1e7ebcfed4c333903070
 2011-01-27 16:59:02 -08:00
Nick Pelly
3fcedf7728 API: Make close() throw an IOException. 
IOException on close() can be useful to indicate that in-progress transactions
were canceled.

I also audited all of our tech classes to make sure every function that needs
to throw IOException does so.

Change-Id: Iaa9c43d79d59ff85772d5c3e4b4d57a6fa8df4cf
 2011-01-27 16:17:14 -08:00
Nick Pelly
21d0a173f1 Fix build - javadoc. 
Change-Id: I0168fb4a75f4dff88e347c0dfd1f0b39e2dba0d6
 2011-01-27 14:07:50 -08:00
Nick Pelly
eab0e97bf0 Merge "Clean up MifareUltralight API." into gingerbread 2011-01-27 12:23:53 -08:00
Nick Pelly
4a5e253220 Clean up MifareUltralight API. 
o Some javadoc updates
o writeBlock -> writePages  (Block means something else in NFC Forum).
o validate page offset

Change-Id: Icae54db3397d57aaa451caaa86d56e8ba82507f2
 2011-01-27 12:22:56 -08:00
Jeff Hamilton
fb69e0c0ff resolved conflicts for merge of 0716ea14 to honeycomb-merge 
Change-Id: I8f5e40c83a470e81910cd07f11fe683bb6f96421
 2011-01-27 12:29:27 -06:00
Robert Greenwalt
89a544088f Merge "Update networktype before sending state change." into gingerbread 2011-01-27 10:17:33 -08:00
Jeff Hamilton
5e2113ff27 resolved conflicts for merge of 3a223404 to honeycomb-merge 
Change-Id: I0eb1f3a271797c78d9ec5b2528a221c89973a83c
 2011-01-27 11:27:58 -06:00
Jeff Hamilton
992f75bcd0 resolved conflicts for merge of 6687ecb4 to honeycomb-merge 
Change-Id: Id9677d2ef1c03191cf73a7d90e80b57ea686afec
 2011-01-27 10:44:21 -06:00
Nick Pelly
56d39d1e03 am b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread 
* commit 'b73203ab7e308b747819de2b2400afe971ef3bff':
  Make sure service handles are live before passing to other objects.
 2011-01-27 08:13:03 -08:00
Jeff Hamilton
7ef536ad2e resolved conflicts for merge of 52d3203e to honeycomb-merge 
Change-Id: Icb56943bc4cd6a93e4e2ff13fd2be6e5b7ca161b
 2011-01-26 23:26:16 -06:00
Nick Pelly
6165985652 am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread 
* commit 'a29bf14e1d2857debc632ce4304a1c72dded348c':
  New Intent defined for RF ON/OFF events
 2011-01-26 20:40:46 -08:00
Robert Greenwalt
67881c414a Update networktype before sending state change. 
Fixes potential race condition in network-type info.  May fix this issue.

bug:3376930
Change-Id: I3d5fd7c76e54923b62c56defa947be3c9c1cd585
 2011-01-26 13:39:46 -08:00
Kenny Root
138757db4f Merge "Make OBB results a one-way call" into gingerbread 2011-01-26 09:17:28 -08:00
Kenny Root
b7db2726e9 Make OBB results a one-way call 
OBB result back to an application needs to be a one-way binder call.

Bug: 3353699
Change-Id: I0e625914d18a001c2fa9d764ea6463f34cf96743
 2011-01-25 17:29:59 -08:00
Martijn Coenen
59ad6ed879 am 25be5365: Implement canMakeReadonly(). 
* commit '25be53652167300183282d170a00a6df576523f5':
  Implement canMakeReadonly().
 2011-01-25 16:16:53 -08:00
Nick Pelly
01a2868985 am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread 
* commit '92939376199a08fa0a3b01759579a4979c2a94a2':
  Remove attemptDeadServiceRecovery() from TagTechnology's.
 2011-01-25 16:16:05 -08:00
Nick Pelly
30098efbca resolved conflicts for merge of d64d711d to honeycomb-merge 
Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885
 2011-01-25 16:13:17 -08:00
Jeff Hamilton
f126ad3b64 Merge "Use classnames instead of ints for NFC techs." into gingerbread 2011-01-25 14:35:46 -08:00
Jeff Hamilton
d88e9aa575 Use classnames instead of ints for NFC techs. 
This makes the system more flexible and allows
adding new technology types without having to
update the API.

Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
 2011-01-25 16:32:26 -06:00
Nick Pelly
0c57adce34 am f54ad8da: Clean up transceive(). 
* commit 'f54ad8daf6f9dc2b9670ab1abbbfa4308b40bc6a':
  Clean up transceive().
 2011-01-25 12:39:25 -08:00
Jeff Hamilton
4f1b04ac47 resolved conflicts for merge of 0aea1836 to honeycomb-merge 
Change-Id: I5aa17ff6dc9037815c3ec3e6e4b18183aedbbdf2
 2011-01-25 14:35:55 -06:00
Dianne Hackborn
93dd6a6ad1 am 3ea5728e: Tweak level at which we reset battery stats to 90%. 
* commit '3ea5728e703554f8ba0bb3aa1367d6dc45d704bb':
  Tweak level at which we reset battery stats to 90%.
 2011-01-25 10:45:33 -08:00
Nick Pelly
b134223f91 Make Mifare Classic increment/decrement operands little endian 
Also make sure they are non-negative.

This is not documented in Mifare Classic spec, but based on findings from NXP:
- Operand should be stored in little-endian format in the transceive buffer
- Tag ignores the sign bit on the operand, its effectively 31-bit unsigned
- Overflow and underflow generates an error.

Change-Id: Id3389b3894ded732c4b00d564ca53f5df651359e
 2011-01-25 07:45:07 -08:00
Adam Powell
bffb0a2586 Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb 2011-01-24 14:23:36 -08:00
Adam Powell
abbcc241c0 Fix bug 3237638 - make it easy to change a "refresh" AB button/icon 
into the indeterminate progress icon

This fixes a bug that caused ActionViews to not be updated properly
after a pass through invalidateOptionsMenu/onPrepareOptionsMenu. Apps
can now set/clear action views to display progress spinner widgets or
anything else on demand.

Change-Id: I138eceb504177c6bb5b86d40a68a82973aa841a5
 2011-01-24 14:03:16 -08:00
Huahui Wu
f93246923f A few small cleanning-ups. 
1. Remove mDeferMultiTouch in WebView, it was for testing only but
we don't need it now since we always pass MultiTouch to WebKit.

2. Remove the use of mDeferMultiTouch in DRT tests.

3. Correct the index of getX(Y) for the second touch point in the
debug string of MotionEvent.

Change-Id: Ib63cfc5935af1a169ed26b2b138f74908492bc18
 2011-01-24 12:07:37 -08:00
Joe Onorato
da34e13bb4 Merge "Remove unwanted parameter (it was a typo)." into honeycomb 2011-01-24 10:43:55 -08:00
Arnaud Ferir
5e81a6e21e Fix trace mismatch. 
Change-Id: Ie6e9a2baef63d2b5621593203742c2ffeaafc4ba
 2011-01-24 12:15:21 -06:00
Sylvain Fonteneau
c5a418ecb7 Handle mock tags in android.nfc.Tag conversion to Parcel. 
When generating a mock tag (after a NDEF exchange over LLCP), one of
the internal fields is set to null. This was causing NullPointerException
when being converted to a Parcel.

This is fixed by not including this field in the Parcel for mock tags.

Change-Id: I000e2faa54d71fd755ba7993e1e258743aad98fb
 2011-01-24 12:15:13 -06:00