Commit Graph

14014 Commits

Author SHA1 Message Date
Robert Greenwalt
0216e61819 Make the interface with DHCP IPv6 capable.
It doesn't work (yet) for IPv6, but we can remove v4-centric notions from the framework.

bug:2542681
Change-Id: I21c058f5c88d07706c9265bf0ea902fc90357e56
2011-01-26 09:10:01 -08:00
Brian Carlstrom
aa16a0f357 am f2b7c844: am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
* commit 'f2b7c84468c5397b44566c393bec2675d73817b7':
  Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
2011-01-25 11:03:52 -08:00
Nick Pelly
c1c93d647a am 894983f0: am 3b61e47a: am b134223f: Make Mifare Classic increment/decrement operands little endian
* commit '894983f060b8e296335c50165049747d0a33fbc0':
  Make Mifare Classic increment/decrement operands little endian
2011-01-25 11:03:35 -08:00
Brian Carlstrom
f2b7c84468 am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
* commit '8d37c4efeb853fdc6626f89b5bc0ec79eb451162':
  Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
2011-01-25 11:00:24 -08:00
Nick Pelly
894983f060 am 3b61e47a: am b134223f: Make Mifare Classic increment/decrement operands little endian
* commit '3b61e47a3f173133e5a3cfcbfe6812eb02a0a760':
  Make Mifare Classic increment/decrement operands little endian
2011-01-25 10:58:46 -08:00
Brian Carlstrom
8d37c4efeb Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb 2011-01-25 10:58:02 -08:00
Gilles Debunne
9854161e8f am 9eaa9b97: am b6b15dca: Merge "TextLine cache is used, even for long lines of text." into honeycomb
* commit '9eaa9b97d78e3efed1ac497822ca06c03db890cd':
  TextLine cache is used, even for long lines of text.
2011-01-25 10:47:33 -08:00
Gilles Debunne
9eaa9b97d7 am b6b15dca: Merge "TextLine cache is used, even for long lines of text." into honeycomb
* commit 'b6b15dca725b3467ea03fa4c0ae29e6b6e753b27':
  TextLine cache is used, even for long lines of text.
2011-01-25 10:45:15 -08:00
Gilles Debunne
b6b15dca72 Merge "TextLine cache is used, even for long lines of text." into honeycomb 2011-01-25 10:43:05 -08:00
Shimeng (Simon) Wang
e59b34cfbf am 1dc6b9eb: am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb
* commit '1dc6b9ebc6ea584b8294e920d0153365c6aa2486':
  Set high usage delta to 1 to avoid constant V8 GC.
2011-01-25 10:34:50 -08:00
Sylvain Fonteneau
d8e4c1b3b2 am a2eced30: am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit 'a2eced302b7a5c4fea6d84c200dbdc5555f0d2b5':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-25 10:32:35 -08:00
Shimeng (Simon) Wang
1dc6b9ebc6 am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb
* commit 'c1e7f2d371aa6c2aa9ed3207689cb53a1f704cbc':
  Set high usage delta to 1 to avoid constant V8 GC.
2011-01-25 10:30:33 -08:00
Nick Pelly
cf1f20e701 am fd06cc10: resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
* commit 'fd06cc10ac372a737e37e764b0a01296e778226e':
  Add operands to mifare classic increment, decrement.
2011-01-25 10:30:11 -08:00
Sylvain Fonteneau
a2eced302b am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit 'e97a42e05cced70dd5713c731a197187b4751800':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-25 10:29:51 -08:00
Shimeng (Simon) Wang
c1e7f2d371 Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb 2011-01-25 10:27:24 -08:00
Nick Pelly
fd06cc10ac resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
Change-Id: I1fcb292287f82605db41d330ae840fb5f617847b
2011-01-25 10:26:54 -08:00
Nick Pelly
866264fa26 am bdd265ba: resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
* commit 'bdd265ba5fe6b2bf632a7a6eb6df9e187a56126a':
  Make MifareClassic methods more consistent.
2011-01-25 10:22:41 -08:00
Nick Pelly
bdd265ba5f resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e
2011-01-25 10:20:02 -08:00
Jeff Hamilton
7a7cde6de1 am 883b26db: am 535ec16c: am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
* commit '883b26db47fc1bfdc29963b6987866de0ed318cd':
  Allow null filters for foreground dispatch to act as catch all.
