Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,792 Commits 3 Branches 0 Tags
532d73cf8c8921098ce820394dfb08d8d8e997b7
Commit Graph

256792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
532d73cf8c Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am: a67112ca92 am: c0df29dfbc am: e9a12d0ac7 
am: f0a65b9a98

Change-Id: I0d5469927688fa23290f3b3e136ba50820b0b8d9
 2016-11-10 10:35:03 +00:00
Narayan Kamath
847d4476a7 Zygote : Block SIGCHLD during fork. am: dfcc79ee8e am: 720fcbc1f7 am: c82eb23651 
am: b0c09c0ebe

Change-Id: I1c378d684eb07cd20b64b358770fa6fe1dae274c
 2016-11-10 10:33:57 +00:00
Narayan Kamath
f0a65b9a98 Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am: a67112ca92 am: c0df29dfbc 
am: e9a12d0ac7

Change-Id: I9c34dfaf3e2cdbb2560765002926a493d2651708
 2016-11-10 10:29:02 +00:00
Narayan Kamath
b0c09c0ebe Zygote : Block SIGCHLD during fork. am: dfcc79ee8e am: 720fcbc1f7 
am: c82eb23651

Change-Id: Iec1e60c29bcaedf030da989aa66488bd87206563
 2016-11-10 10:27:58 +00:00
Narayan Kamath
e9a12d0ac7 Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am: a67112ca92 
am: c0df29dfbc

Change-Id: I5a77286ff7758d3c7aaa1a2bd14588e8dd5216d5
 2016-11-10 10:23:00 +00:00
Narayan Kamath
c82eb23651 Zygote : Block SIGCHLD during fork. am: dfcc79ee8e 
am: 720fcbc1f7

Change-Id: I18aeb47e1a4f061d5afe55a2aa936ae1d1cc61ff
 2016-11-10 10:21:57 +00:00
Narayan Kamath
c0df29dfbc Merge "Zygote : Block SIGCHLD during fork." into nyc-dev 
am: a67112ca92

Change-Id: Ib8bef283e74694a415dc73f2c16b4de3b201798e
 2016-11-10 10:15:59 +00:00
Narayan Kamath
720fcbc1f7 Zygote : Block SIGCHLD during fork. 
am: dfcc79ee8e

Change-Id: I64b380e54d73c777898ece33ba62b838b556921b
 2016-11-10 10:15:56 +00:00
Narayan Kamath
a67112ca92 Merge "Zygote : Block SIGCHLD during fork." into nyc-dev 2016-11-10 10:04:13 +00:00
Alain Vongsouvanh
e616fa1789 colors: Properly set the default accent colors. 
am: 7b371575e4

Change-Id: Icff01bd37726c9a77a80f1afb501390bb3ddc629
 2016-11-10 02:40:55 +00:00
Alain Vongsouvanh
7b371575e4 colors: Properly set the default accent colors. 
The 700 and 50 variant of the default accent colors were pointing to the
wrong material resources (deep_teal instead of accent).
This CL also update the watch colors to the proper specs.

BUG: 32087183
Change-Id: Ib8a23d9078e79bc0fdf6da893b4dff12954c2cbb
 2016-11-10 01:14:55 +00:00
TreeHugger Robot
6a6bc370e9 Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev 2016-11-09 23:05:43 +00:00
Xin Li
a29c7c77b1 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 am: 0bf282606f am: 0326b807fa 
am: d478287ab9

Change-Id: Ie236947ac81a8415e0c382daf4a6527337d3e78b
 2016-11-09 21:14:56 +00:00
Xin Li
a009932a57 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f am: 892385f520 am: 4c1922b441 
am: ba293f3c28

Change-Id: I5fda98c9f3c5f0c8abd133a960e32ef058c261c2
 2016-11-09 21:13:43 +00:00
Xin Li
d478287ab9 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 am: 0bf282606f 
am: 0326b807fa

Change-Id: I84618ae346458ff5db07a40aa6794900842bb222
 2016-11-09 21:03:17 +00:00
