Zach Jang
e61672ab08
Revert "Catch KeyStoreException for setting profile lock"
...
This reverts commit c8fa5ed8f2d492aa5e005fcdb5991c3f980de045.
Change-Id: Ia1425e649e102cb79280d75e5f49db670214cec3
2016-11-22 17:47:18 +00:00
Ricky Wai
c8fa5ed8f2
Catch KeyStoreException for setting profile lock
...
When device upgrades from L->N, sid(in gatekeeper) could be 0
even primary profile screenlock is set.
We are now trying to catch the exception so when sid==0 happens,
it will try to tie profile lock again when primary profile is unlocked.
Bug: 32490092
Change-Id: I73011d872ac15e7e09be9bda0165cf7f6a75493a
2016-11-18 00:02:24 +00:00
Selim Cinek
b8a7f78d24
Fixed a bug with the emergency affordance in multi user
...
The emergency call was not launched in the current user
and therefore was only launching once the user had switched.
Change-Id: If6f3bcf77d88a0658b6e0f91f7e4da5d6264b04f
Fixes: 32424103
Test: manual: switch to secondary user and launch emergency affordance
2016-11-14 23:00:24 +00:00
Andriy Naborskyy
0a2ac837d1
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours
...
am: 18305d920e -s ours
Change-Id: I7cc54b33bc5a37f5ff7f23ba3a33cb477932eb8e
2016-11-14 13:42:21 +00:00
Andriy Naborskyy
e26d15582b
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours am: dbbde14239 -s ours
...
am: f566a1d4bf -s ours
Change-Id: I6323c0bc2a591cd3b50dd44b0ea519730f703b15
2016-11-14 13:41:20 +00:00
Brian Carlstrom
d9ea80d009
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362
...
am: 58612638d1
Change-Id: If03a724c633b1ba97bfd7797f61d0f706654f923
2016-11-14 13:40:16 +00:00
Narayan Kamath
df3e599c7d
Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3
...
am: 5f70cb0898
Change-Id: I16da70d1722e16ca61e31fff092ca778a5d66339
2016-11-14 13:39:05 +00:00
Narayan Kamath
2f2611636b
Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377 am: f3f784853d
...
am: 8ea47824fa
Change-Id: I6d31e839b51896830ae42ddad01581743fd4bd28
2016-11-14 13:38:01 +00:00
Narayan Kamath
44e645e59a
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090 am: 81fd9e618c am: 2c13554c18
...
am: fb207962aa
Change-Id: Ifad8cb21043c498097bcd7c459773cdfdcc98560
2016-11-14 13:36:53 +00:00
Narayan Kamath
327edfeba2
Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa am: d212aa9d13 am: 3b89a68a08
...
am: 146a0f86a6
Change-Id: Ie77008fd0fcab39404ae817413096a0c10f88c6d
2016-11-14 13:35:51 +00:00
Narayan Kamath
58d1705c64
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7 am: 0c8da8aa05 am: 1f9abe310f
...
am: f45a1a0fe6
Change-Id: Ie1cabf78ed27b3110e9b89c45c4fd02a4985231d
2016-11-14 13:34:42 +00:00
Narayan Kamath
83be5fdebb
Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f am: da65c74c54 am: 24b2a54a84 am: 4a204149eb
...
am: e58ee798c1
Change-Id: Ia1e984acaff549a83d4ab6373a9becc89bfd66ce
2016-11-14 13:33:24 +00:00
Andriy Naborskyy
18305d920e
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours
...
am: fb4beac069 -s ours
Change-Id: Id30081863fc467acb09bcc087596e3ec43aa3528
2016-11-14 13:26:16 +00:00
Andriy Naborskyy
f566a1d4bf
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours
...
am: dbbde14239 -s ours
Change-Id: I83f374c3a369b616009bc1381a317c21952698c8
2016-11-14 13:25:11 +00:00
neo.chae
4b72904585
Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed am: 0212d4f3fa
...
am: aaf785c827
Change-Id: I34d0175499e1a47e3e6c9aecd2ac2805a6b4ad51
2016-11-14 13:25:11 +00:00
Brian Carlstrom
58612638d1
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13
...
am: f9150bf362
Change-Id: I647f570452982cdf7202dccad793032305e61a9a
2016-11-14 13:24:01 +00:00
Xin Li
6e8fef24d9
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc am: db984f917c -s ours am: ee6b51a05b
...
am: 20def2e75f
Change-Id: If0d5a1c14c181a8a476a00b66c9f8ba279f597e8
2016-11-14 13:24:00 +00:00
Narayan Kamath
5f70cb0898
Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4
...
am: 479385b6b3
Change-Id: Ia0c1b9e495a4bf78b3b12821a7a106a940c12e87
2016-11-14 13:22:52 +00:00
Xin Li
5386c74a44
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e am: 9788dd5bd2 am: 6ec8dd10bb am: 921dd6a5fd -s ours am: 05a61276c6
...
am: 23270f1311
Change-Id: I242883361ff06daefe80686314e8869a3b6733f4
2016-11-14 13:22:41 +00:00
Narayan Kamath
8ea47824fa
Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377
...
am: f3f784853d
Change-Id: Ia7aa7669db2bce172e325cb2c70facb3ca149974
2016-11-14 13:21:40 +00:00
Narayan Kamath
a9fae33c11
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41
...
am: 5cbd448348
Change-Id: I8c2fd9f5e060fabe7fe5bc4e628f62d9de2f4769
2016-11-14 13:21:23 +00:00
Narayan Kamath
a5ff6c84a2
Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249
...
am: c50c43667f
Change-Id: I11f57941eb00efafb14e0505131e66bc22fc68c6
2016-11-14 13:20:05 +00:00
Narayan Kamath
fb207962aa
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090 am: 81fd9e618c
...
am: 2c13554c18
Change-Id: Iaba405222437a1a6df61c2de1b55d46110b7baac
2016-11-14 13:18:23 +00:00
Narayan Kamath
146a0f86a6
Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa am: d212aa9d13
...
am: 3b89a68a08
Change-Id: I7eb37e002025b94267846d45680f24c3901fada9
2016-11-14 13:17:13 +00:00
Narayan Kamath
f45a1a0fe6
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7 am: 0c8da8aa05
...
am: 1f9abe310f
Change-Id: I016ca17b09b2aa1ca3286f21ab6a534933482d1b
2016-11-14 13:15:59 +00:00
Narayan Kamath
3e85db46bc
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7 am: 8e6e5a157b am: 65abe1066d
...
am: a13068a1c8
Change-Id: I3aa51cf70829614ffcc3598e20eba6e9036d6790
2016-11-14 13:15:47 +00:00
Narayan Kamath
e58ee798c1
Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f am: da65c74c54 am: 24b2a54a84
...
am: 4a204149eb
Change-Id: Ic51bd970889a267e911f6171bd56e955b8ecac63
2016-11-14 13:14:47 +00:00
neo.chae
aaf785c827
Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed
...
am: 0212d4f3fa
Change-Id: I9ea05d641c04178d067c35ae5d2f87ee35c86924
2016-11-14 13:13:48 +00:00
Xin Li
20def2e75f
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc am: db984f917c -s ours
...
am: ee6b51a05b
Change-Id: I114b678f9a47837a97758693f4c0e64e8eb17298
2016-11-14 13:12:42 +00:00
Xin Li
23270f1311
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e am: 9788dd5bd2 am: 6ec8dd10bb am: 921dd6a5fd -s ours
...
am: 05a61276c6
Change-Id: I45d14e29bd7791cd3bd8fcca887478d8ac88d37a
2016-11-14 13:11:30 +00:00
Narayan Kamath
56294db4d4
Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b am: 59e6dccb4c
...
am: 53af5fe3f7
Change-Id: If824016f0535d121404b08c36b43a1ce0f168d13
2016-11-14 13:10:53 +00:00
Narayan Kamath
5cbd448348
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe
...
am: 11b3161c41
Change-Id: Ia63281de50ffd23664671780c2d75155dbc66260
2016-11-14 13:10:17 +00:00
Andriy Naborskyy
fb4beac069
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours
...
am: 3f39609cff -s ours
Change-Id: I2d9f5bf351026cd697b75b1c60a177232cdb2266
2016-11-14 13:09:40 +00:00
Hugo Benichi
fd3e6e8d25
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9 am: 37cacc77ce
...
am: 4bdf37c204
Change-Id: Ida3b6e2739f273228826f1536e2573d9456c2956
2016-11-14 13:09:34 +00:00
Narayan Kamath
c50c43667f
Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca
...
am: 87dc13f249
Change-Id: I7e23610ef0799dcfb3ac3598011280de22ffc25f
2016-11-14 13:09:06 +00:00
Hugo Benichi
1d61b01a5d
DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours
...
am: bdf4d8a93c
Change-Id: Ifc38d9a9e7afedd6bf5af2876f4d1dfdf430dd02
2016-11-14 13:08:26 +00:00
Andriy Naborskyy
dbbde14239
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours
...
am: f380f53752 -s ours
Change-Id: I2b6441bfb380c443199a72ea61044a5480d93324
2016-11-14 13:08:23 +00:00
Narayan Kamath
a13068a1c8
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7 am: 8e6e5a157b
...
am: 65abe1066d
Change-Id: Id11cf7f2b1dbf1db6eb047f1e2015689d733ab69
2016-11-14 13:07:49 +00:00
Brian Carlstrom
f9150bf362
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a
...
am: b272d7cb13
Change-Id: If3d7584fef21c97c9dd9350b385c86bd0dfc1231
2016-11-14 13:07:09 +00:00
Narayan Kamath
479385b6b3
Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573
...
am: 52021073a4
Change-Id: I2d82df99a5c2c4e3c7df0f54638531fb67271e25
2016-11-14 13:05:54 +00:00
Narayan Kamath
f3f784853d
Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3
...
am: ba6d5ee377
Change-Id: Id7fefda1a09fc4af9232cd1acb28092c2fd1b93c
2016-11-14 13:04:33 +00:00
Narayan Kamath
2c13554c18
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090
...
am: 81fd9e618c
Change-Id: I1a30989e0fd2ced4a7e298ae26e76f3525c03362
2016-11-14 13:03:02 +00:00
Narayan Kamath
3b89a68a08
Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa
...
am: d212aa9d13
Change-Id: I477b2582bd31e1f9d1b53ea6bfdad78267fc6bfc
2016-11-14 13:01:42 +00:00
Narayan Kamath
1f9abe310f
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7
...
am: 0c8da8aa05
Change-Id: Iaa46542e0484c3a9e175f492790583482b4f088b
2016-11-14 13:00:21 +00:00
Narayan Kamath
4a204149eb
Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f am: da65c74c54
...
am: 24b2a54a84
Change-Id: I11ecc3013e1de3951b12945c486cca7ad78d38ed
2016-11-14 12:59:01 +00:00
Narayan Kamath
53af5fe3f7
Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b
...
am: 59e6dccb4c
Change-Id: I210a7f36c6bef41c62a12c0b84e3b054f7aebf99
2016-11-14 12:57:59 +00:00
neo.chae
0212d4f3fa
Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c
...
am: 7489336fed
Change-Id: I53fb00542e417e200b46ac941b4255e310348e18
2016-11-14 12:57:53 +00:00
Hugo Benichi
4bdf37c204
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9
...
am: 37cacc77ce
Change-Id: I7c5bc81af38a6b6a3ea26f64ae5c1773a91f1bf6
2016-11-14 12:56:47 +00:00
Xin Li
ee6b51a05b
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc
...
am: db984f917c -s ours
Change-Id: Ib1df6a08c3f6a2e379f7d4ffac944c2169336f11
2016-11-14 12:56:36 +00:00
Hugo Benichi
bdf4d8a93c
DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev
...
am: 476da32d86 -s ours
Change-Id: Ic4ff5e0c392488315659bef421535d43ac115e6f
2016-11-14 12:55:35 +00:00
