drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,782 Commits 1 Branch 0 Tags
Commit Graph

41782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
774f9be5dc Merge "Add debug to CallManager#canDial." into honeycomb 2011-01-25 11:02:25 -08:00
Romain Guy
2bd78c9a9b Merge "Remove debugging log left by mistake." into honeycomb 2011-01-25 11:01:55 -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
Marco Nelissen
8952df7240 am 4b440268: am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread 
* commit '4b44026879723d924ddc306ea1e330a9e87c3a1c':
  Increase the number of useful bits in the spectrum.
 2011-01-25 10:58:56 -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
Hung-ying Tyan
b30392d288 am df1cc4ef: am cc019c0c: Merge "Get mute state from active call." into gingerbread 
* commit 'df1cc4ef9205239701bbe73f903e89a9dfd2623a':
  Get mute state from active call.
 2011-01-25 10:58:42 -08:00
Hung-ying Tyan
2b6d07a51a am 8a424af1: am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread 
* commit '8a424af1d93a13f3b330ffe39de8aa7c592fdf49':
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.
 2011-01-25 10:58:26 -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
Jeff Brown
2996adb765 am e9acc401: (-s ours) am d8bdc06f: Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE) 
* commit 'e9acc40151db2c5ec3c958c206f7c2e805709e29':
  Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
 2011-01-25 10:53:51 -08:00
Andreas Huber
a79ec961af am ca1cf59f: (-s ours) am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder 
* commit 'ca1cf59f495dacb132f2a83cefad41d51141a699':
  DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
 2011-01-25 10:53:46 -08:00
Brad Fitzpatrick
28ae70ceac am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder" 
* commit '23a813e17d94083c24a34559864722c809b4e0f7':
  Avoid using String.format in MediaRecorder
 2011-01-25 10:48:05 -08:00
Justin Ho
e73a710bea am 7cd1cc83: am 28c4f69a: Updated checkbox assets 
* commit '7cd1cc83194fb25b0bcc9d40b20dcff9a427afe8':
  Updated checkbox assets
 2011-01-25 10:47:56 -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
Robert Greenwalt
678c6a358d am d14239a2: Merge "Fix tethering when switching default connection" into honeycomb 
* commit 'd14239a2fb12d775f7b2345286d36ac02234e0a7':
  Fix tethering when switching default connection
 2011-01-25 10:30:36 -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
Arnaud Ferir
0d1289122c am 10ab8617: am 5e81a6e2: Fix trace mismatch. 
* commit '10ab8617e85c9a675ff8251cd328beb4e047777c':
  Fix trace mismatch.
 2011-01-25 10:29:59 -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
John Wang
c3a5b19c95 am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread 
* commit '78eb92388ce30aee9b9aaa3e6c9a2de185f8d6a4':
  Enable recovery in RIL wakelock release check.
 2011-01-25 10:29:44 -08:00
Robert Greenwalt
d14239a2fb Merge "Fix tethering when switching default connection" into honeycomb 2011-01-25 10:27: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
bdd265ba5f resolved conflicts for merge of 12619677 to honeycomb-plus-aosp 
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e
 2011-01-25 10:20:02 -08:00
Gilles Debunne
d6e568c4f3 Removed warnings in DynamicLayout 
Change-Id: Ied1c330795412d0bdcac1236b466951112fabc7d
 2011-01-25 10:14:43 -08:00
Marco Nelissen
4b44026879 am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread 
* commit 'c929677e017759047d94599faa1b80ebe278fefb':
  Increase the number of useful bits in the spectrum.
 2011-01-25 10:11:09 -08:00
Marco Nelissen
c929677e01 Merge "Increase the number of useful bits in the spectrum." into gingerbread 2011-01-25 10:06:16 -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
Jim Miller
00e37916bc am 1323ab83: am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM. 
* commit '1323ab83e4be088fd66ad73ea9da617e46382987':
  Fix 3379239: Catch exceptions from workaround for OOM.
 2011-01-25 10:02:53 -08:00
Dianne Hackborn
119919b81a am 1240719a: am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays" 
* commit '1240719ae06855d38f1fa159dd73e2109bb9586f':
  aapt: Allow raw "%" in unformatted string-arrays
 2011-01-25 10:02:46 -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
Justin Ho
58ea8f7a5c Merging Gingerbread assets into Honeycomb 
Change-Id: I282a84211a8a888d99b0582fbff6a45c4378f8bf
 2011-01-25 09:25:31 -08:00
Justin Ho
34dc9c37e8 Removing old assets from SystemUI in drawable-hdpi 
Change-Id: I53d15f37eb5079df74a22f0d80fed7ecbdb14b61
 2011-01-25 09:23:16 -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
8847fd8532 Merge "Merge commit 'c3563eb9' into honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-01-25 08:58:57 -08:00
Nick Pelly
33bfcd7f22 Merge commit 'c3563eb9' into honeycomb-plus-aosp 
Change-Id: I63ff88ae3597ea8722a59d16e66f5ea65ffa3b9e
 2011-01-25 08:57:50 -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
satok
6ee3bcf6c6 am 3a92c5fd: Merge "Fix the return value of switch to last ime." into honeycomb 
* commit '3a92c5fd3262236e0c6969591da7f6cb50dbddfc':
  Fix the return value of switch to last ime.
 2011-01-25 08:02:42 -08:00
satok
3a92c5fd32 Merge "Fix the return value of switch to last ime." into honeycomb 2011-01-25 08:00:29 -08:00
satok
c445bcd0bc Fix the return value of switch to last ime. 
Change-Id: I5fe8cc696433a7ee72973d16d8f121d3362ab0e0
 2011-01-26 00:49:51 +09: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
satok
89bd89a0dd am b5627921: Merge "Sort IME by id" into honeycomb 
* commit 'b562792129a547bf124e71be7ca5d556c0aefb55':
  Sort IME by id
 2011-01-25 07:28:24 -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
satok
b562792129 Merge "Sort IME by id" into honeycomb 2011-01-25 06:34:21 -08:00
satok
7dc93a1df7 Sort IME by id 
Bug: 3364167

Change-Id: I8c8e4ddc4110e2920c8c7beccf108ac7e0227903
 2011-01-25 23:28:22 +09: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
Jason Sams
0ac3046426 am 03855bbe: Fix bug 3385881 Launch signals and threads are not always matched in index. Threads grab launch indexes as they start which may not be the order in which they were launched. 
* commit '03855bbe4a55668d6834514f83f8c2276e9dc594':
  Fix bug 3385881 Launch signals and threads are not always matched in index.  Threads grab launch indexes as they start which may not be the order in which they were launched.
 2011-01-25 00:40:34 -08:00