Merge commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe' into gingerbread-plus-aosp
* commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe':
Add dynamic uid info for tracking the sip service usage.
Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp
* commit '6947cc594276df899a0c4662224455f40846bd0a':
Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
Merge commit '50395e80718e77d27ec5e2d474b255e05de68d82' into gingerbread-plus-aosp
* commit '50395e80718e77d27ec5e2d474b255e05de68d82':
Fix a fun bug with multiple service bindings from an activity.
There was a flaw in the service management, when the same activity
is doing a bindService() for the same service IBinder. In this case
the activity would correctly keep a list of all generated connections,
however some other data structures would assume there is only one
connection per IBinder, and thus only remember the last.
When that last connection was unbound, the service would be destroyed
since it thought there were no more connections. Then when the
activity was finished, it would try to destroy the service again and
end up with an ANR because the service was already gone and would
not respond.
Change-Id: I59bde38bc24e78147b90b0a7cd525c2a1d20489f
We were using a flag so new broadcasts replaced old. If people are expecting
to see all the broadcasts they sometimes would fail.
bug:2892383
Change-Id: I63df17fe8f8c68f59e1ad6297fe93e169b4463b4
Merge commit '80db4381c010c4dec74c2bf1e02380759e4ff97b' into gingerbread-plus-aosp
* commit '80db4381c010c4dec74c2bf1e02380759e4ff97b':
DO NOT MERGE Enable all networks on screen on
Connectivity to a disabled network never happens.
An old dhcp issue for example prevents
connectivity again in future. Allow connectivity
on all networks on screen on.
Bug: 2129037
Change-Id: I42afc17ddb5cd238e46d7e50f1b6e708e107b35d
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp
* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
DO NOT MERGE Fixing Connectivity
Merge commit '39792d2262352ae775091876d5488d2412a2ff92' into gingerbread-plus-aosp
* commit '39792d2262352ae775091876d5488d2412a2ff92':
Fix bugs with granting permissions through onNewIntent().
It would grant the permission to the temporary ActivityRecord,
not the real one, so it never got cleaned up.
Also allow granting of permissions to services because... well,
it would be really really useful. And it introduces some
refactoring that we'll need to support cut/paste.
Change-Id: If521f509042e7baad7f5dc9bec84b6ba0d90ba09
Passing Gateway addr info from telephony into ConnectivityService so it can
add/remove the default route as needed. Fixed differently on master.
bug:2927822
Change-Id: I9a3ee7cd23c4717e7c60098f0595aa3f77c44b15
Merge commit 'b9a1793195853d6f4a8656d029f0ab47a544d31d' into gingerbread-plus-aosp
* commit 'b9a1793195853d6f4a8656d029f0ab47a544d31d':
SipSession: make potential time-consuming ops run on background thread
Merge commit '99401b29c3f39488a058d3eb616009b751879a77' into gingerbread-plus-aosp
* commit '99401b29c3f39488a058d3eb616009b751879a77':
Add support for throttling motion events.
Merge commit 'cf6d2a1de274e9a4156b12be811a180eb36412ab' into gingerbread-plus-aosp
* commit 'cf6d2a1de274e9a4156b12be811a180eb36412ab':
Fix issue #2845673: android:exported="false" is not obeyed
Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).
Bug: 2834260
Change-Id: I8b33d307f3d569bc92ba2139b9ed224ffc147547
Merge commit '209e651805dd40ea87df7ff67f2755605be9308c' into gingerbread-plus-aosp
* commit '209e651805dd40ea87df7ff67f2755605be9308c':
Make the LED colors when charging customizable by the vendor
Merge commit 'c708e38356e9c381b640ef96db3b0b0fdd41d433' into gingerbread-plus-aosp
* commit 'c708e38356e9c381b640ef96db3b0b0fdd41d433':
Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"
Merge commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815' into gingerbread-plus-aosp
* commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815':
GPS: Initialize XTRA support when GPS is enabled
This reverts commit f2e67a5779.
Open Source Project CL: https://review.source.android.com/#change,16419
This change unexpectedly started preventing users from changing Input-Method.
How to reproduce
1. Long press "?123" button in LatinIME
2. Select "Input method"
3. No window will open.
Change-Id: Ie0d4b58900a9b06aa9d43f9fa0bea5165294fa30
Merge commit '567722eee190f7cf88dc7ea95167db76d5514842' into gingerbread-plus-aosp
* commit '567722eee190f7cf88dc7ea95167db76d5514842':
Fix problems with determining when to kill apps for wake usage.
Merge commit 'e300b8c10c306b575bbbec29d5572ba92a97785e' into gingerbread-plus-aosp
* commit 'e300b8c10c306b575bbbec29d5572ba92a97785e':
DO NOT MERGE Always set/remove default routes.
Merge commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177' into gingerbread-plus-aosp
* commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177':
Various battery info things:
Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on teh same interface.
Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.
bug:2865974
Change-Id: Ifdf49080fa0413a4d826813706c809975a562dfa
- Now track wake locks in battery history.
- Now track sensors in battery history.
- Some filtering of sensory data.
- Fixes to some data that wasn't cleared when resetting battery stats.
- Print amount discharged since last charge.
And the big part -- keep track of wake locks held per process,
and kill processes that hold wake locks too much while they are in
the background. This includes information in the battery stats
about the process being killed, which will be available to the
developer if the app is reported.
Change-Id: I97202e94d00aafe0526ba2db74a03212e7539c54
Use these system properties:
ro.watermark.text
ro.watermark.height
ro.watermark.x
ro.watermark.y
ro.watermark.color
ro.watermark.shadow.radius
ro.watermark.shadow.dx
ro.watermark.shadow.dy
ro.watermark.shadow.color
If ro.watermark.text is not set, no watermark will be shown. All others
have reasonable defaults if they are not set.
Change-Id: Ibe4a01e6f1c576494ae2462e2688cdfaa8c62cb8
Merge commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066' into gingerbread-plus-aosp
* commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066':
Add support for the PointerLocation overlay.
