Commit Graph

277484 Commits

Author SHA1 Message Date
Winson
4823655976 Merge "Fixing RTL issues with transition and screen pinning." into nyc-mr1-dev
am: 00dc65158d

Change-Id: I7d1c1dfa5407c1fcce96710d65f344cc5eca39e6
2016-09-22 22:43:58 +00:00
Winson
9ae8d47697 Fixing RTL issues with transition and screen pinning.
am: 96f78f5046

Change-Id: Id492a30f4a76a2a008d169496e65036ce8828134
2016-09-22 22:43:56 +00:00
yuanhuihui
d105706775 Merge "[ActivityManager] Reset killed flag at attachApplicationLocked" am: 1d5447d70b am: 5820f7fff5
am: 689c4ab00a

Change-Id: I54afd53f6fe0219f33521295a2dde90e911a55f7
2016-09-22 22:43:18 +00:00
Todd Kennedy
21cc71328b Merge "Pass url to the AIA supervisor" into nyc-mr1-dev
am: bce1e8c836

Change-Id: I1e86b7d1b2d79417a704e62efd11969888c5ee88
2016-09-22 22:42:22 +00:00
Todd Kennedy
c2467b8c68 Pass url to the AIA supervisor
am: 52f179fd0e

Change-Id: Ibf10b00e436dbd520e4326a23181562b67581e20
2016-09-22 22:42:20 +00:00
Ajay Panicker
04c7e841f5 [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
am: de7905cec5

Change-Id: I6387b62a1c4af90a5d6485a1cca081d275205003
2016-09-22 22:42:14 +00:00
Jaewan Kim
bf82360453 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
am: d4167d7a0b

Change-Id: Ia3ba184d8772425bdc8bc10d4122ef0229547571
2016-09-22 22:41:17 +00:00
Jeff Sharkey
12de26b83b Merge "Recursively restorecon when SELinux label changes." into nyc-mr1-dev
am: 8423493a85

Change-Id: I7f72932873fd437b07d662fd0c27af8b4baadbe1
2016-09-22 22:41:03 +00:00
Jeff Sharkey
8fb7520a6d Recursively restorecon when SELinux label changes.
am: 7e2bb3e6dd

Change-Id: I964b2173f556077f2718abd5b30e156e1a9e6639
2016-09-22 22:40:38 +00:00
Jaewan Kim
5b649ddcc6 Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074
am: 1ab448b5d5

Change-Id: I4a1da4793ef9c53447742ea9e1f7a34fbffb8807
2016-09-22 22:40:32 +00:00
Jaewan Kim
e9c5b8b6ac 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
am: e9bb43ff8e

Change-Id: I7e09d3dca36a1f3272f2903eef963eb683a12912
2016-09-22 22:40:28 +00:00
Dirk Dougherty
4c9be8f738 Copy IN files to ID, temporarily leaving IN in place. am: 9bbc0a2421 am: d6490cf9c0
am: f7f3f0f401

Change-Id: I4f7f5dbd2d588bf139db87504500a429f71492d9
2016-09-22 22:39:44 +00:00
Pavlin Radoslavov
829285c38e Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
am: 3b0256fc73

Change-Id: If33f7f2787ee94609e9fbb0ea52f66bdbdf57614
2016-09-22 22:39:31 +00:00
Jaewan Kim
afab98a69e DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320
am: 03bad07418

Change-Id: Ia687cf7aa14eb11452d390d47bc13ba4dfba0cda
2016-09-22 22:39:30 +00:00
Jaewan Kim
ec8ef0d4d6 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
am: 8c53db264a

Change-Id: I9c4f145c642e1805b85dfaff113946dea8af3327
2016-09-22 22:39:29 +00:00
Android Build Merger (Role)
b078774a87 Merge "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 am: 6f6b07c9c7" into nyc-mr1-dev-plus-aosp 2016-09-22 22:32:30 +00:00
Jaewan Kim
b0a189e1cf 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
am: 6f6b07c9c7

Change-Id: I4678b9c2930d4fa0d2784512db7710dc53adcf11
2016-09-22 22:31:43 +00:00
Android Build Merger (Role)
0cc5cc4e6e Merge "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 am: 7b348ecc95" into nyc-mr1-dev-plus-aosp 2016-09-22 22:31:21 +00:00
Ajay Panicker
9db8240bb1 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
am: 7b348ecc95

Change-Id: I86ebd091a475a844e6d66b42acaaf26bcff28e7a
2016-09-22 22:30:46 +00:00
Android Build Merger (Role)
8a0bb0b0e9 Merge "[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 am: 553961fbcc" into nyc-mr1-dev-plus-aosp 2016-09-22 22:30:27 +00:00
Android Build Merger (Role)
4d3bd53d56 Merge "Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693 am: aff6881d04 am: 2eb458b8cd am: 854d5bf75b" into nyc-mr1-dev-plus-aosp 2016-09-22 22:30:07 +00:00
Ajay Panicker
ef8196c344 [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
am: 553961fbcc

Change-Id: Ie7e86eb563f40d5ff0d75ac04433f202fc71c550
2016-09-22 22:29:52 +00:00
Android Build Merger (Role)
edeefb0d58 Merge "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 am: fe3e7b181b" into nyc-mr1-dev-plus-aosp 2016-09-22 22:29:32 +00:00
Adarsh Fernando
0e08af7e08 Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693 am: aff6881d04 am: 2eb458b8cd
am: 854d5bf75b

Change-Id: Ie1fe5f32f51a4bc2541913011cbdf0c3799416ae
2016-09-22 22:29:25 +00:00
Android Build Merger (Role)
1a2973baee Merge "[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 am: 45c45d359e am: dc9c76c306 am: 602e5dda33" into nyc-mr1-dev-plus-aosp 2016-09-22 22:29:07 +00:00
Ajay Panicker
7ee9869ac6 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
am: fe3e7b181b

Change-Id: I0d94265b2f44892d737969213db25aeb0baf4d33
2016-09-22 22:28:56 +00:00
Android Build Merger (Role)
6ca8883b50 Merge "[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 am: 5732e9dbc3" into nyc-mr1-dev-plus-aosp 2016-09-22 22:28:35 +00:00
Ajay Panicker
4fb76c9447 [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 am: 45c45d359e am: dc9c76c306
am: 602e5dda33

Change-Id: Iecb3d22f2613f81a12d7110136de93898b6b4161
2016-09-22 22:28:29 +00:00
Android Build Merger (Role)
d829ea0d80 Merge "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 am: 08ca31273c am: 64a14294cb am: bbf376e639" into nyc-mr1-dev-plus-aosp 2016-09-22 22:28:12 +00:00
Jaewan Kim
1ab448b5d5 Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31
am: 09edfde074

Change-Id: I8365e943aab82305fbc5775e8044dc7f014c0cdc
2016-09-22 22:27:37 +00:00
Jaewan Kim
2135ab2f91 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 am: 08ca31273c am: 64a14294cb
am: bbf376e639

Change-Id: I39acef5594cb65c598d3efa7e859f68878f9aeb0
2016-09-22 22:27:03 +00:00
Ajay Panicker
09042aa3cd [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
am: 5732e9dbc3

Change-Id: Iab6d5351a02d76bf50d1c765cde035cf9a70d32b
2016-09-22 22:26:58 +00:00
Android Build Merger (Role)
4015995d47 Merge "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 am: 9b790e27b7 am: 8d45b4522d am: a7dd993294" into nyc-mr1-dev-plus-aosp 2016-09-22 22:26:43 +00:00
Jaewan Kim
03bad07418 DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055
am: 351aa0b320

Change-Id: I4cfe42fedcde6f49f259686481bfe61660d02bfc
2016-09-22 22:26:12 +00:00
Jaewan Kim
f7338ac8c2 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
am: c17a43fcfd

Change-Id: I61a04498f86546eb6a9e50fad78266ec3bff204f
2016-09-22 22:26:04 +00:00
Jaewan Kim
2eea4a662b 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 am: 9b790e27b7 am: 8d45b4522d
am: a7dd993294

Change-Id: Id9ad8bd6bd849d58a69b7430dcda1efe87255fbc
2016-09-22 22:25:57 +00:00
Jaewan Kim
09edfde074 Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours
am: 2cd4383c31

Change-Id: I0e6d2e4c60383c95a4a73bccfdb12472152e86a0
2016-09-22 22:21:52 +00:00
Jaewan Kim
351aa0b320 DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours
am: e9a9e2f055

Change-Id: Iaa0f0e473c9e2389c75c5d4dd9b4ff5e244ba442
2016-09-22 22:20:54 +00:00
TreeHugger Robot
6f91c19337 Merge "Don't halt movement notifications when display is frozen." into nyc-mr1-dev 2016-09-22 22:17:34 +00:00
Android Build Merger (Role)
00a3d1d7a1 Merge "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 am: 83ded12e86 am: 3e2f3c2e31 am: 3babfefdb4" into nyc-mr1-dev-plus-aosp 2016-09-22 22:14:57 +00:00
Android Build Merger (Role)
9570466f2d Merge "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 am: dd883c7e87 am: 832179120f -s ours am: c547eeda12 am: f91952879c" into nyc-mr1-dev 2016-09-22 22:14:44 +00:00
Jaewan Kim
9120c27419 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 am: 83ded12e86 am: 3e2f3c2e31
am: 3babfefdb4

Change-Id: Ie28f23a7d4e711a48f1d654e292019d686c06b2a
2016-09-22 22:13:02 +00:00
Android Build Merger (Role)
29c25c03f8 Merge "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 am: 53adfd6294 am: 5886b4ca7b am: fdad028484" into nyc-mr1-dev-plus-aosp 2016-09-22 22:12:47 +00:00
Jaewan Kim
80843a1b1f 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 am: 53adfd6294 am: 5886b4ca7b
am: fdad028484

Change-Id: Ie9d1f19f2aa1a29d245e3d592aeeb7a868f31ab8
2016-09-22 22:12:03 +00:00
Jaewan Kim
dcbae98c53 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 am: dd883c7e87 am: 832179120f -s ours am: c547eeda12
am: f91952879c

Change-Id: I35d46dce73a7a794906301214f54f743a22b5f6a
2016-09-22 22:11:50 +00:00
Android Build Merger (Role)
2075d8d336 Merge "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 am: b809b1f8aa am: 0471ffa55c am: 0487464b69" into nyc-mr1-dev-plus-aosp 2016-09-22 22:11:47 +00:00
Android Build Merger (Role)
02b5a0579b Merge "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 am: 0e31d93890 am: 4da22f27f6 -s ours am: 36068a2f00 am: 949c938317" into nyc-mr1-dev 2016-09-22 22:11:30 +00:00
Jaewan Kim
55aed3d49a 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 am: 0e31d93890 am: 4da22f27f6 -s ours am: 36068a2f00
am: 949c938317

Change-Id: I49a3b4a43b0f84df33c1f1d4a68d2dea4c44ce8b
2016-09-22 22:10:39 +00:00
Ajay Panicker
de55c4699d 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 am: b809b1f8aa am: 0471ffa55c
am: 0487464b69

Change-Id: I9e6db05f433329af45f21241216c753d6ac212a3
2016-09-22 22:10:38 +00:00
Android Build Merger (Role)
5b396853fb Merge "[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 am: 6ffdf43ec3 am: 5fc21fdbcc am: b2e88d0cb9" into nyc-mr1-dev-plus-aosp 2016-09-22 22:10:20 +00:00