Commit Graph

255075 Commits

Author SHA1 Message Date
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
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
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
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
Ajay Panicker
bc12dda3a7 [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

Change-Id: I51723f883566989133b0c8be92108b8c910c0981
2016-09-22 09:38:13 +00:00
Jaewan Kim
9632afe809 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

Change-Id: I373b66ee022f14d331729531c450eb18f8572d9b
2016-09-22 09:38:13 +00:00
Jaewan Kim
8cb7a9fdb0 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

Change-Id: I3f09cc3c507244d1999ed280002e1354d25db9d2
2016-09-22 09:37:34 +00:00
Jaewan Kim
7eaeeb49bb 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

Change-Id: I8db6ebc6704a60d44739e873038403c2740304e3
2016-09-22 09:35:44 +00:00
Jaewan Kim
aff8ee6351 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: I69d1c836247dbe40ff7c07e503a4cfbd324ecd55
2016-09-22 09:17:14 +00:00
Elliot Waite
ed870fccb4 Merge "Revert fixed at links." into nyc-dev
am: c77b72f244

Change-Id: Ia28b1f02a83cd8f0e346e559bb47a4e0b885fbf2
2016-09-22 09:16:04 +00:00
Elliot Waite
ef69678105 Revert fixed at links.
am: 7c70fed347

Change-Id: I6ff2d18d5cfb834d32e80c945dd14e09c1cdf1de
2016-09-22 09:15:59 +00:00
Adarsh Fernando
4c9ecfbd01 Found a couple of more references to Android N.
am: 9af57aa309

Change-Id: I9f24e1da25553e1d50f61a0aa7a4398f39321174
2016-09-22 09:15:08 +00:00
Jaewan Kim
b6d6519e34 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

Change-Id: I57e8a4e6b415683cba317afa012880b8ac12bff6
2016-09-22 09:14:33 +00:00
Adarsh Fernando
df9659a112 Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
am: fe060d3f37

Change-Id: Ifc20898208dae803037a3c322bea785e6d82926e
2016-09-22 09:13:40 +00:00
Jaewan Kim
5ac79fa0a1 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894
am: 84ecab6059  -s ours

Change-Id: I077206cbba5614e52046cbbbf6e40544c3e25f92
2016-09-22 09:13:35 +00:00
Adarsh Fernando
ce73af6cd2 Docs: Cleanup of Preview language in Android 7.0 docs.
am: 4b6d939321

Change-Id: Ic43b45e9076fa5f132178a5c2a7edbd47f3f8f3f
2016-09-22 09:13:33 +00:00
Jaewan Kim
1adff2ee05 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

Change-Id: I6a216c2e2ddb6b9959e9691c5014c0d29b6c453d
2016-09-22 09:13:26 +00:00
Jaewan Kim
f140f796ea DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours
am: 8dffbcd169  -s ours

Change-Id: Ida4217e4a0392c2f58b1ef3d0229bad4229c838d
2016-09-22 09:13:22 +00:00
Jaewan Kim
e1e6f0a7f5 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

Change-Id: I9d7b96411a566e6fa4ad4c8d263140245b427b44
2016-09-22 09:13:16 +00:00
Jaewan Kim
d9e8bfb8cf 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

Change-Id: Id2538e101907fe6a3dc5cb284ecf93a392a047ba
2016-09-22 08:45:58 +00:00
Jaewan Kim
f595add2ff 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

Change-Id: Id6f3783a23706efaa7f389deb84e69c69fab501a
2016-09-22 08:45:03 +00:00
Ajay Panicker
4a1fd7eb3d Merge "Remove net_bt_stack group and replace it with bluetooth"
am: 2309b98b25

Change-Id: Ib2704e71c9d32a5799b44d1753bf3011607787c8
2016-09-22 08:09:21 +00:00
Jaewan Kim
2c9ad0ff81 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

Change-Id: I1af888ef60ff3920e1b63a421e432319bdefdb3e
2016-09-22 08:08:16 +00:00
Jaewan Kim
2ccdbce954 DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7
am: 35e95d82d7  -s ours

Change-Id: I5fe98000c623199706bd3879a361ef72e0da2ccb
2016-09-22 08:07:35 +00:00
Jaewan Kim
8dffbcd169 DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c
am: 27d24e01cb  -s ours

Change-Id: Ibfec9c02db97a94476d1b6b4d7e98fd051d4aa58
2016-09-22 08:07:29 +00:00
Jaewan Kim
84ecab6059 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586
am: b38fbf9894

Change-Id: I6f6d600544f09aac349a626e3ced18de5e02a2eb
2016-09-22 08:07:17 +00:00
Jaewan Kim
016d110993 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

Change-Id: I198e4b87bed7f0b4e253e86a89fa5c36fec1fbb2
2016-09-22 08:07:15 +00:00
Ajay Panicker
8091a00994 [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

Change-Id: I846d53b9f2b8ac6215d873d2dc8ae3efa20c5919
2016-09-22 08:06:50 +00:00
Jaewan Kim
298c104ae5 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

Change-Id: Ib4a702bd653ca1083ac4846ac4a6947ef91e2e33
2016-09-22 08:06:16 +00:00
Jaewan Kim
8d14f464b5 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

Change-Id: I69062cb6535df22a743270a62fda89dcca155e87
2016-09-22 08:05:11 +00:00
Ajay Panicker
0fee65e58b 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

Change-Id: Ie34765f501d780285449d792c3ebee31090a2651
2016-09-22 08:03:19 +00:00
Etan Cohen
6b6c719dd2 Merge "[NAN] Method renames based on API council feedback" am: dcac00f325
am: 3501748dea

Change-Id: I2b39ff45bcdbd29228720c2abc10a59d1f0480c1
2016-09-22 07:45:51 +00:00
Ajay Panicker
c9830d56e5 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

Change-Id: I812cd00912fad74e9f07a6881bec4b93e6e71490
2016-09-22 07:39:22 +00:00
Ajay Panicker
90eafb5322 [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

Change-Id: Iec857815b52d8b0bdfdd1b14210fa67bc3a17c83
2016-09-22 07:38:34 +00:00
Ajay Panicker
05cd9942d9 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

Change-Id: I0fbfd3aac6e4d6e6090bfcde65abc8f5641cfe5e
2016-09-22 07:37:44 +00:00
Ajay Panicker
8e172c638d [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

Change-Id: I19514d41db780f41114fe05e86360beeda44352b
2016-09-22 07:36:50 +00:00
Jaewan Kim
5decf8e715 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261
am: b2403f3102

Change-Id: Ia418a5eb08b7f5cdb2a987c4f17708069012c0e5
2016-09-22 07:35:45 +00:00
Jaewan Kim
27d24e01cb DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27
am: 9477c1674c

Change-Id: If2edd8d386cd57f00221fedff3f118e6887cab61
2016-09-22 07:35:37 +00:00
Jaewan Kim
35e95d82d7 DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98
am: ff1c1993b7

Change-Id: I60355987ea0814314c2f79041d068e099b158c7b
2016-09-22 07:34:55 +00:00
Jaewan Kim
8a168a7c5d 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

Change-Id: Iaceb27058be8f06e2e1b0a115ba914f7b0aad7e4
2016-09-22 06:41:03 +00:00
Ajay Panicker
0241b6d88a 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

Change-Id: I3370b5bb190ab5c7749e729fefdec33f06523899
2016-09-22 06:41:02 +00:00
Jaewan Kim
64110c6bf1 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776
am: 2d88f87a82

Change-Id: Idd9cdf4bb14b4feced73ea176f3505ae02d630e7
2016-09-22 06:40:05 +00:00
Jaewan Kim
b38fbf9894 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev
am: 5b05226586

Change-Id: I0b0b672c42a7a4bd75ccbeb2c3a1047eebda5076
2016-09-22 06:39:33 +00:00
Jaewan Kim
9477c1674c DO NOT MERGE Check caller for sending media key to telephony service
am: d1641e8c27

Change-Id: I5be1d931c3a2f2748e69158d442172c327199ef5
2016-09-22 06:39:24 +00:00
Ajay Panicker
c1f8a09c1e [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

Change-Id: Idd9dd9b69ae2d5d176c0b9ff663661985658230e
2016-09-22 06:10:41 +00:00