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

Ajay Panicker [Wed, 21 Sep 2016 05:37:27 +0000 (05: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 am: 93a622150f -s ours am: 834f982c97 am: 51c046dae8 am: a33da80306
am: f64b5f0fc8

Change-Id: If177838a329d61646a6a6f0548b2e33246f9961b

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 05:30:47 +0000 (05:30 +0000)]

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

Change-Id: Ibba63021169cae7b5cfda75d6e3f9f270f67dcd4

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 05:29:33 +0000 (05:29 +0000)]

Fix some at links. am: 28d87163e1 am: f3bbfdaf9d am: 5c8bd2598d
am: 4b332ffd9f

Change-Id: I1b885fe640837f390ca7a80ecafa0fa45f3bfc50

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 05:21:16 +0000 (05: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 am: fc7822f58a am: 93a622150f -s ours am: 834f982c97 am: 51c046dae8
am: a33da80306

Change-Id: I930c52f0167d227766206a6e32712c214ed7855d

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:16:40 +0000 (04:16 +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: 2828cb3246

Change-Id: Ied4e9ddfaf9893b62d7344ad5a46f5fc70597172

commit | commitdiff | tree

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

Change-Id: I9fcf88e8003b1a3e116c70d9ec2930805c641f5c

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 04:14:16 +0000 (04:14 +0000)]

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

Change-Id: I3221f5ac3e141cdb8379c41ebc64b6d10ff4bc19

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 04:13:16 +0000 (04:13 +0000)]

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

Change-Id: I2fa802d2e0db99ca0abe2cb3f3ac98c0b5aa9bb5

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:12:42 +0000 (04: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 am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79 am: 3e238e3396 -s ours am: 998001b4b2
am: 04ff2b888b

Change-Id: Id379950f8915de393c76d1a8af498323eecb8a98

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:10:34 +0000 (04:10 +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: af280fb4c1

Change-Id: I299e2ed9a34061721634640fc9abf2d9677edda3

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:52:52 +0000 (03:52 +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: Id2ba962d9bb6341fab608b8c19fe295c7bddaaa8

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:50:33 +0000 (03:50 +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: I13e1a58832d60fb8b89c8cc32f51de3dc5e19210

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:48:17 +0000 (03: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 am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79 am: 3e238e3396 -s ours
am: 998001b4b2

Change-Id: Idce49a38c881ce3b41e29e01665b1b0135bd76f5

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 21 Sep 2016 03:46:29 +0000 (03:46 +0000)]

Merge "Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev am: 1bae4e3e17 am: 0e4b6eb3fd" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 21 Sep 2016 03:46:10 +0000 (03:46 +0000)]

Merge "Merge "Fix some at links." into nyc-dev am: edc31f9593 am: 2b5e6d1551" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Wed, 21 Sep 2016 03:45:36 +0000 (03:45 +0000)]

Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev am: 1bae4e3e17
am: 0e4b6eb3fd

Change-Id: I4e08d5b26514b9b9e7482073623a930bc1fcc830

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:45:35 +0000 (03:45 +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: Ied7524231b911717f832c226b5cda10c53275fb7

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 03:45:20 +0000 (03:45 +0000)]

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

Change-Id: Id50d30d97a692b9215dc2a1129e15010cbc59464

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 21 Sep 2016 03:45:15 +0000 (03:45 +0000)]

Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE. am: f1da90fe04 am: b63481d64c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Wed, 21 Sep 2016 03:44:34 +0000 (03:44 +0000)]

Listen to ACTION_UID_REMOVED only. DO NOT MERGE. am: f1da90fe04
am: b63481d64c

Change-Id: I811a94ec8906e83c235c84952f64c741a1f6e72e

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 03:44:22 +0000 (03:44 +0000)]

Fix some at links. am: 28d87163e1
am: 13145b6f9a

Change-Id: I3e0108bdaa9dc3452251d2cdf0a709ad9e2825b6

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 03:26:01 +0000 (03:26 +0000)]

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

Change-Id: I0a4fa551123a46f3de8323deca72f6582ecba33a

commit | commitdiff | tree

Elliot Waite [Wed, 21 Sep 2016 03:25:49 +0000 (03:25 +0000)]

