Merge commit '24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1' into eclair-mr2-plus-aosp
* commit '24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1':
Propagate background scheduling class across processes.
Merge commit 'e851cdc6c48c977d05096847001a0601d892fd55' into eclair-plus-aosp
* commit 'e851cdc6c48c977d05096847001a0601d892fd55':
Fix#2313382: SECURITY: Live wallpapers get touch events through the lock screen.
Merge commit 'e851cdc6c48c977d05096847001a0601d892fd55' into eclair-mr2
* commit 'e851cdc6c48c977d05096847001a0601d892fd55':
Fix#2313382: SECURITY: Live wallpapers get touch events through the lock screen.
Add a new flag for bindService that tells the system to not bring the
target service's process in to the foreground scheduling class. This is
used by the sync system to not cause the current sync adapter to come to
the foreground as it is running.
Also some small improvements to the debug output of the process list
of oom adj and scheduling info.
This is a quick and dirty hack to not deliver touch events to the wallpaper when
they are being sent to the keyguard. Perhaps we should have a separate window
flag for this, but... bleah. Maybe later. Or maybe I'll use that secure flag.
Or something.
Change-Id: Ifd95b9f5b10db24a0854a93b925a833b24331b4c
Merge commit '1fbc280dac0ce5089ff1491612944344af8d72b4'
* commit '1fbc280dac0ce5089ff1491612944344af8d72b4':
Fix updating Bluetooth icon on status bar and for Wifi.
This is a very simply implementation: upon receiving an IPC, if the handling
thread is at a background priority (the driver will have taken care of
propagating this from the calling thread), then stick it in to the background
scheduling group. Plus an API to turn this off for the process, which is
used by the system process.
This also pulls some of the code for managing scheduling classes out of
the Process JNI wrappers and in to some convenience methods in thread.h.
Merge commit '47cc8112c3f77637ef408ef18e48d146e8250a27' into eclair-mr2-plus-aosp
* commit '47cc8112c3f77637ef408ef18e48d146e8250a27':
Fix updating Bluetooth icon on status bar and for Wifi.
Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-mr2
* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
Fix updating Bluetooth icon on status bar and for Wifi.
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-plus-aosp
* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
DO NOT MERGE Reverting change I53e91db7.
Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-plus-aosp
* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
Fix updating Bluetooth icon on status bar and for Wifi.
Accidentally submitted into eclair instead of eclair-mr2.
I apparently rebased my mr2 working dir to eclair by mistake.
Do not merge this so the desired change will survive on mr2 as intended.
bug: 2265222
Status bar uses the SINK_STATE_CHANGE intent to determine the icon.
This intent also has the device. Thus, we can get this intent for any
device and we update the icon wrongly. The same problem is with Wifi.
This was not commonly observed till now, but with the car dock changes
its easy to reproduce as we can get an incoming connection from the
car's bluetooth system. For Wifi, this will cause coexistance issues
especially with desk docks.
Dr No: Eastham
Bug: 2133530
Merge commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4' into eclair-mr2-plus-aosp
* commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4':
Filter out minor Connectivity Notifications.
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-mr2
* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
Filter out minor Connectivity Notifications.
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-plus-aosp
* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
Filter out minor Connectivity Notifications.
Merge commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61'
* commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61':
move event log tags used by ActivityManager into this package
Merge commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2'
* commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2':
If the usage stats file doesn't exist in the first place there is no need to
Don't send a connectivity change notification if the change is in detailed state only.
IE, Disconnect/Idle -> Disconnect/Scanning should not trigger a connection change
notification.
bug: 2265222
Merge commit 'f6683bb5592825a62e30760abb0734deaaf7bd93' into eclair-mr2-plus-aosp
* commit 'f6683bb5592825a62e30760abb0734deaaf7bd93':
move event log tags used by ActivityManager into this package
We can now locate event log tag definitions in individual packages
(and java constants for the tag numbers get auto-generated), so move
all the tags used by the system server into the package.
Merge commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d' into eclair-mr2-plus-aosp
* commit 'ccbf4c282f6d27602896b812485b41b74eaf8c6d':
If the usage stats file doesn't exist in the first place there is no need to
Merge commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-plus-aosp
* commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
If the usage stats file doesn't exist in the first place there is no need to
Merge commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-mr2
* commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
If the usage stats file doesn't exist in the first place there is no need to
Merge commit '48476b0ade7594a64612db2b867792737193b2ec' into eclair-mr2-plus-aosp
* commit '48476b0ade7594a64612db2b867792737193b2ec':
move event log tags used by system server into this package
We can now locate event log tag definitions in individual packages
(and java constants for the tag numbers get auto-generated), so move
all the tags used by the system server into the package.
Merge commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997'
* commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '11a2853e0196905e25a2dc5c227320688e04e950' into eclair-mr2-plus-aosp
* commit '11a2853e0196905e25a2dc5c227320688e04e950':
Add support for Car Dock.
Merge commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc' into eclair-mr2-plus-aosp
* commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338' into eclair-plus-aosp
* commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338':
Add support for Car Dock.
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2
* commit '678c2e35768a5426b4ad8f67c836008e7751a353':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-plus-aosp
* commit '678c2e35768a5426b4ad8f67c836008e7751a353':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda'
* commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda':
Make the notification panel send the position as well.
Part of a fix for bug b/2300622 (Proximity sensor always blows up the lock screen while in call)
Change-Id: I9ef888638b19540a78a34507d52ff522f505102f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'a8974b637c384d10bac10d94fae7487afdb2c16d' into eclair-mr2-plus-aosp
* commit 'a8974b637c384d10bac10d94fae7487afdb2c16d':
Make the notification panel send the position as well.
Merge commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-plus-aosp
* commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a':
Make the notification panel send the position as well.
Merge commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-mr2
* commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a':
Make the notification panel send the position as well.
