Bill Yi
73c76b0920
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 909eeb6572f69e563a77a0e3d7c0f2e04287325f.
Change-Id: Ib2dd031dc5d195edb1fc6675ee4c6f3597db61f9
2016-12-05 18:56:56 +00:00
Bill Yi
909eeb6572
Import translations. DO NOT MERGE
...
Change-Id: I78f9033e232a205c6ba9b40ffa6c7a445bb8e044
Auto-generated-cl: translation import
2016-12-02 20:45:23 -08:00
TreeHugger Robot
6b4061f895
Merge "Have forAllWindows return IME windows in order with IME target"
2016-12-03 02:49:12 +00:00
TreeHugger Robot
abaa57fa94
Merge "Clean up ApplyStyle JNI"
2016-12-03 02:02:19 +00:00
Tenghui Zhu
f2237741c3
Merge "Recreate the bitmap cache when it is smaller than needed"
2016-12-02 23:16:37 +00:00
Chris Tate
11e9cec138
Merge "Fix the deadlock problem" am: fa228e06f6 am: e8c0e1098e am: 35b99da33a
...
am: 0455c30035
Change-Id: Ib08f8deadfe6085d6d4368527892c799c42f0757
2016-12-02 23:02:58 +00:00
Chris Tate
0455c30035
Merge "Fix the deadlock problem" am: fa228e06f6 am: e8c0e1098e
...
am: 35b99da33a
Change-Id: I5aab63f06fcb6d234cef4d5b9315c712bdd031d1
2016-12-02 22:56:10 +00:00
Tenghui Zhu
015604ff1d
Merge "Update the documentation related to VD / AVD" into nyc-mr2-dev am: c6ee7e317f -s ours
...
am: 17bd8c5c6b -s ours
Change-Id: Iaa780ccb94d61534908a38897c5ad9c37c5124da
2016-12-02 22:55:41 +00:00
Teng-Hui Zhu
fea774bd40
Update the documentation related to VD / AVD am: 14efe881d4
...
am: d76d2d930a -s ours
Change-Id: Ia0cb405e1872d4e2e8c485da01991f679e59bfc4
2016-12-02 22:54:39 +00:00
Jeff Sharkey
54860a6f67
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8 am: 923aef8e02 -s ours am: f199d511c3 am: 1d752340a7 am: 4aacfce724 am: 5b64f51a1c am: 06f0764320
...
am: 7358e7bcdf -s ours
Change-Id: I3700a512ec7401190de7fd7177bab7f8880157c4
2016-12-02 22:53:45 +00:00
Jeff Sharkey
a761210607
DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a am: acfda3d71a -s ours am: 0eaa192436 am: 43b3a13803 am: 6786309c03 am: a43ee01a6d am: 29e38b212f
...
am: 6a85068035 -s ours
Change-Id: I79ceb46fa35243b9d11554b2493e714e293ebb78
2016-12-02 22:52:41 +00:00
Jeff Sharkey
2b55116fd5
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4 -s ours am: 3fa188bd8f am: 09960bdfcc am: d12e48494d am: 341813c852 am: 375f16eff4
...
am: cd57f1d53b -s ours
Change-Id: I1f6298c244cdba7138e9b63113c01745966d73ac
2016-12-02 22:51:38 +00:00
Chris Tate
35b99da33a
Merge "Fix the deadlock problem" am: fa228e06f6
...
am: e8c0e1098e
Change-Id: Ibf2ad3736be9cbe4797c1678e3665be4a19d82ea
2016-12-02 22:51:11 +00:00
Jeff Sharkey
6ab778bae4
DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc -s ours am: 836b54e6bb am: 383e0cfa06 am: a55258bd17 am: 2f48a6ce63 am: 00cc40c40a
...
am: a793aee959 -s ours
Change-Id: Ied9ec46ff6de0f641ab258b3f660fbdc61d49ce5
2016-12-02 22:50:39 +00:00
Paul Stewart
ada9d24aeb
Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev am: 3eda32cc71
...
am: b271a2227a
Change-Id: I49acf0d8cfb091b0aae94ca5756e2d1509dd4e0b
2016-12-02 22:49:40 +00:00
Chris Tate
e8c0e1098e
Merge "Fix the deadlock problem"
...
am: fa228e06f6
Change-Id: I862d3cedcf38c81f22559439aa8f00ac2ab3cca3
2016-12-02 22:45:47 +00:00
Android Build Merger (Role)
a8c99cd882
Merge changes from topic 'am-eb4443f078884e5f82b9ce2fd7dec764'
...
* changes:
Add capability flag for 802.11r fast BSS transition am: fbb63b0923 am: 67e2694fd6
Add constants for 802.11r am: 3ed7caa0f9 am: 7e6940d728
2016-12-02 22:45:36 +00:00
Wale Ogunwale
3c1170d849
Have forAllWindows return IME windows in order with IME target
...
If there is an IME target make sure to return the IME windows next
to the IME target when processing WindowContainer.forAllWindows().
Several users of forAllWindows are expecting this to be the cases so
it is close to the visual order.
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Test: bit FrameworksServicesTests:com.android.server.wm.WindowLayersControllerTests
Change-Id: I737f88ca607ab2694391419d0d38060c03b53840
2016-12-02 14:44:52 -08:00
Paul Stewart
f54ac12a70
Add capability flag for 802.11r fast BSS transition am: fbb63b0923
...
am: 67e2694fd6
Change-Id: I35dab6b5bf7e7b383789abc769793d945ebbd834
2016-12-02 22:44:08 +00:00
Paul Stewart
20569fee35
Add constants for 802.11r am: 3ed7caa0f9
...
am: 7e6940d728
Change-Id: Ic86302bd0ef53ee5797b2caf9cb998e40537ef12
2016-12-02 22:43:07 +00:00
Tenghui Zhu
17bd8c5c6b
Merge "Update the documentation related to VD / AVD" into nyc-mr2-dev
...
am: c6ee7e317f -s ours
Change-Id: Ic572a69b41226103e31fc1e544558990d5255dc5
2016-12-02 22:42:18 +00:00
TreeHugger Robot
e9278712ac
Merge "Allow system_server to measure emulated stats."
2016-12-02 22:42:13 +00:00
Chris Tate
fa228e06f6
Merge "Fix the deadlock problem"
2016-12-02 22:39:57 +00:00
Teng-Hui Zhu
d76d2d930a
Update the documentation related to VD / AVD
...
am: 14efe881d4
Change-Id: I48ec679b5318fb14f8cc4e74f55694af5c798214
2016-12-02 22:37:18 +00:00
Jeff Sharkey
7358e7bcdf
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8 am: 923aef8e02 -s ours am: f199d511c3 am: 1d752340a7 am: 4aacfce724 am: 5b64f51a1c
...
am: 06f0764320
Change-Id: I2040270fa6f80c06f76a797d0ad9ae2fdf6a9f20
2016-12-02 22:28:25 +00:00
Jeff Sharkey
6a85068035
DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a am: acfda3d71a -s ours am: 0eaa192436 am: 43b3a13803 am: 6786309c03 am: a43ee01a6d
...
am: 29e38b212f
Change-Id: I40543d50c8c40688ebd2e28a05ade6284c8942d2
2016-12-02 22:27:11 +00:00
Jeff Sharkey
cd57f1d53b
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4 -s ours am: 3fa188bd8f am: 09960bdfcc am: d12e48494d am: 341813c852
...
am: 375f16eff4
Change-Id: Ia7400dc5280a87cfa687c0b84b124bdb8db6381d
2016-12-02 22:26:03 +00:00
Jakub Pawlowski
b903f9465d
Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev am: c977c776c2
...
am: 70093bc29a
Change-Id: Ic24b66e7d17a6595c084eaa16a01818c810ca201
2016-12-02 22:25:16 +00:00
Tenghui Zhu
c6ee7e317f
Merge "Update the documentation related to VD / AVD" into nyc-mr2-dev
2016-12-02 22:25:04 +00:00
Jeff Sharkey
a793aee959
DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc -s ours am: 836b54e6bb am: 383e0cfa06 am: a55258bd17 am: 2f48a6ce63
...
am: 00cc40c40a
Change-Id: I194205a9ae60f187364590bbf32f42f246d3b912
2016-12-02 22:24:54 +00:00
Jakub Pawlowski
fae9f6e8f3
BLE OOB Pairing - parse address type (5/5) am: 3e73713590
...
am: 5d7e4b45bb
Change-Id: Ice4e6c936f568932f8e0f4644d88241b8c30f90d
2016-12-02 22:23:41 +00:00
Paul Stewart
b271a2227a
Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev
...
am: 3eda32cc71
Change-Id: Iacbf01ae85184c019bb462a7cf55efa2bb4645d5
2016-12-02 22:23:29 +00:00
Jakub Pawlowski
3898169b4d
Fix Bluetooth OOB pairing not working for unseen devices am: 2d0ebcf3a0
...
am: d9b67b3a70
Change-Id: I40eaa2a23d28037b2989e8518ae1b57f3cb8acfc
2016-12-02 22:21:55 +00:00
Jakub Pawlowski
4ca702aa22
Add LE Secure Connection data parsing (1/4) am: 8fcff25c4f -s ours
...
am: fa2ec462e6
Change-Id: Iebf9f0dce010d128ca0a6803a57aa30135b1ee06
2016-12-02 22:20:33 +00:00
Paul Stewart
67e2694fd6
Add capability flag for 802.11r fast BSS transition
...
am: fbb63b0923
Change-Id: I918b0cc6d4b7ab157eabe5a04ce4c04598e01966
2016-12-02 22:19:07 +00:00
Paul Stewart
7e6940d728
Add constants for 802.11r
...
am: 3ed7caa0f9
Change-Id: Iff6064efa02138a0458d31f630335c039b057145
2016-12-02 22:18:25 +00:00
Jakub Pawlowski
70093bc29a
Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev
...
am: c977c776c2
Change-Id: Ic0efac1c5b2abace1e3075eb8b08f4c022a5414c
2016-12-02 22:14:04 +00:00
Jakub Pawlowski
5d7e4b45bb
BLE OOB Pairing - parse address type (5/5)
...
am: 3e73713590
Change-Id: I12b662d43aedab8315d9273e55bfc4203bfc6272
2016-12-02 22:12:36 +00:00
Jakub Pawlowski
d9b67b3a70
Fix Bluetooth OOB pairing not working for unseen devices
...
am: 2d0ebcf3a0
Change-Id: Ifd76075e33e75c03e54aec99b0327e0c9a8f70e6
2016-12-02 22:11:45 +00:00
Jakub Pawlowski
fa2ec462e6
Add LE Secure Connection data parsing (1/4)
...
am: 8fcff25c4f -s ours
Change-Id: Ib9a253c5a4cd69e9eb3028e9c8477ac9acdc3105
2016-12-02 22:10:53 +00:00
Tyler Gunn
d69f90e0f9
Merge "Change prototype for "setCamera" in IMS VideoProvider."
2016-12-02 21:54:19 +00:00
Fyodor Kupolov
98a942d14d
Merge "Switch isUserUnlocked/isUserRunning to use UMS.mUserStates"
2016-12-02 21:28:11 +00:00
TreeHugger Robot
0fb443b8c5
Merge "Switch over to new "time.android.com" NTP pool."
2016-12-02 21:16:05 +00:00
Jeff Sharkey
bd5c6ce582
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8 am: 923aef8e02 -s ours am: f199d511c3 am: 1d752340a7 am: 4aacfce724 am: 5b64f51a1c am: 6fa7e324fe
...
am: 5100194fbc -s ours
Change-Id: Ic9fa83c273adf160cebe7517c3ddfc905150553c
2016-12-02 21:02:37 +00:00
Jeff Sharkey
6d113dcef2
DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a am: acfda3d71a -s ours am: 0eaa192436 am: 43b3a13803 am: 6786309c03 am: a43ee01a6d am: ca76b0420a
...
am: e5d52664c2 -s ours
Change-Id: I442c44aaa41235660080a4ef4a3eac54da49bca2
2016-12-02 21:01:36 +00:00
Jeff Sharkey
f64a036968
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4 -s ours am: 3fa188bd8f am: 09960bdfcc am: d12e48494d am: 341813c852 am: 65d1a92c92
...
am: 01f036ebfd -s ours
Change-Id: I86abcf0af426c18eb996e21a685dcf050506da30
2016-12-02 21:00:37 +00:00
Jeff Sharkey
fbd6362b98
DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc -s ours am: 836b54e6bb am: 383e0cfa06 am: a55258bd17 am: 2f48a6ce63 am: 90055d575c
...
am: 57c8b867c4 -s ours
Change-Id: Ib6d5a414d0b58db436c1b8344d1fd0ef9bd5f766
2016-12-02 20:59:39 +00:00
Jeff Sharkey
5100194fbc
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8 am: 923aef8e02 -s ours am: f199d511c3 am: 1d752340a7 am: 4aacfce724 am: 5b64f51a1c
...
am: 6fa7e324fe
Change-Id: I537d2e35ef28a2d3a34efa4253e89395b0250c10
2016-12-02 20:54:23 +00:00
Jeff Sharkey
e5d52664c2
DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a am: acfda3d71a -s ours am: 0eaa192436 am: 43b3a13803 am: 6786309c03 am: a43ee01a6d
...
am: ca76b0420a
Change-Id: Ibca5f8839dbaaa7380bd9630681bcec60b8e0bf9
2016-12-02 20:53:25 +00:00
Jeff Sharkey
01f036ebfd
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4 -s ours am: 3fa188bd8f am: 09960bdfcc am: d12e48494d am: 341813c852
...
am: 65d1a92c92
Change-Id: I9af1728fa9c933884c11c9f6484e6b4700edb912
2016-12-02 20:52:30 +00:00
