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

(root) / android-x86 / frameworks-base.git / log

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

Elliot Waite [Thu, 22 Sep 2016 02:19:41 +0000 (02:19 +0000)]

Merge "Revert fixed at links." into nyc-dev

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 22:47:30 +0000 (15:47 -0700)]

Revert fixed at links.

This reverts commit c4ae7827e26ab3d0ac340d896c28c166da860fdb.

Change-Id: I65729721ced7fc04d0b9691b63520007adddee29

commit | commitdiff | tree

Jaewan Kim [Wed, 21 Sep 2016 22:53:58 +0000 (22:53 +0000)]

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

Change-Id: I8ec1e339f50ab7d017bcf91cddefc2b0f569c696

commit | commitdiff | tree

Adarsh Fernando [Wed, 21 Sep 2016 22:45:04 +0000 (15:45 -0700)]

Found a couple of more references to Android N.

Bug:31647521
Change-Id: I9f8c40e43cb79656761f237a0f144ab8a9b4c5d5

commit | commitdiff | tree

Adarsh Fernando [Wed, 21 Sep 2016 22:26:48 +0000 (22:26 +0000)]

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

commit | commitdiff | tree

Adarsh Fernando [Wed, 21 Sep 2016 20:56:37 +0000 (13:56 -0700)]

Docs: Cleanup of Preview language in Android 7.0 docs.

bug:31647521
Change-Id: I882f7d7cb5bb1ddcc18ddbc29b17edbbbd84131a

commit | commitdiff | tree

TreeHugger Robot [Wed, 21 Sep 2016 21:46:41 +0000 (21:46 +0000)]

Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev

commit | commitdiff | tree

