Created
February 4, 2016 06:02
-
-
Save ghsr/35002dc10adb47fb9924 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
project art/ | |
4d93433 Add missing null check to String::ToCharArray | |
10d26d8 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
936a95c merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2f091fd merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
fafbafe merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
54f5548 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
57bd717 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5cb7dd6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
692bca7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ba4c819 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4833277 ART: Change UninitializedThis tracking in the verifier | |
579f38d merge in mnc-dr-release history after reset to mnc-dr-dev | |
4c0c354 merge in mnc-dr-release history after reset to mnc-dr-dev | |
bdc9a55 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6346484 merge in mnc-dr-release history after reset to mnc-dr-dev | |
205755a merge in mnc-dr-release history after reset to mnc-dr-dev | |
470ccc7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8dc5029 merge in mnc-dr-release history after reset to mnc-dr-dev | |
88af2bf merge in mnc-dr-release history after reset to mnc-dr-dev | |
8cfd7c1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a73f90c merge in mnc-dr-release history after reset to mnc-dr-dev | |
455aef0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
161a883 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2a8e601 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0b3da57 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6205e64 merge in mnc-dr-release history after reset to mnc-dr-dev | |
603b4c2 Fix some java_lang_Class related moving GC bugs | |
d0b6e38 merge in mnc-release history after reset to mnc-dev | |
52ab795 merge in mnc-release history after reset to mnc-dev | |
762ba50 merge in mnc-release history after reset to mnc-dev | |
8b13431 merge in mnc-release history after reset to mnc-dev | |
c1956de Fix compaction bug in Class_getDeclaredMethodsUnchecked | |
2d22e06 merge in mnc-release history after reset to mnc-dev | |
80ade45 merge in mnc-release history after reset to mnc-dev | |
0941569 merge in mnc-release history after reset to mnc-dev | |
f8b4b5e merge in mnc-release history after reset to mnc-dev | |
4e02012 merge in mnc-release history after reset to mnc-dev | |
5fb3578 merge in mnc-release history after reset to mnc-dev | |
9532111 merge in mnc-release history after reset to mnc-dev | |
987b552 merge in mnc-release history after reset to mnc-dev | |
386e91d merge in mnc-release history after reset to mnc-dev | |
8203a8f merge in mnc-release history after reset to mnc-dev | |
693af6c merge in mnc-release history after reset to mnc-dev | |
73f75bf merge in mnc-release history after reset to mnc-dev | |
d6ec651 ART: Sometimes even empty methods take forever to verify | |
e0d5c3a merge in mnc-release history after reset to mnc-dev | |
9b6f532 merge in mnc-release history after reset to mnc-dev | |
5b79d84 merge in mnc-release history after reset to mnc-dev | |
e2e2b00 merge in mnc-release history after reset to mnc-dev | |
3779e85 merge in mnc-release history after reset to mnc-dev | |
89547c5 merge in mnc-release history after reset to mnc-dev | |
b4bbc4a merge in mnc-release history after reset to mnc-dev | |
8773b01 merge in mnc-release history after reset to mnc-dev | |
c2d3221 Quick: Abolish kMirOpCheckPart2. | |
85336e3 Fix broken checks in IsValidPartOfMemberNameUtf8Slow. | |
ef1cbe7 merge in mnc-release history after reset to mnc-dev | |
6778fd7 merge in mnc-release history after reset to mnc-dev | |
28c906a merge in mnc-release history after reset to mnc-dev | |
d588522 merge in mnc-release history after reset to mnc-dev | |
38f2085 Update the remaining input index of phis after deleting an input. | |
d8d4a20 merge in mnc-release history after reset to mnc-dev | |
3a01631 ART: Fix loop information after dead code elimination | |
d3b8bd8 merge in mnc-release history after reset to mnc-dev | |
06cb4a9 Fix constructor access check through reflection | |
project bionic/ | |
5308b48 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
1a5bfd9 Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev am: 2010fb6722 am: eebe01b523 | |
eebe01b Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev am: 2010fb6722 | |
2010fb6 Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow-cts-dev | |
4f80102 Fix potential race condition on CTS TC pthread_gettid_np | |
7cfba3b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
306ae63 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ab900ef merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f2e4f3c merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
63265e5 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5099402 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
bad632a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
22af16f merge in mnc-dr-release history after reset to mnc-dr-dev | |
0aa018c merge in mnc-dr-release history after reset to mnc-dr-dev | |
b97c8b4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2e8ac0b merge in mnc-dr-release history after reset to mnc-dr-dev | |
b6b6fcf merge in mnc-dr-release history after reset to mnc-dr-dev | |
f117eb8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
89fddb5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b530200 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d588775 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2cddffe merge in mnc-release history after reset to mnc-dev | |
04363e4 merge in mnc-release history after reset to mnc-dev | |
01c72f8 merge in mnc-release history after reset to mnc-dev | |
0e7aca1 merge in mnc-release history after reset to mnc-dev | |
1a78032 merge in mnc-release history after reset to mnc-dev | |
64eb843 merge in mnc-release history after reset to mnc-dev | |
8b18a3c merge in mnc-release history after reset to mnc-dev | |
741df28 merge in mnc-release history after reset to mnc-dev | |
9660d32 merge in mnc-release history after reset to mnc-dev | |
2ff7422 merge in mnc-release history after reset to mnc-dev | |
3619d6b merge in mnc-release history after reset to mnc-dev | |
2783166 merge in mnc-release history after reset to mnc-dev | |
c3351ea Work around incorrect dt_needed entries | |
730c0a4 merge in mnc-release history after reset to mnc-dev | |
c8e23a4 merge in mnc-release history after reset to mnc-dev | |
4d49212 merge in mnc-release history after reset to mnc-dev | |
aa3ef00 merge in mnc-release history after reset to mnc-dev | |
3043072 merge in mnc-release history after reset to mnc-dev | |
51d3926 merge in mnc-release history after reset to mnc-dev | |
4cb434d Fix regression in crash reporting | |
project bootable/recovery/ | |
198223e merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
59f63c6 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
bdb5268 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
b750e65 imgdiff: skip spurious gzip headers in image files | |
0f2f6a7 imgdiff: skip spurious gzip headers in image files | |
9885851 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a200639 uncrypt: Support file level encryption. | |
698937b merge in mnc-dr-release history after reset to mnc-dr-dev | |
babcffa Revert "Change init sequence to support file level encryption" | |
239d572 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d6d34c7 merge in mnc-release history after reset to mnc-dev | |
0460f69 Revert "Zero blocks before BLKDISCARD" | |
project build/ | |
fc5aee3 "MXB48T" | |
3523aa7 MXB48S | |
9b1940c "MXC15" | |
3d2f609 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
3428d7d "MXC14" | |
d540def merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
a47c500 "MXC13" | |
f085b47 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
1090c82 "MXC12" | |
0996a8e merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
65aecc0 "MXC11" | |
04c7711 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
26ce206 "MXC10" | |
4a5031d merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ae26ff8 "MXC07" | |
6f06581 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
6180455 "MXB48R" | |
f65aa4a Update Security String to 2016-02-01 | |
42f2c2a "MXB48Q" | |
5681734 Update Security String to 2016-01-01 to mnc-dev | |
e75f5af "MXC05" | |
a6d94db merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
d8254d2 "MXB48P" | |
5fdf861 "MXB48O" | |
51b5e6d "MXB48N" | |
2493e26 "MXB48M" | |
b23e4f6 "MXB48L" | |
5547e49 Update Security String to 2016-01-01 to mnc-dev | |
02115bf DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063 -s ours am: db4d57a84c | |
db4d57a DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063 -s ours | |
41846b0 DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 | |
5e2b003 Update Security String to 2016-02-01 am: f0f73c06e2 | |
af970fb DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b | |
929a4ab DO NOT MERGE - Update security string to 2016-02-01 | |
f0f73c0 Update Security String to 2016-02-01 | |
ff28af7 "MXB48K" | |
9f38105 "MXB48J" | |
b20c338 "MXB48I" | |
b6e1fdf "MXB48H" | |
859398c "MXB48G" | |
8909bdf Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64 -s ours am: c7b96cdd5e | |
c7b96cd Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64 -s ours | |
2cd2a76 Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 | |
645f200 Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad | |
bcf2866 Update Security String to 2016-01-01 to mnc-dev am: 170459f438 | |
643a31b "MXB48F" | |
170459f Update Security String to 2016-01-01 to mnc-dev | |
58cdbdc Update Security String to 2016-01-01 - DO NOT MERGE | |
d7b86b8 "MXB48E" | |
afb7896 "MXB48D" | |
72b5465 "MXB48C" | |
06bea1d "MXB48B" | |
fd2e61d "MXB48" | |
97dd29e merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
93dcc85 "MXB47" | |
ae10f0b merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
55a149b Revert "Change version back to 6.0" | |
7417d84 "MXB46" | |
d6126e7 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
970f203 Change version back to 6.0 | |
48062c8 "MXB43C" | |
9071dd4 "MXB43B" | |
2a4620b "MXB43" | |
272a3c2 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ad7d04f "MXB42" | |
5096786 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
607f32b "MXB41B" | |
68ef86a "MXB41" | |
6635cc5 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
966a838 "MXB40" | |
52ef332 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
5e0efa4 "MXB39B" | |
7b91985 "MXB39" | |
ca53584 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
86e979d "MXB36B" | |
8ff2e19 "MXB36" | |
0588d96 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
2811378 "MXB35" | |
77950bb merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
60f83f8 "MXB34" | |
5dcf08d merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
1c39a50 "MXB33" | |
16a53c0 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ca5bd57 "MXB32" | |
7fa5777 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
7ab3318 "MXB29D" | |
46c642f "MXB29C" | |
3236e6d "MXB29B" | |
c2ed4ce "MXB29" | |
c8b4ed1 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
4018b59 "MXB28B" | |
c362859 "MXB28" | |
6b2bce6 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
0b34ac7 "MXB27" | |
b5e22a2 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
df2b40c "MXB26" | |
4720e9e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
94b290a "MXB25" | |
6d76bf1 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5a12fd5 MXB22C | |
a37222d "MXB22B" | |
c0f1bb8 "MXB22" | |
2eec144 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
998de2e "MXB21" | |
c4403c7 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e34ce83 "MXB20" | |
6eadc51 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a8ff214 "MXB19" | |
82ce2eb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
3c01a11 "MXB15C" | |
0ea137a "MXB15B" | |
0205c2c "MXB15" | |
861c3e3 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
06b0276 "MXB14B" | |
f94ccc4 "MXB14" | |
6351edc merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5570bf4 "MXB13" | |
f1643f8 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e5c7694 "MXB12" | |
ffad521 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
48681d6 "MXB11" | |
39e7198 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8cde008 "MXB08C" | |
37040e6 MXB08B | |
6ad7953 "MXB02B" | |
259473b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
dc1e310 "MXB08" | |
1efafe5 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
da60c65 "MXB07" | |
388a8d4 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
afc67be "MXB06" | |
41d139a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
429299e "MXB05" | |
15ec5aa merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5f97af3 "MXB04" | |
d82bd2a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c01f53e "MXB01B" | |
edf3ba3 "MXB01" | |
4654483 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
26dc376 "MXA92" | |
16a16cf merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c604c4d "MXA91" | |
7e4d8df merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
60d7fe7 "MXA90" | |
48a1534 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9bfe8b8 "MXA89" | |
5045775 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
768e245 "MXA86F" | |
be1dbcb "MXA86E" | |
864ed4f "MXA86D" | |
f37bda6 "MXA86C" | |
ca8e3a6 "MXA86B" | |
686344c "MXA86" | |
73aaf0b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ca8b281 "MXA85" | |
26ccf8b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
b19648d "MDA72H" | |
e0bf570 "MDA72G" | |
874c791 "MDA72F" | |
cfbd887 "MDA72E" | |
8a3d4c2 "MDA72D" | |
1333093 "MDA72C" | |
6c512f2 "MDA72B" | |
25ceb60 "MDA72" | |
fa2d317 merge in mnc-dr-release history after reset to mnc-dr-dev | |
7c455ea "MDA71C" | |
cb6dfdf MDA71B | |
28c7416 "MDA71" | |
7640f65 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8fc0db1 "MDA70C" | |
d22e02e "MDA70B" | |
a2d210d "MDA70" | |
1ad67ac merge in mnc-dr-release history after reset to mnc-dr-dev | |
6ea86eb "MDA69" | |
2136687 merge in mnc-dr-release history after reset to mnc-dr-dev | |
10c3718 "MDA68" | |
1e4785c merge in mnc-dr-release history after reset to mnc-dr-dev | |
ec86410 "MDA65H" | |
1119fbc "MDA65G" | |
5325444 "MDA65F" | |
85b8cd8 "MDA65E" | |
4054fd5 "MDA65D" | |
a2fea0f "MDA65C" | |
cf848fb "MDA65B" | |
526ebfa "MDA65" | |
9ab9151 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b551d04 "MDA64B" | |
90c79de "MDA64" | |
17aa8c9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c93fdba "MDA63B" | |
2258217 "MDA63" | |
3688f18 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4f0fbce "MDA62C" | |
ad70c94 "MDA62B" | |
64a9217 "MDA62" | |
f9b9612 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b39be90 "MDA58F" | |
a262ca2 "MDA60B" | |
95b0574 merge in mnc-dr-release history after reset to mnc-dr-dev | |
966d7d9 "MDA60" | |
ae45a3f merge in mnc-dr-release history after reset to mnc-dr-dev | |
a4687d2 "MDA58E" | |
9f34d5d "MDA58D" | |
7792dbe "MDA58C" | |
7be3665 "MDA58B" | |
76455f3 "MDA58" | |
b1ff982 merge in mnc-dr-release history after reset to mnc-dr-dev | |
50c1db4 "MDA57" | |
87eb1c4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9a31ed8 "MDA56B" | |
c4f9cda "MDA56" | |
8279da6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3fc7c6f "MDA55" | |
f1c84f6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1c2d61e "MDA54" | |
c546261 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d4829a0 "MDA53" | |
4f1e05d merge in mnc-dr-release history after reset to mnc-dr-dev | |
198d8e2 "MDA51F" | |
f13567e "MDA51E" | |
16fb35a "MDA51D" | |
ac062c5 "MDA51C" | |
b69c2ad "MDA51B" | |
b2c0cee "MDA51" | |
06cb175 merge in mnc-dr-release history after reset to mnc-dr-dev | |
afaeb05 "MDA50B" | |
cc8166e "MDA50" | |
72acd45 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4f4a527 "MDA49B" | |
afb1459 "MDA49" | |
51109e6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d5d3883 "MDA48" | |
70fa09a merge in mnc-dr-release history after reset to mnc-dr-dev | |
e7a2d16 "MDA47" | |
067d264 merge in mnc-dr-release history after reset to mnc-dr-dev | |
530621e "MDA46" | |
fadcdfb merge in mnc-dr-release history after reset to mnc-dr-dev | |
0c50544 "MDA44G" | |
2ab6353 "MDA44F" | |
c825325 "MDA44E" | |
2a94504 "MDA44D" | |
72e6a83 "MDA44C" | |
08d325c "MDA44B" | |
199d884 "MDA44" | |
52bc595 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3458f53 "MDA43B" | |
108995e "MDA43" | |
a72407b merge in mnc-dr-release history after reset to mnc-dr-dev | |
c97fb60 "MDA42D" | |
e198406 "MDA42C" | |
90b520d "MDA42B" | |
fb3971e "MDA42" | |
660d3c5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9613650 MDA41B | |
7335d3d "MDA41" | |
722ed41 merge in mnc-dr-release history after reset to mnc-dr-dev | |
913aa24 "MDA40" | |
ab26418 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a1e4f75 "MDA39" | |
fbed25a merge in mnc-dr-release history after reset to mnc-dr-dev | |
5ee7262 "MDA37F" | |
f7686e3 "MDA37E" | |
0c31682 "MDA37D" | |
6ec1bac "MDA37C" | |
0b49ebd "MDA37B" | |
4b7c822 "MDA37" | |
69395d0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
56b80ad "MDA36B" | |
1aeda1b "MDA36" | |
d1fce24 merge in mnc-dr-release history after reset to mnc-dr-dev | |
eabed94 "MDA35C" | |
42cf27a "MDA35B" | |
cfe07c8 "MDA35" | |
71776a5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d03438e "MDA34B" | |
e6c132e "MDA34" | |
63b74d7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a7ce9c7 "MDA33" | |
fdc6caa merge in mnc-dr-release history after reset to mnc-dr-dev | |
5cae4b8 "MDA32" | |
5018f87 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1adc41a "MDA30H" | |
f3733ec "MDA30G" | |
f0a1ead "MDA30F" | |
01299fb "MDA30E" | |
bbf576e "MDA30D" | |
cd39d0a "MDA30C" | |
5c9c835 "MDA30B" | |
f9b2641 "MDA30" | |
ce687ca merge in mnc-dr-release history after reset to mnc-dr-dev | |
02e2a37 "MDA29B" | |
4b07dd5 "MDA29" | |
e883b8d merge in mnc-dr-release history after reset to mnc-dr-dev | |
7f82594 "MDA28" | |
6dd2932 merge in mnc-dr-release history after reset to mnc-dr-dev | |
eb3a5ae "MDA27" | |
c56ae76 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e603103 "MDA26" | |
cf4e421 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3bda5c5 "MDA25" | |
90e1f70 merge in mnc-dr-release history after reset to mnc-dr-dev | |
46306bc "MDA23D" | |
b89bbae "MDA23C" | |
3e43ec9 MDA23B | |
ab38294 "MDA23" | |
d5ff1cd merge in mnc-dr-release history after reset to mnc-dr-dev | |
abf6cfe "MDA22C" | |
f89e0a8 "MDA22B" | |
1791651 "MDA22" | |
7e7d875 merge in mnc-dr-release history after reset to mnc-dr-dev | |
18fd222 "MDA21B" | |
5c92042 "MDA21" | |
48159c7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e1a09af "MDA20" | |
6fc72a6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
aaa5256 "MDA19" | |
4bf23f3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1f346be "MDA18" | |
a26529f merge in mnc-dr-release history after reset to mnc-dr-dev | |
71ddc57 MDA16G | |
e451a9e "MDA16F" | |
c4cd917 "MDA16E" | |
f3cc78b "MDA16D" | |
95b0eee "MDA16C" | |
1077ab8 "MDA16B" | |
033aa93 "MDA16" | |
1e52cf1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
669baee "MDA15B" | |
9edd74f "MDA15" | |
8a52222 merge in mnc-dr-release history after reset to mnc-dr-dev | |
983cbd1 "MDA14D" | |
86a0166 "MDA14C" | |
5c22d20 "MDA14B" | |
702f512 "MDA14" | |
9c7ee4d merge in mnc-dr-release history after reset to mnc-dr-dev | |
36bd774 "MDA13B" | |
26a1a9d "MDA13" | |
c10ba6b merge in mnc-dr-release history after reset to mnc-dr-dev | |
2763c27 "MDA12" | |
126f4d9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ca8de3b "MDA11" | |
07791ab merge in mnc-dr-release history after reset to mnc-dr-dev | |
208e0bf "MDA09B" | |
62cdce0 "MDA09" | |
695fe3d merge in mnc-dr-release history after reset to mnc-dr-dev | |
3864c71 "MDA08C" | |
bcd142f "MDA08B" | |
6cf7874 "MDA08" | |
fc4f1c2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1bff2e9 "MDA07C" | |
ab5e6f6 "MDA07B" | |
db14e56 "MDA07" | |
4e67017 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a211649 "MDA06B" | |
9c8f773 merge in mnc-dr-release history after reset to mnc-dr-dev | |
7862b64 "MDA06" | |
15835f0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fbff09e "MRZ79H" | |
8c4da68 "MRZ79G" | |
bc61733 "MRZ79F" | |
ab451fd "MRZ79E" | |
8e03535 "MRZ79D" | |
45fa5f4 "MRZ79C" | |
5a93c1c "MRZ79B" | |
abf1aa8 "MRZ79" | |
cdae5f0 merge in mnc-release history after reset to mnc-dev | |
8e03097 "MRZ78B" | |
e6e9856 "MRZ78" | |
ba8372a merge in mnc-release history after reset to mnc-dev | |
1c90241 "MRZ77B" | |
71ca134 "MRZ77" | |
7159a3d merge in mnc-release history after reset to mnc-dev | |
770f2dd "MRZ72F" | |
3384b3f merge in mnc-release history after reset to mnc-dev | |
7897047 "MRZ76B" | |
4c839ad "MRZ76" | |
15a4dfb merge in mnc-release history after reset to mnc-dev | |
abe0c11 "MRZ75" | |
b3b2f02 merge in mnc-release history after reset to mnc-dev | |
ce5bc95 "MRZ74" | |
71e69dc merge in mnc-release history after reset to mnc-dev | |
0a6e8fa "MRZ72E" | |
2b7ba64 "MRZ72D" | |
85ee69a "MRZ72C" | |
ef58ef0 "MRZ72B" | |
e3eb037 "MRZ72" | |
364d857 merge in mnc-release history after reset to mnc-dev | |
1566ad3 "MRZ71C" | |
230223f "MRZ71B" | |
f33d9a7 "MRZ71" | |
43045f7 merge in mnc-release history after reset to mnc-dev | |
7edba94 "MRZ70C" | |
b9284b1 "MRZ70B" | |
29543aa "MRZ70" | |
592816d merge in mnc-release history after reset to mnc-dev | |
988f415 "MRZ69B" | |
e588d89 "MRZ69" | |
dc22fa8 merge in mnc-release history after reset to mnc-dev | |
d0453c5 "MRZ68" | |
b2887cc merge in mnc-release history after reset to mnc-dev | |
8ce8ab7 "MRZ67" | |
f28d08a merge in mnc-release history after reset to mnc-dev | |
c255469 "MRZ65F" | |
3b440a9 "MRZ65E" | |
4aa93a7 "MRZ65D" | |
42008e2 "MRZ65C" | |
07417cc "MRZ65B" | |
49cbee2 "MRZ65" | |
f270320 merge in mnc-release history after reset to mnc-dev | |
74a75cd "MRZ64B" | |
aa319df goldfish: logcat -Q in logd domain | |
234360e "MRZ64" | |
4340591 merge in mnc-release history after reset to mnc-dev | |
0e395b1 "MRZ63C" | |
1782365 "MRZ63B" | |
ad6b53c "MRZ63" | |
916313d merge in mnc-release history after reset to mnc-dev | |
026fb45 "MRZ62B" | |
cd8c93a "MRZ62" | |
b2a06f6 merge in mnc-release history after reset to mnc-dev | |
9fd7b46 "MRZ61" | |
726d8c9 merge in mnc-release history after reset to mnc-dev | |
5159f81 "MRZ60" | |
8b210d3 merge in mnc-release history after reset to mnc-dev | |
79a9f03 "MRZ58D" | |
694eae2 "MRZ58C" | |
a024274 "MRZ58B" | |
17e09d9 "MRZ58" | |
a44a873 merge in mnc-release history after reset to mnc-dev | |
7254999 "MRZ57B" | |
b2c49b7 "MRZ57" | |
c57d9a4 merge in mnc-release history after reset to mnc-dev | |
706180c "MRZ56B" | |
b7f627a "MRZ56" | |
b354af0 merge in mnc-release history after reset to mnc-dev | |
b8a9fac "MRZ55" | |
7d647c6 merge in mnc-release history after reset to mnc-dev | |
c61fbc4 "MRZ54" | |
32fe59c merge in mnc-release history after reset to mnc-dev | |
41803ee "MRZ53" | |
c74ed3e merge in mnc-release history after reset to mnc-dev | |
06828a5 "MRZ51G" | |
41b24a5 "MRZ51F" | |
f0a8b85 "MRZ51E" | |
c0e833d "MRZ51D" | |
d8308d4 "MRZ51C" | |
0fa5417 "MRZ51B" | |
4e786a0 "MRZ51" | |
f6fd686 merge in mnc-release history after reset to mnc-dev | |
337a063 "MRZ50C" | |
5b2a679 "MRZ50B" | |
6e8931c "MRZ50" | |
946289a merge in mnc-release history after reset to mnc-dev | |
400563e "MRZ49C" | |
949d358 "MRZ49B" | |
83f4501 "MRZ49" | |
ab61096 merge in mnc-release history after reset to mnc-dev | |
fabc869 "MRZ48B" | |
0a0358c "MRZ48" | |
a2d466a merge in mnc-release history after reset to mnc-dev | |
f2cdd5c "MRZ47" | |
93e26ee merge in mnc-release history after reset to mnc-dev | |
41814f4 "MRZ46" | |
261edd3 merge in mnc-release history after reset to mnc-dev | |
bbc1fb6 "MRZ44F" | |
185d864 "MRZ44E" | |
7d0e8a5 "MRZ44D" | |
a5de1e5 "MRZ44C" | |
9894e2c "MRZ44B" | |
5fa080b "MRZ44" | |
4f1a98a merge in mnc-release history after reset to mnc-dev | |
52e9404 "MRZ43B" | |
3e8f161 Remove libc++ from prepackaged shared libs in cts. | |
3bc0bc5 Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} Bug: 21095280 | |
74b2788 "MRZ43" | |
cb27df5 merge in mnc-release history after reset to mnc-dev | |
e1bf3dd "MRZ42C" | |
c06ecd2 "MRZ42B" | |
9269975 "MRZ42" | |
c05b24d merge in mnc-release history after reset to mnc-dev | |
cd30cbd "MRZ41B" | |
705e75b "MRZ41" | |
bdd0e1d merge in mnc-release history after reset to mnc-dev | |
b599734 MRZ40B | |
02c2b6a "MRZ40" | |
e604138 merge in mnc-release history after reset to mnc-dev | |
53031ff "MRZ39" | |
07ae6ef merge in mnc-release history after reset to mnc-dev | |
44791bf "MRZ37F" | |
d15dbd7 "MRZ37E" | |
978c935 "MRZ37D" | |
aca3465 Revert "Switch from Calculator to ExactCalculator" | |
a879195 "MRZ37C" | |
b5dc52a "MRZ37B" | |
8b834ff "MRZ37" | |
62e4730 merge in mnc-release history after reset to mnc-dev | |
2014678 "MRZ36B" | |
c4fc651 "MRZ36" | |
7e7592e merge in mnc-release history after reset to mnc-dev | |
01864b7 "MRZ35B" | |
68cc486 "MRZ35" | |
6d6ca24 merge in mnc-release history after reset to mnc-dev | |
0128279 "MRZ34C" | |
20e7715 "MRZ34B" | |
01f3dbc Revert "Don't extract jni from prebuilt apks." | |
8f049bd "MRZ34" | |
a8b61db merge in mnc-release history after reset to mnc-dev | |
875982a "MRZ33" | |
5024292 merge in mnc-release history after reset to mnc-dev | |
708d1d1 "MRZ32" | |
ce6b82a merge in mnc-release history after reset to mnc-dev | |
9e2df49 "MRZ30D" | |
2d43098 "MRZ30C" | |
f771c7e "MRZ30B" | |
1a83636 "MRZ30" | |
3b49d3c merge in mnc-release history after reset to mnc-dev | |
fbd11a5 "MRZ29B" | |
c2309f5 "MRZ29" | |
f821260 merge in mnc-release history after reset to mnc-dev | |
13296f9 "MRZ28C" | |
740279f "MRZ28B" | |
0ab1fbd "MRZ28" | |
fb369ec merge in mnc-release history after reset to mnc-dev | |
a37d793 "MRZ27B" | |
efc9f52 "MRZ27" | |
85e44a7 merge in mnc-release history after reset to mnc-dev | |
f9ecd3f "MRZ26" | |
f2935e0 merge in mnc-release history after reset to mnc-dev | |
8a96072 "MRZ25" | |
29b35e0 merge in mnc-release history after reset to mnc-dev | |
f7533d3 "MRZ24" | |
9f15eb8 merge in mnc-release history after reset to mnc-dev | |
e447ac2 "MRZ23B" | |
project cts/ | |
224fcc8 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
207ad0a merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
b67a4a0 Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev am: 4528128713 -s ours am: 7fc6f38cb1 am: a5d8f5eb9e am: 1c656a46e0 am: fa2dc48cdf | |
d291372 Merge "MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue" into kitkat-cts-dev am: d527cc199f am: 3c12682003 am: e841d86c0a am: 0d24e5587d am: fc384026ed am: fee04d492b | |
89baca2 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00 am: 9ec7400810 am: 6a9df45994 am: b18ddf7395 am: a1d21ae719 | |
c4adfa0 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd am: 8e3c0d3bfb am: 95bcb1915d am: ce38377237 am: a5a3107b26 | |
23e2f2c Merge branch 'mnc-dr-ryu-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-ryu-dev | |
695c766 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 am: 906db8099e am: ed2be337f8 am: 8bf14b2169 am: 9d933d9473 | |
9ec143f Merge branch 'mnc-dr-ryu-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-ryu-dev | |
a027871 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours am: a54da8e17c -s ours am: 7819e8f2f6 -s ours am: b20019e6ae am: d1045ad4a8 | |
c1ca479 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours am: a54da8e17c -s ours am: 7819e8f2f6 -s ours am: b20019e6ae am: d1045ad4a8 | |
6129545 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c am: 736323c5ff am: a34339c59c am: df10bdf0af am: 13c0e93669 | |
5918a8e Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb am: 8ec5ed995b am: 7e9cef30e7 | |
65188a4 Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 am: 743aedb8a7 am: d7605e2398 am: 1254a86511 am: d3cf6e3c6f | |
ae3185c Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours am: d7546b7f3b -s ours am: 1443d75946 -s ours am: dc49cc6fd2 -s ours am: 2577e48f01 am: a7eb20734c | |
41ce7a6 Merge "DO NOT MERGE: The new AudioPolicyBinder tests are not yet robust enough to be added to the test suite, hence adding them to knownfailures" into kitkat-cts-dev am: 76b836f770 -s ours am: 31c05ce957 -s ours am: 923c498095 -s ours am: 99f1138c15 -s ours am: 7c79f832d9 am: 8e703dacbc | |
3c1cdeb Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4 am: 718d102f76 -s ours am: 11aeb060d4 am: 6d8931ed5d am: 5287f75394 | |
fa2dc48 Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev am: 4528128713 -s ours am: 7fc6f38cb1 am: a5d8f5eb9e am: 1c656a46e0 | |
fee04d4 Merge "MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue" into kitkat-cts-dev am: d527cc199f am: 3c12682003 am: e841d86c0a am: 0d24e5587d am: fc384026ed | |
6a5d79b Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c am: af9aff02df am: a8e04b8b4d am: ab448f521b am: 1402e219ee am: e59e98fba4 | |
a1d21ae Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00 am: 9ec7400810 am: 6a9df45994 am: b18ddf7395 | |
6e4ce84 Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev am: d8aada953e -s ours am: 51f4649017 -s ours am: 43703cd5ee -s ours am: 96f5341f0d -s ours am: f51347ea43 am: eea143b960 | |
a5a3107 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd am: 8e3c0d3bfb am: 95bcb1915d am: ce38377237 | |
7b1ba62 Merge branch 'mnc-dr-ryu-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-ryu-dev | |
37992d6 Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours am: 157726d10f -s ours am: 6c6882b3b7 -s ours am: 0d18798422 am: 4a9a3fd676 | |
9d933d9 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 am: 906db8099e am: ed2be337f8 am: 8bf14b2169 | |
6390aa7 Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev am: ec5c384f73 -s ours am: f6cf52311c am: 00c1a13bc5 am: f72ed45287 am: 84b3ea0675 am: 9b67b1cd95 | |
d1045ad Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours am: a54da8e17c -s ours am: 7819e8f2f6 -s ours am: b20019e6ae | |
6ddc712 Merge "DO NOT MERGE Capture fields in CTS:" into kitkat-cts-dev am: ecd778f841 -s ours am: 62ef32f40c -s ours am: 363b5dc152 -s ours am: 6a35c6ff01 -s ours am: 6f908a91b1 am: a389f2128c | |
13c0e93 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c am: 736323c5ff am: a34339c59c am: df10bdf0af | |
4a43020 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 -s ours am: d2edfc4b3a am: b08628be52 am: 0627fca99f am: 12828d9cec | |
f551421 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: 56ba7d81dd -s ours am: 1e39b16fd5 -s ours am: e21d47ca3a am: 7049fd4aa8 | |
7d5dab1 Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88 -s ours am: e1eb4bb28f am: 51620a3d78 am: 0494938eea am: d1173f7cbf | |
4cdda76 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 584cdc7c9a -s ours am: 4a7ac53f93 am: 791dc72a71 am: f7eeacf7e0 | |
7e9cef3 Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb am: 8ec5ed995b | |
ec3d4b5 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 53405b51c8 -s ours am: b0b1f447ad -s ours am: 7fae1232f6 am: 0c4999be9e | |
d3cf6e3 Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 am: 743aedb8a7 am: d7605e2398 am: 1254a86511 | |
e8e870b Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev am: 71c0d24172 am: 0318e2751d am: bcca855341 am: b1e0468156 am: 39c645a588 | |
c8067f1 Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: 5d699eb6fa | |
a7eb207 Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours am: d7546b7f3b -s ours am: 1443d75946 -s ours am: dc49cc6fd2 -s ours am: 2577e48f01 | |
384b78c Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev am: 983ea5225a am: 391c9582c0 am: 8b823f5064 am: 360e0cd0b4 am: b371e0cf57 | |
8e703da Merge "DO NOT MERGE: The new AudioPolicyBinder tests are not yet robust enough to be added to the test suite, hence adding them to knownfailures" into kitkat-cts-dev am: 76b836f770 -s ours am: 31c05ce957 -s ours am: 923c498095 -s ours am: 99f1138c15 -s ours am: 7c79f832d9 | |
5287f75 Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4 am: 718d102f76 -s ours am: 11aeb060d4 am: 6d8931ed5d | |
be25dee Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev am: 5555241f1e am: ef4c045140 -s ours am: 41f96a4dd8 am: fe0c31b63f am: 636acc997b | |
ff3a1fe Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev am: 62c2e665a0 am: 219af39669 am: a7cf6debea am: 2efbe0e620 am: 833bca64a9 | |
1c656a4 Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev am: 4528128713 -s ours am: 7fc6f38cb1 am: a5d8f5eb9e | |
e59e98f Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c am: af9aff02df am: a8e04b8b4d am: ab448f521b am: 1402e219ee | |
fc38402 Merge "MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue" into kitkat-cts-dev am: d527cc199f am: 3c12682003 am: e841d86c0a am: 0d24e5587d | |
b18ddf7 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00 am: 9ec7400810 am: 6a9df45994 | |
eea143b Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev am: d8aada953e -s ours am: 51f4649017 -s ours am: 43703cd5ee -s ours am: 96f5341f0d -s ours am: f51347ea43 | |
ce38377 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd am: 8e3c0d3bfb am: 95bcb1915d | |
4a9a3fd Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours am: 157726d10f -s ours am: 6c6882b3b7 -s ours am: 0d18798422 | |
8bf14b2 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 am: 906db8099e am: ed2be337f8 | |
9b67b1c Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev am: ec5c384f73 -s ours am: f6cf52311c am: 00c1a13bc5 am: f72ed45287 am: 84b3ea0675 | |
b20019e Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours am: a54da8e17c -s ours am: 7819e8f2f6 -s ours | |
a389f21 Merge "DO NOT MERGE Capture fields in CTS:" into kitkat-cts-dev am: ecd778f841 -s ours am: 62ef32f40c -s ours am: 363b5dc152 -s ours am: 6a35c6ff01 -s ours am: 6f908a91b1 | |
6620b9a Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 -s ours am: 053c2547df am: 3be236000f am: 10405d7838 | |
df10bdf Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c am: 736323c5ff am: a34339c59c | |
b9e5e1f Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: fe0750d778 am: ad4130f511 am: 9d53d593d8 | |
12828d9 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 -s ours am: d2edfc4b3a am: b08628be52 am: 0627fca99f | |
17ed8b2 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 194bb39c56 am: c7395f81e5 am: 593728cb0e | |
7049fd4 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: 56ba7d81dd -s ours am: 1e39b16fd5 -s ours am: e21d47ca3a | |
59878af Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: add775967f -s ours am: 990fdd37ee am: bc3d0877ab | |
d1173f7 Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88 -s ours am: e1eb4bb28f am: 51620a3d78 am: 0494938eea | |
a7c6e20 Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: 376b4ac337 -s ours am: 5fc4a1a509 am: 138c27abaf | |
f7eeacf Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 584cdc7c9a -s ours am: 4a7ac53f93 am: 791dc72a71 | |
8ec5ed9 Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb | |
0c4999b Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 53405b51c8 -s ours am: b0b1f447ad -s ours am: 7fae1232f6 | |
777c5ff Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 11b553c4d0 -s ours am: 66ad4784c1 am: c65193447b | |
1254a86 Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 am: 743aedb8a7 am: d7605e2398 | |
3d2ccc8 Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: e31a0cd65e -s ours am: a1f2a73c80 am: 635b5216be | |
39c645a Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev am: 71c0d24172 am: 0318e2751d am: bcca855341 am: b1e0468156 | |
2577e48 Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours am: d7546b7f3b -s ours am: 1443d75946 -s ours am: dc49cc6fd2 -s ours | |
5d699eb Merge branch 'mnc-dr-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev | |
b371e0c Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev am: 983ea5225a am: 391c9582c0 am: 8b823f5064 am: 360e0cd0b4 | |
c0b0ba9 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 85e06a3704 -s ours am: eca552568a am: ff1871a36d | |
7c79f83 Merge "DO NOT MERGE: The new AudioPolicyBinder tests are not yet robust enough to be added to the test suite, hence adding them to knownfailures" into kitkat-cts-dev am: 76b836f770 -s ours am: 31c05ce957 -s ours am: 923c498095 -s ours am: 99f1138c15 -s ours | |
9dc4bc0 Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev am: 983ea5225a am: 391c9582c0 am: 8b823f5064 am: 360e0cd0b4 | |
9c0269d Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: 19d6591ef5 -s ours am: 4114e7e79d am: 76d2dab627 | |
6d8931e Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4 am: 718d102f76 -s ours am: 11aeb060d4 | |
636acc9 Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev am: 5555241f1e am: ef4c045140 -s ours am: 41f96a4dd8 am: fe0c31b63f | |
1402e21 Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c am: af9aff02df am: a8e04b8b4d am: ab448f521b | |
833bca6 Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev am: 62c2e665a0 am: 219af39669 am: a7cf6debea am: 2efbe0e620 | |
492e041 Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: 1ebab33f28 -s ours am: 437ac4cfcc am: b132e46fc4 | |
f51347e Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev am: d8aada953e -s ours am: 51f4649017 -s ours am: 43703cd5ee -s ours am: 96f5341f0d -s ours | |
10405d7 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 -s ours am: 053c2547df am: 3be236000f | |
2f2cd22 Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: 1cc811e674 -s ours am: 9f10aa5017 am: c64bdc8741 | |
0d18798 Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours am: 157726d10f -s ours am: 6c6882b3b7 -s ours | |
9d53d59 Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: fe0750d778 am: ad4130f511 | |
fa872dd Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: 3f8aefb59e -s ours am: 836d82f7a2 am: 5bdc4a6f38 | |
84b3ea0 Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev am: ec5c384f73 -s ours am: f6cf52311c am: 00c1a13bc5 am: f72ed45287 | |
bc3d087 Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: add775967f -s ours am: 990fdd37ee | |
21fca15 Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b -s ours am: 51ebcc78b8 -s ours am: 0f858e5d15 -s ours am: 8b361450a6 -s ours | |
6f908a9 Merge "DO NOT MERGE Capture fields in CTS:" into kitkat-cts-dev am: ecd778f841 -s ours am: 62ef32f40c -s ours am: 363b5dc152 -s ours am: 6a35c6ff01 -s ours | |
138c27a Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: 376b4ac337 -s ours am: 5fc4a1a509 | |
725455c Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev am: 98990c5fe4 am: 2dcd4c244b am: 76ef33856c am: c031171a11 | |
019412a Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into lollipop-mr1-cts-dev am: fe0c8f2aaf -s ours am: 12d88fcfed -s ours am: 575de45639 am: 4276ff1c00 | |
0627fca Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 -s ours am: d2edfc4b3a am: b08628be52 | |
c651934 Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 11b553c4d0 -s ours am: 66ad4784c1 | |
c42b47d Merge "DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase" into lollipop-mr1-cts-dev am: dcd796b871 -s ours am: eddf28fcd5 -s ours am: 9f44c733a8 am: e08a6f4b8b | |
e21d47c Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: 56ba7d81dd -s ours am: 1e39b16fd5 -s ours | |
635b521 Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: e31a0cd65e -s ours am: a1f2a73c80 | |
f9a5193 Merge "DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure" into lollipop-mr1-cts-dev am: 6752d39a3b -s ours am: eda470262e -s ours am: 41a554cf2c am: 94d95bc7b3 | |
791dc72 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 584cdc7c9a -s ours am: 4a7ac53f93 | |
ff1871a Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 85e06a3704 -s ours am: eca552568a | |
95b023f Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev am: f143e2cec9 am: 28b52f16fd am: 653f0e7aee am: f15e93e446 | |
7fae123 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 53405b51c8 -s ours am: b0b1f447ad -s ours | |
b1e0468 Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev am: 71c0d24172 am: 0318e2751d am: bcca855341 | |
76d2dab Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: 19d6591ef5 -s ours am: 4114e7e79d | |
360e0cd Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev am: 983ea5225a am: 391c9582c0 am: 8b823f5064 | |
b132e46 Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: 1ebab33f28 -s ours am: 437ac4cfcc | |
fe0c31b Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev am: 5555241f1e am: ef4c045140 -s ours am: 41f96a4dd8 | |
c64bdc8 Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: 1cc811e674 -s ours am: 9f10aa5017 | |
5bdc4a6 Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: 3f8aefb59e -s ours am: 836d82f7a2 | |
2efbe0e Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev am: 62c2e665a0 am: 219af39669 am: a7cf6debea | |
8b36145 Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b -s ours am: 51ebcc78b8 -s ours am: 0f858e5d15 -s ours | |
3be2360 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 -s ours am: 053c2547df | |
c031171 Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev am: 98990c5fe4 am: 2dcd4c244b am: 76ef33856c | |
ad4130f Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: fe0750d778 | |
4276ff1 Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into lollipop-mr1-cts-dev am: fe0c8f2aaf -s ours am: 12d88fcfed -s ours am: 575de45639 | |
990fdd3 Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: add775967f -s ours | |
e08a6f4 Merge "DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase" into lollipop-mr1-cts-dev am: dcd796b871 -s ours am: eddf28fcd5 -s ours am: 9f44c733a8 | |
5fc4a1a Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: 376b4ac337 -s ours | |
94d95bc Merge "DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure" into lollipop-mr1-cts-dev am: 6752d39a3b -s ours am: eda470262e -s ours am: 41a554cf2c | |
66ad478 Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 11b553c4d0 -s ours | |
237b5e1 resolve merge conflicts of 819dc2b3ca to mnc-dev. am: 9d2b673a5f am: a4947e505a | |
f15e93e Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev am: f143e2cec9 am: 28b52f16fd am: 653f0e7aee | |
a1f2a73 Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: e31a0cd65e -s ours | |
eca5525 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 85e06a3704 -s ours | |
4114e7e Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: 19d6591ef5 -s ours | |
437ac4c Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: 1ebab33f28 -s ours | |
9f10aa5 Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: 1cc811e674 -s ours | |
836d82f Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: 3f8aefb59e -s ours | |
0f858e5 Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b -s ours am: 51ebcc78b8 -s ours | |
76ef338 Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev am: 98990c5fe4 am: 2dcd4c244b | |
575de45 Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into lollipop-mr1-cts-dev am: fe0c8f2aaf -s ours am: 12d88fcfed -s ours | |
9f44c73 Merge "DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase" into lollipop-mr1-cts-dev am: dcd796b871 -s ours am: eddf28fcd5 -s ours | |
41a554c Merge "DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure" into lollipop-mr1-cts-dev am: 6752d39a3b -s ours am: eda470262e -s ours | |
a4947e5 resolve merge conflicts of 819dc2b3ca to mnc-dev. am: 9d2b673a5f | |
653f0e7 Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev am: f143e2cec9 am: 28b52f16fd | |
9d2b673 resolve merge conflicts of 819dc2b3ca to mnc-dev. | |
a5d8f5e Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev am: 4528128713 -s ours am: 7fc6f38cb1 | |
0d24e55 Merge "MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue" into kitkat-cts-dev am: d527cc199f am: 3c12682003 am: e841d86c0a | |
6a9df45 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00 am: 9ec7400810 | |
95bcb19 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd am: 8e3c0d3bfb | |
ed2be33 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 am: 906db8099e | |
7819e8f Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours am: a54da8e17c -s ours | |
a34339c Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c am: 736323c5ff | |
593728c Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 194bb39c56 am: c7395f81e5 | |
0494938 Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88 -s ours am: e1eb4bb28f am: 51620a3d78 | |
d4d86a9 Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours am: 188b260f0c am: b3627dacab | |
d7605e2 Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 am: 743aedb8a7 | |
dc49cc6 Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours am: d7546b7f3b -s ours am: 1443d75946 -s ours | |
99f1138 Merge "DO NOT MERGE: The new AudioPolicyBinder tests are not yet robust enough to be added to the test suite, hence adding them to knownfailures" into kitkat-cts-dev am: 76b836f770 -s ours am: 31c05ce957 -s ours am: 923c498095 -s ours | |
11aeb06 Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4 am: 718d102f76 -s ours | |
ab448f5 Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c am: af9aff02df am: a8e04b8b4d | |
96f5341 Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev am: d8aada953e -s ours am: 51f4649017 -s ours am: 43703cd5ee -s ours | |
6c6882b Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours am: 157726d10f -s ours | |
f72ed45 Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev am: ec5c384f73 -s ours am: f6cf52311c am: 00c1a13bc5 | |
6a35c6f Merge "DO NOT MERGE Capture fields in CTS:" into kitkat-cts-dev am: ecd778f841 -s ours am: 62ef32f40c -s ours am: 363b5dc152 -s ours | |
b08628b Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 -s ours am: d2edfc4b3a | |
1e39b16 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: 56ba7d81dd -s ours | |
4a7ac53 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 584cdc7c9a -s ours | |
b0b1f44 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 53405b51c8 -s ours | |
bcca855 Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev am: 71c0d24172 am: 0318e2751d | |
8b823f5 Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev am: 983ea5225a am: 391c9582c0 | |
41f96a4 Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev am: 5555241f1e am: ef4c045140 -s ours | |
a7cf6de Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev am: 62c2e665a0 am: 219af39669 | |
053c254 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 -s ours | |
5500863 Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours am: c643a1d0d4 -s ours am: a56df60038 am: 2032870025 | |
27f944a Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df am: 97ea8ead55 am: 50359c4ba7 am: 4f6bed9cb1 | |
f78a306 fixed breakage am: 5614190f7b -s ours am: e96247fc5a am: 28f6c0360c am: d6c6ee5c05 | |
2032870 Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours am: c643a1d0d4 -s ours am: a56df60038 | |
4f6bed9 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df am: 97ea8ead55 am: 50359c4ba7 | |
d6c6ee5 fixed breakage am: 5614190f7b -s ours am: e96247fc5a am: 28f6c0360c | |
fe0750d Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 | |
add7759 Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours | |
376b4ac Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours | |
11b553c Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours | |
e31a0cd Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours | |
85e06a3 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours | |
19d6591 Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours | |
1ebab33 Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours | |
1cc811e Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours | |
3f8aefb Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours | |
51ebcc7 Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b -s ours | |
2dcd4c2 Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev am: 98990c5fe4 | |
12d88fc Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into lollipop-mr1-cts-dev am: fe0c8f2aaf -s ours | |
eddf28f Merge "DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase" into lollipop-mr1-cts-dev am: dcd796b871 -s ours | |
eda4702 Merge "DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure" into lollipop-mr1-cts-dev am: 6752d39a3b -s ours | |
28b52f1 Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev am: f143e2cec9 | |
819dc2b Merge "CameraITS: use linear tonemap in test_exposure" into lollipop-mr1-cts-dev am: 37ece1e93c -s ours | |
a56df60 Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours am: c643a1d0d4 -s ours | |
50359c4 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df am: 97ea8ead55 | |
28f6c03 fixed breakage am: 5614190f7b -s ours am: e96247fc5a | |
c643a1d Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours | |
97ea8ea Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df | |
e96247f fixed breakage am: 5614190f7b -s ours | |
a61ed05 cts: get video size from CamcorderProfile -- DO NOT MERGE am: 203f6997c6 -s ours am: 0e7cbc3694 -s ours am: 447116f78c am: a3d744fd87 | |
646a908 BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure am: 71fa8dd091 -s ours am: 279c024b23 am: 4f1639acab am: d9ce1f871d | |
a3d744f cts: get video size from CamcorderProfile -- DO NOT MERGE am: 203f6997c6 -s ours am: 0e7cbc3694 -s ours am: 447116f78c | |
861ca6e BUG: 23954202 fixed minimum memory to be 1099 am: 25360f86ec am: a720724ced am: 12e52fbcb6 am: 5f857888d4 | |
d9ce1f8 BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure am: 71fa8dd091 -s ours am: 279c024b23 am: 4f1639acab | |
d898d3b Add 5-second timeout to testFlacHeapOverflow am: f6483e84dd -s ours am: 201799f5ac am: 57a745da6f am: e721b55cc2 | |
447116f cts: get video size from CamcorderProfile -- DO NOT MERGE am: 203f6997c6 -s ours am: 0e7cbc3694 -s ours | |
5f85788 BUG: 23954202 fixed minimum memory to be 1099 am: 25360f86ec am: a720724ced am: 12e52fbcb6 | |
4f1639a BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure am: 71fa8dd091 -s ours am: 279c024b23 | |
e721b55 Add 5-second timeout to testFlacHeapOverflow am: f6483e84dd -s ours am: 201799f5ac am: 57a745da6f | |
0e7cbc3 cts: get video size from CamcorderProfile -- DO NOT MERGE am: 203f6997c6 -s ours | |
279c024 BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure am: 71fa8dd091 -s ours | |
12e52fb BUG: 23954202 fixed minimum memory to be 1099 am: 25360f86ec am: a720724ced | |
57a745d Add 5-second timeout to testFlacHeapOverflow am: f6483e84dd -s ours am: 201799f5ac | |
a720724 BUG: 23954202 fixed minimum memory to be 1099 am: 25360f86ec | |
201799f Add 5-second timeout to testFlacHeapOverflow am: f6483e84dd -s ours | |
7255af9 Remove corrupt test file am: 45eca1ea8c am: ae9460175b am: 9707d657e6 am: 243a7509f7 | |
ac0cc62 merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: a0351d441b am: bb943950ad am: 3ea3777e46 am: d6ec55ffd7 | |
ddfaf8c Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lmp-mr1-dev am: 4eb9032233 -s ours am: 5f6e8c9dfa -s ours am: d62df8c385 am: 61e556e9eb | |
b168275 DO NOT MERGE: Merged Fixes for CTS Sensor test from master am: 61e3dda0d8 -s ours am: 7b700ba962 -s ours am: cbf61604c2 am: 36e0ebb482 | |
a8aab40 Merge "resolve merge conflicts of ff69cf01b1 to marshmallow-cts-dev." into marshmallow-cts-dev am: a32b2c3284 am: 2adfd37b0f am: 9755f27c5a | |
243a750 Remove corrupt test file am: 45eca1ea8c am: ae9460175b am: 9707d657e6 | |
d6ec55f merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: a0351d441b am: bb943950ad am: 3ea3777e46 | |
61e556e Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lmp-mr1-dev am: 4eb9032233 -s ours am: 5f6e8c9dfa -s ours am: d62df8c385 | |
36e0ebb DO NOT MERGE: Merged Fixes for CTS Sensor test from master am: 61e3dda0d8 -s ours am: 7b700ba962 -s ours am: cbf61604c2 | |
9755f27 Merge "resolve merge conflicts of ff69cf01b1 to marshmallow-cts-dev." into marshmallow-cts-dev am: a32b2c3284 am: 2adfd37b0f | |
9707d65 Remove corrupt test file am: 45eca1ea8c am: ae9460175b | |
3ea3777 merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: a0351d441b am: bb943950ad | |
d62df8c Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lmp-mr1-dev am: 4eb9032233 -s ours am: 5f6e8c9dfa -s ours | |
cbf6160 DO NOT MERGE: Merged Fixes for CTS Sensor test from master am: 61e3dda0d8 -s ours am: 7b700ba962 -s ours | |
2adfd37 Merge "resolve merge conflicts of ff69cf01b1 to marshmallow-cts-dev." into marshmallow-cts-dev am: a32b2c3284 | |
ae94601 Remove corrupt test file am: 45eca1ea8c | |
bb94395 merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: a0351d441b | |
5f6e8c9 Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lmp-mr1-dev am: 4eb9032233 -s ours | |
7b700ba DO NOT MERGE: Merged Fixes for CTS Sensor test from master am: 61e3dda0d8 -s ours | |
a32b2c3 Merge "resolve merge conflicts of ff69cf01b1 to marshmallow-cts-dev." into marshmallow-cts-dev | |
52d8095 resolve merge conflicts of ff69cf01b1 to marshmallow-cts-dev. | |
ebaa00c Merge "Camera: update FPS range check per spec update" into marshmallow-cts-dev am: fea01e7b23 am: e301ca49d9 am: e596519778 | |
e596519 Merge "Camera: update FPS range check per spec update" into marshmallow-cts-dev am: fea01e7b23 am: e301ca49d9 | |
e301ca4 Merge "Camera: update FPS range check per spec update" into marshmallow-cts-dev am: fea01e7b23 | |
fea01e7 Merge "Camera: update FPS range check per spec update" into marshmallow-cts-dev | |
0659bd4 Merge "Update full alarm test requirements" into marshmallow-cts-dev am: 6f23dda366 am: 9ef3a00a3e am: 6c0c9a0b1a | |
6c0c9a0 Merge "Update full alarm test requirements" into marshmallow-cts-dev am: 6f23dda366 am: 9ef3a00a3e | |
7fc6f38 Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev am: 4528128713 -s ours | |
9ef3a00 Merge "Update full alarm test requirements" into marshmallow-cts-dev am: 6f23dda366 | |
6f23dda Merge "Update full alarm test requirements" into marshmallow-cts-dev | |
4528128 Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev | |
2639291 Camera: update FPS range check per spec update | |
e841d86 Merge "MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue" into kitkat-cts-dev am: d527cc199f am: 3c12682003 | |
9ec7400 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00 | |
8e3c0d3 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd | |
906db80 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 | |
a54da8e Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours | |
736323c Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c | |
c7395f8 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 194bb39c56 | |
51620a3 Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88 -s ours am: e1eb4bb28f | |
3c12682 Merge "MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue" into kitkat-cts-dev am: d527cc199f | |
d527cc1 Merge "MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue" into kitkat-cts-dev | |
1cdea24 CTS test for robust handling of invalid cmap am: 57c15f21bd am: a1e319228c am: 03e84e2d00 am: 87eef9b8ce am: f59756e655 am: c8e2241f96 am: 4846ee278c | |
4846ee2 CTS test for robust handling of invalid cmap am: 57c15f21bd am: a1e319228c am: 03e84e2d00 am: 87eef9b8ce am: f59756e655 am: c8e2241f96 | |
c8e2241 CTS test for robust handling of invalid cmap am: 57c15f21bd am: a1e319228c am: 03e84e2d00 am: 87eef9b8ce am: f59756e655 | |
f59756e CTS test for robust handling of invalid cmap am: 57c15f21bd am: a1e319228c am: 03e84e2d00 am: 87eef9b8ce | |
87eef9b CTS test for robust handling of invalid cmap am: 57c15f21bd am: a1e319228c am: 03e84e2d00 | |
03e84e2 CTS test for robust handling of invalid cmap am: 57c15f21bd am: a1e319228c | |
a1e3192 CTS test for robust handling of invalid cmap am: 57c15f21bd | |
57c15f2 CTS test for robust handling of invalid cmap | |
6dd5e73 MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue | |
65d72d7 Merge "Revert "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures"" into marshmallow-cts-dev am: a327989d03 am: b1c9a7d318 am: d99f6b5bcb | |
49bf4bd Merge "DO NOT MERGE: CameraITS: relax test_blackwhite threshold" into marshmallow-cts-dev am: 07629e98df -s ours am: 4dad792513 am: f712e24429 | |
bf78855 Merge "resolve merge conflicts of c696e17027 to marshmallow-cts-dev." into marshmallow-cts-dev am: 11712ba2c6 -s ours am: 2638f86979 am: 83661327ba | |
d99f6b5 Merge "Revert "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures"" into marshmallow-cts-dev am: a327989d03 am: b1c9a7d318 | |
f712e24 Merge "DO NOT MERGE: CameraITS: relax test_blackwhite threshold" into marshmallow-cts-dev am: 07629e98df -s ours am: 4dad792513 | |
8366132 Merge "resolve merge conflicts of c696e17027 to marshmallow-cts-dev." into marshmallow-cts-dev am: 11712ba2c6 -s ours am: 2638f86979 | |
b1c9a7d Merge "Revert "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures"" into marshmallow-cts-dev am: a327989d03 | |
4dad792 Merge "DO NOT MERGE: CameraITS: relax test_blackwhite threshold" into marshmallow-cts-dev am: 07629e98df -s ours | |
2638f86 Merge "resolve merge conflicts of c696e17027 to marshmallow-cts-dev." into marshmallow-cts-dev am: 11712ba2c6 -s ours | |
8886278 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a | |
602ea9b Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 | |
f2b7f84 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours | |
83213a1 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours | |
cfa3f2c Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb | |
194bb39 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac | |
e1eb4bb Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88 -s ours | |
b3627da Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours am: 188b260f0c | |
743aedb Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 | |
188b260 Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours | |
a327989 Merge "Revert "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures"" into marshmallow-cts-dev | |
ed4386b Revert "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures" | |
9905f0b Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours | |
07629e9 Merge "DO NOT MERGE: CameraITS: relax test_blackwhite threshold" into marshmallow-cts-dev | |
11712ba Merge "resolve merge conflicts of c696e17027 to marshmallow-cts-dev." into marshmallow-cts-dev | |
aeda60a resolve merge conflicts of c696e17027 to marshmallow-cts-dev. | |
1443d75 Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours am: d7546b7f3b -s ours | |
923c498 Merge "DO NOT MERGE: The new AudioPolicyBinder tests are not yet robust enough to be added to the test suite, hence adding them to knownfailures" into kitkat-cts-dev am: 76b836f770 -s ours am: 31c05ce957 -s ours | |
d7546b7 Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours | |
31c05ce Merge "DO NOT MERGE: The new AudioPolicyBinder tests are not yet robust enough to be added to the test suite, hence adding them to knownfailures" into kitkat-cts-dev am: 76b836f770 -s ours | |
718d102 Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4 | |
a8e04b8 Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c am: af9aff02df | |
43703cd Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev am: d8aada953e -s ours am: 51f4649017 -s ours | |
157726d Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours | |
00c1a13 Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev am: ec5c384f73 -s ours am: f6cf52311c | |
0a5de00 Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 | |
af9aff0 Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c | |
51f4649 Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev am: d8aada953e -s ours | |
803eae5 Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours | |
363b5dc Merge "DO NOT MERGE Capture fields in CTS:" into kitkat-cts-dev am: ecd778f841 -s ours am: 62ef32f40c -s ours | |
f6cf523 Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev am: ec5c384f73 -s ours | |
d2edfc4 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 -s ours | |
473c7bd am a4456f70: am c65bc434: am 62532688: Set a system property stating the device supports multicast. am: c0c7436030 am: 946a31cae6 am: 819e121f26 am: 4f0eacab33 | |
433c9fa Merge branch \'marshmallow-cts-dev\' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev am: 8545b26608 am: 519137d8cd am: 61b5423c43 | |
4c00e5e Merge branch \'marshmallow-cts-dev\' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev am: 2bee938d06 am: 324d3048f7 am: d7c479d870 | |
af3ccb2 Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: d0c7dbb40c | |
78907b1 am 72a4d623: am 56538948: am 3673d9f0: CameraITS: Added sensor fusion test. am: 24ec999ad4 am: 8f81d2de06 am: 340fd396ac am: 79a982544d | |
450d073 Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: a1e1caa112 | |
8682a48 am d5f8dc7b: am 276b599e: am 876ede47: CameraITS: Cleaned up and documented script to generate DNG noise model am: 78ca52bb7c am: 553c894d33 am: a7a9aaf4b3 am: 11a4265761 | |
839e505 am 59863965: am f7057b97: am 483aa0b6: CameraITS: Added OpenCV to installed module list am: 093e6b6892 am: b1dd82c2eb am: 6c0916ddb5 am: e6c08099fe | |
bfd3510 am 26e02e2a: am d05409d8: am 2f54c52b: Add "-v" to any logcat commands run from within CTS tests am: e4286de95c am: 313000556f am: b468ad7f96 am: e9f5c8525a | |
cc9d49b Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: 1fe95c4e5a | |
2721bba am bcd0e58d: am 57e5c0da: am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev am: 05b1093f71 am: fbc186de1e am: 1848b0c221 am: c9e2a31ad4 | |
4f0eaca am a4456f70: am c65bc434: am 62532688: Set a system property stating the device supports multicast. am: c0c7436030 am: 946a31cae6 am: 819e121f26 | |
61b5423 Merge branch \'marshmallow-cts-dev\' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev am: 8545b26608 am: 519137d8cd | |
d7c479d Merge branch \'marshmallow-cts-dev\' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev am: 2bee938d06 am: 324d3048f7 | |
e167f54 am 784bdd8f: am 16e8e01f: am 9610d4a3: Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev am: 65c4783bac am: 1c7f92cbb7 am: d0362b32e2 am: 660a77315b | |
27032dd Merge branch \'mnc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev am: eb803d2a4c am: a2e6d6d45e | |
d0c7dbb Merge branch 'mnc-dr-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev | |
79a9825 am 72a4d623: am 56538948: am 3673d9f0: CameraITS: Added sensor fusion test. am: 24ec999ad4 am: 8f81d2de06 am: 340fd396ac | |
530e7cd am c45414f6: am 0cd1d99f: am 46d5f094: Merge "CameraITS: allow more time for AE converge" into lmp-sprout-dev am: 173e06387f am: a7944f07a0 am: 7c90a7427a am: 54a9448a53 | |
821b117 am 26198196: am b70ba35a: am a01fb0d7: CameraITS: PDF doc updates for DNG noise model am: c0cdb36251 am: c8bf89d64e am: 0fcdbf97cf | |
5e14c0a am 50d6f79f: am af521804: am 168154f1: Merge "Camera2: skip AE compensation test on legacy devices" into lmp-sprout-dev am: 3764dcbf96 am: 5cdac69a3d am: 15542bdd93 am: 634cb9336a | |
a1e1caa Merge branch 'mnc-dr-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev | |
11a4265 am d5f8dc7b: am 276b599e: am 876ede47: CameraITS: Cleaned up and documented script to generate DNG noise model am: 78ca52bb7c am: 553c894d33 am: a7a9aaf4b3 | |
fae1d00 Merge branch \'mnc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev am: 19a1a39e1f am: 05c73da657 | |
e598e79 Merge branch \'mnc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev am: 3bbee04d2a | |
e6c0809 am 59863965: am f7057b97: am 483aa0b6: CameraITS: Added OpenCV to installed module list am: 093e6b6892 am: b1dd82c2eb am: 6c0916ddb5 | |
0089177 am df5dc917: am 04b6548f: am 61998484: Merge "CameraITS: fix manual capture request" into lmp-sprout-dev am: d22fcb615d am: 2824fe736d am: a65e489992 am: 979554443d | |
e9f5c85 am 26e02e2a: am d05409d8: am 2f54c52b: Add "-v" to any logcat commands run from within CTS tests am: e4286de95c am: 313000556f am: b468ad7f96 | |
eee5418 am e8769ba1: am 7f20f7d6: am 1b16d5ce: Don’t run RingtoneMangerTest tests on devices without audio output. am: 12dda9f3e8 am: 8f63b71dd8 am: 827ff8b623 am: 327d917385 | |
1fe95c4 Merge branch 'mnc-dr-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev | |
c9e2a31 am bcd0e58d: am 57e5c0da: am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev am: 05b1093f71 am: fbc186de1e am: 1848b0c221 | |
cb7c69d am 882ec2e4: am 436acb71: am f9e09d47: Don’t run Ringtone test if the devices without audio output. am: c36c8e2669 am: ea1587cf13 am: 9d9ff617a0 am: 6ce9e8ea1f | |
8af3f54 am bcd0e58d: am 57e5c0da: am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev am: 05b1093f71 am: fbc186de1e am: 1848b0c221 | |
bbd62fe am 6e757b83: am aa05d868: am 354ff1ba: am c059bc6f: Merge "Update Data Backup description to accommodate more devices." into lmp-dev am: 7487e81b29 am: 89dca90601 am: 4e46832fb1 am: 71341094f7 | |
e898e41 am 4b6f2421: am e442282a: am 2cd838d6: am 47a20d81: resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. automerge: f6f6d69 am: b304f03f84 am: e9f94e23b8 am: 7b76ff868d am: 391c45f385 | |
819e121 am a4456f70: am c65bc434: am 62532688: Set a system property stating the device supports multicast. am: c0c7436030 am: 946a31cae6 | |
ae10251 am 14be49bf: resolved conflicts for merge of 1cad200a to lmp-sprout-dev am: 29abecfce5 am: 9d32e93991 am: 43b2789f98 am: 4443bcd779 | |
519137d Merge branch \'marshmallow-cts-dev\' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev am: 8545b26608 | |
0a26d5f Merge branch \'mnc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev am: fc443e2421 am: 72aa893b70 | |
660a773 am 784bdd8f: am 16e8e01f: am 9610d4a3: Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev am: 65c4783bac am: 1c7f92cbb7 am: d0362b32e2 | |
72016b1 am 85ea8f35: am 498091e6: am 8c4b4833: Fix the CTS print tests. am: c107b65119 am: 35c27f873e | |
a97c93d am d8e9c16a: am 80360dc4: am e6ad305e: Merge "Skip ImageReaderDecoderTest if h.264 is not found." into lmp-sprout-dev am: e058addee9 am: c46bfea334 | |
a2e6d6d Merge branch \'mnc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev am: eb803d2a4c | |
764bcd7 am 5b92c7de: am bd93e696: am c455860c: Add processes to root WL am: 08764e7fb3 am: d8731c10b8 am: 11f9c45b36 am: 8a115c36fc | |
324d304 Merge branch \'marshmallow-cts-dev\' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev am: 2bee938d06 | |
54a9448 am c45414f6: am 0cd1d99f: am 46d5f094: Merge "CameraITS: allow more time for AE converge" into lmp-sprout-dev am: 173e06387f am: a7944f07a0 am: 7c90a7427a | |
634cb93 am 50d6f79f: am af521804: am 168154f1: Merge "Camera2: skip AE compensation test on legacy devices" into lmp-sprout-dev am: 3764dcbf96 am: 5cdac69a3d am: 15542bdd93 | |
3daee92 am 736b570b: am 5834bcf1: am 8152e304: CameraITS: Add DNG noise model test am: 148cee75a7 am: 66a638625f | |
6c7b040 am 9eb379a5: resolved conflicts for merge of 20874173 to lmp-sprout-dev am: 5e0965e587 am: fe0cadc5e8 am: 07cbdd099c am: 96faead416 | |
05c73da Merge branch \'mnc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev am: 19a1a39e1f | |
0fcdbf9 am 26198196: am b70ba35a: am a01fb0d7: CameraITS: PDF doc updates for DNG noise model am: c0cdb36251 am: c8bf89d64e | |
94e9850 am c4551f02: Merge "CameraITS: only use analog gain for RAW gain test" into lollipop-mr1-cts-dev am: f9a28b1cf6 am: 3b4cb7633a am: e3fe03a6db am: 97e68b1b9e | |
6a1bc57 am c06afd8c: am e9cf4cb5: am 74b936fb: Fix failing CTS tests. am: d51efae715 am: 59ecf8add9 am: b327f3dfa7 | |
340fd39 am 72a4d623: am 56538948: am 3673d9f0: CameraITS: Added sensor fusion test. am: 24ec999ad4 am: 8f81d2de06 | |
aa84809 am b6a2c6b1: am 63621263: am 2ae07bfd: Merge "Fixed text-to-speech tests for Android Wear. Wear devices don\'t have TTS yet, partly because they don\'t have audio-out. Once they have FEATURE_AUDIO_OUT, they will be required to support TTS." into lmp-sprout-dev am: 024449753a am: 659922931c am: badc96adf2 | |
3bbee04 Merge branch 'mnc-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev | |
a7a9aaf am d5f8dc7b: am 276b599e: am 876ede47: CameraITS: Cleaned up and documented script to generate DNG noise model am: 78ca52bb7c am: 553c894d33 | |
12ec5f3 am f00c6d17: am 9065626e: am 2914d50c: (-s ours) resolved conflicts for merge of 4992891b to klp-modular-dev am: 33773b3021 am: 3b1c9788af am: 2cc0a8134c am: 31b46dcf4c | |
56b773c am e028209f: am c2c7420c: am 336efd31: Merge "Fix various Wear media CTS failures." into lmp-sprout-dev am: e2502c1514 am: 7204d98b84 am: a6f4965920 | |
3a86847 am d5f8dc7b: am 276b599e: am 876ede47: CameraITS: Cleaned up and documented script to generate DNG noise model am: 78ca52bb7c am: 553c894d33 | |
9795544 am df5dc917: am 04b6548f: am 61998484: Merge "CameraITS: fix manual capture request" into lmp-sprout-dev am: d22fcb615d am: 2824fe736d am: a65e489992 | |
8f103a5 am 2964e8fd: am e80808a0: am d624f970: CameraITS: Correct an out-of-date doc comment in its.image. am: 1477e2ddfd am: dead6a6bf2 | |
6b3ec1d am 2cf4b1ad: am 9c2e83ea: Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lmp-dev am: 83a0daa2c8 -s ours am: 4c54f79503 -s ours am: 506e502d56 am: 6884e616a0 | |
327d917 am e8769ba1: am 7f20f7d6: am 1b16d5ce: Don’t run RingtoneMangerTest tests on devices without audio output. am: 12dda9f3e8 am: 8f63b71dd8 am: 827ff8b623 | |
6c0916d am 59863965: am f7057b97: am 483aa0b6: CameraITS: Added OpenCV to installed module list am: 093e6b6892 am: b1dd82c2eb | |
6ce9e8e am 882ec2e4: am 436acb71: am f9e09d47: Don’t run Ringtone test if the devices without audio output. am: c36c8e2669 am: ea1587cf13 am: 9d9ff617a0 | |
b468ad7 am 26e02e2a: am d05409d8: am 2f54c52b: Add "-v" to any logcat commands run from within CTS tests am: e4286de95c am: 313000556f | |
1848b0c am bcd0e58d: am 57e5c0da: am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev am: 05b1093f71 am: fbc186de1e | |
d0362b3 am 784bdd8f: am 16e8e01f: am 9610d4a3: Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev am: 65c4783bac am: 1c7f92cbb7 | |
7134109 am 6e757b83: am aa05d868: am 354ff1ba: am c059bc6f: Merge "Update Data Backup description to accommodate more devices." into lmp-dev am: 7487e81b29 am: 89dca90601 am: 4e46832fb1 | |
eb803d2 Merge branch 'mnc-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev | |
391c45f am 4b6f2421: am e442282a: am 2cd838d6: am 47a20d81: resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. automerge: f6f6d69 am: b304f03f84 am: e9f94e23b8 am: 7b76ff868d | |
7c90a74 am c45414f6: am 0cd1d99f: am 46d5f094: Merge "CameraITS: allow more time for AE converge" into lmp-sprout-dev am: 173e06387f am: a7944f07a0 | |
381744a am c45414f6: am 0cd1d99f: am 46d5f094: Merge "CameraITS: allow more time for AE converge" into lmp-sprout-dev am: 173e06387f am: a7944f07a0 | |
4443bcd am 14be49bf: resolved conflicts for merge of 1cad200a to lmp-sprout-dev am: 29abecfce5 am: 9d32e93991 am: 43b2789f98 | |
15542bd am 50d6f79f: am af521804: am 168154f1: Merge "Camera2: skip AE compensation test on legacy devices" into lmp-sprout-dev am: 3764dcbf96 am: 5cdac69a3d | |
72aa893 Merge branch \'mnc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev am: fc443e2421 | |
19a1a39 Merge branch 'mnc-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev | |
b327f3d am c06afd8c: am e9cf4cb5: am 74b936fb: Fix failing CTS tests. am: d51efae715 am: 59ecf8add9 | |
8a115c3 am 5b92c7de: am bd93e696: am c455860c: Add processes to root WL am: 08764e7fb3 am: d8731c10b8 am: 11f9c45b36 | |
8335ad0 am c06afd8c: am e9cf4cb5: am 74b936fb: Fix failing CTS tests. am: d51efae715 am: 59ecf8add9 | |
96faead am 9eb379a5: resolved conflicts for merge of 20874173 to lmp-sprout-dev am: 5e0965e587 am: fe0cadc5e8 am: 07cbdd099c | |
badc96a am b6a2c6b1: am 63621263: am 2ae07bfd: Merge "Fixed text-to-speech tests for Android Wear. Wear devices don\'t have TTS yet, partly because they don\'t have audio-out. Once they have FEATURE_AUDIO_OUT, they will be required to support TTS." into lmp-sprout-dev am: 024449753a am: 659922931c | |
97e68b1 am c4551f02: Merge "CameraITS: only use analog gain for RAW gain test" into lollipop-mr1-cts-dev am: f9a28b1cf6 am: 3b4cb7633a am: e3fe03a6db | |
a6f4965 am e028209f: am c2c7420c: am 336efd31: Merge "Fix various Wear media CTS failures." into lmp-sprout-dev am: e2502c1514 am: 7204d98b84 | |
31b46dc am f00c6d17: am 9065626e: am 2914d50c: (-s ours) resolved conflicts for merge of 4992891b to klp-modular-dev am: 33773b3021 am: 3b1c9788af am: 2cc0a8134c | |
a65e489 am df5dc917: am 04b6548f: am 61998484: Merge "CameraITS: fix manual capture request" into lmp-sprout-dev am: d22fcb615d am: 2824fe736d | |
6884e61 am 2cf4b1ad: am 9c2e83ea: Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lmp-dev am: 83a0daa2c8 -s ours am: 4c54f79503 -s ours am: 506e502d56 | |
827ff8b am e8769ba1: am 7f20f7d6: am 1b16d5ce: Don’t run RingtoneMangerTest tests on devices without audio output. am: 12dda9f3e8 am: 8f63b71dd8 | |
9d9ff61 am 882ec2e4: am 436acb71: am f9e09d47: Don’t run Ringtone test if the devices without audio output. am: c36c8e2669 am: ea1587cf13 | |
4e46832 am 6e757b83: am aa05d868: am 354ff1ba: am c059bc6f: Merge "Update Data Backup description to accommodate more devices." into lmp-dev am: 7487e81b29 am: 89dca90601 | |
7b76ff8 am 4b6f2421: am e442282a: am 2cd838d6: am 47a20d81: resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. automerge: f6f6d69 am: b304f03f84 am: e9f94e23b8 | |
43b2789 am 14be49bf: resolved conflicts for merge of 1cad200a to lmp-sprout-dev am: 29abecfce5 am: 9d32e93991 | |
fc443e2 Merge branch 'mnc-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev | |
11f9c45 am 5b92c7de: am bd93e696: am c455860c: Add processes to root WL am: 08764e7fb3 am: d8731c10b8 | |
cfb49b8 am 5b92c7de: am bd93e696: am c455860c: Add processes to root WL am: 08764e7fb3 am: d8731c10b8 | |
946a31c am a4456f70: am c65bc434: am 62532688: Set a system property stating the device supports multicast. am: c0c7436030 | |
07cbdd0 am 9eb379a5: resolved conflicts for merge of 20874173 to lmp-sprout-dev am: 5e0965e587 am: fe0cadc5e8 | |
8545b26 Merge branch 'marshmallow-cts-dev' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev | |
35c27f8 am 85ea8f35: am 498091e6: am 8c4b4833: Fix the CTS print tests. am: c107b65119 | |
d3cf1af am 85ea8f35: am 498091e6: am 8c4b4833: Fix the CTS print tests. am: c107b65119 | |
c46bfea am d8e9c16a: am 80360dc4: am e6ad305e: Merge "Skip ImageReaderDecoderTest if h.264 is not found." into lmp-sprout-dev am: e058addee9 | |
e3fe03a am c4551f02: Merge "CameraITS: only use analog gain for RAW gain test" into lollipop-mr1-cts-dev am: f9a28b1cf6 am: 3b4cb7633a | |
2bee938 Merge branch 'marshmallow-cts-dev' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev | |
66a6386 am 736b570b: am 5834bcf1: am 8152e304: CameraITS: Add DNG noise model test am: 148cee75a7 | |
b7271ec am 736b570b: am 5834bcf1: am 8152e304: CameraITS: Add DNG noise model test am: 148cee75a7 | |
c8bf89d am 26198196: am b70ba35a: am a01fb0d7: CameraITS: PDF doc updates for DNG noise model am: c0cdb36251 | |
2cc0a81 am f00c6d17: am 9065626e: am 2914d50c: (-s ours) resolved conflicts for merge of 4992891b to klp-modular-dev am: 33773b3021 am: 3b1c9788af | |
8f81d2d am 72a4d623: am 56538948: am 3673d9f0: CameraITS: Added sensor fusion test. am: 24ec999ad4 | |
553c894 am d5f8dc7b: am 276b599e: am 876ede47: CameraITS: Cleaned up and documented script to generate DNG noise model am: 78ca52bb7c | |
dead6a6 am 2964e8fd: am e80808a0: am d624f970: CameraITS: Correct an out-of-date doc comment in its.image. am: 1477e2ddfd | |
506e502 am 2cf4b1ad: am 9c2e83ea: Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lmp-dev am: 83a0daa2c8 -s ours am: 4c54f79503 -s ours | |
b1dd82c am 59863965: am f7057b97: am 483aa0b6: CameraITS: Added OpenCV to installed module list am: 093e6b6892 | |
3130005 am 26e02e2a: am d05409d8: am 2f54c52b: Add "-v" to any logcat commands run from within CTS tests am: e4286de95c | |
fbc186d am bcd0e58d: am 57e5c0da: am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev am: 05b1093f71 | |
0d3c79d am b5d78746: am c5f65324: am c2cef921: Added Clear, View, and Export actions to main list for activity windows without Action Bar feature. am: 3cb7cae009 | |
1c7f92c am 784bdd8f: am 16e8e01f: am 9610d4a3: Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev am: 65c4783bac | |
a7944f0 am c45414f6: am 0cd1d99f: am 46d5f094: Merge "CameraITS: allow more time for AE converge" into lmp-sprout-dev am: 173e06387f | |
5cdac69 am 50d6f79f: am af521804: am 168154f1: Merge "Camera2: skip AE compensation test on legacy devices" into lmp-sprout-dev am: 3764dcbf96 | |
0c78e28 am 0dd22c5f: am 7c95df2b: am 4c4f07d9: Camera2: add static metadata collection am: 1e65d1c4c9 | |
59ecf8a am c06afd8c: am e9cf4cb5: am 74b936fb: Fix failing CTS tests. am: d51efae715 | |
6599229 am b6a2c6b1: am 63621263: am 2ae07bfd: Merge "Fixed text-to-speech tests for Android Wear. Wear devices don\'t have TTS yet, partly because they don\'t have audio-out. Once they have FEATURE_AUDIO_OUT, they will be required to support TTS." into lmp-sprout-dev am: 024449753a | |
7204d98 am e028209f: am c2c7420c: am 336efd31: Merge "Fix various Wear media CTS failures." into lmp-sprout-dev am: e2502c1514 | |
2824fe7 am df5dc917: am 04b6548f: am 61998484: Merge "CameraITS: fix manual capture request" into lmp-sprout-dev am: d22fcb615d | |
8f63b71 am e8769ba1: am 7f20f7d6: am 1b16d5ce: Don’t run RingtoneMangerTest tests on devices without audio output. am: 12dda9f3e8 | |
ea1587c am 882ec2e4: am 436acb71: am f9e09d47: Don’t run Ringtone test if the devices without audio output. am: c36c8e2669 | |
89dca90 am 6e757b83: am aa05d868: am 354ff1ba: am c059bc6f: Merge "Update Data Backup description to accommodate more devices." into lmp-dev am: 7487e81b29 | |
56ba7d8 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours | |
e9f94e2 am 4b6f2421: am e442282a: am 2cd838d6: am 47a20d81: resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. automerge: f6f6d69 am: b304f03f84 | |
584cdc7 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 | |
9d32e93 am 14be49bf: resolved conflicts for merge of 1cad200a to lmp-sprout-dev am: 29abecfce5 | |
53405b5 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours | |
d8731c1 am 5b92c7de: am bd93e696: am c455860c: Add processes to root WL am: 08764e7fb3 | |
0318e27 Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev am: 71c0d24172 | |
fe0cadc am 9eb379a5: resolved conflicts for merge of 20874173 to lmp-sprout-dev am: 5e0965e587 | |
391c958 Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev am: 983ea5225a | |
3b4cb76 am c4551f02: Merge "CameraITS: only use analog gain for RAW gain test" into lollipop-mr1-cts-dev am: f9a28b1cf6 | |
3b1c978 am f00c6d17: am 9065626e: am 2914d50c: (-s ours) resolved conflicts for merge of 4992891b to klp-modular-dev am: 33773b3021 | |
ef4c045 Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev am: 5555241f1e | |
219af39 Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev am: 62c2e665a0 | |
62ef32f Merge "DO NOT MERGE Capture fields in CTS:" into kitkat-cts-dev am: ecd778f841 -s ours | |
4c54f79 am 2cf4b1ad: am 9c2e83ea: Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lmp-dev am: 83a0daa2c8 -s ours | |
bdb8f99 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 am: cb3a4ff072 am: 3c5db1ebb5 am: 36dd8b7c0b -s ours am: 539f4224b5 am: 650f5461a3 | |
650f546 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 am: cb3a4ff072 am: 3c5db1ebb5 am: 36dd8b7c0b -s ours am: 539f4224b5 | |
539f422 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 am: cb3a4ff072 am: 3c5db1ebb5 am: 36dd8b7c0b -s ours | |
36dd8b7 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 am: cb3a4ff072 am: 3c5db1ebb5 | |
3c5db1e Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 am: cb3a4ff072 | |
cb3a4ff Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 | |
c9eb5be Merge "Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding."" into mnc-dr-dev am: a03b088227 | |
a03b088 Merge "Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding."" into mnc-dr-dev | |
445ebd9 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 am: e2a79f622f am: a58f7e6a73 -s ours am: befad72b95 am: 85fc50c1f6 am: a355c51355 am: 224384ae06 am: 410eddc547 | |
410eddc Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 am: e2a79f622f am: a58f7e6a73 -s ours am: befad72b95 am: 85fc50c1f6 am: a355c51355 am: 224384ae06 | |
224384a Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 am: e2a79f622f am: a58f7e6a73 -s ours am: befad72b95 am: 85fc50c1f6 am: a355c51355 | |
a355c51 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 am: e2a79f622f am: a58f7e6a73 -s ours am: befad72b95 am: 85fc50c1f6 | |
85fc50c Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 am: e2a79f622f am: a58f7e6a73 -s ours am: befad72b95 | |
befad72 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 am: e2a79f622f am: a58f7e6a73 -s ours | |
a58f7e6 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 am: e2a79f622f | |
e2a79f6 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 | |
d941d32 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev | |
cdc1a02 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: f8db80ea9e am: 72733de4c2 -s ours am: 324e7aff0b am: 3bfce70ec8 am: 930dcf490c -s ours am: 37dabf9e9c am: 82d9da35ea | |
82d9da3 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: f8db80ea9e am: 72733de4c2 -s ours am: 324e7aff0b am: 3bfce70ec8 am: 930dcf490c -s ours am: 37dabf9e9c | |
37dabf9 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: f8db80ea9e am: 72733de4c2 -s ours am: 324e7aff0b am: 3bfce70ec8 am: 930dcf490c -s ours | |
44c49bc CTS fix: match test to CDD memory requirements | |
930dcf4 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: f8db80ea9e am: 72733de4c2 -s ours am: 324e7aff0b am: 3bfce70ec8 | |
3bfce70 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: f8db80ea9e am: 72733de4c2 -s ours am: 324e7aff0b | |
324e7af Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: f8db80ea9e am: 72733de4c2 -s ours | |
72733de Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: f8db80ea9e | |
f8db80e Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours | |
ffd10c4 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev | |
3a15653 DO NOT MERGE: Revert "Camera: cross check camera2 features" | |
820440b DO NOT MERGE: CameraITS: relax test_blackwhite threshold | |
b0c1112 Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding." | |
e748004 MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 am: eb798f8c61 am: d669482441 am: 84e397df30 am: 9297ae8d00 am: afe30f1801 am: a44d029c4b am: 095321cdcb am: 98f352f2e6 am: 0f2c94b5e0 | |
0f2c94b MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 am: eb798f8c61 am: d669482441 am: 84e397df30 am: 9297ae8d00 am: afe30f1801 am: a44d029c4b am: 095321cdcb am: 98f352f2e6 | |
13b0107 Merge "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures" into marshmallow-cts-dev am: cc7738ed56 am: 5c38f2f97c am: fac47328e8 | |
98f352f MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 am: eb798f8c61 am: d669482441 am: 84e397df30 am: 9297ae8d00 am: afe30f1801 am: a44d029c4b am: 095321cdcb | |
32d6851 Merge "fix failure line handling for VideEncoderDecoderTest." into marshmallow-cts-dev am: 93a62f44b7 am: 6fe8595ce5 am: b472e33b4d | |
d7e3773 Merge "Enable SPEAKERPHONE CTS tests." into marshmallow-cts-dev am: 28490ac2b8 am: f6cb5e778a am: 94452f256a | |
085d6bc Merge "Reduce EGLCleanup test iterations" into marshmallow-cts-dev am: 55449c5b67 am: 28547fcf48 am: 2639191084 | |
920cf4a Merge "Make copy_media.sh POSIX compatible" into marshmallow-cts-dev am: 4d8a2820cc am: 2872f85e03 am: 16ef035a62 | |
38d3254 Merge "Enable test of events occuring after AudioRecord.stop" into marshmallow-cts-dev am: 977b792416 am: 42bb01df12 am: b567243ed6 | |
a927cb8 Merge "Fix timestamps sort in UiAutomationTest.testWindowContentFrameStats" into marshmallow-cts-dev am: 7e2024b3a3 am: 45693f41ea am: 052a8b5248 | |
df0b3ee Merge "Fix report latency overflow in DeviceSuspendTest" into marshmallow-cts-dev am: 5593c07d82 am: a0a7aa520c am: 0202eb1a55 | |
8fb3b6d Merge "Reduce CTS audio requirements for low memory devices" into marshmallow-cts-dev am: 97b1eaec60 am: f4d997fb68 am: 2ff04bc836 | |
fac4732 Merge "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures" into marshmallow-cts-dev am: cc7738ed56 am: 5c38f2f97c | |
095321c MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 am: eb798f8c61 am: d669482441 am: 84e397df30 am: 9297ae8d00 am: afe30f1801 am: a44d029c4b | |
b472e33 Merge "fix failure line handling for VideEncoderDecoderTest." into marshmallow-cts-dev am: 93a62f44b7 am: 6fe8595ce5 | |
94452f2 Merge "Enable SPEAKERPHONE CTS tests." into marshmallow-cts-dev am: 28490ac2b8 am: f6cb5e778a | |
2639191 Merge "Reduce EGLCleanup test iterations" into marshmallow-cts-dev am: 55449c5b67 am: 28547fcf48 | |
16ef035 Merge "Make copy_media.sh POSIX compatible" into marshmallow-cts-dev am: 4d8a2820cc am: 2872f85e03 | |
b567243 Merge "Enable test of events occuring after AudioRecord.stop" into marshmallow-cts-dev am: 977b792416 am: 42bb01df12 | |
052a8b5 Merge "Fix timestamps sort in UiAutomationTest.testWindowContentFrameStats" into marshmallow-cts-dev am: 7e2024b3a3 am: 45693f41ea | |
0202eb1 Merge "Fix report latency overflow in DeviceSuspendTest" into marshmallow-cts-dev am: 5593c07d82 am: a0a7aa520c | |
5c38f2f Merge "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures" into marshmallow-cts-dev am: cc7738ed56 | |
2ff04bc Merge "Reduce CTS audio requirements for low memory devices" into marshmallow-cts-dev am: 97b1eaec60 am: f4d997fb68 | |
a44d029 MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 am: eb798f8c61 am: d669482441 am: 84e397df30 am: 9297ae8d00 am: afe30f1801 | |
6fe8595 Merge "fix failure line handling for VideEncoderDecoderTest." into marshmallow-cts-dev am: 93a62f44b7 | |
f6cb5e7 Merge "Enable SPEAKERPHONE CTS tests." into marshmallow-cts-dev am: 28490ac2b8 | |
28547fc Merge "Reduce EGLCleanup test iterations" into marshmallow-cts-dev am: 55449c5b67 | |
2872f85 Merge "Make copy_media.sh POSIX compatible" into marshmallow-cts-dev am: 4d8a2820cc | |
42bb01d Merge "Enable test of events occuring after AudioRecord.stop" into marshmallow-cts-dev am: 977b792416 | |
45693f4 Merge "Fix timestamps sort in UiAutomationTest.testWindowContentFrameStats" into marshmallow-cts-dev am: 7e2024b3a3 | |
a0a7aa5 Merge "Fix report latency overflow in DeviceSuspendTest" into marshmallow-cts-dev am: 5593c07d82 | |
f4d997f Merge "Reduce CTS audio requirements for low memory devices" into marshmallow-cts-dev am: 97b1eaec60 | |
afe30f1 MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 am: eb798f8c61 am: d669482441 am: 84e397df30 am: 9297ae8d00 | |
cc7738e Merge "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures" into marshmallow-cts-dev | |
93a62f4 Merge "fix failure line handling for VideEncoderDecoderTest." into marshmallow-cts-dev | |
28490ac Merge "Enable SPEAKERPHONE CTS tests." into marshmallow-cts-dev | |
55449c5 Merge "Reduce EGLCleanup test iterations" into marshmallow-cts-dev | |
4d8a282 Merge "Make copy_media.sh POSIX compatible" into marshmallow-cts-dev | |
9297ae8 MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 am: eb798f8c61 am: d669482441 am: 84e397df30 | |
977b792 Merge "Enable test of events occuring after AudioRecord.stop" into marshmallow-cts-dev | |
7e2024b Merge "Fix timestamps sort in UiAutomationTest.testWindowContentFrameStats" into marshmallow-cts-dev | |
5593c07 Merge "Fix report latency overflow in DeviceSuspendTest" into marshmallow-cts-dev | |
d4444ac Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev | |
97b1eae Merge "Reduce CTS audio requirements for low memory devices" into marshmallow-cts-dev | |
84e397d MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 am: eb798f8c61 am: d669482441 | |
d669482 MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 am: eb798f8c61 | |
eb798f8 MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 | |
8327555 MediaMetadataRetrieverTest: remove unused import to fix compile error. | |
8131514 Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 am: e186732d3c am: 8d92d809ae am: 7e058bde18 am: b8d2096fbc am: e6e8987d67 am: bf1d44f3c8 am: e006c2bb6b am: 464942ae00 am: 41c305b598 | |
41c305b Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 am: e186732d3c am: 8d92d809ae am: 7e058bde18 am: b8d2096fbc am: e6e8987d67 am: bf1d44f3c8 am: e006c2bb6b am: 464942ae00 | |
464942a Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 am: e186732d3c am: 8d92d809ae am: 7e058bde18 am: b8d2096fbc am: e6e8987d67 am: bf1d44f3c8 am: e006c2bb6b | |
e006c2b Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 am: e186732d3c am: 8d92d809ae am: 7e058bde18 am: b8d2096fbc am: e6e8987d67 am: bf1d44f3c8 | |
bf1d44f Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 am: e186732d3c am: 8d92d809ae am: 7e058bde18 am: b8d2096fbc am: e6e8987d67 | |
e6e8987 Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 am: e186732d3c am: 8d92d809ae am: 7e058bde18 am: b8d2096fbc | |
0d059db Update full alarm test requirements | |
b8d2096 Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 am: e186732d3c am: 8d92d809ae am: 7e058bde18 | |
77e73de Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev am: d7fbebc695 -s ours am: d9f7da15c8 am: 4178f44fe7 | |
7e058bd Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 am: e186732d3c am: 8d92d809ae | |
4178f44 Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev am: d7fbebc695 -s ours am: d9f7da15c8 | |
8d92d80 Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 am: e186732d3c | |
d9f7da1 Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev am: d7fbebc695 -s ours | |
e186732 Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 | |
d7fbebc Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev | |
dbbf638 Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev | |
5d1d8d0 DO NOT MERGE - MediaServerCrashTest: add testDrmManagerClientReset. am: 0612101597 am: 8cedf07200 -s ours am: 4480afc2e7 am: 84df684b28 am: 56e4e8b52a -s ours am: ae9375f5da am: 90f1ebdbb7 | |
90f1ebd DO NOT MERGE - MediaServerCrashTest: add testDrmManagerClientReset. am: 0612101597 am: 8cedf07200 -s ours am: 4480afc2e7 am: 84df684b28 am: 56e4e8b52a -s ours am: ae9375f5da | |
ae9375f DO NOT MERGE - MediaServerCrashTest: add testDrmManagerClientReset. am: 0612101597 am: 8cedf07200 -s ours am: 4480afc2e7 am: 84df684b28 am: 56e4e8b52a -s ours | |
56e4e8b DO NOT MERGE - MediaServerCrashTest: add testDrmManagerClientReset. am: 0612101597 am: 8cedf07200 -s ours am: 4480afc2e7 am: 84df684b28 | |
84df684 DO NOT MERGE - MediaServerCrashTest: add testDrmManagerClientReset. am: 0612101597 am: 8cedf07200 -s ours am: 4480afc2e7 | |
dbc0594 MediaServerCrashTest: add testDrmManagerClientReset. am: a74beb1a12 am: 9841ef744f | |
4480afc DO NOT MERGE - MediaServerCrashTest: add testDrmManagerClientReset. am: 0612101597 am: 8cedf07200 -s ours | |
9841ef7 MediaServerCrashTest: add testDrmManagerClientReset. am: a74beb1a12 | |
8cedf07 DO NOT MERGE - MediaServerCrashTest: add testDrmManagerClientReset. am: 0612101597 | |
0612101 DO NOT MERGE - MediaServerCrashTest: add testDrmManagerClientReset. | |
a74beb1 MediaServerCrashTest: add testDrmManagerClientReset. | |
ae6c3cc Merge "Camera: create camera test package" into marshmallow-cts-dev am: aa8fbe2018 am: af8c6a3023 am: d1253c74d3 | |
d1253c7 Merge "Camera: create camera test package" into marshmallow-cts-dev am: aa8fbe2018 am: af8c6a3023 | |
af8c6a3 Merge "Camera: create camera test package" into marshmallow-cts-dev am: aa8fbe2018 | |
aa8fbe2 Merge "Camera: create camera test package" into marshmallow-cts-dev | |
404bbc3 Reduce CTS audio requirements for low memory devices | |
2a5a0cb Merge "Do not test AudioPlayback if system doesn\'t have audio out" into marshmallow-cts-dev am: 90d0d52c04 am: 398724c523 am: eae5a58ffb | |
eae5a58 Merge "Do not test AudioPlayback if system doesn\'t have audio out" into marshmallow-cts-dev am: 90d0d52c04 am: 398724c523 | |
398724c Merge "Do not test AudioPlayback if system doesn\'t have audio out" into marshmallow-cts-dev am: 90d0d52c04 | |
90d0d52 Merge "Do not test AudioPlayback if system doesn't have audio out" into marshmallow-cts-dev | |
aec67ad Do not test AudioPlayback if system doesn't have audio out | |
3e37c36 Merge "Camera: remove FREEFORM cropping check for FULL device" into marshmallow-cts-dev am: 1581976913 am: dd14acb21c am: 95b3a8a610 | |
95b3a8a Merge "Camera: remove FREEFORM cropping check for FULL device" into marshmallow-cts-dev am: 1581976913 am: dd14acb21c | |
dd14acb Merge "Camera: remove FREEFORM cropping check for FULL device" into marshmallow-cts-dev am: 1581976913 | |
1581976 Merge "Camera: remove FREEFORM cropping check for FULL device" into marshmallow-cts-dev | |
b87aabb Merge "Enforce the valid range of psc, pci and lac/cid for primary cells." into marshmallow-cts-dev am: 492e4f4938 am: 35f3f86955 am: f22107e885 | |
f22107e Merge "Enforce the valid range of psc, pci and lac/cid for primary cells." into marshmallow-cts-dev am: 492e4f4938 am: 35f3f86955 | |
a387152 Merge "SensorBatching Test Fixes" into marshmallow-cts-dev am: f3b0e41117 am: 65c8c0289d am: 109447ce2d | |
109447c Merge "SensorBatching Test Fixes" into marshmallow-cts-dev am: f3b0e41117 am: 65c8c0289d | |
35f3f86 Merge "Enforce the valid range of psc, pci and lac/cid for primary cells." into marshmallow-cts-dev am: 492e4f4938 | |
65c8c02 Merge "SensorBatching Test Fixes" into marshmallow-cts-dev am: f3b0e41117 | |
492e4f4 Merge "Enforce the valid range of psc, pci and lac/cid for primary cells." into marshmallow-cts-dev | |
f3b0e41 Merge "SensorBatching Test Fixes" into marshmallow-cts-dev | |
96f4d40 Camera: create camera test package | |
bb7fb44 Fix timestamps sort in UiAutomationTest.testWindowContentFrameStats | |
21a8bd6 Fix for testBadSurfaceDimensions | |
f0f730c Enforce the valid range of psc, pci and lac/cid for primary cells. | |
f11d358 Merge "DO NOT MERGE: Revert "Add build number into CTS Verifier."" into marshmallow-cts-dev am: 27425c8e96 -s ours am: a4bb6d45e3 am: 18cca1fde1 | |
18cca1f Merge "DO NOT MERGE: Revert "Add build number into CTS Verifier."" into marshmallow-cts-dev am: 27425c8e96 -s ours am: a4bb6d45e3 | |
a4bb6d4 Merge "DO NOT MERGE: Revert "Add build number into CTS Verifier."" into marshmallow-cts-dev am: 27425c8e96 -s ours | |
27425c8 Merge "DO NOT MERGE: Revert "Add build number into CTS Verifier."" into marshmallow-cts-dev | |
aba8142 DO NOT MERGE: Revert "Add build number into CTS Verifier." | |
e9c6c7a Merge "Add new keyguard disable features tests for primary profile to CTS Verifier" into marshmallow-cts-dev am: 5ccc5c2d52 am: 629986b283 am: 6fbcdba3dc | |
6fbcdba Merge "Add new keyguard disable features tests for primary profile to CTS Verifier" into marshmallow-cts-dev am: 5ccc5c2d52 am: 629986b283 | |
629986b Merge "Add new keyguard disable features tests for primary profile to CTS Verifier" into marshmallow-cts-dev am: 5ccc5c2d52 | |
5ccc5c2 Merge "Add new keyguard disable features tests for primary profile to CTS Verifier" into marshmallow-cts-dev | |
f0c7308 Merge "Camera: read exposure value range if possible" into marshmallow-cts-dev am: 1b542eab39 am: 9ea3cb8007 am: f03f756343 | |
f03f756 Merge "Camera: read exposure value range if possible" into marshmallow-cts-dev am: 1b542eab39 am: 9ea3cb8007 | |
9ea3cb8 Merge "Camera: read exposure value range if possible" into marshmallow-cts-dev am: 1b542eab39 | |
5d56ac4 Merge "Increase timeout for gtest runs." into marshmallow-cts-dev am: 5be25df345 am: bbb8a41787 am: 289a772b9c | |
289a772 Merge "Increase timeout for gtest runs." into marshmallow-cts-dev am: 5be25df345 am: bbb8a41787 | |
1b542ea Merge "Camera: read exposure value range if possible" into marshmallow-cts-dev | |
bbb8a41 Merge "Increase timeout for gtest runs." into marshmallow-cts-dev am: 5be25df345 | |
5be25df Merge "Increase timeout for gtest runs." into marshmallow-cts-dev | |
9fa97c2 Add new keyguard disable features tests for primary profile to CTS Verifier | |
8f00a7e Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 9a3f7b9230 am: 5768d3249b am: e09abc059d am: db2400fc07 am: 7c33c16114 -s ours am: 66686dbb43 am: eb69339260 | |
eb69339 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 9a3f7b9230 am: 5768d3249b am: e09abc059d am: db2400fc07 am: 7c33c16114 -s ours am: 66686dbb43 | |
66686db Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 9a3f7b9230 am: 5768d3249b am: e09abc059d am: db2400fc07 am: 7c33c16114 -s ours | |
1e44c21 SensorBatching Test Fixes | |
7c33c16 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 9a3f7b9230 am: 5768d3249b am: e09abc059d am: db2400fc07 | |
db2400f Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 9a3f7b9230 am: 5768d3249b am: e09abc059d | |
e09abc0 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 9a3f7b9230 am: 5768d3249b | |
5768d32 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 9a3f7b9230 | |
9a3f7b9 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 | |
3f879d9 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev | |
e436b1b Merge "Add fingerprint feature to cts verifier app" into marshmallow-cts-dev am: d1b93e3750 am: 47557c524d am: b73ee83085 | |
b73ee83 Merge "Add fingerprint feature to cts verifier app" into marshmallow-cts-dev am: d1b93e3750 am: 47557c524d | |
47557c5 Merge "Add fingerprint feature to cts verifier app" into marshmallow-cts-dev am: d1b93e3750 | |
d1b93e3 Merge "Add fingerprint feature to cts verifier app" into marshmallow-cts-dev | |
fc56b9b Add fingerprint feature to cts verifier app | |
83d1ba8 Merge "Remove cts-verifier tests for two intents." into marshmallow-cts-dev am: ea02935362 am: f60cffa984 am: b782734098 | |
b782734 Merge "Remove cts-verifier tests for two intents." into marshmallow-cts-dev am: ea02935362 am: f60cffa984 | |
247c3de Merge "Fix for Job Scheduler Charging test case" into marshmallow-cts-dev am: f127404330 am: 3231b4ca1c am: 627d1faff1 | |
f60cffa Merge "Remove cts-verifier tests for two intents." into marshmallow-cts-dev am: ea02935362 | |
627d1fa Merge "Fix for Job Scheduler Charging test case" into marshmallow-cts-dev am: f127404330 am: 3231b4ca1c | |
ea02935 Merge "Remove cts-verifier tests for two intents." into marshmallow-cts-dev | |
3231b4c Merge "Fix for Job Scheduler Charging test case" into marshmallow-cts-dev am: f127404330 | |
f127404 Merge "Fix for Job Scheduler Charging test case" into marshmallow-cts-dev | |
b3a7431 Remove cts-verifier tests for two intents. | |
54064cf Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 am: 8a017dc88a am: 8575f8995d am: b2de036e3b am: a4f15c619b | |
a4f15c6 Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 am: 8a017dc88a am: 8575f8995d am: b2de036e3b | |
b2de036 Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 am: 8a017dc88a am: 8575f8995d | |
8575f89 Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 am: 8a017dc88a | |
8a017dc Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 | |
e0cf4c2 Merge "Media tests should use redirector.gvt1.com" into marshmallow-cts-dev am: 11932dad29 am: 9be7520e64 am: 21692b5ff0 | |
7410ffb Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 | |
21692b5 Merge "Media tests should use redirector.gvt1.com" into marshmallow-cts-dev am: 11932dad29 am: 9be7520e64 | |
3d9381b Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev | |
9be7520 Merge "Media tests should use redirector.gvt1.com" into marshmallow-cts-dev am: 11932dad29 | |
11932da Merge "Media tests should use redirector.gvt1.com" into marshmallow-cts-dev | |
ee509b7 DO NOT MERGE CTS device-side preconditions for MNC | |
884b5c7 Merge "Fix testSetPreviewTextureBothCallbacks wait timeout" into marshmallow-cts-dev am: ceff2940f4 am: efb60623a2 am: 1287e36c8d | |
1287e36 Merge "Fix testSetPreviewTextureBothCallbacks wait timeout" into marshmallow-cts-dev am: ceff2940f4 am: efb60623a2 | |
efb6062 Merge "Fix testSetPreviewTextureBothCallbacks wait timeout" into marshmallow-cts-dev am: ceff2940f4 | |
ceff294 Merge "Fix testSetPreviewTextureBothCallbacks wait timeout" into marshmallow-cts-dev | |
0e31d66 Camera: read exposure value range if possible | |
b1adf9e Make sure the next case started after previous case finished | |
2c4b976 Merge "Selectively delete files from the sdcard" into marshmallow-cts-dev am: 2a2c06e583 am: b69e36ace5 am: 917d65495b | |
917d654 Merge "Selectively delete files from the sdcard" into marshmallow-cts-dev am: 2a2c06e583 am: b69e36ace5 | |
b69e36a Merge "Selectively delete files from the sdcard" into marshmallow-cts-dev am: 2a2c06e583 | |
2a2c06e Merge "Selectively delete files from the sdcard" into marshmallow-cts-dev | |
e0d1f82 Merge "Add FileSystemPermissionTest exception for /dev/dri/renderD129." into marshmallow-cts-dev am: dcd7934387 am: 147d9b83c7 am: a147433f43 | |
a147433 Merge "Add FileSystemPermissionTest exception for /dev/dri/renderD129." into marshmallow-cts-dev am: dcd7934387 am: 147d9b83c7 | |
147d9b8 Merge "Add FileSystemPermissionTest exception for /dev/dri/renderD129." into marshmallow-cts-dev am: dcd7934387 | |
dcd7934 Merge "Add FileSystemPermissionTest exception for /dev/dri/renderD129." into marshmallow-cts-dev | |
442a181 Selectively delete files from the sdcard | |
0ea4882 Increase timeout for gtest runs. | |
8c2b1d6 Bump CTS 6.0R3 for Security Releases. am: 15dbbfab8b am: 6dd6876fee | |
6dd6876 Bump CTS 6.0R3 for Security Releases. am: 15dbbfab8b | |
15dbbfa Bump CTS 6.0R3 for Security Releases. | |
4d7146e Revert "Add build number into CTS Verifier." am: dd58e481b0 am: 4175e96920 | |
4175e96 Revert "Add build number into CTS Verifier." am: dd58e481b0 | |
dd58e48 Revert "Add build number into CTS Verifier." | |
aaf61c0 Make copy_media.sh POSIX compatible | |
3dbab59 Merge "CTS: PO tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: 865c2f206b am: e1c3b60895 am: cdeb73f30b | |
cdeb73f Merge "CTS: PO tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: 865c2f206b am: e1c3b60895 | |
e1c3b60 Merge "CTS: PO tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: 865c2f206b | |
865c2f2 Merge "CTS: PO tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev | |
cc728ce CTS: PO tests for DISALLOW_CONFIG_VPN | |
1f317db Merge "Revert "Revert "CTS: Tests for DISALLOW_CONFIG_VPN""" into marshmallow-cts-dev am: a928b53b06 am: aa03ed198b am: 1e3c356762 | |
1e3c356 Merge "Revert "Revert "CTS: Tests for DISALLOW_CONFIG_VPN""" into marshmallow-cts-dev am: a928b53b06 am: aa03ed198b | |
aa03ed1 Merge "Revert "Revert "CTS: Tests for DISALLOW_CONFIG_VPN""" into marshmallow-cts-dev am: a928b53b06 | |
a928b53 Merge "Revert "Revert "CTS: Tests for DISALLOW_CONFIG_VPN""" into marshmallow-cts-dev | |
c0ffa1f Media tests should use redirector.gvt1.com | |
e07a0bb Merge commit \'845e32c6c1d3ec2d4fcdc08ad6e4e49663ec7018\' into manual_merge_845e32c6c1 am: fdc22a795d am: 7069f77c95 | |
7069f77 Merge commit \'845e32c6c1d3ec2d4fcdc08ad6e4e49663ec7018\' into manual_merge_845e32c6c1 am: fdc22a795d | |
fdc22a7 Merge commit '845e32c6c1d3ec2d4fcdc08ad6e4e49663ec7018' into manual_merge_845e32c6c1 | |
b0668ac Merge "Revert "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices"" into marshmallow-cts-dev am: 3d84f4f5e2 -s ours am: 4e88667cce am: a9036d5973 | |
a9036d5 Merge "Revert "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices"" into marshmallow-cts-dev am: 3d84f4f5e2 -s ours am: 4e88667cce | |
4e88667 Merge "Revert "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices"" into marshmallow-cts-dev am: 3d84f4f5e2 -s ours | |
845e32c Merge "Fixed CtsVerifier version" into marshmallow-cts-dev | |
26f8a4d Fixed CtsVerifier version | |
3d84f4f Merge "Revert "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices"" into marshmallow-cts-dev | |
d7cad88 Revert "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices" | |
2c43901 Fix for Job Scheduler Charging test case | |
27a695a Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274 am: b2561e7cf4 am: c16242429e am: dee2733f7d am: a700c60aa2 | |
a700c60 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274 am: b2561e7cf4 am: c16242429e am: dee2733f7d | |
dee2733 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274 am: b2561e7cf4 am: c16242429e | |
c162424 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274 am: b2561e7cf4 | |
b2561e7 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274 | |
7712881 Revert "Revert "CTS: Tests for DISALLOW_CONFIG_VPN"" | |
55fed42 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
43d398f Merge "Revert "CTS: Tests for DISALLOW_CONFIG_VPN"" into marshmallow-cts-dev am: 67d39dc603 am: eed7e988cd am: 7b0e0d9871 | |
7b0e0d9 Merge "Revert "CTS: Tests for DISALLOW_CONFIG_VPN"" into marshmallow-cts-dev am: 67d39dc603 am: eed7e988cd | |
eed7e98 Merge "Revert "CTS: Tests for DISALLOW_CONFIG_VPN"" into marshmallow-cts-dev am: 67d39dc603 | |
67d39dc Merge "Revert "CTS: Tests for DISALLOW_CONFIG_VPN"" into marshmallow-cts-dev | |
c300031 Revert "CTS: Tests for DISALLOW_CONFIG_VPN" | |
96bb88c Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 | |
a9abb91 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e | |
34fdae0 Merge "DO NOT MERGE media: add mpeg4 qcif test to VideoDecoderPerfTest." into marshmallow-cts-dev am: d9efe7ad69 -s ours am: 1295860cc4 am: 108a509683 | |
31d78d1 Merge "Adjust telecom setup timeout values to be more generous" into marshmallow-cts-dev am: 113e063967 am: 634f4bb07a am: c79ac4591a | |
de142dc Merge "CTS Verifier fix latency estimation for Loopback test" into marshmallow-cts-dev am: 90a18e9974 am: 9b8e0bc99d am: 738d64f6c7 | |
15b5ed3 Merge "media: DecoderTest: make sure we call AudioTrack.stop()" into marshmallow-cts-dev am: c600e14564 am: 92c77216ca am: d63af2521f | |
4fa1349 Merge "Add FileSystemPermissionTest exception for DRM-based GPU drivers." into marshmallow-cts-dev am: 153d57e312 am: 812739b3ed am: d458df54f5 | |
89b4dc5 Merge "Skip assist CTS tests on low ram devices" into marshmallow-cts-dev am: b8a3542cb6 am: 346f603555 am: ff8586ecb9 | |
d919f32 Merge "CTS: Tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: 668b86b642 am: afed23029b am: e15411fef7 | |
a2205ad Merge "Runtime hint for android.adminhostside CTS test" into marshmallow-cts-dev am: 2ea49fcb72 am: 6e428d5944 am: c973aeebf0 | |
98f8f0c Merge "Fix the issue in testCalculateLength" into marshmallow-cts-dev am: 842dc6f9a1 am: cbcdf86bcd am: cdbd5e403a | |
e0e7ff9 Merge "Camera: skip unsupported stream combination" into marshmallow-cts-dev am: fd3744e698 am: 837d080baa am: 11d0034659 | |
d70a19c Merge "Update 320dpi & 360dpi small/normal memory requirements" into marshmallow-cts-dev am: 9dcf6c22c6 am: 9ab687bbb8 am: 21a1f5f01c | |
27e6994 Merge "camera2: Clean up render script context" into marshmallow-cts-dev am: 6339786e6d am: 154a2bf8f1 am: e6f37514e6 | |
c364190 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d | |
02d7925 Merge "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices" into marshmallow-cts-dev am: fc3bb206d4 -s ours am: f8257b2be8 am: dd50ade04f | |
c9e7daa Merge "Use FLAG_RECEIVER_FOREGROUND for ordered broadcasts" into marshmallow-cts-dev am: 4f0c862eba am: 6d7f541688 am: 0c670b405f | |
7554d20 Merge "media: Add volatile to mThreadStarted to make sure the thread can stop properly." into marshmallow-cts-dev am: b358cbfe8b am: 62310b9918 am: c5139d9b7b | |
b12c17c Merge "Fix timeout for testCanInstallValidRsaKeypair in hostsidetests" into marshmallow-cts-dev am: 7f1cd78501 am: e026066b3a am: 5965676a42 | |
bc4c71c Merge "Refactoring the updatePassButton methods" into marshmallow-cts-dev am: 0fb4da0212 am: d284431258 am: 5f4766704c | |
1477367 Merge "Added location tests for BYOD in cts-verfier." into marshmallow-cts-dev am: d9d90a75d9 am: 890b0dd13d am: f171422333 | |
a29f02c Merge "Fix android.os.cts.SeccompTest#testKernelBasicTests under Android Native Bridge." into marshmallow-cts-dev am: b10d15a525 am: bca1c46872 am: 8be5d4edc0 | |
c9261fa Merge "EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer" into marshmallow-cts-dev am: 6b33b0add8 am: 5a854f3083 am: 70e20db093 | |
108a509 Merge "DO NOT MERGE media: add mpeg4 qcif test to VideoDecoderPerfTest." into marshmallow-cts-dev am: d9efe7ad69 -s ours am: 1295860cc4 | |
f08acb1 Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev am: 57031aa47e am: a4e71a5304 am: 9bfb43c08f | |
c79ac45 Merge "Adjust telecom setup timeout values to be more generous" into marshmallow-cts-dev am: 113e063967 am: 634f4bb07a | |
53c64d2 Merge "remove TYPE_ORIENTATION sensor requirement." into marshmallow-cts-dev am: 6a54530ce3 am: 8cbe5a1120 am: 9256959176 | |
738d64f Merge "CTS Verifier fix latency estimation for Loopback test" into marshmallow-cts-dev am: 90a18e9974 am: 9b8e0bc99d | |
d63af25 Merge "media: DecoderTest: make sure we call AudioTrack.stop()" into marshmallow-cts-dev am: c600e14564 am: 92c77216ca | |
91903ad Merge "Relieve Sensor Event Gap Test Criterion" into marshmallow-cts-dev am: 15853f5dcb am: 299095c410 am: 9693eeacdb | |
429f3c1 Merge "Make AES*CipherTest explicitly use Android Keystore Provider." into marshmallow-cts-dev am: 3ea94e9bc4 am: cc79c8942b am: f82199a424 | |
d458df5 Merge "Add FileSystemPermissionTest exception for DRM-based GPU drivers." into marshmallow-cts-dev am: 153d57e312 am: 812739b3ed | |
d153a31 Merge "Remove a cross-profile app linking test." into marshmallow-cts-dev am: 4cc519da7f am: 34e8f24ced am: c87b260d08 | |
ff8586e Merge "Skip assist CTS tests on low ram devices" into marshmallow-cts-dev am: b8a3542cb6 am: 346f603555 | |
e15411f Merge "CTS: Tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: 668b86b642 am: afed23029b | |
c973aee Merge "Runtime hint for android.adminhostside CTS test" into marshmallow-cts-dev am: 2ea49fcb72 am: 6e428d5944 | |
cdbd5e4 Merge "Fix the issue in testCalculateLength" into marshmallow-cts-dev am: 842dc6f9a1 am: cbcdf86bcd | |
11d0034 Merge "Camera: skip unsupported stream combination" into marshmallow-cts-dev am: fd3744e698 am: 837d080baa | |
21a1f5f Merge "Update 320dpi & 360dpi small/normal memory requirements" into marshmallow-cts-dev am: 9dcf6c22c6 am: 9ab687bbb8 | |
c2114b4 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 | |
e6f3751 Merge "camera2: Clean up render script context" into marshmallow-cts-dev am: 6339786e6d am: 154a2bf8f1 | |
dd50ade Merge "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices" into marshmallow-cts-dev am: fc3bb206d4 -s ours am: f8257b2be8 | |
0c670b4 Merge "Use FLAG_RECEIVER_FOREGROUND for ordered broadcasts" into marshmallow-cts-dev am: 4f0c862eba am: 6d7f541688 | |
c5139d9 Merge "media: Add volatile to mThreadStarted to make sure the thread can stop properly." into marshmallow-cts-dev am: b358cbfe8b am: 62310b9918 | |
1295860 Merge "DO NOT MERGE media: add mpeg4 qcif test to VideoDecoderPerfTest." into marshmallow-cts-dev am: d9efe7ad69 -s ours | |
5965676 Merge "Fix timeout for testCanInstallValidRsaKeypair in hostsidetests" into marshmallow-cts-dev am: 7f1cd78501 am: e026066b3a | |
634f4bb Merge "Adjust telecom setup timeout values to be more generous" into marshmallow-cts-dev am: 113e063967 | |
5f47667 Merge "Refactoring the updatePassButton methods" into marshmallow-cts-dev am: 0fb4da0212 am: d284431258 | |
9b8e0bc Merge "CTS Verifier fix latency estimation for Loopback test" into marshmallow-cts-dev am: 90a18e9974 | |
f171422 Merge "Added location tests for BYOD in cts-verfier." into marshmallow-cts-dev am: d9d90a75d9 am: 890b0dd13d | |
92c7721 Merge "media: DecoderTest: make sure we call AudioTrack.stop()" into marshmallow-cts-dev am: c600e14564 | |
8be5d4e Merge "Fix android.os.cts.SeccompTest#testKernelBasicTests under Android Native Bridge." into marshmallow-cts-dev am: b10d15a525 am: bca1c46872 | |
812739b Merge "Add FileSystemPermissionTest exception for DRM-based GPU drivers." into marshmallow-cts-dev am: 153d57e312 | |
70e20db Merge "EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer" into marshmallow-cts-dev am: 6b33b0add8 am: 5a854f3083 | |
346f603 Merge "Skip assist CTS tests on low ram devices" into marshmallow-cts-dev am: b8a3542cb6 | |
9bfb43c Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev am: 57031aa47e am: a4e71a5304 | |
afed230 Merge "CTS: Tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: 668b86b642 | |
9256959 Merge "remove TYPE_ORIENTATION sensor requirement." into marshmallow-cts-dev am: 6a54530ce3 am: 8cbe5a1120 | |
6e428d5 Merge "Runtime hint for android.adminhostside CTS test" into marshmallow-cts-dev am: 2ea49fcb72 | |
9693eea Merge "Relieve Sensor Event Gap Test Criterion" into marshmallow-cts-dev am: 15853f5dcb am: 299095c410 | |
cbcdf86 Merge "Fix the issue in testCalculateLength" into marshmallow-cts-dev am: 842dc6f9a1 | |
f82199a Merge "Make AES*CipherTest explicitly use Android Keystore Provider." into marshmallow-cts-dev am: 3ea94e9bc4 am: cc79c8942b | |
837d080 Merge "Camera: skip unsupported stream combination" into marshmallow-cts-dev am: fd3744e698 | |
8a27d7a Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf | |
c87b260 Merge "Remove a cross-profile app linking test." into marshmallow-cts-dev am: 4cc519da7f am: 34e8f24ced | |
9ab687b Merge "Update 320dpi & 360dpi small/normal memory requirements" into marshmallow-cts-dev am: 9dcf6c22c6 | |
154a2bf Merge "camera2: Clean up render script context" into marshmallow-cts-dev am: 6339786e6d | |
f8257b2 Merge "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices" into marshmallow-cts-dev am: fc3bb206d4 -s ours | |
6d7f541 Merge "Use FLAG_RECEIVER_FOREGROUND for ordered broadcasts" into marshmallow-cts-dev am: 4f0c862eba | |
62310b9 Merge "media: Add volatile to mThreadStarted to make sure the thread can stop properly." into marshmallow-cts-dev am: b358cbfe8b | |
e026066 Merge "Fix timeout for testCanInstallValidRsaKeypair in hostsidetests" into marshmallow-cts-dev am: 7f1cd78501 | |
d284431 Merge "Refactoring the updatePassButton methods" into marshmallow-cts-dev am: 0fb4da0212 | |
890b0dd Merge "Added location tests for BYOD in cts-verfier." into marshmallow-cts-dev am: d9d90a75d9 | |
bca1c46 Merge "Fix android.os.cts.SeccompTest#testKernelBasicTests under Android Native Bridge." into marshmallow-cts-dev am: b10d15a525 | |
5a854f3 Merge "EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer" into marshmallow-cts-dev am: 6b33b0add8 | |
a4e71a5 Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev am: 57031aa47e | |
d9efe7a Merge "DO NOT MERGE media: add mpeg4 qcif test to VideoDecoderPerfTest." into marshmallow-cts-dev | |
8cbe5a1 Merge "remove TYPE_ORIENTATION sensor requirement." into marshmallow-cts-dev am: 6a54530ce3 | |
299095c Merge "Relieve Sensor Event Gap Test Criterion" into marshmallow-cts-dev am: 15853f5dcb | |
113e063 Merge "Adjust telecom setup timeout values to be more generous" into marshmallow-cts-dev | |
90a18e9 Merge "CTS Verifier fix latency estimation for Loopback test" into marshmallow-cts-dev | |
cc79c89 Merge "Make AES*CipherTest explicitly use Android Keystore Provider." into marshmallow-cts-dev am: 3ea94e9bc4 | |
c600e14 Merge "media: DecoderTest: make sure we call AudioTrack.stop()" into marshmallow-cts-dev | |
29e4a3b Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a | |
153d57e Merge "Add FileSystemPermissionTest exception for DRM-based GPU drivers." into marshmallow-cts-dev | |
34e8f24 Merge "Remove a cross-profile app linking test." into marshmallow-cts-dev am: 4cc519da7f | |
b8a3542 Merge "Skip assist CTS tests on low ram devices" into marshmallow-cts-dev | |
668b86b Merge "CTS: Tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev | |
2ea49fc Merge "Runtime hint for android.adminhostside CTS test" into marshmallow-cts-dev | |
842dc6f Merge "Fix the issue in testCalculateLength" into marshmallow-cts-dev | |
fd3744e Merge "Camera: skip unsupported stream combination" into marshmallow-cts-dev | |
9dcf6c2 Merge "Update 320dpi & 360dpi small/normal memory requirements" into marshmallow-cts-dev | |
6339786 Merge "camera2: Clean up render script context" into marshmallow-cts-dev | |
fc3bb20 Merge "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices" into marshmallow-cts-dev | |
4f0c862 Merge "Use FLAG_RECEIVER_FOREGROUND for ordered broadcasts" into marshmallow-cts-dev | |
b358cbf Merge "media: Add volatile to mThreadStarted to make sure the thread can stop properly." into marshmallow-cts-dev | |
7f1cd78 Merge "Fix timeout for testCanInstallValidRsaKeypair in hostsidetests" into marshmallow-cts-dev | |
0fb4da0 Merge "Refactoring the updatePassButton methods" into marshmallow-cts-dev | |
d9d90a7 Merge "Added location tests for BYOD in cts-verfier." into marshmallow-cts-dev | |
b10d15a Merge "Fix android.os.cts.SeccompTest#testKernelBasicTests under Android Native Bridge." into marshmallow-cts-dev | |
6b33b0a Merge "EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer" into marshmallow-cts-dev | |
57031aa Merge "Don't run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev | |
6a54530 Merge "remove TYPE_ORIENTATION sensor requirement." into marshmallow-cts-dev | |
15853f5 Merge "Relieve Sensor Event Gap Test Criterion" into marshmallow-cts-dev | |
3ea94e9 Merge "Make AES*CipherTest explicitly use Android Keystore Provider." into marshmallow-cts-dev | |
4cc519d Merge "Remove a cross-profile app linking test." into marshmallow-cts-dev | |
e48654c Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev | |
cbb1eda Merge "Dynamically load the list of runtime permissions." into marshmallow-cts-dev am: ee2729e3af am: adcf4cad1c am: d1666cd056 | |
d1666cd Merge "Dynamically load the list of runtime permissions." into marshmallow-cts-dev am: ee2729e3af am: adcf4cad1c | |
adcf4ca Merge "Dynamically load the list of runtime permissions." into marshmallow-cts-dev am: ee2729e3af | |
ee2729e Merge "Dynamically load the list of runtime permissions." into marshmallow-cts-dev | |
13b7892 Merge "Add a build for CTS Verifier framework library." into marshmallow-cts-dev am: 11ec8ef692 am: 3794510f52 am: 3c0a17566f | |
3c0a175 Merge "Add a build for CTS Verifier framework library." into marshmallow-cts-dev am: 11ec8ef692 am: 3794510f52 | |
3794510 Merge "Add a build for CTS Verifier framework library." into marshmallow-cts-dev am: 11ec8ef692 | |
11ec8ef Merge "Add a build for CTS Verifier framework library." into marshmallow-cts-dev | |
e612a9e Basic test of android.media.RemoteController | |
92ad9e4 Make AES*CipherTest explicitly use Android Keystore Provider. | |
a36fa6e Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into marshmallow-cts-dev am: 7275f1f3e8 am: 5ec45a8527 am: 96005e1d86 | |
96005e1 Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into marshmallow-cts-dev am: 7275f1f3e8 am: 5ec45a8527 | |
5ec45a8 Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into marshmallow-cts-dev am: 7275f1f3e8 | |
7275f1f Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into marshmallow-cts-dev | |
d3169b6 TIF: Make sure that Cursor.moveToNext() is called before using Cursor | |
7041074 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
044e5f3 Merge "Fix for Idle Mode Constraint test" into marshmallow-cts-dev am: 24da8dba7b am: 620ca9ee85 am: 165d828eda | |
165d828 Merge "Fix for Idle Mode Constraint test" into marshmallow-cts-dev am: 24da8dba7b am: 620ca9ee85 | |
620ca9e Merge "Fix for Idle Mode Constraint test" into marshmallow-cts-dev am: 24da8dba7b | |
24da8db Merge "Fix for Idle Mode Constraint test" into marshmallow-cts-dev | |
42a5dc7 Merge "removing android.security.cts.ServicePermissionsTest#testDumpProtected from knownfailures" into marshmallow-cts-dev am: 4f978f8a35 am: 8e441d75cd am: 7006810c93 | |
4c993ce Merge "DO NOT MERGE: Remove DeadObjectException from dumpservice failure condition." into marshmallow-cts-dev am: db790aa7a7 -s ours am: b4449ed4ee am: ee6dc83395 | |
7006810 Merge "removing android.security.cts.ServicePermissionsTest#testDumpProtected from knownfailures" into marshmallow-cts-dev am: 4f978f8a35 am: 8e441d75cd | |
ee6dc83 Merge "DO NOT MERGE: Remove DeadObjectException from dumpservice failure condition." into marshmallow-cts-dev am: db790aa7a7 -s ours am: b4449ed4ee | |
8e441d7 Merge "removing android.security.cts.ServicePermissionsTest#testDumpProtected from knownfailures" into marshmallow-cts-dev am: 4f978f8a35 | |
b4449ed Merge "DO NOT MERGE: Remove DeadObjectException from dumpservice failure condition." into marshmallow-cts-dev am: db790aa7a7 -s ours | |
4f978f8 Merge "removing android.security.cts.ServicePermissionsTest#testDumpProtected from knownfailures" into marshmallow-cts-dev | |
3e3e4ab removing android.security.cts.ServicePermissionsTest#testDumpProtected from knownfailures | |
d4f171d Merge "Revert "Camera: mark testFocusDistanceControl known failure"" into marshmallow-cts-dev am: 6f314234ad am: 784ff552fa am: e9475c7c5a | |
db790aa Merge "DO NOT MERGE: Remove DeadObjectException from dumpservice failure condition." into marshmallow-cts-dev | |
a14e074 DO NOT MERGE: Remove DeadObjectException from dumpservice failure condition. | |
e9475c7 Merge "Revert "Camera: mark testFocusDistanceControl known failure"" into marshmallow-cts-dev am: 6f314234ad am: 784ff552fa | |
784ff55 Merge "Revert "Camera: mark testFocusDistanceControl known failure"" into marshmallow-cts-dev am: 6f314234ad | |
6f31423 Merge "Revert "Camera: mark testFocusDistanceControl known failure"" into marshmallow-cts-dev | |
f60373a Revert "Camera: mark testFocusDistanceControl known failure" | |
e3684cb Merge "disable a bunch of test failures for CTS 6.0R2" into marshmallow-cts-dev am: ce931517cf am: ac3911bcbc am: 0cbc5fb8d9 | |
0cbc5fb Merge "disable a bunch of test failures for CTS 6.0R2" into marshmallow-cts-dev am: ce931517cf am: ac3911bcbc | |
ac3911b Merge "disable a bunch of test failures for CTS 6.0R2" into marshmallow-cts-dev am: ce931517cf | |
3c21781 MediaMetadataRetrieverTest: add new test to handle overflowed padding. | |
ce93151 Merge "disable a bunch of test failures for CTS 6.0R2" into marshmallow-cts-dev | |
bd290de disable a bunch of test failures for CTS 6.0R2 | |
1a3cab5 Merge "Camera: mark testFocusDistanceControl known failure" into marshmallow-cts-dev am: a22cea93e9 am: cde77b727e am: 9038d7682a | |
9038d76 Merge "Camera: mark testFocusDistanceControl known failure" into marshmallow-cts-dev am: a22cea93e9 am: cde77b727e | |
cde77b7 Merge "Camera: mark testFocusDistanceControl known failure" into marshmallow-cts-dev am: a22cea93e9 | |
a22cea9 Merge "Camera: mark testFocusDistanceControl known failure" into marshmallow-cts-dev | |
45dd49f Camera: mark testFocusDistanceControl known failure | |
4e485e6 EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer | |
6e0d621 Merge "Revert "DO NOT MERGE CTS device-side preconditions for MNC"" into marshmallow-cts-dev am: 9c3c69817a -s ours am: 9f7ae7b5e4 am: 734775ead8 | |
a314347 Merge "Revert "DO NOT MERGE CTS host-side preconditions for MNC"" into marshmallow-cts-dev am: b9ac18d7a2 -s ours am: 25947fc8ad am: 36a0d009ff | |
734775e Merge "Revert "DO NOT MERGE CTS device-side preconditions for MNC"" into marshmallow-cts-dev am: 9c3c69817a -s ours am: 9f7ae7b5e4 | |
36a0d00 Merge "Revert "DO NOT MERGE CTS host-side preconditions for MNC"" into marshmallow-cts-dev am: b9ac18d7a2 -s ours am: 25947fc8ad | |
9f7ae7b Merge "Revert "DO NOT MERGE CTS device-side preconditions for MNC"" into marshmallow-cts-dev am: 9c3c69817a -s ours | |
25947fc Merge "Revert "DO NOT MERGE CTS host-side preconditions for MNC"" into marshmallow-cts-dev am: b9ac18d7a2 -s ours | |
9c3c698 Merge "Revert "DO NOT MERGE CTS device-side preconditions for MNC"" into marshmallow-cts-dev | |
92eba40 Revert "DO NOT MERGE CTS device-side preconditions for MNC" | |
b9ac18d Merge "Revert "DO NOT MERGE CTS host-side preconditions for MNC"" into marshmallow-cts-dev | |
e989c0c Revert "DO NOT MERGE CTS host-side preconditions for MNC" | |
edf584b Dynamically load the list of runtime permissions. | |
d001dbc Added location tests for BYOD in cts-verfier. | |
2018d75 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
9fb50b6 Fix bugs regarding CTS fails for VP8 codec with low performance | |
98ce05e Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 am: ae71d6268f am: c199dab921 am: 0734828650 am: 56ac7caf69 am: fc7616b515 am: b21a2116c4 am: ed36e478ca am: d53e2d2d11 am: 007172b6f1 | |
007172b Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 am: ae71d6268f am: c199dab921 am: 0734828650 am: 56ac7caf69 am: fc7616b515 am: b21a2116c4 am: ed36e478ca am: d53e2d2d11 | |
4aa9348 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 3d594391ac am: 16bb8c76e5 -s ours am: 460c8904b4 am: 234fe8392c am: abb94388be -s ours am: 0cf72418a0 am: 75a580a425 | |
d53e2d2 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 am: ae71d6268f am: c199dab921 am: 0734828650 am: 56ac7caf69 am: fc7616b515 am: b21a2116c4 am: ed36e478ca | |
75a580a Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 3d594391ac am: 16bb8c76e5 -s ours am: 460c8904b4 am: 234fe8392c am: abb94388be -s ours am: 0cf72418a0 | |
ed36e47 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 am: ae71d6268f am: c199dab921 am: 0734828650 am: 56ac7caf69 am: fc7616b515 am: b21a2116c4 | |
0cf7241 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 3d594391ac am: 16bb8c76e5 -s ours am: 460c8904b4 am: 234fe8392c am: abb94388be -s ours | |
b21a211 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 am: ae71d6268f am: c199dab921 am: 0734828650 am: 56ac7caf69 am: fc7616b515 | |
abb9438 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 3d594391ac am: 16bb8c76e5 -s ours am: 460c8904b4 am: 234fe8392c | |
fc7616b Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 am: ae71d6268f am: c199dab921 am: 0734828650 am: 56ac7caf69 | |
234fe83 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 3d594391ac am: 16bb8c76e5 -s ours am: 460c8904b4 | |
56ac7ca Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 am: ae71d6268f am: c199dab921 am: 0734828650 | |
460c890 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 3d594391ac am: 16bb8c76e5 -s ours | |
0734828 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 am: ae71d6268f am: c199dab921 | |
16bb8c7 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 3d594391ac | |
c199dab Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 am: ae71d6268f | |
3d59439 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours | |
ae71d62 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 | |
3f0bc45 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev | |
e3d326e DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated | |
2cdf647 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 | |
54f86cd Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev | |
a0fc975 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f am: ca1ed7e779 am: 497751de92 am: 3dd9583a57 am: 5e77afceaa am: 1fcb7b5ac6 am: a9bcb2103e am: 980efdf981 am: b003b55b79 am: c568d09ee4 | |
c568d09 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f am: ca1ed7e779 am: 497751de92 am: 3dd9583a57 am: 5e77afceaa am: 1fcb7b5ac6 am: a9bcb2103e am: 980efdf981 am: b003b55b79 | |
b003b55 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f am: ca1ed7e779 am: 497751de92 am: 3dd9583a57 am: 5e77afceaa am: 1fcb7b5ac6 am: a9bcb2103e am: 980efdf981 | |
980efdf Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f am: ca1ed7e779 am: 497751de92 am: 3dd9583a57 am: 5e77afceaa am: 1fcb7b5ac6 am: a9bcb2103e | |
a9bcb21 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f am: ca1ed7e779 am: 497751de92 am: 3dd9583a57 am: 5e77afceaa am: 1fcb7b5ac6 | |
1fcb7b5 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f am: ca1ed7e779 am: 497751de92 am: 3dd9583a57 am: 5e77afceaa | |
5e77afc Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f am: ca1ed7e779 am: 497751de92 am: 3dd9583a57 | |
3dd9583 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f am: ca1ed7e779 am: 497751de92 | |
497751d Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f am: ca1ed7e779 | |
ca1ed7e Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f | |
cad57ae Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours | |
9053806 Merge "Fixed break #2" into kitkat-cts-dev | |
2840e5c Fixed break #2 | |
77b1a7a Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf am: 417ffa8c95 am: fa4a4db81d -s ours am: 678fcaf0f7 am: fd6e228df1 -s ours am: cc5cd07ec7 am: b80bf27f2e am: ca9b8d50dd -s ours am: 3fba208ec5 am: 303c980152 | |
303c980 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf am: 417ffa8c95 am: fa4a4db81d -s ours am: 678fcaf0f7 am: fd6e228df1 -s ours am: cc5cd07ec7 am: b80bf27f2e am: ca9b8d50dd -s ours am: 3fba208ec5 | |
3fba208 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf am: 417ffa8c95 am: fa4a4db81d -s ours am: 678fcaf0f7 am: fd6e228df1 -s ours am: cc5cd07ec7 am: b80bf27f2e am: ca9b8d50dd -s ours | |
ca9b8d5 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf am: 417ffa8c95 am: fa4a4db81d -s ours am: 678fcaf0f7 am: fd6e228df1 -s ours am: cc5cd07ec7 am: b80bf27f2e | |
b80bf27 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf am: 417ffa8c95 am: fa4a4db81d -s ours am: 678fcaf0f7 am: fd6e228df1 -s ours am: cc5cd07ec7 | |
cc5cd07 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf am: 417ffa8c95 am: fa4a4db81d -s ours am: 678fcaf0f7 am: fd6e228df1 -s ours | |
fd6e228 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf am: 417ffa8c95 am: fa4a4db81d -s ours am: 678fcaf0f7 | |
678fcaf Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf am: 417ffa8c95 am: fa4a4db81d -s ours | |
fa4a4db Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf am: 417ffa8c95 | |
417ffa8 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf | |
e05bb2b Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours | |
89a195f Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev | |
971aa2a DO NOT MERGE: Fixed breakage | |
394274e Merge "DO NOT MERGE: Bumping CTS/CTS Verifier version to CTS 6.0R2." into marshmallow-cts-dev am: 02ef3b38f6 -s ours am: 24b25aafdf am: a25247bee6 | |
a25247b Merge "DO NOT MERGE: Bumping CTS/CTS Verifier version to CTS 6.0R2." into marshmallow-cts-dev am: 02ef3b38f6 -s ours am: 24b25aafdf | |
24b25aa Merge "DO NOT MERGE: Bumping CTS/CTS Verifier version to CTS 6.0R2." into marshmallow-cts-dev am: 02ef3b38f6 -s ours | |
02ef3b3 Merge "DO NOT MERGE: Bumping CTS/CTS Verifier version to CTS 6.0R2." into marshmallow-cts-dev | |
1296058 DO NOT MERGE: Bumping CTS/CTS Verifier version to CTS 6.0R2. | |
0efe735 Relieve Sensor Event Gap Test Criterion | |
40af6fa Don't run Wifi scan timestamp tests when location is turned off. | |
60b9818 Add a build for CTS Verifier framework library. | |
4d5dc1c Merge "DO NOT MERGE CTS host-side preconditions for MNC" into marshmallow-cts-dev am: 40c0d8911f -s ours am: dd53911f31 am: 90d1390ce5 | |
90d1390 Merge "DO NOT MERGE CTS host-side preconditions for MNC" into marshmallow-cts-dev am: 40c0d8911f -s ours am: dd53911f31 | |
dd53911 Merge "DO NOT MERGE CTS host-side preconditions for MNC" into marshmallow-cts-dev am: 40c0d8911f -s ours | |
40c0d89 Merge "DO NOT MERGE CTS host-side preconditions for MNC" into marshmallow-cts-dev | |
52013e1 Fix for Idle Mode Constraint test | |
d8972ff DO NOT MERGE CTS host-side preconditions for MNC | |
5a2126a Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev am: 4de401fe0d -s ours am: 44523978b4 am: 0d39451068 | |
0d39451 Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev am: 4de401fe0d -s ours am: 44523978b4 | |
4452397 Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev am: 4de401fe0d -s ours | |
4de401f Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev | |
b5f74c3 Fix android.os.cts.SeccompTest#testKernelBasicTests under Android Native Bridge. | |
e46610d merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
f2a6fdc Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev am: ca29aea82c am: 73fdcf2adf am: 289f4fb50d | |
289f4fb Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev am: ca29aea82c am: 73fdcf2adf | |
73fdcf2 Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev am: ca29aea82c | |
ca29aea Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev | |
c492f98 Merge "Add reference url to XML reports" into marshmallow-cts-dev am: 4318078f65 am: 889cea6c52 am: 989dc34697 | |
989dc34 Merge "Add reference url to XML reports" into marshmallow-cts-dev am: 4318078f65 am: 889cea6c52 | |
889cea6 Merge "Add reference url to XML reports" into marshmallow-cts-dev am: 4318078f65 | |
4318078 Merge "Add reference url to XML reports" into marshmallow-cts-dev | |
8df6ad6 Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1 am: 6e5f6e27e7 -s ours am: 3322c282fd am: acb962ebda | |
acb962e Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1 am: 6e5f6e27e7 -s ours am: 3322c282fd | |
3322c28 Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1 am: 6e5f6e27e7 -s ours | |
6e5f6e2 Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1 | |
90bbb96 Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 | |
cfdcba2 Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours | |
842be8f Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev | |
5b0df2c DO NOT MERGE: fixed breakages | |
f2d535d Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e am: 3e5dbafc5d -s ours am: e179f1528e am: 03fd9a1c84 | |
03fd9a1 Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e am: 3e5dbafc5d -s ours am: e179f1528e | |
e179f15 Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e am: 3e5dbafc5d -s ours | |
3e5dbaf Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e | |
fbe5db8 Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 | |
d6dc24d Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours | |
0d61990 Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev | |
b15e4eb DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10 | |
5a5a2bb Add reference url to XML reports | |
4c517e4 Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737 am: bc884dcbec am: d0ad09166a am: 2d4a2aba7f | |
2d4a2ab Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737 am: bc884dcbec am: d0ad09166a | |
d0ad091 Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737 am: bc884dcbec | |
bc884dc Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737 | |
ddff8ff Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e | |
b677598 Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 | |
3afc0fa Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 | |
4a350f5 Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 | |
490c486 Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 | |
85c2298 Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 | |
d87db0f Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev | |
c8a9a00 Enable test of events occuring after AudioRecord.stop | |
b8fbd66 Fix testSetPreviewTextureBothCallbacks wait timeout | |
e63f4b8 Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c am: 49226d07bf -s ours am: 1ce9ab41b8 am: fb0f421bf6 | |
fb0f421 Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c am: 49226d07bf -s ours am: 1ce9ab41b8 | |
1ce9ab4 Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c am: 49226d07bf -s ours | |
49226d0 Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c | |
c5372ed Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 | |
19cf4d6 Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours | |
78ba3c4 Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev | |
3cf33b6 Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" | |
c891087 media: Add volatile to mThreadStarted to make sure the thread can stop properly. | |
6a45e7e Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: 681cdc950d am: 40a50b1bf6 am: 6770e5deda -s ours am: 669174c3b6 am: 742e61bc84 | |
742e61b Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: 681cdc950d am: 40a50b1bf6 am: 6770e5deda -s ours am: 669174c3b6 | |
669174c Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: 681cdc950d am: 40a50b1bf6 am: 6770e5deda -s ours | |
2ef9c1b DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices | |
6770e5d Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: 681cdc950d am: 40a50b1bf6 | |
40a50b1 Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: 681cdc950d | |
681cdc9 Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours | |
3f88be1 Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev | |
f8b0e03 DO NOT MERGE: remove duplicate knownfailures | |
7710f9a merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ef38ce6 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 7e68f84f72 am: 3a3dbd810f am: 8781815f7c -s ours am: 0ab7a44f64 am: 02f95411b8 | |
02f9541 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 7e68f84f72 am: 3a3dbd810f am: 8781815f7c -s ours am: 0ab7a44f64 | |
0ab7a44 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 7e68f84f72 am: 3a3dbd810f am: 8781815f7c -s ours | |
8781815 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 7e68f84f72 am: 3a3dbd810f | |
3a3dbd8 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 7e68f84f72 | |
7e68f84 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours | |
97a8cc3 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev | |
10b5ab9 DO NOT MERGE: fixed build breakage | |
83943c6 Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: fa186e7877 am: a83b9ec4b7 am: c2e872c7df -s ours am: dc932f3208 am: fd4715567d | |
fd47155 Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: fa186e7877 am: a83b9ec4b7 am: c2e872c7df -s ours am: dc932f3208 | |
dc932f3 Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: fa186e7877 am: a83b9ec4b7 am: c2e872c7df -s ours | |
434d499 Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: f73a030750 am: ae699fc8d5 am: edb1b07ee8 -s ours am: d837fd83a6 am: 543d7125fb | |
c2e872c Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: fa186e7877 am: a83b9ec4b7 | |
a83b9ec Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: fa186e7877 | |
543d712 Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: f73a030750 am: ae699fc8d5 am: edb1b07ee8 -s ours am: d837fd83a6 | |
d837fd8 Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: f73a030750 am: ae699fc8d5 am: edb1b07ee8 -s ours | |
fa186e7 Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours | |
edb1b07 Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: f73a030750 am: ae699fc8d5 | |
9ddec62 Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev | |
273af31 DO NOT MERGE: disable camera2 tests | |
ae699fc Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: f73a030750 | |
f73a030 Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours | |
c2aef7d Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev | |
a786250 DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage | |
180f226 Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: a37171db7e am: 5224a8af10 am: c0090c720c -s ours am: 458b1752c2 am: 19cb8b2857 | |
68e178a Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: ec587e37d9 am: 8d81e80d9a am: e6b53e4ce9 -s ours am: 72b71f5fa1 am: 39fe30960d | |
19cb8b2 Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: a37171db7e am: 5224a8af10 am: c0090c720c -s ours am: 458b1752c2 | |
39fe309 Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: ec587e37d9 am: 8d81e80d9a am: e6b53e4ce9 -s ours am: 72b71f5fa1 | |
458b175 Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: a37171db7e am: 5224a8af10 am: c0090c720c -s ours | |
72b71f5 Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: ec587e37d9 am: 8d81e80d9a am: e6b53e4ce9 -s ours | |
c0090c7 Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: a37171db7e am: 5224a8af10 | |
e6b53e4 Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: ec587e37d9 am: 8d81e80d9a | |
5224a8a Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: a37171db7e | |
8d81e80 Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: ec587e37d9 | |
a37171d Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours | |
ec587e3 Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours | |
a7ed7d7 Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev | |
d774dd4 Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" | |
99e595f Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev | |
3bce5d4 Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" | |
3d6f8bb DO NOT MERGE CTS device-side preconditions for MNC | |
ef1bc9c Merge "Fix for Frequency Tests to match CDD requirements" into marshmallow-cts-dev am: cb22094bb7 am: c44af58813 am: 87c61e81b9 | |
87c61e8 Merge "Fix for Frequency Tests to match CDD requirements" into marshmallow-cts-dev am: cb22094bb7 am: c44af58813 | |
c44af58 Merge "Fix for Frequency Tests to match CDD requirements" into marshmallow-cts-dev am: cb22094bb7 | |
cb22094 Merge "Fix for Frequency Tests to match CDD requirements" into marshmallow-cts-dev | |
087d265 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
eef7e5a Reduce EGLCleanup test iterations | |
97708a3 Merge "Update the build version to 6.0.1." into marshmallow-cts-dev am: a5df6e2e80 am: 8ef336e140 am: 46ab834c4d | |
46ab834 Merge "Update the build version to 6.0.1." into marshmallow-cts-dev am: a5df6e2e80 am: 8ef336e140 | |
8ef336e Merge "Update the build version to 6.0.1." into marshmallow-cts-dev am: a5df6e2e80 | |
a5df6e2 Merge "Update the build version to 6.0.1." into marshmallow-cts-dev | |
bb1d5a7 Update the build version to 6.0.1. | |
b453110 Camera: remove FREEFORM cropping check for FULL device | |
72624dc merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
e0a0888 Merge "DO NOT MERGE Fix CTS failures on AudioFlingerBinderTest for case where remote submix audio HAL is not included test_setMasterMute test_setMasterVolume" into mnc-dev am: 2d69f4688e am: ae6b48d442 | |
ae6b48d Merge "DO NOT MERGE Fix CTS failures on AudioFlingerBinderTest for case where remote submix audio HAL is not included test_setMasterMute test_setMasterVolume" into mnc-dev am: 2d69f4688e | |
2d69f46 Merge "DO NOT MERGE Fix CTS failures on AudioFlingerBinderTest for case where remote submix audio HAL is not included test_setMasterMute test_setMasterVolume" into mnc-dev | |
b068f19 Adjust telecom setup timeout values to be more generous | |
ac4c6d7 Update 320dpi & 360dpi small/normal memory requirements | |
bdfeea4 CTS Verifier fix latency estimation for Loopback test | |
5863eaf Use FLAG_RECEIVER_FOREGROUND for ordered broadcasts | |
749a087 Merge "Revert "DO NOT MERGE ANYWHERE: mark known failure camera tests"" into marshmallow-cts-dev am: c4ade203c7 -s ours am: 629c116137 -s ours am: 8cd4eb58c3 -s ours | |
8cd4eb5 Merge "Revert "DO NOT MERGE ANYWHERE: mark known failure camera tests"" into marshmallow-cts-dev am: c4ade203c7 -s ours am: 629c116137 -s ours | |
629c116 Merge "Revert "DO NOT MERGE ANYWHERE: mark known failure camera tests"" into marshmallow-cts-dev am: c4ade203c7 -s ours | |
c4ade20 Merge "Revert "DO NOT MERGE ANYWHERE: mark known failure camera tests"" into marshmallow-cts-dev | |
2cb7235 Revert "DO NOT MERGE ANYWHERE: mark known failure camera tests" | |
75b4976 Merge "DO NOT MERGE ANYWHERE: mark known failure camera tests" into marshmallow-cts-dev am: 2111d51659 -s ours am: c6e71faef4 -s ours am: c0256314df -s ours | |
c025631 Merge "DO NOT MERGE ANYWHERE: mark known failure camera tests" into marshmallow-cts-dev am: 2111d51659 -s ours am: c6e71faef4 -s ours | |
c6e71fa Merge "DO NOT MERGE ANYWHERE: mark known failure camera tests" into marshmallow-cts-dev am: 2111d51659 -s ours | |
2111d51 Merge "DO NOT MERGE ANYWHERE: mark known failure camera tests" into marshmallow-cts-dev | |
1b64814 media: DecoderTest: make sure we call AudioTrack.stop() | |
e8a13b1 Fix for Frequency Tests to match CDD requirements | |
e5ea9d7 DO NOT MERGE ANYWHERE: mark known failure camera tests | |
732751c Fix report latency overflow in DeviceSuspendTest | |
dbe0410 camera2: Clean up render script context | |
ad3e7df Skip assist CTS tests on low ram devices | |
dd75b7f DO NOT MERGE Fix CTS failures on AudioFlingerBinderTest for case where remote submix audio HAL is not included test_setMasterMute test_setMasterVolume | |
3ef522a Fix the issue in testCalculateLength | |
147c5b1 Remove a cross-profile app linking test. | |
a52ffe9 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
54b6abd Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b -s ours am: 2a72b1b08e -s ours am: c1f6baf9ec -s ours am: ba72ac87a7 -s ours am: e9e56b476b -s ours am: 04d23e6526 -s ours | |
72ebd2f Runtime hint for android.adminhostside CTS test | |
3aeb0d3 Enable SPEAKERPHONE CTS tests. | |
2b51a7c fix failure line handling for VideEncoderDecoderTest. | |
fde5384 CTS: Tests for DISALLOW_CONFIG_VPN | |
0c4e033 remove TYPE_ORIENTATION sensor requirement. | |
85381a8 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
8ea1911 Fix timeout for testCanInstallValidRsaKeypair in hostsidetests | |
0b8a4c0 DO NOT MERGE media: add mpeg4 qcif test to VideoDecoderPerfTest. | |
561d3fd merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
62b69b9 Refactoring the updatePassButton methods | |
cdf2061 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5fcf156 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2c480d8 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
363df32 Camera: skip unsupported stream combination | |
183859b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2621f72 Fix bugs regarding TextView layout size with large font scale in ScrollingText | |
d2a9fb9 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
27c55e2 CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures | |
3c0f090 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
7dc91b3 Add FileSystemPermissionTest exception for /dev/dri/renderD129. | |
3304976 Add FileSystemPermissionTest exception for DRM-based GPU drivers. | |
802ef43 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
4ca5414 CTS: android.text.method.cts related tests failing | |
293aadd merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2ed19b8 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f2d0fc3 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
94eb3a3 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a11da45 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
55621a8 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5eb1a12 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
49e9056 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
20bba16 merge in mnc-dr-release history after reset to mnc-dr-dev | |
72344c2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
93034b9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9c911ad merge in mnc-dr-release history after reset to mnc-dr-dev | |
ac82cce merge in mnc-dr-release history after reset to mnc-dr-dev | |
c0fd0de merge in mnc-dr-release history after reset to mnc-dr-dev | |
9c0bcba merge in mnc-dr-release history after reset to mnc-dr-dev | |
81809ea merge in mnc-dr-release history after reset to mnc-dr-dev | |
54e6067 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a2e11cc merge in mnc-dr-release history after reset to mnc-dr-dev | |
65e49b8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e90860d merge in mnc-dr-release history after reset to mnc-dr-dev | |
824ca59 merge in mnc-dr-release history after reset to mnc-dr-dev | |
28a9233 merge in mnc-dr-release history after reset to mnc-dr-dev | |
20150fc merge in mnc-dr-release history after reset to mnc-dr-dev | |
da346c8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
76ccc4d merge in mnc-dr-release history after reset to mnc-dr-dev | |
accb996 Fix build | |
6b8eae4 Remove unnecessary layout request, avoid obtaining wrong bounds rect | |
bf1875a Add an option to use log saver for generated XML report | |
1b0bd2c [CtsVerfier] ScreenLockBoundKeys - use different key ID | |
c358445 merge in mnc-dr-release history after reset to mnc-dr-dev | |
22c9210 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9edd486 Bug: 23003511 Fix CTS: AudioManagerTest#testSoundEffects failing | |
f2e3b58 merge in mnc-dr-release history after reset to mnc-dr-dev | |
38a07ad CTS runner fixes | |
b6ab3b2 MIDI CTS: remove tests that pass null callback | |
861fc41 Revert "Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing" | |
2084cea merge in mnc-dr-release history after reset to mnc-dr-dev | |
6ecbb88 Update CTS for unsupported legacy ConnectivityManager APIs | |
c821cd0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6b4f1ae merge in mnc-dr-release history after reset to mnc-dr-dev | |
b18f481 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f049e59 Fix contacts provider cts tests | |
954eefe media: combine log to reduce the size | |
672b31f merge in mnc-dr-release history after reset to mnc-dr-dev | |
b999e79 Add MIDI feature to MNC section | |
d173212 Permissions: Fix Auth CTS tests to reflect changes. | |
53b27bd Verify uninstall using "pm list". | |
bdf0b8e testExtractAlpha was asserting a bug | |
a479b2c CTS: TelephonyProviderTest failing | |
87ea308 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4f74448 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5613c1e merge in mnc-dr-release history after reset to mnc-dr-dev | |
968ce01 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fd4b01e merge in mnc-dr-release history after reset to mnc-dr-dev | |
40db3d8 media: use small frame size for resource manager test. | |
9dfe7a8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
edd4ec4 Update last public framework attribute to pass CTS test. | |
03db252 Revert "add more logging to monkey seed test" | |
d32ddbf Add Ble test cases to BuildCtsTemporarilyKnownFailureList. | |
703b85d merge in mnc-dr-release history after reset to mnc-dr-dev | |
6912277 merge in mnc-dr-release history after reset to mnc-dr-dev | |
40e450f merge in mnc-dr-release history after reset to mnc-dr-dev | |
fcd0c82 Add logging statements to debug hangs. | |
6716917 media: deliver report to host | |
98a6bcd videoperf: specify timeout for VideoEncoderDecoderTest | |
ebab4fc merge in mnc-dr-release history after reset to mnc-dr-dev | |
7a957a1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8a0ebb8 use locked orientation instead of "nosensor" | |
3b5cac0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5aafe29 MediaSyncTest: use float for playback rate tolerance to keep consistent with others. | |
e11e244 media: deliver test report to host. | |
e548f98 CTS: Adds conditions to bypass FileSystemPermissionTest.testDeviceTreeCpuCurrent | |
2983cbe merge in mnc-dr-release history after reset to mnc-dr-dev | |
a23e196 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0f15171 merge in mnc-dr-release history after reset to mnc-dr-dev | |
308abc6 videoperf: avoid potential ArrayIndexOutOfBounds | |
a8279cc merge in mnc-dr-release history after reset to mnc-dr-dev | |
6e129de merge in mnc-dr-release history after reset to mnc-dr-dev | |
7cc7c32 Use example.com for strict mode cts test. | |
f1f901e merge in mnc-release history after reset to mnc-dev | |
4b61d4c Remove not relevant browser tests - APIs are gone | |
71dba80 Remove android.security.cts.SeccompBpfTest. | |
2db81f6 merge in mnc-release history after reset to mnc-dev | |
f33ad19 merge in mnc-release history after reset to mnc-dev | |
26e4533 merge in mnc-release history after reset to mnc-dev | |
3eb5506 merge in mnc-release history after reset to mnc-dev | |
359272a merge in mnc-release history after reset to mnc-dev | |
71e5ed7 A better shadow value to cover more devices, handle TV theme override. | |
b4e8522 merge in mnc-release history after reset to mnc-dev | |
7dd1e17 Respect hard restriction to minimum password length in CTS | |
52c8598 merge in mnc-release history after reset to mnc-dev | |
d8d0c10 merge in mnc-release history after reset to mnc-dev | |
ca26409 merge in mnc-release history after reset to mnc-dev | |
e89c675 merge in mnc-release history after reset to mnc-dev | |
7bea994 Use simple break strategy for testSetTextLong | |
a99d048 Split CTS-DEQP plan into two plans | |
a250792 merge in mnc-release history after reset to mnc-dev | |
7542792 Cherrypick the following CLs from LMP MR1 | |
039b00b Fix up Looper preparation. | |
69c85ad Fix build | |
a01622e Dismiss dialogs during indeterminate progress dialog CTS tests | |
d1fd52f merge in mnc-release history after reset to mnc-dev | |
4eaca29 Use dup2() to make message queue tests less flaky. | |
741bbde merge in mnc-release history after reset to mnc-dev | |
03e4db1 merge in mnc-release history after reset to mnc-dev | |
22e6c1c Fix Drawable, PopupWindow CTS breakages | |
269967e merge in mnc-release history after reset to mnc-dev | |
3a491c8 merge in mnc-release history after reset to mnc-dev | |
6c1245b merge in mnc-release history after reset to mnc-dev | |
e71484d merge in mnc-release history after reset to mnc-dev | |
4daa833 merge in mnc-release history after reset to mnc-dev | |
6086b14 merge in mnc-release history after reset to mnc-dev | |
ac23f11 fix build | |
6da731e Remove WebGL conformance tests from CTS | |
61ecdd4 merge in mnc-release history after reset to mnc-dev | |
b35b30c Temp disables for deqp tests failing due to missing driver fixes. | |
ab03e94 merge in mnc-release history after reset to mnc-dev | |
275d2ba merge in mnc-release history after reset to mnc-dev | |
8f45024 merge in mnc-release history after reset to mnc-dev | |
b5effdb merge in mnc-release history after reset to mnc-dev | |
3762271 Ensure JobScheduler Connectivity CTS reenables WiFI | |
0f1d001 merge in mnc-release history after reset to mnc-dev | |
5431857 merge in mnc-release history after reset to mnc-dev | |
dbea20a merge in mnc-release history after reset to mnc-dev | |
c145421 Temporarily disable flaky EGL tests while waiting for driver fixes | |
cc55709 merge in mnc-release history after reset to mnc-dev | |
7a49955 merge in mnc-release history after reset to mnc-dev | |
71f03b6 Failing android.content.ContentResolver tests to CTS staging | |
84d24c0 Add workaround for ContetxtImpl.setTheme(), verify test setup | |
3b25c2d merge in mnc-release history after reset to mnc-dev | |
6a70a9b merge in mnc-release history after reset to mnc-dev | |
602c0d5 merge in mnc-release history after reset to mnc-dev | |
c9bc142 Hide more failing CTS-DEQP tests. | |
76fc052 Hide failing GLES31 texture.border_clamp tests. | |
20c7360 merge in mnc-release history after reset to mnc-dev | |
93ee255 Add STOPSHIP to CTS-DEQP plan generation. | |
dbf386e Test for issue #16013164: protect app ops setMode(). | |
project developers/samples/android/ | |
cf8d987 merge in mnc-dr-release history after reset to mnc-dr-dev | |
40cf110 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9f8c4dc merge in mnc-dr-release history after reset to mnc-dr-dev | |
498c811 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b316545 merge in mnc-dr-release history after reset to mnc-dr-dev | |
451a4db merge in mnc-dr-release history after reset to mnc-dr-dev | |
1cd7b66 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3993957 merge in mnc-dr-release history after reset to mnc-dr-dev | |
54d2af0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2bbd7c6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
168ba60 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ca80a4f merge in mnc-dr-release history after reset to mnc-dr-dev | |
d2227f0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9312c85 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1e873eb merge in mnc-dr-release history after reset to mnc-dr-dev | |
ebe466f merge in mnc-release history after reset to mnc-dev | |
3b1d038 merge in mnc-release history after reset to mnc-dev | |
7856750 merge in mnc-release history after reset to mnc-dev | |
project development/ | |
08e0409 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
0c3e2a0 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
0241daa merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
cbd869d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
25186be merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
cffd452 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9dc73fb merge in mnc-dr-release history after reset to mnc-dr-dev | |
50b3514 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b8c9130 merge in mnc-dr-release history after reset to mnc-dr-dev | |
de5ca32 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3d4eb5c merge in mnc-dr-release history after reset to mnc-dr-dev | |
5be2c8e merge in mnc-dr-release history after reset to mnc-dr-dev | |
57f556b merge in mnc-dr-release history after reset to mnc-dr-dev | |
8cff4c1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5677965 merge in mnc-dr-release history after reset to mnc-dr-dev | |
57a9852 merge in mnc-dr-release history after reset to mnc-dr-dev | |
eda6a84 merge in mnc-dr-release history after reset to mnc-dr-dev | |
48ef196 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9241c26 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a44d312 merge in mnc-dr-release history after reset to mnc-dr-dev | |
20b4e81 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b37fe3f merge in mnc-dr-release history after reset to mnc-dr-dev | |
fbdbeab merge in mnc-release history after reset to mnc-dev | |
c6ffeac merge in mnc-release history after reset to mnc-dev | |
d307a13 merge in mnc-release history after reset to mnc-dev | |
cdd98ee merge in mnc-release history after reset to mnc-dev | |
cf98b14 merge in mnc-release history after reset to mnc-dev | |
4382306 merge in mnc-release history after reset to mnc-dev | |
f85643a merge in mnc-release history after reset to mnc-dev | |
09da891 merge in mnc-release history after reset to mnc-dev | |
d76998b merge in mnc-release history after reset to mnc-dev | |
d2bed1e merge in mnc-release history after reset to mnc-dev | |
7034fa1 merge in mnc-release history after reset to mnc-dev | |
314d607 merge in mnc-release history after reset to mnc-dev | |
3a5722c merge in mnc-release history after reset to mnc-dev | |
61c57fd Setup flags to make SDK images provisioned. | |
project device/sample/ | |
c22dfd0 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
efaef57 Remove TMO & MetroPCS entries for mcc/mnc 310/580 in apn-conf | |
0fafbb2 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5f06524 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5b0b44d merge in mnc-dr-release history after reset to mnc-dr-dev | |
8f2c1b0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c0b4a21 Change APNs as request of operators | |
project docs/source.android.com/ | |
522291b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
010c6eb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
55c6c90 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
6c6d8be merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
70af8e2 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
4c0eede merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
1f15738 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8577305 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2ef6aab merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e2eaeb5 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
3d1d00f merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
d14e1ab merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
bdae4df merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e79fff5 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
7d253a5 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
14a3bcc merge in mnc-dr-release history after reset to mnc-dr-dev | |
bd2ba23 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f963266 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d5f4fcd merge in mnc-dr-release history after reset to mnc-dr-dev | |
9d6aa71 merge in mnc-dr-release history after reset to mnc-dr-dev | |
96b867b merge in mnc-dr-release history after reset to mnc-dr-dev | |
633881d merge in mnc-dr-release history after reset to mnc-dr-dev | |
d683836 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5449914 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b65ff42 merge in mnc-release history after reset to mnc-dev | |
99d696f merge in mnc-release history after reset to mnc-dev | |
project external/aac/ | |
2d435aa Remove __DATE__/__TIME__ | |
project external/apache-harmony/ | |
c4604ee merge in mnc-release history after reset to mnc-dev | |
364703a merge in mnc-release history after reset to mnc-dev | |
project external/boringssl/ | |
c7432a2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
aec5314 merge in mnc-release history after reset to mnc-dev | |
5da81fe merge in mnc-release history after reset to mnc-dev | |
project external/bouncycastle/ | |
d1d983a DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec | |
e94d929 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
864e87b DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec | |
75307ac merge in mnc-dr-release history after reset to mnc-dr-dev | |
d1f5eb8 merge in mnc-release history after reset to mnc-dev | |
4f5a324 Register DSA OID for KeyFactory not just Signature | |
project external/chromium-trace/ | |
959b836 merge in mnc-dr-release history after reset to mnc-dr-dev | |
768aec6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
132e1b3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1dcad3b merge in mnc-release history after reset to mnc-dev | |
be882b3 merge in mnc-release history after reset to mnc-dev | |
project external/compiler-rt/ | |
32fedd9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c1d5769 merge in mnc-dr-release history after reset to mnc-dr-dev | |
947d850 merge in mnc-release history after reset to mnc-dev | |
1351bf6 merge in mnc-release history after reset to mnc-dev | |
336cf88 merge in mnc-release history after reset to mnc-dev | |
23a87c1 Build the ASAN RTL without RTTI. | |
project external/conscrypt/ | |
1daaba3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
37780e2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d73156f merge in mnc-release history after reset to mnc-dev | |
13e7258 merge in mnc-release history after reset to mnc-dev | |
1592c45 merge in mnc-release history after reset to mnc-dev | |
4b408f6 merge in mnc-release history after reset to mnc-dev | |
b0e7a58 Fix compilation with OpenSSL | |
35c2503 Fix error conditions in certificate/PKCS#7 reading | |
5cb1a59 merge in mnc-release history after reset to mnc-dev | |
e5d26bc NativeCrypto: special case for empty cipher list | |
b10a249 merge in mnc-release history after reset to mnc-dev | |
5b59e99 OpenSSLKey: unsupported algorithm is an InvalidKeyException | |
426c3f2 merge in mnc-release history after reset to mnc-dev | |
d30453b merge in mnc-release history after reset to mnc-dev | |
bac21ca merge in mnc-release history after reset to mnc-dev | |
a75450d merge in mnc-release history after reset to mnc-dev | |
41b978e merge in mnc-release history after reset to mnc-dev | |
095edd6 merge in mnc-release history after reset to mnc-dev | |
809811d merge in mnc-release history after reset to mnc-dev | |
308eaf6 Throw InvalidKeyException when keystore key malformed | |
e3834b1 NativeCrypto: allow default exceptions | |
72ea3d6 NativeCrypto: not finding a key is not fatal | |
project external/deqp/ | |
f6441d9 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
6af4252 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
f88cd77 Merge "Remove wide line bounding box cases" into marshmallow-cts-dev am: 598e5de412 | |
bee524b Remove GLES2-texture.wrap tests from mustpass am: 85fcb8dc40 | |
598e5de Merge "Remove wide line bounding box cases" into marshmallow-cts-dev | |
d300e34 Remove GLES2.functional.texture.units.2_units.only_cube.9 from mustpass am: b84fd4b0ff | |
85fcb8d Remove GLES2-texture.wrap tests from mustpass | |
b84fd4b Remove GLES2.functional.texture.units.2_units.only_cube.9 from mustpass | |
ee0868c Remove wide line bounding box cases | |
0c59f7b Merge "Change MSAA sample-count error to warning" into marshmallow-cts-dev am: 0727d29796 | |
0711fc1 Remove GLES2.functional.dither.disable.gradient.* tests from mustpass am: 9a42bb8be3 | |
0727d29 Merge "Change MSAA sample-count error to warning" into marshmallow-cts-dev | |
9a42bb8 Remove GLES2.functional.dither.disable.gradient.* tests from mustpass | |
0168010 DO NOT MERGE add running time hints for dEQP packages am: 75da7d236c -s ours | |
75da7d2 DO NOT MERGE add running time hints for dEQP packages | |
4e2092b Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev am: a3571bc9c9 -s ours | |
a3571bc Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev | |
c6d3656 Exclude RGB565 blending cases from the must-pass am: 494bb5a472 | |
494bb5a Exclude RGB565 blending cases from the must-pass | |
57f1d6d Change MSAA sample-count error to warning | |
e625e2d DO NOT MERGE Restore accidentally commented line | |
74e77f9 DO NOT MERGE Split GLES31 copy image tests in 3. am: e3f31fbe9e -s ours | |
e3f31fb DO NOT MERGE Split GLES31 copy image tests in 3. | |
7f2264e Merge "DO NOT MERGE: Add cube gather tests that avoid corners; remove D32F from mustpass" into lollipop-mr1-cts-dev am: 06627c74b4 -s ours am: a635ea841e am: 1bb32404ed -s ours | |
ad9738c Merge "Remove broken record_variable_selection test from MR1 must-pass." into lollipop-mr1-cts-dev am: 67685b11a4 am: a9216ffd5a am: 195c6d1c5f | |
7ec9411 DO NOT MERGE: Apply fix for tessellation fractional even test verification. am: a77161bb85 -s ours am: 76114a7968 am: 90b1a9f687 -s ours | |
3a8d6b0 DO NOT MERGE Do not require signed zero support in ldexp tests() am: 5b076d99a8 -s ours am: 366da5103d am: 6a4a901e5a -s ours | |
867d4a0 DO NOT MERGE: Ignore denormals in floatUlpThresholdCompare. am: 5c7feb8db2 -s ours am: 80ff623675 am: f088b2b570 -s ours | |
1bb3240 Merge "DO NOT MERGE: Add cube gather tests that avoid corners; remove D32F from mustpass" into lollipop-mr1-cts-dev am: 06627c74b4 -s ours am: a635ea841e | |
195c6d1 Merge "Remove broken record_variable_selection test from MR1 must-pass." into lollipop-mr1-cts-dev am: 67685b11a4 am: a9216ffd5a | |
90b1a9f DO NOT MERGE: Apply fix for tessellation fractional even test verification. am: a77161bb85 -s ours am: 76114a7968 | |
6a4a901 DO NOT MERGE Do not require signed zero support in ldexp tests() am: 5b076d99a8 -s ours am: 366da5103d | |
f088b2b DO NOT MERGE: Ignore denormals in floatUlpThresholdCompare. am: 5c7feb8db2 -s ours am: 80ff623675 | |
a635ea8 Merge "DO NOT MERGE: Add cube gather tests that avoid corners; remove D32F from mustpass" into lollipop-mr1-cts-dev am: 06627c74b4 -s ours | |
06627c7 Merge "DO NOT MERGE: Add cube gather tests that avoid corners; remove D32F from mustpass" into lollipop-mr1-cts-dev | |
e98edf6 DO NOT MERGE: Add cube gather tests that avoid corners; remove D32F from mustpass | |
a9216ff Merge "Remove broken record_variable_selection test from MR1 must-pass." into lollipop-mr1-cts-dev am: 67685b11a4 | |
76114a7 DO NOT MERGE: Apply fix for tessellation fractional even test verification. am: a77161bb85 -s ours | |
366da51 DO NOT MERGE Do not require signed zero support in ldexp tests() am: 5b076d99a8 -s ours | |
80ff623 DO NOT MERGE: Ignore denormals in floatUlpThresholdCompare. am: 5c7feb8db2 -s ours | |
67685b1 Merge "Remove broken record_variable_selection test from MR1 must-pass." into lollipop-mr1-cts-dev | |
91be034 Remove broken record_variable_selection test from MR1 must-pass. | |
a77161b DO NOT MERGE: Apply fix for tessellation fractional even test verification. | |
5b076d9 DO NOT MERGE Do not require signed zero support in ldexp tests() | |
5c7feb8 DO NOT MERGE: Ignore denormals in floatUlpThresholdCompare. | |
2712439 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
25d6f3a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
03d3fc3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c4eb7fc merge in mnc-dr-release history after reset to mnc-dr-dev | |
9b2eca5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2807726 merge in mnc-dr-release history after reset to mnc-dr-dev | |
45e393c merge in mnc-dr-release history after reset to mnc-dr-dev | |
7d80ccf merge in mnc-dr-release history after reset to mnc-dr-dev | |
243bc61 Remove infeasible M tests. | |
498bfb2 Remove tests infeasible for M. | |
8ec84bd merge in mnc-dr-release history after reset to mnc-dr-dev | |
fcb6b56 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6190d72 merge in mnc-dr-release history after reset to mnc-dr-dev | |
774d8a1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
50731dc merge in mnc-dr-release history after reset to mnc-dr-dev | |
a1a4af8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8d6280f merge in mnc-dr-release history after reset to mnc-dr-dev | |
9f58bb9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
910e7a3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
628b140 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3e5b9b7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4649775 merge in mnc-dr-release history after reset to mnc-dr-dev | |
04cc7e6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9e7f1df merge in mnc-dr-release history after reset to mnc-dr-dev | |
c3f84fc merge in mnc-dr-release history after reset to mnc-dr-dev | |
7699c4c merge in mnc-release history after reset to mnc-dev | |
ff7b42f merge in mnc-release history after reset to mnc-dev | |
dd317ad merge in mnc-release history after reset to mnc-dev | |
aba59ab merge in mnc-release history after reset to mnc-dev | |
01bdd65 merge in mnc-release history after reset to mnc-dev | |
4f92034 merge in mnc-release history after reset to mnc-dev | |
331b812 merge in mnc-release history after reset to mnc-dev | |
4716ee4 merge in mnc-release history after reset to mnc-dev | |
ef0df44 merge in mnc-release history after reset to mnc-dev | |
82f0120 merge in mnc-release history after reset to mnc-dev | |
18ca0d5 merge in mnc-release history after reset to mnc-dev | |
4999ac8 merge in mnc-release history after reset to mnc-dev | |
72e0a30 merge in mnc-release history after reset to mnc-dev | |
6639d90 merge in mnc-release history after reset to mnc-dev | |
f396fb3 merge in mnc-release history after reset to mnc-dev | |
0ed4299 merge in mnc-release history after reset to mnc-dev | |
a804e1d merge in mnc-release history after reset to mnc-dev | |
3a9f91c merge in mnc-release history after reset to mnc-dev | |
02b40d2 Fix primitive bbox line verification regression. | |
project external/doclava/ | |
f8ae1af merge in mnc-dr-release history after reset to mnc-dr-dev | |
671ad0e merge in mnc-dr-release history after reset to mnc-dr-dev | |
f92db8d merge in mnc-release history after reset to mnc-dev | |
432d168 merge in mnc-release history after reset to mnc-dev | |
project external/drm_hwcomposer/ | |
30c46a3 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
29ff641 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
83eecd8 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
bf20636 drm_hwcomposer: Always call PrepareFrame() for compositions | |
9fe2d41 drm_hwcomposer: Always call PrepareFrame() for compositions am: e3141c6fa6 | |
e3141c6 drm_hwcomposer: Always call PrepareFrame() for compositions | |
0049694 drm_hwcomposer: Save the atomic_test result between tests | |
503854d drm_hwcomposer: Save the atomic_test result between tests am: 6c18b3b67e | |
2b0cdf8 drm_hwcomposer: Save the atomic_test result between tests | |
6c18b3b drm_hwcomposer: Save the atomic_test result between tests | |
6cc5fbf drm_hwcomposer: only check the composition after a geometry change | |
4d844a4 drm_hwcomposer: Skip layers which aren't on-screen | |
6afbb6a drm_hwcomposer: only check the composition after a geometry change | |
d0cff78 Merge "drm_hwcomposer: Skip layers which aren't on-screen" into mnc-dr-dev | |
b100837 drm_hwcomposer: Skip layers which aren't on-screen | |
d09d9ea drm_hwcomposer: set blending mode to kPreMult for GL output | |
0c7da1e drm_hwcomposer: set blending mode to kPreMult for GL output | |
5c867b3 drm_hwcomposer: Allow for multiple transforms at once | |
551a211 drm_hwcomposer: Check the composition before sending to frame worker | |
93eed9e drm_hwcomposer: Split DrmDisplayCompositor::SquashAll() | |
91e9310 drm_hwcomposer: Add test_only mode to CommitFrame | |
4fdafe6 Merge "drm_hwcomposer: Check the composition before sending to frame worker" into mnc-dr-dev | |
d4bd44d Merge "drm_hwcomposer: Allow for multiple transforms at once" into mnc-dr-dev | |
04b47ea drm_hwcomposer: Allow for multiple transforms at once | |
647beb2 drm_hwcomposer: Check the composition before sending to frame worker | |
d51c761 drm_hwcomposer: Split DrmDisplayCompositor::SquashAll() | |
f59eaf0 drm_hwcomposer: Create mode blob on modeset queue | |
8de1cd0 drm_hwcomposer: during SquashAll, skip layers with kSourceNone | |
6d3b661 drm_hwcomposer: composite down to a primary plane after a timeout | |
c3c27e0 drm_hwcomposer: avoid creating release fences for invalid OutputFd | |
435be95 drm_hwcomposer: add AutoLock to automatically handle pthread_mutex_lock | |
c07b211 drm_hwcomposer: Add test_only mode to CommitFrame | |
35301f4 drm_hwcomposer: Create mode blob on modeset queue | |
2b4b1ee drm_hwcomposer: during SquashAll, skip layers with kSourceNone | |
f1acc6d Merge "drm_hwcomposer: composite down to a primary plane after a timeout" into mnc-dr-dev | |
153b38a Merge "drm_hwcomposer: avoid creating release fences for invalid OutputFd" into mnc-dr-dev | |
a43948d Merge "drm_hwcomposer: add AutoLock to automatically handle pthread_mutex_lock" into mnc-dr-dev | |
aa362b1 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
bff33ac drm_hwcomposer: composite down to a primary plane after a timeout | |
faca209 drm_hwcomposer: Increase the virtual display compositor's fence timeout | |
cb1cfc8 drm_hwcomposer: avoid creating release fences for invalid OutputFd | |
49446bc drm_hwcomposer: add AutoLock to automatically handle pthread_mutex_lock | |
a9cbd00 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
8467b12 drm_hwcomposer: add optional timeout for WaitForSignalOrExitLocked | |
126eb04 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
db81fce drm_hwcomposer: always put protected layers on hardware planes | |
103d28d merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
aa2f4a5 drm_hwcomposer: fix spelling of "separate". | |
f3d3603 drm_hwcomposer: filter out empty or invalid rects. | |
3700587 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
bd61c8d drm_hwcomposer: Handle HWC_SKIP_LAYER properly | |
3979f7d drm_hwcomposer: add ATRACE_CALL. | |
7642c92 drm_hwcomposer: update #include's for drm_hwcomposer.h | |
d8c19a0 drm_hwcomposer: rename file with underscore to not use underscore | |
ff30b52 drm_hwcomposer: polish for old DRM wrapper code | |
0883037 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
e88fa70 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
5b51ebc merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
0f8a9c3 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
045fa26 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f58a26e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ff42932 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
7390812 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
29ad237 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ead314e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f98c8f7 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2676141 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
1e69f1d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f8af6f9 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
dbdd16a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9019a0d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ccb0468 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e1e9ccc merge in mnc-dr-release history after reset to mnc-dr-dev | |
45b1c9b merge in mnc-dr-release history after reset to mnc-dr-dev | |
71bffe9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ec7a77e merge in mnc-dr-release history after reset to mnc-dr-dev | |
423d14e merge in mnc-dr-release history after reset to mnc-dr-dev | |
249052e merge in mnc-dr-release history after reset to mnc-dr-dev | |
c6f6bfa merge in mnc-dr-release history after reset to mnc-dr-dev | |
eed8064 merge in mnc-dr-release history after reset to mnc-dr-dev | |
bc46c0a merge in mnc-dr-release history after reset to mnc-dr-dev | |
150db71 merge in mnc-dr-release history after reset to mnc-dr-dev | |
846e3f7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d5acfa8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5904a1d merge in mnc-dr-release history after reset to mnc-dr-dev | |
1e36b60 merge in mnc-dr-release history after reset to mnc-dr-dev | |
597e840 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f23979b merge in mnc-dr-release history after reset to mnc-dr-dev | |
f2f1665 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d6a4969 merge in mnc-dr-release history after reset to mnc-dr-dev | |
befafb5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
636cbcd merge in mnc-dr-release history after reset to mnc-dr-dev | |
e1ab172 merge in mnc-release history after reset to mnc-dev | |
9a36e8d merge in mnc-release history after reset to mnc-dev | |
e7e3cbd merge in mnc-release history after reset to mnc-dev | |
project external/icu/ | |
d26b106 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
0c451aa merge in mnc-dr-release history after reset to mnc-dr-dev | |
fff3ffb merge in mnc-dr-release history after reset to mnc-dr-dev | |
c4f805e merge in mnc-release history after reset to mnc-dev | |
b04a10e merge in mnc-release history after reset to mnc-dev | |
project external/jdiff/ | |
7ac8c27 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c85b273 merge in mnc-release history after reset to mnc-dev | |
bff72e2 merge in mnc-release history after reset to mnc-dev | |
da770fa merge in mnc-release history after reset to mnc-dev | |
project external/libavc/ | |
bda5c37 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
1c01bc1 Remove __DATE__/__TIME__ from Android builds | |
ac8d2d6 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
3bdbf32 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c208ea2 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
0c366ff merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
1bff181 Encoder: Fixed an issue in handling FPS greater than 60 | |
7e9d4bf merge in mnc-dr-release history after reset to mnc-dr-dev | |
3f192b0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
cd5f95a merge in mnc-release history after reset to mnc-dev | |
748fa42 merge in mnc-release history after reset to mnc-dev | |
4980a6f merge in mnc-release history after reset to mnc-dev | |
4e09125 Fixed few issues seen in CTS tests | |
project external/libdrm/ | |
0698135 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
f0d6e2e merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ee1d48a drm: add zcull info and zcull bind for nouveau | |
28a6d5e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9059e7c merge in mnc-dr-release history after reset to mnc-dr-dev | |
5a69ad8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fd0eabb merge in mnc-dr-release history after reset to mnc-dr-dev | |
b56fd92 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fe6dc0a merge in mnc-dr-release history after reset to mnc-dr-dev | |
13a5c2d merge in mnc-dr-release history after reset to mnc-dr-dev | |
585f8c9 merge in mnc-release history after reset to mnc-dev | |
8802109 merge in mnc-release history after reset to mnc-dev | |
project external/libhevc/ | |
d8ef5fd Merge "DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips" into mnc-dev am: 403dec0afc -s ours | |
403dec0 Merge "DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips" into mnc-dev | |
547ec2a Merge "Added few memsets to avoid uninitialized reads for error clips" into mnc-dr-dev | |
3b069c8 DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips am: b9f7c2c45c -s ours am: d7d7fe0e07 am: f61083b7dc -s ours am: ba8667b6f4 | |
ba8667b DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips am: b9f7c2c45c -s ours am: d7d7fe0e07 am: f61083b7dc -s ours | |
f61083b DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips am: b9f7c2c45c -s ours am: d7d7fe0e07 | |
d7d7fe0 DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips am: b9f7c2c45c -s ours | |
2060081 DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips | |
8f9c1c0 Revert "Added few memsets to avoid uninitialized reads for error clips" am: 552578a757 am: 675c41434a am: 516528ee1c -s ours | |
516528e Revert "Added few memsets to avoid uninitialized reads for error clips" am: 552578a757 am: 675c41434a | |
b9f7c2c DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips | |
675c414 Revert "Added few memsets to avoid uninitialized reads for error clips" am: 552578a757 | |
552578a Revert "Added few memsets to avoid uninitialized reads for error clips" | |
02d4468 Added few memsets to avoid uninitialized reads for error clips am: d71abc6924 am: d488586974 am: 9043fefe92 -s ours | |
9043fef Added few memsets to avoid uninitialized reads for error clips am: d71abc6924 am: d488586974 | |
d488586 Added few memsets to avoid uninitialized reads for error clips am: d71abc6924 | |
6ae135c Remove __DATE__/__TIME__ from Android builds | |
dca46f9 Added few memsets to avoid uninitialized reads for error clips | |
d71abc6 Added few memsets to avoid uninitialized reads for error clips | |
6e5e56a resolve merge conflicts of 7899c8cffa to mnc-dev. am: b3a53cebdb | |
b3a53ce resolve merge conflicts of 7899c8cffa to mnc-dev. | |
7899c8c Aligned ps_pic_pu to 4 bytes am: e8bfec1fa4 | |
e8bfec1 Aligned ps_pic_pu to 4 bytes | |
project external/libmpeg2/ | |
ae6d9f7 Remove __DATE__/__TIME__ from Android builds | |
project external/libnfc-nci/ | |
633b73f Don't free memory that shouldn't be freed. | |
920423e Fix 256-bit Thinfilm NFC barcode. | |
project external/libunwind/ | |
4bb3117 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
147832f merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
3c0cd97 merge in mnc-dr-release history after reset to mnc-dr-dev | |
da5f22a merge in mnc-dr-release history after reset to mnc-dr-dev | |
c812a8f merge in mnc-release history after reset to mnc-dev | |
6c653da merge in mnc-release history after reset to mnc-dev | |
c3ba862 merge in mnc-release history after reset to mnc-dev | |
ce727f2 Fix incorrect check of bool returning function. | |
project external/mdnsresponder/ | |
0aa6558 Stop building __DATE__/__TIME__ into Android binaries | |
project external/naver-fonts/ | |
6810e94 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ff4369f merge in mnc-dr-release history after reset to mnc-dr-dev | |
b902688 merge in mnc-release history after reset to mnc-dev | |
c0448a0 merge in mnc-release history after reset to mnc-dev | |
project external/noto-fonts/ | |
b5a7f76 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
42d158f Better compression for NotoColorEmoji | |
b1a370c Update NotoColorEmoji font to Unicode 7 and 8 | |
0993b73 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
708c75e merge in mnc-dr-release history after reset to mnc-dr-dev | |
5576398 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8e75aff merge in mnc-release history after reset to mnc-dev | |
b5f6067 merge in mnc-release history after reset to mnc-dev | |
project external/okhttp/ | |
fc964bb merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
57813a7 Revert "DO NOT MERGE Revert "okio: increase segment size to 8 KiB"" | |
5d749df merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
6d293a3 Merge "DO NOT MERGE Revert "okio: increase segment size to 8 KiB"" into mnc-dr-dev | |
0051544 DO NOT MERGE Revert "okio: increase segment size to 8 KiB" | |
28967fb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8ca8d89 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f1703f5 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
46d6e04 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4a31fe4 merge in mnc-release history after reset to mnc-dev | |
d8d0b08 Fix for HttpURLConnection not always throwing SocketTimeoutException | |
project external/selinux/ | |
4efa85e merge in mnc-dr-release history after reset to mnc-dr-dev | |
1b65f99 merge in mnc-release history after reset to mnc-dev | |
27c2dc4 merge in mnc-release history after reset to mnc-dev | |
d9a05c8 merge in mnc-release history after reset to mnc-dev | |
project external/sepolicy/ | |
1507ef2 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
32d207e Enable permission checking by binderservicedomain. | |
5eac921 Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD am: 7d20f40879 am: a8bbe96d8b | |
a8bbe96 Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD am: 7d20f40879 | |
7d20f40 Merge remote-tracking branch 'goog/mnc-cts-release' into HEAD | |
c31888d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
634bfc7 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
788451f merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c7fdb9c merge in mnc-dr-release history after reset to mnc-dr-dev | |
3960757 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fe0a762 merge in mnc-dr-release history after reset to mnc-dr-dev | |
bb7b993 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1d41f08 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1283c5e merge in mnc-dr-release history after reset to mnc-dr-dev | |
369556b merge in mnc-release history after reset to mnc-dev | |
9051115 merge in mnc-release history after reset to mnc-dev | |
1802bc3 merge in mnc-release history after reset to mnc-dev | |
8934fac merge in mnc-release history after reset to mnc-dev | |
d06607b merge in mnc-release history after reset to mnc-dev | |
7745275 merge in mnc-release history after reset to mnc-dev | |
05dc432 merge in mnc-release history after reset to mnc-dev | |
01cec59 merge in mnc-release history after reset to mnc-dev | |
ddbf028 merge in mnc-release history after reset to mnc-dev | |
caa6523 merge in mnc-release history after reset to mnc-dev | |
00cbb64 merge in mnc-release history after reset to mnc-dev | |
b98619e merge in mnc-release history after reset to mnc-dev | |
a106039 merge in mnc-release history after reset to mnc-dev | |
c1cb855 camera: Add AIDL interface for CameraServiceProxy. | |
9dc28cd Allow MediaProvider to traverse /mnt/media_rw. | |
b30dc5c merge in mnc-release history after reset to mnc-dev | |
271f9d2 merge in mnc-release history after reset to mnc-dev | |
324cdd6 Fix sepolicy-analyze libc++.so loading issue w/CTS. | |
project external/sqlite/ | |
d7546c9 merge in mnc-release history after reset to mnc-dev | |
55a53fd merge in mnc-release history after reset to mnc-dev | |
project external/tinyalsa/ | |
5382d9b merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
6f416f0 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
26a32e8 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
caab548 tinymix: Remove the unused parameter from tinymix_set_byte_ctl() | |
f481dc6 tinymix: Support more that 512 bytes in byte control | |
b39bcb4 mixer: add support for TLV based byte controls | |
74f9a58 tinyalsa: unable to set BYTE mixer | |
c90f8e2 tinymix: Add support for setting/getting a binary control | |
7a53049 tinymix: Remove the unused parameter from tinymix_set_byte_ctl() | |
16ee253 tinymix: Support more that 512 bytes in byte control | |
8dd560e mixer: add support for TLV based byte controls | |
b22ae76 tinyalsa: unable to set BYTE mixer | |
effa011 tinymix: Add support for setting/getting a binary control | |
5c9cb35 Add pcm_get_poll_fd | |
3886a87 Export pcm_mmap_avail | |
project external/tremolo/ | |
e97cf75 Check partword is in range for # of partitions am: 0cf80af909 am: 01cadd9f25 am: fff7087bf3 | |
fff7087 Check partword is in range for # of partitions am: 0cf80af909 am: 01cadd9f25 | |
01cadd9 Check partword is in range for # of partitions am: 0cf80af909 | |
0cf80af Check partword is in range for # of partitions | |
project external/webrtc/ | |
d0e5361 Remove __DATE__ and __TIME__ from tracing | |
project external/wpa_supplicant_8/ | |
88f9f9a merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
0cffde9 Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use" into klp-dev am: f5974f2cf3 am: f7df971bc0 am: 5604f5caa4 am: 68cc9467a2 am: 0c96662c27 am: d9d8e396f6 | |
11e9913 Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev am: a8da4f66a6 am: e2e3cab2ba am: dafadb94f6 am: 5f8f208272 am: 832a67d5e0 am: 648e8c98b6 | |
1cf55c3 EAP-pwd peer: Fix last fragment length validation am: 3aa9ad54b1 am: 9c5ac8d9a4 am: bc45429306 am: 5060e1c00b am: c480e21e4f am: b0c3a7cff2 | |
d9d8e39 Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use" into klp-dev am: f5974f2cf3 am: f7df971bc0 am: 5604f5caa4 am: 68cc9467a2 am: 0c96662c27 | |
648e8c9 Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev am: a8da4f66a6 am: e2e3cab2ba am: dafadb94f6 am: 5f8f208272 am: 832a67d5e0 | |
b0c3a7c EAP-pwd peer: Fix last fragment length validation am: 3aa9ad54b1 am: 9c5ac8d9a4 am: bc45429306 am: 5060e1c00b am: c480e21e4f | |
0c96662 Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use" into klp-dev am: f5974f2cf3 am: f7df971bc0 am: 5604f5caa4 am: 68cc9467a2 | |
832a67d Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev am: a8da4f66a6 am: e2e3cab2ba am: dafadb94f6 am: 5f8f208272 | |
c480e21 EAP-pwd peer: Fix last fragment length validation am: 3aa9ad54b1 am: 9c5ac8d9a4 am: bc45429306 am: 5060e1c00b | |
68cc946 Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use" into klp-dev am: f5974f2cf3 am: f7df971bc0 am: 5604f5caa4 | |
5f8f208 Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev am: a8da4f66a6 am: e2e3cab2ba am: dafadb94f6 | |
5060e1c EAP-pwd peer: Fix last fragment length validation am: 3aa9ad54b1 am: 9c5ac8d9a4 am: bc45429306 | |
5604f5c Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use" into klp-dev am: f5974f2cf3 am: f7df971bc0 | |
dafadb9 Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev am: a8da4f66a6 am: e2e3cab2ba | |
bc45429 EAP-pwd peer: Fix last fragment length validation am: 3aa9ad54b1 am: 9c5ac8d9a4 | |
f7df971 Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use" into klp-dev am: f5974f2cf3 | |
e2e3cab Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev am: a8da4f66a6 | |
9c5ac8d EAP-pwd peer: Fix last fragment length validation am: 3aa9ad54b1 | |
f5974f2 Merge "WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use" into klp-dev | |
a8da4f6 Merge "EAP-pwd server: Fix last fragment length validation" into klp-dev | |
1e9857b WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use | |
c61bad6 EAP-pwd server: Fix last fragment length validation | |
3aa9ad5 EAP-pwd peer: Fix last fragment length validation | |
7440d81 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e80112a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ec63869 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
bcb09cb merge in mnc-dr-release history after reset to mnc-dr-dev | |
7b37693 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1937b3a merge in mnc-dr-release history after reset to mnc-dr-dev | |
4c2415c merge in mnc-dr-release history after reset to mnc-dr-dev | |
6766588 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6950110 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a8e7f85 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ec6ffca merge in mnc-dr-release history after reset to mnc-dr-dev | |
33cc452 merge in mnc-release history after reset to mnc-dev | |
a83ff17 merge in mnc-release history after reset to mnc-dev | |
project frameworks/av/ | |
2394f8c merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ce81b9d merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
89a82d4 Fix security vulnerability in ICrypto DO NOT MERGE | |
424c120 libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. | |
6eb322e DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 am: 2c59cc083d -s ours am: c653d2f19e am: 62646f8c4b | |
62646f8 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 am: 2c59cc083d -s ours am: c653d2f19e | |
c653d2f DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 am: 2c59cc083d -s ours | |
2c59cc0 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 | |
1856f1f DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 | |
50270d9 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. | |
2dd983d Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: 89bec04cf8 am: f797a48b4c | |
f797a48 Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: 89bec04cf8 | |
89bec04 Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev | |
9c200ee DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours am: e6185af491 am: 3cb2e6732f | |
3cb2e67 DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours am: e6185af491 | |
e6185af DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours | |
fe2d80d DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab | |
8348718 DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c | |
22f824f Fix security vulnerability in ICrypto DO NOT MERGE | |
91a23ed DO NOT MERGE nuplayer: do not use cached source for wvm content | |
6888943 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3 am: 0357d3503f | |
0357d35 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3 | |
6d3f50d DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours | |
8f283a8 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 | |
b3d6d88 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 am: b51610971c | |
9161b6a DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 | |
b516109 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 | |
975bb62 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours | |
92edb17 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours | |
569d39f Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 | |
f4dfde9 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b | |
adfda28 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 | |
c565559 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours | |
bb1809a Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours | |
208bc47 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 | |
ba49fda Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 | |
0c4d693 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev | |
3d6a714 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread | |
517246b DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 am: 2048dd5483 -s ours am: 7a2dbcd38b am: f766fdb625 | |
f766fdb DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 am: 2048dd5483 -s ours am: 7a2dbcd38b | |
7a2dbcd DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 am: 2048dd5483 -s ours | |
2048dd5 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 | |
d7c5ee0 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 am: b7e63bfadb | |
e0c9d8a DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea | |
b7e63bf DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 | |
db76a87 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours | |
e3bbe23 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours | |
862b693 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 | |
dd4576b DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 | |
4c0d243 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours | |
bed81d6 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 | |
9e1d775 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 | |
4b56fa1 libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 am: bee48d7956 | |
e4223a8 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours | |
bee48d7 libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 | |
3e8e134 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 | |
6afc659 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. | |
0462975 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. | |
69bd1cf libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. | |
19c47af DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread | |
803a615 libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223 | |
fc39dd9 Don't place large objects on the stack | |
87f8cbb libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. | |
4a97c43 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
32df25f DO NOT MERGE ANYWHERE Change Smaug volume curve | |
83a22c5 Merge "Reduce lock time for dump to make sure not locked when calling back to IResourceManagerClient." into mnc-dr-dev | |
a0f1141 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
1d29e12 Merge "ALooper::awaitResponse gets reply and returns immediately if the looper is stopped." into mnc-dr-dev | |
cfc6b1f merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
7cffac5 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
f6224de Merge "Revert "Revert "audio policy: bind setMode() and setPhoneState() operations""" into mnc-dev am: 681bc45d25 | |
8c5b71c Merge "Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""" into mnc-dev am: 6919fbe40d | |
681bc45 Merge "Revert "Revert "audio policy: bind setMode() and setPhoneState() operations""" into mnc-dev | |
6919fbe Merge "Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""" into mnc-dev | |
1fcbd9b Merge "Revert "AudioPolicyService: fix race in AudioCommandThread"" into mnc-dev am: cda4871486 | |
fd16414 Merge "Revert "audio policy: bind setMode() and setPhoneState() operations"" into mnc-dev am: be6f10c049 | |
3994ffd Revert "Revert "audio policy: bind setMode() and setPhoneState() operations"" | |
a754b4f Revert "Revert "AudioPolicyService: fix race in AudioCommandThread"" | |
cda4871 Merge "Revert "AudioPolicyService: fix race in AudioCommandThread"" into mnc-dev | |
be6f10c Merge "Revert "audio policy: bind setMode() and setPhoneState() operations"" into mnc-dev | |
26ce11a Revert "audio policy: bind setMode() and setPhoneState() operations" | |
75c82b5 Revert "AudioPolicyService: fix race in AudioCommandThread" | |
76d4c7f Reduce lock time for dump to make sure not locked when calling back to IResourceManagerClient. | |
b49c385 ALooper::awaitResponse gets reply and returns immediately if the looper is stopped. | |
adb199a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8e493bb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
eb8ec4f merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9485dc3 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
51bd168 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
04f3afe merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e5fe953 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
0ca9ccb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
3309dbd merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2afe0d2 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8ba2376 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a7c17fc merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
fa123b2 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
dae5f9a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c1036f8 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
88b0863 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f84e11a Revert "Do not acknowledge flush() on start() for static tracks" | |
1901c4f merge in mnc-dr-release history after reset to mnc-dr-dev | |
448cb39 merge in mnc-dr-release history after reset to mnc-dr-dev | |
66d1429 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fd4d192 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5292fe5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1fca1f2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
685a58a merge in mnc-dr-release history after reset to mnc-dr-dev | |
c3592f2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b4ee8a7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
7c53bf9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6cca3d5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
355a0d1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e3b028c merge in mnc-dr-release history after reset to mnc-dr-dev | |
3f569db merge in mnc-dr-release history after reset to mnc-dr-dev | |
82f9381 merge in mnc-dr-release history after reset to mnc-dr-dev | |
82afe8c merge in mnc-dr-release history after reset to mnc-dr-dev | |
5a12d0a merge in mnc-dr-release history after reset to mnc-dr-dev | |
453ef12 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6f77589 merge in mnc-dr-release history after reset to mnc-dr-dev | |
38e106f merge in mnc-dr-release history after reset to mnc-dr-dev | |
7ec2f28 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d7524c6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4dcacac merge in mnc-dr-release history after reset to mnc-dr-dev | |
70575fa merge in mnc-dr-release history after reset to mnc-dr-dev | |
12dcc60 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8626bc8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5430ec7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b960ee9 SoftAVCDec: init decoder using updated size | |
project frameworks/base/ | |
28c9433 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
427787f merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
a069bf6 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread | |
8c3600d merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
c8e5a45 Mark Pixel C keyboard as having hardware autorepeat | |
b431f4b Mark Pixel C keyboard as having hardware autorepeat | |
90a0a58 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 | |
add4b91 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d | |
69c5e71 Merge "Camera: codegen doc update" into mnc-dev | |
b7f35e2 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c am: 7c798c13a7 | |
7c798c1 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c | |
0a887bc DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread | |
5fdf0a1 Camera: codegen doc update | |
53e1113 IME switcher visibility should ignore aux IMEs. | |
b0ebff3 Tweak the conditions to hide IME switcher icon. | |
5b6d213 DO NOT MERGE: Don't throw RuntimeException in user dir delegations. | |
cca67ca Merge changes Iadec2950,I6d818f5a into mnc-dr-ryu-dev | |
82ea0fd IME switcher visibility should ignore aux IMEs. | |
a900b91 Import translations. DO NOT MERGE am: bddde9b83d -s ours | |
bddde9b Import translations. DO NOT MERGE | |
b296136 Tweak the conditions to hide IME switcher icon. | |
6df837a better notification speed change | |
4f1c9cc Better focus logic | |
98c9c55 Discrete modes for touch or key traversal | |
30f9a27 removed doze | |
4d46003 disable alt-tab traversal when touching | |
2b07093 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 | |
974f805 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 | |
b776891 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 | |
33c1718 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 | |
d3b6e2d Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 | |
42faa22 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd | |
0b54263 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 | |
41f5797 better notification speed change | |
f1f45fe Don't use framework permission strings for netd permissions. | |
5ed4008 Better focus logic | |
e1d9bb6 Discrete modes for touch or key traversal | |
9e13bbe removed doze | |
3d418fe disable alt-tab traversal when touching | |
92da2e6 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 | |
08ed2bc DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 | |
18a2ac0 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours | |
bd23716 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 | |
614ea46 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de | |
4d89fe5 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 | |
313c7b2 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 | |
4aa1e48 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev | |
07d7a06 Merge "DO NOT MERGE: Don't throw RuntimeException in user dir delegations." into mnc-dr-ryu-dev | |
6dbe8b6 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
3bcea8d Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae | |
ccfcb63 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 | |
abea6dc Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev | |
618d99d Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 | |
0691d16 Camera: Minor documentation update am: 0b6e1bfae8 | |
39c7804 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
0b6e1bf Camera: Minor documentation update | |
333db2e DO NOT MERGE. Prevent recents from coming up when in SUW | |
84669ca DO NOT MERGE. Prevent recents from coming up when in SUW | |
e7e7261 Merge "border animation revisions" into mnc-dr-ryu-dev | |
1ad85f7 border animation revisions | |
5083f79 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 | |
ef15ca8 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 | |
d45a18c 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 | |
32265b9 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 | |
fa68593 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 | |
b133b98 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 | |
3e9f2b7 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d | |
dce0f80 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev | |
bb4da4e Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev | |
bd92ec8 Merge "Revert "renderthread: add EGL_EXT_buffer_age support"" into mnc-dr-ryu-dev | |
d2f7abe Revert "renderthread: add EGL_EXT_buffer_age support" | |
38c9503 Merge "renderthread: add EGL_EXT_buffer_age support" into mnc-dr-ryu-dev | |
abad1cf Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 | |
c4a9c31 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 | |
c9eb8b4 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b | |
64bdb9f Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d | |
2d5e8fb Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 | |
359ee7f Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e | |
69ee300 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c | |
bf29f10 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 | |
af5c9f8 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc | |
44368e6 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af | |
c455148 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 | |
f5f03a1 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 | |
6d13650 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f | |
a0d20db Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 | |
cc7c1d3 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 | |
34b700a Sync extras bundle comparison can throw NPE am: c0f39c1ece | |
294611f Sync extras bundle comparison can throw NPE am: 2f137b7705 | |
4b8fc30 renderthread: add EGL_EXT_buffer_age support | |
b86d2a7 Merge "Added border to focus state" into mnc-dr-ryu-dev | |
f4164d6 Added border to focus state | |
929b9a9 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am: 5b6ad87630 | |
ccbe738 Don't allow contact sharing by default for device not recognized as carkit. | |
5b6ad87 Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev | |
92fe1a0 More cleanup | |
6d6cfc0 Code cleanup | |
2f137b7 Sync extras bundle comparison can throw NPE | |
0ce84f0 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
7a0b2f1 Optimize the condition to show IME switcher. | |
f059c88 Fixed recents animation bugs | |
45b349c Merge "Fixed double focus animation" into mnc-dr-ryu-dev | |
467c378 Fixed double focus animation | |
8acbebe Camera: Documentation updates am: d8407271ff am: 37e78cf8f1 | |
37e78cf Camera: Documentation updates am: d8407271ff | |
d840727 Camera: Documentation updates | |
3ca51b4 Merge "Adjusted animation timing" into mnc-dr-ryu-dev | |
6eeaf8f Adjusted animation timing | |
07533db Don't allow contact sharing by default for device not recognized as carkit. | |
4604ce5 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001 | |
88d4cc1 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev | |
05ce0c6 Revert "Fix race condition when setting default ringtones" | |
435b5c0 Change search key behavior for Ryu | |
f183de2 Merge "Limited number of Recents" into mnc-dr-ryu-dev | |
ca298ff Limited number of Recents | |
9e89117 DO NOT MERGE: Don't throw RuntimeException in user dir delegations. | |
a7df771 DO NOT MERGE Ensure that the device is provisioned before showing Recents. | |
16a76da DO NOT MERGE Ensure that the device is provisioned before showing Recents. | |
f2f5340 Import translations. DO NOT MERGE am: 984f7fb960 -s ours | |
7b317f4 Import translations. DO NOT MERGE | |
984f7fb Import translations. DO NOT MERGE | |
c0f39c1 Sync extras bundle comparison can throw NPE | |
4c7a637 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
90555cd Revert "Limited number of recent tasks to 10" | |
0ac7518 Revert "16 recents" | |
b4272ad 16 recents | |
0d7f35a Modified focus state | |
5b6eda3 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
9941c0a Merge "Moved navigation bar buttons" into mnc-dr-ryu-dev | |
fdcc4f4 Moved navigation bar buttons | |
4277b84 Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2 | |
00765ef Merge "Block directory selection in openable modes." into mnc-dr-dev | |
82d4214 Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed | |
83702ec Merge "Fix race condition when setting default ringtones" into mnc-dr-dev | |
5aece45 Import translations. DO NOT MERGE am: 49eeda33dd -s ours | |
25d209d Import translations. DO NOT MERGE | |
49eeda3 Import translations. DO NOT MERGE | |
864c035 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
6f78c09 Merge "Add ability to cancel task window transitions." into mnc-dr-ryu-dev | |
00fe5dd Add ability to cancel task window transitions. | |
f2cb934 Fix race condition when setting default ringtones | |
7ecaea8 Block directory selection in openable modes. | |
6c12c3a SystemUI: implement bluetooth scan timeout | |
42e8ca9 Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am: 0cf48e9120 | |
adbee2b Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am: e10faaa410 | |
0cf48e9 Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev | |
e10faaa Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev | |
beef211 Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am: 76d20b4a5c | |
76d20b4 Merge "When the incoming light source is invalid, don't generate any shadow" into mnc-dr-dev | |
f131e1a Kick movement preconditions onto handler thread. | |
e0fa747 Revert "Remove -ffast-math from libhwui makefile" | |
d97b8bd Merge "Bandaid over broken keyboard layout selection process." into mnc-dr-ryu-dev | |
b39f95c merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
cf22d18 When the incoming light source is invalid, don't generate any shadow | |
bba0011 Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am: c8bb39d98d | |
c8bb39d Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev | |
4a4f56a Merge "Early return when the scale is 0." into mnc-dr-dev am: 10eb6ab94b | |
10eb6ab Merge "Early return when the scale is 0." into mnc-dr-dev | |
e581d60 Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am: c4aaf0f4b8 | |
c4aaf0f Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev | |
8181ec8 Merge "Import translations. DO NOT MERGE" into mnc-dr-ryu-dev | |
cdce35a Early return when the scale is 0. | |
214d3a6 Merge "Limited number of recent tasks to 10" into mnc-dr-ryu-dev | |
e02ec7c Remove -ffast-math from libhwui makefile | |
6744219 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7 -s ours | |
e99cb8b Import translations. DO NOT MERGE | |
8e7ab07 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
f8f111f Import translations. DO NOT MERGE | |
fcdd2bb Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b | |
1e1fbd8 Merge "Revert "Use clang for libhwui"" into mnc-dr-dev | |
492a56c Revert "Use clang for libhwui" | |
d7100be Import translations. DO NOT MERGE am: 4c9cdbc7ba -s ours | |
1521b11 Import translations. DO NOT MERGE | |
4c9cdbc Import translations. DO NOT MERGE | |
f3ec536 Bandaid over broken keyboard layout selection process. | |
db3184e merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
0394a0c Convert ashmem bitmap thresholds to constants. | |
afdc6b1 Limited number of recent tasks to 10 | |
d1d5c15 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 | |
966d604 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev | |
7f09de2 Merge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d | |
61c93eb Merge "Use clang for libhwui" into mnc-dr-dev | |
d354fd2 Use clang for libhwui | |
0a4bde1 Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e4984505 | |
71e4984 Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev | |
8cee7c1 Limit persistent ashmem backed fds to a minimum of 128kB. | |
6b96538 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
e3264db Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am: 1942be506e | |
1942be5 Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev | |
3c5b37b Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am: 8b86c76296 | |
8b86c76 Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev | |
502aeb6 Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am: b57c65b00e | |
b57c65b Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev | |
cb49857 Fixed a bug where the panel could get stuck closing am: b0e4f9e97e | |
fcc95a6 Fix issue #25357209: Could not send SMS or MMS messages, had to reboot | |
f149dcb Fix a crash while printing ICCID because of alphabets in UICC. | |
b0e4f9e Fixed a bug where the panel could get stuck closing | |
bcbca11 Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev am: a47f9dad2b | |
a47f9da Merge "Don't try overriding system fixed permissions on install" into mnc-dr-dev | |
4f7883c Don't try overriding system fixed permissions on install | |
2dd3ff2 Merge "Allow verifier to grant permissions" into mnc-dr-dev am: cfa233eefb | |
cfa233e Merge "Allow verifier to grant permissions" into mnc-dr-dev | |
3ffb08a Improve comment on EXTRA_CALL_RAT_TYPE. | |
239795de PackageSettingBase needs to copy volume UUID. am: 3b1c6e03f6 | |
957de05 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
3b1c6e0 PackageSettingBase needs to copy volume UUID. | |
cafd74e Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev am: a975732a83 | |
a975732 Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev | |
66a1bb4 Merge "Fixed task focus bug." into mnc-dr-ryu-dev | |
d8989cc Fixed task focus bug. | |
cf9f5ae Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev am: 4ec415800f | |
4ec4158 Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev | |
e2ed23e Handle "uninstalled" apps when pruning app-ops. | |
3b0437e IMS: Support For Per-Call RAT Info | |
8c84217 NetworkTimeUpdateService: Grab a wakelock when manipulating system time | |
7bddf5a Allow verifier to grant permissions | |
868fc2c Get rid of getTypesVisibleToCaller log spam. am: 02bffab9dc | |
3c3bf88 Merge "Made alt-tab loop." into mnc-dr-ryu-dev | |
02bffab Get rid of getTypesVisibleToCaller log spam. | |
5ffa3a1 Merge "Disable the search bar in Recents." into mnc-dr-ryu-dev | |
748e9ad Disable the search bar in Recents. | |
a03c9f6 Made alt-tab loop. | |
21b5a01 UsbDeviceManager: set mUsbDataUnlocked=false on user switch am: 5701321701 | |
5701321 UsbDeviceManager: set mUsbDataUnlocked=false on user switch | |
4f3ca35 Import translations. DO NOT MERGE am: c3cd7b1585 -s ours | |
168e980 Import translations. DO NOT MERGE | |
c3cd7b1 Import translations. DO NOT MERGE | |
2866bf1 Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d | |
1a87f3b merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
a2cc047 Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev | |
7611f1c Don't crash if a DHCP server doesn't send the server ID option. | |
511a24f Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a | |
416d24e Merge "Import translations. DO NOT MERGE" into mnc-dr-ryu-dev | |
d1304d3 Import translations. DO NOT MERGE | |
2cdcb04 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours | |
a149d78 Import translations. DO NOT MERGE am: b8afc77c0a -s ours | |
c571ea3 Import translations. DO NOT MERGE | |
ae11192 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
7563f6f Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21 | |
8b34fd7 Fix issue #25289999: Lower device idle alarm limit to 10 mins. am: 7682b26ea1 | |
b0c66f4 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
dc0d8b7 Merge "Import translations. DO NOT MERGE" into mnc-dr-ryu-dev | |
c47ae11 Import translations. DO NOT MERGE | |
428248b Merge "Import translations. DO NOT MERGE" into mnc-dr-ryu-dev | |
4471395 Import translations. DO NOT MERGE | |
096853e Merge "Import translations. DO NOT MERGE" into mnc-dr-ryu-dev | |
7bfa53b Merge "Import translations. DO NOT MERGE" into mnc-dr-ryu-dev | |
9603389 Import translations. DO NOT MERGE | |
16a2a10f Import translations. DO NOT MERGE | |
6d2b5f2 Merge "Import translations. DO NOT MERGE" into mnc-dr-ryu-dev | |
09dc098 Import translations. DO NOT MERGE | |
9b8889a Merge "Import translations. DO NOT MERGE" into mnc-dr-ryu-dev | |
45753a2 Import translations. DO NOT MERGE | |
b6b6c74 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 14bb0511c6 -s ours | |
b68e327 Merge "Import translations. DO NOT MERGE" into mnc-dr-ryu-dev | |
3c7e687 Import translations. DO NOT MERGE am: f6fc9e2152 -s ours | |
af2ce88 Import translations. DO NOT MERGE | |
ce13042 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
4062f5a Prevent recents from coming up when in SUW | |
333e32b SystemUI: fix automatic pairing of BT keyboards | |
44d8712 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a918db7 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c853911 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
304b421 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
6eea9f2 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5fb2d76 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
131cb6b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
df48755 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c3d927e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
48f7ad1 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
d35ae2e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
d7bddda merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
673f267 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9a7e779 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e916dba merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
1feabf1 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
883999e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2dedaff merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f31daeb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
0301a56 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5162a1d Add to configure for MDC_INITIAL_MAX_RETRY | |
30ed8ca Add op package to the UID special case handling in account manager. | |
ff5f879 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2f68422 Add carrier config for specifying invalid characters. | |
9bacb63 merge in mnc-dr-release history after reset to mnc-dr-dev | |
daddf6d merge in mnc-dr-release history after reset to mnc-dr-dev | |
287c3aa merge in mnc-dr-release history after reset to mnc-dr-dev | |
da527ef Do not show roaming icon for some operators of Chile | |
a397bfb merge in mnc-dr-release history after reset to mnc-dr-dev | |
fbe18f6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
898db05 Fix broken enter key after failed PIN attempts. | |
60240dd merge in mnc-dr-release history after reset to mnc-dr-dev | |
0f1848c Fixed a bug where the secure camera would flash when rotated | |
541ada3 BatteryStats: Start using cpu power from kernel | |
f483918 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c01b38e merge in mnc-dr-release history after reset to mnc-dr-dev | |
7f2a7b7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f9f7161 Fix NPE in AR hardware binding sequence. b/22772433 | |
2c13575 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9846424 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f4221f1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
68696a9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ffdc2ad Translate ripple mask to account for drawable bounds | |
12309ab merge in mnc-dr-release history after reset to mnc-dr-dev | |
971ddf0 Fix wakelock leak for dozing | |
c9d39ff merge in mnc-dr-release history after reset to mnc-dr-dev | |
34d580e Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest | |
ac60ded merge in mnc-dr-release history after reset to mnc-dr-dev | |
5a95f97 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f3bf5d4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2c9dc42 merge in mnc-dr-release history after reset to mnc-dr-dev | |
812723e merge in mnc-dr-release history after reset to mnc-dr-dev | |
b032495 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0f515af Avoid use-after-free race condition when rebasing theme | |
9c2f76c merge in mnc-dr-release history after reset to mnc-dr-dev | |
7cab659 merge in mnc-dr-release history after reset to mnc-dr-dev | |
7bd0f82 merge in mnc-dr-release history after reset to mnc-dr-dev | |
49db74f Don't dispatch when non-interactive and the display is off. | |
6a09a63 merge in mnc-dr-release history after reset to mnc-dr-dev | |
da4371d Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup"" | |
f4fcfd2 Fix app ops regressions introduced by the per UID policy change | |
3236730 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c9cbe42 Fix crash in kModeProcessNoContext | |
ff2b059 Ensure per package and per UID state share same package settings. | |
1dac151 Remove spurious syncmanager wake-ups | |
b6ead7d Revert "Permissions: GET_ACCOUNTS permission cleanup" | |
a430b90 merge in mnc-dr-release history after reset to mnc-dr-dev | |
419bc8f Expand ringtone titles to support OGG and FLAC. | |
f346540 Fix NPE in AppOpsService | |
52d1a6b Bug: 22879202 App compatibility with WRITE_SETTINGS failing | |
80c8865 media: Clarify MediaCodec and CodecCapabilities documentation | |
ff2828d merge in mnc-dr-release history after reset to mnc-dr-dev | |
e08a3c8 Fix SysUI crash on device boot. | |
f3e2dff Make DateTimeView more robust to weird contexts. | |
2b3dfd4 Make the RemoteViews context safe for Icons. | |
12097ac BatteryStats: include mobile radio active count and unknown time in checkin | |
332d06a Add OrSelf to privileged permission check. | |
7edc103 Introduced android.permission.PEERS_MAC_ADDRESS permission | |
e576ebe DateTimeView: don't assume you have an ApplicationContext. | |
6bec2f7 Include non-zero dimension views in excess space calculation | |
5b2e4ce merge in mnc-dr-release history after reset to mnc-dr-dev | |
879a66b Default grants: handle update system packages | |
4d2ce01 Revert "Call getInstanceForPackage instead of creating a new SensorManager instance." | |
720b2cd Work on issue #22765972: Binder transactions running out of address... | |
4604e78 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d38e654 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9171700 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b217d8a merge in mnc-dr-release history after reset to mnc-dr-dev | |
7bd8a98 merge in mnc-dr-release history after reset to mnc-dr-dev | |
be0acad DO NOT MERGE Enhance local log. | |
cb185b1 Properly synchronize interactivity state. | |
153d712 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1c41d9d UsageStats: Gracefully handle corrupt filenames | |
66bf17de Don't crash sysui when advisory calls fail. | |
2b97520 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6edf339 Add callback to voice interaction session for lockscreen shown | |
37e3d18 merge in mnc-dr-release history after reset to mnc-dr-dev | |
290909e merge in mnc-dr-release history after reset to mnc-dr-dev | |
cca016b Do not auto grant GET_ACCOUNTS as it is temporarily normal | |
664794d Temporary lower GET_ACCOUNTS protection level | |
1f2e9c5 DefaultPermission: GET_ACCOUNTS is now in CONTACTS | |
758a49b merge in mnc-dr-release history after reset to mnc-dr-dev | |
4becfb4 Make sure we get valid package name or fail. | |
0a8cea3 Grant default permissions to the setup app robustly. | |
ac3f531 Give DCS permission needed to measure all users. | |
018f089 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d41c1bc BatteryStats: Remove uid_cputime Slog.wtf for high cpu times | |
f340a22 Clear binder id when determining external storage state | |
e38a963 Add checks for READ_PRIVILEGED_PHONE_STATE. | |
221b85f Prevent null allowableAccounts from crashing | |
906cf82 media: Implement getAchievableFrameRatesFor with measured frame rate. | |
6bf2b72 merge in mnc-dr-release history after reset to mnc-dr-dev | |
364c76e Check user state after clearing identity. | |
0e086d9 Fix new user creation regression due to vold remount calls | |
32b155d merge in mnc-dr-release history after reset to mnc-dr-dev | |
5b62200 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1818e74 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3a515e4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6d2f77a Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" | |
7f0ec89 merge in mnc-dr-release history after reset to mnc-dr-dev | |
16324a6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b0aafa0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6560052 Fetch the Bluetooth name and address without enabling the whole stack | |
08559d9 Debug logging for a certain class of binder transaction failures | |
942e2d1 Fix opening secured networks from QS | |
1c1ae5d Fix FloatingToolbar flickers. | |
99c9d77 Patch up certain kinds of broken notifications. | |
d6ff9a4 Write packages.list when granting permissions. | |
52f6709 GetInstalledProvidersForProfiles should never return null object. | |
2454e76 SubscriptionManager: Fix NPE in getSimStateForSlotIdx | |
7eba08f Use consistent cases for aliases in AndroidKeystoreBCWorkaround. | |
a987271 Fixes for Region_writeToParcel. | |
ab816f2 merge in mnc-release history after reset to mnc-dev | |
b870b72 merge in mnc-release history after reset to mnc-dev | |
fa8058d Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM. | |
7c40a8b Fix null deref | |
0c05f3c Changed BugReportReceiver to send zipped bugreports. | |
f2d1e79 merge in mnc-release history after reset to mnc-dev | |
99df903 merge in mnc-release history after reset to mnc-dev | |
cd9fb20 merge in mnc-release history after reset to mnc-dev | |
19913fc merge in mnc-release history after reset to mnc-dev | |
d4046dd merge in mnc-release history after reset to mnc-dev | |
7ec39a9 Revert write secure settings permission protection level. | |
54d387c Check targetSdkVersion when passing size hints for UNSPECIFIED specs | |
3cfc49a Protect against null detail record. | |
project frameworks/compile/slang/ | |
9b000b1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fdaa95f merge in mnc-dr-release history after reset to mnc-dr-dev | |
6cfe559 merge in mnc-dr-release history after reset to mnc-dr-dev | |
82f2590 merge in mnc-dr-release history after reset to mnc-dr-dev | |
41660b2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
13b2644 merge in mnc-release history after reset to mnc-dev | |
6c2740a merge in mnc-release history after reset to mnc-dev | |
36a8744 merge in mnc-release history after reset to mnc-dev | |
project frameworks/data-binding/ | |
95a7ee2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
20a5232 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f318be9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ccbb3a4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a565bbc merge in mnc-dr-release history after reset to mnc-dr-dev | |
235b2ce merge in mnc-dr-release history after reset to mnc-dr-dev | |
5db2cbd merge in mnc-dr-release history after reset to mnc-dr-dev | |
4ffd5b6 merge in mnc-release history after reset to mnc-dev | |
0527597 merge in mnc-release history after reset to mnc-dev | |
4c412ab merge in mnc-release history after reset to mnc-dev | |
d2d32ed merge in mnc-release history after reset to mnc-dev | |
project frameworks/minikin/ | |
482f287 Avoid integer overflows in parsing fonts | |
3f089f8 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
c65e6f1 Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE | |
7be825c merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
adaf42f Accept variation selector in emoji sequences - DO NOT MERGE | |
04b8c2b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e621aed merge in mnc-dr-release history after reset to mnc-dr-dev | |
bbe5277 merge in mnc-dr-release history after reset to mnc-dr-dev | |
be45720 merge in mnc-dr-release history after reset to mnc-dr-dev | |
85af219 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0dd5b61 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c03e25e merge in mnc-dr-release history after reset to mnc-dr-dev | |
5c6e6dd merge in mnc-dr-release history after reset to mnc-dr-dev | |
8fd5e9c merge in mnc-release history after reset to mnc-dev | |
a5f0c0e merge in mnc-release history after reset to mnc-dev | |
project frameworks/native/ | |
82ac05c merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
d475cd3 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
679f34f DO NOT MERGE: dumpstate: execute procrank using su | |
ebdb8d4 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
0fa1c5e Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am: f1de4547c1 am: 37b8c1f77c | |
37b8c1f Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am: f1de4547c1 | |
f1de454 Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev | |
521dea3 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
afe5555 SF: more DispSync improvements. | |
9ad6ed1 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
c449da2 SF: use first sample timestamp as reference. | |
db7a9ae merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ccd90a4 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
bc6d961 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a6e8a36 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
26712f3 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2afa512 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e4e5c69 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ec75cfb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ee2df3b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
54fae32 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2aa10cb merge in mnc-dr-release history after reset to mnc-dr-dev | |
727b89f merge in mnc-dr-release history after reset to mnc-dr-dev | |
f348545 merge in mnc-dr-release history after reset to mnc-dr-dev | |
60d808a merge in mnc-dr-release history after reset to mnc-dr-dev | |
ade9b18 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0f98198 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b337350 merge in mnc-dr-release history after reset to mnc-dr-dev | |
bcaa8d5 OMX: clarify EOS signaling for tunneled decoders | |
f7cff9c merge in mnc-dr-release history after reset to mnc-dr-dev | |
f71a825 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e0ea7db merge in mnc-dr-release history after reset to mnc-dr-dev | |
5a373bb Revert "Bug fix in SensorManager." | |
cce3fae merge in mnc-dr-release history after reset to mnc-dr-dev | |
122baf6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5fbeece merge in mnc-dr-release history after reset to mnc-dr-dev | |
58d353a merge in mnc-dr-release history after reset to mnc-dr-dev | |
5526b6e merge in mnc-dr-release history after reset to mnc-dr-dev | |
2061378 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d0ac3c6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fd92b5d merge in mnc-dr-release history after reset to mnc-dr-dev | |
83265b5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
16beb86 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b9a1fd5 merge in mnc-release history after reset to mnc-dev | |
555a1c6 merge in mnc-release history after reset to mnc-dev | |
7e428b1 merge in mnc-release history after reset to mnc-dev | |
ca53c1a merge in mnc-release history after reset to mnc-dev | |
54c55f3 merge in mnc-release history after reset to mnc-dev | |
db86386 merge in mnc-release history after reset to mnc-dev | |
50c0897 merge in mnc-release history after reset to mnc-dev | |
3c1ee1e merge in mnc-release history after reset to mnc-dev | |
c4fad89 merge in mnc-release history after reset to mnc-dev | |
b1874e3 merge in mnc-release history after reset to mnc-dev | |
302c708 merge in mnc-release history after reset to mnc-dev | |
8a715c6 Revert "Modify EGL to disconnect the window when the surface gets destroyed." | |
f7ac9a3 merge in mnc-release history after reset to mnc-dev | |
1eb8b67 merge in mnc-release history after reset to mnc-dev | |
a1a7ad6 merge in mnc-release history after reset to mnc-dev | |
3734dcc merge in mnc-release history after reset to mnc-dev | |
1dbae14 merge in mnc-release history after reset to mnc-dev | |
dbbad2e merge in mnc-release history after reset to mnc-dev | |
a3dfcda merge in mnc-release history after reset to mnc-dev | |
37c6aaa Fix broken NDK sensor manager API. | |
6d09ca8 libgui: Clear frame number while freeing slot | |
project frameworks/opt/net/ims/ | |
35339f6 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
b2d14ca merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9298c62 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
6734cfa Fix typos | |
project frameworks/opt/net/voip/ | |
3d9980b merge in mnc-dr-release history after reset to mnc-dr-dev | |
7227a99 merge in mnc-release history after reset to mnc-dev | |
11d941a Fix JNI registration error | |
project frameworks/opt/net/wifi/ | |
2db1fea merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
885561d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a887435 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
7bd0ee7 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
4ac1219 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
7d3e33e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c671e30 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
896327c merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ec14b8e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5a10f41 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
d3739b5 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ff0d8da merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2c546e9 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
60c6558 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
141ed6c merge in mnc-dr-release history after reset to mnc-dr-dev | |
23b9a7d merge in mnc-dr-release history after reset to mnc-dr-dev | |
81aeb60 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4ed7285 merge in mnc-dr-release history after reset to mnc-dr-dev | |
74624a9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3f50746 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e9e2d50 merge in mnc-dr-release history after reset to mnc-dr-dev | |
dd6f8a8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c8dc708 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3d6346a merge in mnc-dr-release history after reset to mnc-dr-dev | |
8fa8c8a merge in mnc-dr-release history after reset to mnc-dr-dev | |
4a5c85d merge in mnc-dr-release history after reset to mnc-dr-dev | |
b45ea79 merge in mnc-dr-release history after reset to mnc-dr-dev | |
56dd034 merge in mnc-dr-release history after reset to mnc-dr-dev | |
16cb0c9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
26ead5b merge in mnc-dr-release history after reset to mnc-dr-dev | |
c2c3e4e merge in mnc-dr-release history after reset to mnc-dr-dev | |
7113fa4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6c2c1bd merge in mnc-dr-release history after reset to mnc-dr-dev | |
2b31a45 Allow active network scorer access to scan results. | |
25849cf Use PEERS_MAC_ADDRESS permission instead of isSystemProcess | |
d3e5035 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8a2c847 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0e4f552 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a5c7737 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d4d1097 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1b522db merge in mnc-dr-release history after reset to mnc-dr-dev | |
b29cd16 Synchronize getScanCapabilities() with other commands | |
19e6ba7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0018e95 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0c3995a merge in mnc-dr-release history after reset to mnc-dr-dev | |
bc48f49 merge in mnc-dr-release history after reset to mnc-dr-dev | |
61cff90 Added guard around IMSI parameter. | |
b2267a5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3355869 merge in mnc-dr-release history after reset to mnc-dr-dev | |
98e14a9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
88b3ef4 merge in mnc-release history after reset to mnc-dev | |
c40e2e4 merge in mnc-release history after reset to mnc-dev | |
4f23074 merge in mnc-release history after reset to mnc-dev | |
f969bd5 merge in mnc-release history after reset to mnc-dev | |
3390b41 merge in mnc-release history after reset to mnc-dev | |
d74dd1f Disable long running chronograph thread | |
6a0c7ef merge in mnc-release history after reset to mnc-dev | |
e2e3f07 merge in mnc-release history after reset to mnc-dev | |
9bdb759 Temporarily disable wifi logger | |
7368e7c merge in mnc-release history after reset to mnc-dev | |
71d35cf Fix a null pointer exception in logger | |
499bebc merge in mnc-release history after reset to mnc-dev | |
859cb73 prevent false wifi roaming signal Bug:21617059 | |
442b561 merge in mnc-release history after reset to mnc-dev | |
6736ab8 merge in mnc-release history after reset to mnc-dev | |
a1f7f7f merge in mnc-release history after reset to mnc-dev | |
c950374 Wifi log spam is still a thing | |
ffb8a38 Fix an ANR in WifiSettings | |
a59d8f9 merge in mnc-release history after reset to mnc-dev | |
7cff882 Fix bad logs and a crash while reading configs | |
4edaa6b Indicate failed scans with EXTRA_RESULTS_UPDATED | |
4dd5225 Keep history after reset to undo 2 cherrypicks. | |
bc73c21 Fix bad logs and a crash while reading configs | |
2efb0fe Indicate failed scans with EXTRA_RESULTS_UPDATED | |
ffcef0b Fixed bad network history saving and reading. | |
fe3bce4 Interpret scan-failed event from wpa_supplicant | |
8d44f10 merge in mnc-release history after reset to mnc-dev | |
ffbb785 merge in mnc-release history after reset to mnc-dev | |
58f405c Check for null return from getRingBufferStatus | |
2da5dad create IpReachabilityMonitor only in L2ConnectedState | |
ed9b240 If the interface at start-up isn't valid don't NPE on missing IpReachabilityMonitor | |
b56701c Only notify of new link properties if they are non-null | |
3ec60f1 merge in mnc-release history after reset to mnc-dev | |
09c7e49 merge in mnc-release history after reset to mnc-dev | |
d0f2cb4 merge in mnc-release history after reset to mnc-dev | |
abb6804 merge in mnc-release history after reset to mnc-dev | |
78980d6 Initialize wifi_set_nodfs_flag with a stub | |
50bdd1f merge in mnc-release history after reset to mnc-dev | |
0b1cd62 Fix unhandled CMD_GET_MATCHING_CONFIG | |
0d5b0fb Fix NPE on devices without DPM service | |
project frameworks/opt/photoviewer/ | |
e4b8400 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ddf131a Import translations. DO NOT MERGE | |
15cf10a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8f13dac merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
fa87748 merge in mnc-dr-release history after reset to mnc-dr-dev | |
80a308b merge in mnc-dr-release history after reset to mnc-dr-dev | |
project frameworks/opt/setupwizard/ | |
ec5da38 merge in mnc-dr-release history after reset to mnc-dr-dev | |
712f8c7 merge in mnc-release history after reset to mnc-dev | |
444c1ac merge in mnc-release history after reset to mnc-dev | |
9cf09a6 merge in mnc-release history after reset to mnc-dev | |
8949c76 merge in mnc-release history after reset to mnc-dev | |
b67eb73 merge in mnc-release history after reset to mnc-dev | |
58838e3 merge in mnc-release history after reset to mnc-dev | |
a27d52b merge in mnc-release history after reset to mnc-dev | |
bd1144c merge in mnc-release history after reset to mnc-dev | |
c19fbd1 merge in mnc-release history after reset to mnc-dev | |
b08a337 merge in mnc-release history after reset to mnc-dev | |
e9f7fd5 merge in mnc-release history after reset to mnc-dev | |
b7baec2 merge in mnc-release history after reset to mnc-dev | |
aa7fad3 am 7114577a: [SetupWizard] Add attributes for illustration size | |
b01e885 am a38fab1a: Merge "[SetupWizardLib] Fill viewport on phone portrait" into ub-setupwizard-alatar | |
41aa41a am a2ad0846: [SetupWizardLib] Correct accent colors | |
d3ea068 Merge "Import translations. DO NOT MERGE" | |
8fab689 Import translations. DO NOT MERGE | |
edb6d10 Import translations. DO NOT MERGE | |
191dddc am ef6e202a: Merge "[SetupWizardLib] Update for buildSrc 1.1" into ub-setupwizard-alatar | |
bc92084 am 2152fdf0: [SetupWizard] Update dark theme accent color | |
e13cae8 am 30e6ffd2: Merge "[SetupWizardLib] Update theme colors" into ub-setupwizard-alatar | |
928afc0 am 0fe74b9f: Merge "[SetupWizardLib] Limit header lines" into ub-setupwizard-alatar | |
9455cc7 am 5e79c37f: [SetupWizardLib] Fix shouldMirrorIllustration NPE | |
60e5c1f am 56a19113: [SetupWizardLib] Add isLightTheme method | |
6db1f7f am 0d6c44af: Merge "[SetupWizardLib] Adjust immersive flags for dialogs" into ub-setupwizard-alatar | |
5575246 am 64158e33: [SetupWizardLib] Fix Partner class and tests | |
589209c am d61674ef: [SetupWizardLib] Add progress bar support | |
49c72c5 am e7b519c1: [SetupWizardLib] Fix nav bar button alpha | |
0d73002 Import translations. DO NOT MERGE | |
4525582 am 83c3c518: [SetupWizardLib] Fix setup wizard crash | |
a183f1a am 2cd3a505: Merge "[SetupWizardLib] Add isSetupWizard" into ub-setupwizard-alatar | |
d2abf66 am 6df73450: [SetupWizardLib] Add standalone build file | |
5e9b02e am 9f936767: [SetupWizardLib] Eclair compat build | |
4c4303f am eb0dd6bb: Merge "[SetupWizardLib] Fix back button bug" into ub-setupwizard-alatar | |
533cacf am 504a2f6f: Merge "[SetupWizardLib] Add no-scroll templates" into ub-setupwizard-alatar | |
5e20f62 am ad05462a: (-s ours) Import translations. DO NOT MERGE | |
51910e4 am cbce1423: Merge "[SetupWizardLib] Use AppCompat themes for icsCompat" into ub-setupwizard-alatar | |
2e007de am 2a007876: Merge "[SetupWizardLib] Add getNavigationBar" into ub-setupwizard-alatar | |
cc20d39 am c7033d3c: (-s ours) Import translations. DO NOT MERGE | |
86e4c4c am 779e26ab: (-s ours) Import translations. DO NOT MERGE | |
fb74042 Import translations. DO NOT MERGE | |
9a551bd am a722cfbd: [SetupWizardLib] Flip Illustration for RTL on JB | |
20a4f1a am 2646e1d8: [SetupWizardLib] Changed project hierarchy | |
63b29a6 am 16a7a7a8: Merge "[SetupWizardLib] Implement Partner" into ub-setupwizard-alatar | |
821562b am 97984027: Merge "[SetupWizardLib] Fix tests for tablets" into ub-setupwizard-alatar | |
1527fc6 am 4fe042de: Merge "[SetupWizardLib] Add dist plugin to gradle" into ub-setupwizard-alatar | |
d2681a8 am 62aa3106: [SetupWizardLib] Fix navigation bar theme | |
4119053 am 9fdfbb26: Merge "[SetupWizardLib] Resources for ICS" into ub-setupwizard-alatar | |
7a4ecce am 66cb0cca: [SetupWizardLib] Test ListLayout | |
1603a2a am 3bf68bb0: Merge "[SetupWizardLib] Post checkScroll in BottomScrollView" into ub-setupwizard-alatar | |
ac5a6f1 am 94a6491f: Merge "[SetupWizardLib] Compat for Java code" into ub-setupwizard-alatar | |
f60416f am 170a720f: [SetupWizardLib] Tests | |
77c1959 am 250655b0: Merge "[SetupWizardLib] Rename setBackground" into ub-setupwizard-alatar | |
e1706a1 am 7617968e: [SetupWizardLib] Set up compat build | |
6630883 am cfb8d4ad: (-s ours) Merge "[SetupWizardLib] Mass cherry-pick changes" into ub-setupwizard-alatar | |
e5c011f am 9efb3263: [SetupWizardLib] Configure build server | |
b332804 Merge "[SetupWizardLib] Implement SetupWizardListLayout" | |
c5820f8 [SetupWizardLib] Implement SetupWizardListLayout | |
3e2e08a am f4fea900: [SetupWizardLib] Configure gradle | |
650fc29 Merge "[SetupWizardLib] Remove SetupWizardLayoutHelper" | |
eea7ecd [SetupWizardLib] Configure gradle | |
125bfc3 [SetupWizardLib] Remove SetupWizardLayoutHelper | |
4dad307 [SetupWizardLib] Add more themes | |
2853c9e [SetupWizardLib] Themes and attrs support | |
8d35d7b Merge "[SetupWizardLib] Remove deprecated styles" | |
c71f6fb Merge "[SetupWizardLib] Rename attributes" | |
09546ca [SetupWizardLib] Implement LayoutHelper.setIllustration | |
2536b1e [SetupWizardLib] Remove deprecated styles | |
16876d4 [SetupWizardLib] Rename attributes | |
a630443 am e670270b: (-s ours) am b668cbb3: (-s ours) Import translations. DO NOT MERGE | |
e670270 am b668cbb3: (-s ours) Import translations. DO NOT MERGE | |
b668cbb Import translations. DO NOT MERGE | |
3ab8deb [SetupWizardLib] Implement SetupWizardLayout | |
4ad94c5 [SetupWizardLib] Provide templates in library | |
project frameworks/opt/telephony/ | |
abddaf2 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
d9fb1fe Merge "Set WIFI icon for connection based on connection extra." into mnc-dr-dev | |
6d7e8df Fix a crash while printing ICCID because of alphabets in UICC. | |
2e66c63 Set WIFI icon for connection based on connection extra. | |
1dd5529 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
af7f33e merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
7fab14d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
514091b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8ac785d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
cc39adb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
45f5163 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e6859e8 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
01dc0bc merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
302e4cd merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
95d9367 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a59fcd0 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
354a798 Check MDC_INITIAL_MAX_RETRY to use resource overlay for operators | |
e5efe6a merge in mnc-dr-release history after reset to mnc-dr-dev | |
1079b79 Remove carrier-defined invalid characters from call subjects. | |
e7aba1b merge in mnc-dr-release history after reset to mnc-dr-dev | |
7e36bad merge in mnc-dr-release history after reset to mnc-dr-dev | |
425bd9d merge in mnc-dr-release history after reset to mnc-dr-dev | |
1f5d141 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ca6d1ec In PhoneProxy query voice RAT after CarrierConfig is loaded. | |
28a0cae merge in mnc-dr-release history after reset to mnc-dr-dev | |
d4d4c4f merge in mnc-dr-release history after reset to mnc-dr-dev | |
5efa558 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c381c69 Change to dispose Gsm/CdmaConnection to make sure wakelock is released | |
e75c526 merge in mnc-dr-release history after reset to mnc-dr-dev | |
da7459e merge in mnc-dr-release history after reset to mnc-dr-dev | |
6154670 merge in mnc-dr-release history after reset to mnc-dr-dev | |
87eb4cd merge in mnc-dr-release history after reset to mnc-dr-dev | |
549bf29 Don't set prefer network type on RIL connected. | |
514b7d8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b691a12 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b017cc3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
05b5c68 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ea43e9b merge in mnc-dr-release history after reset to mnc-dr-dev | |
e9c22da merge in mnc-dr-release history after reset to mnc-dr-dev | |
6a36b01 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b86d646 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d8f8a80 Don't process NetworkRequests when there are none. | |
97fd7f5 Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." | |
45f86f6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
cef955a merge in mnc-dr-release history after reset to mnc-dr-dev | |
65c41c2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
12e0efb DO NOT MERGE Add logging to detect the start of a sync problem. | |
9c57ac6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f797c47 Add logs to PhoneFactory | |
41d30d9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
627e041 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3582a8b merge in mnc-dr-release history after reset to mnc-dr-dev | |
b6b3a34 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c0e6075 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b3f4ac0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2b36a0c merge in mnc-dr-release history after reset to mnc-dr-dev | |
b92a9e8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1c597f5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0d1e79e merge in mnc-dr-release history after reset to mnc-dr-dev | |
f37d038 merge in mnc-release history after reset to mnc-dev | |
43bdefb merge in mnc-release history after reset to mnc-dev | |
de68736 merge in mnc-release history after reset to mnc-dev | |
aef4c3a merge in mnc-release history after reset to mnc-dev | |
d6f1fc0 merge in mnc-release history after reset to mnc-dev | |
2de8a0f merge in mnc-release history after reset to mnc-dev | |
048eb9d merge in mnc-release history after reset to mnc-dev | |
154c220 merge in mnc-release history after reset to mnc-dev | |
f3977a8 merge in mnc-release history after reset to mnc-dev | |
cb44e08 merge in mnc-release history after reset to mnc-dev | |
808217f merge in mnc-release history after reset to mnc-dev | |
6aa0323 merge in mnc-release history after reset to mnc-dev | |
790cf66 merge in mnc-release history after reset to mnc-dev | |
d0569ed merge in mnc-release history after reset to mnc-dev | |
3142f2b merge in mnc-release history after reset to mnc-dev | |
d245937 merge in mnc-release history after reset to mnc-dev | |
194fb59 merge in mnc-release history after reset to mnc-dev | |
91d560b merge in mnc-release history after reset to mnc-dev | |
510799b merge in mnc-release history after reset to mnc-dev | |
73ac005 merge in mnc-release history after reset to mnc-dev | |
42793ed merge in mnc-release history after reset to mnc-dev | |
9f54db0 merge in mnc-release history after reset to mnc-dev | |
91d6a48 Dont fail if modem ids are empty. | |
project frameworks/rs/ | |
c86a000 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ec54c50 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
53c51af Enable error logcat for rsDispatch. | |
874c49c merge in mnc-dr-release history after reset to mnc-dr-dev | |
13c892a merge in mnc-dr-release history after reset to mnc-dr-dev | |
e0beee3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3119ee5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
43c889e merge in mnc-dr-release history after reset to mnc-dr-dev | |
3407cf3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8fe0e35 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5287d7a merge in mnc-dr-release history after reset to mnc-dr-dev | |
bac5bff merge in mnc-release history after reset to mnc-dev | |
c22af66 merge in mnc-release history after reset to mnc-dev | |
a903b91 merge in mnc-release history after reset to mnc-dev | |
3ff5b80 merge in mnc-release history after reset to mnc-dev | |
971c48b merge in mnc-release history after reset to mnc-dev | |
6c80b0c merge in mnc-release history after reset to mnc-dev | |
d77d158 merge in mnc-release history after reset to mnc-dev | |
ca02ffc merge in mnc-release history after reset to mnc-dev | |
fc9f383 merge in mnc-release history after reset to mnc-dev | |
3acc886 merge in mnc-release history after reset to mnc-dev | |
1e340fc merge in mnc-release history after reset to mnc-dev | |
a2f1650 merge in mnc-release history after reset to mnc-dev | |
39a7f4d merge in mnc-release history after reset to mnc-dev | |
42c1f86 merge in mnc-release history after reset to mnc-dev | |
5752c28 merge in mnc-release history after reset to mnc-dev | |
19f3392 merge in mnc-release history after reset to mnc-dev | |
839ee4b merge in mnc-release history after reset to mnc-dev | |
5126e3e SetError if forEachMtlsSetup fails sanity check | |
abb535b Handle older structure sizes by zeroing new fields | |
project frameworks/support/ | |
a4b8712 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
2c3ce80 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
3618ba3 [RenderScript] Load from the full path of librsjni and libRSSupport. am: aa35ba536c am: 2e2e7fb23a | |
2e2e7fb [RenderScript] Load from the full path of librsjni and libRSSupport. am: aa35ba536c | |
aa35ba5 [RenderScript] Load from the full path of librsjni and libRSSupport. | |
67ced21 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
fbc0c1f Import translations. DO NOT MERGE | |
963d560 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8b304dc merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
fe0f5b3 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
84ff9e3 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ad6e343 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e163914 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
097cf54 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
406a3d3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f01e643 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0e89aa9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b32408f merge in mnc-dr-release history after reset to mnc-dr-dev | |
6c1a8be merge in mnc-dr-release history after reset to mnc-dr-dev | |
0d59ba9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f24ded1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b6e32dc merge in mnc-dr-release history after reset to mnc-dr-dev | |
78dfaee merge in mnc-dr-release history after reset to mnc-dr-dev | |
e7ad568 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6f7e300 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b5e36c2 Get support lib ready for release | |
ad23501 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3ea62d4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d9c12e9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
7bd2671 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0223cf3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fbbf054 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d4c5a45 merge in mnc-dr-release history after reset to mnc-dr-dev | |
bcb8825 merge in mnc-dr-release history after reset to mnc-dr-dev | |
affa373 merge in mnc-dr-release history after reset to mnc-dr-dev | |
617669a merge in mnc-dr-release history after reset to mnc-dr-dev | |
5b6c1e3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e6c01ac merge in mnc-dr-release history after reset to mnc-dr-dev | |
5318f69 merge in mnc-dr-release history after reset to mnc-dr-dev | |
de81ed7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
985f3fa merge in mnc-dr-release history after reset to mnc-dr-dev | |
b578875 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5a1a033 merge in mnc-dr-release history after reset to mnc-dr-dev | |
cbc470f merge in mnc-dr-release history after reset to mnc-dr-dev | |
a32d7bc merge in mnc-dr-release history after reset to mnc-dr-dev | |
d16b3cf merge in mnc-dr-release history after reset to mnc-dr-dev | |
f817c73 merge in mnc-dr-release history after reset to mnc-dr-dev | |
036fea8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4c0a9c8 merge in mnc-release history after reset to mnc-dev | |
9d5aae1 merge in mnc-release history after reset to mnc-dev | |
bffe6f9 merge in mnc-release history after reset to mnc-dev | |
efd0403 merge in mnc-release history after reset to mnc-dev | |
fb71642 merge in mnc-release history after reset to mnc-dev | |
7fec55b merge in mnc-release history after reset to mnc-dev | |
4556177 merge in mnc-release history after reset to mnc-dev | |
f220892 merge in mnc-release history after reset to mnc-dev | |
a35e2ec merge in mnc-release history after reset to mnc-dev | |
7775dac merge in mnc-release history after reset to mnc-dev | |
55caa88 merge in mnc-release history after reset to mnc-dev | |
5e439a0 merge in mnc-release history after reset to mnc-dev | |
d41e125 merge in mnc-release history after reset to mnc-dev | |
c050dc7 merge in mnc-release history after reset to mnc-dev | |
171bca8 merge in mnc-release history after reset to mnc-dev | |
4893657 merge in mnc-release history after reset to mnc-dev | |
806fc79 merge in mnc-release history after reset to mnc-dev | |
89a1f98 merge in mnc-release history after reset to mnc-dev | |
78ed94e merge in mnc-release history after reset to mnc-dev | |
57288ca merge in mnc-release history after reset to mnc-dev | |
785b38d merge in mnc-release history after reset to mnc-dev | |
2e81dd0 merge in mnc-release history after reset to mnc-dev | |
8a82c60 merge in mnc-release history after reset to mnc-dev | |
44fd639 merge in mnc-release history after reset to mnc-dev | |
c2931bc [RenderScript] fix support lib after Native RS API change. | |
c56796e merge in mnc-release history after reset to mnc-dev | |
e85639b merge in mnc-release history after reset to mnc-dev | |
e82657b merge in mnc-release history after reset to mnc-dev | |
79466a2 merge in mnc-release history after reset to mnc-dev | |
3b7a171 merge in mnc-release history after reset to mnc-dev | |
402b849 merge in mnc-release history after reset to mnc-dev | |
86e48b1 merge in mnc-release history after reset to mnc-dev | |
cddadbb merge in mnc-release history after reset to mnc-dev | |
94c27f8 merge in mnc-release history after reset to mnc-dev | |
185ecb6 merge in mnc-release history after reset to mnc-dev | |
72d9f6b Update current.txt, fix build. | |
project frameworks/webview/ | |
f8de987 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
30b5750 Import translations. DO NOT MERGE | |
f5deeec Merge remote-tracking branch \'goog/lmp-mr1-ub-dev\' into mnc-dev am: a082f08797 | |
a082f08 Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into mnc-dev | |
7640778 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5044238 merge in mnc-dr-release history after reset to mnc-dr-dev | |
392d21f merge in mnc-release history after reset to mnc-dev | |
87f9983 merge in mnc-release history after reset to mnc-dev | |
e36d187 am 12399ba4: Fix WebView targetSDK checks. | |
4269df6 am 446ce2c2: (-s ours) Add support for SmartClip interface in the glue layer. | |
bf9d394 am ddbcc035: (-s ours) Always add the path to the WebView assets. | |
054071f am 2b22e3a2: Merge "Add version code support for mips64." | |
2b22e3a Merge "Add version code support for mips64." | |
993bed6 am f2e74977: am 4a38c0de: Merge "Revert "Implement stub functions"" | |
f2e7497 am 4a38c0de: Merge "Revert "Implement stub functions"" | |
4a38c0d Merge "Revert "Implement stub functions"" | |
1db8b6b Revert "Implement stub functions" | |
d619a03 am 8898ecf7: am 7ed31a7d: Merge "Implement stub functions" | |
8898ecf am 7ed31a7d: Merge "Implement stub functions" | |
7ed31a7 Merge "Implement stub functions" | |
63deb68 Implement stub functions | |
aba5740 Add version code support for mips64. | |
463b216 am 20135337: (-s ours) Import translations. DO NOT MERGE | |
2013533 Import translations. DO NOT MERGE | |
3f6ae77 am a770a09c: Merge "Fix remaining references to hidden fields." | |
a770a09 Merge "Fix remaining references to hidden fields." | |
cb0c757 Fix remaining references to hidden fields. | |
656ec98 resolved conflicts for merge of 83f6e3db to lmp-mr1-dev-plus-aosp | |
83f6e3d Merge "Track move of android.net.http.ErrorStrings." | |
0485a46 Track move of android.net.http.ErrorStrings. | |
7094995 resolved conflicts for merge of d83e7f76 to lmp-mr1-dev-plus-aosp | |
d83e7f7 Merge internal glue layer to AOSP at c28cfda. | |
3021973 resolved conflicts for merge of 4e0495ed to lmp-mr1-dev-plus-aosp | |
4e0495e Merge glue layer up to 7f6067d into AOSP. | |
12399ba Fix WebView targetSDK checks. | |
539a137 Merge correct version of glue layer. | |
f118a31 Merge AOSP master into M39 glue layer code. | |
a0cac31 Merge "Add support for SmartClip interface in the glue layer." into m39 | |
c6c1f3d Add support for SmartClip interface in the glue layer. | |
0dd72dc [WebView] Start building against the System SDK. | |
4570250 [WebView] Remove direct dependencies on hidden APIs. | |
edcfb0f [WebView] Remove unused method in CookieManager | |
446ce2c Add support for SmartClip interface in the glue layer. | |
8a26cc6 Merge "[WebView] Remove dependencies on DebugFlags." into m39 | |
4eb3b4b [WebView] Remove dependencies on DebugFlags. | |
469cf49 am 9ee9488a: (-s ours) Import translations. DO NOT MERGE | |
bf95f76 [WebView] Remove dependency on Build.IS_DEBUGGABLE. | |
9ee9488 Import translations. DO NOT MERGE | |
538dc44 am 4bb8eed6: Revert "Wrap one more Context" | |
9ca4f33 am 3180c1cc: resolved conflicts for merge of 5a706141 to stage-aosp-master | |
4bb8eed Revert "Wrap one more Context" | |
620317d Merge "[WebView] Remove dependency on FileUtils." into m39 | |
3180c1c resolved conflicts for merge of 5a706141 to stage-aosp-master | |
5112943 [WebView] Remove dependency on FileUtils. | |
8a2779d Always add the path to the WebView assets. | |
ddbcc03 Always add the path to the WebView assets. | |
5a70614 Merge "Merge chromium-dev up to 7d62eab" | |
a54ab0f Merge chromium-dev up to 7d62eab | |
512dab0 am a837930e: am 53dc1aa9: Match removal of config_webSettingsDefaultTextEncoding. | |
ba3f200 am b762bbe6: am 0c6c259a: Merge "Use overridden resources." into lmp-dev | |
248d047 Merge "Remove DRP manager code" into m39 | |
011b28c Remove DRP manager code | |
9f3473a Fix reflection for detecting fullscreen API support. | |
8735fb8 Merge glue layer from master. | |
6fb047a Match removal of config_webSettingsDefaultTextEncoding. | |
a837930 am 53dc1aa9: Match removal of config_webSettingsDefaultTextEncoding. | |
e494d2a Match removal of config_webSettingsDefaultTextEncoding. | |
7d62eab Merge "Remove the default text encoding resource." into chromium-dev | |
2de594d Remove the default text encoding resource. | |
53dc1aa Match removal of config_webSettingsDefaultTextEncoding. | |
b762bbe am 0c6c259a: Merge "Use overridden resources." into lmp-dev | |
0c6c259 Merge "Use overridden resources." into lmp-dev | |
d6a17bc Use overridden resources. | |
39781a2 Reset the state of lmp-mr1-dev-plus-aosp to match lmp-dev-plus-aosp | |
6bdee98 am f6966000: Webview: Remove dexpreopt flag | |
2747b94 resolved conflicts for merge of 5cdf0214 to lmp-dev-plus-aosp | |
916516f Merge -s ours (skip) commit a1b0248 into lmp-dev-plus-aosp | |
f40b944 Merge commit 60e4952d into lmp-dev-plus-aosp | |
996374d Merge commit 8dc9a9d1 into lmp-dev-plus-aosp | |
9bfd830 Merge -s ours (skip) commit 04cc2fa into lmp-dev-plus-aosp | |
5cdf021 Merge "Merge chromium-dev @ a1b0248 into aosp/master." | |
0c91329 Merge chromium-dev @ a1b0248 into aosp/master. | |
f696600 Webview: Remove dexpreopt flag | |
b02dda8 am b20977d3: Remove WebView DRP Setting from Developer Settings | |
b20977d Remove WebView DRP Setting from Developer Settings | |
6ec46f2 Merge "Wrap one more Context" into chromium-dev | |
f0c97c1 Wrap one more Context | |
139902d am 8192f716: Merge "Suport initializing DRP from cmd line switches." into lmp-dev | |
8192f71 Merge "Suport initializing DRP from cmd line switches." into lmp-dev | |
e41c9c1 Suport initializing DRP from cmd line switches. | |
2dead57 Merge "Wrap all of the WebView Contexts" into chromium-dev | |
a1b0248 Wrap all of the WebView Contexts | |
627cd52 am 85e03c0a: WebView does not require a touch screen. | |
85e03c0 WebView does not require a touch screen. | |
500ebd6 am 80bf8d5e: Merge "Update WebView manifest to target/minSDK 21." into lmp-dev | |
80bf8d5 Merge "Update WebView manifest to target/minSDK 21." into lmp-dev | |
8473b38 Update WebView manifest to target/minSDK 21. | |
7936aa0 am fd23af21: Fix resource rewriting in apps with other shared libs. | |
fd23af2 Fix resource rewriting in apps with other shared libs. | |
d02af1c am b1100a8d: Use drawables instead of mipmap for WebView icon. | |
b1100a8 Use drawables instead of mipmap for WebView icon. | |
0113e74 am df873b4a: (-s ours) Import translations. DO NOT MERGE | |
b17c116 am adcbfb74: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev | |
df873b4 Import translations. DO NOT MERGE | |
adcbfb7 Merge "Import translations. DO NOT MERGE" into lmp-dev | |
9aa2f10 am a8cbb40a: Disable dex-preopt. | |
a8cbb40 Disable dex-preopt. | |
1a4c166 am fae9ed9a: Merge "Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev | |
8e6f4d6 am a17d86e9: Don\'t use reflection to rewrite the WebView resources. | |
fae9ed9 Merge "Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev | |
a17d86e Don't use reflection to rewrite the WebView resources. | |
60e4952 Merge "WebViewChromiumFactoryProvider should import ResourceExtractor fromorg.chromium.base" into chromium-dev | |
03af49a WebViewChromiumFactoryProvider should import ResourceExtractor fromorg.chromium.base | |
3b3a02d am 4510b8d1: Merge "Remove check for styleable resources in WebView ResourceRewriter." into lmp-dev | |
4510b8d Merge "Remove check for styleable resources in WebView ResourceRewriter." into lmp-dev | |
91c538c Remove check for styleable resources in WebView ResourceRewriter. | |
0d3c16f am 35716689: Implement FileChooserParams.createIntent and parseResult | |
3571668 Implement FileChooserParams.createIntent and parseResult | |
eb38742 am 98f9a279: Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture. | |
b709ef5 Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture. | |
98f9a27 Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture. | |
e41e134 am 5b026de6: Remove the plumbing for optOutDataReductionProxy API | |
44d477c Remove the plumbing for optOutDataReductionProxy API | |
8dc9a9d Merge "Update some content classes to content_public" into chromium-dev | |
e73e669 Update some content classes to content_public | |
5b026de Remove the plumbing for optOutDataReductionProxy API | |
db0b20b Import translations. DO NOT MERGE | |
30808fe Skip commits up to 76399f9 from AOSP. | |
a71fdd6 Merge "Make init command line happen early" | |
98fae68 Skip commits up to b20a4cb from AOSP. | |
78e79ef Skip commits up to 2846d3c from AOSP. | |
d59fae7 Update from lmp-dev. | |
04cc2fa Merge "Don't declare WebView as a library." into chromium-dev | |
29ddcde Don't declare WebView as a library. | |
76399f9 Merge "Don't declare WebView as a library." | |
f3f92fd Don't declare WebView as a library. | |
b1a19f5 Merge "Merge chromium-dev up to 9d15314" | |
b1cbea9 Suppress StrictMode warning reading command line file. | |
5226c5d Merge "Update API name to comply with changes to API" into lmp-dev | |
1288f69 Update API name to comply with changes to API | |
874c81b Update WebView APK name. | |
3a0ab2f Merge "Disable building the APK when a prebuilt is in use." into lmp-dev | |
1987003 Cherry-pick: Remove debug logging. | |
9d66ae4 Merge chromium-dev up to 9d15314 | |
9d15314 Merge "Make init command line happen early" into chromium-dev | |
8c71319 Merge "Update WebViewFlingTest to use new UiAutomator API." into lmp-dev | |
b20a4cb Merge "Don't use android.internal.R for resources." into chromium-dev | |
3f3b5f8 Merge "AOSP-only changes to support the WebView loading from an APK." into chromium-dev | |
9d92423 Merge "Generate symlinks to libwebviewchromium.so in /system/priv-app" into chromium-dev | |
7bb8bff Merge "Generate resources before running aapt." into chromium-dev | |
855360f Merge "Include pak files in the WebView apk." into chromium-dev | |
4598b8f Merge "Move WebView resources to separate APK" into chromium-dev | |
de0b554 Merge "Add com.android.webview to the package whitelist." into chromium-dev | |
d167209 Merge "Make the WebView Java library into an APK." into chromium-dev | |
cfadfad Don't use android.internal.R for resources. | |
fd40957 AOSP-only changes to support the WebView loading from an APK. | |
0a00dfc Generate symlinks to libwebviewchromium.so in /system/priv-app | |
b825b81 Generate resources before running aapt. | |
8239879 Include pak files in the WebView apk. | |
c182da2 Disable building the APK when a prebuilt is in use. | |
386cea2 Merge "Enable wrap_contents quirk for apps targetting pre-L SDK." into lmp-dev | |
d54876d Move WebView resources to separate APK | |
62cac14 Add com.android.webview to the package whitelist. | |
ab83716 Make the WebView Java library into an APK. | |
94bf55c WebView fix for devices running <LRW48. | |
2283d9e Enable wrap_contents quirk for apps targetting pre-L SDK. | |
c287310 Update WebViewFlingTest to use new UiAutomator API. | |
1cec52f Merge "Finish zoomBy API hookup." into lmp-dev | |
e497b03 Finish zoomBy API hookup. | |
fa3440f Merge "Do not read DRP key from GServices" into lmp-dev | |
64059ae Do not read DRP key from GServices | |
0a42eb2 Make init command line happen early | |
6a10068 Merge "Delete profile data if the WebView is downgraded." into lmp-dev | |
7377fc0 Delete profile data if the WebView is downgraded. | |
630307b Add version to public structs | |
febe875 Set native pointers before initialization | |
8caf018 Add a trace event for AwBrowserProcess.loadLibrary. | |
48d6cbb Generate version data for the WebView package. | |
dba1a36 Merge "Fix merge_from_chromium.py script to work with new buildspec repo" into lmp-dev | |
129af03 Merge "Cherry-pick: [WebView] Notify Chromium whether the app supports fullscreen." into lmp-dev | |
775c246 Cherry-pick: [WebView] Notify Chromium whether the app supports fullscreen. | |
37b38e9 Fix merge_from_chromium.py script to work with new buildspec repo | |
2846d3c Merge "Merge up to 707d93c from chromium-dev." | |
a06a5d8 Merge up to 707d93c from chromium-dev. | |
baab9e9 Merge "Increase char limit for private browsing warning." into lmp-dev | |
79ca909 Increase char limit for private browsing warning. | |
f99773f Merge "Start reading drp setting from GoogleSetting" into lmp-dev | |
527e425 Start reading drp setting from GoogleSetting | |
c88f9f2 Revert version code to 1 | |
6beb32a Set target and min sdk level for webview package | |
7a7bc44 Merge "Revert "Bump WebView package version number."" into lmp-dev | |
58b971c Revert "Bump WebView package version number." | |
e81a713 Merge "Bump WebView package version number." into lmp-dev | |
485f248 Bump WebView package version number. | |
8d63f24 Change function table assignment to allow new fields | |
bb89091 Fix makefile parsing when chromium_org isn't checked out. | |
bd8a804 Don't declare WebView as a library. | |
eba27ea Split package creation into separate makefile. | |
707d93c Merge "Change function table assignment to allow new fields" into chromium-dev | |
44132d3 Change function table assignment to allow new fields | |
27c92b2 Fix typo in cleanspec. | |
fd122dc Merge "Rename the WebView package." into lmp-dev | |
9eacb4b Rename the WebView package. | |
7b3588b Prepare WebView library APK. | |
4345d90 Clean old webview jar/pak files. | |
c8613c2 CHerry pick Update framework resource references. | |
3d4e9d0 Cherry pick Generate resources before running aapt. | |
e48bcd6 CHerry pick Include pak files in the WebView apk. | |
6c8ad27 Cherry pick Use size for address space reservation. | |
aa23fbc Cherry pick Add com.android.webview to the package whitelist. | |
d872dc0 Cherry Pick Add missing back paren back in. | |
86218cd Cherry Pick Generate R class for the glue layer. | |
a8ac567 Cherry Pick Generate symlinks to libwebviewchromium.so in /system/priv-app | |
d574984 Cherry pick Move WebView resources to separate APK | |
4aba304 Cherry pickMake the WebView Java library into an APK. | |
3db202f Update framework resource references. | |
d71dc21 Merge "Add DrawGL kModeSync" into lmp-dev | |
2a534ae Merge "Implement enableSlowWholeDocumentDraw" into lmp-dev | |
2fcb973 Implement enableSlowWholeDocumentDraw | |
32b527b Add DrawGL kModeSync | |
10d3d57 The plumbing for API changes | |
6ed700e Merge "Force software draws in AOSP" | |
b6b9251 Merge "Force software draws in AOSP" into chromium-dev | |
acdfdb7 Corresponding permission API change in WebView glue layer. | |
ffda7fe Force software draws in AOSP | |
6909170 Force software draws in AOSP | |
929a219 Merge "Merge remote-tracking branch 'aosp/master' into merge_into_crdev" into chromium-dev | |
1430cd2 Merge remote-tracking branch 'aosp/master' into merge_into_crdev | |
79625af Add zoomBy API plumbing | |
fe2e7b6 Merge "Work around AwWebResourceResponse not supporting null headers." into lmp-dev | |
39d58cb Work around AwWebResourceResponse not supporting null headers. | |
6c34851 Add plumbing for new shouldInterceptRequest callback. | |
c341bd3 Merge "Add plumbing for new shouldInterceptRequest callback." into lmp-dev | |
abf2feb Plumb temporary view detach calls through WebViewChromium. | |
e64f201 am f250ae82: (-s ours) Merge "Merge up to 33b9fe6 from chromium-dev." | |
c2b11ce The plumbing to disable data reduction proxy | |
ddabdb6 Import translations. DO NOT MERGE | |
683bfb4 Merge "Fix WebView crash on startup due to missing resource." | |
2529fc6 Fix WebView crash on startup due to missing resource. | |
070f911 Merge "Add Third Party Cookie API" into lmp-dev | |
881717f Merge "Implement WebViewChromium.preauthorizePermission." into lmp-dev | |
a42d516 Implement WebViewChromium.preauthorizePermission. | |
b539353 Add Third Party Cookie API | |
0e96d56 Merge "Merge up to 2b4719f from chromium-dev." | |
260da26 Merge up to 2b4719f from chromium-dev. | |
bedf4e4 Merge "Merge up to 6904764 from chromium-dev." | |
d9cda18 Merge up to 6904764 from chromium-dev. | |
2b4719f Merge "Match API changes from http://crrev.com/284123004" into chromium-dev | |
fa7d66b Match API changes from http://crrev.com/284123004 | |
6904764 Merge "Update chromium-dev to current AOSP master." into chromium-dev | |
42a8e58 Update chromium-dev to current AOSP master. | |
23e0ff6 Merge "Add plumbing for the new fullscreen video path." into chromium-dev | |
87eddcf Add plumbing for the new fullscreen video path. | |
c3d558b Merge "Make DrawGLFunctor work on 64-bit platforms." | |
0328c4b Make DrawGLFunctor work on 64-bit platforms. | |
f250ae8 Merge "Merge up to 33b9fe6 from chromium-dev." | |
b4cbff7 Merge up to 33b9fe6 from chromium-dev. | |
33b9fe6 Merge "Update WebViewChromium to match http://crrev.com/274153002" into chromium-dev | |
9fd2c44 Update WebViewChromium to match http://crrev.com/274153002 | |
project frameworks/wilhelm/ | |
6617f3b Clear OpenSL ES BufferQueue for AudioRecorder | |
project hardware/broadcom/libbt/ | |
e17ce06 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
65785e4 dragon: libbt: set BT_WAKE_USERIAL_LDISC = TRUE | |
project hardware/broadcom/wlan/ | |
000b726 Fix use-after-free in wifi_cleanup() | |
8522e09 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
b14a71b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
aaea2dd merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
75b056b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c3838ea merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9984c37 merge in mnc-dr-release history after reset to mnc-dr-dev | |
7f49dee merge in mnc-dr-release history after reset to mnc-dr-dev | |
2964f10 net: wireless: bcmdhd: update bcm4358 FW (7.112.100.27) | |
a24e874 merge in mnc-dr-release history after reset to mnc-dr-dev | |
28242fd merge in mnc-dr-release history after reset to mnc-dr-dev | |
35baed5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8b91b48 merge in mnc-dr-release history after reset to mnc-dr-dev | |
976db58 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b05e986 merge in mnc-dr-release history after reset to mnc-dr-dev | |
69ef000 net: wireless: bcmdhd: update bcm4358 FW(7.112.100.17) | |
214eeed merge in mnc-dr-release history after reset to mnc-dr-dev | |
b4a850a merge in mnc-dr-release history after reset to mnc-dr-dev | |
b9f86fa merge in mnc-dr-release history after reset to mnc-dr-dev | |
64ae3e5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a3b7687 merge in mnc-dr-release history after reset to mnc-dr-dev | |
bc349f9 net:wireless:bcmdhd: Update bcm4354/56 FW (7.35.79.94) | |
b97f770 Fix couple of issues with unregistering event handlers | |
5f5a492 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5b16e12 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4bc4579 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1cf610a merge in mnc-dr-release history after reset to mnc-dr-dev | |
c6e2679 Fix incorrect wifi_cleanup | |
ff1731f merge in mnc-dr-release history after reset to mnc-dr-dev | |
5d312a4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ec23d76 merge in mnc-release history after reset to mnc-dev | |
4678dd2 merge in mnc-release history after reset to mnc-dev | |
950c7ce merge in mnc-release history after reset to mnc-dev | |
f99a47e merge in mnc-release history after reset to mnc-dev | |
017b795 merge in mnc-release history after reset to mnc-dev | |
da3607d Fix a deadlock in wifi_cleanup | |
project hardware/intel/common/omx-components/ | |
e140b31 fix random SEGV issue which is caused by wild pointer in libmix | |
project hardware/intel/img/hwcomposer/ | |
4b8a0d1 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
f65be04 Use default csc mode and video range setting for HDMI. Update VideoPayloadBuffer to align with palyload in video driver | |
project hardware/libhardware/ | |
ee060bb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ca943f0 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
67aa040 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
7b1fcb8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
376b828 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a34216d merge in mnc-dr-release history after reset to mnc-dr-dev | |
4f25575 merge in mnc-dr-release history after reset to mnc-dr-dev | |
52ce32f merge in mnc-dr-release history after reset to mnc-dr-dev | |
ff726ce merge in mnc-dr-release history after reset to mnc-dr-dev | |
1ce7ba1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ac6a823 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f31ab75 merge in mnc-release history after reset to mnc-dev | |
b482e80 merge in mnc-release history after reset to mnc-dev | |
project hardware/libhardware_legacy/ | |
b7615bd merge in mnc-dr-release history after reset to mnc-dr-dev | |
8f6356c make wifi_load_driver blocking | |
project hardware/qcom/audio/ | |
1db405d merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
e2c50fe merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ffa7f34 post proc : volume listener : fix effect release crash am: ebbb823651 | |
ebbb823 post proc : volume listener : fix effect release crash | |
4048e03 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
eac20ef merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
fced70d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
6288866 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
19cc4b1 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ff37f72 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8a9b71c merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
0aaec2a merge in mnc-dr-release history after reset to mnc-dr-dev | |
ced902b merge in mnc-dr-release history after reset to mnc-dr-dev | |
2615719 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f7defc1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
903921a merge in mnc-dr-release history after reset to mnc-dr-dev | |
53cda3f merge in mnc-dr-release history after reset to mnc-dr-dev | |
969b199 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3d22f46 merge in mnc-dr-release history after reset to mnc-dr-dev | |
cf20714 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c8f47b3 audio: set voice call volume step by property | |
20ba5b9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
98e4d30 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d915b56 merge in mnc-dr-release history after reset to mnc-dr-dev | |
11038f3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b572cd3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
cc16172 merge in mnc-dr-release history after reset to mnc-dr-dev | |
7025258 merge in mnc-release history after reset to mnc-dev | |
080f3fa merge in mnc-release history after reset to mnc-dev | |
project hardware/qcom/camera/ | |
65d32a1 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e917e92 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
755fa61 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
77a0f76 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
12fd5dc merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2100231 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
4f48d7c merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
dc778bf camera: update to AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.312 | |
369a1d3 camera: update to AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.309 | |
7252954 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a81c852 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5d9d5b1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a07d40d Camera3: Reduce the max inflight buffer count for BLOB | |
07a78df camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.297 | |
2fffae0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
dc9338b merge in mnc-dr-release history after reset to mnc-dr-dev | |
f79eed8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2a2dc0c merge in mnc-dr-release history after reset to mnc-dr-dev | |
ae5ccdb merge in mnc-dr-release history after reset to mnc-dr-dev | |
507f6aa camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.276 | |
2bdec01 merge in mnc-dr-release history after reset to mnc-dr-dev | |
514ce91 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e630303 Camera3: Disable CDS for EIS | |
fcb371e Camera3: Temporarily disable log error until b/22952640 fixed | |
d75e6d3 camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.254 | |
8ef25fb camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.251 | |
189eff7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f3b4f78 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a78f42b merge in mnc-dr-release history after reset to mnc-dr-dev | |
9256af5 camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.237 | |
19a4d76 merge in mnc-dr-release history after reset to mnc-dr-dev | |
aad80b3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
952a759 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d0ae01e Camera3: Make the reprocess crop data agnostic to stream id | |
61395b8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f3ba663 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0aad43f merge in mnc-dr-release history after reset to mnc-dr-dev | |
90bb652 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a514f17 Camera3: Add conditional for model info in EXIF | |
b243b0b camera: update AU_LINUX_ANDROID_LA.BF64.1.2.9.05.01.00.089.199 | |
project hardware/qcom/display/ | |
9043e8c merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f46d649 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
392102b merge in mnc-dr-release history after reset to mnc-dr-dev | |
f6bb04f merge in mnc-dr-release history after reset to mnc-dr-dev | |
ea70297 merge in mnc-dr-release history after reset to mnc-dr-dev | |
24a7b93 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3410823 merge in mnc-dr-release history after reset to mnc-dr-dev | |
602d108 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f3bc898 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b40bd26 merge in mnc-dr-release history after reset to mnc-dr-dev | |
702f409 merge in mnc-dr-release history after reset to mnc-dr-dev | |
682aab6 merge in mnc-release history after reset to mnc-dev | |
786abf1 gralloc: 8974: handle YV12 format in lock_ycbcr | |
project hardware/qcom/media/ | |
a9cab99 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
15c3715 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
d291cb3 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
1abf243 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
d0727e9 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9d89541 mm-video-v4l2: venc: Update low power mode for 4K recording | |
b76a029 merge in mnc-dr-release history after reset to mnc-dr-dev | |
608d805 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5642bf7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
08ff9dd merge in mnc-dr-release history after reset to mnc-dr-dev | |
c989e5c merge in mnc-dr-release history after reset to mnc-dr-dev | |
5e28297 mm-video-v4l2: vdec: Handle empty EOS buffer | |
project hardware/qcom/msm8994/ | |
c2fa637 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
b1466de merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
e3fa5e3 msm8994: update kernel header | |
project hardware/qcom/wlan/ | |
6be74ec merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
b82f66c merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ec900e7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
be26b0f WiFi-HAL: Write header and payload to same buffer | |
1e594c5 WiFi-HAL: Write and read data to/from ring buffers record wise | |
1f28998 merge in mnc-dr-release history after reset to mnc-dr-dev | |
16f09fc WiFi-HAL: Unlock mutex before calling framework callback | |
a9fbd3d merge in mnc-dr-release history after reset to mnc-dr-dev | |
f8db5b7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3f9b11a merge in mnc-dr-release history after reset to mnc-dr-dev | |
f669b1e merge in mnc-dr-release history after reset to mnc-dr-dev | |
2aab954 merge in mnc-dr-release history after reset to mnc-dr-dev | |
66fb901 WiFi-HAL: Donot initialize Lowi module for gscan calls | |
project hardware/ril/ | |
74a193c merge in mnc-dr-release history after reset to mnc-dr-dev | |
9ef2226 merge in mnc-dr-release history after reset to mnc-dr-dev | |
project libcore/ | |
2fe9609 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
cca4d10 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
cf4b283 Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev am: 1117338720 | |
0730bd1 Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into marshmallow-cts-dev am: 79810ceebb | |
1117338 Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev | |
79810ce Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into marshmallow-cts-dev | |
36363b0 Fix time calculation in test_SSLSession_getLastAccessedTime | |
ef2d585 Add more debugging to the DigestTest | |
1c18e7a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
85f3da9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4ff6e54 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2500ef0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3a8a325 merge in mnc-dr-release history after reset to mnc-dr-dev | |
43579cc merge in mnc-dr-release history after reset to mnc-dr-dev | |
7037e72 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5015635 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1679be5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d8fcfe4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
32db019 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ee42c86 merge in mnc-dr-release history after reset to mnc-dr-dev | |
43c137b ProviderTest: Add provider name to failure message. | |
2905371 libcore: removed unnecessary code in SSLSocketTest | |
e0fd6b8 merge in mnc-release history after reset to mnc-dev | |
7efb424 merge in mnc-release history after reset to mnc-dev | |
aee65b0 merge in mnc-release history after reset to mnc-dev | |
39768a2 Send SIGQUIT when finalizer times out | |
fdc4ad6 merge in mnc-release history after reset to mnc-dev | |
8442a3b SSLEngineTest: set up server instead of using anon | |
e135be3 SSLSocketTest: add test with no ciphers | |
f192521 Fix X509CertificateTest.testVerifyPublicKeyString failure. | |
6831aa4 merge in mnc-release history after reset to mnc-dev | |
bcdfeb2 Relax the test for inappropriate fallback | |
afb6a96 merge in mnc-release history after reset to mnc-dev | |
deb1ef5 merge in mnc-release history after reset to mnc-dev | |
3592cd2 No need to test EC keys of 192 bits | |
ab9d33b merge in mnc-release history after reset to mnc-dev | |
d5190b1 merge in mnc-release history after reset to mnc-dev | |
9a0df8d merge in mnc-release history after reset to mnc-dev | |
6fb716b Add test_PacketSocketAddress to the list of known failures. | |
project packages/apps/Bluetooth/ | |
49708b9 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
c908bd6 Import translations. DO NOT MERGE | |
f7465bb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9da38de merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
930417d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8abcbd7 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f431dbf merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
39c935d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
4bb29ea merge in mnc-dr-release history after reset to mnc-dr-dev | |
7fb4511 merge in mnc-dr-release history after reset to mnc-dr-dev | |
16c3b98 merge in mnc-dr-release history after reset to mnc-dr-dev | |
cd999c5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9885922 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1114402 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9eeea56 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3bf14b0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2ab0365 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a5feed8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
08d2fcc merge in mnc-dr-release history after reset to mnc-dr-dev | |
2856fbb merge in mnc-dr-release history after reset to mnc-dr-dev | |
ec0c409 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e5be1d6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e3fdab3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
369b0ec merge in mnc-dr-release history after reset to mnc-dr-dev | |
becf183 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1af9b1c merge in mnc-dr-release history after reset to mnc-dr-dev | |
17c5e5c merge in mnc-dr-release history after reset to mnc-dr-dev | |
dcbc2c2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
83cc521 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1fe98a1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
7a8bcb3 Revert "Disable Bluetooth profiles that are not used on Clockwork." | |
0252483 merge in mnc-release history after reset to mnc-dev | |
ed2a22f merge in mnc-release history after reset to mnc-dev | |
4a7b344 merge in mnc-release history after reset to mnc-dev | |
project packages/apps/Camera2/ | |
44187ea Import translations. DO NOT MERGE | |
project packages/apps/CarrierConfig/ | |
94d441c merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2959ea1 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
79eac72 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
6e347de merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
70e767c merge in mnc-dr-release history after reset to mnc-dr-dev | |
fc33756 Set carrier-specific invalid characters. | |
project packages/apps/CellBroadcastReceiver/ | |
9a63996 Import translations. DO NOT MERGE | |
project packages/apps/CertInstaller/ | |
5f082bc Import translations. DO NOT MERGE | |
project packages/apps/Contacts/ | |
24d6100 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
d9e42fc Import translations. DO NOT MERGE | |
fbea51f merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8335e44 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
4c6ae61 merge in mnc-dr-release history after reset to mnc-dr-dev | |
211c68e merge in mnc-dr-release history after reset to mnc-dr-dev | |
8387183 merge in mnc-dr-release history after reset to mnc-dr-dev | |
19e67ee merge in mnc-dr-release history after reset to mnc-dr-dev | |
af6a6e8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b89fc18 merge in mnc-dr-release history after reset to mnc-dr-dev | |
476f970 Check for WRITE_CONTACTS permission | |
611c3e0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
91e3065 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6112aad merge in mnc-dr-release history after reset to mnc-dr-dev | |
802bfad merge in mnc-dr-release history after reset to mnc-dr-dev | |
d6fa0a3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4581036 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b31ca1f merge in mnc-dr-release history after reset to mnc-dr-dev | |
27f2c2d merge in mnc-dr-release history after reset to mnc-dr-dev | |
ffaae27 Add back READ_EXTERNAL_STORAGE permission for vcard import 1/3 | |
c775d0d merge in mnc-dr-release history after reset to mnc-dr-dev | |
0672070 merge in mnc-dr-release history after reset to mnc-dr-dev | |
adb24cb merge in mnc-dr-release history after reset to mnc-dr-dev | |
8392b23 merge in mnc-dr-release history after reset to mnc-dr-dev | |
19d8e9f merge in mnc-dr-release history after reset to mnc-dr-dev | |
3c3cf79 merge in mnc-release history after reset to mnc-dev | |
effc86c merge in mnc-release history after reset to mnc-dev | |
b08f87c merge in mnc-release history after reset to mnc-dev | |
c3ab68d merge in mnc-release history after reset to mnc-dev | |
156d198 Check for null getCurrentFocus(). Fix NPE | |
ee5cd57 merge in mnc-release history after reset to mnc-dev | |
b367dc4 merge in mnc-release history after reset to mnc-dev | |
fa13bd7 merge in mnc-release history after reset to mnc-dev | |
2769ea2 merge in mnc-release history after reset to mnc-dev | |
48797f6 merge in mnc-release history after reset to mnc-dev | |
497891d merge in mnc-release history after reset to mnc-dev | |
12438ef merge in mnc-release history after reset to mnc-dev | |
6038699 merge in mnc-release history after reset to mnc-dev | |
a4a586c merge in mnc-release history after reset to mnc-dev | |
04fdbdb merge in mnc-release history after reset to mnc-dev | |
43d9ce2 merge in mnc-release history after reset to mnc-dev | |
be88ddf merge in mnc-release history after reset to mnc-dev | |
6137948 merge in mnc-release history after reset to mnc-dev | |
72ba4f2 merge in mnc-release history after reset to mnc-dev | |
e13a359 merge in mnc-release history after reset to mnc-dev | |
bcd4b0e merge in mnc-release history after reset to mnc-dev | |
7698504 Guard against null listener when picking contacts | |
project packages/apps/ContactsCommon/ | |
472ab79 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
1ceac65 Import translations. DO NOT MERGE am: cab7db51bf -s ours | |
a209d35 Import translations. DO NOT MERGE | |
cab7db5 Import translations. DO NOT MERGE | |
c24d310 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
e68d05a Import translations. DO NOT MERGE am: 47fda83674 -s ours | |
b4be594 Import translations. DO NOT MERGE | |
47fda83 Import translations. DO NOT MERGE | |
3af947b merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
da7d60e Import translations. DO NOT MERGE am: 44182ce6e8 -s ours | |
1c93e80 Import translations. DO NOT MERGE | |
f52bbdf merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
b280e88 Import translations. DO NOT MERGE am: 331428f924 -s ours | |
0310060 Import translations. DO NOT MERGE | |
8fa45b6 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
1baaac6 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
30fb960 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a1449b7 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f394f29 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
15ff90a merge in mnc-dr-release history after reset to mnc-dr-dev | |
0db4648 merge in mnc-dr-release history after reset to mnc-dr-dev | |
edca33b merge in mnc-dr-release history after reset to mnc-dr-dev | |
9414ea4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0b28759 Correctly handle empty permissions array in callback | |
7f92059 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c544a6c DO NOT MERGE Catch SecurityExceptions in onCreateDialog | |
2a7bbc1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
cc6a007 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b42d621 merge in mnc-dr-release history after reset to mnc-dr-dev | |
65e8402 merge in mnc-dr-release history after reset to mnc-dr-dev | |
45fef4b merge in mnc-dr-release history after reset to mnc-dr-dev | |
bf763dc merge in mnc-dr-release history after reset to mnc-dr-dev | |
f87c84b merge in mnc-dr-release history after reset to mnc-dr-dev | |
7f7b2b8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e88bc66 merge in mnc-dr-release history after reset to mnc-dr-dev | |
bdf6582 merge in mnc-dr-release history after reset to mnc-dr-dev | |
10a3025 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ebfbe30 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e1d9fc4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ebcbbbe Add back READ_EXTERNAL_STORAGE permission for vcard import 2/3 | |
bba87e3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
841ab0c merge in mnc-dr-release history after reset to mnc-dr-dev | |
5f386f8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
42c020f merge in mnc-release history after reset to mnc-dev | |
102de19 merge in mnc-release history after reset to mnc-dev | |
edb9f93 merge in mnc-release history after reset to mnc-dev | |
f010e5e merge in mnc-release history after reset to mnc-dev | |
project packages/apps/DeskClock/ | |
c51a3b8 Import translations. DO NOT MERGE | |
project packages/apps/Dialer/ | |
fc758cf merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
c414917 Import translations. DO NOT MERGE | |
fc421cb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
aad067e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
4aa7314 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
296e227 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
87d6ef8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5f38c84 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4e260b5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8129b04 merge in mnc-dr-release history after reset to mnc-dr-dev | |
be7faec merge in mnc-dr-release history after reset to mnc-dr-dev | |
0ef0782 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9995bec merge in mnc-dr-release history after reset to mnc-dr-dev | |
ef29338 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0e70619 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a96e5c1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
04eeb8a merge in mnc-dr-release history after reset to mnc-dr-dev | |
3d7aa4f merge in mnc-dr-release history after reset to mnc-dr-dev | |
9c7dd2c merge in mnc-dr-release history after reset to mnc-dr-dev | |
f5e54e4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
79a26bd merge in mnc-dr-release history after reset to mnc-dr-dev | |
c32190d merge in mnc-dr-release history after reset to mnc-dr-dev | |
a0fd812 merge in mnc-dr-release history after reset to mnc-dr-dev | |
bd8939d merge in mnc-dr-release history after reset to mnc-dr-dev | |
a6578e2 Permission protect UndemoteOutgoingCallReceiver | |
860f8cc merge in mnc-dr-release history after reset to mnc-dr-dev | |
fb8c572 Fix SecurityException in DefaultVoicemailNotifier | |
8d954d7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a12ded0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
77afcc6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ccd2f8a merge in mnc-dr-release history after reset to mnc-dr-dev | |
bea8936 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f0927b0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
45261a9 merge in mnc-release history after reset to mnc-dev | |
242caad merge in mnc-release history after reset to mnc-dev | |
933f86f merge in mnc-release history after reset to mnc-dev | |
e3637fe merge in mnc-release history after reset to mnc-dev | |
project packages/apps/FMRadio/ | |
5a7955b Import translations. DO NOT MERGE | |
project packages/apps/Gallery/ | |
3e06680 Import translations. DO NOT MERGE | |
project packages/apps/InCallUI/ | |
64cc1d9 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ff6498a Show child number in incoming call notification. am: 2e5cfc1a71 | |
2e5cfc1 Show child number in incoming call notification. | |
14107b2 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
fbe0255 Import translations. DO NOT MERGE | |
b600dbe merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2d53ca2 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
b5296f1 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
36de151 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
08a6af0 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c0736e0 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9c35351 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d054396 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d34523b merge in mnc-dr-release history after reset to mnc-dr-dev | |
67567d2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2371eaf merge in mnc-dr-release history after reset to mnc-dr-dev | |
08672cb merge in mnc-dr-release history after reset to mnc-dr-dev | |
4097d92 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1a433bc merge in mnc-dr-release history after reset to mnc-dr-dev | |
a438895 DO NOT MERGE Null check CallList mapping in callbacks | |
fbd13d2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
343ad61 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9ae1a1d merge in mnc-dr-release history after reset to mnc-dr-dev | |
187c3f8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4c0c8d1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1bee901 merge in mnc-dr-release history after reset to mnc-dr-dev | |
cb998c3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6bff229 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9707c9f merge in mnc-dr-release history after reset to mnc-dr-dev | |
c6f6f98 Null protect getUi() in configureAnswerTargetsForSms | |
63b9dd2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
270da9e merge in mnc-dr-release history after reset to mnc-dr-dev | |
80ee59e merge in mnc-dr-release history after reset to mnc-dr-dev | |
42440f3 merge in mnc-release history after reset to mnc-dev | |
8d6e9b5 merge in mnc-release history after reset to mnc-dev | |
53dadbd merge in mnc-release history after reset to mnc-dev | |
3587716 merge in mnc-release history after reset to mnc-dev | |
284245f merge in mnc-release history after reset to mnc-dev | |
4fa6fd7 merge in mnc-release history after reset to mnc-dev | |
a95dd2f merge in mnc-release history after reset to mnc-dev | |
a3eb6e0 merge in mnc-release history after reset to mnc-dev | |
c77f031 merge in mnc-release history after reset to mnc-dev | |
ede7e80 merge in mnc-release history after reset to mnc-dev | |
2b4b2ac merge in mnc-release history after reset to mnc-dev | |
19fe178 Remove reliance on getDefaultDisplay() to determine screen rotation. | |
f8639c8 merge in mnc-release history after reset to mnc-dev | |
1679566 merge in mnc-release history after reset to mnc-dev | |
2a9c96d merge in mnc-release history after reset to mnc-dev | |
c205d32 merge in mnc-release history after reset to mnc-dev | |
3f93da9 Fix NPE for video card when VT not active | |
project packages/apps/KeyChain/ | |
e44203d Import translations. DO NOT MERGE | |
project packages/apps/Launcher2/ | |
479fa61 Import translations. DO NOT MERGE | |
project packages/apps/ManagedProvisioning/ | |
1702a99 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
445806d Import translations. DO NOT MERGE | |
fb44d14 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c5afbaa merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
25faac3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0b8b5be merge in mnc-dr-release history after reset to mnc-dr-dev | |
ee85353 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c5e0f53 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c1f1391 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2ec94d1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0c54b38 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ad267bb merge in mnc-dr-release history after reset to mnc-dr-dev | |
56e1607 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4071406 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b5ea5d2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1831197 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6f36698 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6a34746 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6b02ebc merge in mnc-dr-release history after reset to mnc-dr-dev | |
7f90370 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5cc8b91 merge in mnc-release history after reset to mnc-dev | |
2cd77ed merge in mnc-release history after reset to mnc-dev | |
a76736c merge in mnc-release history after reset to mnc-dev | |
7c2b099 merge in mnc-release history after reset to mnc-dev | |
project packages/apps/Music/ | |
c5ba8c3 Import translations. DO NOT MERGE | |
project packages/apps/Nfc/ | |
e607cd4 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
a8b6d95 Import translations. DO NOT MERGE | |
1ec17a0 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f34dfb8 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
bdec086 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ff7fc78 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2f1e79e merge in mnc-dr-release history after reset to mnc-dr-dev | |
edc66ce merge in mnc-dr-release history after reset to mnc-dr-dev | |
fcf269b merge in mnc-dr-release history after reset to mnc-dr-dev | |
e5a8d68 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ffd7329 merge in mnc-dr-release history after reset to mnc-dr-dev | |
face8fb Reset P2P flag in de-initialization. | |
81cc1e0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3ce9cd8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
103c057 merge in mnc-dr-release history after reset to mnc-dr-dev | |
16f6fe2 merge in mnc-release history after reset to mnc-dev | |
b835ad8 Add LOCAL_MAC_ADDRESS permission. | |
project packages/apps/PackageInstaller/ | |
aea557a merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
5b1001b merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ebb26e2 Fix some UI glitches in PackageInstaller am: 42af15b6d9 am: 587374a996 | |
587374a Fix some UI glitches in PackageInstaller am: 42af15b6d9 | |
42af15b Fix some UI glitches in PackageInstaller | |
53dbe0d Clean up package installer styling am: 2cf17ddcef am: c10abb25f3 | |
c10abb2 Clean up package installer styling am: 2cf17ddcef | |
2cf17dd Clean up package installer styling | |
17859f7 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
6945e1d Import translations. DO NOT MERGE | |
51f2a49 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8ffb1b3 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
52b8c1b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5441d00 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ab2af01 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b3a8535 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f40a4ab merge in mnc-dr-release history after reset to mnc-dr-dev | |
142438d merge in mnc-dr-release history after reset to mnc-dr-dev | |
38f7f5d merge in mnc-dr-release history after reset to mnc-dr-dev | |
604072f merge in mnc-dr-release history after reset to mnc-dr-dev | |
c875821 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2a52cbe merge in mnc-dr-release history after reset to mnc-dr-dev | |
68a117b merge in mnc-dr-release history after reset to mnc-dr-dev | |
851c5c4 Revert "Grant only requested permissions not the whole group." | |
cc257aa Revert "Show multi-permission UI in the requested order." | |
32c4cb1 Show multi-permission UI in the requested order. | |
7d765a8 Grant only requested permissions not the whole group. | |
9430f0d merge in mnc-dr-release history after reset to mnc-dr-dev | |
92fd977 merge in mnc-dr-release history after reset to mnc-dr-dev | |
232c9ad merge in mnc-dr-release history after reset to mnc-dr-dev | |
68f6bb0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
65675f2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4d2061b merge in mnc-dr-release history after reset to mnc-dr-dev | |
b9bd036 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9008456 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c6dae10 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6bb5f69 merge in mnc-dr-release history after reset to mnc-dr-dev | |
aaa8e51 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1605cef merge in mnc-dr-release history after reset to mnc-dr-dev | |
ad92ed6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
dba2ac5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
7838eed merge in mnc-dr-release history after reset to mnc-dr-dev | |
56b15b5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
153332c merge in mnc-dr-release history after reset to mnc-dr-dev | |
bb57c4c merge in mnc-dr-release history after reset to mnc-dr-dev | |
133eae1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
00a7904 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fff4bf3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0dec9ef Make package installer a privileged core app | |
9dbc041 merge in mnc-dr-release history after reset to mnc-dr-dev | |
63a155f merge in mnc-dr-release history after reset to mnc-dr-dev | |
4698490 merge in mnc-release history after reset to mnc-dev | |
38aeb35 merge in mnc-release history after reset to mnc-dev | |
1dbaa19 merge in mnc-release history after reset to mnc-dev | |
a335e89 merge in mnc-release history after reset to mnc-dev | |
c9b1864 merge in mnc-release history after reset to mnc-dev | |
39c85bc merge in mnc-release history after reset to mnc-dev | |
ed8657c merge in mnc-release history after reset to mnc-dev | |
ea7edbb merge in mnc-release history after reset to mnc-dev | |
651eccb merge in mnc-release history after reset to mnc-dev | |
74274a9 merge in mnc-release history after reset to mnc-dev | |
62fabc1 merge in mnc-release history after reset to mnc-dev | |
8093561 merge in mnc-release history after reset to mnc-dev | |
8fcbfc9 merge in mnc-release history after reset to mnc-dev | |
41dfd41 merge in mnc-release history after reset to mnc-dev | |
09879a6 merge in mnc-release history after reset to mnc-dev | |
1644b12 merge in mnc-release history after reset to mnc-dev | |
1cb306a merge in mnc-release history after reset to mnc-dev | |
f75869d merge in mnc-release history after reset to mnc-dev | |
90dba16 merge in mnc-release history after reset to mnc-dev | |
0e56980 merge in mnc-release history after reset to mnc-dev | |
b5b3305 merge in mnc-release history after reset to mnc-dev | |
42a436a Don't show permission with no app ops. | |
948d9f7 Fix truncated permission message if 'Do not ask again' is shown | |
20da6fd Add logging for user permission interactions. | |
project packages/apps/Settings/ | |
a738a49 Fix cutoff shadows on dashboard. | |
efbeeef [WifiSettings] Submit Wi-Fi dialog with enter key | |
48c2bd5 Block developer settings during SUW | |
57285f4 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
f53bf0d Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6 | |
2075d98 Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de | |
6bf86bf Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 am: 28eca8e8c2 | |
f0ff163 Merge "Preserve FRP lock if wiped during SUW" into mnc-dev | |
28eca8e Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 | |
245bfee merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
de4fc8e Preserve FRP lock if wiped during SUW | |
8a2706d Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262 | |
98f11fd Uncheck checkbox for contact sharing by default for non carkit devices. | |
dbc47fb Uncheck checkbox for contact sharing by default for non carkit devices. | |
ca640ed merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
03df1a2 Null check queryIntentServices am: a4c9492b50 | |
a4c9492 Null check queryIntentServices | |
2d2f63b merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ee3c64a Directly show the layout selection screen. | |
b0a9db3 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
e6b8a33 Merge "Further tweak to issue #issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d | |
3b4e4dd Merge "Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev | |
b6c7b05 Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS | |
8e3e92a Merge "Fix issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 508559d076 | |
508559d Merge "Fix issue #25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev | |
30bbd90 Fix issue #25371736: Don't include z-ram allocations in Android OS | |
aa42fa5 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
8204195 Merge "Import translations. DO NOT MERGE" into mnc-dr-ryu-dev | |
6027629 Import translations. DO NOT MERGE am: 260d90a102 -s ours | |
1839056 Import translations. DO NOT MERGE | |
214c36f merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
d61e4ce Import translations. DO NOT MERGE | |
dbb4b0a Import translations. DO NOT MERGE am: c338bacb59 -s ours | |
da250fa Import translations. DO NOT MERGE | |
c11d28a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
0713d44 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5138abf merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
cc99dd2 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
3e9d2be merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
21ba076 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2879f0a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
d5be4bc merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
0e15af6 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
201e22f merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
35a4e2d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
756a281 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f2b3ba0 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
51b74c1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e9b1d7d merge in mnc-dr-release history after reset to mnc-dr-dev | |
558eade merge in mnc-dr-release history after reset to mnc-dr-dev | |
5f9420e merge in mnc-dr-release history after reset to mnc-dr-dev | |
54d8156 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e218bc2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1277990 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5f73785 merge in mnc-dr-release history after reset to mnc-dr-dev | |
addd03b merge in mnc-dr-release history after reset to mnc-dr-dev | |
d9657fd merge in mnc-dr-release history after reset to mnc-dr-dev | |
3320639 merge in mnc-dr-release history after reset to mnc-dr-dev | |
83d0d99 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f51316c merge in mnc-dr-release history after reset to mnc-dr-dev | |
bd90b3c merge in mnc-dr-release history after reset to mnc-dr-dev | |
fc797d6 Adapted string length translation limits | |
8c277ba merge in mnc-dr-release history after reset to mnc-dr-dev | |
85aa7bb Stop crash on repeated enters on virtual keyboard | |
8fb9519 merge in mnc-dr-release history after reset to mnc-dr-dev | |
de73338 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4e8d05b merge in mnc-dr-release history after reset to mnc-dr-dev | |
287cb54 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c3c246c merge in mnc-dr-release history after reset to mnc-dr-dev | |
e25f6d4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
da4630b merge in mnc-dr-release history after reset to mnc-dr-dev | |
0f89eea merge in mnc-dr-release history after reset to mnc-dr-dev | |
8a8f5d0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2616793 merge in mnc-dr-release history after reset to mnc-dr-dev | |
213e8e1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
80a4228 Added android.permission.PEERS_MAC_ADDRESS permission | |
d16135d merge in mnc-dr-release history after reset to mnc-dr-dev | |
88f8c4e merge in mnc-dr-release history after reset to mnc-dr-dev | |
ad930bf merge in mnc-dr-release history after reset to mnc-dr-dev | |
fa494d8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6da1c7f merge in mnc-dr-release history after reset to mnc-dr-dev | |
06a45f7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
69064ad merge in mnc-dr-release history after reset to mnc-dr-dev | |
c7c950f merge in mnc-dr-release history after reset to mnc-dr-dev | |
4f917b4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0fcea9b merge in mnc-dr-release history after reset to mnc-dr-dev | |
af59308 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ab9c314 Do not throw exception when MeasurementDetails.mediaSize is empty | |
f8c1621 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f436e46 merge in mnc-dr-release history after reset to mnc-dr-dev | |
366a1a1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b0b4068 merge in mnc-dr-release history after reset to mnc-dr-dev | |
992e086 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0001e8b Fix opening secured networks from QS | |
724cb3a Allow give/take in app version/disabled fields | |
03c2be6 merge in mnc-release history after reset to mnc-dev | |
3cf2629 merge in mnc-release history after reset to mnc-dev | |
1f7df1d merge in mnc-release history after reset to mnc-dev | |
17c4543 merge in mnc-release history after reset to mnc-dev | |
339059a merge in mnc-release history after reset to mnc-dev | |
a7e8653 merge in mnc-release history after reset to mnc-dev | |
28ef79a merge in mnc-release history after reset to mnc-dev | |
project packages/apps/Stk/ | |
5376524 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
e707661 Import translations. DO NOT MERGE | |
5078d9d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c67facb merge in mnc-dr-release history after reset to mnc-dr-dev | |
ff3d2d8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
03798e1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
221aa41 merge in mnc-dr-release history after reset to mnc-dr-dev | |
eb9215e merge in mnc-release history after reset to mnc-dev | |
9f3abe7 merge in mnc-release history after reset to mnc-dev | |
project packages/apps/TvSettings/ | |
142940c merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
133522c Import translations. DO NOT MERGE am: 118159ccbb -s ours | |
e3c3d77 Import translations. DO NOT MERGE | |
118159c Import translations. DO NOT MERGE | |
8ddd919 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
de75391 Import translations. DO NOT MERGE am: ebd4809777 -s ours | |
194a8a6 Import translations. DO NOT MERGE | |
3cbdcdf merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
15cdd0d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f88f312 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
507d675 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
889be6c merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
28ae182 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
7ca3a88 merge in mnc-dr-release history after reset to mnc-dr-dev | |
57ac273 merge in mnc-dr-release history after reset to mnc-dr-dev | |
34edac2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2d355d3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2bd998f merge in mnc-dr-release history after reset to mnc-dr-dev | |
44bbb72 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5e9c45d merge in mnc-dr-release history after reset to mnc-dr-dev | |
e7b4002 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6685604 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0a2ae62 Scan storage volumes post-setup | |
ca5b374 Don't show storage pop-up if setup is not complete | |
4a444fd merge in mnc-dr-release history after reset to mnc-dr-dev | |
90c2cee Don't show storage notification across users | |
ca38905 Do not throw exception when MeasurementDetails.mediaSize is empty | |
8ca01a9 Fix daydreams for restricted profiles [1/2] | |
70ff51a merge in mnc-dr-release history after reset to mnc-dr-dev | |
48fd3d5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2a2e7b7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c230366 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b73b603 merge in mnc-dr-release history after reset to mnc-dr-dev | |
96bb490 merge in mnc-release history after reset to mnc-dev | |
332cf65 merge in mnc-release history after reset to mnc-dev | |
3261c3c merge in mnc-release history after reset to mnc-dev | |
50b31e7 merge in mnc-release history after reset to mnc-dev | |
a117647 merge in mnc-release history after reset to mnc-dev | |
0b0bcf6 merge in mnc-release history after reset to mnc-dev | |
1653da2 merge in mnc-release history after reset to mnc-dev | |
5709bf3 merge in mnc-release history after reset to mnc-dev | |
bc80115 merge in mnc-release history after reset to mnc-dev | |
af0991d merge in mnc-release history after reset to mnc-dev | |
3f3f8f4 merge in mnc-release history after reset to mnc-dev | |
43df805 merge in mnc-release history after reset to mnc-dev | |
fa6676f merge in mnc-release history after reset to mnc-dev | |
231e39f Fix crash in wifi connection activity | |
e75daf6 Don't crash settings when cast is disabled | |
1da1986 merge in mnc-release history after reset to mnc-dev | |
6d1f4ca merge in mnc-release history after reset to mnc-dev | |
1774be5 Handle android.settings.APPLICATION_DETAILS_SETTINGS | |
f34dc23 TvSettings should not listen for GMS location intents | |
ad0d09f merge in mnc-release history after reset to mnc-dev | |
131a062 merge in mnc-release history after reset to mnc-dev | |
3f12a33 Add format progress and slow drive warning | |
project packages/inputmethods/LatinIME/ | |
e4687af merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
8220d8d merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
a2a057a Check if last shown Emoji category ID is still valid | |
4c5ce3d Import translations. DO NOT MERGE am: fdbd6fe212 -s ours | |
922be5c Import translations. DO NOT MERGE | |
fdbd6fe Import translations. DO NOT MERGE | |
f6e0204 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
1f23f99 Import translations. DO NOT MERGE am: 76218d9045 -s ours | |
024e1cd Import translations. DO NOT MERGE | |
76218d9 Import translations. DO NOT MERGE | |
ec35354 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
0f1be93 Unicode 8.0 emoji additions to Google Keyboard. am: 7674a65367 | |
7674a65 Unicode 8.0 emoji additions to Google Keyboard. | |
e12d374 Import translations. DO NOT MERGE am: 4de1e2262e -s ours | |
191ec80 Import translations. DO NOT MERGE | |
4de1e22 Import translations. DO NOT MERGE | |
09a2d70 Revert "Unicode 8.0 emoji changes to Google Keyboard." am: e1d5012683 | |
c405679 Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev am: 9dfac101f2 | |
e1d5012 Revert "Unicode 8.0 emoji changes to Google Keyboard." | |
9dfac10 Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev | |
354d009 Revert "Add description strings for Unicode 8.0 new emoji." | |
03fb748 Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev am: 9749f1f1c3 | |
9749f1f Merge "Add description strings for Unicode 8.0 new emoji." into mnc-dr-dev | |
a6b0658 Unicode 8.0 emoji changes to Google Keyboard. am: 9cc42549d1 | |
9cc4254 Unicode 8.0 emoji changes to Google Keyboard. | |
332181b Add description strings for Unicode 8.0 new emoji. | |
444b382 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
9a438a3 Fix AltR+1 -> ESC shortcuts bringing on-screen keyboard | |
f170725 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
683ad40 Merge "Import translations. DO NOT MERGE" into mnc-dr-ryu-dev | |
2d9c8a8 Import translations. DO NOT MERGE | |
09e4409 Import translations. DO NOT MERGE | |
3599ff4 Do not start in recents tab if we do not have recent emojis | |
2dfc42b Define shortcuts for toggling IME layouts. | |
cf4be08 Re-activate emoji keyboard shortcut. | |
072668d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
4d630fa merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
cc14d69 merge in mnc-dr-release history after reset to mnc-dr-dev | |
bd19fb7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1bd0fee merge in mnc-dr-release history after reset to mnc-dr-dev | |
82bdfe9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
91fbeff merge in mnc-dr-release history after reset to mnc-dr-dev | |
b31e51a merge in mnc-dr-release history after reset to mnc-dr-dev | |
7194607 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0dacd26 merge in mnc-dr-release history after reset to mnc-dr-dev | |
afdc132 merge in mnc-dr-release history after reset to mnc-dr-dev | |
244a9c6 merge in mnc-release history after reset to mnc-dev | |
de30b54 merge in mnc-release history after reset to mnc-dev | |
ae69129 merge in mnc-release history after reset to mnc-dev | |
87827ae merge in mnc-release history after reset to mnc-dev | |
6c2edae Merge "Turn off split keyboard" into edamame-mnc-preview | |
53a476d Turn off split keyboard | |
73dccd8 merge in mnc-release history after reset to mnc-dev | |
466446b Do not call AccountManager apis in mnc keyboard | |
9db8b28 merge in mnc-release history after reset to mnc-dev | |
adf5f94 Fix rollback to edemame-release. | |
3456a5e Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-edamame-mr1-release | |
3195b6e Import translations. DO NOT MERGE | |
282908f Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-edamame-mr1-release | |
d6c7f7d Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-edamame-mr1-release | |
491e7be Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-edamame-mr1-release | |
9f7d08a Import translations. DO NOT MERGE | |
c5c109f Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-edamame-mr1-release | |
dbbfc33 Import translations. DO NOT MERGE | |
ac8c017 Import translations. DO NOT MERGE | |
6637533 Import translations. DO NOT MERGE | |
b048610 Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-edamame-mr1-release | |
6112555 Import translations. DO NOT MERGE | |
0be07e9 Import translations. DO NOT MERGE | |
29b184e Fix a NPE | |
f14cc29 Fix oscillations on ICS | |
7249604 Fix the base character of D with stroke | |
12acf4c Rename a confusing method name | |
37becdb Fix emoji key background of Holo themes | |
7ca950a Fix a bug where LatinIME would recorrect with no input view | |
cc405c7 Merge "Fix Greek accented upper case letters" into ub-latinimegoogle-edamame-mr1-release | |
6fc9289 Fix Greek accented upper case letters | |
ef37558 Fix possible NPE in SubtypeSwitcher | |
44a1e49 Import translations. DO NOT MERGE | |
1665022 Fix Emoji key feedback | |
12b5311 Fix symbol letter size of phone/number layout | |
fe81072 Fix number and phone keyboard visual glitches | |
8551a94 Fix MainKeyboardView visibility must be aligned with main keyboard frame | |
99be8fc Small comment fixes | |
eaacc73 Import translations. DO NOT MERGE | |
59020bb Fix a concurrency bug that ends up in a crash. | |
2abe6d6 FIx potential NPE | |
7f61a61 Import translations. DO NOT MERGE | |
7d2725d Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-edamame-mr1-release | |
e2a5ee5 Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-edamame-mr1-release | |
0b9b1d4 Import translations. DO NOT MERGE | |
0809241 Import translations. DO NOT MERGE | |
0da7091 Fix missing Telugu letters | |
629cc2e Enforce a length limit to auto-correction for some languages | |
ae4833b [ML27.1] Allow adding additional features to other settings | |
6d392aa [ML29] Reinitialize the subtype at input start | |
7d04e94 [ML25] Add an hasDict method. | |
cb1a2bf Fix a bug with no suggestions flag | |
e63d262 Bring back long press timeout settings | |
37014c8 Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-edamame-mr1-release | |
86103be Import translations. DO NOT MERGE | |
ff6ed9b Import translations. DO NOT MERGE | |
eb1f44a [ML24] Add facilities to read the script of a subtype | |
3a5f357 Performance fix for multiple language subtypes | |
bb4ca89 Fix an NPE. | |
1fdaf5a Fix: BoS bigram from user history dictionary is too strong. | |
dc5afca Import translations. DO NOT MERGE | |
c9a2998 [ML23] Introduce a different accuracy/performance tradeoff | |
b0f3e62 Fixing keyboard theme selection | |
eb35b01 [ML22] Improve the language on spacebar for SLS | |
70d353a Always show the typed word in recorrections. | |
c758935 [ML20.1] Move getRichInputMethodSubtype to additional features | |
e92693e [ML19] Actually switch the language when appropriate | |
82afa80 Add keyboard shadow | |
fc153d2 [ML18] Make WordComposer#getAutoCorrection a word info | |
cda578e Stop dimming main keyboard while showing more keys keyboard | |
ea35b77 [ML17] Add a method to switch the most probable language | |
7f713e4 [ML16] Remove DictionaryFacilitator.getLocale() | |
430c5e9 [ML15] First step in removing DictionaryFacilitator.getLocale | |
7a15471 Fix NoClassDefFoundError due to CursorAnchorInfo in K | |
1eb8138 merge in ub-latinimegoogle-edamame-mr1-release history after reset to dce0394e415850225b8b6c90befccf3958a6364f | |
b675c88 merge in ub-latinimegoogle-edamame-mr1-release history after reset to feb3d152f6a1ae6edca8dbf27b5b640c82fd1d97 | |
778e762 merge in ub-latinimegoogle-edamame-mr1-release history after reset to 602de33b97b271860fa5258b4ca1723203b9d742 | |
b1bc456 Fall back to default keyboard theme | |
6d0ce27 merge in ub-latinimegoogle-edamame history after reset to 8e5bb720f64dc1c54e41107a70dfcea546bc73f5 | |
cd372be merge in ub-latinimegoogle-edamame history after reset to ab131309b7db41333cef8e3837c1120dfd4c8047 | |
8e5bb72 merge in ub-latinimegoogle-edamame history after reset to 84cd3fca6b2e65b2b99698a79a438cdb0b46f0b5 | |
26d9714 merge in ub-latinimegoogle-edamame history after reset to e53c39b43c4cb25a8315793ae22c377d8c38b672 | |
641ad0b merge in ub-latinimegoogle-edamame history after reset to 9cefd4f6f944a7d37889098cef05e726a485d65f | |
36f6eea Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-edamame | |
e6bd843 Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-edamame | |
790fe09 Import translations. DO NOT MERGE | |
af58700 Import translations. DO NOT MERGE | |
fce5103 Import translations. DO NOT MERGE | |
04ee257 merge in ub-latinimegoogle-edamame history after reset to 9f0c1d4cee9b08f9b0011f3a43fd0ed91f83b0f5 | |
de9364e Fix a bug where mic/emoji key wouldn't work. | |
project packages/providers/BookmarkProvider/ | |
a3b65c6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2c97835 merge in mnc-release history after reset to mnc-dev | |
3a997d2 merge in mnc-release history after reset to mnc-dev | |
project packages/providers/CalendarProvider/ | |
9b2d8e1 Work on issue #25467052: System lagged out | |
project packages/providers/ContactsProvider/ | |
4bef60f merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
5027bd7 Import translations. DO NOT MERGE | |
891f28b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f0a11ac merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
5d3c5b3 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c9db63d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
b3df253 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0d7ecaf merge in mnc-dr-release history after reset to mnc-dr-dev | |
4817989 merge in mnc-dr-release history after reset to mnc-dr-dev | |
388bb4a merge in mnc-dr-release history after reset to mnc-dr-dev | |
c29d2da merge in mnc-dr-release history after reset to mnc-dr-dev | |
a7f9691 merge in mnc-dr-release history after reset to mnc-dr-dev | |
cdad8fb merge in mnc-dr-release history after reset to mnc-dr-dev | |
2e6bb8d merge in mnc-dr-release history after reset to mnc-dr-dev | |
3ce7c8f merge in mnc-dr-release history after reset to mnc-dr-dev | |
1a2b135 merge in mnc-release history after reset to mnc-dev | |
b067c1a merge in mnc-release history after reset to mnc-dev | |
b191fe1 merge in mnc-release history after reset to mnc-dev | |
372aed5 merge in mnc-release history after reset to mnc-dev | |
7696d16 merge in mnc-release history after reset to mnc-dev | |
01767b2 merge in mnc-release history after reset to mnc-dev | |
41ff066 merge in mnc-release history after reset to mnc-dev | |
5530424 Fix NPE in enterprise API & fix unit tests. | |
343af3b merge in mnc-release history after reset to mnc-dev | |
ca56898 merge in mnc-release history after reset to mnc-dev | |
a11c21f merge in mnc-release history after reset to mnc-dev | |
0f8ad67 merge in mnc-release history after reset to mnc-dev | |
9ddc8b5 merge in mnc-release history after reset to mnc-dev | |
49015f4 merge in mnc-release history after reset to mnc-dev | |
889994a merge in mnc-release history after reset to mnc-dev | |
537dae8 merge in mnc-release history after reset to mnc-dev | |
4104bde merge in mnc-release history after reset to mnc-dev | |
6ad275e Fix NPE in CallLogProviderWorker | |
project packages/providers/DownloadProvider/ | |
8ef9035 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
f043127 Import translations. DO NOT MERGE | |
569c825 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a0c66e4 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8745cbd merge in mnc-dr-release history after reset to mnc-dr-dev | |
3c8d441 merge in mnc-dr-release history after reset to mnc-dr-dev | |
project packages/providers/MediaProvider/ | |
429e866 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
8277ae7 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
db2de9f merge in mnc-dr-release history after reset to mnc-dr-dev | |
8b9b53d merge in mnc-dr-release history after reset to mnc-dr-dev | |
bddb770 Media provider clears binder id calling in other providers | |
18e3b6c merge in mnc-dr-release history after reset to mnc-dr-dev | |
363bce4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
7b105bf merge in mnc-dr-release history after reset to mnc-dr-dev | |
41717e0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ce292c6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8a9b0a8 MtpService always expects a start intent. | |
79ffa2a merge in mnc-dr-release history after reset to mnc-dr-dev | |
df15682 merge in mnc-release history after reset to mnc-dev | |
538b143 merge in mnc-release history after reset to mnc-dev | |
project packages/providers/TelephonyProvider/ | |
de9b3ea merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
cecbabc Try-catch for deletePreferredApnId() | |
11f884a merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ae77c1f merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
10f4417 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
0fbf550 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
461e049 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2fb9c18 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6851c8a merge in mnc-dr-release history after reset to mnc-dr-dev | |
a174e72 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3b76432 merge in mnc-dr-release history after reset to mnc-dr-dev | |
096d475 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fce183b merge in mnc-dr-release history after reset to mnc-dr-dev | |
21bfcc3 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3b59837 merge in mnc-release history after reset to mnc-dev | |
ae9af2c merge in mnc-release history after reset to mnc-dev | |
ff634cd merge in mnc-release history after reset to mnc-dev | |
b48fea0 merge in mnc-release history after reset to mnc-dev | |
64bb128 merge in mnc-release history after reset to mnc-dev | |
a14a274 merge in mnc-release history after reset to mnc-dev | |
e9315ba merge in mnc-release history after reset to mnc-dev | |
113415c merge in mnc-release history after reset to mnc-dev | |
8f43b93 merge in mnc-release history after reset to mnc-dev | |
e72ac32 merge in mnc-release history after reset to mnc-dev | |
9f86017 Adding try-catch block to catch an unexpected exception causing crash. | |
project packages/services/Mms/ | |
8734446 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c37389b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
faf4738 merge in mnc-release history after reset to mnc-dev | |
354d430 merge in mnc-release history after reset to mnc-dev | |
99422dd merge in mnc-release history after reset to mnc-dev | |
1983ce8 merge in mnc-release history after reset to mnc-dev | |
7a4535b merge in mnc-release history after reset to mnc-dev | |
e6defb1 merge in mnc-release history after reset to mnc-dev | |
b887618 merge in mnc-release history after reset to mnc-dev | |
71ffc0a remove active sub ID check for mms download | |
project packages/services/Telecomm/ | |
f68a80a merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
02a4bfb merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a99cba9 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
dcbec8a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
3947d23 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
b372f9b merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9d51618 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
0fdf979 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a536be8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ecfdf39 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c6a0e81 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a67a132 merge in mnc-dr-release history after reset to mnc-dr-dev | |
33850d8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
82d4eec merge in mnc-dr-release history after reset to mnc-dr-dev | |
d12d377 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5a6c92f merge in mnc-dr-release history after reset to mnc-dr-dev | |
179ae3e merge in mnc-dr-release history after reset to mnc-dr-dev | |
c61c034 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a50c35d merge in mnc-dr-release history after reset to mnc-dr-dev | |
b8d9264 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9ae76ea merge in mnc-dr-release history after reset to mnc-dr-dev | |
ce857b5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
10defd6 Add OrSelf to privileged permission check. | |
af28074 merge in mnc-dr-release history after reset to mnc-dr-dev | |
36a1d7c merge in mnc-dr-release history after reset to mnc-dr-dev | |
4d84729 merge in mnc-dr-release history after reset to mnc-dr-dev | |
101acf6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
112ed52 merge in mnc-dr-release history after reset to mnc-dr-dev | |
aca9e25 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5c88a92 Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE) | |
d89dff3 Add checks for READ_PRIVILEGED_PHONE_STATE. | |
ba61def merge in mnc-dr-release history after reset to mnc-dr-dev | |
eb1d7ab merge in mnc-dr-release history after reset to mnc-dr-dev | |
688d307 merge in mnc-dr-release history after reset to mnc-dr-dev | |
179faf5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ae3a484 merge in mnc-release history after reset to mnc-dev | |
93805bd merge in mnc-release history after reset to mnc-dev | |
1a4fbf2 merge in mnc-release history after reset to mnc-dev | |
f45d72b merge in mnc-release history after reset to mnc-dev | |
e28c3cc Mark all SIM accounts as enabled. | |
ed25ae1 merge in mnc-release history after reset to mnc-dev | |
34bf686 merge in mnc-release history after reset to mnc-dev | |
cc0a4b1 merge in mnc-release history after reset to mnc-dev | |
95f5786 merge in mnc-release history after reset to mnc-dev | |
0457c71 merge in mnc-release history after reset to mnc-dev | |
f18568b merge in mnc-release history after reset to mnc-dev | |
44bc828 PhoneAccountRegistrar#getSimCallManager should consider disabled PhoneAccounts. | |
87c2212 merge in mnc-release history after reset to mnc-dev | |
a501e99 Use setIntentExtras instead of setExtras. | |
2b2634f merge in mnc-release history after reset to mnc-dev | |
88c0aa9 merge in mnc-release history after reset to mnc-dev | |
c931972 merge in mnc-release history after reset to mnc-dev | |
b128869 merge in mnc-release history after reset to mnc-dev | |
e77085d merge in mnc-release history after reset to mnc-dev | |
8768e1c merge in mnc-release history after reset to mnc-dev | |
284c013 merge in mnc-release history after reset to mnc-dev | |
26cf8c2 Add a slew of clearCallingIdentity() invocations to telecom. | |
d6859ed Fix crash caused by incorrect permission in TelecomServiceImpl. | |
project packages/services/Telephony/ | |
2f7aded merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
6af4f87 Import translations. DO NOT MERGE am: 5ca7a9b7cc -s ours | |
922408b Import translations. DO NOT MERGE | |
5ca7a9b Import translations. DO NOT MERGE | |
cccee0e merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
69756c9 Import translations. DO NOT MERGE am: 2dad7c686e -s ours | |
0adb52c Import translations. DO NOT MERGE | |
2dad7c6 Import translations. DO NOT MERGE | |
390aaed merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
02bd99e Merge "Revert "Ensure sim contacts import screen supports rotation."" into mnc-dr-dev am: 09481a1673 | |
09481a1 Merge "Revert "Ensure sim contacts import screen supports rotation."" into mnc-dr-dev | |
edb2cb1 Revert "Ensure sim contacts import screen supports rotation." | |
ef4e92c merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
e542dfc Import translations. DO NOT MERGE am: 831ff856b2 -s ours | |
3278ead Import translations. DO NOT MERGE | |
831ff85 Import translations. DO NOT MERGE | |
7d68a28 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
1ae1dd1 Ensure connection extras are propagated on start of call. am: 06f2ca3945 | |
f875aa4 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
06f2ca3 Ensure connection extras are propagated on start of call. | |
25edd90 Import translations. DO NOT MERGE am: 2388cfda63 -s ours | |
8a53667 Import translations. DO NOT MERGE | |
8943ec3 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
3de0485 Import translations. DO NOT MERGE am: 0d9e7eba32 -s ours | |
324bc63 Import translations. DO NOT MERGE | |
4295af6 Import translations. DO NOT MERGE am: 049b3bbbeb -s ours | |
c2697c5 Import translations. DO NOT MERGE | |
6c59b09 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f908240 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
aaf1be4 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
b2deb3e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a8a9896 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f01ccac merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
eeccb09 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
bf91c62 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ed9f619 merge in mnc-dr-release history after reset to mnc-dr-dev | |
4e343c2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d9b8baf merge in mnc-dr-release history after reset to mnc-dr-dev | |
79250cb merge in mnc-dr-release history after reset to mnc-dr-dev | |
36b4d3d merge in mnc-dr-release history after reset to mnc-dr-dev | |
336d554 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9acfd1d merge in mnc-dr-release history after reset to mnc-dr-dev | |
867e94e merge in mnc-dr-release history after reset to mnc-dr-dev | |
b7f7e62 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8dc8241 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0eb79fe Only mark as read voicemails with the "is_read" flag set. | |
ba6bdb5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ea0885e merge in mnc-dr-release history after reset to mnc-dr-dev | |
6b4595e merge in mnc-dr-release history after reset to mnc-dr-dev | |
1450cea merge in mnc-dr-release history after reset to mnc-dr-dev | |
4e87a4e merge in mnc-dr-release history after reset to mnc-dr-dev | |
958aebe merge in mnc-dr-release history after reset to mnc-dr-dev | |
1196b30 merge in mnc-dr-release history after reset to mnc-dr-dev | |
644370a Use SSL connection for T-Mobile. | |
c5825ae merge in mnc-dr-release history after reset to mnc-dr-dev | |
57ea287 merge in mnc-dr-release history after reset to mnc-dr-dev | |
02614d7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b6a1793 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0e9bf0f merge in mnc-dr-release history after reset to mnc-dr-dev | |
01ba6a9 Add OrSelf to privileged permission check. | |
f50e567 merge in mnc-dr-release history after reset to mnc-dr-dev | |
04b3a7e merge in mnc-dr-release history after reset to mnc-dr-dev | |
79ee961 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f732ca0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
c4705cd merge in mnc-dr-release history after reset to mnc-dr-dev | |
27e96c4 Add better logs. Ignore all duplicate phone state changes. | |
51056b0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
716fc73 merge in mnc-dr-release history after reset to mnc-dr-dev | |
236497b merge in mnc-dr-release history after reset to mnc-dr-dev | |
948242f merge in mnc-dr-release history after reset to mnc-dr-dev | |
768defa Add checks for READ_PRIVILEGED_PHONE_STATE. | |
29916e7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
fcd1204 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f33863f merge in mnc-dr-release history after reset to mnc-dr-dev | |
0e208a5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3439d98 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d9e75d0 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e409624 merge in mnc-release history after reset to mnc-dev | |
0e848cd merge in mnc-release history after reset to mnc-dev | |
dfef05e merge in mnc-release history after reset to mnc-dev | |
d1e16be merge in mnc-release history after reset to mnc-dev | |
037495a merge in mnc-release history after reset to mnc-dev | |
c94a613 Include disabled accounts when cleaning up telephony accounts. | |
ba4b6f3 merge in mnc-release history after reset to mnc-dev | |
827b313 merge in mnc-release history after reset to mnc-dev | |
17b09ff merge in mnc-release history after reset to mnc-dev | |
57ed82c Check if mImapStore is null before attempting to open folder. | |
286171b Adding temporary logging to debug CTS failure (for CellLocationTest). | |
fc16196 merge in mnc-release history after reset to mnc-dev | |
da4bd1c merge in mnc-release history after reset to mnc-dev | |
921809e merge in mnc-release history after reset to mnc-dev | |
7afb7e4 merge in mnc-release history after reset to mnc-dev | |
f3f117a merge in mnc-release history after reset to mnc-dev | |
628df99 merge in mnc-release history after reset to mnc-dev | |
1485c2d merge in mnc-release history after reset to mnc-dev | |
4caa896 Revert "Save config to disk to avoid binding." | |
f4f02bc merge in mnc-release history after reset to mnc-dev | |
542f20f merge in mnc-release history after reset to mnc-dev | |
faba5d9 merge in mnc-release history after reset to mnc-dev | |
2503dce Lookup SIP Profile using profile name instead of URI. | |
project packages/wallpapers/Basic/ | |
2195644 Import translations. DO NOT MERGE | |
project platform_testing/ | |
a2e221c merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
c66c4ef merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
5581e68 test improvement: dump window hierarchy line by line | |
29fc9bf merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ee70755 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f7f2f88 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f94b872 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a46ff7e merge in mnc-dr-release history after reset to mnc-dr-dev | |
5d0a121 youtube jank test fix | |
2a15ac8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
40b1dba merge in mnc-dr-release history after reset to mnc-dr-dev | |
5845313 merge in mnc-dr-release history after reset to mnc-dr-dev | |
18ecb8a merge in mnc-dr-release history after reset to mnc-dr-dev | |
e2d02b9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ea25480 merge in mnc-dr-release history after reset to mnc-dr-dev | |
52e95a5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
452cc07 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f62dbbe merge in mnc-dr-release history after reset to mnc-dr-dev | |
0152330 Jank Micro benchmark nit fix | |
a6cb612 update resource id per new GSA drop | |
5076c38 jank microbenchmark more tests | |
2a62079 Jank benchmark tests for APIDemos | |
5abbc77 merge in mnc-release history after reset to mnc-dev | |
ffbf301 merge in mnc-release history after reset to mnc-dev | |
bdeec7f test apk name correction | |
7055886 More system app jank tests Simple usecases for Books, Camera, Chrome, Gmail and Maps | |
35cfc45 Package name fix for Youtube fling test | |
project prebuilts/clang/linux-x86/host/3.6/ | |
16200ab merge in mnc-dr-release history after reset to mnc-dr-dev | |
2803984 merge in mnc-release history after reset to mnc-dev | |
project prebuilts/gradle-plugin/ | |
5321196 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
4ce7bff merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
75371f1 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
project prebuilts/misc/ | |
35075e6 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a0df0f4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
project prebuilts/sdk/ | |
1d5fe78 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
cdf8a43 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
d25728a merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
project system/bt/ | |
26f78c3 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
43f477a Retry HID Polling when EINTR is returned | |
f9ed535 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
03d1711 Always update remote address type during LE scan | |
7a83d72 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
15c1f68 Merge "Do not mask out secure connections (SC) bit for BT <4.2" into mnc-dr-dev | |
7312c6d Fix bug in SDP 128-bit UUID lookup | |
4da5ccf Do not mask out secure connections (SC) bit for BT <4.2 | |
74ee83e merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
864e773 Serialize remote version query over LE | |
202e149 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
8f605fd merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
04d8732 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
b9f4cff merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
7a32d41 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c8b37cd merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
808402e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c7e5c86 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d10c980 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3d1f038 merge in mnc-dr-release history after reset to mnc-dr-dev | |
407aa43 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9fb5bc7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
88e9471 merge in mnc-dr-release history after reset to mnc-dr-dev | |
84d1a5e merge in mnc-dr-release history after reset to mnc-dr-dev | |
5f59745 merge in mnc-dr-release history after reset to mnc-dr-dev | |
dcfaea9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
be18ef5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ed904c4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d608770 merge in mnc-dr-release history after reset to mnc-dr-dev | |
1b44324 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3e77817 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3ca5acb merge in mnc-dr-release history after reset to mnc-dr-dev | |
07a37c1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
eba7108 merge in mnc-dr-release history after reset to mnc-dr-dev | |
825b721 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f4be2b6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e79a13d merge in mnc-dr-release history after reset to mnc-dr-dev | |
eb948e4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f03ad67 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0bccfc2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
68b8dd7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ae2b518 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b2164f2 Additional BDA range for Nexus Remote secure connections blacklist | |
c7c8a40 Move pairing auto-retry workaround to new interop db | |
782a266 merge in mnc-dr-release history after reset to mnc-dr-dev | |
0ead03d merge in mnc-dr-release history after reset to mnc-dr-dev | |
e2e9874 merge in mnc-dr-release history after reset to mnc-dr-dev | |
eca1ce2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
429d890 merge in mnc-release history after reset to mnc-dev | |
0778570 merge in mnc-release history after reset to mnc-dev | |
8eb1dd2 merge in mnc-release history after reset to mnc-dev | |
7aeffff merge in mnc-release history after reset to mnc-dev | |
384353a merge in mnc-release history after reset to mnc-dev | |
5c464ff merge in mnc-release history after reset to mnc-dev | |
7b523c7 merge in mnc-release history after reset to mnc-dev | |
e52edf5 merge in mnc-release history after reset to mnc-dev | |
bd2319e merge in mnc-release history after reset to mnc-dev | |
b49a8b3 Fix memory corruption due to BLE multi-adv macro | |
d49ac4c merge in mnc-release history after reset to mnc-dev | |
7407ffc merge in mnc-release history after reset to mnc-dev | |
6b57bb3 merge in mnc-release history after reset to mnc-dev | |
58221c6 merge in mnc-release history after reset to mnc-dev | |
4893bc2 merge in mnc-release history after reset to mnc-dev | |
30ae983 Fix build after cross-key issues broke non privacy enabled builds | |
5ded8a1 merge in mnc-release history after reset to mnc-dev | |
9c6a2b6 merge in mnc-release history after reset to mnc-dev | |
2b9c1e6 Include osi_module reference in module_init funcion | |
2473edb merge in mnc-release history after reset to mnc-dev | |
3a192d1 merge in mnc-release history after reset to mnc-dev | |
6d47493 merge in mnc-release history after reset to mnc-dev | |
f4db1d7 merge in mnc-release history after reset to mnc-dev | |
951a1fb Only register key types with uinput that we can actually map | |
a3879c6 merge in mnc-release history after reset to mnc-dev | |
4956a99 merge in mnc-release history after reset to mnc-dev | |
6277ebb merge in mnc-release history after reset to mnc-dev | |
8e6cc09 merge in mnc-release history after reset to mnc-dev | |
b0fd32a Ensure PAN is initialized before invoking callbacks | |
5a0d122 merge in mnc-release history after reset to mnc-dev | |
11adcf8 Stop media task alarm when task is exiting | |
1d835f6 Add LE device to device database before adding LE keys | |
51eb82c merge in mnc-release history after reset to mnc-dev | |
5378ddd Keep track of pending LE background connections | |
1f30f1c Cross transport key mapping fixes | |
project system/core/ | |
06cd1d9 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
c5e40cd healthd: Support new PD and USB Type C types | |
26a9b44 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
68ac0be Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours am: ea1e6a59e7 am: 088639a20f -s ours am: 55263d2ae3 am: 99cd21ef5c | |
5123d84 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb am: 089ad5e98a -s ours am: 2f1562eb10 am: 9f1b1caa78 | |
63a0ac9 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am: f84eef3fca -s ours am: d0ed7943b8 -s ours am: a1da204980 am: 7755770ac9 | |
99cd21e Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours am: ea1e6a59e7 am: 088639a20f -s ours am: 55263d2ae3 | |
9f1b1ca Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb am: 089ad5e98a -s ours am: 2f1562eb10 | |
7755770 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am: f84eef3fca -s ours am: d0ed7943b8 -s ours am: a1da204980 | |
55263d2 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours am: ea1e6a59e7 am: 088639a20f -s ours | |
2f1562e Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb am: 089ad5e98a -s ours | |
a1da204 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am: f84eef3fca -s ours am: d0ed7943b8 -s ours | |
088639a Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours am: ea1e6a59e7 | |
089ad5e Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb | |
d0ed794 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am: f84eef3fca -s ours | |
ea1e6a5 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours | |
702fe6d Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a | |
362f13d Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours | |
fd56dc4 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 | |
8ac41fa Merge "Add macro to call event logger for errors." into mnc-dev am: d028c6fa7f am: bc1ef58505 | |
93a3871 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours | |
bc1ef58 Merge "Add macro to call event logger for errors." into mnc-dev am: d028c6fa7f | |
442a830 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 | |
d028c6f Merge "Add macro to call event logger for errors." into mnc-dev | |
f84eef3 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev | |
5280061 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev | |
809d5a0 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev | |
f6891c0 Add macro to call event logger for errors. | |
9a86c28 Add macro to call event logger for errors. DO NOT MERGE | |
f34258f Add macro to call event logger for errors. DO NOT MERGE | |
4fd8210 Add macro to call event logger for errors. DO NOT MERGE | |
dac2a49 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
f12cab2 Merge "logd: pruning time horizon" into mnc-dr-dev am: dfbe85ec8b | |
dfbe85e Merge "logd: pruning time horizon" into mnc-dr-dev | |
44bcbd7 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
653316a logd: pruning time horizon | |
13e199f Remove __DATE__/__TIME__ from init and debuggerd am: 36b24a4a20 | |
f93e497 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
36b24a4 Remove __DATE__/__TIME__ from init and debuggerd | |
0eb0516 DO NOT MERGE: fs_mgr: set partition.*.verified property even without state | |
69406d9 Fix incorrect check of descsz value. am: d917514bd6 | |
d917514 Fix incorrect check of descsz value. | |
6925e2a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c8e7a5a merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
9327f4d merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
f667f16 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
ef4eddd merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2d77b18 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e1aecd7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8fbc042 merge in mnc-dr-release history after reset to mnc-dr-dev | |
17b314f Add zygote to the foreground cpuset. | |
d6bd958 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5ad8221 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6173d4b merge in mnc-dr-release history after reset to mnc-dr-dev | |
10c073a merge in mnc-dr-release history after reset to mnc-dr-dev | |
54d65a4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9b8ec76 merge in mnc-dr-release history after reset to mnc-dr-dev | |
3b4efd2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ea3c381 merge in mnc-dr-release history after reset to mnc-dr-dev | |
971abfe merge in mnc-dr-release history after reset to mnc-dr-dev | |
8774e2c merge in mnc-dr-release history after reset to mnc-dr-dev | |
dc4e386 merge in mnc-dr-release history after reset to mnc-dr-dev | |
5fa1f92 merge in mnc-dr-release history after reset to mnc-dr-dev | |
be959f1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
61ceac1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
be2bbcb merge in mnc-dr-release history after reset to mnc-dr-dev | |
88dd713 Revert "Change init sequence to support file level encryption" | |
60f86a4 merge in mnc-dr-release history after reset to mnc-dr-dev | |
d35bad7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
project system/extras/ | |
2b3b95e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
cf971e6 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
07c17ba merge in mnc-dr-release history after reset to mnc-dr-dev | |
0e115db Actually encrypt stuff | |
8723dd3 Don't encrypt lost+found | |
7a329c6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
a0025a8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
951b7ce merge in mnc-dr-release history after reset to mnc-dr-dev | |
0e734c2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ae88622 merge in mnc-release history after reset to mnc-dev | |
3608002 merge in mnc-release history after reset to mnc-dev | |
project system/gatekeeper/ | |
1a699f7 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ba596dd Merge remote-tracking branch 'goog/master' into merge-master | |
e3fab37 Merge "Fix Gatekeeper unit test" | |
b3f9a07 Merge "Fix default constructor" | |
936d5ba Fix Gatekeeper unit test | |
70a35b8 Fix default constructor | |
2e52dd5 Merge "fix gatekeper_device_test" | |
7d0b0ba fix gatekeper_device_test | |
78ae7ba fix error in timeout computation am: 66261db8d2 am: f0217cdbde | |
f0217cd fix error in timeout computation am: 66261db8d2 | |
66261db fix error in timeout computation | |
d14f472 [gatekeeeper] fix error in timeout computation | |
15d6276 [gatekeeper] implement recommended throttling function am: f436c80fdf | |
69d977a more gatekeeper unit tests am: 21223c8b36 | |
6a886d7 Add static gatekeeper library am: 3c4cbf7f94 | |
7d84092 Add static gatekeeper library am: 3c4cbf7f94 | |
3c4cbf7 Add static gatekeeper library | |
f436c80 [gatekeeper] implement recommended throttling function | |
21223c8 more gatekeeper unit tests | |
9be92ed Add static gatekeeper library | |
22febf8 Disable sanitizer coverage flags for gatekeeper. | |
08083b8 am 9ed18d65: Merge "make DoVerify protected" | |
9ed18d6 Merge "make DoVerify protected" | |
41d4847 make DoVerify protected | |
adbcf04 am e547f93b: [gatekeeper] make DoVerify protected | |
992a033 am bd0b418f: [gatekeeper] add cleanspec to remove obsolete gatekeeper.default.so | |
117bb07 am 68b57e9e: request reenroll of pre-throttling password | |
5abfb30 am b6fc8937: allow for non-throttling passwords | |
cb54dd3 Merge "resolved conflicts for merge of 52376c13 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp | |
578b026 resolved conflicts for merge of 52376c13 to mnc-dev-plus-aosp | |
5616b84 am b6a5cd7c: [gatekeeper] fix error computing retry timeout | |
b6a5cd7 [gatekeeper] fix error computing retry timeout | |
a2500f0 am 893fa7f7: request reenroll of pre-throttling password | |
b5e3e81 am 48a4f837: allow for non-throttling passwords | |
893fa7f request reenroll of pre-throttling password | |
48a4f83 allow for non-throttling passwords | |
8020833 am 2c8c44ff: remove unused parameters | |
97cea61 am ea08aceb: disable throtlling | |
ea08ace disable throtlling | |
05c886c am a623e45c: remove unused parameters | |
af925e7 am 69e7394c: move throttling to GateKeeper layer | |
a623e45 remove unused parameters | |
7577933 am aedf605d: move throttling to GateKeeper layer | |
256f5c6 am 4844fa6b: remove softgatekeeper device | |
aedf605 move throttling to GateKeeper layer | |
4844fa6 remove softgatekeeper device | |
5e38ebd am 32a89f2c: remove softgatekeeper device | |
fd736a6 am 65625f39: Fix clang warnings on unused variable and function. | |
8aceb8f Fix clang warnings on unused variable and function. | |
project system/keymaster/ | |
7821c05 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
6d7f048 Return correct error from keymaster0engine for large RSA input | |
e726e70 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
b5eebb4 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
c5698c1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
bc5989c merge in mnc-dr-release history after reset to mnc-dr-dev | |
b1034db merge in mnc-dr-release history after reset to mnc-dr-dev | |
844c3ee merge in mnc-dr-release history after reset to mnc-dr-dev | |
c5cf424 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ce7da0d merge in mnc-dr-release history after reset to mnc-dr-dev | |
3cfe1c8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2d14f75 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ce073fc merge in mnc-dr-release history after reset to mnc-dr-dev | |
f404750 merge in mnc-dr-release history after reset to mnc-dr-dev | |
2577fc6 merge in mnc-dr-release history after reset to mnc-dr-dev | |
6124cd2 merge in mnc-dr-release history after reset to mnc-dr-dev | |
94dcf83 merge in mnc-dr-release history after reset to mnc-dr-dev | |
636001d merge in mnc-release history after reset to mnc-dev | |
5217c59 merge in mnc-release history after reset to mnc-dev | |
b820f0c merge in mnc-release history after reset to mnc-dev | |
10b2153 merge in mnc-release history after reset to mnc-dev | |
project system/media/ | |
43fe483 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
86f9af8 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
137dfd4 Camera: update FPS range spec am: 30bf75b88a | |
30bf75b Camera: update FPS range spec | |
b4eb821 merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev | |
ebfd7b8 Camera: Documentation updates am: 04292697a7 | |
0429269 Camera: Documentation updates | |
291205e merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
a41e7fe merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
2236390 merge in mnc-dr-release history after reset to mnc-dr-dev | |
216b3b7 merge in mnc-dr-release history after reset to mnc-dr-dev | |
010109a merge in mnc-dr-release history after reset to mnc-dr-dev | |
388846f merge in mnc-dr-release history after reset to mnc-dr-dev | |
a998b10 merge in mnc-dr-release history after reset to mnc-dr-dev | |
b50bc20 merge in mnc-dr-release history after reset to mnc-dr-dev | |
277f09f merge in mnc-dr-release history after reset to mnc-dr-dev | |
d7a032d merge in mnc-dr-release history after reset to mnc-dr-dev | |
be9c2e1 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8cfc63c merge in mnc-dr-release history after reset to mnc-dr-dev | |
6c33301 merge in mnc-dr-release history after reset to mnc-dr-dev | |
ac1a9f9 merge in mnc-release history after reset to mnc-dev | |
46f7617 merge in mnc-release history after reset to mnc-dev | |
ea6ade9 merge in mnc-release history after reset to mnc-dev | |
project system/security/ | |
ddab0bb Limit maximum number of concurrent keystore operations. | |
project system/vold/ | |
1b32d16 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
3193b61 merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
559f1da merge in mnc-dr-ryu-release history after reset to mnc-dr-dev | |
71a572a merge in mnc-dr-release history after reset to mnc-dr-dev | |
b0d93c8 merge in mnc-dr-release history after reset to mnc-dr-dev | |
beab2ea merge in mnc-dr-release history after reset to mnc-dr-dev | |
6eec38d merge in mnc-dr-release history after reset to mnc-dr-dev | |
3486b99 merge in mnc-dr-release history after reset to mnc-dr-dev | |
83d8be9 merge in mnc-dr-release history after reset to mnc-dr-dev | |
9dba741 merge in mnc-dr-release history after reset to mnc-dr-dev | |
f32fa76 merge in mnc-dr-release history after reset to mnc-dr-dev | |
8ab9ac5 merge in mnc-dr-release history after reset to mnc-dr-dev | |
e04b67a merge in mnc-dr-release history after reset to mnc-dr-dev | |
72ad911 merge in mnc-dr-release history after reset to mnc-dr-dev | |
237bb4f merge in mnc-release history after reset to mnc-dev | |
7d49edf merge in mnc-release history after reset to mnc-dev | |
589f4a1 merge in mnc-release history after reset to mnc-dev | |
c94e7c7 merge in mnc-release history after reset to mnc-dev | |
1338182 merge in mnc-release history after reset to mnc-dev | |
aa38c24 merge in mnc-release history after reset to mnc-dev | |
78edb10 merge in mnc-release history after reset to mnc-dev | |
2a02c3f merge in mnc-release history after reset to mnc-dev | |
6922290 merge in mnc-release history after reset to mnc-dev | |
3590bf0 merge in mnc-release history after reset to mnc-dev | |
af94f53 Offer debug flag to force default primary. | |
a65f72c merge in mnc-release history after reset to mnc-dev | |
97b0bf3 merge in mnc-release history after reset to mnc-dev | |
8fcc77a Report internal path for public volumes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment