3127 Commits

Author SHA1 Message Date
Joe Onorato
d596d5115c am 070433ed: am 76d9bf52: 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 a
Merge commit '070433edee72de5fd9b93ddf055f74277f0deff4'

* commit '070433edee72de5fd9b93ddf055f74277f0deff4':
  Add a method to let a properly permissioned app directly
2010-07-27 09:26:26 -07:00
Joe Onorato
070433edee am 76d9bf52: 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
Merge commit '76d9bf52f31b8f31f64348b736422861c90ab463' into gingerbread-plus-aosp

* commit '76d9bf52f31b8f31f64348b736422861c90ab463':
  Add a method to let a properly permissioned app directly
2010-07-27 09:19:48 -07:00
Joe Onorato
76d9bf52f3 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
Dianne Hackborn
9fb0bb8292 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
4cca89c042 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
Mathias Agopian
bf23832acc 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
be199f3e11 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
Dianne Hackborn
b6022e3d50 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
3a2ff74fa4 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
Mathias Agopian
fed3c364e6 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
02c0641046 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
Dianne Hackborn
14bfa398a4 Infrastructure to report running services to developer.
Change-Id: Id1aae61323e7b8357c5fcc4bc641aaa57f3b6fde
2010-07-24 20:07:17 -07:00
Dianne Hackborn
46730fc783 Fix handling of application disabled state.
Change-Id: I617b76e89eeb75437b384b92f1205bb00b15bb70
2010-07-24 16:34:00 -07:00
Joe Onorato
7999bff154 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.

Change-Id: I76422f952e3e894c90b3311e7d889899c79cbbaa
2010-07-24 11:50:05 -04:00
Mathias Agopian
32123fde1b Report sensor events to BatteryStats service
Change-Id: I9b83aa709887aa658bc474391573f2d45b6c4eb2
2010-07-23 16:55:24 -07:00
Mathias Agopian
aea786f42c SensorService handles last known state properly
SensorService now correctly sends the last known
state of a sensor as soon as a new connection is made.
This fixes the issue where, for instance, an application
could wait a long time before getting the light or proximity
sensor initial state.

Change-Id: Ic41392f3626e26c4f15746c7e17c7ecd44bbb10b
2010-07-22 21:24:39 -07:00
Mathias Agopian
dbb93c5e9f am f595a8f7: am 19f082eb: Merge "filter sensor event by connection" into gingerbread
Merge commit 'f595a8f7a90bc7f3b947b05cfbcd209d3e94ba89'

* commit 'f595a8f7a90bc7f3b947b05cfbcd209d3e94ba89':
  filter sensor event by connection
2010-07-22 17:29:04 -07:00
Mathias Agopian
f595a8f7a9 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
Jean-Baptiste Queru
1b57b86dcc am 83a23630: am dd299046: Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
Merge commit '83a236303438453740d5db41b0d017be9e5d56c1'

* commit '83a236303438453740d5db41b0d017be9e5d56c1':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver
2010-07-22 16:18:35 -07:00
Mathias Agopian
efba8bf53a filter sensor event by connection
we now don't send events down to a connection that has not
registered for this event.

Change-Id: I3fe507974d3e99293749bfec2ef871e8a0ee9600
2010-07-22 16:18:10 -07:00
Jean-Baptiste Queru
83a2363034 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
Mathias Agopian
7fbb7ab191 am 422e700e: am db3eb355: Merge "propagate sensor event rate properly to the sensor HAL" into gingerbread
Merge commit '422e700ee4f312c7d3c87e26bc2b0c7061c9aa8a'

* commit '422e700ee4f312c7d3c87e26bc2b0c7061c9aa8a':
  propagate sensor event rate properly to the sensor HAL
2010-07-22 14:45:59 -07:00
Mathias Agopian
422e700ee4 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
Vairavan Srinivasan
61f07659fe frameworks/base: Implement Mutual exclusion in BroadcastReceiver
Invoke forceStopPackageLocked after acquiring a lock on
ActivityManagerService.this.

