Ajay Panicker
916552b0c9
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 am: 0029d03c0a am: afeaced48f am: 2a214fc5f2
...
am: 0ec10c8fdc
2016-09-22 19:56:50 +00:00
Colin Cross
d333f28397
Merge "Remove has_trivial_move trait from StringPool types"
2016-09-22 19:44:28 +00:00
Android Build Merger (Role)
62e519d02a
Merge "Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev am: 8b05feb5b4" into nyc-dev-plus-aosp
2016-09-22 19:24:07 +00:00
Android Build Merger (Role)
8139010d37
Merge "Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693" into nyc-dev-plus-aosp
2016-09-22 19:23:52 +00:00
Scott Main
f9c35c961b
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
...
am: 8b05feb5b4
2016-09-22 19:23:12 +00:00
Ajay Panicker
0ec10c8fdc
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 am: 0029d03c0a am: afeaced48f
...
am: 2a214fc5f2
2016-09-22 19:23:06 +00:00
Adarsh Fernando
3955fef4b7
Removing a temporary redirect for /ndk/guides/cmake.html
...
am: dafcbfa693
2016-09-22 19:23:05 +00:00
yuanhuihui
689c4ab00a
Merge "[ActivityManager] Reset killed flag at attachApplicationLocked" am: 1d5447d70b
...
am: 5820f7fff5
2016-09-22 19:21:50 +00:00
Jaewan Kim
dd883c7e87
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 am: 1bf809c490 am: 6ad7c0f6ce -s ours am: 1c278e5652
...
am: bed7636243
2016-09-22 19:01:08 +00:00
Jaewan Kim
0e31d93890
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 am: 7ffaaca237 -s ours am: fa9983ec73
...
am: 900d1c90b3
2016-09-22 19:00:14 +00:00
Jaewan Kim
ded4df2e79
Merge "DO NOT MERGE Fix build" into lmp-dev
...
am: fce3b76452
2016-09-22 18:09:45 +00:00
Jaewan Kim
499871ebe9
DO NOT MERGE Fix build
...
am: dfedca4e43
2016-09-22 18:09:41 +00:00
Ajay Panicker
2a214fc5f2
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 am: 0029d03c0a
...
am: afeaced48f
2016-09-22 18:07:40 +00:00
Jaewan Kim
fce3b76452
Merge "DO NOT MERGE Fix build" into lmp-dev
2016-09-22 17:46:59 +00:00
Jaewan Kim
dfedca4e43
DO NOT MERGE Fix build
...
Bug: 29833954
Change-Id: Ia814969b516ac7cc0ad7431ebab40cc74fdf2a05
2016-09-22 17:43:35 +00:00
yuanhuihui
5820f7fff5
Merge "[ActivityManager] Reset killed flag at attachApplicationLocked"
...
am: 1d5447d70b
2016-09-22 17:28:31 +00:00
Dirk Dougherty
9bbc0a2421
Copy IN files to ID, temporarily leaving IN in place.
...
Change-Id: I1a92e4254fe57817cb555629059539aaec47e182
2016-09-22 10:21:29 -07:00
Colin Cross
cafc05357c
Remove has_trivial_move trait from StringPool types
...
StringPool:entry* are not trivially moveable, as they contain Vector<>
objects. The data in Vector<> is trivially moveable, but Vector<>
itself is a dynamic type with a vtable, which is not trivially
moveable.
Impact on aapt for frameworks-res is negligible, ~3%.
Bug: 31595853
Test: m -j framework-res
Change-Id: I562a46ef8934aed7aab5c5377db53d9cf64a08b9
2016-09-22 10:09:38 -07:00
liulvping
2527fa3067
Skip uninstalled package for getPackagesForUid()
...
If a package with sharedUserId had been setInstalled
with false, then the result of getPackagesForUid()
should not include it.
https://code.google.com/p/android/issues/detail?id=212255
Change-Id: I7b984051db34ecc2d0ef9518786d51100ab9ac79
Signed-off-by: liulvping <liulvping@xiaomi.com >
2016-09-22 16:53:21 +00:00
Narayan Kamath
2090e9222c
Remove (now) unnecessary reference to core-lambda-stubs.
...
Tis now included in core-oj.
bug: 31675876
Test: make checkbuild
Change-Id: If9062a55ec02fe653542dcb4a41020c8e1f6f15e
2016-09-22 17:52:37 +01:00
Jaewan Kim
bed7636243
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 am: 1bf809c490 am: 6ad7c0f6ce -s ours
...
am: 1c278e5652
2016-09-22 16:06:27 +00:00
Ajay Panicker
de7905cec5
[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 am: ffe6090f7e am: a71d1c416b am: 081bea189d -s ours
...
am: 34b14060c1
2016-09-22 15:45:36 +00:00
Scott Main
8b05feb5b4
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
2016-09-22 15:22:40 +00:00
Treehugger Robot
1d5447d70b
Merge "[ActivityManager] Reset killed flag at attachApplicationLocked"
2016-09-22 14:54:16 +00:00
Ajay Panicker
34b14060c1
[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 am: ffe6090f7e am: a71d1c416b
...
am: 081bea189d
2016-09-22 14:48:37 +00:00
Jaewan Kim
900d1c90b3
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 am: 7ffaaca237 -s ours
...
am: fa9983ec73
2016-09-22 14:23:38 +00:00
Ajay Panicker
081bea189d
[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 am: ffe6090f7e
...
am: a71d1c416b
2016-09-22 14:22:50 +00:00
Jaewan Kim
1c278e5652
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 am: 1bf809c490
...
am: 6ad7c0f6ce
2016-09-22 13:58:30 +00:00
Ajay Panicker
afeaced48f
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
...
am: 0029d03c0a
2016-09-22 13:33:07 +00:00
Ajay Panicker
a71d1c416b
[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
...
am: ffe6090f7e
2016-09-22 13:32:52 +00:00
Jaewan Kim
fa9983ec73
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
...
am: 7ffaaca237
2016-09-22 13:31:57 +00:00
Jaewan Kim
6ad7c0f6ce
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
...
am: 1bf809c490
2016-09-22 13:10:13 +00:00
Jaewan Kim
d4167d7a0b
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
...
am: 36aa253b2b
2016-09-22 12:37:05 +00:00
Jaewan Kim
e9bb43ff8e
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
...
am: b96d410537
2016-09-22 12:36:11 +00:00
Jaewan Kim
8c53db264a
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
...
am: 61fda61d20
2016-09-22 12:35:13 +00:00
Jaewan Kim
6f6b07c9c7
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
...
am: 78efad6418
2016-09-22 12:34:18 +00:00
Ajay Panicker
7b348ecc95
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
...
am: c5442c263a
2016-09-22 12:33:22 +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
2016-09-22 12:32:25 +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
2016-09-22 12:31:06 +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
2016-09-22 12:29:58 +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
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
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
2016-09-22 12:28:51 +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
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
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
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
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
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
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
2016-09-22 10:57:53 +00:00
