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
Mathias Agopian
cee79391c8
fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
...
rework how our EGL wrapper manages EGLConfig:
- we now store the EGLConfig with the EGLSurface and EGLContext
so that we can have easy access to it from eglQueryContext
and eglQuerySurface.
- EGLConfig now are an index into a sorted table of egl_config_t,
we use a binary search to retrieve our EGLConfig (the index) from
the implementation's EGLConfig.
- egl_config_t keeps track of the implementation's index,
EGLConfig and CONFIG_ID as well as our CONFIG_ID.
In many ways, this implementation is simpler and more robust, as it doesn't
assume anything about the number of implementations nor what EGLConfig is
made of (the previous code assumed EGLConfig didn't usem more than 24-bits).
Change-Id: Id5abe923aacb6e1fd2b63bd8c15d7b04ae824922
2010-07-26 21:14:59 -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
Adam Bliss
39a9bd6d49
Merge "Don't throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
2010-07-19 08:09:19 -07:00
Jeff Brown
f26db0d6c5
Fix trackball down and movement bugs.
...
Bug: 2823788
Change-Id: Icb0c392b58f7e735614460b5eb87439cb73ac4f2
2010-07-16 17:46:03 -07:00
Hung Dang
9b242faf8b
am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
...
Merge commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2' into gingerbread
* commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2':
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
2010-07-16 15:15:44 -07:00
Jamie Gennis
874da6e438
Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread
2010-07-16 15:14:44 -07:00
Hung Dang
fb9b2483c9
Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
2010-07-16 15:13:12 -07:00
Jeff Brown
3cf1c9b844
Fix individual pointer id up/down reporting.
...
Fix a minor threading bug in InputManager dump.
Change-Id: Ic2eecf7df5a8dc9f40561fcb03ebe58a2c073778
2010-07-16 15:11:24 -07:00
Scott Main
127c21f74a
am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo
...
Merge commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1' into gingerbread
* commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1':
docs: editorial revisions to Search guide
2010-07-16 14:59:48 -07:00
Scott Main
f044328d09
Merge "docs: editorial revisions to Search guide" into froyo
2010-07-16 14:52:03 -07:00
Jamie Gennis
aca4e22879
Re-use existing Surface objects when reading them from parcels.
...
This change adds a process-global cache of previously deserialized Surface
objects so that if a Surface object wrapping the same ISurface gets received
again the same Surface can be used. This is important because the 'tail'
pointer in the SharedBufferClient is stored only on the client side, and needs
to be the same for all the Surface objects wrapping an ISurface instance. This
solves the problem by making there only be one Surface object wrapping an
ISurface per process.
Change-Id: I4bf0b8787885c56277622fca053022d2bb638902
2010-07-16 13:03:15 -07:00