Change-Id: I75a85da03418a87c26b89360cebd3bccc6a25e46
2010-07-22 13:36:40 -07:00
Mathias Agopian
d865351844 propagate sensor event rate properly to the sensor HAL
Change-Id: I1abe4c0fcce423caab79208353fded4d57398227
2010-07-21 21:45:57 -07:00
Mathias Agopian
5c49ec30b5 am 1f2ec407: am 23e8de26: propagate sensor event rate properly
Merge commit '1f2ec4070aa9c999d41dc50a892a896e894c5710'

* commit '1f2ec4070aa9c999d41dc50a892a896e894c5710':
  propagate sensor event rate properly
2010-07-21 18:13:39 -07:00
Mathias Agopian
409c484b6d am 994fff70: am 5df13ef3: SensorService doesn\'t crash if correct HAL is not present
Merge commit '994fff705ee8a7a8e9826ade53a5220949a28192'

* commit '994fff705ee8a7a8e9826ade53a5220949a28192':
  SensorService doesn't crash if correct HAL is not present
2010-07-21 18:13:35 -07:00
Mathias Agopian
36647e977a am 042efd6c: am b9cdead4: Merge "Better dumpsys logs" into gingerbread
Merge commit '042efd6c9251064f09705882180d9ab18ce4e914'

* commit '042efd6c9251064f09705882180d9ab18ce4e914':
  Better dumpsys logs
2010-07-21 18:13:32 -07:00
Mathias Agopian
ed7c8c9046 am 808fd2ff: am 865991b0: Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread
Merge commit '808fd2ff89fa2feee568bb64017eece73d6b24cb'

* commit '808fd2ff89fa2feee568bb64017eece73d6b24cb':
  Added partial support for repporting sensor activity to IBatteryStats
2010-07-21 18:13:27 -07:00
Mathias Agopian
50558b9561 resolved conflicts for merge of bc54e63c to master
Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
2010-07-21 18:10:22 -07:00
Mathias Agopian
1f2ec4070a am 23e8de26: propagate sensor event rate properly
Merge commit '23e8de26b7b3d04daf08526f314c2fdd2f8fee65' into gingerbread-plus-aosp

* commit '23e8de26b7b3d04daf08526f314c2fdd2f8fee65':
  propagate sensor event rate properly
2010-07-21 16:12:28 -07:00
Mathias Agopian
994fff705e am 5df13ef3: SensorService doesn\'t crash if correct HAL is not present
Merge commit '5df13ef30e7dd58e4e718e6d949ac3d1f5af94e0' into gingerbread-plus-aosp

* commit '5df13ef30e7dd58e4e718e6d949ac3d1f5af94e0':
  SensorService doesn't crash if correct HAL is not present
2010-07-21 16:12:25 -07:00
Mathias Agopian
042efd6c92 am b9cdead4: Merge "Better dumpsys logs" into gingerbread
Merge commit 'b9cdead457fb86efc125db8c1c6954c4af1d7388' into gingerbread-plus-aosp

* commit 'b9cdead457fb86efc125db8c1c6954c4af1d7388':
  Better dumpsys logs
2010-07-21 16:10:04 -07:00
Mathias Agopian
808fd2ff89 am 865991b0: Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread
Merge commit '865991b075de1df8144426b5c2b2f341e4e33d33' into gingerbread-plus-aosp

* commit '865991b075de1df8144426b5c2b2f341e4e33d33':
  Added partial support for repporting sensor activity to IBatteryStats
2010-07-21 16:10:00 -07:00
Mathias Agopian
bc54e63c84 am e4764521: Merge "new SensorService" into gingerbread
Merge commit 'e4764521353e898554931a557460fc49209fb0a9' into gingerbread-plus-aosp

* commit 'e4764521353e898554931a557460fc49209fb0a9':
  new SensorService
