git.osdn.net Git - android-x86/frameworks-base.git/log

Narayan Kamath [Mon, 14 Nov 2016 14:09:01 +0000 (14:09 +0000)]

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 am: 58d1705c64 am: 1886232f48
am: 9facd98e75

Change-Id: I5b57c5a660562defc701ad4db67a4bc60cf3cc90

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 14:01:40 +0000 (14:01 +0000)]

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 am: 83be5fdebb am: 4c5dc7e622
am: 6b7badc832

Change-Id: Ib452ae62dc517dea0bff09b5fd993c3c26f0e087

commit | commitdiff | tree

neo.chae [Mon, 14 Nov 2016 14:00:33 +0000 (14:00 +0000)]

Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed am: 0212d4f3fa am: aaf785c827 am: 4b72904585 am: 7530ea7ec0
am: fa2e233c30

Change-Id: I8ab4857b2a24d5ef7141254a7f2aaa789d56c819

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:59:17 +0000 (13:59 +0000)]

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 am: 6e8fef24d9 am: eb4de1706e
am: 9d04aa4f81

Change-Id: I5b81dc5fdec7019befcac49271f71bd8c55327a6

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:58:30 +0000 (13:58 +0000)]

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 am: 58d1705c64
am: 1886232f48

Change-Id: I52ea7397d96eebbec543a584c2372e44a7a00ca4

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:57:43 +0000 (13:57 +0000)]

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 am: 5386c74a44 am: f3e0e13b54
am: 3a86cff442

Change-Id: I4b2964c8393965be2597f48728ee0985cecc627f

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:56:28 +0000 (13:56 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41 am: 5cbd448348 am: a9fae33c11 am: 05f59b1f1d
am: ec69d20c3d

Change-Id: I3885439df19100036fcd1bef31e1f86fe86a07bd

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:52:23 +0000 (13:52 +0000)]

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 am: 83be5fdebb
am: 4c5dc7e622

Change-Id: I0b9b598150782a50f8a2e6c3f93acf9fed969c4e

commit | commitdiff | tree

neo.chae [Mon, 14 Nov 2016 13:51:14 +0000 (13:51 +0000)]

Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed am: 0212d4f3fa am: aaf785c827 am: 4b72904585
am: 7530ea7ec0

Change-Id: I887d0fa23e82fad83759b47aa9b3cb7c0ab5dea0

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:50:00 +0000 (13:50 +0000)]

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
am: 58d1705c64

Change-Id: Ia768dae225459af1d7bcea6a7aa78bc2df170199

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:49:59 +0000 (13:49 +0000)]

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 am: 6e8fef24d9
am: eb4de1706e

Change-Id: I1a405d53ae83b3e227f258d8aded7c9e1c0d6e88

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:49:10 +0000 (13:49 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249 am: c50c43667f am: a5ff6c84a2 am: 9efaadccc0
am: 6861821082

Change-Id: I3abe13ffda27d4920a989c7f91ac2643f15209a3

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:47:59 +0000 (13:47 +0000)]

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 am: 3e85db46bc am: 5ad1a52678
am: 8ff9e7104c

Change-Id: I818d6006fd3af80313e1d903f94f2a6e1fcb52ef

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:46:47 +0000 (13:46 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b am: 59e6dccb4c am: 53af5fe3f7 am: 56294db4d4 am: 8fecc8687b
am: 9f37c28a17

Change-Id: I472cd78ae1b956126feea81dd619310c44d4801a

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:45:53 +0000 (13:45 +0000)]

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 am: 5386c74a44
am: f3e0e13b54

Change-Id: I3bd3b1405acac465f3974f3cd9ff231a1800aa16

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 13:45:24 +0000 (13:45 +0000)]

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9 am: 37cacc77ce am: 4bdf37c204 am: fd3e6e8d25 am: bfa2fed779
am: fb2b64d037

Change-Id: Ic4c6875e06bd4eddd32cff43054c84bd5fa326fd

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:44:35 +0000 (13:44 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41 am: 5cbd448348 am: a9fae33c11
am: 05f59b1f1d

Change-Id: I5382ba916ec72d4ecb519dac5a89bce35947738f

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 13:44:05 +0000 (13:44 +0000)]

DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours am: bdf4d8a93c am: 1d61b01a5d am: 9a6f65608a
am: 6db87b6e2a

Change-Id: I81963b856cc76598555fb51fb27874d22c543fcb

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:41:49 +0000 (13:41 +0000)]

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
am: 83be5fdebb

Change-Id: I31fd20827d22d0b8cb3b8df8db99e1b0aad6fa85

commit | commitdiff | tree

neo.chae [Mon, 14 Nov 2016 13:40:37 +0000 (13:40 +0000)]

Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed am: 0212d4f3fa am: aaf785c827
am: 4b72904585

Change-Id: I365cdb2764ffb15f233cfeb43339e6acbc369e49

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:39:25 +0000 (13:39 +0000)]

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
am: 6e8fef24d9

Change-Id: I43f556df4700c9470a0df500eadddcbcd8146cf7

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:37:08 +0000 (13:37 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249 am: c50c43667f am: a5ff6c84a2
am: 9efaadccc0

Change-Id: I8a47806998957121f0de14e7e5bdb4d8e39944de

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:36:02 +0000 (13:36 +0000)]

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 am: 3e85db46bc
am: 5ad1a52678

Change-Id: I0e6cfed1a3fac9ba0cf45c4148fbb7fe077fd624

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:35:02 +0000 (13:35 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b am: 59e6dccb4c am: 53af5fe3f7 am: 56294db4d4
am: 8fecc8687b

Change-Id: Ie17f7a15e86b88d9fef7edc43919bc3669ba5acf

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:34:42 +0000 (13:34 +0000)]

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

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 13:33:55 +0000 (13:33 +0000)]

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9 am: 37cacc77ce am: 4bdf37c204 am: fd3e6e8d25
am: bfa2fed779

Change-Id: I7c2d9158c7395a35b92ad74535cff704e6b897f4

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:33:24 +0000 (13:33 +0000)]

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

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 13:32:50 +0000 (13:32 +0000)]

DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours am: bdf4d8a93c am: 1d61b01a5d
am: 9a6f65608a

Change-Id: I91630e0cdfff69cfcea1e680fae1db34541cc8de

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:30:19 +0000 (13:30 +0000)]

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
am: 5386c74a44

