1536 Commits

Author SHA1 Message Date
Mike Lockwood
15740edd2a am b70da2bb: Merge change I1c281504 into eclair-mr2
Merge commit 'b70da2bbc594b093472d5333386d79f677fd9e01' into eclair-mr2-plus-aosp

* commit 'b70da2bbc594b093472d5333386d79f677fd9e01':
  Remove some unused window manager methods.
2009-11-30 11:00:34 -08:00
Mike Lockwood
239775a2ce am 3766ae55: Merge change I707f53cd into eclair-mr2
Merge commit '3766ae5551e6231c251b0af38206aea30a49df63' into eclair-mr2-plus-aosp

* commit '3766ae5551e6231c251b0af38206aea30a49df63':
  LightsService cleanup:
2009-11-30 11:00:04 -08:00
Mike Lockwood
db727a8a03 Remove some unused window manager methods.
Change-Id: I1c28150416b92b96b9f434270652c4be2613434c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-28 22:28:17 -05:00
Mike Lockwood
3cb67a37f1 LightsService cleanup:
Add Light subclass to replace LightsService light setting methods
Remove LightsService.setAttentionLight() and LightsService.pulseBreathingLight()
Add support for Wifi and Bluetooth lights

Change-Id: I707f53cda27481c25649f402567a665d52e9cb62
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-27 15:02:11 -05:00
Dan Egnor
413eed9eb4 am ed8d33b7: Merge change I5ec249ab into eclair-mr2
Merge commit 'ed8d33b7976c006b4bd28eb89cac36074e4eccf5' into eclair-mr2-plus-aosp

