Sundeep Ghuman
1e61697d3c
Merge "Don't show unset score values for AccessPoints." into oc-dev
...
am: 32c65fccaf
Change-Id: I40586bcf4ab1fc32a15c145798460008ded764d1
2017-06-06 18:51:54 +00:00
Jian Sun
c3c3112806
Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev
...
am: f1946baae7
Change-Id: Iacba4bd641367f5cf64bcd4d7098bba05fca835d
2017-06-06 18:48:33 +00:00
TreeHugger Robot
32c65fccaf
Merge "Don't show unset score values for AccessPoints." into oc-dev
2017-06-06 18:45:18 +00:00
Jian Sun
f1946baae7
Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev
2017-06-06 18:30:12 +00:00
Wale Ogunwale
b4f383c26e
Merge "Don't allow removed DividerView to resize stack" into oc-dev
...
am: d7427d5d90
Change-Id: I6dfe65d2d3e2c69be14b472dcd3e28389e70655f
2017-06-06 17:53:46 +00:00
TreeHugger Robot
d7427d5d90
Merge "Don't allow removed DividerView to resize stack" into oc-dev
2017-06-06 17:46:37 +00:00
Sundeep Ghuman
8a43704a26
Don't show unset score values for AccessPoints.
...
Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed
Bug: b/3692675
Test: Visual confirmation
Change-Id: I52909bf55e6efabd2be6c17542f2a15135d25c62
2017-06-06 10:33:06 -07:00
Makoto Onuki
a178d194f9
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
...
am: a9c185f6e7
Change-Id: If571669aaa81d085774c1bb9a0daa308f237978a
2017-06-06 16:44:59 +00:00
Makoto Onuki
a9c185f6e7
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
2017-06-06 16:26:10 +00:00
Wale Ogunwale
15ba1515a8
Don't allow removed DividerView to resize stack
...
If a divider view is removed or in the process of been removed, then it
should no longer have any influence on the size of stacks.
Fixes: 62273599
Test: go/wm-smoke
Test: enter split-screen and make sure recents is visible, lock and
unlock the device and verify things look fine.
Change-Id: I79aca82be8a7013328b78e82f508c4ed9fa48a4a
2017-06-06 08:31:17 -07:00
Jeff Sharkey
67cb5f5210
Merge "Give Doclava our manifest; more permission docs." into oc-dev
...
am: 65d4cbba37
Change-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e
2017-06-06 15:28:26 +00:00
Jeff Sharkey
65d4cbba37
Merge "Give Doclava our manifest; more permission docs." into oc-dev
2017-06-06 15:19:23 +00:00
Rebecca Silberstein
0ffff6a341
Merge "WifiConfiguration: add local only networkId" into oc-dev
...
am: 46f4d5c4a6
Change-Id: I76454a05fdeec94b84d0bfb6f084790e0a7f77d5
2017-06-06 14:49:57 +00:00
Rebecca Silberstein
46f4d5c4a6
Merge "WifiConfiguration: add local only networkId" into oc-dev
2017-06-06 14:42:59 +00:00
Bryce Lee
42e95f8b54
Merge "Coordinate configuration changes and window frame size." into oc-dev
...
am: 749cbb1911
Change-Id: I2a27d8b34967603b0621332651a31be025542c09
2017-06-06 14:38:58 +00:00
Bryce Lee
749cbb1911
Merge "Coordinate configuration changes and window frame size." into oc-dev
2017-06-06 14:26:32 +00:00
Paul Duffin
2fa69bdfce
Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4 am: de30ee2d40
...
am: e468747115
Change-Id: I50e3ae83eabe75cb87e0dd25acd05eee811c25ce
2017-06-06 08:13:12 +00:00
Paul Duffin
e468747115
Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4
...
am: de30ee2d40
Change-Id: I4f615991b43350df9748d7f05fdcf5501eff135d
2017-06-06 08:01:41 +00:00
Paul Duffin
de30ee2d40
Merge "Added android.test.mock and android.test.mock.sdk targets"
...
am: 46f8d427c4
Change-Id: I93ecb5e95337b84c2746b802fa88382cdd676cb8
2017-06-06 07:49:39 +00:00
Paul Duffin
46f8d427c4
Merge "Added android.test.mock and android.test.mock.sdk targets"
2017-06-06 07:40:19 +00:00
Erik Kline
6ce08f623c
Merge "Support setting upstream parameters." am: faf8d67749 am: 4e5024131b
...
am: e2018a407a
Change-Id: I8e0f7188ff29b2fd7c34fd2a340c8b4abaac2be7
2017-06-06 05:16:27 +00:00
Erik Kline
e2018a407a
Merge "Support setting upstream parameters." am: faf8d67749
...
am: 4e5024131b
Change-Id: I150015ea0c66be50e79f641f20d1752b9d60cb0d
2017-06-06 05:05:04 +00:00
Erik Kline
4e5024131b
Merge "Support setting upstream parameters."
...
am: faf8d67749
Change-Id: I0be9ad265fa664f0ce6e1e098996b46c88317b97
2017-06-06 04:54:04 +00:00
Treehugger Robot
faf8d67749
Merge "Support setting upstream parameters."
2017-06-06 04:43:35 +00:00
Bryce Lee
afb45bba83
Coordinate configuration changes and window frame size.
...
Previously, it was possible for the view hierarchy to be measured,
laid out, and drawn around a window frame size that did not match
the current configuration. This stems from new configurations not
always propagating back from WindowSession#relayout, which is
called from ViewRootImpl.
This changelist makes WindowManagerService#relayoutWindow always
return the latest configuration. It also adds rotation to the
configuration.
Fixes: 32839232
Test: go/wm-smoke
Test: Open Camera while rotating phone to landscape. Added
temporary logs to detect inconsistencies between measurements
and reported rotation on draw.
Change-Id: I39daca338b4f87eff1a509eb99493f01e710ced1
2017-06-05 20:55:46 -07:00
Guang Zhu
8212cdfb40
Merge "Revert "Disabled task snapshot for TV"" into oc-dev
...
am: faf86491e9
Change-Id: I360c924fc3335a72c6cf46b30ee9749838e97433
2017-06-06 03:38:52 +00:00
Guang Zhu
faf86491e9
Merge "Revert "Disabled task snapshot for TV"" into oc-dev
2017-06-06 03:29:10 +00:00
Guang Zhu
09486a323f
Revert "Disabled task snapshot for TV"
...
Bug: 62360140
Bug: 62040693
This reverts commit 4256422eb6 .
Change-Id: Id89de52c9ad25ef7b3163bd8b4a0c44f97631431
2017-06-06 03:27:44 +00:00
Erik Kline
7990aef63b
Support setting upstream parameters.
...
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Bug: 34361337
Change-Id: Id88cae4beed7d38aec3d29a0e2f59a5c7e6a9a4e
2017-06-06 12:02:13 +09:00
Todd Kennedy
27eb2e2b5b
Merge "Don't verify instant apps" into oc-dev
...
am: 9bac79a540
Change-Id: I63537d6e6048152f93b5d314250334bcb1e75520
2017-06-06 01:49:12 +00:00
TreeHugger Robot
9bac79a540
Merge "Don't verify instant apps" into oc-dev
2017-06-06 01:41:13 +00:00
Jayachandran C
39c23689dd
Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon" into oc-dev
...
am: 4deefdbe7a
Change-Id: I57053efb8796c22899c6b0dbdafe26377f70a530
2017-06-06 00:39:38 +00:00
TreeHugger Robot
4deefdbe7a
Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon" into oc-dev
2017-06-06 00:30:10 +00:00
Keyvan Amiri
1d3a419358
Merge "Disabled task snapshot for TV" into oc-dev
...
am: 4cddd9a723
Change-Id: I4de52f4ac20c9f9ec99bbc810735e98f1537708e
2017-06-06 00:22:07 +00:00
Robert Carr
6f0f995120
Merge "Reinstate SurfaceView Background from N" into oc-dev
...
am: 71044d6ba1
Change-Id: I5a4e8a5c8c45add308b115bc447f85393d572e00
2017-06-06 00:09:17 +00:00
TreeHugger Robot
4cddd9a723
Merge "Disabled task snapshot for TV" into oc-dev
2017-06-06 00:04:36 +00:00
TreeHugger Robot
71044d6ba1
Merge "Reinstate SurfaceView Background from N" into oc-dev
2017-06-05 23:57:06 +00:00
Lucas Dupin
6b5b7c4d31
Merge "Fix icon tint on notification shelf" into oc-dev
...
am: 285ad4ce66
Change-Id: Ifbc2c1829182aa47de9e835a3bbeac7146a31d1b
2017-06-05 23:40:12 +00:00
Jeff Sharkey
bfc4fcde9f
Give Doclava our manifest; more permission docs.
...
We've seen some @SystemApi methods protected with non-system
permissions, so give Doclava the platform AndroidManifest.xml so it
can parse the actual permission protection levels to look for APIs
that are letting in non-system apps.
Also document more @SystemApi permissions.
This is purely a docs change; no logic changes are being made.
Test: make -j32 update-api
Bug: 62263906
Change-Id: Ie0f0a5fb0033817bcc95060f2183a52ae4ae7b06
2017-06-05 17:38:19 -06:00
TreeHugger Robot
285ad4ce66
Merge "Fix icon tint on notification shelf" into oc-dev
2017-06-05 23:29:49 +00:00
Winson Chung
13ec0f2bba
Merge "Initialize last-orientation to ensure we don't skip loading config." into oc-dev
...
am: 5fc8f7d08a
Change-Id: I1ca302446a3bff3c1f3096f353ca8b081e13e816
2017-06-05 22:47:28 +00:00
TreeHugger Robot
5fc8f7d08a
Merge "Initialize last-orientation to ensure we don't skip loading config." into oc-dev
2017-06-05 22:37:08 +00:00
Jeff Sharkey
7a2e4a8486
Merge "Annotate @SystemApi with required permissions." into oc-dev
...
am: c1406978a4
Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1
2017-06-05 22:28:21 +00:00
Jeff Sharkey
c1406978a4
Merge "Annotate @SystemApi with required permissions." into oc-dev
2017-06-05 22:19:49 +00:00
Android Build Merger (Role)
c382355cc1
Merge "Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am: 7a5dd1c3ff am: 51a89ee90c am: 102b9e5968" into oc-dev-plus-aosp
2017-06-05 21:59:24 +00:00
Erik Wolsheimer
22fc7cd712
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am: 7a5dd1c3ff am: 51a89ee90c
...
am: 102b9e5968
Change-Id: If7e8d4d2cdc734bab90b4abf0f2cba16645e4a6d
2017-06-05 21:58:11 +00:00
Erik Wolsheimer
dae13a0990
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am: 7a5dd1c3ff am: 51a89ee90c
...
am: 2c5e537e6c
Change-Id: Ie8f090c0049715bfc2d23a4f2d1f8d90c227b0e2
2017-06-05 21:56:29 +00:00
Erik Wolsheimer
102b9e5968
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am: 7a5dd1c3ff
...
am: 51a89ee90c
Change-Id: I982b94c155849061a667b1bf90f7a511bb81b1c5
2017-06-05 21:46:36 +00:00
Erik Wolsheimer
2c5e537e6c
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am: 7a5dd1c3ff
...
am: 51a89ee90c
Change-Id: I154876bd0294d0e31af63ed2e24c91d243eae56f
2017-06-05 21:46:26 +00:00
Erik Wolsheimer
51a89ee90c
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev
...
am: 7a5dd1c3ff
Change-Id: Ida35556f6d57113ad06c736ef780580b814f673e
2017-06-05 21:38:33 +00:00