Commit Graph

277484 Commits

Author SHA1 Message Date
Bill Yi
d89e27a99c Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 5086fe2800  -s ours

Change-Id: I891dc2d4f99ac46f225837b9a71013ad8ff142c7
2016-09-22 12:32:35 +00:00
Bill Yi
ed0063eede Import translations. DO NOT MERGE
am: 7fea90bfec  -s ours

Change-Id: I312c228c256b9f71174e6c02af8a7c1dfceaae97
2016-09-22 12:32:27 +00:00
Ajay Panicker
553961fbcc [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708 am: 90eafb5322 -s ours
am: b2a1dcb913

Change-Id: I420198b83b2b8480a87a6d55195b6f05ec06b057
2016-09-22 12:32:25 +00:00
Bill Yi
d343a87b10 Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 994ec6a0ec -s ours
am: b1056852a5  -s ours

Change-Id: I01089f7bf4258e4e894f2a2d996b6750e17c5e7b
2016-09-22 12:32:04 +00:00
Bill Yi
96853eb87d Import translations. DO NOT MERGE am: a6c51e2c94 -s ours
am: 563510e1b6  -s ours

Change-Id: I8b1d1b7af93df4253166aef4338b7f07759d9f19
2016-09-22 12:31:07 +00:00
Ajay Panicker
fe3e7b181b Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1 am: 05cd9942d9 -s ours
am: 745254f98b

Change-Id: I8204d26ad589a600a7e1cccc306266b1ab579c6a
2016-09-22 12:31:06 +00:00
Bill Yi
0575a4d1c5 Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: c051914a46  -s ours

Change-Id: Id2bfbe894e47451efc8159a8cd692537d4f291f5
2016-09-22 12:30:03 +00:00
Ajay Panicker
5732e9dbc3 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours am: c56c079470 am: 1783182332 am: 993015ce9a am: 8e172c638d -s ours
am: 9338ffa148

Change-Id: Iad6b7ac69088d60cf02cd9870e2520388d398767
2016-09-22 12:29:58 +00:00
Bill Yi
9368b5dd39 Import translations. DO NOT MERGE
am: e0e30f5320  -s ours

Change-Id: If1a43ad1feb011755cf61f6c38a37b6c37ce56c8
2016-09-22 12:29:57 +00:00
Bill Yi
4fb97691f1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 6856972e4b  -s ours

Change-Id: I0071654ea2d70605ea858e19454621f97fd92f28
2016-09-22 12:29:55 +00:00
Bill Yi
3dc3d3eda4 Import translations. DO NOT MERGE
am: 7060296d02  -s ours

Change-Id: Iece9d5abf1ddb194f6009640ad6626609a8d769e
2016-09-22 12:29:51 +00:00
Jaewan Kim
1bf809c490 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours
am: 890f53a486

Change-Id: I7f85d8785ce8829cb9d01a23413c545f5e5a769a
2016-09-22 12:29:19 +00:00
Jaewan Kim
c17a43fcfd Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261 am: b2403f3102 am: 5decf8e715 -s ours
am: 963c269ffa

Change-Id: I709f55ff1694415af29f11694d74c1564dbe36fc
2016-09-22 12:28:57 +00:00
Ajay Panicker
0029d03c0a Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a am: 0fee65e58b
am: 08fed21f2c  -s ours

Change-Id: I2e790e95077c0760d1be6d984e7e90fb62a3d9db
2016-09-22 12:28:51 +00:00
Jaewan Kim
245e33a0b1 DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7 am: 35e95d82d7 -s ours am: 2ccdbce954
am: 091681149b

Change-Id: I0fb73df3b32342897159f99b8f1ee99b975f8874
2016-09-22 12:26:49 +00:00
Ajay Panicker
ffe6090f7e [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994 -s ours
am: bc12dda3a7

Change-Id: Ib99bfa28add599f964b1b669de22fd653e42b02a
2016-09-22 11:58:28 +00:00
Ajay Panicker
bd25fec0d9 Merge "Remove net_bt_stack group and replace it with bluetooth" am: 2309b98b25
am: 4a1fd7eb3d

Change-Id: If1fc5aab977c74c0865e0abc18205eaf028148c7
2016-09-22 11:23:35 +00:00
Jaewan Kim
36aa253b2b Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours am: 298c104ae5 am: d9e8bfb8cf am: 8cb7a9fdb0
am: a13096f4c5  -s ours

Change-Id: I5b9a7bb6faae813c9b4f6beeb8f96dfb5ad3cc3b
2016-09-22 11:22:51 +00:00
Jaewan Kim
7ffaaca237 DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea
am: 7eaeeb49bb

Change-Id: I21b359b1471ee527a2bc975c399253def98e40fe
2016-09-22 11:21:01 +00:00
Jaewan Kim
b96d410537 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5 am: f595add2ff am: e1e6f0a7f5
am: 9632afe809  -s ours

Change-Id: I68e31867b8c925717eda87a426add614f731f77a
2016-09-22 10:59:39 +00:00
Jaewan Kim
61fda61d20 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2 am: bea0b3ec06 -s ours am: 91ccfa1def am: 4167620d33 am: 2c9ad0ff81
am: b6d6519e34  -s ours

Change-Id: Idda087e0cbccf3e94dd23a41156cdcc14a4b2459
2016-09-22 10:58:44 +00:00
Jaewan Kim
78efad6418 DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861 am: ba1d8300be am: 016d110993
am: 1adff2ee05  -s ours

Change-Id: I99f14369c3f5f4388a17b85720a45bde8ee4c5be
2016-09-22 10:57:53 +00:00
Ajay Panicker
c5442c263a Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed -s ours am: d4fe288933 am: f65661939b am: 630d577349
am: c9830d56e5  -s ours

Change-Id: Iaae899eeea3c9c95ebcd7654e6fb5a89d7f1ed90
2016-09-22 10:56:50 +00:00
Ajay Panicker
b2a1dcb913 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708
am: 90eafb5322  -s ours

Change-Id: I21edab5680d1cc4f5afa74ab9764f0ff945a44cc
2016-09-22 10:55:43 +00:00
Ajay Panicker
745254f98b Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1
am: 05cd9942d9  -s ours

Change-Id: Iedd8920de15034413968efa125fa544b5a25e87c
2016-09-22 10:54:53 +00:00
Ajay Panicker
9338ffa148 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours am: c56c079470 am: 1783182332 am: 993015ce9a
am: 8e172c638d  -s ours

Change-Id: I6ed9ac6f79a853f08fbc3105cade0d47033701f0
2016-09-22 10:53:39 +00:00
Jaewan Kim
963c269ffa Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261 am: b2403f3102
am: 5decf8e715  -s ours

Change-Id: I79036440c10f32b4a30fbefa3a3ff65ebd9fc69e
2016-09-22 10:52:37 +00:00
Jaewan Kim
a13096f4c5 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours am: 298c104ae5 am: d9e8bfb8cf
am: 8cb7a9fdb0

Change-Id: Ib54fc420bb43c312f72f5c72bb38b97550db9da9
2016-09-22 10:52:34 +00:00
Jaewan Kim
091681149b DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7 am: 35e95d82d7 -s ours
am: 2ccdbce954

Change-Id: Iede8b78ecc2ae054266286d69317b655263deacc
2016-09-22 10:50:05 +00:00
Elliot Waite
d872507b6b Merge "Revert fixed at links." into nyc-dev am: c77b72f244 am: 8ea167bf7a am: ffb31e9954
am: 99e8284514

Change-Id: I3cafba5a53c0a94b0569bbed1652f1fa61e69c88
2016-09-22 10:32:13 +00:00
Elliot Waite
297ca1b1ad Revert fixed at links. am: 7c70fed347 am: 4a60ffd518 am: e2b498241a
am: 47b11423ac

Change-Id: Ibae53d75c5f9ad8e0ee3e69688fbbe74448cdc22
2016-09-22 10:31:18 +00:00
Adarsh Fernando
b6493d33e2 Found a couple of more references to Android N. am: 9af57aa309 am: 9a91d6662e am: acb068a213
am: 9fc1b4c5b8

Change-Id: I0704581c446b52a1a75cea63e9e6b4a191d554e7
2016-09-22 10:30:08 +00:00
Adarsh Fernando
733bccb617 Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am: fe060d3f37 am: 453160c39d am: 551d5d7f7f
am: a7de0e1f58

Change-Id: Ied8793e814a3eaf31da62ba78f18c339347a0b45
2016-09-22 10:29:18 +00:00
Adarsh Fernando
ba3ee5555b Docs: Cleanup of Preview language in Android 7.0 docs. am: 4b6d939321 am: 0b8e646225 am: 059c09784d
am: 4fb36b0dfb

Change-Id: I1d65d529a99f23b01c1ec1533cddc800d3647d75
2016-09-22 10:28:18 +00:00
Stuart Scott
ef43416c0e Merge "Continue if package is not in system" into nyc-dr1-dev am: cffe1f48d3 am: a676b157fb
am: a177302cd0

Change-Id: I4ee26f9df77081d8d0ac989810b818775660cf62
2016-09-22 10:27:00 +00:00
Stuart Scott
ab4e9b2fee Continue if package is not in system am: 434c8db80f am: 0845b025aa
am: b15c45a037

Change-Id: I8426be2a7217eb6eaf78f3e37fd787c065027411
2016-09-22 10:26:02 +00:00
Jaewan Kim
2b406dbc9e Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev am: 8ba2549592 am: 60d2af330b am: 345d75bf88
am: 1f52dcc543

Change-Id: I6ffcfa8151c1430546d6f30348a7029e06e20549
2016-09-22 10:25:08 +00:00
Bill Yi
b1056852a5 Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
am: 994ec6a0ec  -s ours

Change-Id: Ida7cf9408ad94d3a17fc7b1154f0644c1ae33442
2016-09-22 10:23:07 +00:00
Bill Yi
563510e1b6 Import translations. DO NOT MERGE
am: a6c51e2c94  -s ours

Change-Id: I4e82725c53421b83579b8f3ced716366eaa8df51
2016-09-22 10:23:04 +00:00
Jaewan Kim
4eda8b6a7f DO NOT MERGE Check caller for sending media key to global priority session am: 09c3df004b am: 01796f794d am: e13dc68953
am: 407e4eaa34

Change-Id: I49c03f2164bc01f73244858239ab9916617be48c
2016-09-22 10:23:03 +00:00
Bill Yi
7640ef24d1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: d5d5dc2473  -s ours

Change-Id: Ie1fd61e17f3ed2a1429412722f1571e5c1e91954
2016-09-22 10:22:21 +00:00
Bill Yi
660e6d0269 Import translations. DO NOT MERGE
am: 6394011a86  -s ours

Change-Id: I5b6ba4829095eed2641781e45468a1f7a009ec85
2016-09-22 10:22:17 +00:00
yuanhuihui
dc94b2973f [ActivityManager] Reset killed flag at attachApplicationLocked
A restarted process will reuse original process record.
If only reset KilledByAm flag, not reset Killed flag.
When app process have been killed by AMS can skip  unnessary ANR,
but not catch lowmemorykiller in AppErrors.appNotResponding()

Change-Id: Ie4653edf4252797eaeefbf9a4a35ac00cfa857d8
Signed-off-by: yuanhuihui <yuanhuihui@xiaomi.com>
2016-09-22 18:17:16 +08:00
TreeHugger Robot
5086fe2800 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-22 09:56:57 +00:00
TreeHugger Robot
c051914a46 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-22 09:56:33 +00:00
TreeHugger Robot
6856972e4b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-22 09:54:12 +00:00
Ajay Panicker
08fed21f2c Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a
am: 0fee65e58b

Change-Id: I6e5bb9fea57cf5fe9cff68952d6b2878ce005d7c
2016-09-22 09:53:30 +00:00
TreeHugger Robot
994ec6a0ec Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 2016-09-22 09:53:02 +00:00
TreeHugger Robot
d5d5dc2473 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-22 09:52:00 +00:00
Jaewan Kim
890f53a486 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours
am: 5ac79fa0a1  -s ours

Change-Id: I02b22b773537b4c37893114f85714c32de5035a2
2016-09-22 09:38:16 +00:00