* commit 'ed8d33b7976c006b4bd28eb89cac36074e4eccf5':
  More elimination of Formatter (I was tired of waiting several
2009-11-25 13:46:00 -08:00
Android (Google) Code Review
ed8d33b797 Merge change I5ec249ab into eclair-mr2
* changes:
  More elimination of Formatter (I was tired of waiting several seconds for "dumpsys dropbox"...).
2009-11-25 13:40:10 -08:00
Dan Egnor
5ec249abe3 More elimination of Formatter (I was tired of waiting several
seconds for "dumpsys dropbox"...).
2009-11-25 13:16:47 -08:00
Dan Egnor
86ef717e26 am 99cee031: Merge change Ieb7a7d57 into eclair-mr2
Merge commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365' into eclair-mr2-plus-aosp

* commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365':
  Change the DropBoxManager API slightly (this is public, but not yet released) --
2009-11-25 13:04:19 -08:00
Android (Google) Code Review
99cee0318b Merge change Ieb7a7d57 into eclair-mr2
* changes:
  Change the DropBoxManager API slightly (this is public, but not yet released) -- take a File instead of a ParcelFileDescriptor (gets opened internally) -- that way the caller doesn't have to worry about closing their PFD and so on. (Pretty much 100% of the time the caller will be uploading a file, anyway.)
2009-11-25 12:59:48 -08:00
Mike Lockwood
f6a1dab030 am f3e291a0: Merge change Id7b9903e into eclair-mr2
Merge commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b' into eclair-mr2-plus-aosp

* commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b':
  Add setAttentionLight() to IPowerManager for the Phone app.
2009-11-25 12:44:40 -08:00
Dan Egnor
eb7a7d57ca Change the DropBoxManager API slightly (this is public, but not yet released) --
take a File instead of a ParcelFileDescriptor (gets opened internally) --
that way the caller doesn't have to worry about closing their PFD and so on.
(Pretty much 100% of the time the caller will be uploading a file, anyway.)
2009-11-25 12:38:00 -08:00
Android (Google) Code Review
f3e291a05d Merge change Id7b9903e into eclair-mr2
* changes:
  Add setAttentionLight() to IPowerManager for the Phone app.
2009-11-25 12:34:28 -08:00
Mike Lockwood
b11832de73 Add setAttentionLight() to IPowerManager for the Phone app.
Change-Id: Id7b9903e1efaf56a2336519a8653962b6ae2c13d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-25 15:25:55 -05:00
Doug Zongker
79347f94fa am a85a0ac1: Merge change I4413e8bc into eclair-mr2
Merge commit 'a85a0ac1072c7653fdafa791416658154b76ac0d' into eclair-mr2-plus-aosp

* commit 'a85a0ac1072c7653fdafa791416658154b76ac0d':
  close file descriptors passed to drop box
2009-11-25 11:58:23 -08:00
Mike Lockwood
dfaf2e03ad am 30348b0d: Merge change I086d681f into eclair-mr2
Merge commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b' into eclair-mr2-plus-aosp

* commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b':
  Remove HardwareService and move vibrator support to VibratorService.
2009-11-25 11:54:18 -08:00
Android (Google) Code Review
a85a0ac107 Merge change I4413e8bc into eclair-mr2
* changes:
  close file descriptors passed to drop box
2009-11-25 11:54:17 -08:00
Mike Lockwood
3a32213c40 Remove HardwareService and move vibrator support to VibratorService.
The lights support is only needed by PowerManagerService and NotificationManagerService, so we do not need a Binder API for it.
Move backlight and notification light support to new LightsService class.
The camera flash is now handled directly by the camera HAL, so the flash Hardware service flash support is obsolete.

Change-Id: I086d681f54668e7f7de3e8b90df3de19d59833c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-25 12:54:58 -05:00
Doug Zongker
4413e8bc4c close file descriptors passed to drop box
The ParcelFileDescriptors passed to DropBoxManager.addFile() are
supposed to be closed after the call.
2009-11-25 09:16:48 -08:00
Dianne Hackborn
80d5fc0f5a am 9ad091ab: am 118d92f7: Merge change I16925b91 into eclair
Merge commit '9ad091ab1065e85222da0927bb33913530f56f65' into eclair-mr2-plus-aosp

* commit '9ad091ab1065e85222da0927bb33913530f56f65':
  Finish fixing issue #2228381: android.view.InflateException...
2009-11-24 15:08:13 -08:00
Dianne Hackborn
9ad091ab10 am 118d92f7: Merge change I16925b91 into eclair
Merge commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b' into eclair-mr2

* commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b':
  Finish fixing issue #2228381: android.view.InflateException...
2009-11-24 15:01:51 -08:00
Dan Egnor
5057d9f558 am b29fefe6: Merge change Ic4cf6caa into eclair-mr2
Merge commit 'b29fefe6aeed68c22c7711263357348006ab8b79' into eclair-mr2-plus-aosp

* commit 'b29fefe6aeed68c22c7711263357348006ab8b79':
  Copy SYSTEM_LAST_KMSG from /proc/last_kmsg instead of /data/dontpanic/last_kmsg.
2009-11-24 14:52:31 -08:00
Dianne Hackborn
195f6a0ff3 Finish fixing issue #2228381: android.view.InflateException...
...Binary XML file line #37: Error inflating class <unknown> after adding a secondary account

The problem was that we weren't dealing well with the situation where we start a transition
from activity A to B, then transition back to A before B is shown (it finishes before being
shown), then transition from A to C.  At this point we had some state showing that we
were in the process of showing A from it being hidden (due to the middle transition from
B to A), which would cause the layout pass to ensure its window is hidden before the
transition starts.

The solution is to detect the case where we are showing a token and it is already actually
shown, and in this case not do all of the token setup for it to wait for its windows to
be displayed before it is shown.  This isn't needed, the windows are already displayed
or the token is already set up to wait for them to be displayed.

Change-Id: I16925b91e1e2449dd65ade162a5758173c6e2695
2009-11-24 11:34:55 -08:00
Dan Egnor
c4cf6caa99 Copy SYSTEM_LAST_KMSG from /proc/last_kmsg instead of /data/dontpanic/last_kmsg.
(In preparation for not copying to /data/dontpanic/last_kmsg at all.)
2009-11-23 19:23:49 -08:00
Dianne Hackborn
01d9fe1d06 am cfe90ce4: am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84' into eclair-mr2-plus-aosp

* commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 16:03:16 -08:00
Dianne Hackborn
cfe90ce461 am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit '05799981d8d930e0b929cdb99f9407e3ee18c142' into eclair-mr2

* commit '05799981d8d930e0b929cdb99f9407e3ee18c142':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 15:58:18 -08:00
Dianne Hackborn
05799981d8 Fix issue #2281046: Size and pressure don't change
Change-Id: Iadc1d438a494bb1495ee6d93d0dd3b4a491a378f
2009-11-23 15:49:15 -08:00
Eric Olsen
f7a5721895 am b2796da2: am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f' into eclair-mr2-plus-aosp

* commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f':
  Add logging of headset events to help debug issue.
2009-11-23 14:30:35 -08:00
Eric Olsen
b2796da2ed am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit '0d631b9b58db54bee58da717b38b8020bc3d0437' into eclair-mr2

* commit '0d631b9b58db54bee58da717b38b8020bc3d0437':
  Add logging of headset events to help debug issue.
2009-11-23 13:55:25 -08:00
Mike Lockwood
fa351d388d am e5683369: Merge change I60dfecdc into eclair-mr2
Merge commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a' into eclair-mr2-plus-aosp

* commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a':
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 13:13:39 -08:00
Eric Olsen
e7096ebba1 Add logging of headset events to help debug issue.
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-23 13:06:07 -08:00
Mike Lockwood
fb73f79340 Add window manager support for overriding button and keyboard backlight values.
The new backlightBrightness field works similarly as the existing WindowManager.LayoutParams.screenBrightness field

Needed for bugs:
    b/2233655 (under low ambient light the touch keys remain illuminated during video playback and never timeout)
    b/2221079 (Backlight for home/search/back/etc buttons should turn off when in dock in night mode)

Change-Id: I60dfecdc7bb653b0db38094464de651220b3d438
2009-11-23 15:16:55 -05:00
Eric Laurent
6ed9c32c04 am 132dab8f: am a0f9a4f7: Merge change I2083b297 into eclair
Merge commit '132dab8f91f5e87581660069753f238ea9914732' into eclair-mr2-plus-aosp

* commit '132dab8f91f5e87581660069753f238ea9914732':
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:21:01 -08:00
Eric Laurent
132dab8f91 am a0f9a4f7: Merge change I2083b297 into eclair
Merge commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f' into eclair-mr2

* commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f':
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:16:27 -08:00
Dianne Hackborn
1f0a0ed549 am 41039247: am 8abd5f0d: Fix issue #2267665 IME keyboard appears as Blank in compose view...
Merge commit '4103924742c376716ce5866f6d2f53eac4f3cb59' into eclair-mr2-plus-aosp

* commit '4103924742c376716ce5866f6d2f53eac4f3cb59':
  Fix issue #2267665 IME keyboard appears as Blank in compose view...
2009-11-23 11:12:04 -08:00
Android (Google) Code Review
a0f9a4f735 Merge change I2083b297 into eclair
* changes:
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:11:55 -08:00
Dianne Hackborn
4103924742 am 8abd5f0d: Fix issue #2267665 IME keyboard appears as Blank in compose view...
Merge commit '8abd5f0d519afa787e7c64e429df17ccc661ce75' into eclair-mr2

* commit '8abd5f0d519afa787e7c64e429df17ccc661ce75':
  Fix issue #2267665 IME keyboard appears as Blank in compose view...
2009-11-23 11:05:54 -08:00
Dianne Hackborn
8abd5f0d51 Fix issue #2267665 IME keyboard appears as Blank in compose view...
...if you re-lunch messaging application after deleting the
character and pressing home key

Change-Id: Idc7da05e54730958644e80069764237e5db6f288
2009-11-23 10:58:56 -08:00
Mike Lockwood
1866591c19 am 34c5813e: am 174b7269: Merge change Id886fb28 into eclair
Merge commit '34c5813e488fd4f044e545f177a20f553580ce6a' into eclair-mr2-plus-aosp

* commit '34c5813e488fd4f044e545f177a20f553580ce6a':
  Fix deadlock in WindowManagerService.reenableKeyguard()
2009-11-23 10:45:24 -08:00
Mike Lockwood
34c5813e48 am 174b7269: Merge change Id886fb28 into eclair
Merge commit '174b726917c12d61f9135a180afc8413d845dc2d' into eclair-mr2

* commit '174b726917c12d61f9135a180afc8413d845dc2d':
  Fix deadlock in WindowManagerService.reenableKeyguard()
2009-11-23 10:40:13 -08:00
Mike Lockwood
983ee099de Fix deadlock in WindowManagerService.reenableKeyguard()
If reenableKeyguard() is called before the previous disableKeyguard() call is processed,
then TokenWatcher.sendNotificationLocked() will cancel the request, resulting in neither
the TokenWatcher acquired() or released() methods being called.
In that case, reenableKeyguard() will hang waiting for released() to set
mWaitingUntilKeyguardReenabled to false.  Now we only wait in reenableKeyguard()
if the TokenWatcher acquired() method is called and the keyguard has actually been disabled.

This should fix bug b/2270192

Change-Id: Id886fb28df607dbb4543124f2db6997121d6a682
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-22 02:00:13 -05:00
Mike Lockwood
589f8d7d41 am 53e9c126: am a1ce6551: Merge change I69324a33 into eclair
Merge commit '53e9c126f5fc39459554f0290a2c863f645d397a' into eclair-mr2-plus-aosp

* commit '53e9c126f5fc39459554f0290a2c863f645d397a':
  AlarmManagerService: Fix daylight savings time offset computation
2009-11-20 13:36:14 -08:00
Mike Lockwood
53e9c126f5 am a1ce6551: Merge change I69324a33 into eclair
Merge commit 'a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2' into eclair-mr2

* commit 'a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2':
  AlarmManagerService: Fix daylight savings time offset computation
2009-11-20 13:32:17 -08:00
Mike Lockwood
1f7b4134db AlarmManagerService: Fix daylight savings time offset computation
Fixes b/2244560 (Time Stamp On Bug Reports And Pictures Is One Hour Off)

Change-Id: I69324a33f80e41ce68a0e6fdba08b80ed9453e19
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-20 15:16:58 -05:00
Mike Lockwood
9d633968ce am 401a712e: IPowerManager: remove some unused methods.
Merge commit '401a712e3b3b41c77e79a130d7b07d653e18bcab' into eclair-mr2-plus-aosp

* commit '401a712e3b3b41c77e79a130d7b07d653e18bcab':
  IPowerManager: remove some unused methods.
2009-11-20 09:56:25 -08:00
Mike Lockwood
401a712e3b IPowerManager: remove some unused methods.
Change-Id: I7c7fa7eaf6c99e723da20939c27fbc172ad51613
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-20 11:50:21 -05:00
Eric Laurent
2083b297e4 Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
The cause of the problem is that under certain circumstance the HeadsetObserver receives unexpected connection events. For instance,
when removing a bad quality 3.5mm stereo jack without mic the following events can be received:
1 connection of a headset with mic
2 removal of a headset with mic.

The result is that the no mic headset is never disconnected and audio policy manager considers it is still present. Then the music or downlink call audio is always routed to headset even if none is connected giving the impression that audio is lost, except whne you reconnect a headset of enable speaker phone.

The fix consists in adding more checks in HeadsetObserver to reject illegal transitions in headset state received from event observer.
2009-11-20 07:26:56 -08:00
Doug Zongker
a7ad3f6c71 am 50a21f4d: add reboot() method to PowerManager
Merge commit '50a21f4d3b70360b36acad20e234c380654fd59f' into eclair-mr2-plus-aosp

* commit '50a21f4d3b70360b36acad20e234c380654fd59f':
  add reboot() method to PowerManager
2009-11-19 17:28:42 -08:00
Doug Zongker
50a21f4d3b add reboot() method to PowerManager
In order to unbundle System Update, we need some to expose in the SDK
some way to reboot the device into recovery.  Add a reboot() method to
PowerManager, protected by the android.permission.REBOOT permission.
2009-11-19 17:18:31 -08:00
Mike Lockwood
d9a49b00ce Fix broken merges from MR2:
e090281428cbd1114f4ae2f10755013cea09cdb5 Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
0e5bb7f1c9558bcf76af4f31dd5a11e78bcbdc9d PowerManagerService: Hold a wakelock while mProximityTask is queued

Change-Id: I8082b546467f839f53187534bb4264e59bd4a7db
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-19 01:44:58 -05:00
repo sync
d28fcd5bb8 resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosp
Signed-off-by: repo sync <lockwood@android.com>
2009-11-18 20:13:09 -05:00