Fan Zhang [Wed, 21 Sep 2016 15:29:56 +0000 (15:29 +0000)]

Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:13:46 +0000 (04:13 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac am: be2651bb6b am: a7176293fd
am: e60aa74d44 -s ours

Change-Id: Id0fe233f9b700c7b41fe864699b54727108b6ecf

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:02:02 +0000 (04:02 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac am: be2651bb6b
am: a7176293fd

Change-Id: I480a3e8cfc363570ecb10d5cca2b0e1a95472f51

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:44:15 +0000 (03:44 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac
am: be2651bb6b

Change-Id: I7ffc9b61fbfe670a68049b94a05415abec38e36e

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:26:15 +0000 (03:26 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 am: dddb99f020 am: cdf3126615
am: bd752f7d88 -s ours

Change-Id: I5657111479e2ac6df3f856c7a624421e37ec731d

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:23:38 +0000 (03:23 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours
am: 3a20f7ceac

Change-Id: I10c29e499b19e247dedc4e65b3d1d4bd42a7eb03

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:17:36 +0000 (03:17 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d am: 853e39d3d9
am: 232824e01c -s ours

Change-Id: Ic4636b08ecc94720c7b013769436668167b6fca8

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:15:14 +0000 (03:15 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 am: 1682f67177 am: 13ac17ab3a
am: ec220f645f -s ours

Change-Id: If90aff1167803a965e938f9e174ec1df09401b85

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:13:20 +0000 (03:13 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79
am: 3e238e3396 -s ours

Change-Id: I52e1cfccc31b8169eaeb4e4aacc67b97b0e39cec

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:12:09 +0000 (03:12 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 am: dddb99f020
am: cdf3126615

Change-Id: I37fdf0eb48bd07dc07b8716040d2f286304bce70

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:12:02 +0000 (03:12 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09 am: fc7822f58a
am: 93a622150f -s ours

Change-Id: If89cb759ef536ee618a3ab6121fde4e3dbc6dac3

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:10:15 +0000 (03:10 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5
am: fe616288dc -s ours

Change-Id: I858b0c0f7d1b9e723857169bd7f29a55d82e0136

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:56:53 +0000 (02:56 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975
am: dddb99f020

Change-Id: Ie45bd66830e6e3e68be7e3f2692911ea4fa82fa9

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:55:36 +0000 (02:55 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485
am: 95b604ccb5

Change-Id: I78d80c17e2b7a0b6d0d611f738a3b880dd74dab0

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:54:19 +0000 (02:54 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d
am: 853e39d3d9

Change-Id: I1f1f4f44161525bb4ee7fbbcabdd5a6e346d3b8a

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:40:31 +0000 (02:40 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 am: 1682f67177
am: 13ac17ab3a

Change-Id: I495579b3cca396dd5fb6a628bedb5e5be4916b26

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:38:56 +0000 (02:38 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50
am: c147db7a79

Change-Id: I52a9da62a72e21a052561b8aa1760bedb8a4b8c6

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:37:38 +0000 (02:37 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09
am: fc7822f58a

Change-Id: I7b744f3d3c5e816a1722b20bad66b924911b8a36

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:37:35 +0000 (02:37 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours
am: 6b16f71975

Change-Id: I2f7ec847c4d781a80e950c3ede965456163c90f9

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:35:59 +0000 (02:35 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1
am: 3ed9e7693d

Change-Id: Ie6c2f8cf182d0787ffc401800134f30fde903e3b

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:24:44 +0000 (02:24 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77
am: 1682f67177

Change-Id: I75da25a30cc7be28b3a2d332fa5ca7fc18322dfc

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:24:08 +0000 (02:24 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours
am: dcb78c9cf1

Change-Id: I196204c683a0eacbe08103b383dcd9cb1435a43d

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:23:37 +0000 (02:23 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa
am: b2e8361c50

Change-Id: I679522909e4498442cb2e227ac0b7c45fbc47ebf

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:22:08 +0000 (02:22 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev
am: 60bf672485

Change-Id: Iba3b6ff14fdab510e1e0c8fae7298be290e93bf1

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:21:15 +0000 (02:21 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e
am: d46605ab09

Change-Id: Icc3905c1133d4ed3b3ea40f95bde021933adcd02

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 02:15:09 +0000 (02:15 +0000)]

Merge "Fix some at links." into nyc-dev

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:09:09 +0000 (02:09 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113
am: b2094f7c37 -s ours

Change-Id: I202fe25cf207a5063f897d13617fc0a03fe2ca83

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:03:46 +0000 (02:03 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours
am: 0f464f9d77

Change-Id: I0c7d7db1dcc585477d5f7841137b5603270eabe6

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:02:47 +0000 (02:02 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours
am: 2ef2d90eaa

Change-Id: Iff03e10920f3d42246b7b7e2c172ac30b3beaccb

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:01:38 +0000 (02:01 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours
am: afafdff50e

Change-Id: I33b393b32af485c4bb96d723a44e24d1acefaadc

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:00:25 +0000 (02:00 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957
am: cc4fd13113

Change-Id: I0b99176d0bc750dd824f0cd7b9663c87a6424143

commit | commitdiff | tree

Jaewan Kim [Mon, 19 Sep 2016 12:19:55 +0000 (21:19 +0900)]

DO NOT MERGE Check caller for sending media key to global priority session

Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().

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

commit | commitdiff | tree

Jaewan Kim [Mon, 19 Sep 2016 12:19:55 +0000 (21:19 +0900)]

commit | commitdiff | tree

Marie Janssen [Wed, 21 Sep 2016 01:04:28 +0000 (01:04 +0000)]

Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb
am: 0ed17e5c8d

Change-Id: Ie2b6d2008be82b8413ed01e1a51b88ea66ad9f48

commit | commitdiff | tree

Marie Janssen [Wed, 21 Sep 2016 01:02:29 +0000 (01:02 +0000)]

Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048
am: 532d2b11a3

Change-Id: Iee468d3bcfd72b33475e9bf1d51865f3c5e8a4a2

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 01:02:28 +0000 (01:02 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
am: bb9b38b957

Change-Id: I8083cdc24b838d235c83360372afc198c2f9f6c5

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 01:00:49 +0000 (01:00 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b
am: 9a66565324 -s ours

Change-Id: I4b7cfdd5cad8ab054bb1e03279eb27a302c6acc2

commit | commitdiff | tree

TreeHugger Robot [Wed, 21 Sep 2016 00:52:46 +0000 (00:52 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:50:07 +0000 (00:50 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4
am: ef74f3b079 -s ours

Change-Id: I0273945795e743e3508b9691c388b7fd3a32cdbc

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:48:28 +0000 (00:48 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f
am: 1dcec33349 -s ours

Change-Id: Ibc2d0fd88e89b0553cf5c9542457172692271318

commit | commitdiff | tree

Marie Janssen [Wed, 21 Sep 2016 00:47:29 +0000 (00:47 +0000)]

Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3
am: ce8032ebbb

Change-Id: I2e48e99c2e0cd3f1990cb17a4fc672fe312576bd

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:47:16 +0000 (00:47 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55
am: a701b1b6f6 -s ours

Change-Id: Ie8be52ca401883516b0e746ee9211c4a44460e1c

commit | commitdiff | tree

Marie Janssen [Wed, 21 Sep 2016 00:46:01 +0000 (00:46 +0000)]

Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27
am: e3812fc048

Change-Id: I6119aa9db2792a149202c16d63de205ba32423e8

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:44:57 +0000 (00:44 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc
am: cdff42091b

Change-Id: Ib97d5a470acde585ea27a1a3d0050871f644428e

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:40:01 +0000 (00:40 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db
am: b367200be4

Change-Id: I3e9a492bbdecc5335047c1687d2a7a6e8c33025f

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:39:03 +0000 (00:39 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9
am: 7caccc107f

Change-Id: I8587341bb8ec9e42103e4082dfa249e56b773bbb

commit | commitdiff | tree

Marie Janssen [Wed, 21 Sep 2016 00:38:59 +0000 (00:38 +0000)]

Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323
am: e4f60787f3

Change-Id: I598f7cbaa4ff2bddaeb1e08e5eaa062c28ab7c60

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:37:11 +0000 (00:37 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac
am: 0639d05e55

Change-Id: Ic57c43dcd18e09ad860407c16a77662bdd68268b

commit | commitdiff | tree

Marie Janssen [Wed, 21 Sep 2016 00:37:07 +0000 (00:37 +0000)]

Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f
am: 3106e3ae27

Change-Id: I0748eed7b884294d993b4538e4e65397b6f0dbb2

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:36:25 +0000 (00:36 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours
am: 5977c8b5bc

Change-Id: Ia362dd16d6a58e6c9c617fec169ed86b8eea8e50

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:21:20 +0000 (00:21 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours
am: 050b9170db

Change-Id: If64625b574530db5f9d3ce01871fb8ea38ad9ca3

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:20:21 +0000 (00:20 +0000)]

commit | commitdiff | tree

Marie Janssen [Wed, 21 Sep 2016 00:19:16 +0000 (00:19 +0000)]

Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev
am: 22046e7323

Change-Id: I06e960bef8fc2fdacfe9f6e4ecb1e970eb1e7cb4

commit | commitdiff | tree

Marie Janssen [Wed, 21 Sep 2016 00:19:12 +0000 (00:19 +0000)]

Fix setPairingConfirmation permissions issue (2/2)
am: 93326cfd9f

Change-Id: If8fdb8c3f5c167e1b6465c67cf64b8310d55b80b

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:19:02 +0000 (00:19 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours
am: fafa73a8ac

Change-Id: Icecb73a1309bb45994889756f8e421dc6fda76a4

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:17:48 +0000 (00:17 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev
am: 19b09dd0d3 -s ours

Change-Id: Id030cd83f6759c255c1a5cfbea8b90a92610a02d

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:13:03 +0000 (00:13 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
am: 0ea21bc70e -s ours

Change-Id: I24d8a2df435e4df43cc39d0e0314796e53e30429

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:12:20 +0000 (00:12 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours
am: 4f77ca16e4 -s ours

Change-Id: I6be29367b410ffc98e61d49450bb1d9905fbf3f8

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 00:12:13 +0000 (17:12 -0700)]

Fix some at links.

Change-Id: Ia455e7edff115e9c5b8e531c3fe430114aeb3d8e

commit | commitdiff | tree

TreeHugger Robot [Wed, 21 Sep 2016 00:12:03 +0000 (00:12 +0000)]

Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:10:52 +0000 (00:10 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours
am: cb970f408e -s ours

Change-Id: I385bc1700aebf53fb2846a149995925dcb00b5e8

commit | commitdiff | tree

TreeHugger Robot [Wed, 21 Sep 2016 00:07:34 +0000 (00:07 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:04:35 +0000 (00:04 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660
am: 3d995d6f5f -s ours

Change-Id: I9e410ce2d5302eda87aea9628cb58ca203a212c5

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:03:23 +0000 (00:03 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5
am: 3758253ae8 -s ours

Change-Id: I0836ddb1649084a6814c461bccc41135cb475337

commit | commitdiff | tree

Ajay Panicker [Tue, 20 Sep 2016 23:56:48 +0000 (23:56 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e
am: a278a1e660

Change-Id: I22838d21bdd289ca34b78260ade59adafbdc408a

commit | commitdiff | tree

Ajay Panicker [Tue, 20 Sep 2016 23:55:44 +0000 (23:55 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a
am: 271e34dbd5

Change-Id: I954b8f2d9333fa6bb549dc812733d2b8f71220b9

commit | commitdiff | tree

Ajay Panicker [Tue, 20 Sep 2016 23:49:13 +0000 (23:49 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev
am: 204da8aa9e

Change-Id: I0ff3b20fc2f3318070e343dfe6dc29b2979284ef

commit | commitdiff | tree

Ajay Panicker [Tue, 20 Sep 2016 23:49:05 +0000 (23:49 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
am: edae39d59a

Change-Id: I2bdf5c6fc24fd370e2555585e8492558040c0d10

commit | commitdiff | tree

Ajay Panicker [Thu, 8 Sep 2016 18:01:29 +0000 (11:01 -0700)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)

setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.

This is restricted to BLUETOOTH_PRIVILEGED permission.

Bug: 29043989
Change-Id: Iddc935f0b02f5ff56e930914b4b664377e786184

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Sep 2016 23:44:57 +0000 (23:44 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Sep 2016 22:54:27 +0000 (22:54 +0000)]

Merge "Docs: Fix manifest example for ARC" into nyc-dev

commit | commitdiff | tree

Adarsh Fernando [Tue, 20 Sep 2016 20:31:22 +0000 (13:31 -0700)]

Temporary redirect for CMake Variables list.

Change-Id: I7d6fd1afaa342d74bbede2721a6b8d3a2117fb25

commit | commitdiff | tree

Scott Main [Tue, 20 Sep 2016 20:26:09 +0000 (20:26 +0000)]

Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev

commit | commitdiff | tree

Fan Zhang [Tue, 20 Sep 2016 19:22:18 +0000 (12:22 -0700)]

Fix NPE for WifiConfiguration in AccessPoint.

In getSummary methods, make a local reference to WifiConfig before
accessing the fields to prevent member variable mConfig being reset in a
different thread.

Bug: 31617798
Test: manually open/close/refresh wifi settings and see no crash.

Change-Id: I254cb3cb59dead425a9ada17d9e84a7e2974f738

commit | commitdiff | tree

smain@google.com [Mon, 19 Sep 2016 23:19:37 +0000 (16:19 -0700)]

update metadata for the studio landing page cards (for 2.2 content)
edit landing page banner ("a dozen" --> "20")

Change-Id: Iccad4faab12930eac9fe58b5c84ba08d444fbee6

commit | commitdiff | tree

Mary Yanchar [Tue, 20 Sep 2016 18:19:21 +0000 (18:19 +0000)]

Merge "Small change for new sample test code" into nyc-dev

commit | commitdiff | tree

Scott Main [Tue, 20 Sep 2016 16:56:54 +0000 (16:56 +0000)]

Merge changes from topic 'n-versioncode' into nyc-dev

* changes:
A little more on issue #30766518: Document what targeting N does
Cherrypick so we can publish N version code description ASAP

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 08:32:59 +0000 (08:32 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03
am: 1c2e8848dc -s ours

Change-Id: I8ef9e22473b93cc298273be517be4623b9ab1c1f

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 08:28:33 +0000 (08:28 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0
am: 5753af889b -s ours

Change-Id: I29a75431dd445026efde90f13a6e55fa59ec574d

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:34:19 +0000 (06:34 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c
am: badb5f2a03

Change-Id: Ic4099ba4eaac6bb50afe5811eacf85dd7759819c

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:33:24 +0000 (06:33 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492
am: 8d302da986 -s ours

Change-Id: I1c1edf783ae5c466ed8c89978de5d5dfd9adb643

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:32:39 +0000 (06:32 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9
am: 62c6ce4ca0

Change-Id: I1d0c04e3c4382f395d10034343240e1bf4bca68f

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:54:37 +0000 (05:54 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7
am: 7fd31ca09c

Change-Id: I36eecf20e2fc862daba195738363761b27e9fe8f

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:53:17 +0000 (05:53 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc
am: 827f465492

Change-Id: I6113993dcd1aed053e5755deca2b115f5df8c5bd

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:51:05 +0000 (05:51 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea
am: 71bb55afd9

Change-Id: Id9ccdcb6bad4eddb355f2035049361c66a3a5f15

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:34:00 +0000 (05:34 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09
am: 8fedc773fc

Change-Id: I389e25a4d5bc24761cc7c2c9e94e45e5e6158453

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:23:59 +0000 (05:23 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours
am: 29e4cd66d7

Change-Id: Ib64a0085bfdb4a8e0a4d8d4b69b7434a0f8fdd4e

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:14:33 +0000 (05:14 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours
am: 1310d53aea

Change-Id: If01f2017d66da002d7e01fb28ffd49f0e84319d1

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:06:22 +0000 (05:06 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours
am: b235bc6f09

Change-Id: Id2d98d2f695f8884b5854e8fb1fbf406fda8fdb0

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 04:42:51 +0000 (04:42 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071
am: 3c7e989835 -s ours

Change-Id: Ieb72c957f1d58cea635bcd7b9449b19b3341efc8

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help