1500 Commits

Author SHA1 Message Date
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
Mike Lockwood
efd91d7ce0 am 03786b83: Merge change I813fdb7a into eclair
Merge commit '03786b83bd02f8dd8e1049d333fbfdee395ac965' into eclair-mr2

* commit '03786b83bd02f8dd8e1049d333fbfdee395ac965':
  Fixes for proximity sensor behavior:
2009-11-18 16:24:37 -08:00
Android (Google) Code Review
03786b83bd Merge change I813fdb7a into eclair
* changes:
  Fixes for proximity sensor behavior:
2009-11-18 16:20:32 -08:00
Mike Lockwood
0e39ea83c5 Fixes for proximity sensor behavior:
Add optional flag to Wakelock.release() to specify whether we should wait for proximity sensor to go negative before turning on the screen.
Clear the "waiting for proximity sensor to go negative" state when the power key is pressed.

Part of the fix for b/2243198 (Black screen lockup after ending call)

Change-Id: I813fdb7aa4192cd3384a25be9e59d7d4b90da53a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-18 18:45:59 -05:00
Dianne Hackborn
08a22a2007 am a2f4c254: am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode
Merge commit 'a2f4c2543a7f78b77491c701230e8f406dcca540' into eclair-mr2-plus-aosp

* commit 'a2f4c2543a7f78b77491c701230e8f406dcca540':
  Fix issue #2249821: Unable to start passion in safe mode
2009-11-18 11:55:41 -08:00
Dianne Hackborn
a2f4c2543a am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode
Merge commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e' into eclair-mr2

* commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e':
  Fix issue #2249821: Unable to start passion in safe mode
2009-11-18 11:51:05 -08:00
Dianne Hackborn
1d62ea9d8c Fix issue #2249821: Unable to start passion in safe mode
Holding down the trackball now works.

Also fix a little API check warning from Intent.

Change-Id: Icb1f901535cb521917bf7f847a93c4ff7861d20e
2009-11-18 11:42:32 -08:00
Dan Egnor
5021e08d58 am 9a5985a8: Merge change I24e47245 into eclair-mr2
Merge commit '9a5985a8d975f88e314a321392cc7e25bd14ad0e' into eclair-mr2-plus-aosp

* commit '9a5985a8d975f88e314a321392cc7e25bd14ad0e':
  Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox.
2009-11-17 21:57:38 -08:00
Android (Google) Code Review
9a5985a8d9 Merge change I24e47245 into eclair-mr2
* changes:
  Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox. Optimize DropBoxManagerService.dump() a bit.
2009-11-17 18:02:12 -08:00
Dan Egnor
3d40df335e Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox.
Optimize DropBoxManagerService.dump() a bit.
2009-11-17 18:00:48 -08:00
Joe Onorato
95230656e4 am 0036b4de: am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit '0036b4def5242429abdf6e8e420896eb5296316e' into eclair-mr2-plus-aosp

* commit '0036b4def5242429abdf6e8e420896eb5296316e':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
2009-11-17 16:05:27 -08:00
Joe Onorato
0036b4def5 am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871' into eclair-mr2

* commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
2009-11-17 14:10:12 -08:00
Joe Onorato
df7dbb68d3 Fix bug 2252145 - Notification panel not closing completely when a call comes in 2009-11-17 10:43:37 -08:00
Mike Lockwood
11c89c4828 am 0d829149: am f8c4af65: Merge change I51b84496 into eclair
Merge commit '0d829149292713f05b85f33fedaba88771627533' into eclair-mr2-plus-aosp

* commit '0d829149292713f05b85f33fedaba88771627533':
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-16 20:05:53 -08:00
Mike Cleron
e5b5aa4903 am fd5cfd88: am f36b8f43: Merge change Ia428b2c2 into eclair
Merge commit 'fd5cfd885da4ee883153474d43e883aac7516023' into eclair-mr2-plus-aosp

* commit 'fd5cfd885da4ee883153474d43e883aac7516023':
  This time for sure: make wallpapers work
2009-11-16 20:05:17 -08:00
Dianne Hackborn
3a624abe27 am 92b18800: am ab5efde8: Merge change Iff5b8ce3 into eclair
Merge commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12' into eclair-mr2-plus-aosp

* commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12':
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 20:04:09 -08:00
Mike Lockwood
0d82914929 am f8c4af65: Merge change I51b84496 into eclair
Merge commit 'f8c4af65e8f9c7f395ac8eb52fe741242f6747b6' into eclair-mr2

