OSDN Git Service
Yifan Hong [Tue, 15 Nov 2016 03:19:19 +0000 (03:19 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am:
8cc1343724 am:
2187dc5ca1
am:
41579ea4d4
Change-Id: Ia8f41eb4c76c241088a4cce368409bd61deb5d35
Yifan Hong [Tue, 15 Nov 2016 03:12:43 +0000 (03:12 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am:
8cc1343724
am:
2187dc5ca1
Change-Id: If0919864026c78fed76df1554235c2acca9f2750
Yifan Hong [Tue, 15 Nov 2016 03:06:44 +0000 (03:06 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
am:
8cc1343724
Change-Id: If003adc06673d8e6c6db6f8a5d858dcca7aed109
Treehugger Robot [Tue, 15 Nov 2016 02:59:51 +0000 (02:59 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
Selim Cinek [Tue, 15 Nov 2016 01:32:12 +0000 (01:32 +0000)]
Fixed a bug with the emergency affordance in multi user am:
b8a7f78d24 am:
6cc0b517ba
am:
96d4aadb4c
Change-Id: I46d1527df288330d9daea3f7c843a4b80a4ec468
Selim Cinek [Tue, 15 Nov 2016 01:24:32 +0000 (01:24 +0000)]
Fixed a bug with the emergency affordance in multi user am:
b8a7f78d24
am:
6cc0b517ba
Change-Id: If537b10c1838a47e7662ef56ae08b806fe5d669f
Selim Cinek [Tue, 15 Nov 2016 01:18:35 +0000 (01:18 +0000)]
Fixed a bug with the emergency affordance in multi user
am:
b8a7f78d24
Change-Id: I68fa35dbedb3740eff1c83d03c9c9b5080d3ea81
Selim Cinek [Thu, 3 Nov 2016 21:55:40 +0000 (14:55 -0700)]
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
Sohani Rao [Mon, 14 Nov 2016 21:28:08 +0000 (21:28 +0000)]
Merge "Add WiFi toggle prompts - framework" am:
584b5cee49 -s ours am:
31082a0824 -s ours
am:
31264c994c -s ours
Change-Id: I37fe61c02a960ab5024fca8ab025c8e1933d269b
Sohani Rao [Mon, 14 Nov 2016 21:21:38 +0000 (21:21 +0000)]
Merge "Add WiFi toggle prompts - framework" am:
584b5cee49 -s ours
am:
31082a0824 -s ours
Change-Id: Ib2d485f7c6904fc3890c08f34d52703b92d379b5
Sohani Rao [Mon, 14 Nov 2016 21:14:44 +0000 (21:14 +0000)]
Merge "Add WiFi toggle prompts - framework"
am:
584b5cee49 -s ours
Change-Id: I9dd54beb08f771be886c03fa0f8a3335f574c47c
Sohani Rao [Mon, 14 Nov 2016 20:59:35 +0000 (20:59 +0000)]
Merge "Add WiFi toggle prompts - framework"
Sohani Rao [Mon, 14 Nov 2016 19:59:22 +0000 (19:59 +0000)]
Merge "Permissions check for Wifi Display configuration" am:
f5c32a411c am:
7342bb84cd
am:
b4663456d4
Change-Id: I9bfd828577029c3ebb6b89b6830a5c8d72833768
Sohani Rao [Mon, 14 Nov 2016 19:44:46 +0000 (19:44 +0000)]
Merge "Permissions check for Wifi Display configuration" am:
f5c32a411c
am:
7342bb84cd
Change-Id: Iac379dace6fd8b01e5bb80a193f79c65ace1f9b9
Sohani Rao [Mon, 14 Nov 2016 19:33:31 +0000 (19:33 +0000)]
Merge "Permissions check for Wifi Display configuration"
am:
f5c32a411c
Change-Id: I7a1c2d0f48728cd5e056076a2cf1499a7abb2438
Sohani Rao [Mon, 14 Nov 2016 19:21:57 +0000 (19:21 +0000)]
Merge "Permissions check for Wifi Display configuration"
Narayan Kamath [Mon, 14 Nov 2016 19:03:16 +0000 (19:03 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
d9a8ee7598
am:
7521a1b465
Change-Id: I8988c6ef182a55bbd361ccc4db8ffde6297742cb
Narayan Kamath [Mon, 14 Nov 2016 18:56:09 +0000 (18:56 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
d9a8ee7598
Change-Id: Ie7c2ec8ec358ce403a0c8afe6305d3164d3892e8
Svetoslav Ganov [Wed, 27 Jul 2016 01:23:01 +0000 (18:23 -0700)]
Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Bug:
28715749
Test: Unit Tests
Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Merged-In: I020601e208c0736005bcabc7b7b77b96eee45b03
Tyler Gunn [Mon, 14 Nov 2016 18:22:14 +0000 (18:22 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am:
8223dc1ae9 am:
8b58e73c48
am:
9e976c8565
Change-Id: If743a67bff170096f028c7d7f3fc88c8548dfbf1
Sohani Rao [Thu, 29 Sep 2016 23:20:45 +0000 (16:20 -0700)]
Permissions check for Wifi Display configuration
Wifi Display is configured using the AIDL call setMiracastMode()
and using a message over the async channel SET_WFD_INFO.
Enforce permissions on the calling uid before updating the config
Bug:
18668877
Test: Unit tests
Change-Id: I0be2d2af49070aad759f24bd31331f7df39a0422
Merged-In: I0be2d2af49070aad759f24bd31331f7df39a0422
Tyler Gunn [Mon, 14 Nov 2016 18:15:12 +0000 (18:15 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." am:
8223dc1ae9
am:
8b58e73c48
Change-Id: Ifdbfdb2f418297eae83a69196462dc847650e3e2
Tyler Gunn [Mon, 14 Nov 2016 18:08:11 +0000 (18:08 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
am:
8223dc1ae9
Change-Id: Id8c6077d099f9ef943c09242acb22173b6628c1a
Narayan Kamath [Mon, 14 Nov 2016 17:25:09 +0000 (17:25 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
9087f331a8
Change-Id: I800230fd9a4baf543d53834b00019f81aa07bdc9
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
Bug:
32618130
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
(cherry picked from commit
25cd01cc69fcad34756b00e52a79c0c54178f2e6)
(cherry picked from commit
9087f331a85790d49d1095e1eaf0305b7863e0ba)
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
Bug:
32618130
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
(cherry picked from commit
25cd01cc69fcad34756b00e52a79c0c54178f2e6)
Tyler Gunn [Mon, 14 Nov 2016 16:23:42 +0000 (16:23 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
Steven Moreland [Mon, 14 Nov 2016 15:29:39 +0000 (15:29 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *." am:
e17e68f139 am:
5f9ac42029
am:
cd0f045eb7
Change-Id: Iecdc2bd4e06fdd8e6b2e2217c8c988dcabceda25
Steven Moreland [Mon, 14 Nov 2016 15:22:35 +0000 (15:22 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *." am:
e17e68f139
am:
5f9ac42029
Change-Id: I29e5b04d4737dcc380ac34a0becfe633fc1d51db
Steven Moreland [Mon, 14 Nov 2016 15:15:39 +0000 (15:15 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *."
am:
e17e68f139
Change-Id: Iefe4ae60d8e7f0473f1b417ac09c5e37b082d07b
Treehugger Robot [Mon, 14 Nov 2016 15:03:31 +0000 (15:03 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *."
Andriy Naborskyy [Mon, 14 Nov 2016 14:24:29 +0000 (14:24 +0000)]
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 am:
0a2ac837d1 -s ours am:
415ec85fdb -s ours
am:
5c47b5ec06 -s ours
Change-Id: I3a438d3b5945da3fbcb8e6a655e53813d0094b74
Andriy Naborskyy [Mon, 14 Nov 2016 14:23:17 +0000 (14:23 +0000)]
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 am:
e26d15582b -s ours am:
bb1dfdc660 -s ours
am:
2480121100 -s ours
Change-Id: Id4cf19f648862cfb25499f532d68d9bc791b16ba
Brian Carlstrom [Mon, 14 Nov 2016 14:22:02 +0000 (14:22 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13 am:
f9150bf362 am:
58612638d1 am:
d9ea80d009 am:
46abcdd83f
am:
35063cdb3c
Change-Id: I7c6bae206f08cc4eeeaf7f8b444f5847812600cf
Narayan Kamath [Mon, 14 Nov 2016 14:14:16 +0000 (14:14 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4 am:
479385b6b3 am:
5f70cb0898 am:
df3e599c7d am:
19ee3109e1
am:
bf3c83eeac
Change-Id: I05d77dbca719382340c1df02c2f3c513118e64f9
Narayan Kamath [Mon, 14 Nov 2016 14:13:00 +0000 (14:13 +0000)]
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 am:
2f2611636b am:
86e1929551
am:
8ecbb2b2ae
Change-Id: Ifdc128e39b8a34731a972049c398a7e3784f5303
Narayan Kamath [Mon, 14 Nov 2016 14:11:46 +0000 (14:11 +0000)]
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 am:
44e645e59a am:
f2a94f71fb
am:
48d16243f9
Change-Id: I70ce50374b406443d58f07409bfa58335e96e8de
Andriy Naborskyy [Mon, 14 Nov 2016 14:11:10 +0000 (14:11 +0000)]
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 am:
0a2ac837d1 -s ours
am:
415ec85fdb -s ours
Change-Id: I3fe6e41b3a2b6119a7d980227756054a2267b797
Narayan Kamath [Mon, 14 Nov 2016 14:10:20 +0000 (14:10 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75 am:
e82866df3f am:
f8335b6a59 am:
2f8ce5f5cb am:
5515b415aa am:
d212aa9d13 am:
3b89a68a08 am:
146a0f86a6 am:
327edfeba2 am:
51930580bf
am:
deabe2c324
Change-Id: If6bf0b5dac1c7b9141462b9c28c5f0bf76bdceca
Andriy Naborskyy [Mon, 14 Nov 2016 14:09:55 +0000 (14:09 +0000)]
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 am:
e26d15582b -s ours
am:
bb1dfdc660 -s ours
Change-Id: I230967ab2be77179282d37ea186906adabfafde5
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
Brian Carlstrom [Mon, 14 Nov 2016 14:08:51 +0000 (14:08 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13 am:
f9150bf362 am:
58612638d1 am:
d9ea80d009
am:
46abcdd83f
Change-Id: Ie195e5ab259ed009a311dc5f17522c2d6599fe32
Narayan Kamath [Mon, 14 Nov 2016 14:03:02 +0000 (14:03 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4 am:
479385b6b3 am:
5f70cb0898 am:
df3e599c7d
am:
19ee3109e1
Change-Id: Ib1b9d1acfe8a689d50334c2107af66b8f2a54513
Narayan Kamath [Mon, 14 Nov 2016 14:01:54 +0000 (14:01 +0000)]
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 am:
2f2611636b
am:
86e1929551
Change-Id: Ic1a9c733b811ab04cc0024956998137a39edeee5
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
Narayan Kamath [Mon, 14 Nov 2016 14:00:45 +0000 (14:00 +0000)]
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 am:
44e645e59a
am:
f2a94f71fb
Change-Id: Ie17b51e1d33668cf8a8566a65ec9182c17cace16
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
Andriy Naborskyy [Mon, 14 Nov 2016 14:00:26 +0000 (14:00 +0000)]
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
am:
0a2ac837d1 -s ours
Change-Id: I0ba7195818a50a4f5260022370aa3a26e5dbd40d
Narayan Kamath [Mon, 14 Nov 2016 13:59:40 +0000 (13:59 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75 am:
e82866df3f am:
f8335b6a59 am:
2f8ce5f5cb am:
5515b415aa am:
d212aa9d13 am:
3b89a68a08 am:
146a0f86a6 am:
327edfeba2
am:
51930580bf
Change-Id: I7dfa706aab6051e0b25c976f187091c2d8927c45
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
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
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
Andriy Naborskyy [Mon, 14 Nov 2016 13:56:46 +0000 (13:56 +0000)]
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
am:
e26d15582b -s ours
Change-Id: I6e1c029f57f69785b9a7070ec6e8c35673b65cc2
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
Brian Carlstrom [Mon, 14 Nov 2016 13:55:41 +0000 (13:55 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13 am:
f9150bf362 am:
58612638d1
am:
d9ea80d009
Change-Id: I086d525fa3cdfd34d1b1ad5089662ea7eb57a418
Narayan Kamath [Mon, 14 Nov 2016 13:54:35 +0000 (13:54 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4 am:
479385b6b3 am:
5f70cb0898
am:
df3e599c7d
Change-Id: Ida0d973df74c0636e6b93df4af296cd74c3103cb
Narayan Kamath [Mon, 14 Nov 2016 13:53:28 +0000 (13:53 +0000)]
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
am:
2f2611636b
Change-Id: Ie36e3041b72422b78a7335198671fc893c763614
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
Narayan Kamath [Mon, 14 Nov 2016 13:52:18 +0000 (13:52 +0000)]
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
am:
44e645e59a
Change-Id: I950358108a9df60418e9d1370f55fdc81a2046f5
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
Narayan Kamath [Mon, 14 Nov 2016 13:51:05 +0000 (13:51 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75 am:
e82866df3f am:
f8335b6a59 am:
2f8ce5f5cb am:
5515b415aa am:
d212aa9d13 am:
3b89a68a08 am:
146a0f86a6
am:
327edfeba2
Change-Id: Ibe4a93c42a9594dce74b76a9ae6e2e32cb11b1e5
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
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
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
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
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
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
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
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
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
Andriy Naborskyy [Mon, 14 Nov 2016 13:42:21 +0000 (13:42 +0000)]
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
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
Andriy Naborskyy [Mon, 14 Nov 2016 13:41:20 +0000 (13:41 +0000)]
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
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
Brian Carlstrom [Mon, 14 Nov 2016 13:40:16 +0000 (13:40 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13 am:
f9150bf362
am:
58612638d1
Change-Id: If03a724c633b1ba97bfd7797f61d0f706654f923
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
Narayan Kamath [Mon, 14 Nov 2016 13:39:05 +0000 (13:39 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4 am:
479385b6b3
am:
5f70cb0898
Change-Id: I16da70d1722e16ca61e31fff092ca778a5d66339
Narayan Kamath [Mon, 14 Nov 2016 13:38:01 +0000 (13:38 +0000)]
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
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
Narayan Kamath [Mon, 14 Nov 2016 13:36:53 +0000 (13:36 +0000)]
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
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
Narayan Kamath [Mon, 14 Nov 2016 13:35:51 +0000 (13:35 +0000)]
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
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
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
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
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
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
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
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
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
Andriy Naborskyy [Mon, 14 Nov 2016 13:26:16 +0000 (13:26 +0000)]
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
Andriy Naborskyy [Mon, 14 Nov 2016 13:25:11 +0000 (13:25 +0000)]
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
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
Brian Carlstrom [Mon, 14 Nov 2016 13:24:01 +0000 (13:24 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13
am:
f9150bf362
Change-Id: I647f570452982cdf7202dccad793032305e61a9a
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
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
Narayan Kamath [Mon, 14 Nov 2016 13:22:52 +0000 (13:22 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4
am:
479385b6b3
Change-Id: Ia0c1b9e495a4bf78b3b12821a7a106a940c12e87
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
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
Narayan Kamath [Mon, 14 Nov 2016 13:21:40 +0000 (13:21 +0000)]
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