Xin Li
ba293f3c28 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f am: 892385f520 
am: 4c1922b441

Change-Id: Ia972df65c6ad3da624c16cbe911474560286ac3d
 2016-11-09 21:02:08 +00:00
Xin Li
0326b807fa Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 
am: 0bf282606f

Change-Id: I52dc31670838c2d067bf262981885f5bf2be3445
 2016-11-09 20:52:19 +00:00
Xin Li
4c1922b441 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f 
am: 892385f520

Change-Id: Icd01d06e42adc1995f555cc6e6bc146baee0fce1
 2016-11-09 20:51:08 +00:00
Narayan Kamath
2b3a352a4d Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf am: acdb6bb1aa am: e3d31ebc0e 
am: dac1d242ab

Change-Id: If057ed9554180fd773113629ff32129f08d8eff3
 2016-11-09 20:49:08 +00:00
Narayan Kamath
c8044be01e Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69 am: 4f65baa12f am: 76a388b93b -s ours 
am: 30a6da2b14

Change-Id: I19477805ad4b8b5c66634dc33021461b17d99aca
 2016-11-09 20:47:09 +00:00
Xin Li
b7f279051e Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac am: 781d8f7426 
am: c8ac64aca7

Change-Id: I8116a4a96c47bad2ff769fba878b863cc517c016
 2016-11-09 20:46:08 +00:00
Xin Li
0bf282606f Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours 
am: 4146229e69

Change-Id: I5530c638ccd5ad8af4115e6d8c5f85351948811d
 2016-11-09 20:45:40 +00:00
Xin Li
3b4f8bc034 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081 am: 9dccfbc7c8 
am: 68d354abce

Change-Id: I1c8d54f67f0e644e90856197a0713f7d6f86b33f
 2016-11-09 20:45:14 +00:00
Xin Li
892385f520 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours 
am: d167a27c1f

Change-Id: I6301865f95712e610ab75031fe401386a8010efd
 2016-11-09 20:44:35 +00:00
Narayan Kamath
dac1d242ab Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf am: acdb6bb1aa 
am: e3d31ebc0e

Change-Id: I27f374ed810a533e8df3111e1887e51520ebb3f1
 2016-11-09 20:41:16 +00:00
Narayan Kamath
30a6da2b14 Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69 am: 4f65baa12f 
am: 76a388b93b  -s ours

Change-Id: Ie2473f3fce3c956c9b6bc1ce9903d4c53874ddd4
 2016-11-09 20:40:24 +00:00
Xin Li
4146229e69 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 
am: 503661118a  -s ours

Change-Id: I1dc24f01552359d8cdaea875f399878fa55ea2e0
 2016-11-09 20:36:11 +00:00
Xin Li
c8ac64aca7 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac 
am: 781d8f7426

Change-Id: I2c144951b08fda465e0ee4ad4ba50f9ebe247a1c
 2016-11-09 20:35:03 +00:00
Xin Li
d167a27c1f Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 
am: 84a9614947  -s ours

Change-Id: I0a1887ae82111b39e1dea53fadea452bc522c2ae
 2016-11-09 20:34:42 +00:00
Xin Li
68d354abce Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081 
am: 9dccfbc7c8

Change-Id: Ib02f82fa385a514d339331fc3f3b5309a8042fa5
 2016-11-09 20:34:01 +00:00
Narayan Kamath
e3d31ebc0e Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf 
am: acdb6bb1aa

Change-Id: I363a163de6d9856ca84cc153ce3ef7a4485dc22e
 2016-11-09 20:26:18 +00:00
Narayan Kamath
76a388b93b Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69 
am: 4f65baa12f

Change-Id: Ib482d999552ca44ccc000a4a2f5604e920db2079
 2016-11-09 20:25:13 +00:00
Xin Li
503661118a Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e 
am: 71e62a4058

Change-Id: I0d66e9689c9ec4a2537cdd23a73ec4dbb74cfd1a
 2016-11-09 20:24:23 +00:00
Xin Li
781d8f7426 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 
am: 1a06ebfcac