2011-01-25 10:08:56 -08:00
John Reck
746e063c83 am 500c9e99: am 7f532976: Merge "Docs for Origin" into honeycomb
* commit '500c9e99f514bd6b3df9b04ed10a763ea752c138':
  Docs for Origin
2011-01-25 10:05:34 -08:00
Nick Pelly
8bfdd9a651 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-01-25 10:03:46 -08:00
Jeff Hamilton
883b26db47 am 535ec16c: am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
* commit '535ec16c78eada2d32669f5a2f8e3c227a5beecc':
  Allow null filters for foreground dispatch to act as catch all.
2011-01-25 10:03:17 -08:00
John Reck
500c9e99f5 am 7f532976: Merge "Docs for Origin" into honeycomb
* commit '7f532976baa54d2935a8ba42cc2c529b7460e57a':
  Docs for Origin
2011-01-25 10:03:14 -08:00
John Reck
7f532976ba Merge "Docs for Origin" into honeycomb 2011-01-25 10:01:16 -08:00
Shimeng (Simon) Wang
7c1bcfddcd Set high usage delta to 1 to avoid constant V8 GC.
This value will be passed to native webkit to V8.

3 consecutive dromaeo DOM core are run, there's no crash.
Because of assets change, Passion browser can't be run; this will
need to be checked in I release, I think

issue: 3317722
Change-Id: Ifa6e4116f76f395d98db9f8336f91dc9de6bf125
2011-01-25 09:55:11 -08:00
Jesse Wilson
a16e38f156 Merge "Prefer the overload of getDigestAlgorithm spelled correctly." 2011-01-25 09:44:24 -08:00
Jesse Wilson
66e40c36b3 Prefer the overload of getDigestAlgorithm spelled correctly.
Change-Id: Iaf1c031b982890c2ef21607bdf80acd652646e19
2011-01-25 09:40:57 -08:00
Gilles Debunne
f902d7bc49 TextLine cache is used, even for long lines of text.
Bug 3381368

The 250 characters limit is passed for long URLs. There are only 3
TextLine objects, so their total size is not an issue. Recycle long
lines as well to make sure we fill the cache and avoid object creation.

Change-Id: I843bf623594312a0fcf0edbb13b7cd64cce0ddd1
2011-01-25 09:09:46 -08:00
Nick Pelly
3b61e47a3f am b134223f: Make Mifare Classic increment/decrement operands little endian
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
  Make Mifare Classic increment/decrement operands little endian
2011-01-25 08:41:35 -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
Ken Wakasa
6a05139af1 am 901a8193: am 24a0b71a: Merge "Clip touch event at SoftInputWindow to handle the event from Inset" into honeycomb
* commit '901a81933415811d011d1596a3e2bd65ed2d490e':
  Clip touch event at SoftInputWindow to handle the event from Inset
2011-01-25 07:37:33 -08:00
Ken Wakasa
901a819334 am 24a0b71a: Merge "Clip touch event at SoftInputWindow to handle the event from Inset" into honeycomb
* commit '24a0b71a67ca98fbb94ff6ff321acb155d8a1014':
  Clip touch event at SoftInputWindow to handle the event from Inset
2011-01-25 07:28:12 -08:00
Ken Wakasa
24a0b71a67 Merge "Clip touch event at SoftInputWindow to handle the event from Inset" into honeycomb 2011-01-25 05:42:36 -08:00
Tadashi G. Takaoka
7bd6c20f26 Clip touch event at SoftInputWindow to handle the event from Inset
Bug: 3238092
Change-Id: I92d98bed75957c8db149e1ad87defe24d44f4d53
2011-01-25 18:02:55 +09:00
Dianne Hackborn
4ea2d2994a am dc3bb35b: am 4989aa7d: Merge "Fix issue #3385054: HRI24 never enters suspend (LP0) - IKXEVEREST-3439" into honeycomb
* commit 'dc3bb35b672841115a4fd5d22d98dc75ed4ade83':
  Fix issue #3385054: HRI24 never enters suspend (LP0) - IKXEVEREST-3439
2011-01-24 22:55:28 -08:00
Romain Guy
335f1513d7 am b372d7cb: am 89fca351: Merge "Make nested hardware layers work again" into honeycomb
* commit 'b372d7cbea0b80cda3c7b08dcaddbd5c398911b2':
  Make nested hardware layers work again
