Dirk Dougherty
5cf8fa8046
am 0ac8ac30: Doc change: Add docs for licensing service.
...
Merge commit '0ac8ac301d056604485aeca9ffe5ce8d1e63ef19' into gingerbread
* commit '0ac8ac301d056604485aeca9ffe5ce8d1e63ef19':
Doc change: Add docs for licensing service.
2010-07-26 20:01:12 -07:00
Brad Fitzpatrick
cc41e06ef9
am eacf0ecd: Merge "Fix StrictMode for Binder.dump()" into gingerbread
...
Merge commit 'eacf0ecd00f77718ac4570077d729e33b6c320f4' into gingerbread-plus-aosp
* commit 'eacf0ecd00f77718ac4570077d729e33b6c320f4':
Fix StrictMode for Binder.dump()
2010-07-26 19:46:45 -07:00
Brad Fitzpatrick
f17bc88c60
Merge "Fix StrictMode for Binder.dump()" into gingerbread
2010-07-26 19:44:50 -07:00
Jean-Michel Trivi
125bc5dde1
am 4a60d618: Fix NPE in TextToSpeech with setLanguage(null)
...
Merge commit '4a60d61887a20d349e5eb38900dfbcaab06630fc' into gingerbread-plus-aosp
* commit '4a60d61887a20d349e5eb38900dfbcaab06630fc':
Fix NPE in TextToSpeech with setLanguage(null)
2010-07-26 17:53:57 -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
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
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
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
Eric Laurent
6862484713
Merge "LVM release 1.04." into gingerbread
2010-07-26 02:17:52 -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
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
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
Eric Laurent
3987726555
am 021697ad: Audio effects: lvm bundle wrapper update after first integration tests.
...
Merge commit '021697ad3d4ef981d0deae1fa223ed06f30df738' into gingerbread-plus-aosp
* commit '021697ad3d4ef981d0deae1fa223ed06f30df738':
Audio effects: lvm bundle wrapper update after first integration tests.
2010-07-23 01:03:06 -07:00
Mathias Agopian
84101fe028
am 4782cdbb: Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread
...
Merge commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7' into gingerbread-plus-aosp
* commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7':
Fix a memory corruption when writting Sensor into a parcel
2010-07-22 20:09:09 -07:00
Mathias Agopian
625177aa35
Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread
2010-07-22 20:07:01 -07:00
Mathias Agopian
d03d9ced3f
Fix a memory corruption when writting Sensor into a parcel
...
Change-Id: I03f703ae2224f43924031bfea4c68aa979bb9f05
2010-07-22 18:57:41 -07:00
Mathias Agopian
805b620794
am 19f082eb: Merge "filter sensor event by connection" into gingerbread
...
Merge commit '19f082ebe859da5191ccab5f38058513c32b3d05' into gingerbread-plus-aosp
* commit '19f082ebe859da5191ccab5f38058513c32b3d05':
filter sensor event by connection
2010-07-22 17:26:17 -07:00
Mathias Agopian
84a7d07f45
Merge "filter sensor event by connection" into gingerbread
2010-07-22 17:23:17 -07:00
James Dong
be9a667bb2
am 53d4e0d5: Allows the authoring engine to skip frame.
...
Merge commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba' into gingerbread-plus-aosp
* commit '53d4e0d58e2d5c18f6e026c705af833b9bdd7aba':
Allows the authoring engine to skip frame.
2010-07-22 16:25:17 -07:00
Jean-Baptiste Queru
5eb81846a0
am dd299046: Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
...
Merge commit 'dd29904638fb36cd5585560e83367d1f5565cc4c' into gingerbread-plus-aosp
* commit 'dd29904638fb36cd5585560e83367d1f5565cc4c':
frameworks/base: Implement Mutual exclusion in BroadcastReceiver
2010-07-22 16:14:18 -07:00
Jean-Baptiste Queru
b8bd449144
Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
2010-07-22 15:55:31 -07:00
Mathias Agopian
be48137beb
move native services under services/
...
moved surfaceflinger, audioflinger, cameraservice
all native services should now reside in this location.
Change-Id: Icd7336f7289db35df9c8c1857a5122bb8a6f1c86
2010-07-22 15:28:19 -07:00
Mathias Agopian
6c1ed6522d
am db3eb355: Merge "propagate sensor event rate properly to the sensor HAL" into gingerbread
...
Merge commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa' into gingerbread-plus-aosp
* commit 'db3eb3553502d142c85d47ec4fb847b7fa3b06fa':
propagate sensor event rate properly to the sensor HAL
2010-07-22 14:42:12 -07:00
Mathias Agopian
f35ed885c1
Merge "propagate sensor event rate properly to the sensor HAL" into gingerbread
2010-07-22 14:38:49 -07:00
Andreas Huber
98343e73aa
am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread
...
Merge commit '81046c8c42ff3b630c6496deafd44f2a07a25463' into gingerbread-plus-aosp
* commit '81046c8c42ff3b630c6496deafd44f2a07a25463':
Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes.
2010-07-22 13:54:47 -07:00
Andreas Huber
e99010aae2
Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread
2010-07-22 13:47:41 -07:00
Jean-Baptiste Queru
cdf63e92cf
am e7486695: Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"
...
Merge commit 'e7486695ced2dd135f6e2223b582adde4155b917' into gingerbread-plus-aosp
* commit 'e7486695ced2dd135f6e2223b582adde4155b917':
Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
2010-07-22 12:43:07 -07:00
Jean-Baptiste Queru
661d13b9e5
Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"
2010-07-22 12:22:56 -07:00
Jean-Baptiste Queru
72d60ccc35
am b42aa98d: Merge "Correct VM number updation during MBDN refresh."
...
Merge commit 'b42aa98d44f1ad22746005264274220770de2756' into gingerbread-plus-aosp
* commit 'b42aa98d44f1ad22746005264274220770de2756':
Correct VM number updation during MBDN refresh.
2010-07-22 11:47:26 -07:00
Jean-Baptiste Queru
11b9e7d766
Merge "Correct VM number updation during MBDN refresh."
2010-07-22 11:38:05 -07:00
Steve Howard
851ab85ea3
am 13d08515: Remove SEE_ALL_EXTERNAL permission from Download Manager.
...
Merge commit '13d08515f038db45de6028085993ae6076566867' into gingerbread-plus-aosp
* commit '13d08515f038db45de6028085993ae6076566867':
Remove SEE_ALL_EXTERNAL permission from Download Manager.
2010-07-22 11:31:37 -07:00