Commit Graph

18628 Commits

Author SHA1 Message Date
Eric Laurent
df7961b143 am e80c30c6: am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
Merge commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338'

* commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338':
  Fixed bug in vlm effect bunde wrapper effect init function.
2010-07-26 12:30:49 -07:00
Mike Lockwood
a9cf1fd3f4 am 64f04a64: am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread
Merge commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416'

* commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416':
  Avoid starting multiple threads in ShutdownThread
2010-07-26 12:30:28 -07:00
Eric Laurent
51646b13e0 am df5c3b50: am 739bf285: Merge "LVM release 1.04." into gingerbread
Merge commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365'

* commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365':
  LVM release 1.04.
2010-07-26 12:30:23 -07:00
Dianne Hackborn
072b727775 am b6022e3d: am 14bfa398: Infrastructure to report running services to developer.
Merge commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736'

* commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736':
  Infrastructure to report running services to developer.
2010-07-26 12:30:19 -07:00
Dianne Hackborn
df55b02fbd am ef1b9c6a: am 3ac8eb72: Update app label.
Merge commit 'ef1b9c6aa7a9a4dd79823e47829a9ca894c06a0f'

* commit 'ef1b9c6aa7a9a4dd79823e47829a9ca894c06a0f':
  Update app label.
2010-07-26 12:30:15 -07:00
Dianne Hackborn
fec9bb7edf am 3a2ff74f: am 46730fc7: Fix handling of application disabled state.
Merge commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111'

* commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111':
  Fix handling of application disabled state.
2010-07-26 12:30:10 -07:00
Dianne Hackborn
3c5cce6542 am 443d884e: am 3bee5af8: Battery stats: start removing last stats, keep total discharge.
Merge commit '443d884e16fad2e01a97aa788d4b30de53c94048'

* commit '443d884e16fad2e01a97aa788d4b30de53c94048':
  Battery stats: start removing last stats, keep total discharge.
2010-07-26 12:30:06 -07:00
Mathias Agopian
44188ffbf9 am fed3c364: am eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread
Merge commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248'

* commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248':
  Report sensor events to BatteryStats service
2010-07-26 12:30:01 -07:00
Mathias Agopian
96bf4875ab am 02c06410: am f88ed6c2: Merge "SensorService handles last known state properly" into gingerbread
Merge commit '02c06410461e3880c6ad2c0d15637438113adb4e'

* commit '02c06410461e3880c6ad2c0d15637438113adb4e':
  SensorService handles last known state properly
2010-07-26 12:29:56 -07:00
Steve Howard
e5d8d23504 am a08a0a7b: am a13a02cd: New permission for non-purgeable cache downloads.
Merge commit 'a08a0a7bee7ba09917b94e41c705a643c8e06a1a'

* commit 'a08a0a7bee7ba09917b94e41c705a643c8e06a1a':
  New permission for non-purgeable cache downloads.
2010-07-26 12:29:49 -07:00
Eric Laurent
2dce5547f7 am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
Merge commit '00de721859ca291d0e212a6970f0bd8b3a2f8428' into gingerbread-plus-aosp

* commit '00de721859ca291d0e212a6970f0bd8b3a2f8428':
  Fixed bug in vlm effect bunde wrapper effect init function.
2010-07-26 12:25:37 -07:00
Mike Lockwood
8c335a50b8 am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread
Merge commit '70736a6d92767258543bb03ac22a705535d86341' into gingerbread-plus-aosp

* commit '70736a6d92767258543bb03ac22a705535d86341':
  Avoid starting multiple threads in ShutdownThread
2010-07-26 12:25:31 -07:00
Eric Laurent
f087436b0c am 739bf285: Merge "LVM release 1.04." into gingerbread
Merge commit '739bf285be7a154b92e74b069dff7dc8f7ffc2f3' into gingerbread-plus-aosp

* commit '739bf285be7a154b92e74b069dff7dc8f7ffc2f3':
  LVM release 1.04.
2010-07-26 12:25:24 -07:00
Dianne Hackborn
b7ed8acac1 am 14bfa398: Infrastructure to report running services to developer.
Merge commit '14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp

* commit '14bfa398a4e8697ce5822861a684b7d1245e4a85':
  Infrastructure to report running services to developer.