2011-01-24 22:55:24 -08:00
Dianne Hackborn
dc3bb35b67 am 4989aa7d: Merge "Fix issue #3385054: HRI24 never enters suspend (LP0) - IKXEVEREST-3439" into honeycomb
* commit '4989aa7da319e4fcf95a92c4a2d6f2cf1ed6d563':
  Fix issue #3385054: HRI24 never enters suspend (LP0) - IKXEVEREST-3439
2011-01-24 22:53:25 -08:00
Romain Guy
b372d7cbea am 89fca351: Merge "Make nested hardware layers work again" into honeycomb
* commit '89fca351702e3ec54c2748e2e2676ec1b2fbe9dc':
  Make nested hardware layers work again
2011-01-24 22:53:21 -08:00
Dianne Hackborn
4989aa7da3 Merge "Fix issue #3385054: HRI24 never enters suspend (LP0) - IKXEVEREST-3439" into honeycomb 2011-01-24 22:51:18 -08:00
Romain Guy
89fca35170 Merge "Make nested hardware layers work again" into honeycomb 2011-01-24 22:35:21 -08:00
Romain Guy
5e7f766e99 Make nested hardware layers work again
Change-Id: I97bde694ec1b712a1e010c8137919e6d64af3148
2011-01-24 22:35:56 -08:00
Ken Wakasa
80ed57d9c0 am 67e95052: am bc891b67: Merge "Fix NPE in IInputMethodSessionWrapper.executeMessage" into honeycomb
* commit '67e9505235fd4efd8fa15f88351d1eaf13a856cb':
  Fix NPE in IInputMethodSessionWrapper.executeMessage
2011-01-24 22:31:36 -08:00
Dianne Hackborn
1563966ca0 am 98d169ea: am 5d9d03a0: Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
* commit '98d169eacd65e6278bb8eab354f0278065771e9f':
  Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
2011-01-24 22:31:26 -08:00
Romain Guy
caf48e95e7 am 7b4950ae: am 169fafe6: Merge "Fix rendering issues with animated layers. Bug #3385247" into honeycomb
* commit '7b4950ae350255a393125cc4262925b432770ac4':
  Fix rendering issues with animated layers. Bug #3385247
2011-01-24 22:31:04 -08:00
Ken Wakasa
67e9505235 am bc891b67: Merge "Fix NPE in IInputMethodSessionWrapper.executeMessage" into honeycomb
* commit 'bc891b67e07fd6f5077f88879299dbdf27ae9ee1':
  Fix NPE in IInputMethodSessionWrapper.executeMessage
2011-01-24 22:12:44 -08:00
Dianne Hackborn
98d169eacd am 5d9d03a0: Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
* commit '5d9d03a0234faa3cffd11502f973057045cafe82':
  Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
2011-01-24 22:12:36 -08:00
Dianne Hackborn
c2d9c8e20b Fix issue #3385054: HRI24 never enters suspend (LP0) - IKXEVEREST-3439
Um.  My fix for calling onReceive() even after a receiver is
unregistered actually made it so onReceive() is never called for
the result receiver of a broadcast.

Change-Id: I30efe05d8fdec6fee4222b7d797f2b303073dbcc
2011-01-24 21:59:21 -08:00
Ken Wakasa
bc891b67e0 Merge "Fix NPE in IInputMethodSessionWrapper.executeMessage" into honeycomb 2011-01-24 21:37:53 -08:00
Dianne Hackborn
5d9d03a023 Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
...Invalid index 0, size is 0 at
android.app.ActivityThread.performPauseActivity(ActivityThread.java:2326)

It looks like if an arrow key is dispatched between the time the
list view is told its data set has changed and it does the resulting
layout pass, we could try to move the position to a now invalid
index.  This may prevent that from happening.

Also put in a better error message if saving state of a fragment
whose target is no longer in the fragment manager.

And fix a bug in PackageManager where we could return a null from
queryIntentActivities().

And add a new API to find out whether a fragment is being removed,
to help fix issue #3306021: NPE at
android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)

Next, for new HC apps we can delay committing data to
storage until the activity is stopped.

Finally, use the new multi-threaded AyncTask executor in a few
places, so we don't have worked blocked by long-running tasks from
the application.

Change-Id: I27b2aafedf2e1bf3a2316309889613fa539760f3
2011-01-24 21:23:03 -08:00
Ken Wakasa
a308c0326b Fix NPE in IInputMethodSessionWrapper.executeMessage
bug: 3384715
Change-Id: I4bd8f2b505318a9b3e17dccf6a583dc7f36a8a24
2011-01-25 14:02:07 +09:00