Commit Graph

27835 Commits

Author SHA1 Message Date
Jaikumar Ganesh
8cb1073856 am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb
* commit '5cbb162262cf2dc1a5763ddbdeb4f8ec50c33dba':
  Rename virtual call API to ScoUsingVirtualCall.
2011-01-25 14:00:32 -08:00
Romain Guy
242d290802 am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb
* commit '3ac1b0f0d4d78568faf7616b2a8b808bdf5c4882':
  Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339
2011-01-25 13:58:08 -08:00
Jaikumar Ganesh
b2fdb066d2 Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb 2011-01-25 13:56:02 -08:00
Romain Guy
260e546e98 Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb 2011-01-25 13:55:14 -08:00
Gilles Debunne
f21fbdce79 am c927ec50: Merge "Overscoll bounce amplitude is smaller." into honeycomb
* commit 'c927ec50497bf5f477663deb7b366b37185d46b0':
  Overscoll bounce amplitude is smaller.
2011-01-25 13:47:24 -08:00
Adam Powell
40ddaa1ef2 am f72a13ec: Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb
* commit 'f72a13ec76517ff0be297f194c88ceb0d84b85e8':
  Fix bug 3378333 - Holo-style layout for granting permissions
2011-01-25 13:45:19 -08:00
Gilles Debunne
4a3a735d74 Merge "Overscoll bounce amplitude is smaller." into honeycomb 2011-01-25 13:44:32 -08:00
Adam Powell
69d4962cb2 Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb 2011-01-25 13:42:49 -08:00
Dheeraj Sharma
34bb5035d9 am b8942108: Merge "Video Editor:Fix for 3375632" into honeycomb
* commit 'b8942108826893657ca0b8b6d5d6d153739a76f6':
  Video Editor:Fix for 3375632
2011-01-25 12:52:38 -08:00
Dheeraj Sharma
a7c5e7650e Merge "Video Editor:Fix for 3375632" into honeycomb 2011-01-25 12:50:34 -08:00
Amith Yamasani
ea0844a886 am 6bcbf54f: Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb
* commit '6bcbf54feed8ca7c1bf9b509f8581684988d45dd':
  Heed the focusability flag in SearchView and set the default to true.
2011-01-25 12:38:40 -08:00
Jeff Brown
a0a7dfeb53 am 561a434b: Merge "Fix emulator trackball." into honeycomb
* commit '561a434b9769217b8936eea40b564bb9615f1a12':
  Fix emulator trackball.
2011-01-25 12:36:26 -08:00
Amith Yamasani
1571ac1ae2 Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb 2011-01-25 12:35:06 -08:00
Jeff Brown
41cd3a720a Merge "Fix emulator trackball." into honeycomb 2011-01-25 12:33:50 -08:00
Gilles Debunne
0ea5694013 am bb37b647: Merge "Fixed CAB background and selection color for legacy applications." into honeycomb
* commit 'bb37b6477fe76a045654290f2b998a61ff2632b9':
  Fixed CAB background and selection color for legacy applications.
2011-01-25 11:39:39 -08:00
Gilles Debunne
bf2a4a1135 Merge "Fixed CAB background and selection color for legacy applications." into honeycomb 2011-01-25 11:37:54 -08:00
Gilles Debunne
7d4e74e12d am 2a32a39e: Merge "Removed warnings in DynamicLayout" into honeycomb
* commit '2a32a39e9a0455732724bbbbbdce41e12a8ffb1e':
  Removed warnings in DynamicLayout
2011-01-25 11:36:21 -08:00
Gilles Debunne
d4a0a583c6 Merge "Removed warnings in DynamicLayout" into honeycomb 2011-01-25 11:34:19 -08:00
Wink Saville
27e813464d am 774f9be5: Merge "Add debug to CallManager#canDial." into honeycomb
* commit '774f9be5dc02e8a7f742008872c6214e517cb8a3':
  Add debug to CallManager#canDial.
2011-01-25 11:06:24 -08:00
Romain Guy
e02457720b am 2bd78c9a: Merge "Remove debugging log left by mistake." into honeycomb
* commit '2bd78c9a9b15d1c5c06d838c1fca77d9748e1c41':
  Remove debugging log left by mistake.
2011-01-25 11:03:55 -08:00
Wink Saville
8b43d1bb62 Merge "Add debug to CallManager#canDial." into honeycomb 2011-01-25 11:02:25 -08:00
Romain Guy
ab968d018c Merge "Remove debugging log left by mistake." into honeycomb 2011-01-25 11:01:55 -08:00
Brian Carlstrom
8c864ca446 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
d8b13cb776 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
19ab1403f7 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
372b9f199c 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
6c286e919f 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
6fc3211a09 Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb 2011-01-25 10:58:02 -08:00
Jeff Brown
d1083fed65 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
fb0c560eeb 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
7de2597cf4 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
78a8e2c5c4 am 7cd1cc83: am 28c4f69a: Updated checkbox assets
* commit '7cd1cc83194fb25b0bcc9d40b20dcff9a427afe8':
  Updated checkbox assets
2011-01-25 10:47:56 -08:00
Gilles Debunne
a4e84c5bd9 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
65e2e812c3 Merge "TextLine cache is used, even for long lines of text." into honeycomb 2011-01-25 10:43:05 -08:00
Robert Greenwalt
610894ab6f 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
c129567bf7 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
ff5fdec6d0 am 10ab8617: am 5e81a6e2: Fix trace mismatch.
* commit '10ab8617e85c9a675ff8251cd328beb4e047777c':
  Fix trace mismatch.
2011-01-25 10:29:59 -08:00
Sylvain Fonteneau
0c6e45cfb5 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
23b081af5e 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
10a2205d31 Merge "Fix tethering when switching default connection" into honeycomb 2011-01-25 10:27:51 -08:00
Shimeng (Simon) Wang
a520267488 Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb 2011-01-25 10:27:24 -08:00
Nick Pelly
78e8e2b421 resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
Change-Id: I1fcb292287f82605db41d330ae840fb5f617847b
2011-01-25 10:26:54 -08:00
Nick Pelly
bb635189fc resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e
2011-01-25 10:20:02 -08:00
Marco Nelissen
e1ea1e3e74 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
802c092a8a Merge "Increase the number of useful bits in the spectrum." into gingerbread 2011-01-25 10:06:16 -08:00
Nick Pelly
0047debd05 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
8db548d782 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
889ae9270e am 7f532976: Merge "Docs for Origin" into honeycomb
* commit '7f532976baa54d2935a8ba42cc2c529b7460e57a':
  Docs for Origin
2011-01-25 10:03:14 -08:00
Jim Miller
73cb8207ce 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
90c0c8a971 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