Jamie Gennis
9fee7bd73d
am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
...
* commit '23d622418b5c67dc43faabd930d1c59c5ce34f6a':
Set the secureness when creating displays
2012-10-22 13:52:12 -07:00
Jamie Gennis
23d622418b
Merge "Set the secureness when creating displays" into jb-mr1-dev
2012-10-22 13:49:35 -07:00
Amith Yamasani
6eb9844c8e
am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
...
* commit '2278898126c1cea4bd345bb96313d381b4ad3993':
System server should always send broadcasts to a specific or all users
2012-10-22 13:35:21 -07:00
Amith Yamasani
2278898126
Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
2012-10-22 13:32:24 -07:00
Amith Yamasani
cd75706117
System server should always send broadcasts to a specific or all users
...
Bug: 7368245
Log a warning if the system process calls unqualified sendBroadcast()
and other calls.
As a result of the logging above, found a few more method calls such as
bindService() that would benefit from being more explicit to avoid
future confusion and reduce the log warnings.
Change-Id: I17f15c8be9adf7becd456d6abbab606f19befdbf
2012-10-22 12:38:53 -07:00
Adam Powell
cad6dce596
am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
...
* commit 'cd92db84c6d9e0c9992abfbbda45d504c7f5e062':
Remove View's long press callbacks when ACTION_CANCEL is received
2012-10-22 12:31:35 -07:00
Adam Powell
5311c4476e
Remove View's long press callbacks when ACTION_CANCEL is received
...
Bug 7391646
Change-Id: Icd100d3eff63a54c892367fb70dec517257a01f8
2012-10-22 12:15:49 -07:00
Baligh Uddin
e53f5265d1
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-22 10:28:21 -07:00
Baligh Uddin
154eaa22c3
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-22 10:24:45 -07:00
Baligh Uddin
93c6094b67
Import translations. DO NOT MERGE
...
Change-Id: I02aa0e6fa545b325429029f58d19247b9d3f3373
Auto-generated-cl: translation import
2012-10-22 09:44:44 -07:00
Baligh Uddin
02e551c200
Import translations. DO NOT MERGE
...
Change-Id: Ib5d95dba6f34050b0863776a786cd75b9def4af0
Auto-generated-cl: translation import
2012-10-22 09:43:15 -07:00
Daniel Sandler
466b77e995
am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
...
* commit '2dd0c3a576925be4b5f0438a57af626e6e162e0e':
New lockscreen: allow search gesture from nav bar.
2012-10-22 08:02:32 -07:00
Daniel Sandler
2dd0c3a576
Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
2012-10-22 07:59:18 -07:00
Amith Yamasani
f624d72cb0
am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
...
* commit '8074e98b20ac04fdc032a1ed00dd6763b7e04147':
Fix crashes when quickly adding and removing users
2012-10-21 07:48:02 -07:00
Amith Yamasani
8074e98b20
Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
2012-10-21 07:44:46 -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
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
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
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
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
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
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
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
Craig Mautner
444354d2c6
am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
...
* commit '0ed07a0a30ef71053d0426956d3c198bb7540d4e':
Allow getDisplayContentLocked to return null...
2012-10-19 09:30:06 -07:00
Craig Mautner
0ed07a0a30
Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
2012-10-19 09:27:06 -07:00
John Spurlock
ed108f3d12
Frameworks base: Promote dream setting defaults to config.
...
So that:
- the values can be shared (to fix assoc bug)
- the values can be customized in product overlays
Bug:7373284
Change-Id: I37f037082523a3d975f6014f36afa28c60117372
2012-10-19 11:32:03 -04:00
Geremy Condra
01e99adaed
am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
...
* commit 'a1f739ea83b6d770b8469ae1c2c4161f6fe96334':
Change android.permission.SERIAL_PORT to signature|system.
2012-10-19 00:02:41 -07:00
Geremy Condra
a1f739ea83
Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
2012-10-18 23:59:37 -07:00
Dave Burke
744b4dca34
am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
...
* commit '09a5321c60c02d944684abb98e0daec9dd810fab':
Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
2012-10-18 21:05:29 -07:00
Dave Burke
09a5321c60
Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
2012-10-18 21:02:13 -07:00
Dave Burke
579e14016c
Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
...
This reverts commit 57fca90ac65ecfe97acd4c93d442c3db8f815e11
Change-Id: I21b007a7d150a4c23f25a706cdba5cb86198198f
2012-10-18 20:41:55 -07:00
Fabrice Di Meglio
b003e28c1d
Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
...
- set the popup layout direction depending on the anchor view's layout direction
(if not defined before)
- make first pass of ViewRootImpl.performTraversals() and configuration update
not override any layout direction that could have been set before
Change-Id: I8e86ca805f0caf52c058d06aa7861df56fb862e6
2012-10-18 18:02:56 -07:00
Kenny Root
cea3743499
Try to free cache before giving up on install
...
Try to get installd to free up cache before giving up when there is too
little space free.
Bug: 7232123
Change-Id: Ie3c8ca8dfc190abbb9a29a7baee31f32e9de7d69
2012-10-18 17:21:59 -07:00
Fabrice Di Meglio
8de328c996
am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
...
* commit '45c77ca0f6afd568ff6d149e17fb43c684e51722':
Fix missing @hide on ViewGroup.resolveLayoutParams()
2012-10-18 16:24:08 -07:00
Fabrice Di Meglio
45c77ca0f6
Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
2012-10-18 16:20:36 -07:00
Fabrice Di Meglio
1e0ed6b232
Fix missing @hide on ViewGroup.resolveLayoutParams()
...
- as we dont need this to be public
Change-Id: Ib8de262eec26d4785b13875d59599369b06a067d
2012-10-18 16:06:52 -07:00
Fabrice Di Meglio
8c2bc7ccf1
am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
...
* commit '07f85fecdd9f13a617953c7377ff62b4133b4e30':
Fix bug #7374285 GridLayout layout param margins are broken in RTL mode
2012-10-18 15:26:29 -07:00
Fabrice Di Meglio
07f85fecdd
Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
2012-10-18 15:23:41 -07:00