Change-Id: I122525c6a85e1542370835d88e83cad30f747bff

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:29:01 +0000 (13:29 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41 am: 5cbd448348
am: a9fae33c11

Change-Id: Idb4874c1c84d894bb20ac24dfc2c2035f9e1c10a

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:27:51 +0000 (13:27 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249 am: c50c43667f
am: a5ff6c84a2

Change-Id: I62e2180c0a3b2d9e2a11b3ad4d93288bed1ccef6

commit | commitdiff | tree

neo.chae [Mon, 14 Nov 2016 13:25:11 +0000 (13:25 +0000)]

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

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:24:00 +0000 (13:24 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:23:48 +0000 (13:23 +0000)]

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
am: 3e85db46bc

Change-Id: I880788deb83685b523641097bf336d3233faad96

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:22:41 +0000 (13:22 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:22:32 +0000 (13:22 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b am: 59e6dccb4c am: 53af5fe3f7
am: 56294db4d4

Change-Id: Icc973e244e150d786c21a22ce63ae85232a115c2

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 13:21:26 +0000 (13:21 +0000)]

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9 am: 37cacc77ce am: 4bdf37c204
am: fd3e6e8d25

Change-Id: I154015353cdab13732d82e02e277139511f797f4

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:21:23 +0000 (13:21 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:20:05 +0000 (13:20 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249
am: c50c43667f

Change-Id: I11f57941eb00efafb14e0505131e66bc22fc68c6

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 13:19:50 +0000 (13:19 +0000)]

DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours am: bdf4d8a93c
am: 1d61b01a5d

Change-Id: Ie4a49408157b5de6dc0003b148e0d1042c87d515

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:15:59 +0000 (13:15 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:15:47 +0000 (13:15 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:14:47 +0000 (13:14 +0000)]

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

commit | commitdiff | tree

neo.chae [Mon, 14 Nov 2016 13:13:48 +0000 (13:13 +0000)]

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

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:12:42 +0000 (13:12 +0000)]

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

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:11:30 +0000 (13:11 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:10:53 +0000 (13:10 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b am: 59e6dccb4c
am: 53af5fe3f7

Change-Id: If824016f0535d121404b08c36b43a1ce0f168d13

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:10:17 +0000 (13:10 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe
am: 11b3161c41

Change-Id: Ia63281de50ffd23664671780c2d75155dbc66260

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 13:09:34 +0000 (13:09 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:09:06 +0000 (13:09 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca
am: 87dc13f249

Change-Id: I7e23610ef0799dcfb3ac3598011280de22ffc25f

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 13:08:26 +0000 (13:08 +0000)]

DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours
am: bdf4d8a93c

Change-Id: Ifc38d9a9e7afedd6bf5af2876f4d1dfdf430dd02

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:07:49 +0000 (13:07 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:00:21 +0000 (13:00 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:59:01 +0000 (12:59 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:57:59 +0000 (12:57 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b
am: 59e6dccb4c

Change-Id: I210a7f36c6bef41c62a12c0b84e3b054f7aebf99

commit | commitdiff | tree

neo.chae [Mon, 14 Nov 2016 12:57:53 +0000 (12:57 +0000)]

Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c
am: 7489336fed

Change-Id: I53fb00542e417e200b46ac941b4255e310348e18

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 12:56:47 +0000 (12:56 +0000)]

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9
am: 37cacc77ce

Change-Id: I7c5bc81af38a6b6a3ea26f64ae5c1773a91f1bf6

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 12:56:36 +0000 (12:56 +0000)]

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

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 12:55:35 +0000 (12:55 +0000)]

DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev
am: 476da32d86 -s ours

Change-Id: Ic4ff5e0c392488315659bef421535d43ac115e6f

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 12:55:17 +0000 (12:55 +0000)]

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

Change-Id: Iffc4ed4a45701d533a0b6d24daaa137982554057

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:54:10 +0000 (12:54 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2
am: 77decadefe

Change-Id: I41f78ad8e6d669cb1e038480adfd9d12a469500c

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:52:53 +0000 (12:52 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247
am: d98e75feca

Change-Id: Ic63a80f3a591956fd82a223c74050a24d7805add

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:51:41 +0000 (12:51 +0000)]

Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7
am: 8e6e5a157b

Change-Id: Ie00c71b1bef751c2f0b039a5a150fc6971fbf415

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:50:15 +0000 (12:50 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e
am: d17867203b

Change-Id: I2d230bcbb539def3db3da59e45e0c1e86ff13a2b

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 12:49:00 +0000 (12:49 +0000)]

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae
am: afa3694ea9

Change-Id: I7ac1eb75c3bde52332875e992124407e6cfd5417

commit | commitdiff | tree

Hugo Benichi [Fri, 11 Nov 2016 02:24:23 +0000 (11:24 +0900)]

DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev

Change-Id: I854eddda678934d0da083d22b99b855ed57fd644

commit | commitdiff | tree

Jakub Pawlowski [Sat, 12 Nov 2016 00:11:19 +0000 (00:11 +0000)]

Merge "Bluetooth: advertising improvements" am: 82c9ba9c55 am: e3b71cd572
am: d81df46e80

Change-Id: I7e17eac0305832d69366b565427ec048a7166357

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 12 Nov 2016 00:08:37 +0000 (00:08 +0000)]

Merge "Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev am: 954347fb1b" into nyc-mr2-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 12 Nov 2016 00:08:08 +0000 (00:08 +0000)]

Merge "DO NOT MERGE - 2-dimensional Recents activity. am: c13df1eb30" into nyc-mr2-dev-plus-aosp

commit | commitdiff | tree

Manu Cornet [Sat, 12 Nov 2016 00:06:57 +0000 (00:06 +0000)]

Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev
am: 954347fb1b

Change-Id: Ia1fd6ab09d6310575bdbceba1d56f0a58160331f

commit | commitdiff | tree

Manu Cornet [Sat, 12 Nov 2016 00:06:49 +0000 (00:06 +0000)]

DO NOT MERGE - 2-dimensional Recents activity.
am: c13df1eb30

Change-Id: Idfcea35ba54b69e780bb9159055ea296dd9f14a9

commit | commitdiff | tree

Robert Sesek [Sat, 12 Nov 2016 00:06:34 +0000 (00:06 +0000)]

Merge "Respect force_mount_namespace in MountEmulatedStorage()." am: b828b6bf6c am: a0d2e6f4b7
am: 057e9c16e7

Change-Id: I96c16db9b8fcd197709179429de07a77cbabe5e8

commit | commitdiff | tree

Marie Janssen [Sat, 12 Nov 2016 00:05:19 +0000 (00:05 +0000)]

Merge "Bluetooth: BLE app tracking fixes" am: 2174731449 am: 3d8d5dbb56
am: 56853771ae

Change-Id: I2c0ac6fd2047643ae3c1e6450397b2cd9eed7e94

commit | commitdiff | tree

Jakub Pawlowski [Fri, 11 Nov 2016 23:58:44 +0000 (23:58 +0000)]

Merge "Bluetooth: advertising improvements" am: 82c9ba9c55
am: e3b71cd572

Change-Id: I54df9c355ac951d40b2d8e865d5f36f8875ce71f

commit | commitdiff | tree

Robert Sesek [Fri, 11 Nov 2016 23:55:18 +0000 (23:55 +0000)]

Merge "Respect force_mount_namespace in MountEmulatedStorage()." am: b828b6bf6c
am: a0d2e6f4b7

Change-Id: I4044e01b9de9bc502eda18fc34182629ca524701

commit | commitdiff | tree

Marie Janssen [Fri, 11 Nov 2016 23:53:47 +0000 (23:53 +0000)]

Merge "Bluetooth: BLE app tracking fixes" am: 2174731449
am: 3d8d5dbb56

Change-Id: Ia9b8950f66f31b0d3b78f6e2f6c2314cf0b931f0

commit | commitdiff | tree

Jakub Pawlowski [Fri, 11 Nov 2016 23:48:51 +0000 (23:48 +0000)]

Merge "Bluetooth: advertising improvements"
am: 82c9ba9c55

Change-Id: I662ba0f326aa204f9f07ce88bc9d48f5b06770cb

commit | commitdiff | tree

TreeHugger Robot [Fri, 11 Nov 2016 23:46:26 +0000 (23:46 +0000)]

Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev

commit | commitdiff | tree

Robert Sesek [Fri, 11 Nov 2016 23:44:49 +0000 (23:44 +0000)]

Merge "Respect force_mount_namespace in MountEmulatedStorage()."
am: b828b6bf6c

Change-Id: I9b4d0000c29d5e404f333d8e8c89af2425452a17

commit | commitdiff | tree

Marie Janssen [Fri, 11 Nov 2016 23:41:42 +0000 (23:41 +0000)]

Merge "Bluetooth: BLE app tracking fixes"
am: 2174731449

Change-Id: Id07abb3d5ad76b318d1b7cee6d9fb9351737b141

commit | commitdiff | tree

Kevin Hufnagle [Fri, 11 Nov 2016 23:40:43 +0000 (23:40 +0000)]

Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev am: 867d09fe18 am: 5584ee2131
am: d733ff11ea

Change-Id: I323b294af1ea7b4a86d5eef7bd7670c965e1b5bf

commit | commitdiff | tree

Makoto Onuki [Fri, 11 Nov 2016 23:36:04 +0000 (23:36 +0000)]

App Shortcut: Clarify which attributes must be resources am: 104f805337 am: 2a3fe7d979
am: b0fd5ba122

Change-Id: I4780d09f8b692dbe76f1726a436f9693281fd488

commit | commitdiff | tree

Rati Agrawal [Fri, 11 Nov 2016 23:34:32 +0000 (23:34 +0000)]

Merge "Add check for null manger for a11y recents action" into cw-f-dev am: 87d764f184
am: 9261740a8b

Change-Id: Ib93bfac0e85da0aaa582924c981f59e52f45ea8e

commit | commitdiff | tree

Jakub Pawlowski [Fri, 11 Nov 2016 23:33:14 +0000 (23:33 +0000)]

Merge "Bluetooth: advertising improvements"

commit | commitdiff | tree

Phil Weaver [Fri, 11 Nov 2016 23:29:59 +0000 (23:29 +0000)]

Add check for null manger for a11y recents action am: 2585033100
am: 0cd036da23

Change-Id: Ic10e13d83bd6cb2dab3b445e8b5ec41a45e08fa6

commit | commitdiff | tree

Jakub Pawlowski [Fri, 4 Nov 2016 22:25:57 +0000 (15:25 -0700)]

Bluetooth: advertising improvements

This patch removes isPeripheralModeSupported(), hidden public method
which is always returning true. It also modify the BluetoothLeAdvertiser
to be able to use advertising instance with instance id equal 0.

Bug: 30622771
Bug: 24099160
Change-Id: Id31582621dbe56d5c3a8d4ee5cd296af66a5f026

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Nov 2016 23:25:43 +0000 (23:25 +0000)]

Merge "Respect force_mount_namespace in MountEmulatedStorage()."

commit | commitdiff | tree

Kevin Hufnagle [Fri, 11 Nov 2016 23:23:20 +0000 (23:23 +0000)]

Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev am: 867d09fe18
am: 5584ee2131

Change-Id: I84a7d1b5eb89fa5c796e2db7838aee0af9114486

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Nov 2016 23:22:55 +0000 (23:22 +0000)]

Merge "Bluetooth: BLE app tracking fixes"

commit | commitdiff | tree

Makoto Onuki [Fri, 11 Nov 2016 23:22:08 +0000 (23:22 +0000)]

App Shortcut: Clarify which attributes must be resources am: 104f805337
am: 2a3fe7d979

Change-Id: I7858db41a362e3be0a8668f23476b082e8140f43

commit | commitdiff | tree

Rati Agrawal [Fri, 11 Nov 2016 23:17:43 +0000 (23:17 +0000)]

Merge "Add check for null manger for a11y recents action" into cw-f-dev
am: 87d764f184

Change-Id: I4b1424314f9b8bd1c2d463e2a3c62c90bbe107e8

commit | commitdiff | tree

Phil Weaver [Fri, 11 Nov 2016 23:17:41 +0000 (23:17 +0000)]

Add check for null manger for a11y recents action
am: 2585033100

Change-Id: I9b5977ad876048e5c527ff1f8ef6b989283a0e73

commit | commitdiff | tree

Kevin Hufnagle [Fri, 11 Nov 2016 23:14:28 +0000 (23:14 +0000)]

Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev
am: 867d09fe18

Change-Id: Ib56e1a8895557d43aadd8eada75dce2d9b836dc9

commit | commitdiff | tree

Makoto Onuki [Fri, 11 Nov 2016 23:14:22 +0000 (23:14 +0000)]

App Shortcut: Clarify which attributes must be resources
am: 104f805337

Change-Id: I85eb5652c978fe4c41059158cf1d0f180b51fdd7

commit | commitdiff | tree

Rati Agrawal [Fri, 11 Nov 2016 23:03:30 +0000 (23:03 +0000)]

Merge "Add check for null manger for a11y recents action" into cw-f-dev

commit | commitdiff | tree

Yigit Boyar [Fri, 11 Nov 2016 22:53:17 +0000 (22:53 +0000)]

Merge "List all methods that change data in the docs" into nyc-mr1-dev am: 7cd6c3a084 am: 4e49a3a008
am: 00ab52e3a2

Change-Id: I135b0f83c5041e5467a808694fc93408d63a75d1

commit | commitdiff | tree

Yigit Boyar [Fri, 11 Nov 2016 22:52:01 +0000 (22:52 +0000)]

List all methods that change data in the docs am: 42c69b9ce4 am: 7e6fdaab69
am: 93f130e232

Change-Id: Id95fff602b22d376cfd81fbafdc22fac376a644c

commit | commitdiff | tree

Yigit Boyar [Fri, 11 Nov 2016 22:46:32 +0000 (22:46 +0000)]

Merge "List all methods that change data in the docs" into nyc-mr1-dev am: 7cd6c3a084
am: 4e49a3a008

Change-Id: I8b40b32c181ceab9b53e3593c11f5f716b27c1d7

commit | commitdiff | tree

Kevin Hufnagle [Fri, 11 Nov 2016 22:44:01 +0000 (22:44 +0000)]

Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev

commit | commitdiff | tree

Yigit Boyar [Fri, 11 Nov 2016 22:39:25 +0000 (22:39 +0000)]

List all methods that change data in the docs am: 42c69b9ce4
am: 7e6fdaab69

Change-Id: Ife360d719384d958b6022f29f928a5bbae2ed6ef