2010-07-26 12:24:57 -07:00
Dianne Hackborn
370ea7364a am 3ac8eb72: Update app label.
Merge commit '3ac8eb7278e3603d1a35fdbd2fff540a235da2ab' into gingerbread-plus-aosp

* commit '3ac8eb7278e3603d1a35fdbd2fff540a235da2ab':
  Update app label.
2010-07-26 12:24:39 -07:00
Dianne Hackborn
aec5d77fbe am 46730fc7: Fix handling of application disabled state.
Merge commit '46730fc78388607fd562044cbaaa26ffc9f65337' into gingerbread-plus-aosp

* commit '46730fc78388607fd562044cbaaa26ffc9f65337':
  Fix handling of application disabled state.
2010-07-26 12:24:21 -07:00
Dianne Hackborn
7cd6017314 am 3bee5af8: Battery stats: start removing last stats, keep total discharge.
Merge commit '3bee5af8162c177f8c8f4199489a401058ab26a9' into gingerbread-plus-aosp

* commit '3bee5af8162c177f8c8f4199489a401058ab26a9':
  Battery stats: start removing last stats, keep total discharge.
2010-07-26 12:24:16 -07:00
Mathias Agopian
c57be7f300 am eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread
Merge commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d' into gingerbread-plus-aosp

* commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d':
  Report sensor events to BatteryStats service
2010-07-26 12:24:00 -07:00
Mathias Agopian
33b0a2c40a am f88ed6c2: Merge "SensorService handles last known state properly" into gingerbread
Merge commit 'f88ed6c2ce750fcf7fb23778286e15557de758f9' into gingerbread-plus-aosp

* commit 'f88ed6c2ce750fcf7fb23778286e15557de758f9':
  SensorService handles last known state properly
2010-07-26 12:23:55 -07:00
Steve Howard
9a63ac7889 am a13a02cd: New permission for non-purgeable cache downloads.
Merge commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964' into gingerbread-plus-aosp

* commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964':
  New permission for non-purgeable cache downloads.
2010-07-26 12:23:48 -07:00
Xavier Ducrohet
dc47e13d35 am f8c335e8: am f72181c6: Fix hosttests to use the new ddmlib API.
Merge commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4'

* commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4':
  Fix hosttests to use the new ddmlib API.
2010-07-26 12:01:13 -07:00
Gilles Debunne
924e831ddc am d24ac171: am 8cd48574: Fixed bug in BitmapFactory.decodeStream
Merge commit 'd24ac17121b23efb17219f355e5dd38f933352ff'

* commit 'd24ac17121b23efb17219f355e5dd38f933352ff':
  Fixed bug in BitmapFactory.decodeStream
2010-07-26 12:01:06 -07:00
Xavier Ducrohet
6f936f73b4 am f72181c6: Fix hosttests to use the new ddmlib API.
Merge commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e' into gingerbread-plus-aosp

* commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e':
  Fix hosttests to use the new ddmlib API.
2010-07-26 11:43:07 -07:00
Gilles Debunne
ea8db98aab am 8cd48574: Fixed bug in BitmapFactory.decodeStream
Merge commit '8cd48574a755bea86243e9f9eabaee341ecf9c60' into gingerbread-plus-aosp

* commit '8cd48574a755bea86243e9f9eabaee341ecf9c60':
  Fixed bug in BitmapFactory.decodeStream
2010-07-26 11:41:46 -07:00
Romain Guy
e86d28e4b1 Merge "Fix text corruption when rendering RTL enabled text." 2010-07-26 11:39:27 -07:00
Jean-Baptiste Queru
2de445cf70 am bd01583d: resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp
Merge commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4'

* commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4':
  move native services under services/
2010-07-26 10:26:46 -07:00
Jean-Baptiste Queru
a0410b4b68 resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp
Change-Id: Ibd9f488a0331c472a852054af5db06f8e7d35e76
2010-07-26 10:22:58 -07:00
Ben Komalo
ea5f5f9a86 Merge "Ensure that creating a Loader/LoaderManager after the Activity has started will kick off startLoading() as expected." 2010-07-26 10:18:29 -07:00
Jean-Baptiste Queru
f818af3dab am 14d9c34c: am c7ab09ed: Merge "Fix build."
Merge commit '14d9c34ccb75795d0b219b3dcc42c2269eb0e756'

* commit '14d9c34ccb75795d0b219b3dcc42c2269eb0e756':
  Fix build.