* commit 'f8c4af65e8f9c7f395ac8eb52fe741242f6747b6':
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-16 19:56:49 -08:00
Mike Cleron
fd5cfd885d am f36b8f43: Merge change Ia428b2c2 into eclair
Merge commit 'f36b8f439babc141970b1207d1d9c12b7a14c468' into eclair-mr2

* commit 'f36b8f439babc141970b1207d1d9c12b7a14c468':
  This time for sure: make wallpapers work
2009-11-16 19:56:09 -08:00
Dianne Hackborn
92b1880084 am ab5efde8: Merge change Iff5b8ce3 into eclair
Merge commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679' into eclair-mr2

* commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679':
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 19:53:15 -08:00
Mike Lockwood
51b844965b Revert "PowerManagerService: enable logging for when mPowerState changes."
This reverts commit 24ace3395b532e3cbb63d2a6197a91dd9242bb36.

Bug b/2265538 (verbose logging from power manager)
2009-11-16 21:51:18 -05:00
Android (Google) Code Review
f36b8f439b Merge change Ia428b2c2 into eclair
* changes:
  This time for sure: make wallpapers work
2009-11-16 18:02:20 -08:00
Mike Lockwood
f6cee83f81 am 5fd01f7a: am fa82d97d: Merge change Ib1fb3fcf into eclair
Merge commit '5fd01f7aff5bf3e835ce233b68199db19ac93c1d' into eclair-mr2-plus-aosp

* commit '5fd01f7aff5bf3e835ce233b68199db19ac93c1d':
  Keep screen bright until boot completed.
2009-11-16 14:37:03 -08:00
Dianne Hackborn
f670ef7235 Work on issue 2259506: camera ANRed and then device runtime restarted
If a process fails to come up, we could leave content providers and
services hanging around.

Change-Id: Iff5b8ce3b933580954724338a89e110e45f1b00c
2009-11-16 13:59:16 -08:00
Mike Lockwood
5fd01f7aff am fa82d97d: Merge change Ib1fb3fcf into eclair
Merge commit 'fa82d97dc67b2c3047ad2abe7553d4a0f47b6e7f' into eclair-mr2

* commit 'fa82d97dc67b2c3047ad2abe7553d4a0f47b6e7f':
  Keep screen bright until boot completed.
2009-11-16 03:24:35 -08:00
Mike Cleron
a428b2c260 This time for sure: make wallpapers work
Fix http://b/issue?id=2262556. Make restoring
work as well as switching between live and 
non-live wallpapers. Also support live wallpaper
as default.
2009-11-15 22:53:08 -08:00
Mike Lockwood
2d7bb81ac4 Keep screen bright until boot completed.
Fixes b/2262575 (device boots into darkness)

Change-Id: Ib1fb3fcfd4a389d8aa5803a60e07660cfbe4fe47
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-15 18:12:22 -05:00
Mike Lockwood
7f9fb0c4de am 04c585e3: Merge changes Ia4825f54,If6f80560 into eclair
Merge commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404' into eclair-mr2

* commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404':
  Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
  PowerManagerService: Hold a wakelock while mProximityTask is queued
2009-11-15 14:49:40 -08:00
Jean-Baptiste Queru
8a4e470fc2 merge from open-source master 2009-11-15 11:04:00 -08:00
Mike Lockwood
e090281428 Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
Do not cancel screen brightness animation in forceUserActivityLocked unless screen is turning off.
Also not turn the screen on if PowerManager.preventScreenOn(false) is called while proximity sensor is active.

Fixes b/2254818 (dim display) where due to a race condition the screen is stuck in a dim state.

Change-Id: If6f805609c8d463631b9e22805e5242714ce34c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-14 23:12:25 -05:00
Mike Lockwood
0e5bb7f1c9 PowerManagerService: Hold a wakelock while mProximityTask is queued
This prevents the device from sleeping while a deferred proximity sensor
event is pending.
Fixes b/2260005 (Proximity sensor can fail due to missing wakelock)

Change-Id: Ia4825f548b5b7d8a0b184f720b32c2f21b77b96e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-14 06:41:20 -05:00
Mike Cleron
c035590541 am 0a27865a: am d54261aa: Merge change Id6c0b844 into eclair
Merge commit '0a27865a015d9e0401b6b3bff9eedd06d59043b3' into eclair-mr2-plus-aosp

