1246 Commits

Author SHA1 Message Date
Amith Yamasani
14fb81af28 Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
This should remove the deadlock. I'm not absolutely positive that
it fixes it, as it's not easy to reproduce.
2009-11-05 11:41:58 -08:00
Eric Olsen
8e49e998fd am 62335430: Merge change I4499ad72 into eclair
Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-plus-aosp

* commit '62335430b05d92ad2255bf20b76b35e012b385c9':
  Fix bad merge fixes build breakage.
2009-11-04 17:36:26 -08:00
Android (Google) Code Review
62335430b0 Merge change I4499ad72 into eclair
* changes:
  Fix bad merge fixes build breakage.
2009-11-04 20:27:11 -05:00
Eric Olsen
4499ad729a Fix bad merge fixes build breakage.
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-04 17:12:41 -08:00
Eric Olsen
5a301c0d17 am 9053fdb3: Merge change I76127f6f into eclair
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-plus-aosp

* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
  Add support for colored LED on jogball backlight.
2009-11-04 16:46:49 -08:00
Android (Google) Code Review
9053fdb32b Merge change I76127f6f into eclair
* changes:
  Add support for colored LED on jogball backlight.
2009-11-04 19:39:29 -05:00
Christopher Tate
409d10c30c am 595596fe: Merge change I561011bc into eclair
Merge commit '595596fe6b6fd52bf26d224f18b8724a4d151316' into eclair-plus-aosp

* commit '595596fe6b6fd52bf26d224f18b8724a4d151316':
  Fix #2176803 - restores from userdebug to user builds not working
2009-11-04 16:02:06 -08:00
Eric Olsen
f42f15cf45 Add support for colored LED on jogball backlight.
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-04 14:31:26 -08:00
Christopher Tate
78dd4a7371 Fix #2176803 - restores from userdebug to user builds not working
The underlying issue is that ordinarily, the restore mechanism checks the
signature block of the package which uploaded the restore data against the
signature of the package on-device that will be handling the restore.  This is
to ensure that the restore goes to the "same" application as the one that
uploaded it.

However, applications bundled on the system partition as part of the device
build are signed not with a permanent, app-identifying signature, but rather
with the device's signature block, which is different for each kind of device
and potentially between kinds of build for the same device.  That renders the
stored backup data unusable when changing devices / builds / etc.

This change works around the problem by explicitly privileging applications that
reside on the system partition:  they have been built into the device, and so
are trusted to be able to handle data that is marked as coming from its package
name.

Change-Id: I561011bce2b54cff3e695e82e7544b126b6ac31e
2009-11-04 13:27:56 -08:00
Mike Lockwood
b8d8bb40a1 am 27c6dd7a: PowerManagerService: Fix manual brightness mode.
Merge commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116' into eclair-plus-aosp

* commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116':
  PowerManagerService: Fix manual brightness mode.
2009-11-04 06:11:15 -08:00
Mike Lockwood
27c6dd7aa4 PowerManagerService: Fix manual brightness mode.
Change-Id: I10aec64e3f7ae2715475b9797565747295c19a00
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-04 08:57:07 -05:00
Amith Yamasani
1209c012a2 am 86396f97: Merge changes Idcdd2978,Ied564b31,I6179126d into eclair
Merge commit '86396f97c998358390d912903395828ee244e2d5' into eclair-plus-aosp

* commit '86396f97c998358390d912903395828ee244e2d5':
  Fix 2233444 (No IME).
  Revert "Revert "Fix notification bar performance.""
  Revert "Revert "fix 2233092 - Notification shade gets stuck half-open""
2009-11-03 15:26:41 -08:00
Amith Yamasani
6179126dad Fix 2233444 (No IME).
Fix the flags for the StatusBarExpanded window that were causing the Window Manager to
think that it needed input.
2009-11-03 13:22:24 -08:00
Amith Yamasani
ed564b319d Revert "Revert "Fix notification bar performance.""
This reverts commit 6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de.
2009-11-03 13:20:21 -08:00
Amith Yamasani
dcdd29781a Revert "Revert "fix 2233092 - Notification shade gets stuck half-open""
This reverts commit b96a9d9296925fef6a1c0e5ad4d847d96bf9acb5.
2009-11-03 13:18:03 -08:00
Android Git Automerger
d2801942a9 am b96a9d92: Revert "fix 2233092 - Notification shade gets stuck half-open"
Merge commit 'b96a9d9296925fef6a1c0e5ad4d847d96bf9acb5' into eclair-plus-aosp

* commit 'b96a9d9296925fef6a1c0e5ad4d847d96bf9acb5':
  Revert "fix 2233092 - Notification shade gets stuck half-open"
2009-11-03 12:36:15 -08:00
Android Git Automerger
8383d06fac am 6e8f47b0: Revert "Fix notification bar performance."
Merge commit '6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de' into eclair-plus-aosp

* commit '6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de':
  Revert "Fix notification bar performance."
