Christopher Ferris
be4d8ddf1d
Fix bug where mExtensions was not initialized.
...
Recent changes to mExtensions moved the initialization code from the
constructor to a separate function called load. Make sure to call
this function in the initExtensions function call.
Bug: 25615666
Change-Id: Ic016232c42afefd3b5bc3e4bd5c8428a11c454ad
2015-11-13 20:10:17 -08:00
Yohei Yukawa
678e38e214
Mechanical code clean-ups in MSG_UNBIND handler.
...
As a preparation to fix Bug 25373872, this CL does a mechanical
code clean-ups. Literally there is no behavior change.
Bug: 24504456
Change-Id: I6e3062bda17e748a3c5f1450d6752239dd260520
2015-11-13 18:36:21 -08:00
Paul Stewart
ae64b185fc
WifiEnterpriseConfiguration: Do not print credentials in toString
...
BUG:25624963
Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
2015-11-13 16:43:53 -08:00
Chong Zhang
55608e7acb
Merge "Notify client of surface size change if it's changed from last relayout"
2015-11-14 00:25:35 +00:00
Chong Zhang
5b2f199c85
Notify client of surface size change if it's changed from last relayout
...
Not just when it's changed during this relayout.
bug: 25596610
Also add the delayed surface to removal list regardless of the show
result, it won't be destroyed until window is ready to show but we
need to add it to the list first.
bug: 25666160
Change-Id: I6fceada1bdc1de0a5b5a4d6dc261957164817330
2015-11-14 00:20:49 +00:00
Chris Craik
4bc507851c
Merge "Add error check for float parsing and fix tests"
2015-11-14 00:00:05 +00:00
Doris Liu
1e67f08963
Add error check for float parsing and fix tests
...
Change-Id: Ia4f4863d415536b3796edbcdb83c951b6cff02cf
2015-11-13 15:58:49 -08:00
Eino-Ville Talvala
0b6e1bfae8
Camera: Minor documentation update
...
- Further clarify hardware.camera feature being only for the back camera
Bug: 24540625
Change-Id: I7a698740475aa4932648c8f62aab81d5f9341030
2015-11-13 15:25:45 -08:00
Vinit Deshpande
0430f187af
Merge "Re-enable wifi firmware debugging"
2015-11-13 23:22:40 +00:00
Fyodor Kupolov
e80085d61a
Reduce excessive locking in UserManager
...
Bug: 24979571
Change-Id: I1cfbe48712ae26ec134354d109d2538d566b92d7
2015-11-13 15:22:26 -08:00
Winson
e86deb8adb
Ensuring that fast-alt tab works from Home as well as other apps.
...
Change-Id: Ie4a6e95e790483c283d4257b15cf1b7dd315db28
2015-11-13 22:53:28 +00:00
Wale Ogunwale
16b83907d1
Merge "Fixed bug where stack crop wasn't applied when it should"
2015-11-13 22:45:42 +00:00
Wale Ogunwale
83e3563ee3
Merge "Don't move task if it is already in the destination stack"
2015-11-13 22:29:58 +00:00
Michael Wright
333db2e122
DO NOT MERGE. Prevent recents from coming up when in SUW
...
Bug: 25229538
Change-Id: Ib19f368e9ef383ba5e60ea0b88193178d5769469
2015-11-13 21:53:14 +00:00
Yang Ni
746955c0d1
Merge "Various fixes in setting globals in a script group" am: c011ffd842 am: 7ee861abae
...
am: 89baba188e
* commit '89baba188eab42c424cc96eb62114d660ab6c992':
Various fixes in setting globals in a script group
2015-11-13 21:34:15 +00:00
Yang Ni
89baba188e
Merge "Various fixes in setting globals in a script group" am: c011ffd842
...
am: 7ee861abae
* commit '7ee861abaeac214a889d8f4113db41970599793b':
Various fixes in setting globals in a script group
2015-11-13 21:26:15 +00:00
Wale Ogunwale
70c65c8e47
Don't move task if it is already in the destination stack
...
When moving a task from one stack to another we detach the source
stack from the display if the stack is empty after the task move.
If the source and destination stack are the same we detach the
stack from the display when the task is removed, but it isn't
re-attached to the display when the task is add back since we
only attach stacks to displays when they are created.
We no longer try to move the task if it is already in the destination
stack.
Bug: 25671469
Change-Id: Idde54d362a35716223bc5f1143000111af380239
2015-11-13 13:25:16 -08:00
Yang Ni
7ee861abae
Merge "Various fixes in setting globals in a script group"
...
am: c011ffd842
* commit 'c011ffd84296700df4c28b9fc9fa84da9081de41':
Various fixes in setting globals in a script group
2015-11-13 21:17:33 +00:00
Chong Zhang
dd148eafbe
Merge "Need to updateSurface if surface size was changed in relayoutWindow"
2015-11-13 21:14:31 +00:00
Yang Ni
c011ffd842
Merge "Various fixes in setting globals in a script group"
2015-11-13 21:11:25 +00:00
Chong Zhang
f4abc2b701
Need to updateSurface if surface size was changed in relayoutWindow
...
On some chips, SurfaceControl.setSize will not take effect for several
frames. We have to also do a updateSurface/invalidate (which destroys
and creates the EGLSurface) to get the size right.
Keep track of SurfaceControl size changes in window manager, and pass
that to ViewRootImpl, so that a updateSurface is done either the surface
itself or its size is changed.
Note that we don't use frame size change to trigger updateSurface, because
frame size could be different from the surface size that window manager set.
For example during drag resizing, the surface size is fullscreen although
frame size changes constantly. Doing updateSurface upon frame size change
could cause us to do many unnecessary updateSurface.
bug: 25583942
Change-Id: I1989613a187bb6ef1c179bd2800c6a7b01fcdb3a
2015-11-13 13:03:48 -08:00
Fyodor Kupolov
9fdc67f900
Merge "Moved system user apps whitelisting to PM"
2015-11-13 20:00:40 +00:00
Wale Ogunwale
69cf50f759
Fixed bug where stack crop wasn't applied when it should
...
- Apply stack crop if window isn't animating when replacing window.
We were previously not applying the crop if replacing window regardless
of the animation state.
- Apply stack crop if the current docked window isn't animating.
We were previously not applying if any window in the system is animating.
- Also created setter/getter methods for WindowAnimator.mAnimating
to make debugging easier.
Bug: 25645069
Change-Id: I671549626e218358a7dea9e78bd0b2a1f1b3a51e
2015-11-13 11:22:17 -08:00
Winson Chung
a1ace2219a
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 am: 28fc76ecef am: 20ba5c919b
...
am: d2b3d8bff1 -s ours
* commit 'd2b3d8bff1deb5a699a97dd9b3377ff02211e6c6':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 19:02:45 +00:00
Winson Chung
d7532bf4fc
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 am: 1b29fd87a2 am: 3bab0fd4f7
...
am: ef5feb290a -s ours
* commit 'ef5feb290a325a4943d2dea74f5a1f4844567bef':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 19:01:25 +00:00
Winson Chung
d2b3d8bff1
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 am: 28fc76ecef
...
am: 20ba5c919b
* commit '20ba5c919bb97bb922919a34b3a081ea26b25000':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:51:18 +00:00
Chong Zhang
c90d2b6b3d
Merge "Consider stack invisible if it got no running apps."
2015-11-13 18:48:57 +00:00
Winson Chung
20ba5c919b
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7
...
am: 28fc76ecef
* commit '28fc76ecef04061bfdbad2f5dc52bc1d5daf0e0d':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:44:29 +00:00
Adam Lesinski
51c2892768
Merge "AAPT2: Add support for overlays when merging resources"
2015-11-13 18:40:36 +00:00
Winson Chung
d8f89e5f9f
Merge "Ensure that the device is provisioned before showing Recents."
2015-11-13 18:38:12 +00:00
Winson
e924356ddf
Ensure that the device is provisioned before showing Recents.
...
Bug: 25476219
Change-Id: I87b78d4c3ca1e4d71280f057f3e076cc456bbf8f
2015-11-13 18:37:46 +00:00
Winson Chung
28fc76ecef
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec
...
am: ef15ca85d7
* commit 'ef15ca85d7f847884e391e3283daabb019e44e10':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:37:15 +00:00
Winson Chung
ef5feb290a
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 am: 1b29fd87a2
...
am: 3bab0fd4f7
* commit '3bab0fd4f7b848d45ce94b96abbdc537d1e47a5a':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:29:35 +00:00
Winson Chung
ef15ca85d7
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours
...
am: d45a18c8ec
* commit 'd45a18c8eca074f8c83a64ed465021a61becb49a':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:29:33 +00:00
Winson Chung
d45a18c8ec
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0
...
am: 32265b9ea0 -s ours
* commit '32265b9ea000b04ac62f3c114edb063246260401':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:21:55 +00:00
Winson Chung
3bab0fd4f7
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894
...
am: 1b29fd87a2
* commit '1b29fd87a26d6230c55c701d1411b34342614af0':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:21:53 +00:00
Winson Chung
32265b9ea0
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3
...
am: b133b984a0
* commit 'b133b984a0644a78270d51007123e75ded24eb14':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:15:30 +00:00
Winson Chung
1b29fd87a2
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d
...
am: 3e9f2b7894
* commit '3e9f2b789414f34b5530107c362295c5a637bac1':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:15:29 +00:00
Winson Chung
b133b984a0
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
...
am: bb4da4efc3
* commit 'bb4da4efc320caee77f11bb316145b8e5f264e07':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:08:38 +00:00
Winson Chung
3e9f2b7894
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
...
am: dce0f8040d
* commit 'dce0f8040dcce494166832eb6c1e8a2d9638ddd4':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:08:35 +00:00
Winson Chung
dce0f8040d
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
2015-11-13 18:02:47 +00:00
Winson Chung
bb4da4efc3
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
2015-11-13 18:02:38 +00:00
Yang Ni
263cc90345
Various fixes in setting globals in a script group
...
Bug: 25602504
1) Passing floating point values into a script group was broken,
since they were casted to long values. Fixed that in the frameworks
implementation by taking the raw bits instead.
2) Passing 64-bit values into a script group was broken on 32-bit
platforms, since they were casted to pointer-sized integers
(uintptr_t) in the JNI code. Fixed that by casting to int64_t
instead.
3) Setting global variables of Allocation type in a script group was
broken. The special size value -1 was used to indicate the value is an
Allocation. However, size was casted to size_t in the JNI code.
Fixed that by using signed integers.
Change-Id: Ifff099a76be7707df7b67c388395f5a00f9cae66
2015-11-13 10:00:12 -08:00
Filip Gruszczynski
0fb9e4f535
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev am: fe482e0bca am: 0e6007d229
...
am: f9661eafa0 -s ours
* commit 'f9661eafa0de1e9fe0bdf12d8c23ad087ece8729':
Initialize DisplayContent base info when object is constructed
2015-11-13 17:47:32 +00:00
Filip Gruszczynski
f9661eafa0
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev am: fe482e0bca
...
am: 0e6007d229
* commit '0e6007d22928da4c529a5fa773fbeeb441421804':
Initialize DisplayContent base info when object is constructed
2015-11-13 17:26:47 +00:00
Filip Gruszczynski
0e6007d229
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
...
am: fe482e0bca
* commit 'fe482e0bcabb98d983ecb4080b35490b9814c809':
Initialize DisplayContent base info when object is constructed
2015-11-13 17:20:05 +00:00
Filip Gruszczynski
fe482e0bca
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
2015-11-13 17:15:14 +00:00
Gustav Sennton
371df36b5c
Merge "Trigger WebView relro creation when new provider package installed."
2015-11-13 17:08:39 +00:00
Alan Viverette
b6181565e5
Merge "Return correct intrinsic dimensions for inset colors"
2015-11-13 15:48:23 +00:00
Mark Salyzyn
530dcda9a5
Merge "jni: is loggable speedup, not within signal" am: 96e780c99c am: 33a0db92aa
...
am: 5f6b645985
* commit '5f6b6459853700c85d71906eb7b758a17ffb32ba':
jni: is loggable speedup, not within signal
2015-11-13 15:36:07 +00:00