Commit Graph

309172 Commits

Author SHA1 Message Date
Suprabh Shukla
475fb1fbab DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b am: 3411150115
am: d176e0a508

Change-Id: I524217495255a77580e33ccb07563fcb65607a6e
2017-02-02 23:21:56 +00:00
Manu Cornet
f8b2e8bffb 2D Recents: Less drastic scale reduction for dismiss animation am: 8ea36af22b
am: 69f9c6073d

Change-Id: I60cc6ab90e224c82524a36bc2d5123d0cda95fa0
2017-02-02 23:21:56 +00:00
Suprabh Shukla
64e2b4f825 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours
am: 3f7ed73fdd  -s ours

Change-Id: I42ed0e37dc68919a2a3e6b9b6aaa5030a90eca77
2017-02-02 23:21:37 +00:00
Suprabh Shukla
08e93fac70 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60 am: 029364c505 am: 2f1b2d82ca am: ac8f44e387 am: 674cefc5f5
am: fd8ccd934a  -s ours

Change-Id: Ic0d5b6c9a31227b5650fa25244fc3a2a553b1359
2017-02-02 23:20:59 +00:00
Manu Cornet
7b35813f42 Merge "2D Recents: Fix issues with thumbnail scaling transitions" into nyc-mr2-dev am: f41a8c5a3d
am: 10b7963547

Change-Id: Ie00ba28ca5ac20a579231892d37abd1f3580ecab
2017-02-02 23:20:06 +00:00
Paul Lawrence
14f31aa647 Optimize seccomp
Bug: 34946764
Test: Make sure boots, seccomp still blocks, and is faster
Change-Id: I2b4da512f8a9eb8a32f4435561285d42e4b0395f
2017-02-02 15:19:25 -08:00
Suprabh Shukla
dcc633f1f8 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours
am: f1e045b733

Change-Id: I6cfa97f2f4fd113cafcca5440eafd6c5bf70698b
2017-02-02 23:19:12 +00:00
Manu Cornet
429338e3bd 2D Recents: Fix issues with thumbnail scaling transitions am: 57b6149f8b
am: 6f5bb1f340

Change-Id: I0556939ca9c94965865ac050a98981a347f6d0aa
2017-02-02 23:19:05 +00:00
Suprabh Shukla
c1a0e6db4c Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours
am: bf1c88f34e  -s ours

Change-Id: I75d702680bc6ef22e0f60a3c165cd310bf2bb6cf
2017-02-02 23:18:07 +00:00
Makoto Onuki
9a32a2c13e DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc am: 963cba5b5b am: f1e276384d -s ours am: 3d45f12cad -s ours
am: 40c83c5b0f  -s ours

Change-Id: I4425ab8e2b6a7c51d1da2f7da52ae0e498648f9c
2017-02-02 23:18:05 +00:00
Suprabh Shukla
7314106770 Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58
am: b2cdb4e2dd

Change-Id: I304954cb2b7d67030714b4b43098aaab4d61c67e
2017-02-02 23:17:40 +00:00
Suprabh Shukla
3f7ed73fdd DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours
am: a3685e4bb5  -s ours

Change-Id: If22ee3dec4879f8324a66dea910bb65c9f6eda14
2017-02-02 23:17:06 +00:00
Philip P. Moltmann
1771be6a8c Merge "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms" into nyc-mr2-dev am: 65924030d6
am: 962db24548  -s ours

Change-Id: I5542b89150066d5b10bac38fd05a42237b60bbd5
2017-02-02 23:16:47 +00:00
Suprabh Shukla
d176e0a508 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b
am: 3411150115

