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

42514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
968c805086 am a79ec961: (-s ours) am ca1cf59f: (-s ours) am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder 
* commit 'a79ec961af59ad754cc338a1d3579f9940246b6f':
  DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
 2011-01-25 10:56:38 -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
23b802f65b am 28ae70ce: am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder" 
* commit '28ae70ceac7d8295c3ba0dbd644c5cef56dc72b3':
  Avoid using String.format in MediaRecorder
 2011-01-25 10:50:59 -08:00
Justin Ho
9fcaeb9139 am e73a710b: am 7cd1cc83: am 28c4f69a: Updated checkbox assets 
* commit 'e73a710bea6e3d925c028e90be43618ee5d23826':
  Updated checkbox assets
 2011-01-25 10:50:56 -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
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
Robert Greenwalt
fc8e55850b am 678c6a35: am d14239a2: Merge "Fix tethering when switching default connection" into honeycomb 
* commit '678c6a358dc14beb7825b30346ab09df432ba1fe':
  Fix tethering when switching default connection
 2011-01-25 10:34:53 -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
Arnaud Ferir
eed0f2c22d am 0d128912: am 10ab8617: am 5e81a6e2: Fix trace mismatch. 
* commit '0d1289122c2215add91cb86d520a72fd0815b6b6':
  Fix trace mismatch.
 2011-01-25 10:32:39 -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
John Wang
b761f681e8 am c3a5b19c: am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread 
* commit 'c3a5b19c9518cf4cc7206a69015c96119bf35f73':
  Enable recovery in RIL wakelock release check.
 2011-01-25 10:32:31 -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
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
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
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
Jean-Michel Trivi
138ca4affa Merge "Bug 3376700 Add support in APM for stream-specific volume curves" 2011-01-25 10:10:24 -08:00
Nick Pelly
1b90877aff am 8bfdd9a6: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 
* commit '8bfdd9a65102c13e6a0786d16bf27083be8a98ff':
 2011-01-25 10:09:00 -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
Jim Miller
0a2a4addd4 am 00e37916: am 1323ab83: am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM. 
* commit '00e37916bc121cea928f6bad6d059cbd00e8bf6b':
  Fix 3379239: Catch exceptions from workaround for OOM.
 2011-01-25 10:08:38 -08:00
Dianne Hackborn
217b0a8468 am 119919b8: am 1240719a: am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays" 
* commit '119919b81a2aee7637219ea2c255fc55c886a11f':
  aapt: Allow raw "%" in unformatted string-arrays
 2011-01-25 10:08:20 -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
Jean-Michel Trivi
3aab0583d9 Bug 3376700 Add support in APM for stream-specific volume curves 
The stream volume was handled the same way for all different stream,
 the only potential difference between each of them being the number
 of steps available to the user to change the volume. This was
 mapped to 99 steps of 0.5dB amplitude, offering a maximum attenuation
 of -49.5dB.
This change consists in defining for each stream a curve with two
 knees (3 segments) for conversion from volume index to attenuation.
 This curve is defined in the AudioPolicyManager in
 initializeVolumeCurves(), and can therefore be overridden by the
 platform.
Note that this change doesn't modify the volume curves: this CL
 enables the curves to be changed by overriding this default
 behavior.

Change-Id: I575b66799c52df2906db248943b15120b8a79ea2
 2011-01-25 10:04:31 -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
Jesse Wilson
a16e38f156 Merge "Prefer the overload of getDigestAlgorithm spelled correctly." 2011-01-25 09:44:24 -08:00
Mike Lockwood
cebc92c9a9 Revert "libutils: Fix race condition in Thread::requestExitAndWait()" 
This change turned out to be unnecessary

This reverts commit 4a7f412e1d932f46f6adf079df4d9ee7279bd795.
 2011-01-25 09:41:20 -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
8b8138d76d am 8847fd85: Merge "Merge commit \'c3563eb9\' into honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '8847fd8532c12c8d3cf7f68e0313141b6f877434':
  Fix getSwitchState.
 2011-01-25 09:06:41 -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
satok
e9423b7c7a am 6ee3bcf6: am 3a92c5fd: Merge "Fix the return value of switch to last ime." into honeycomb 
* commit '6ee3bcf6c6b4e8a03903ca029fee5ee5df7668d3':
  Fix the return value of switch to last ime.
 2011-01-25 08:04:57 -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