Fix some at links.
am: 28d87163e1

Change-Id: Ibaa18eee9bf406eccda03e3b5425f72b8fb51037

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

Marie Janssen [Wed, 21 Sep 2016 03:14:07 +0000 (03:14 +0000)]

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

Change-Id: If6c8ab5479b950eb7473edfe8d5ed2a02beeb865

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

Marie Janssen [Wed, 21 Sep 2016 03:12:23 +0000 (03:12 +0000)]

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

Change-Id: Ia5a750eab904baebf042b43ef5eb8f63d99f1881

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

Doris Liu [Wed, 21 Sep 2016 03:11:17 +0000 (03:11 +0000)]

Merge "Improve Javadoc for AnimatedVectorDrawable" into nyc-mr1-dev am: 85973e91d2
am: ef2dafbbe4

Change-Id: I96ba5e572739fc3196feb7e558e407807363d6bc

commit | commitdiff | tree

Felipe Leme [Wed, 21 Sep 2016 03:09:16 +0000 (03:09 +0000)]

Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev
am: 1bae4e3e17

Change-Id: I7e0677a20b59ef8449ec2318292cf7afff7c5115

commit | commitdiff | tree

Felipe Leme [Wed, 21 Sep 2016 03:09:13 +0000 (03:09 +0000)]

Listen to ACTION_UID_REMOVED only. DO NOT MERGE.
am: f1da90fe04

Change-Id: I6a555cc1572add73e467a829271909aade5ca1e3

commit | commitdiff | tree

Marie Janssen [Wed, 21 Sep 2016 02:57:35 +0000 (02:57 +0000)]

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

Change-Id: I8125e8c8d043d1b9a7e41ce4aaa829dd0427ca23

commit | commitdiff | tree

Doris Liu [Wed, 21 Sep 2016 02:56:51 +0000 (02:56 +0000)]

Improve Javadoc for AnimatedVectorDrawable am: 7d76fc4433
am: f6088e45e0

Change-Id: I8124dbe734afc7d1876e2228aad69a653fb3e469

commit | commitdiff | tree

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

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

Change-Id: I872dcd022b298f3f441a9d2315b3ec967e0af5bd

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

Doris Liu [Wed, 21 Sep 2016 02:37:40 +0000 (02:37 +0000)]

Merge "Improve Javadoc for AnimatedVectorDrawable" into nyc-mr1-dev
am: 85973e91d2

Change-Id: I4d1369f3ff89fe99ae8649867c36d3a132af4211

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

Doris Liu [Wed, 21 Sep 2016 02:37:37 +0000 (02:37 +0000)]

Improve Javadoc for AnimatedVectorDrawable
am: 7d76fc4433

Change-Id: I930323ef0e9a058ebb916d68404dfb36e2e14421

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

Android Build Merger (Role) [Wed, 21 Sep 2016 02:26:03 +0000 (02:26 +0000)]

Merge changes from topic 'am-15128313c71649e3bd36a27ab8405fce' into nyc-mr1-dev-plus-aosp

* changes:
Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev am: 3ef3f62fa5 am: 9730f8bae2
Added new config to indicate uneditable APN fields. am: 71e9ea6770 am: 49985fb986

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

Amit Mahajan [Wed, 21 Sep 2016 02:24:15 +0000 (02:24 +0000)]

Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev am: 3ef3f62fa5
am: 9730f8bae2

Change-Id: I57be82638f7a1de97a066e3b8a1ad3dd971f6c6d

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

Amit Mahajan [Wed, 21 Sep 2016 02:22:35 +0000 (02:22 +0000)]

Added new config to indicate uneditable APN fields. am: 71e9ea6770
am: 49985fb986

Change-Id: I7bf6c7c5c3b107639217f0a81b4d1a9f5f638a02

commit | commitdiff | tree

Marie Janssen [Wed, 21 Sep 2016 02:22:11 +0000 (02:22 +0000)]

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

Change-Id: Ifba32cf89392b19034ed0c88c9d02f48bc5e4852

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

Marie Janssen [Wed, 21 Sep 2016 02:20:22 +0000 (02:20 +0000)]

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

Change-Id: I695df247f11b6bce15d3f771e4cc2edfd7c86f10

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

