Android Build Merger (Role)
137d09aa07
Merge "Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d11145 am: c717e603b1" into oc-dr1-dev-plus-aosp
2017-06-13 19:08:28 +00:00
Bryce Lee
78d6b5fb94
Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d11145
...
am: c717e603b1
2017-06-13 19:07:25 +00:00
Bryce Lee
b64e5067f0
Merge "Address issues surrounding freezing by display." into oc-dev am: 8ab4d11145
...
am: fb385a6c15
2017-06-13 19:03:56 +00:00
Bryce Lee
c717e603b1
Merge "Address issues surrounding freezing by display." into oc-dev
...
am: 8ab4d11145
2017-06-13 18:56:53 +00:00
Bryce Lee
fb385a6c15
Merge "Address issues surrounding freezing by display." into oc-dev
...
am: 8ab4d11145
2017-06-13 18:56:52 +00:00
Bryce Lee
8ab4d11145
Merge "Address issues surrounding freezing by display." into oc-dev
2017-06-13 18:51:04 +00:00
Narayan Kamath
fec2aa40de
Merge changes I73ae8de1,I58260902 am: 6f11744adc am: a506180804
...
am: d1941e51a6
2017-06-13 15:53:15 +00:00
Narayan Kamath
d1941e51a6
Merge changes I73ae8de1,I58260902 am: 6f11744adc
...
am: a506180804
2017-06-13 15:45:48 +00:00
Narayan Kamath
a506180804
Merge changes I73ae8de1,I58260902
...
am: 6f11744adc
2017-06-13 15:38:42 +00:00
Treehugger Robot
6f11744adc
Merge changes I73ae8de1,I58260902
...
* changes:
Binder: Log details of pending exception.
Binder: Be forceful about a forceful exit.
2017-06-13 15:27:11 +00:00
Bryce Lee
d18712695c
Address issues surrounding freezing by display.
...
The first issue is the animating a display as a consequence of the
freezing due to configuration change during construction. This
additional animation is not expected and interferes with tests
expecting for the original display contents to be shown intact. This
CL addresses the issue by not freezing while the display is not ready
(before construction is finished).
The second problem addressed is book-keeping for
DisplayContentsAnimators in WindowAnimator. Currently, a getter
method is used internally to reference these animators, which
generates them if not present and adds them to the animation
iteration. In the case we set an animation on a display that no
longer exists (which can be the case after unfreezing), we end up
recreating this object. This can lead to us trying to animate a
non-existent DisplayContent. This CL prevents creating an animator
for a non-existent display and adjusts the methods using this getter
to handle this case.
Fixes: 62460846
Fixes: 62461229
Bug: 35486733
Bug: 62541591
Test: go/wm-smoke
Test: open and close projected android auto mode repeatedly and
ensure display correctness
Test: cts-tradefed run singleCommand cts-dev --module CtsMediaTestCases --test android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay
Change-Id: I60ade6f97440c8fa01b10e36c019865cf1fd0730
2017-06-13 07:05:34 -07:00
Android Build Merger (Role)
bf841692cd
Merge "Merge "Eagerly serialize historical sessions" into oc-dev am: c7ea7effde am: 7ba9c4dc62" into oc-dr1-dev-plus-aosp
2017-06-13 10:52:32 +00:00
Narayan Kamath
6ca3567674
Merge "Eagerly serialize historical sessions" into oc-dev am: c7ea7effde
...
am: 17652d85ec
2017-06-13 10:50:44 +00:00
Narayan Kamath
0f00093ec8
Merge "Eagerly serialize historical sessions" into oc-dev am: c7ea7effde
...
am: 7ba9c4dc62
2017-06-13 10:50:43 +00:00
Narayan Kamath
7ba9c4dc62
Merge "Eagerly serialize historical sessions" into oc-dev
...
am: c7ea7effde
2017-06-13 10:40:48 +00:00
Narayan Kamath
17652d85ec
Merge "Eagerly serialize historical sessions" into oc-dev
...
am: c7ea7effde
2017-06-13 10:40:46 +00:00
Narayan Kamath
c7ea7effde
Merge "Eagerly serialize historical sessions" into oc-dev
2017-06-13 10:32:28 +00:00
Narayan Kamath
a22a766ea3
Eagerly serialize historical sessions
...
mHistoricalSessions maintained a strong reference to a PackageInstallerSession,
which in turn kept references to Bitmaps and other heavy-weight objects around.
Since this field is primarily used for debugging, this change replaces it with
a String dump of the session in question. Each dump takes about 600bytes, which
is comparable to the sizes of the un-serialized raw objects.
Bug: 62485552
Test: Manual
Change-Id: I4949a64b538ab4a97384f4f8bc9a6ef155a4b128
2017-06-13 10:29:12 +00:00
Erik Kline
72240b9eeb
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am: 30a1cf96bb am: cfaeabb3e3
...
am: 4bcce2b2ef
2017-06-13 08:42:44 +00:00
Erik Kline
4bcce2b2ef
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am: 30a1cf96bb
...
am: cfaeabb3e3
2017-06-13 08:36:14 +00:00
Erik Kline
cfaeabb3e3
Merge "make UpsreamNetworkMonitor the sole source of upstream network information"
...
am: 30a1cf96bb
2017-06-13 08:29:06 +00:00
Erik Kline
30a1cf96bb
Merge "make UpsreamNetworkMonitor the sole source of upstream network information"
2017-06-13 08:20:43 +00:00
Adam Vartanian
0cbfb82f38
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev
...
am: 87587fbda2
2017-06-13 08:19:16 +00:00
Adam Vartanian
87587fbda2
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev
2017-06-13 08:13:34 +00:00
Erik Kline
118e0e87e7
Merge "Only disable Wi-Fi IP serving on specific interface, if available" am: 6428e1a4d4 am: e675273dbc
...
am: e13b93c585
2017-06-13 03:41:18 +00:00
Erik Kline
e13b93c585
Merge "Only disable Wi-Fi IP serving on specific interface, if available" am: 6428e1a4d4
...
am: e675273dbc
2017-06-13 03:34:55 +00:00
Erik Kline
e675273dbc
Merge "Only disable Wi-Fi IP serving on specific interface, if available"
...
am: 6428e1a4d4
2017-06-13 03:25:12 +00:00
Treehugger Robot
6428e1a4d4
Merge "Only disable Wi-Fi IP serving on specific interface, if available"
2017-06-13 03:13:19 +00:00
Erik Kline
5bbece747f
make UpsreamNetworkMonitor the sole source of upstream network information
...
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug: 32163131
Change-Id: I66ce682cf9c31887264a095a4e4638d281d8ed39
2017-06-13 12:04:00 +09:00
Android Build Merger (Role)
7729edee10
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a -s ours" into oc-dr1-dev am: 2eb4ec0e72 -s ours" into oc-dr1-dev-plus-aosp
2017-06-13 02:41:48 +00:00
Android Build Merger (Role)
cea026e027
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a -s ours am: 15094560a4 -s ours" into oc-dr1-dev-plus-aosp
2017-06-13 02:41:07 +00:00
Bill Yi
1e57a53f02
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a -s ours" into oc-dr1-dev
...
am: 2eb4ec0e72
2017-06-13 02:40:48 +00:00
Bill Yi
2d8c070c50
Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a -s ours
...
am: 15094560a4
2017-06-13 02:38:30 +00:00
Bill Yi
50a405cf2c
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 34cfd78f8e
2017-06-13 02:38:29 +00:00
Android Build Merger (Role)
2eb4ec0e72
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a -s ours" into oc-dr1-dev
2017-06-13 02:32:21 +00:00
Bill Yi
15094560a4
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 7fc501184a
2017-06-13 02:31:28 +00:00
TreeHugger Robot
34cfd78f8e
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-06-13 02:31:28 +00:00
Bill Yi
7bc4424b13
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 7fc501184a
2017-06-13 02:30:19 +00:00
Bill Yi
47bb41b1bb
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 1190614529
2017-06-13 02:30:08 +00:00
Erik Kline
218c226b08
Only disable Wi-Fi IP serving on specific interface, if available
...
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug: 32163131
Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5
2017-06-13 11:27:36 +09:00
TreeHugger Robot
1190614529
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-06-13 02:20:39 +00:00
TreeHugger Robot
7fc501184a
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-06-13 02:18:48 +00:00
Winson Chung
53ee05b34a
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am: b1cdc17dfb
...
am: 87997ce838
2017-06-13 01:51:00 +00:00
Android Build Merger (Role)
1bbc25d903
Merge "Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev am: 43dc06a9a9" into oc-dr1-dev-plus-aosp
2017-06-13 01:48:21 +00:00
Etan Cohen
d3653e65ad
Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev
...
am: 43dc06a9a9
2017-06-13 01:46:09 +00:00
Winson Chung
94bbf483e3
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am: b1cdc17dfb
...
am: ebc74796e4
2017-06-13 01:45:31 +00:00
Winson Chung
87997ce838
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
...
am: b1cdc17dfb
2017-06-13 01:41:18 +00:00
Winson Chung
ebc74796e4
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
...
am: b1cdc17dfb
2017-06-13 01:37:34 +00:00
TreeHugger Robot
43dc06a9a9
Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev
2017-06-13 01:34:48 +00:00
Android Build Merger (Role)
d681a81d89
Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am: 68a4c91bb4 am: 2ddb92f2d9" into oc-dr1-dev-plus-aosp
2017-06-13 01:19:49 +00:00
