Merge commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21' into eclair-mr2
* commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21':
Use separate flags for enabling hardware and software auto-brightness.
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>
For framework light sensor support (does not affect hardware based approach).
Change-Id: I6896a7c5b3fd3ed136c4f25c63a0e5813c349f68
Signed-off-by: Mike Lockwood <lockwood@android.com>
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>
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.
Merge commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7' into eclair-mr2-plus-aosp
* commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7':
When upgrading packages with shared user ids make sure we are eliminating
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-mr2
* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
When upgrading packages with shared user ids make sure we are eliminating
Merge commit '18eedbacac964f200309f99fdfca06a0a01e5bf5' into eclair-mr2-plus-aosp
* commit '18eedbacac964f200309f99fdfca06a0a01e5bf5':
Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
Merge commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0' into eclair-mr2
* 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
Merge commit '8071b14680f8081019ac1b995d7c7f09a8aeeba7' into eclair-mr2-plus-aosp
* commit '8071b14680f8081019ac1b995d7c7f09a8aeeba7':
Fix a race that kept the locale picker from working under heavy CPU load.
Merge commit 'c867958eb6fb50210a767fa24757bfa19228c22e' into eclair-mr2-plus-aosp
* commit 'c867958eb6fb50210a767fa24757bfa19228c22e':
A better solution for ignoring user activity while the screen is animating off.
Merge commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-mr2
* commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df':
Fix a race that kept the locale picker from working under heavy CPU load.
Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-mr2
* commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550':
A better solution for ignoring user activity while the screen is animating off.
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-plus-aosp
* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
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
Merge commit '952402704a175ba27f6c89dff1ada634c5ce5626' into eclair-mr2-plus-aosp
* commit '952402704a175ba27f6c89dff1ada634c5ce5626':
Instead of a raw AIDL interface, give DropBox a Java
interface (android.os.DropBox); move the Binder interface
behind the scenes. Make DropBoxEntry into DropBox.Entry.
Make it possible to get a dropbox from an (Application)Context
with the usual getSystemService(DROPBOX_SERVICE) type thing.
Update the tests accordingly.
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
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.
Merge commit '8d1eeb2144945365cae281552bd7bc5eb14f7688' into eclair-mr2-plus-aosp
* commit '8d1eeb2144945365cae281552bd7bc5eb14f7688':
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '763ccae7d734cc7e55772936dc3f101a2bf453d4' into eclair-plus-aosp
* commit '763ccae7d734cc7e55772936dc3f101a2bf453d4':
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
Merge commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-mr2
* commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec':
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit 'ed7755cc30fe6b2b0254207347629ad0cae094db' into eclair-mr2-plus-aosp
* commit 'ed7755cc30fe6b2b0254207347629ad0cae094db':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-mr2
* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-plus-aosp
* commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df':
Fix a race that kept the locale picker from working under heavy CPU load.
Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-plus-aosp
* commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550':
A better solution for ignoring user activity while the screen is animating off.
Fixes a deadlock that occurred because mAnimatingScreenOff was left set to true
after aborting turning off the screen.
This change removes the mAnimatingScreenOff flag and checks for
(mScreenBrightness.animating && mScreenBrightness.targetValue == 0) instead.
Fixes bug b/2219706
Change-Id: I081f08c14ad7585a953fb567867238b1f3db841f
Signed-off-by: Mike Lockwood <lockwood@android.com>
The locale picker and the activity transition would both change the
configuration, and depending upon the timing, the activity transition
would undo what the locale picker had just done. Usually it worked right,
but would often fail if the user changed locales just after a data wipe,
when the media scanner was working hard in the background to index
the contents of the SD card.
http://b/issue?id=2216298
Merge commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-plus-aosp
* commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec':
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
This fixes a problem that resulted in bogus battery statistics for the prox and light sensors
due to the sensors being enabled in an app's context and disabled in the system context.
Fixes problems reported in bug b/2211960
Change-Id: Ib0d3d9d06f043b386d3b8d494b9bad5bd40bb6e1
Signed-off-by: Mike Lockwood <lockwood@android.com>
Fixes bug b/2198028 (testDirectionsFromScratchByTyping fails because of android.permission.ACCESS_WIFI_STATE)
Change-Id: I44e95981d805189ed6d906d388c5189ee788802f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-plus-aosp
* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '9baeff05a8bf9bd4479f2a357dca0463cc750202' into eclair-mr2-plus-aosp
* commit '9baeff05a8bf9bd4479f2a357dca0463cc750202':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Merge commit '6eb14c30387d9c13538887e54bc180a430b2ac40' into eclair-mr2
* commit '6eb14c30387d9c13538887e54bc180a430b2ac40':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Merge commit '6eb14c30387d9c13538887e54bc180a430b2ac40' into eclair-plus-aosp
* commit '6eb14c30387d9c13538887e54bc180a430b2ac40':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
