Commit Graph

16090 Commits

Author SHA1 Message Date
Mike Lockwood
1b55aad8ef Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 2010-07-28 04:04:18 -07:00
Brad Fitzpatrick
6c595a17f5 Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread 2010-07-27 18:34:08 -07:00
Steve Howard
38fa7eccc1 Merge "One last change to current.xml for new download manager API" into gingerbread 2010-07-27 16:55:14 -07:00
Brad Fitzpatrick
928b1c94a5 am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Merge commit '86c035f0d176be9cb06b1e4f2390c25701417586' into gingerbread

* commit '86c035f0d176be9cb06b1e4f2390c25701417586':
  COMMENT ONLY change to clarify ContentProvider documentation.
2010-07-27 16:52:12 -07:00
Brad Fitzpatrick
be2ec77f92 Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo 2010-07-27 16:44:53 -07:00
Steve Howard
1faba30b39 Merge "Un-@hide new download manager public API." into gingerbread 2010-07-27 16:29:37 -07:00
Brad Fitzpatrick
55fcdbc397 Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread 2010-07-27 15:19:08 -07:00
Brad Fitzpatrick
834772c15b Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread 2010-07-27 13:59:47 -07:00
Brad Fitzpatrick
70081a1511 Replace several IPCThreadState::get() lookups with one.
Also, make StrictMode's ThreadLocal final.

Change-Id: I08d400ed254fa67bb7a3dae1227f205a54c00df0
2010-07-27 12:28:57 -07:00
Dan Egnor
38e04ae4f9 Merge "Remove a log message Jason doesn't like" into gingerbread 2010-07-27 10:22:58 -07:00
Joe Onorato
385adbdbe3 am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." i
Merge commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917' into gingerbread

* commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917':
  Add a method to let a properly permissioned app directly
2010-07-27 09:14:42 -07:00
Joe Onorato
38723b069c Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." into froyo 2010-07-27 09:05:05 -07:00
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
f17bc88c60 Merge "Fix StrictMode for Binder.dump()" into gingerbread 2010-07-26 19:44:50 -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
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
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
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
84a7d07f45 Merge "filter sensor event by connection" into gingerbread 2010-07-22 17:23:17 -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
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
Mathias Agopian
e3c8234765 propagate sensor event rate properly
Change-Id: I32e67d30e4295285a6827956cc8161b2025d70bc
2010-07-21 16:09:39 -07:00
Mathias Agopian
49f2aee90c Merge "Better dumpsys logs" into gingerbread 2010-07-21 16:07:32 -07:00
Mathias Agopian
883b3e9206 Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread 2010-07-21 16:07:15 -07:00
Mathias Agopian
39e1a83cad Merge "new SensorService" into gingerbread 2010-07-21 16:06:46 -07:00
Dan Egnor
2307948dde am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo
Merge commit 'e8605af513e846f6cd223c9e92461189727d8c9b' into gingerbread

* commit 'e8605af513e846f6cd223c9e92461189727d8c9b':
  Avoid leaking file descriptors when returning drop box events.
2010-07-21 13:55:13 -07:00
Dan Egnor
e39c274841 Merge "Avoid leaking file descriptors when returning drop box events." into froyo 2010-07-21 13:53:23 -07:00
Andreas Huber
4745f5aea6 Merge "Add a seek test to the stagefright commandline tool." into gingerbread 2010-07-21 12:31:14 -07:00
Tom Taylor
36cdee48ec am dbac180d: Fix a merge problem with html mms
Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread

* commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff':
  Fix a merge problem with html mms
2010-07-21 11:22:22 -07:00
Andreas Huber
976f08643c Merge "Support finer seek control on MediaSources." into gingerbread 2010-07-21 10:36:08 -07:00
James Dong
97a5e2992a Merge "Progress status notification" into gingerbread 2010-07-20 14:29:39 -07:00
Jason Parks
24e0cd34aa Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 2010-07-20 14:01:39 -07:00
Dan Egnor
95127e043b am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread

* commit '2f0dc6d9f50ceece294e9db393583e655d3bf781':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
2010-07-20 13:59:43 -07:00
Dan Egnor
468c4f6de9 Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 2010-07-20 13:57:08 -07:00
Scott Main
5933744aa3 am 2316d626: docs: add information about using color resources as drawables
Merge commit '2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread

* commit '2316d6260862230af10d8ca3ff446ad3f560f712':
  docs: add information about using color resources as drawables
2010-07-20 13:53:55 -07:00
Dan Egnor
e26a37d259 Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 2010-07-20 13:23:09 -07:00
Dan Egnor
a53040a705 resolved conflicts for merge of 9bc4039a to gingerbread
Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec
2010-07-20 11:30:17 -07:00
Eric Laurent
af1b8029d7 Merge "Audio policy manager changes for audio effects" into gingerbread 2010-07-20 11:25:35 -07:00
Andreas Huber
c49422fba4 Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread 2010-07-20 09:18:58 -07:00
Dan Egnor
351778fa02 Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo 2010-07-19 18:14:50 -07:00
Mathias Agopian
a7352c9f4a new SensorService
remove old sensor service and implement SensorManager
on top of the new (native) SensorManger API.

Change-Id: Iddb77d498755da3e11646473a44d651f12f40281
2010-07-19 17:57:29 -07:00
Jamie Gennis
ac07cd613f Remove some debug logging that I accidentally committed.
Change-Id: Ib182455fad5e5b3f3f59b3ff24f59dcd7f638292
2010-07-19 16:09:26 -07:00
Vasu Nori
9f63ea27d5 Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 2010-07-19 15:26:39 -07:00
Scott Main
dfe85d8b12 am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Merge commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d' into gingerbread

* commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d':
  docs: add troubleshooting to eclipse guide about restarting adb
2010-07-19 14:50:32 -07:00
Scott Main
7125c105c4 Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 2010-07-19 14:42:13 -07:00
Danica Chang
4978e7814f Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 2010-07-19 13:47:50 -07:00
Eric Laurent
b04f72e609 Merge "Fixed problems in audio effect volume control." into gingerbread 2010-07-19 10:13:27 -07:00