* commit '0a27865a015d9e0401b6b3bff9eedd06d59043b3':
  Unbreak setting photos as wallpaper
2009-11-13 17:07:29 -08:00
Mike Cleron
26431be568 am d54261aa: Merge change Id6c0b844 into eclair
Merge commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7' into eclair-plus-aosp

* commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7':
  Unbreak setting photos as wallpaper
2009-11-13 17:04:11 -08:00
Mike Cleron
0a27865a01 am d54261aa: Merge change Id6c0b844 into eclair
Merge commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7' into eclair-mr2

* commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7':
  Unbreak setting photos as wallpaper
2009-11-13 17:03:31 -08:00
Android (Google) Code Review
d54261aab0 Merge change Id6c0b844 into eclair
* changes:
  Unbreak setting photos as wallpaper
2009-11-13 17:00:44 -08:00
Mike Cleron
d6c0b844a0 Unbreak setting photos as wallpaper 2009-11-13 16:37:27 -08:00
Mike Cleron
fcd2917a35 am aaa8e7e6: am 27d6e65b: Merge change I322b6ee7 into eclair
Merge commit 'aaa8e7e633b61b221d10f21006bf2cd197004093' into eclair-mr2-plus-aosp

* commit 'aaa8e7e633b61b221d10f21006bf2cd197004093':
  Add support for making a LiveWallpaper the default
2009-11-13 11:33:49 -08:00
Dianne Hackborn
b9456ac726 am 6e0ff0c3: am 826d17c0: A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit '6e0ff0c37cd293d49c3c874ee30a49b1d5902b5e' into eclair-mr2-plus-aosp

* commit '6e0ff0c37cd293d49c3c874ee30a49b1d5902b5e':
  A little more on #2256270: Package manager sends bad broadcasts when components change
2009-11-13 11:33:37 -08:00
Mike Cleron
e351da6cde am 27d6e65b: Merge change I322b6ee7 into eclair
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-plus-aosp

* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
  Add support for making a LiveWallpaper the default
2009-11-13 11:12:26 -08:00
Dianne Hackborn
fac7bd8345 am 826d17c0: A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit '826d17c0690e086ed96f43714d731ec6e0ddcf96' into eclair-plus-aosp

* commit '826d17c0690e086ed96f43714d731ec6e0ddcf96':
  A little more on #2256270: Package manager sends bad broadcasts when components change
2009-11-13 11:12:11 -08:00
Mike Cleron
aaa8e7e633 am 27d6e65b: Merge change I322b6ee7 into eclair
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-mr2

* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
  Add support for making a LiveWallpaper the default
2009-11-13 11:11:42 -08:00
Dianne Hackborn
6e0ff0c37c am 826d17c0: A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit '826d17c0690e086ed96f43714d731ec6e0ddcf96' into eclair-mr2

* commit '826d17c0690e086ed96f43714d731ec6e0ddcf96':
  A little more on #2256270: Package manager sends bad broadcasts when components change
2009-11-13 11:11:24 -08:00
Android (Google) Code Review
27d6e65b71 Merge change I322b6ee7 into eclair
* changes:
  Add support for making a LiveWallpaper the default
2009-11-13 11:01:57 -08:00
Dianne Hackborn
826d17c069 A little more on #2256270: Package manager sends bad broadcasts when components change
Don't go through all this work if the enabled state hasn't changed.

Change-Id: If7393f53d6c0d0770960bb37bcaa5adebdbb3099
2009-11-13 10:59:42 -08:00
Eric Laurent
355743c70d am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '609acfd2a1067f49e51925776484b070a24d8301' into eclair-mr2-plus-aosp

* commit '609acfd2a1067f49e51925776484b070a24d8301':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-13 09:27:55 -08:00
David 'Digit' Turner
567716acc5 am 097855eb: am 6f5ba934: Merge change I42a0f7a5 into eclair
Merge commit '097855eb00971092ff6332aa2bf0fae71f42ab5f' into eclair-mr2-plus-aosp

* commit '097855eb00971092ff6332aa2bf0fae71f42ab5f':
  PackageManager: Support secondary ABI for native code at installation time.
2009-11-13 09:27:18 -08:00
Mike Cleron
322b6ee7e1 Add support for making a LiveWallpaper the default 2009-11-12 23:23:49 -08:00
Eric Laurent
609acfd2a1 am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-mr2

* commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 23:10:18 -08:00