Jean-Baptiste Queru
0e0942c720
Merge "Default WiFi sleep policy setting"
2012-08-29 09:50:45 -07:00
Irfan Sheriff
48c45d0e3b
Merge "Fix join scenario with provision discovery"
2012-08-29 09:47:27 -07:00
Irfan Sheriff
127efc4e25
Fix join scenario with provision discovery
...
Bug: 7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
2012-08-29 08:36:17 -07:00
Michal Stawinski
35ef567140
Fix SkBitmap::fPixels not being locked correctly
...
In some cases bitmap's pixels where freed during encoding, which
caused a null pointer dereference.
This fix makes sure that underlaying buffer is locked for the whole
process of compression.
Change-Id: I0ac56821f5d333072271dc2670fa30f1562adfa3
2012-08-29 15:54:01 +02:00
Mikhail Naganov
ba9b189c3d
Merge "Clarify WebSettings.setGeolocationEnabled JavaDocs."
2012-08-29 06:27:36 -07:00
Mikhail Naganov
6cb296a55c
Clarify WebSettings.setGeolocationEnabled JavaDocs.
...
The current doc is very brief and doesn't specify important
requirements.
Change-Id: I36c0cfac18d2c9a7b435b07d67d1bbabad41e2fb
2012-08-29 14:17:32 +01:00
Jeff Brown
c53abc4d42
Run with scissors.
...
Add a useful (if somewhat dangerous) method which will help
replace similarly dangerous code patterns in a few different places.
Change-Id: If1295f7ab9652c906ce718d94eb7914d143e1939
2012-08-29 06:15:21 -07:00
Erik Ljungberg
7e07147ece
Default WiFi sleep policy setting
...
Creates a defult.xml setting for WiFi sleep policy.
It is now possible, through device overlays, to change
the default sleep policy to e.g. never in order to improve
user experience of WiFi.
Change-Id: Ie459b8e70fdbc7c605452fe0692d7bc26460e939
2012-08-29 09:52:12 +02:00
Johan Redestig
3cd42dfd50
Make addAddress locale safe
...
Using regular string concatenation to avoid unexpected
results in some locales.
Change-Id: I47dd5e174c4a2e88dc18e014002820cdbf63fcad
2012-08-29 08:07:02 +02:00
Amith Yamasani
122adb0909
am 5a38afac: am 2c577f17: Merge "Fix adding live wallpaper in a second user" into jb-mr1-dev
...
* commit '5a38afac83ec364bff8016d11cf272f126f20d67':
Fix adding live wallpaper in a second user
2012-08-28 22:52:35 -07:00
Amith Yamasani
5a38afac83
am 2c577f17: Merge "Fix adding live wallpaper in a second user" into jb-mr1-dev
...
* commit '2c577f1777a9227c581d41d5c08d674740e39ea9':
Fix adding live wallpaper in a second user
2012-08-28 22:50:54 -07:00
Amith Yamasani
2c577f1777
Merge "Fix adding live wallpaper in a second user" into jb-mr1-dev
2012-08-28 22:47:45 -07:00
Amith Yamasani
4e2820c22b
Fix adding live wallpaper in a second user
...
When the second user downloads a new wallpaper service, Wallpaper
service needs to query the correct user's package state to figure
out if it is available and bind to it.
Change-Id: Ifb95db1c859887f996f5b2e821b4b46510ee7016
2012-08-28 22:45:17 -07:00
Adam Powell
2d7d23beed
am 910500b1: am 04951a51: Merge "New implementation for ScaleGestureDetector" into jb-mr1-dev
...
* commit '910500b17c429f677a711e1ab2474a2caf8f7fe7':
New implementation for ScaleGestureDetector
2012-08-28 18:57:07 -07:00
Adam Powell
910500b17c
am 04951a51: Merge "New implementation for ScaleGestureDetector" into jb-mr1-dev
...
* commit '04951a51f8b8cc4fade3742ab0de8e74cd86807a':
New implementation for ScaleGestureDetector
2012-08-28 18:54:29 -07:00
Adam Powell
04951a51f8
Merge "New implementation for ScaleGestureDetector" into jb-mr1-dev
2012-08-28 18:51:24 -07:00
Craig Mautner
27ff8538f7
am 73439236: am c479b55a: Merge "Check proximity detector before powering off." into jb-mr1-dev
...
* commit '73439236885c557fd59d26714814e5f2512dafdc':
Check proximity detector before powering off.
2012-08-28 17:20:42 -07:00
Craig Mautner
7343923688
am c479b55a: Merge "Check proximity detector before powering off." into jb-mr1-dev
...
* commit 'c479b55abe059776392af54685b77a825871781e':
Check proximity detector before powering off.
2012-08-28 17:18:47 -07:00
Craig Mautner
c479b55abe
Merge "Check proximity detector before powering off." into jb-mr1-dev
2012-08-28 17:16:28 -07:00
Craig Mautner
4ccbdd1770
Check proximity detector before powering off.
...
Do not automatically power off if the proximity detector wakelock is
active.
Fixes bug 7047455.
Change-Id: I44e30bf388292e5c476dfb5d0de9226d21853e4d
2012-08-28 17:12:52 -07:00
Amith Yamasani
824b8dedbb
am ef81aac0: am 7af0c166: Merge "Fix recents list for multiuser" into jb-mr1-dev
...
* commit 'ef81aac0cd95871ec8f3638d3cdd27aeea87a0b6':
Fix recents list for multiuser
2012-08-28 17:08:04 -07:00
Amith Yamasani
ef81aac0cd
am 7af0c166: Merge "Fix recents list for multiuser" into jb-mr1-dev
...
* commit '7af0c166f01f80dbe28339c46b1d381837f92b73':
Fix recents list for multiuser
2012-08-28 17:05:32 -07:00
Amith Yamasani
7af0c166f0
Merge "Fix recents list for multiuser" into jb-mr1-dev
2012-08-28 17:02:29 -07:00
Amith Yamasani
3f1a2d15f6
am 5d33cdb5: am c3815a56: Merge "Fix PendingIntent caching for multiuser" into jb-mr1-dev
...
* commit '5d33cdb5ac24a7a234fbb9db09d652b10677e25b':
Fix PendingIntent caching for multiuser
2012-08-28 17:01:21 -07:00
Amith Yamasani
5d33cdb5ac
am c3815a56: Merge "Fix PendingIntent caching for multiuser" into jb-mr1-dev
...
* commit 'c3815a5679c21a6b09c2deaa6baedd124f9e717a':
Fix PendingIntent caching for multiuser
2012-08-28 16:58:48 -07:00
Amith Yamasani
c3815a5679
Merge "Fix PendingIntent caching for multiuser" into jb-mr1-dev
2012-08-28 16:56:19 -07:00
Elliott Hughes
989e14bee1
Merge "Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings."
2012-08-28 16:54:14 -07:00
Jeff Sharkey
35744c19f6
Bind to screenshot service for current user.
...
Let apps bindService() across user boundaries if they hold the
INTERACT_ACROSS_USERS_FULL permission.
Bug: 7012034
Change-Id: I2047d8318e1de47bfae7470d1dbc6fe5cfe44fdc
2012-08-28 16:49:10 -07:00
Elliott Hughes
47a0539eca
Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings.
...
Change-Id: Id9e3b678a98751c4ca85f63b130cc7781d2a6cfe
2012-08-28 16:41:37 -07:00
John Reck
5a55494d15
am 992fde95: am b5b2acec: Merge "Remove dead code" into jb-mr1-dev
...
* commit '992fde950886606adbe29b523188428308e7502d':
Remove dead code
2012-08-28 16:32:20 -07:00
Dianne Hackborn
80a4af2bbc
Start implementing concept of "running" users.
...
The activity manager now keeps track of which users are running.
Initially, only user 0 is running.
When you switch to another user, that user is started so it is
running. It is only at this point that BOOT_COMPLETED is sent
for that user and it is allowed to execute anything.
You can stop any user except user 0, which brings it back to the
same state as when you first boot the device. This is also used
to be able to more cleaning delete a user, by first stopping it
before removing its data.
There is a new broadcast ACTION_USER_STOPPED sent when a user is
stopped; system services need to handle this like they currently
handle ACTION_PACKAGE_RESTARTED when individual packages are
restarted.
Change-Id: I89adbd7cbaf4a0bb72ea201385f93477f40a4119
2012-08-28 16:30:55 -07:00
John Reck
992fde9508
am b5b2acec: Merge "Remove dead code" into jb-mr1-dev
...
* commit 'b5b2acec806a3acfbecb63839f8da431e8a9daab':
Remove dead code
2012-08-28 16:30:50 -07:00
John Reck
b5b2acec80
Merge "Remove dead code" into jb-mr1-dev
2012-08-28 16:28:15 -07:00
John Reck
25b86b6bf0
Remove dead code
...
Change-Id: Ice4bf3a94743019a8fc8ab04ee3de19f27a9e2c3
2012-08-28 16:24:28 -07:00
Adam Powell
618cbea4e7
New implementation for ScaleGestureDetector
...
This solves the problems around active pointer tracking when the
caller may skip events in the MotionEvent stream and replaces the
old implementation with a much simpler algorithm.
Change-Id: I6b15a2e215cab7b9559db800fcc57374702357fc
2012-08-28 16:20:32 -07:00
Irfan Sheriff
95cedb19ed
am 5aa9b043: am 608e5c41: Merge "Fix join scenario with provision discovery" into jb-mr1-dev
...
* commit '5aa9b043e75c3963e16c8af2260081b9af0b2bed':
Fix join scenario with provision discovery
2012-08-28 16:12:59 -07:00
Irfan Sheriff
5aa9b043e7
am 608e5c41: Merge "Fix join scenario with provision discovery" into jb-mr1-dev
...
* commit '608e5c416f15fb6d71ec6e3024ff2579fe006637':
Fix join scenario with provision discovery
2012-08-28 16:10:39 -07:00
Irfan Sheriff
608e5c416f
Merge "Fix join scenario with provision discovery" into jb-mr1-dev
2012-08-28 16:07:40 -07:00
Irfan Sheriff
4bbb13976e
Fix join scenario with provision discovery
...
Bug: 7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
2012-08-28 16:05:43 -07:00
Dianne Hackborn
e42c5d52e2
am 8c9c235f: am def8b0f0: Merge "Fix infinite loop when uninstalling apps." into jb-mr1-dev
...
* commit '8c9c235f520cd56289a305be815b30cce9784495':
Fix infinite loop when uninstalling apps.
2012-08-28 16:05:09 -07:00
Dianne Hackborn
8c9c235f52
am def8b0f0: Merge "Fix infinite loop when uninstalling apps." into jb-mr1-dev
...
* commit 'def8b0f011b5b2b02235063d5021ddfd58aa0baf':
Fix infinite loop when uninstalling apps.
2012-08-28 16:03:53 -07:00
Dianne Hackborn
def8b0f011
Merge "Fix infinite loop when uninstalling apps." into jb-mr1-dev
2012-08-28 16:01:53 -07:00
Dianne Hackborn
377de7b13e
Fix infinite loop when uninstalling apps.
...
Change-Id: Ibdf7fa832529a358d1115fc300651101c5185484
2012-08-28 15:57:33 -07:00
Baligh Uddin
6013978aa8
am f3a4f90f: (-s ours) am b2100187: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'f3a4f90f56d5e1efa1522526b7b021d1a7154c8a':
Import translations. DO NOT MERGE
2012-08-28 15:55:20 -07:00
Baligh Uddin
f3a4f90f56
am b2100187: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b210018760997ee76940080b3257dda0958b681f':
Import translations. DO NOT MERGE
2012-08-28 15:52:59 -07:00
Baligh Uddin
b210018760
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-28 15:51:02 -07:00
Amith Yamasani
d2e99565f5
Fix recents list for multiuser
...
Since the Recents is now an activity running in the respective user's sandbox,
it shouldn't use the special API to get the current user's recent tasks.
Otherwise it causes all users to fetch the state of the current foreground user
instead of their own recents.
Change-Id: Ice8c2978e6a7ae71c44666c79a19ac07a2cbea1b
2012-08-28 15:49:06 -07:00
Baligh Uddin
4216984c05
Merge "Import translations. DO NOT MERGE"
2012-08-28 15:48:43 -07:00
Baligh Uddin
8f6c0fb66c
am 3e328cce: (-s ours) am 97d8f838: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '3e328cce5f1c0983e713c2435fc141c034158891':
Import translations. DO NOT MERGE
2012-08-28 15:36:26 -07:00
Baligh Uddin
3e328cce5f
am 97d8f838: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '97d8f83818d36397805a8844ce5d71ce3a5fe069':
Import translations. DO NOT MERGE
2012-08-28 15:34:04 -07:00