Change-Id: I735a0801698f926c6230311c887c58f6fcf86576
2017-02-02 23:16:39 +00:00
Philip P. Moltmann
a772be715c [DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms am: 2fc44947dd
am: 416a36a83b  -s ours

Change-Id: Ic800b08f1aca058084538b0e862c2255ab96fdb0
2017-02-02 23:15:53 +00:00
Suprabh Shukla
f1e045b733 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a
am: 55176e2d5a  -s ours

Change-Id: If9f0a189981a49d36662ad4e90d3278be35148d0
2017-02-02 23:14:43 +00:00
Paul Lawrence
9e1b582af6 Merge "Install seccomp into zygote not init" am: ba9bbd8517 am: dcf63748fc am: 5a389e7e44
am: 299227693c

Change-Id: Iaf077a1adfc25c5b3eff91058f35f58155438fbe
2017-02-02 23:14:22 +00:00
Suprabh Shukla
bf1c88f34e Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours
am: d9c8155943  -s ours

Change-Id: I9dfff7471440739580e7827cdb4484fad6900048
2017-02-02 23:13:03 +00:00
Suprabh Shukla
b2cdb4e2dd Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0
am: 5a2e7e2e58

Change-Id: I336ce9f979c74df32ea80cd43253485ce184d0c0
2017-02-02 23:12:32 +00:00
Jack Yu
34722d7c01 Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1 am: 73056d5feb am: ecadb9d7cb am: f565a487bb am: e06c03d843
am: d7aa4db998

Change-Id: I7b72fc5e77b69dc03f788ccaf1320f6c68e5197d
2017-02-02 23:12:13 +00:00
Suprabh Shukla
a3685e4bb5 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours
am: 051f01700e  -s ours

Change-Id: Idcf3ce991369a6e41a3c2bd3aa9cd16d909eea13
2017-02-02 23:12:05 +00:00
Suprabh Shukla
3411150115 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e
am: a293067f0b

Change-Id: Idf95cea3331afbab3f6c69ced3341a7fa1dac2e1
2017-02-02 23:11:34 +00:00
Suprabh Shukla
55176e2d5a DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b
am: c19d459e2a

Change-Id: I4b7d8869ecb9f1d8a52a0cccf59f8dee1f6c31dc
2017-02-02 23:10:10 +00:00
Paul Lawrence
3a1cae007a Merge "resolve merge conflicts of fde0a41065 to master" 2017-02-02 23:08:53 +00:00
Suprabh Shukla
d9c8155943 Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev
am: af85feef36  -s ours

Change-Id: Idf57ddf932e98dda06ac9c51f7e230d6a673882b
2017-02-02 23:07:36 +00:00
Suprabh Shukla
051f01700e DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 14ed611912  -s ours

Change-Id: I1645d15febdfffd76cd2c592241549c507db1185
2017-02-02 23:07:34 +00:00
Jack Yu
d7aa4db998 Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1 am: 73056d5feb am: ecadb9d7cb am: f565a487bb
am: e06c03d843

Change-Id: I4a42274fe5646f41364abf144e39110522d48db4
2017-02-02 23:07:06 +00:00
Suprabh Shukla
5a2e7e2e58 Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc
am: 73d19fc1a0

Change-Id: I3d09ae3d8683f9f4a2c68321eb4fdd9490c9355b
2017-02-02 23:06:08 +00:00
Suprabh Shukla
a293067f0b DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf
am: 642912652e

Change-Id: Ie6d665f3cb2aae6e8043b4bde28005a2aaa94953
2017-02-02 23:05:10 +00:00
Suprabh Shukla
c19d459e2a DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54
am: 4e4dfacb7b

Change-Id: I7dcba06623c993f0539729be69d97d338be2393f
2017-02-02 23:05:09 +00:00
Jack Yu
e06c03d843 Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1 am: 73056d5feb am: ecadb9d7cb
am: f565a487bb

Change-Id: Ia8861b784be1b25dae59cea5b2eb288ec739e346
2017-02-02 23:03:17 +00:00
Suprabh Shukla
73d19fc1a0 Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours
am: ea91d2d0cc

Change-Id: I4f5ae380b111b21838744c83eda1e3772d705692
2017-02-02 23:01:14 +00:00
Suprabh Shukla
642912652e DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours
am: 5fce769ecf

Change-Id: I903e7a49df102aaa442cfb49040cd99bb2e7f0f2
2017-02-02 23:00:10 +00:00
Suprabh Shukla
4e4dfacb7b DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours
am: bdeae85e54

Change-Id: I112366734c02695d69251e159fb97c523a9c0cf4
2017-02-02 23:00:07 +00:00
Suprabh Shukla
af85feef36 Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev 2017-02-02 22:58:49 +00:00
Suprabh Shukla
bdeae85e54 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41
am: 6e850f85fc  -s ours

Change-Id: I1cfa1298cf0a1f4f53358242d639ff7f072bc273
2017-02-02 22:56:23 +00:00
Suprabh Shukla
ea91d2d0cc Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b
am: 5acc268372  -s ours

Change-Id: I2d8425f5da49ba7b1bd451f9ce5e15cfd423b7eb
2017-02-02 22:56:15 +00:00
Jack Yu
f565a487bb Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1 am: 73056d5feb
am: ecadb9d7cb

Change-Id: I85221b6dc0097893ec6d5d3fbbe09d549ecc1b18
2017-02-02 22:55:10 +00:00
Suprabh Shukla
5fce769ecf DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42
am: af7a739889  -s ours

Change-Id: Ie8ed7d0a8f45d4ad2ccd9f0db56499aa492b8cb8
2017-02-02 22:55:08 +00:00
TreeHugger Robot
ec3211830e Merge "TIF: add COLUMN_SYSTEM_APPROVED in Channels" 2017-02-02 22:54:44 +00:00
TreeHugger Robot
39455174d7 Merge "TIF: change the column names to be consistent with other fields" 2017-02-02 22:54:00 +00:00
Pierre Lecesne
880d65b4fd Iterate over the zip entries in order.
Test: Unit tests pass.

Change-Id: I0501fad51a87c6cc91f2fc22358cd356616e1a2e
2017-02-02 22:52:44 +00:00
Jack Yu
ecadb9d7cb Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1
am: 73056d5feb

Change-Id: Id542f20e2e11baae9b6281af86d8f0dbe12d08b3
2017-02-02 22:51:09 +00:00
Suprabh Shukla
6e850f85fc DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours
am: 483b561f41

Change-Id: I065ff3640f19985157cd63c529019167c135489a
2017-02-02 22:50:32 +00:00
Suprabh Shukla
5acc268372 Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469
am: ceb288f00b

Change-Id: I6594a2922340e20d226752f0b4a1e99aed7448cb
2017-02-02 22:49:26 +00:00
Suprabh Shukla
af7a739889 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56
am: db40505c42

Change-Id: I97bba19262c03c223faf56505534c29f603d7671
2017-02-02 22:48:34 +00:00
Jack Yu
73056d5feb Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6
am: 37d3b12aa1

Change-Id: I751c29efc17d371905f5d70460e65744c63ec1fc
2017-02-02 22:45:43 +00:00
Suprabh Shukla
483b561f41 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours
am: ec3e2b9dcb  -s ours

Change-Id: I76bf4d69d98374a90da3cd4c74f0c2d892504a40
2017-02-02 22:45:36 +00:00
Suprabh Shukla
ceb288f00b Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21
am: 429683b469

Change-Id: I4998929bae9f510de4dc5828e136921a033ff98e
2017-02-02 22:43:58 +00:00
Suprabh Shukla
db40505c42 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4
am: 50c6d2ff56

Change-Id: I53ba07ec6cfa0c8617eae87a671d292a6b28f519
2017-02-02 22:43:00 +00:00