Change-Id: I062b547da4a7190f27de0979b9859d4ce4307b00
 2016-11-09 20:24:23 +00:00
Xin Li
9dccfbc7c8 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours 
am: b9634f3081

Change-Id: Icd07d2224a1b58800f7344ff3b7928b335904446
 2016-11-09 20:23:02 +00:00
Xin Li
84a9614947 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba 
am: 63c9a312a2

Change-Id: I5123223d1ba04f94d52261ab77d6ec33a0c7dc75
 2016-11-09 20:23:01 +00:00
Xin Li
71e62a4058 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 
am: eda0b0078e

Change-Id: Ibf745e727c36dd04b5cb30b574cca4b5709b9f4b
 2016-11-09 20:17:53 +00:00
Xin Li
63c9a312a2 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours 
am: 6166af96ba

Change-Id: I591eb39cc8f7e3528a35ae1d98f641fdf12c4082
 2016-11-09 20:17:00 +00:00
Narayan Kamath
acdb6bb1aa Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev 
am: 12f98789bf

Change-Id: Ib86b20a2e51cac443adc73d5c18bca73ac316613
 2016-11-09 20:13:19 +00:00
Narayan Kamath
4f65baa12f Zygote: Additional whitelists for runtime overlay / other static resources. 
am: 25cd01cc69

Change-Id: I64dce88921b36a58dc66cd4b89e571ce9b8114eb
 2016-11-09 20:13:16 +00:00
Xin Li
1a06ebfcac Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev 
am: 49b144e630

Change-Id: Ib96a27383309fee13040dae1e12c23802a17f19f
 2016-11-09 20:11:43 +00:00
Xin Li
eda0b0078e Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev 
am: cc115c5931

Change-Id: I9e226ffdca4c3633061f0202da367e2be0eeeb1f
 2016-11-09 20:11:42 +00:00
Xin Li
b9634f3081 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. 
am: 9b9906e9c0  -s ours

Change-Id: I3456ce6db555dfed284003579ef24d70ae99d13c
 2016-11-09 20:11:38 +00:00
Xin Li
6166af96ba Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. 
am: ee2903686f  -s ours

Change-Id: I565953c9962f328055512615185de735c33a50bb
 2016-11-09 20:11:37 +00:00
Damien Bargiacchi
bcbd1f8110 Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev 
am: 7da025f142

Change-Id: I52cf76707b3273aa92d566487189db2a593bedaa
 2016-11-09 19:14:33 +00:00
Damien Bargiacchi
4e9436261f Allow config.xml to set the default display's default color mode 
am: 4364bbf93f

Change-Id: I6d68be94598f3fe28225826e00459d5707b7ecee
 2016-11-09 19:14:26 +00:00
Damien Bargiacchi
7da025f142 Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev 2016-11-09 19:05:37 +00:00
Narayan Kamath
dfcc79ee8e Zygote : Block SIGCHLD during fork. 
We close the android logging related sockets prior as late as possible
before every fork to avoid having to whitelist them. If one of the
zygote's children dies after this point (but prior to the fork), we can
end up reopening the logging sockets from the SIGCHLD signal handler.

To prevent this from happening, block SIGCHLD during this critical
section.

Bug: 32693692
Test: Manual

(cherry picked from commit e9a525829a)

Zygote: Unblock SIGCHLD in the parent after fork.

Follow up to change e9a525829a. Allows the zygote to
receive SIGCHLD again and prevents the zygote from getting into a
zombie state if it's killed.

Contributed-By: rhed_jao <rhed_jao@htc.com>
Bug: 32693692
Test: manual

(cherry picked from commit c7161f756e86b98f2244a04d9207b47149965fd7)

Change-Id: If89903a29c84dfc9b056f9e19618046874bba689
 2016-11-09 18:30:55 +00:00
Narayan Kamath
12f98789bf Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev 2016-11-09 09:48:43 +00:00
Bill Yi
497956cf15 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: aa13d0f09d  -s ours

Change-Id: I8580ef0aca3b98579053a3eae475167b2037c3ed
 2016-11-09 02:32:19 +00:00