git.osdn.net Git - android-x86/frameworks-base.git/log

Scott Main [Thu, 22 Sep 2016 16:57:45 +0000 (16:57 +0000)]

Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
am: 8b05feb5b4

Change-Id: Ib2367374818a66cb257ab772204dc1be79e47242

commit | commitdiff | tree

Adarsh Fernando [Thu, 22 Sep 2016 16:57:42 +0000 (16:57 +0000)]

Removing a temporary redirect for /ndk/guides/cmake.html
am: dafcbfa693

Change-Id: I8c190be258c96b33d31b400f6c935a4a40fe722e

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 16:38:14 +0000 (16:38 +0000)]

[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

Change-Id: I017086383136e5a16bc5328046781bc584043f6c

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 16:37:06 +0000 (16:37 +0000)]

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

Change-Id: I93fc78c253458ec31b7ea34e34c3124bf7f557b7

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 16:35:42 +0000 (16:35 +0000)]

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

Change-Id: If9781b819c9baa55597daaf2ed03b2886739f56e

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 16:34:39 +0000 (16:34 +0000)]

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

Change-Id: I9159be101773b421df3b23ec02d0f7ec8cb64b4a

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 16:33:47 +0000 (16:33 +0000)]

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

Change-Id: I1eb3eba4342a7af62ebbc3a9f4e90e58b5adcac2

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 16:32:31 +0000 (16:32 +0000)]

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

Change-Id: Ib205c5e83f800dbb2a41b812fc0840f2b4029874

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 16:31:34 +0000 (16:31 +0000)]

[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: I3b8c695133c8631e7f058b9fd26da13d69d23735

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 16:30:28 +0000 (16:30 +0000)]

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: I35793a0332aaeb572a288d7806aed2bc43879dab

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 16:06:27 +0000 (16:06 +0000)]

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

Change-Id: I2486a6238a2595d7bd84b31916e22987ea2f98d5

commit | commitdiff | tree

Scott Main [Thu, 22 Sep 2016 15:22:38 +0000 (15:22 +0000)]

Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 14:48:37 +0000 (14:48 +0000)]

[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

Change-Id: Ic3f72935e96e7b6f7b3a69474451d3edd418dd24

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 14:24:38 +0000 (14:24 +0000)]

[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: I92ec98b22ea071df0a24d19f8a6bb4523606089d

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 14:23:38 +0000 (14:23 +0000)]

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

Change-Id: I5e9cb821711f13d536af5d3d5d42595f0e286559

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 14:22:50 +0000 (14:22 +0000)]

[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

Change-Id: Ib0ef4b276401795bbe64b35cf4caa9a173eaec21

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 13:58:30 +0000 (13:58 +0000)]

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

Change-Id: I71157581308c3ef4be7dad8db5c7d9a637a24320

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 13:57:14 +0000 (13:57 +0000)]

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: Ife5fa9fb43fb28eb8e71a7707c846c58d18478b4

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 13:33:07 +0000 (13:33 +0000)]

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

Change-Id: Ia40c8390390d5612ad53c649d14516871bfba8e9

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 13:32:52 +0000 (13:32 +0000)]

[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

Change-Id: I6d48f72f00bd10d6013753db78883cec67c68568

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 13:31:57 +0000 (13:31 +0000)]

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

Change-Id: I1db1ad50bfd89c038f9d226109958011aeb1496e

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 13:10:13 +0000 (13:10 +0000)]

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