2010-07-21 16:09:55 -07:00
Mathias Agopian
23e8de26b7 propagate sensor event rate properly
Change-Id: I32e67d30e4295285a6827956cc8161b2025d70bc
2010-07-21 16:09:39 -07:00
Mathias Agopian
5df13ef30e SensorService doesn't crash if correct HAL is not present
Change-Id: I83700b1a1b43390f5830e1056572bfb16e58e8e4
2010-07-21 16:09:39 -07:00
Mathias Agopian
b9cdead457 Merge "Better dumpsys logs" into gingerbread 2010-07-21 16:07:32 -07:00
Mathias Agopian
865991b075 Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread 2010-07-21 16:07:15 -07:00
Mathias Agopian
e476452135 Merge "new SensorService" into gingerbread 2010-07-21 16:06:46 -07:00
Dan Egnor
3300b6f41e am 7da38863: am 3685db7f: am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo
Merge commit '7da38863d4382746090bf50413b1774ab04f6bc1'

* commit '7da38863d4382746090bf50413b1774ab04f6bc1':
  Avoid leaking file descriptors when returning drop box events.
2010-07-21 15:00:27 -07:00
Dan Egnor
7da38863d4 am 3685db7f: am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo
Merge commit '3685db7f5dd8a830a4e096404d4924e12697fb78' into gingerbread-plus-aosp

* commit '3685db7f5dd8a830a4e096404d4924e12697fb78':
  Avoid leaking file descriptors when returning drop box events.
2010-07-21 13:58:08 -07:00
Dan Egnor
3685db7f5d 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
6e6d60d4c8 Avoid leaking file descriptors when returning drop box events.
We can't use Parcel.writeValue() to write the ParcelFileDescriptor, otherwise
it leaks when returning the value to the caller (the flag gets lost).  Change
the way DropBoxManager.Entry gets serialized so that it uses a bit of its own
flags value to track whether the data is a byte[] or a ParcelFileDescriptor.

Modify the dropbox unit test to add extensive checking of Entry serialization
and deserialization under various circumstances, and to include a regression
test to ensure that FD leaking doesn't happen.

Bug: 2847738
Change-Id: I4ccd17dd03ffab234340cd359e6f3510fdf81193
2010-07-21 12:52:21 -07:00
The Android Open Source Project
57339e752c am e9e04673: merge from open-source master
Merge commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530'

* commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530':
  replaced deprecated setButton Methods
2010-07-21 08:13:02 -07:00
The Android Open Source Project
e9e046733d merge from open-source master
Change-Id: I5d220f16c319e95547f133ee9bcbd0b5caabc597
2010-07-21 08:05:45 -07:00
Eric Laurent
240677ec68 resolved conflicts for merge of dd206093 to master
Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae
2010-07-20 13:37:19 -07:00
Eric Laurent
dd2060932a am 22a2d718: Merge "Audio policy manager changes for audio effects" into gingerbread
Merge commit '22a2d7186d015efcd648dff99500f8467463be82' into gingerbread-plus-aosp

* commit '22a2d7186d015efcd648dff99500f8467463be82':
  Audio policy manager changes for audio effects
2010-07-20 11:28:26 -07:00
Romain Guy
13d33472b2 Merge "replaced deprecated setButton Methods" 2010-07-20 11:11:20 -07:00
Eric Laurent
8ed6ed0b62 Audio policy manager changes for audio effects
Added methods for audio effects management by audio policy manager.
- control of total CPU load and memory used by effect engines
- selection of output stream for global effects
- added audio session id in parameter list for startOutput() and stopOutput().
this is not used in default audio policy manager implementation.

Modifications of audio effect framework in AudioFlinger to allow moving and reconfiguring
effect engines from one output mixer thread to another when audio tracks in the same session
are moved or when requested by audio policy manager.
Also fixed mutex deadlock problem with effect chains locks.

Change-Id: Ida43484b06e9b890d6b9e53c13958d042720ebdb
2010-07-20 10:31:57 -07:00