2010-07-26 10:13:02 -07:00
Eric Laurent
23abef82b6 Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread 2010-07-26 10:09:54 -07:00
Jean-Baptiste Queru
8bdc24e308 am c7ab09ed: Merge "Fix build."
Merge commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b' into gingerbread-plus-aosp

* commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b':
  Fix build.
2010-07-26 10:05:23 -07:00
Jean-Baptiste Queru
91d4d71a04 Merge "move native services under services/" 2010-07-26 10:01:19 -07:00
Jean-Baptiste Queru
9e4acbb6dd Merge "Fix build." 2010-07-26 09:56:10 -07:00
Mike Lockwood
d6499d8b3f Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread 2010-07-26 08:11:54 -07:00
Maksymilian Osowski
408c105fb6 Merge "First stage of refactoring the code to handle crashes gracefully." 2010-07-26 03:06:01 -07:00
Eric Laurent
6862484713 Merge "LVM release 1.04." into gingerbread 2010-07-26 02:17:52 -07:00
Dianne Hackborn
0a795767b1 Merge "Add new DialogFragment class." 2010-07-24 11:44:04 -07:00
Romain Guy
a14d7cd8f7 Merge "Add text alignment support to drawText()." 2010-07-23 18:56:32 -07:00
Jean-Baptiste Queru
40cff52d07 am 1b05a79f: am 7cdd26ce: Merge "Enables writing to USIM phonebook (fixes issue 8976)."
Merge commit '1b05a79f7d3c77ac2135d8f1ab40f0b13854ffae'

* commit '1b05a79f7d3c77ac2135d8f1ab40f0b13854ffae':
  Enables writing to USIM phonebook (fixes issue 8976).
2010-07-23 17:52:30 -07:00
Jean-Baptiste Queru
c2c0f38d81 am 7cdd26ce: Merge "Enables writing to USIM phonebook (fixes issue 8976)."
Merge commit '7cdd26ce30e61a108e4def932b96aca9f031e5d2' into gingerbread-plus-aosp

* commit '7cdd26ce30e61a108e4def932b96aca9f031e5d2':
  Enables writing to USIM phonebook (fixes issue 8976).
2010-07-23 17:48:11 -07:00
Jean-Baptiste Queru
ec5506e87a Merge "Enables writing to USIM phonebook (fixes issue 8976)." 2010-07-23 17:35:13 -07:00
Mathias Agopian
5767cf62a4 Merge "Report sensor events to BatteryStats service" into gingerbread 2010-07-23 17:03:43 -07:00
Mathias Agopian
148b25a2a6 Merge "SensorService handles last known state properly" into gingerbread 2010-07-23 16:39:34 -07:00
Jean-Baptiste Queru
532948cbc3 am 8a13d4e3: am f5c73101: Merge "dependent change for "parse instrumentation result bundles" in sdk"
Merge commit '8a13d4e3e5a175baddb7b8ca542d9d9941cf24a6'

* commit '8a13d4e3e5a175baddb7b8ca542d9d9941cf24a6':
  dependent change for "parse instrumentation result bundles" in sdk
2010-07-23 15:34:50 -07:00
Jean-Baptiste Queru
71f592ceca am f5c73101: Merge "dependent change for "parse instrumentation result bundles" in sdk"
Merge commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf' into gingerbread-plus-aosp

* commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf':
  dependent change for "parse instrumentation result bundles" in sdk
2010-07-23 15:32:45 -07:00
Jean-Baptiste Queru
0e81e1b726 Merge "dependent change for "parse instrumentation result bundles" in sdk" 2010-07-23 15:24:55 -07:00
Jean-Baptiste Queru
5ac6e1e022 am 5b0f030d: resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp
Merge commit '5b0f030d0bfdf7003e74b24da8c4379c74447380'

* commit '5b0f030d0bfdf7003e74b24da8c4379c74447380':
  Remove compilation warnings by removing illegal characters
2010-07-23 15:04:28 -07:00
Alex Sakhartchouk
2f31238dfe Merge "Updating parts of font cache as needed instead of the entire map." 2010-07-23 15:00:24 -07:00
Jean-Baptiste Queru
66282a6a09 resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp
Change-Id: Ief79eaa532b583d9608701d48464b7afdc493bac
2010-07-23 14:15:01 -07:00
Romain Guy
410d0ea5a4 Merge "Remove compilation warnings by removing illegal characters" 2010-07-23 14:05:40 -07:00