Amith Yamasani
8074e98b20
Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
2012-10-21 07:44:46 -07:00
Dirk Dougherty
27b94b3eac
am 746b6d46: am 7707b050: am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
...
* commit '746b6d462fd0eea294680a244602a81c3c993179':
Doc change: remove a few third-party refs. Fix broken image ref.
2012-10-20 18:00:17 -07:00
Dirk Dougherty
746b6d462f
am 7707b050: am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
...
* commit '7707b050f7f0f01819aaa6ccdafe0721c267fdeb':
Doc change: remove a few third-party refs. Fix broken image ref.
2012-10-20 17:57:58 -07:00
Dirk Dougherty
7707b050f7
am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
...
* commit '454248f0d25cfb7e4131acca07a4c38acb74934d':
Doc change: remove a few third-party refs. Fix broken image ref.
2012-10-20 17:55:38 -07:00
Dirk Dougherty
454248f0d2
am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
...
* commit 'e25c241bddaf1e838b95c924976861733c7042bf':
Doc change: remove a few third-party refs. Fix broken image ref.
2012-10-20 17:52:41 -07:00
Dirk Dougherty
e25c241bdd
am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
...
* commit '6faae9ad08670c30379fed451e73171f7d1b6ac8':
Doc change: remove a few third-party refs. Fix broken image ref.
2012-10-20 17:51:00 -07:00
Dirk Dougherty
6faae9ad08
Doc change: remove a few third-party refs. Fix broken image ref.
...
Change-Id: Ife1826f9c7d409e131b50e7178eba22f962d4219
2012-10-20 17:47:18 -07:00
Fabrice Di Meglio
0be6a28ed5
am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
...
* commit '08f27b1bffbf01d9e5a102b8c90a3c2095fc82b3':
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
2012-10-19 19:19:00 -07:00
Fabrice Di Meglio
08f27b1bff
am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
...
* commit '59420ecd1518289cc47c32181250539c981f85f0':
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
2012-10-19 19:17:06 -07:00
Fabrice Di Meglio
59420ecd15
Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
2012-10-19 19:14:30 -07:00
Fabrice Di Meglio
d3156a2a56
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
...
This was a regression introduced by a previous CL.
- we actually need to let the layout params resolution goes all the time
as we dont have any "isResolved" state and a public API for doing its reset thru ViewGroup.
The current implementation is simple and works even if it is doing sometimes a bit more
than it should really do. This is a well conscious tradeoff.
Change-Id: I5c4d532331b3970dfe88f016bc305cbc4a0d83f1
2012-10-19 18:46:43 -07:00
Jamie Gennis
7bbf8163fb
Set the secureness when creating displays
...
This change makes use of the new 'secure' argument to the
ISurfaceComposer::createDisplay method. In this change both the overlay and
wifi displays are hard-coded to be non-secure displays.
Bug: 7368436
Change-Id: Ib65312f2adab5104d8deefbfc32af9dc106a9129
2012-10-19 18:34:35 -07:00
Jeff Brown
32dafe25ac
Reduce screen on/off latency.
...
Reduce latency of screen on/off and improve how it is synchronized with
backlight changes. Screen state changes are no longer posted to vsync
which should save time. What's more, the state change occurs on a
separate thread so we no longer run the risk of blocking the Looper
for a long time while waiting for the screen to turn on or off.
Bug: 7382919
Bug: 7139924
Change-Id: I375950d1b07e22fcb94efb82892fd817e2f780dc
2012-10-19 18:04:27 -07:00
Kenny Root
9396f183c2
resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp
...
Change-Id: I21512d61b5c08cee5fed69b34c3275ba5c3fc0d8
2012-10-19 17:16:41 -07:00
Dianne Hackborn
7ad4438414
Fix issue #7353900 : Brief flash of home screen while dream starts on lock screen.
...
Not very clean, this has a special hack in the window manager to
redo layout when a dream window is shown. After MR1 we should clean
this up (and the various other special dream hacks).
Change-Id: Ic1a5a2b10a0a07b4a5dccdbf0736b614ec06dd4a
2012-10-19 16:40:13 -07:00
Kenny Root
a5d29b2c14
am 9bef3294: Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev
...
* commit '9bef3294d3660a85442829a25c9777e25d3c3cc8':
Try to free cache before giving up on install
Robustly add symlink and add for non-primary users
2012-10-19 16:40:07 -07:00
Kenny Root
9bef3294d3
Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev
...
* changes:
Try to free cache before giving up on install
Robustly add symlink and add for non-primary users
2012-10-19 16:37:55 -07:00
Casey Burkhardt
4be114b6d4
Re-fixing content descritpion on quick settings toggle.
...
Bug: 7362316
Change-Id: I6d4afbcbfbe3e38a6bdd080bc60409854de08251
2012-10-19 16:29:28 -07:00
Amith Yamasani
db6a14cc85
Fix crashes when quickly adding and removing users
...
Make USER_REMOVED an ordered broadcast and send it before the user's
state is completely removed from the system. This gives services the
opportunity to clean up their state, while still having access to the
user's directory and UserInfo object (such as serial number).
Tell SyncManager to skip over dying/partially created users.
Improve UserManager tests, waiting for users to be removed fully.
Bug: 7382252
Change-Id: I93cfb39c9efe6f15087bf83c569a2d154ef27168
2012-10-19 16:23:30 -07:00
Eric Laurent
4aed962612
am a09dd3a6: am 7e1664d4: Merge "New camera sounds" into jb-mr1-dev
...
* commit 'a09dd3a6081b498476beddbbc2506f6d2be25a6b':
New camera sounds
2012-10-19 16:18:04 -07:00
Eric Laurent
a09dd3a608
am 7e1664d4: Merge "New camera sounds" into jb-mr1-dev
...
* commit '7e1664d44be6174c772fc3d2dc8ef9f5f5824390':
New camera sounds
2012-10-19 16:15:39 -07:00
Eric Laurent
7e1664d44b
Merge "New camera sounds" into jb-mr1-dev
2012-10-19 16:13:08 -07:00
Svetoslav Ganov
f46476cd15
am 19f2b16c: am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
...
* commit '19f2b16cb6b4f488b31861e1f572ec4f71ffd69e':
Cannot pan in browser if magnification is enabled.
2012-10-19 14:53:23 -07:00
Svetoslav Ganov
19f2b16cb6
am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
...
* commit '9823723d0f0bb47dfd3a6b251d7155dc1eb0918b':
Cannot pan in browser if magnification is enabled.
2012-10-19 14:50:02 -07:00
Svetoslav Ganov
9823723d0f
Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
2012-10-19 14:46:40 -07:00
Christopher Tate
9fffd565a9
am e9472f29: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
...
* commit 'e9472f2937478ead4a5c2115ee69e508e4933417':
Document immutable requirement of SharedPreferences return objects
2012-10-19 14:43:50 -07:00
Christopher Tate
e9472f2937
am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
...
* commit '935415a050be75f582f632dd168be9fbb047137b':
Document immutable requirement of SharedPreferences return objects
2012-10-19 14:41:16 -07:00
Christopher Tate
935415a050
Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
2012-10-19 14:38:05 -07:00
Daniel Sandler
d5483c3157
New lockscreen: allow search gesture from nav bar.
...
Show a lights-out pip if home is invisible but search is
still OK.
Change-Id: Ifc69c12296cc8e8cf7c89dd06173d7abf499a878
2012-10-19 16:48:12 -04:00
Christopher Tate
01ed79c578
Document immutable requirement of SharedPreferences return objects
...
In particular, make it quite clear that the set returned by
getStringSet() must not be modfied by the app, period; and
add a similar caution about the map returned via getAll().
Also, fix a bug that could lead to unexpected data being committed
if the set instance passed to putStringSet() was mutated by the
app after that call (including mutations after commit() was
invoked).
Bug 7312641
Change-Id: If9a1be1b0669ac879ff7a7dc67a8805548ea10cc
2012-10-19 13:43:52 -07:00
Adam Cohen
f9a3616bc9
am 7ff0fa48: am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev
...
* commit '7ff0fa48c2e4ae7f0684f28d40e39852211f23a0':
Fix transition into Recents with live wallpaper
2012-10-19 13:22:57 -07:00
Adam Cohen
7ff0fa48c2
am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev
...
* commit '6dad395ca8d5ff4ae278ac82a6de7a1ed2e36b49':
Fix transition into Recents with live wallpaper
2012-10-19 13:19:25 -07:00
Adam Cohen
6dad395ca8
Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev
2012-10-19 13:17:54 -07:00
alanv
ac6e50a671
Catch badly formed URLs in WebView accessibility injector.
...
Bug: 7206684
Change-Id: I13e8f29043314430ea3fcfa8ab59040136d06e57
2012-10-19 12:57:41 -07:00
Irfan Sheriff
93462385d4
am cacc4792: am 61e42262: Fix group join CTS test
...
* commit 'cacc47920795ad0421f056004c03984a8e114b8b':
Fix group join CTS test
2012-10-19 12:43:21 -07:00
Irfan Sheriff
cacc479207
am 61e42262: Fix group join CTS test
...
* commit '61e42262000549b78843f0959043fec8367ed189':
Fix group join CTS test
2012-10-19 12:40:40 -07:00
Irfan Sheriff
61e4226200
Fix group join CTS test
...
Bug: 7379336
Change-Id: I20ead7e8c0d855be523bdfd8d9cb9eaa4b8fcac1
2012-10-19 12:30:47 -07:00
Fabrice Di Meglio
e549a602a3
am af26ac31: am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
...
* commit 'af26ac3130c0e956e28443d6e42212b02d4da611':
Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
2012-10-19 11:38:18 -07:00
Fabrice Di Meglio
af26ac3130
am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
...
* commit '398a6713c355cf59af071e944268aec7c0096b5a':
Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
2012-10-19 11:36:12 -07:00
Fabrice Di Meglio
398a6713c3
Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
2012-10-19 11:33:01 -07:00
Jeff Sharkey
45dec78cde
am e4109957: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
...
* commit 'e4109957ecaabf1e6843a4cde4dcfac9d37fef23':
Parcel VpnProfile without using disk format.
2012-10-19 11:18:22 -07:00
Jeff Sharkey
e4109957ec
am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
...
* commit 'ba0372db366e63fa928ba83f3ad8c064c51ac8e0':
Parcel VpnProfile without using disk format.
2012-10-19 11:16:41 -07:00
Jeff Sharkey
ba0372db36
Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
2012-10-19 11:12:59 -07:00
John Spurlock
01d2c64ab2
am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
...
* commit '7404f28b11e386a42b67ec8afcc9823f2bd03c2b':
Frameworks base: Promote dream setting defaults to config.
2012-10-19 11:05:23 -07:00
John Spurlock
7404f28b11
am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
...
* commit '8c82025650fdbcb2a80be03f8be6dbff430b678c':
Frameworks base: Promote dream setting defaults to config.
2012-10-19 11:02:40 -07:00
John Spurlock
8c82025650
Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
2012-10-19 11:00:00 -07:00
Jeff Sharkey
6e7aa77565
Parcel VpnProfile without using disk format.
...
The on-disk format of VpnProfile only stores the username/password
when saveLogin is set, which was dropping them across IPC boundaries.
Bug: 7378327
Change-Id: I30c16efb358ab8f8d3d9229bbf9811146fe034ce
2012-10-19 10:48:11 -07:00
Romain Guy
be432fa01c
am eb78cf53: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824 " into jb-mr1-dev
...
* commit 'eb78cf538f87301c1612bf081ae2d5f93cae50f0':
Defer layer rendering to avoid stalls Bug #7326824
2012-10-19 10:45:41 -07:00
Romain Guy
eb78cf538f
am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824 " into jb-mr1-dev
...
* commit '8b946c055ddd90cf79cd407c9f68a013d5d24c2a':
Defer layer rendering to avoid stalls Bug #7326824
2012-10-19 10:43:04 -07:00
Romain Guy
8b946c055d
Merge "Defer layer rendering to avoid stalls Bug #7326824 " into jb-mr1-dev
2012-10-19 10:40:28 -07:00