Change-Id: I0a316929c7654f89e435ac459bc9175434136f99

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 12:29:19 +0000 (12:29 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 12:28:51 +0000 (12:28 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 11:58:28 +0000 (11:58 +0000)]

[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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 11:22:51 +0000 (11:22 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 11:21:01 +0000 (11:21 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 10:59:39 +0000 (10:59 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 10:58:44 +0000 (10:58 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 10:57:53 +0000 (10:57 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 10:56:50 +0000 (10:56 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 10:55:43 +0000 (10:55 +0000)]

[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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 10:54:53 +0000 (10:54 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 10:53:39 +0000 (10:53 +0000)]

[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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 10:52:37 +0000 (10:52 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 10:52:34 +0000 (10:52 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 10:50:05 +0000 (10:50 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 09:53:30 +0000 (09:53 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Sep 2016 09:53:00 +0000 (09:53 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 09:38:16 +0000 (09:38 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 09:38:13 +0000 (09:38 +0000)]

[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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 09:38:13 +0000 (09:38 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 09:37:34 +0000 (09:37 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 09:35:44 +0000 (09:35 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 09:14:33 +0000 (09:14 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 09:13:35 +0000 (09:13 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 09:13:26 +0000 (09:13 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 09:13:22 +0000 (09:13 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 09:13:16 +0000 (09:13 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 08:45:58 +0000 (08:45 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 08:45:03 +0000 (08:45 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 08:08:16 +0000 (08:08 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 08:07:35 +0000 (08:07 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 08:07:29 +0000 (08:07 +0000)]

DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c
am: 27d24e01cb -s ours

Change-Id: Ibfec9c02db97a94476d1b6b4d7e98fd051d4aa58

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 08:07:17 +0000 (08:07 +0000)]

Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586
am: b38fbf9894

Change-Id: I6f6d600544f09aac349a626e3ced18de5e02a2eb

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 08:07:15 +0000 (08:07 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 08:06:50 +0000 (08:06 +0000)]

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 08:06:16 +0000 (08:06 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 08:05:11 +0000 (08:05 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 08:03:19 +0000 (08:03 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 07:39:22 +0000 (07:39 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 07:38:34 +0000 (07:38 +0000)]

[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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 07:37:44 +0000 (07:37 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 07:36:50 +0000 (07:36 +0000)]

[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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 07:35:45 +0000 (07:35 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 07:35:37 +0000 (07:35 +0000)]

DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27
am: 9477c1674c

Change-Id: If2edd8d386cd57f00221fedff3f118e6887cab61

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 07:34:55 +0000 (07:34 +0000)]

DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98
am: ff1c1993b7

Change-Id: I60355987ea0814314c2f79041d068e099b158c7b

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 06:41:03 +0000 (06:41 +0000)]

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

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 06:41:02 +0000 (06:41 +0000)]

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

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 06:40:05 +0000 (06:40 +0000)]

DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776
am: 2d88f87a82

Change-Id: Idd9cdf4bb14b4feced73ea176f3505ae02d630e7

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 06:39:33 +0000 (06:39 +0000)]

Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev
am: 5b05226586

Change-Id: I0b0b672c42a7a4bd75ccbeb2c3a1047eebda5076

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 06:39:24 +0000 (06:39 +0000)]

DO NOT MERGE Check caller for sending media key to telephony service
am: d1641e8c27

Change-Id: I5be1d931c3a2f2748e69158d442172c327199ef5

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 06:10:41 +0000 (06:10 +0000)]

[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

Import translations. DO NOT MERGE

Change-Id: I2ebb252040d261a9ce7dc01d080b9cc82c644533
Auto-generated-cl: translation import

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 05:19:34 +0000 (05:19 +0000)]

Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 04:58:44 +0000 (04:58 +0000)]

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

Change-Id: I05d4bdc92834197058c77ae31113c9783b558d8e

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 04:57:53 +0000 (04:57 +0000)]

[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

Change-Id: Ic23e1121dda4b85e5064c8d47a142da41617f321

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 04:57:01 +0000 (04:57 +0000)]

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

Change-Id: Ib333fdba81a5c339bc9b55fa3055a73a3b6042a7

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 04:56:04 +0000 (04:56 +0000)]

[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

Change-Id: Ia62f75205e5d8406249991175fc5cf66d1f2bdb9

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 04:55:18 +0000 (04:55 +0000)]

Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13
am: 78fa55e261

Change-Id: I81587010e753fd1f23a530c973675fe0790b8b33

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 04:54:32 +0000 (04:54 +0000)]

[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

Change-Id: Ia1485d87e224d8fb870b50bc73f4ee6e93dd48e4

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 04:54:25 +0000 (04:54 +0000)]

DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106
am: 868d586c98

Change-Id: Icc7c4e12e75f5b27c41866fcb8d8553fcffd90ab

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 04:29:59 +0000 (04:29 +0000)]

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

Change-Id: I9f76004fe1ef3b54b187414281874f34e2ff4dc8

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 04:29:01 +0000 (04:29 +0000)]

DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours
am: 30d1440861

Change-Id: I000e899b41a1a88a2d68a3d554b3d2f6045aa0d2

commit | commitdiff | tree

Jaewan Kim [Wed, 21 Sep 2016 02:20:54 +0000 (11:20 +0900)]

DO NOT MERGE Check caller for sending media key to telephony service

Prevent sending media key events from the non-system app to the
telephony service through the AudioManager.dispatchMediaKeyEvent()
or sending media key broadcast directly.

Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 03:50:02 +0000 (03:50 +0000)]

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

Change-Id: I75e0e5a61d15b2e6c4a1fec70b807165c8768987

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 03:49:50 +0000 (03:49 +0000)]

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

Change-Id: Ie0629a3b6f4c5fd8166bb060673606878f00bef8

commit | commitdiff | tree

Elliot Waite [Thu, 22 Sep 2016 03:49:12 +0000 (03:49 +0000)]

Merge "Revert fixed at links." into nyc-dev
am: c77b72f244

Change-Id: I2ee03bed08613ad562cd62fdae1c1bc526c10be4

commit | commitdiff | tree

Elliot Waite [Thu, 22 Sep 2016 03:49:08 +0000 (03:49 +0000)]

Revert fixed at links.
am: 7c70fed347

Change-Id: I69a15936193917911224af7f417b16d30dd8dfe4

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 03:48:56 +0000 (03:48 +0000)]

[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

Change-Id: I8693bc42cd9ff46f6b0c56db49a5c467b3ab4af0

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 03:48:40 +0000 (03:48 +0000)]

[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f
am: 438cc52ca1 -s ours

Change-Id: Iabaa5642ffa6c3417b5e027e2da9b33666b1aacf

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 03:48:37 +0000 (03:48 +0000)]

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

Change-Id: Ic367544242a4034b66f03568eb7d1035f90836dd

commit | commitdiff | tree

Adarsh Fernando [Thu, 22 Sep 2016 03:48:21 +0000 (03:48 +0000)]

Found a couple of more references to Android N.
am: 9af57aa309

Change-Id: I2a72b761fdb8fddbda7aca792a08c851595b29ac

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 03:47:58 +0000 (03:47 +0000)]

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

Change-Id: Id42caaa08c4e933cf0d08bfe7c8271f2cdd40c76

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 03:47:42 +0000 (03:47 +0000)]

DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca
am: 6bf115121c -s ours

Change-Id: Ic25670f851a72e8be2b028016ac4515c8977d349

commit | commitdiff | tree

Adarsh Fernando [Thu, 22 Sep 2016 03:47:02 +0000 (03:47 +0000)]

Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
am: fe060d3f37

Change-Id: I4c7c2363cea058a1b905b07826ffba5a4439f833

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 03:47:01 +0000 (03:47 +0000)]

[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours
am: c56c079470

Change-Id: Ie03995ef39bce15b5279ff78ef23e94401eab9db

commit | commitdiff | tree

Adarsh Fernando [Thu, 22 Sep 2016 03:46:55 +0000 (03:46 +0000)]

Docs: Cleanup of Preview language in Android 7.0 docs.
am: 4b6d939321

Change-Id: Ife2fba8fa61083ccaf2c3f4a3df88418bd0a316b

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 03:23:14 +0000 (03:23 +0000)]

Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c
am: e47b5adce2

Change-Id: Ie35fa2ebffc5f5369b1473f78c0bfeb38fdfc5ca

commit | commitdiff | tree

Jaewan Kim [Thu, 22 Sep 2016 03:22:18 +0000 (03:22 +0000)]

DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267
am: 709d112eca

Change-Id: Ic112856078e6b3c0bd4e6e2442457c3be035a253