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

OSDN Git Service

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

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 05:43:52 +0000 (05:43 +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 am: e053061edd
am: 6ac86ae1db

Change-Id: I3d6994fffb88ca8ba49cb3efa321493661ab33d2

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 05:41:26 +0000 (05:41 +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 am: da12b4b0f0
am: 71831be462

Change-Id: I83dc1f6eee420b9aa655f32e70f5a5c618bd552d

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 05:40:01 +0000 (05:40 +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 am: 257cf16de3
am: c96f655395

Change-Id: I844fa87398b64854c7655d43339887ea2a7a56ee

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 05:06:53 +0000 (05:06 +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
am: e053061edd

Change-Id: I3b271244a7be75f7f652f8192ba337352d946462

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:16:27 +0000 (04:16 +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 am: e460ea15e6
am: b9cfbef8db

Change-Id: I5cd4c1be5362d2d0500afa29ffddc20a541e6ee5

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:14:28 +0000 (04:14 +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
am: da12b4b0f0

Change-Id: I9cf2a8223db41299b5c4089437a0ff3cc14418e4

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:14:26 +0000 (04:14 +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 am: 998001b4b2
am: d9421e7758

Change-Id: Ifd0e426285b9242ed9b0a1c3f72d82bad8fc9e02

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:13:25 +0000 (04:13 +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
am: 257cf16de3

Change-Id: I1677fdf4dcfe9fe96de22f4cdfb67225b4d86a2e

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:12:11 +0000 (04: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 am: 834f982c97
am: 51c046dae8

Change-Id: I2c10dde1ac9c511ed21d7a7b2e97d1f7de4d9d0e

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:30:43 +0000 (03:30 +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
am: e460ea15e6

Change-Id: I37c93b23735ea728ce5cfd77ae930f6834a6cfe5

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:27:48 +0000 (03:27 +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
am: 998001b4b2

Change-Id: I3fa54c60c1172c2e934fa8887413c3767f82e6d6

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:25:07 +0000 (03:25 +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
am: 834f982c97

Change-Id: I01516b02b44a32a1f140143ef118f623905fca1e

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

Elliot Waite [Wed, 21 Sep 2016 03:12:54 +0000 (03:12 +0000)]

Merge "Fix some at links." into nyc-dev am: edc31f9593
am: 7072b952c8

Change-Id: I379a5a75cc2fc85a1520ea45b3e1cbd0674ad199

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

Elliot Waite [Wed, 21 Sep 2016 03:11:58 +0000 (03:11 +0000)]

Fix some at links. am: 28d87163e1
am: f3bbfdaf9d

Change-Id: I6f0e9b8702c4a09bbe3c752077a8d9e164c61d2e

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

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

Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev

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

Elliot Waite [Wed, 21 Sep 2016 02:38:10 +0000 (02:38 +0000)]

Merge "Fix some at links." into nyc-dev
am: edc31f9593

Change-Id: I01ae10ce4ee5f0e224bd0ceb36c8e3dffb6c5aff

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 02:38:06 +0000 (02:38 +0000)]

Fix some at links.
am: 28d87163e1

Change-Id: I90f11e3705c546a8d37cf67a2b4de0a379497568

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

Marie Janssen [Wed, 21 Sep 2016 02:26:05 +0000 (02:26 +0000)]

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

Change-Id: I92c466da144a731bab41e829ba1ad29fbbf789f7

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

Marie Janssen [Wed, 21 Sep 2016 02:24:18 +0000 (02:24 +0000)]

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

Change-Id: If850d33567371bc2a9bd4e2394b90ea84066b602

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

TreeHugger Robot [Wed, 21 Sep 2016 02:16:31 +0000 (02:16 +0000)]

Merge "Improve Javadoc for AnimatedVectorDrawable" into nyc-mr1-dev

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

TreeHugger Robot [Wed, 21 Sep 2016 01:45:49 +0000 (01:45 +0000)]

Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev

commit | commitdiff | tree

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

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

Change-Id: I410c28139316f4b9bef378d73ad8e39f83ae21df

commit | commitdiff | tree

Marie Janssen [Wed, 21 Sep 2016 01:32:37 +0000 (01:32 +0000)]

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

Change-Id: Idc9352afe667bb8be4846dc53036e95af2b248ce

commit | commitdiff | tree

Felipe Leme [Fri, 9 Sep 2016 00:26:00 +0000 (17:26 -0700)]

Listen to ACTION_UID_REMOVED only. DO NOT MERGE.

NMPS was listening to both ACTION_UID_REMOVED and
ACTION_PACKAGE_REMOVED, which not only was redundant but would also
cause problems when a package with shared UIDs was removed.

Fixes: 31375684

Change-Id: Iec006dbbec0e6298f1e568cbf81ed3672f61b7d2
(cherry picked from commit fdebbea401dc9d38b0cbea0fdfbd758e16805358)

commit | commitdiff | tree

Jeff Sharkey [Wed, 21 Sep 2016 01:08:15 +0000 (01:08 +0000)]

Merge "Check if anyone could possibly provide service." into nyc-mr1-dev

commit | commitdiff | tree

Erik Kline [Wed, 21 Sep 2016 01:05:31 +0000 (01:05 +0000)]

Merge "Handle more commands in StoppingState" into nyc-mr1-dev

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

Doris Liu [Fri, 16 Sep 2016 22:36:46 +0000 (15:36 -0700)]

Improve Javadoc for AnimatedVectorDrawable

This CL adds a summary of what developers can expect from running
AVD on RenderThread.

Also re-structure the class level Javadoc summary to better organize
the examples.

Test: make offline-sdk-docs

BUG: 30402908
Change-Id: I7111f67db5f2ec352730f633bb34f2e89e1c70e9

commit | commitdiff | tree

Jaewan Kim [Wed, 21 Sep 2016 00:36:10 +0000 (00:36 +0000)]

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

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

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

Change-Id: I8a13167984a898e726953d6a80694786d120015b

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

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

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

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

Jeff Sharkey [Tue, 20 Sep 2016 23:20:17 +0000 (17:20 -0600)]

Check if anyone could possibly provide service.

If no service is present that could satisfy a given ServiceWatcher,
then return false. For example, on devices were there is no Geocoder
service implementation, we need to avoid claiming that the API is
supported.

Test: booted
Bug: 30837973
Change-Id: Ib0834cf1a12623733f8b472dc3da7b3e2adc4515

commit | commitdiff | tree

Josh Horwich [Tue, 20 Sep 2016 23:08:56 +0000 (23:08 +0000)]

Merge "Docs: Fix manifest example for ARC" into nyc-dev am: 7980e4522e
am: df80f760c0

Change-Id: I23ff226d42c2f51f433ed8b58cf0835927c7dda1

commit | commitdiff | tree

Josh Horwich [Tue, 20 Sep 2016 23:07:45 +0000 (23:07 +0000)]

Docs: Fix manifest example for ARC am: 8960d0a712
am: cf3ba02ac2

Change-Id: Ia029f9848a8230d692ee1464917b8ec02eb2e1c4

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Sep 2016 23:00:33 +0000 (23:00 +0000)]

Merge "Removing private system ui flags from status bar flags logic." into nyc-mr1-dev

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.