OSDN Git Service
Android Build Merger (Role) [Wed, 5 Jul 2017 23:38:51 +0000 (23:38 +0000)]
Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am:
484d742af0" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 5 Jul 2017 23:37:05 +0000 (23:37 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
am:
484d742af0
Change-Id: Id424bf6f16c7fe60607c78189239cb223e8984fd
Bryce Lee [Wed, 5 Jul 2017 23:35:50 +0000 (23:35 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
am:
484d742af0
Change-Id: Ib1c1a331ca0ec4a3792bf6fabc0a372b4608e706
Android Build Merger (Role) [Wed, 5 Jul 2017 23:30:10 +0000 (23:30 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp am:
313d31af94" into oc-dr1-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 23:28:18 +0000 (23:28 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
am:
313d31af94
Change-Id: Ie3d89588f8841a5f0d13fe297b7879a26d4f51ce
Android Build Merger (Role) [Wed, 5 Jul 2017 23:27:30 +0000 (23:27 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp am:
81d0134a0f" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 5 Jul 2017 23:26:45 +0000 (23:26 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
Android Build Merger (Role) [Wed, 5 Jul 2017 23:26:37 +0000 (23:26 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp am:
81d0134a0f" into oc-dr1-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 23:25:01 +0000 (23:25 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
am:
81d0134a0f
Change-Id: Ic822925ada8cacab55b9f6d21b57d740ef7154ff
Tobias Thierer [Wed, 5 Jul 2017 23:24:06 +0000 (23:24 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
am:
81d0134a0f
Change-Id: I4a19300a18aea12251258e47c935ade2ee485684
Android Build Merger (Role) [Wed, 5 Jul 2017 23:23:54 +0000 (23:23 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp am:
6a9d07ed22" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 5 Jul 2017 23:23:27 +0000 (23:23 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp am:
6a9d07ed22" into oc-dr1-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 23:21:42 +0000 (23:21 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
am:
6a9d07ed22
Change-Id: I3f9a021df549f65b1bc34a5486a62f673ab85d80
Tobias Thierer [Wed, 5 Jul 2017 23:19:19 +0000 (23:19 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
am:
6a9d07ed22
Change-Id: Icb419aea058ee777bae57217e2be699890f936f3
Android Build Merger (Role) [Wed, 5 Jul 2017 23:16:00 +0000 (23:16 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp am:
d01571b951" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 5 Jul 2017 23:14:40 +0000 (23:14 +0000)]
Merge "Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp am:
d01571b951" into oc-dr1-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 23:12:39 +0000 (23:12 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
am:
d01571b951
Change-Id: I1c0091643eecf0794bc515ba65935eec523be585
Tobias Thierer [Wed, 5 Jul 2017 23:09:23 +0000 (23:09 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
am:
d01571b951
Change-Id: I50aa3812696208517848869ee646f272290d6275
Android Build Merger (Role) [Wed, 5 Jul 2017 23:08:55 +0000 (23:08 +0000)]
Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp am:
8bbf3cad1e" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 5 Jul 2017 23:08:32 +0000 (23:08 +0000)]
Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp am:
8bbf3cad1e" into oc-dr1-dev-plus-aosp
Andreas Gampe [Wed, 5 Jul 2017 23:07:04 +0000 (23:07 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp
am:
8bbf3cad1e
Change-Id: I37f71e0dd4a12cac9d099fc9a8c000603e167478
Android Build Merger (Role) [Wed, 5 Jul 2017 23:06:38 +0000 (23:06 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03 am:
a94db9f04d" into oc-dr1-dev-plus-aosp
Andreas Gampe [Wed, 5 Jul 2017 23:06:09 +0000 (23:06 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp
am:
8bbf3cad1e
Change-Id: I0568f8c626b82ca4134132ab4df755b5fb244467
Andreas Gampe [Wed, 5 Jul 2017 23:05:22 +0000 (23:05 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03
am:
a94db9f04d
Change-Id: Ib70a9b8861e4d527979f777fd5e81e4839ab7039
Andreas Gampe [Wed, 5 Jul 2017 23:03:28 +0000 (23:03 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03
am:
a94db9f04d
Change-Id: Ia08c9bcf58e09e6d9aadd09b4b74aff462d5e97b
Android Build Merger (Role) [Wed, 5 Jul 2017 22:59:32 +0000 (22:59 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a" into oc-dev-plus-aosp am:
3255899bbd" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 5 Jul 2017 22:59:10 +0000 (22:59 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
Android Build Merger (Role) [Wed, 5 Jul 2017 22:58:56 +0000 (22:58 +0000)]
Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am:
7a4157d7b4" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 5 Jul 2017 22:58:44 +0000 (22:58 +0000)]
Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am:
7a4157d7b4" into oc-dr1-dev-plus-aosp
Andreas Gampe [Wed, 5 Jul 2017 22:58:08 +0000 (22:58 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a" into oc-dev-plus-aosp
am:
3255899bbd
Change-Id: Id6b022d5cb9e1a55aa4c321697cbb355d3338f2c
Tobias Thierer [Wed, 5 Jul 2017 22:56:14 +0000 (22:56 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
4e4b5a2426
Change-Id: I6d68ea194068c674d5e79a01d9ce05b9674dc16b
Android Build Merger (Role) [Wed, 5 Jul 2017 22:56:05 +0000 (22:56 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
4e4b5a2426" into oc-dev-plus-aosp
Antony Sargent [Wed, 5 Jul 2017 22:56:03 +0000 (22:56 +0000)]
Merge "Add a convenience method to facilitate tests" into oc-dr1-dev
am:
7a4157d7b4
Change-Id: I575c815b13a19d189e6677a2f83f705ba0f70082
Antony Sargent [Wed, 5 Jul 2017 22:55:40 +0000 (22:55 +0000)]
Merge "Add a convenience method to facilitate tests" into oc-dr1-dev
am:
7a4157d7b4
Change-Id: Ib5e3a54a1e3541eeaf2f137a5d477c98a986b5af
Android Build Merger (Role) [Wed, 5 Jul 2017 22:55:11 +0000 (22:55 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
Andreas Gampe [Wed, 5 Jul 2017 22:54:52 +0000 (22:54 +0000)]
Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a
am:
f3ee8c601a
Change-Id: I0b67701f1c4a3923e52a696451882a19166726e6
Tobias Thierer [Wed, 5 Jul 2017 22:53:14 +0000 (22:53 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
4e4b5a2426
Change-Id: I7f960d0d7e41ed89e422560318a73dad92562c87
Android Build Merger (Role) [Wed, 5 Jul 2017 22:52:17 +0000 (22:52 +0000)]
Merge "Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master am:
93cc3d86ad" into oc-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 22:52:14 +0000 (22:52 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
93cc3d86ad
Change-Id: I393799a36639f94583726be4176ef8d436aee932
Android Build Merger (Role) [Wed, 5 Jul 2017 22:51:47 +0000 (22:51 +0000)]
Merge "Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master am:
42d194ee03" into oc-dev-plus-aosp
Tobias Thierer [Wed, 5 Jul 2017 22:50:21 +0000 (22:50 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
am:
93cc3d86ad
Change-Id: I724ab35811887b1fd4ab2222046ed1123fc4b4cc
Andreas Gampe [Wed, 5 Jul 2017 22:49:24 +0000 (22:49 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master
am:
42d194ee03
Change-Id: I1836f523463d004ed7c6f9f907c5c11d3fb086e2
Android Build Merger (Role) [Wed, 5 Jul 2017 22:49:16 +0000 (22:49 +0000)]
Merge "Merge "Clear calling id before updating MediaStore." into oc-dr1-dev am:
28042d09d1" into oc-dr1-dev-plus-aosp
Antony Sargent [Wed, 5 Jul 2017 22:49:11 +0000 (22:49 +0000)]
Merge "Add a convenience method to facilitate tests" into oc-dr1-dev
Android Build Merger (Role) [Wed, 5 Jul 2017 22:49:05 +0000 (22:49 +0000)]
Merge "Merge "Clear calling id before updating MediaStore." into oc-dr1-dev am:
28042d09d1" into oc-dr1-dev-plus-aosp
Andreas Gampe [Wed, 5 Jul 2017 22:48:16 +0000 (22:48 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master
am:
42d194ee03
Change-Id: I694c150dc2d944d2adf0f2972e82b3c227843438
Garfield Tan [Wed, 5 Jul 2017 22:47:19 +0000 (22:47 +0000)]
Merge "Clear calling id before updating MediaStore." into oc-dr1-dev
am:
28042d09d1
Change-Id: I1ac305c95d59ef41d6e17ee3c8836d227bb1ded1
Android Build Merger (Role) [Wed, 5 Jul 2017 22:46:24 +0000 (22:46 +0000)]
Merge "Merge "Hide VIRTUAL_KEY_RELEASE constant." into oc-dr1-dev am:
20a240fc5d" into oc-dr1-dev-plus-aosp
Garfield Tan [Wed, 5 Jul 2017 22:46:14 +0000 (22:46 +0000)]
Merge "Clear calling id before updating MediaStore." into oc-dr1-dev
am:
28042d09d1
Change-Id: I29b452dbb955d65806cd472cf20d4595ac4844dc
Siarhei Vishniakou [Wed, 5 Jul 2017 22:45:21 +0000 (22:45 +0000)]
Merge "Hide VIRTUAL_KEY_RELEASE constant." into oc-dr1-dev
am:
20a240fc5d
Change-Id: Ic75b920c99102a09d89ec40b79ce08e53698769b
Android Build Merger (Role) [Wed, 5 Jul 2017 22:44:48 +0000 (22:44 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56 am:
f70270f94a" into oc-dev-plus-aosp
Siarhei Vishniakou [Wed, 5 Jul 2017 22:44:32 +0000 (22:44 +0000)]
Merge "Hide VIRTUAL_KEY_RELEASE constant." into oc-dr1-dev
am:
20a240fc5d
Change-Id: Ied28ed4e4ae56aca9ac315f0963a027710960286
Android Build Merger (Role) [Wed, 5 Jul 2017 22:43:56 +0000 (22:43 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
Andreas Gampe [Wed, 5 Jul 2017 22:42:57 +0000 (22:42 +0000)]
Merge "Framework: Add libziparchive dependency" am:
2688a9ab56
am:
f70270f94a
Change-Id: Ic8cf6139665107692a7b74a15f51a3387a4fa3e7
Andreas Gampe [Wed, 5 Jul 2017 22:42:39 +0000 (22:42 +0000)]
Merge "Framework: Add libziparchive dependency" am:
2688a9ab56
am:
f70270f94a
Change-Id: I08559a9603872b2b671bb9ef3ccc54955865b18b
TreeHugger Robot [Wed, 5 Jul 2017 22:39:37 +0000 (22:39 +0000)]
Merge "Clear calling id before updating MediaStore." into oc-dr1-dev
Android Build Merger (Role) [Wed, 5 Jul 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Merge "Track update of org.json API" am:
c5a65bc152" into stage-aosp-master
Tobias Thierer [Wed, 5 Jul 2017 22:37:47 +0000 (22:37 +0000)]
Merge "Track update of org.json API"
am:
c5a65bc152
Change-Id: I9f6df94ef58488a62558ee31e549c5e71a726f8a
TreeHugger Robot [Wed, 5 Jul 2017 22:37:32 +0000 (22:37 +0000)]
Merge "Hide VIRTUAL_KEY_RELEASE constant." into oc-dr1-dev
Tobias Thierer [Wed, 5 Jul 2017 22:33:10 +0000 (22:33 +0000)]
Merge "Track update of org.json API"
am:
c5a65bc152
Change-Id: I755b8be63f4a9dbe11d1c14c0d9f3f8cd3e93916
Android Build Merger (Role) [Wed, 5 Jul 2017 22:33:09 +0000 (22:33 +0000)]
Merge "Merge "Framework: Add libziparchive dependency" am:
2688a9ab56" into stage-aosp-master
Andreas Gampe [Wed, 5 Jul 2017 22:30:56 +0000 (22:30 +0000)]
Merge "Framework: Add libziparchive dependency"
am:
2688a9ab56
Change-Id: I68c353e8784c86b4a1e1e38c3c2f65e79bd7920a
Andreas Gampe [Wed, 5 Jul 2017 22:30:51 +0000 (22:30 +0000)]
Merge "Framework: Add libziparchive dependency"
am:
2688a9ab56
Change-Id: I4d42a5c0564f7d142b1ee3fe8606b4bd6371e9a9
Android Build Merger (Role) [Wed, 5 Jul 2017 22:25:27 +0000 (22:25 +0000)]
Merge "Merge "Adds a new string definition for IMS Access blocked reason" into oc-dr1-dev am:
092e461281" into oc-dr1-dev-plus-aosp
Brad Ebinger [Wed, 5 Jul 2017 22:23:58 +0000 (22:23 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason" into oc-dr1-dev
am:
092e461281
Change-Id: Ib719c0993898cdec9326043aaeff8fd11afd5593
Brad Ebinger [Wed, 5 Jul 2017 22:22:52 +0000 (22:22 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason" into oc-dr1-dev
am:
092e461281
Change-Id: Ic8b76e83aa8eb20074862f0e67734d2c5389ba12
Tobias Thierer [Wed, 5 Jul 2017 22:22:16 +0000 (22:22 +0000)]
Merge "Track update of org.json API"
Treehugger Robot [Wed, 5 Jul 2017 22:20:40 +0000 (22:20 +0000)]
Merge "Framework: Add libziparchive dependency"
TreeHugger Robot [Wed, 5 Jul 2017 22:17:01 +0000 (22:17 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason" into oc-dr1-dev
Android Build Merger (Role) [Wed, 5 Jul 2017 21:31:28 +0000 (21:31 +0000)]
Merge "Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master am:
a998cffb1b -s ours" into oc-dev-plus-aosp am:
530a622f60 -s ours" into oc-dr1-dev-plus-aosp
Adam Lesinski [Wed, 5 Jul 2017 21:30:34 +0000 (21:30 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master am:
a998cffb1b -s ours" into oc-dev-plus-aosp
am:
530a622f60 -s ours
Change-Id: I39c1e2e73d377ae8012a7810c7d0fe43dcc665c9
Android Build Merger (Role) [Wed, 5 Jul 2017 21:30:03 +0000 (21:30 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours" into oc-dev-plus-aosp am:
eb20c5a9f4 -s ours" into oc-dr1-dev-plus-aosp
Adam Lesinski [Wed, 5 Jul 2017 21:28:03 +0000 (21:28 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours" into oc-dev-plus-aosp
am:
eb20c5a9f4 -s ours
Change-Id: I65561262aaf4c3b4eb0c8efe495fb1f59968301b
Adam Lesinski [Wed, 5 Jul 2017 21:27:49 +0000 (21:27 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master am:
a998cffb1b -s ours" into oc-dev-plus-aosp
am:
530a622f60 -s ours
Change-Id: I0bf2d7461e65989758cb0575c1b1cb6ae238dd9f
Adam Lesinski [Wed, 5 Jul 2017 21:26:38 +0000 (21:26 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours" into oc-dev-plus-aosp
am:
eb20c5a9f4 -s ours
Change-Id: I5e4e3d86918830bbc13d60ecd8a3392d55ff2726
Android Build Merger (Role) [Wed, 5 Jul 2017 21:24:07 +0000 (21:24 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours am:
8f09557150 -s ours" into oc-dr1-dev-plus-aosp
Adam Lesinski [Wed, 5 Jul 2017 21:23:09 +0000 (21:23 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours
am:
8f09557150 -s ours
Change-Id: I11fefbcbc4cef187dba5ba3fa4fa3265ab508490
Adam Lesinski [Wed, 5 Jul 2017 21:22:26 +0000 (21:22 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours
am:
8f09557150 -s ours
Change-Id: I238486086c8b806593e241a8c1a6f070fdcf060d
Android Build Merger (Role) [Wed, 5 Jul 2017 21:20:02 +0000 (21:20 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master am:
a998cffb1b -s ours" into oc-dev-plus-aosp
Adam Lesinski [Wed, 5 Jul 2017 21:19:08 +0000 (21:19 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master
am:
a998cffb1b -s ours
Change-Id: I15f2cf810bd0f2feb3117dbebe7f15daff281c1f
Android Build Merger (Role) [Wed, 5 Jul 2017 21:18:47 +0000 (21:18 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours" into oc-dev-plus-aosp
Adam Lesinski [Wed, 5 Jul 2017 21:17:50 +0000 (21:17 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours
am:
1ebe18d691 -s ours
Change-Id: Idb9123f2913be7ac629c7822a846b6de849c638c
Adam Lesinski [Wed, 5 Jul 2017 21:16:55 +0000 (21:16 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours
am:
1ebe18d691 -s ours
Change-Id: I407815d637dadf8416c8df715b533e2eb3edee2e
Android Build Merger (Role) [Wed, 5 Jul 2017 21:13:19 +0000 (21:13 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master
Adam Lesinski [Wed, 5 Jul 2017 21:12:22 +0000 (21:12 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6"
am:
6fd0671265 -s ours
Change-Id: Icefbb67a8046a4bc57de5f69bcc32ab235371ddc
Adam Lesinski [Wed, 5 Jul 2017 21:11:36 +0000 (21:11 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6"
am:
6fd0671265 -s ours
Change-Id: Ib9428106e209a77220e22f43210ecf0d946128ad
Treehugger Robot [Wed, 5 Jul 2017 21:01:29 +0000 (21:01 +0000)]
Android Build Merger (Role) [Wed, 5 Jul 2017 21:01:00 +0000 (21:01 +0000)]
Merge "Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev am:
e80ea58d60" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 5 Jul 2017 20:59:59 +0000 (20:59 +0000)]
Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev
am:
e80ea58d60
Change-Id: I727bd81fb59f52cdffb10d3b22afbb3da04ecbfd
Bryce Lee [Wed, 5 Jul 2017 20:59:14 +0000 (20:59 +0000)]
Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev
am:
e80ea58d60
Change-Id: I5c9592e68a5d462feb136ea0638647bbc516b711
Bryce Lee [Wed, 5 Jul 2017 20:52:33 +0000 (20:52 +0000)]
Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev
Bryce Lee [Thu, 22 Jun 2017 20:14:28 +0000 (13:14 -0700)]
Use configuration delta to determine if still in orientation change.
We currently track this change in the WindowState with a variable
called mOrientationChanging. This value is set and cleared in a
variety of classes. It is possible for this value to be cleared
before processing an orientation changing frame. This can lead to us
prematurely unfreezing.
Since the orientation is present in the configuration, we can use the
orientation delta between the last and current frame's configuration
to determine whether we are in the middle of an orientation change.
The existing signal has been moved behind a setter/getter where the
latter is combined with the configuration state.
Bug:
62846907
Test: go/wm-smoke
Test: turn launcher rotation on, open dialer in portrait, turn off
screen, rotate to landscape, unlock with fingerprint, press
home while rotating. make sure layout is correct.
Change-Id: Ie0b78b76565125fd1cb036545cfb59f2a9075328
Andreas Gampe [Mon, 3 Jul 2017 20:03:29 +0000 (13:03 -0700)]
Framework: Add libziparchive dependency
Bug:
37342627
Test: m
Change-Id: I4bc85b87a6c4305f14586aba662bcccbd4b8b6e2
Adam Lesinski [Fri, 28 Oct 2016 23:39:15 +0000 (16:39 -0700)]
Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6
Partial cherry-pick of commit
7ad1110ecd6a840fcd2895c62668828a1ca029c6.
Test: m
Merged-In: Id0e57ee828f17008891fe3741935a9be8830b01d
Change-Id: Id0e57ee828f17008891fe3741935a9be8830b01d
Jason Monk [Wed, 5 Jul 2017 17:51:37 +0000 (17:51 +0000)]
Merge "Fix rounded corners fangs in RTL" into oc-dr1-dev
am:
5c5f1f6419
Change-Id: Ib93c82921f7651db143355224231fe41db87137e
Jason Monk [Wed, 5 Jul 2017 17:50:11 +0000 (17:50 +0000)]
Merge "Updates to brightness mirror to play with color extraction" into oc-dr1-dev
am:
4cccea6b6a
Change-Id: I821c127ed06ecd858e6380ddc4019fcc17d7fc32
Selim Cinek [Wed, 5 Jul 2017 17:46:23 +0000 (17:46 +0000)]
Merge "Fixed the clear all animation on the locked shade" into oc-dr1-dev
am:
890c430416
Change-Id: Id19480f5051b3e96b2fea0e768af5fbaf3d746a8
Selim Cinek [Wed, 5 Jul 2017 17:44:52 +0000 (17:44 +0000)]
Merge "Calling hideKeyguard more often, instead of caching it" into oc-dr1-dev
am:
71e0a3758f
Change-Id: I2841b973d012ea3d0b2c4162f3930e3d48cebad1
Jason Monk [Wed, 5 Jul 2017 17:43:31 +0000 (17:43 +0000)]
Merge "Remove UI_MODE_CAR for QS because it isn't doing anything right now." into oc-dr1-dev
am:
700cd6528b
Change-Id: I54c78e1d5db31174d4e9ed9480a233e09470f815
TreeHugger Robot [Wed, 5 Jul 2017 17:41:33 +0000 (17:41 +0000)]
Merge "Fix rounded corners fangs in RTL" into oc-dr1-dev
OSDN Git Service