2009-11-03 12:36:07 -08:00
Android Git Automerger
b96a9d9296 Revert "fix 2233092 - Notification shade gets stuck half-open"
As per Dr. No; revert commit 6a7899a8d6444989657d1058666269263b5b50c0.
2009-11-03 12:29:46 -08:00
Android Git Automerger
6e8f47b0ed Revert "Fix notification bar performance."
As per Dr. No; revert commit 0d7dc3b800d0489c43ad9071615b2b4ebec80443.
2009-11-03 12:26:15 -08:00
Mike Lockwood
3580ee41f1 am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair
Merge commit 'd2c68794364120d0531667e797f078416ebef3f5' into eclair-plus-aosp

* commit 'd2c68794364120d0531667e797f078416ebef3f5':
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
2009-11-03 09:37:39 -08:00
Joe Onorato
179af55bd8 am 6a7899a8: fix 2233092 - Notification shade gets stuck half-open
Merge commit '6a7899a8d6444989657d1058666269263b5b50c0' into eclair-plus-aosp

* commit '6a7899a8d6444989657d1058666269263b5b50c0':
  fix 2233092 - Notification shade gets stuck half-open
2009-11-03 09:33:30 -08:00
Android (Google) Code Review
d2c6879436 Merge changes I116424c4,Ibd0ef67f into eclair
* changes:
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
2009-11-03 12:32:04 -05:00
Joe Onorato
6a7899a8d6 fix 2233092 - Notification shade gets stuck half-open
Follow up to bug 2195678.  This was one of the reprocussions that
I was worried about with respect to that bug, so I'm counting
Dr. No on that change as the one for this one.
2009-11-03 12:22:33 -05:00
Mike Lockwood
f90ffcc639 Remove obsolete hardware auto-brightness support.
Change-Id: Ibd0ef67f887254f26ce19faf0627f8b246ec0a18
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-03 11:41:27 -05:00
Dan Egnor
d0f054a5ed am afd81beb: Merge change Icbb3aa0a into eclair
Merge commit 'afd81beb33cce3b296927d13821fe0dc874ce7db' into eclair-plus-aosp

* commit 'afd81beb33cce3b296927d13821fe0dc874ce7db':
  Use setRepeating() rather than setInexactRepeating() for backup scheduling,
2009-11-02 14:04:59 -08:00
Android (Google) Code Review
afd81beb33 Merge change Icbb3aa0a into eclair
* changes:
  Use setRepeating() rather than setInexactRepeating() for backup scheduling, and add some random fuzz to the scheduling times, to make sure we aren't creating hour-aligned server load spikes.
2009-11-02 16:58:26 -05:00
Joe Onorato
ac8d865866 am cce9f0fa: Merge change I0d7dc3b8 into eclair
Merge commit 'cce9f0fa862b6fa9de8dbf5a7a7b63167770a9b3' into eclair-plus-aosp

* commit 'cce9f0fa862b6fa9de8dbf5a7a7b63167770a9b3':
  Fix notification bar performance.
2009-11-02 13:37:41 -08:00
Android (Google) Code Review
cce9f0fa86 Merge change I0d7dc3b8 into eclair
* changes:
  Fix notification bar performance.
2009-11-02 16:29:31 -05:00
Joe Onorato
0d7dc3b800 Fix notification bar performance.
Bug 2195678

We had all this stuff there to keep the notification view
around so it doesn't need to be reconstructed each time,
and we weren't using it.  This fixes that, and it looks
much better now.
2009-11-02 16:20:44 -05:00
Mike Lockwood
b98837dc2d am 989b76aa: Merge change Ieca126e6 into eclair
Merge commit '989b76aadd92538c7ab4ca00c34508b42fda8cef' into eclair-plus-aosp

* commit '989b76aadd92538c7ab4ca00c34508b42fda8cef':
  Fix problem with proximity sensor not reawaking screen if the values change too quickly.
2009-11-02 11:49:00 -08:00
Mike Lockwood
952211b4ae Fix problem with proximity sensor not reawaking screen if the values change too quickly.
The logic that disables user activity while turning off the screen should not affect proximity sensor.

Fixes bug b/2228734 (in-call, prox sensor gets confused)

Change-Id: Ieca126e6f79bf7baa5741981aea72d306ba03edc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-02 14:17:57 -05:00
Mike Lockwood
29d03dd25d am f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90' into eclair-plus-aosp

* commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90':
  Do not advance mLastEventTime when enabling or disabling user activity.
2009-11-02 10:10:41 -08:00
Mike Lockwood
f1d14f6a33 Do not advance mLastEventTime when enabling or disabling user activity.
Fixes a race condition between the keyguard and power key that sometimes resulted
in the power key failing to turn off the screen.

Fixes bug b/2212852 (Power button does not put phone to sleep)

Change-Id: I92498c5fddf2bfc32b105ea1a7ea14a06d83888e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-02 11:56:59 -05:00
Mike Lockwood
a0b0e720a1 am 9efd523c: Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit '9efd523c4611c0cf10e712453a699c083a01064c' into eclair-plus-aosp

* commit '9efd523c4611c0cf10e712453a699c083a01064c':
  Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
2009-11-01 07:14:35 -08:00
Mike Lockwood
1cd948b427 am 4984e73d: Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea' into eclair-plus-aosp

* commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea':
  Manage button and keyboard backlights with light sensor in both manual and automatic mode.
2009-11-01 07:14:29 -08:00
Mike Lockwood
9efd523c46 Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Change-Id: I90eae78f71f377f6479d0aaf7ced38a7b988a7ee
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-01 10:05:50 -05:00
Mike Lockwood
23fc31c793 am df024920: Don\'t turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit 'df024920ebc63a82f570105c7a26e339ff244afd' into eclair-plus-aosp

* commit 'df024920ebc63a82f570105c7a26e339ff244afd':
  Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
2009-11-01 05:31:58 -08:00
Mike Lockwood
794b882e9b am aa66ea88: Use separate flags for enabling hardware and software auto-brightness.
Merge commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21' into eclair-plus-aosp

* commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21':
  Use separate flags for enabling hardware and software auto-brightness.
2009-11-01 05:31:51 -08:00
Mike Lockwood
4984e73dc5 Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Now the manual brightness mode only applies to the LCD backlight and
button and keyboard backlights are always managed automatically.

Fixes bug b/2195798 (Passion capacitive key backlights don't always come on)

This change only affects the framework based auto-brightness implementation.
Hardware auto-brightness is not affected.

Change-Id: Ib88310d642d498591e8879c8269d630ff3f7c8af
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-01 08:20:42 -05:00
Mike Lockwood
df024920eb Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
For framework light sensor support (does not affect hardware based approach).

Change-Id: I6896a7c5b3fd3ed136c4f25c63a0e5813c349f68
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-31 17:05:00 -04:00
Mike Lockwood
aa66ea880f Use separate flags for enabling hardware and software auto-brightness.
This cleans up the code in preparation for some other auto-brightness changes
and fixes support for devices without light sensors.

Change-Id: I3d4802cf860a865ffd86a8bb57cd57b46359433d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-31 16:31:27 -04:00
Dan Egnor
c1c49c024f Use setRepeating() rather than setInexactRepeating() for backup scheduling,
and add some random fuzz to the scheduling times, to make sure we aren't
creating hour-aligned server load spikes.

See bug 2226553 for details & Dr. No information.
2009-10-30 18:12:29 -07:00
Suchi Amalapurapu
ebacbff0f4 am 22dad592: Merge change I6cae32c7 into eclair
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-plus-aosp

* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
  When upgrading packages with shared user ids make sure we are eliminating
2009-10-29 01:03:12 -07:00
Suchi Amalapurapu
d83006cbe8 When upgrading packages with shared user ids make sure we are eliminating
the package about to be deleted or upgraded when updating permissions associated
with the shared user. Include a simple null check when retrieving the permission.

Fix PackageParser to avoid ArrayIndexOutOfBounds exceptions in several places
2009-10-29 00:46:55 -07:00
Suchi Amalapurapu
cdf899435f am a47a1e77: Merge change Ic03d28b9 into eclair
Merge commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0' into eclair-plus-aosp

* commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0':
  Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
2009-10-28 15:37:27 -07:00
Suchi Amalapurapu
c03d28b9e9 Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
again this flag gets set no matter what since the keyguard window is always present in the list of tokens and this hides the window which would
have become visible since the keyguard just got dismissed.
This causes unnecessary focus changes due to changes in visibility of current window.

This will resolve issues related to current focus and time outs when dispatching key events.
2009-10-28 14:47:45 -07:00
Christopher Tate
c2f735741b am 763ccae7: Merge change I8e7f5f07 into eclair
Merge commit '763ccae7d734cc7e55772936dc3f101a2bf453d4' into eclair-plus-aosp

* commit '763ccae7d734cc7e55772936dc3f101a2bf453d4':
  DO NOT MERGE: Fix loss of focus after wakeup into incall screen
2009-10-28 12:19:01 -07:00
Android (Google) Code Review
763ccae7d7 Merge change I8e7f5f07 into eclair
* changes:
  DO NOT MERGE: Fix loss of focus after wakeup into incall screen
2009-10-28 15:09:29 -04:00
Christopher Tate
405d089863 DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Because of the asynchronous behavior of keyguard, and incall explicitly
disabling keyguard, sometimes the window manager would wind up in a state in
which the "correct" app and activity window were shown, but focus was
recalculated "too soon," at a time when keyguard was just about gone but not
quite, and incall was not yet fully shown.  In this case there was no currently
valid event target, but the final show of the incall window would not prompt a
focus recalculation, so that "no current focus" state would incorrectly persist,
resulting in spurious ANRs until some other phone activity forced a focus
update.

We now detect the problematic case when windows are shown, and make sure to
recalculate focus explicitly thereafter.  This change does *not* fix the
underlying race conditions that have been resulting in mismatched state within
the window manager, but it does force a validation pass that puts things in
order so that normal operation can continue.

Change-Id: I8e7f5f0795f0042a0da074aeed385e3fbc210360
2009-10-28 11:52:58 -07:00
Eric Fischer
bf09620baf am fb872d1a: Merge change Id4d04def into eclair
Merge commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-plus-aosp

* commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df':
  Fix a race that kept the locale picker from working under heavy CPU load.
2009-10-28 10:24:53 -07:00