Amit Mahajan [Wed, 21 Sep 2016 02:11:54 +0000 (02:11 +0000)]

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

Change-Id: I661a3dcd183b3a5d13b55ca2848aa166314293fc

commit | commitdiff | tree

Amit Mahajan [Wed, 21 Sep 2016 02:11:36 +0000 (02:11 +0000)]

Added new config to indicate uneditable APN fields.
am: 71e9ea6770

Change-Id: I1b9fc2ea6fac58547a4f1ac31e32bfbc412dc248

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

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

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

Change-Id: Iad8274630b38aa53c565e4229dfcb1904593fdd1

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Wed, 21 Sep 2016 01:59:56 +0000 (01:59 +0000)]

Merge "Check if anyone could possibly provide service." into nyc-mr1-dev am: 7da2a0c571
am: d77b0309ac

Change-Id: I3fcd5820274f063d57ee9f787190c2ff79fec6d0

commit | commitdiff | tree

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

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

Change-Id: I88928de86c08a148b3124c616b309862da1a1c24

commit | commitdiff | tree

Jeff Sharkey [Wed, 21 Sep 2016 01:58:39 +0000 (01:58 +0000)]

Check if anyone could possibly provide service. am: f6e9b95127
am: 0e928ee97b

Change-Id: I1085fe70088698fd7d31b1b5fe4d6af05765ecf8

commit | commitdiff | tree

Erik Kline [Wed, 21 Sep 2016 01:57:22 +0000 (01:57 +0000)]

Merge "Handle more commands in StoppingState" into nyc-mr1-dev am: 9ed777d03d
am: 6569c05f02

Change-Id: If26e1f3416b5b3df41bdec8829faed047bfcebd6

commit | commitdiff | tree

Erik Kline [Wed, 21 Sep 2016 01:56:18 +0000 (01:56 +0000)]

Handle more commands in StoppingState am: 8ec1dc8117
am: 103eeee194

Change-Id: I1681625323463bf2be87ea7072fb8b570b4b4ab8

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

Jeff Sharkey [Wed, 21 Sep 2016 01:23:59 +0000 (01:23 +0000)]

Merge "Check if anyone could possibly provide service." into nyc-mr1-dev
am: 7da2a0c571

Change-Id: I0ab4324716288dc5bebed438e03e2f7381d714f2

commit | commitdiff | tree

Jeff Sharkey [Wed, 21 Sep 2016 01:23:55 +0000 (01:23 +0000)]

Check if anyone could possibly provide service.
am: f6e9b95127

Change-Id: I979716e66e6b5ca068e4a0de3cf2432cbbf25c37

commit | commitdiff | tree

Erik Kline [Wed, 21 Sep 2016 01:22:34 +0000 (01:22 +0000)]

Merge "Handle more commands in StoppingState" into nyc-mr1-dev
am: 9ed777d03d

Change-Id: I3a00c9b514620fd29fc30ab907406c2137347808

commit | commitdiff | tree

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

Handle more commands in StoppingState
am: 8ec1dc8117

Change-Id: I24cbb5187f82044d4f319bdb59c562854d39d374

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

Jaewan Kim [Wed, 21 Sep 2016 01:01:52 +0000 (01:01 +0000)]

Merge "Check caller for sending media key to global priority session" into nyc-mr1-dev am: c78afedc91
am: 97db8c04c7

Change-Id: Id966270566bb3e339332434214692e6b211e2c0b

commit | commitdiff | tree

Jaewan Kim [Wed, 21 Sep 2016 01:00:53 +0000 (01:00 +0000)]

Check caller for sending media key to global priority session am: d409d18686
am: 419aeae678

Change-Id: I8e4ad81d9e4a40cc99f913e7e22ce22be88e7406

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

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

Jaewan Kim [Wed, 21 Sep 2016 00:50:07 +0000 (00:50 +0000)]

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

Change-Id: I8c42ef0f5a1489078c01535a78188b2348543855

commit | commitdiff | tree

Jaewan Kim [Wed, 21 Sep 2016 00:50:04 +0000 (00:50 +0000)]

Check caller for sending media key to global priority session
am: d409d18686

Change-Id: I533ac492152a3aee906d3bf09df9dd965e1213bf

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

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

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