Fan Zhang
32bd448cc1
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
2016-09-21 15:29:59 +00:00
Lorenzo Colitti
488ca21f0a
Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev
...
am: 4813790d95
2016-09-21 09:47:33 +00:00
Lorenzo Colitti
caf1f0bf0e
Rematch wifi networks when the avoid bad wifi setting changes.
...
am: 836d8788a8
2016-09-21 09:47:28 +00:00
Lorenzo Colitti
4813790d95
Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev
2016-09-21 09:42:08 +00:00
Lorenzo Colitti
836d8788a8
Rematch wifi networks when the avoid bad wifi setting changes.
...
Currently, when the avoid bad wifi setting changes, we rematch
all networks and requests, but do not update any NetworkFactories
with new scores. This means that if a wifi network's score goes
down as a result of enabling bad wifi avoidance, we will not look
for another network (e.g., cell data) to satisfy its requests.
This makes it so that when the user enables avoiding bad wifi,
we will attempt to bring up cell data will if it is not already
connected.
Bug: 31075769
Change-Id: Ie5b685be8676999adea8c9ecbbc1abb92f81a74f
2016-09-21 15:10:14 +09:00
Ajay Panicker
9030016e5f
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
2016-09-21 05:43:52 +00:00
Ajay Panicker
89024c7477
[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
2016-09-21 05:41:26 +00:00
Ajay Panicker
4a496b0810
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
2016-09-21 05:40:01 +00:00
Ajay Panicker
6ac86ae1db
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
2016-09-21 05:06:53 +00:00
Ajay Panicker
7b11b2deff
[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
2016-09-21 04:16:27 +00:00
Ajay Panicker
71831be462
[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
2016-09-21 04:14:28 +00:00
Ajay Panicker
48f906c852
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
2016-09-21 04:14:26 +00:00
Ajay Panicker
e053061edd
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
2016-09-21 04:13:46 +00:00
Ajay Panicker
c96f655395
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
2016-09-21 04:13:25 +00:00
Ajay Panicker
a33da80306
[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
2016-09-21 04:12:11 +00:00
Ajay Panicker
e60aa74d44
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
2016-09-21 04:02:02 +00:00
Ajay Panicker
a7176293fd
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
2016-09-21 03:44:15 +00:00
Ajay Panicker
b9cfbef8db
[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
2016-09-21 03:30:43 +00:00
Ajay Panicker
d9421e7758
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
2016-09-21 03:27:48 +00:00
Ajay Panicker
da12b4b0f0
[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
2016-09-21 03:26:15 +00:00
Ajay Panicker
51c046dae8
[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
2016-09-21 03:25:07 +00:00
Ajay Panicker
be2651bb6b
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours
...
am: 3a20f7ceac
2016-09-21 03:23:38 +00:00
Ajay Panicker
257cf16de3
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
2016-09-21 03:17:36 +00:00
Ajay Panicker
e460ea15e6
[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
2016-09-21 03:15:14 +00:00
Ajay Panicker
998001b4b2
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
2016-09-21 03:13:20 +00:00
Elliot Waite
00be401c1d
Merge "Fix some at links." into nyc-dev am: edc31f9593
...
am: 7072b952c8
2016-09-21 03:12:54 +00:00
Ajay Panicker
bd752f7d88
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 am: dddb99f020
...
am: cdf3126615
2016-09-21 03:12:09 +00:00
Ajay Panicker
834f982c97
[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
2016-09-21 03:12:02 +00:00
Elliot Waite
5c8bd2598d
Fix some at links. am: 28d87163e1
...
am: f3bbfdaf9d
2016-09-21 03:11:58 +00:00
Ajay Panicker
3a20f7ceac
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5
...
am: fe616288dc
2016-09-21 03:10:15 +00:00
Ajay Panicker
cdf3126615
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975
...
am: dddb99f020
2016-09-21 02:56:53 +00:00
Ajay Panicker
fe616288dc
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485
...
am: 95b604ccb5
2016-09-21 02:55:36 +00:00
Ajay Panicker
232824e01c
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
2016-09-21 02:54:19 +00:00
TreeHugger Robot
1bae4e3e17
Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE." into nyc-mr1-dev
2016-09-21 02:46:08 +00:00
Ajay Panicker
ec220f645f
[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
2016-09-21 02:40:31 +00:00
Ajay Panicker
3e238e3396
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
2016-09-21 02:38:56 +00:00
Elliot Waite
7072b952c8
Merge "Fix some at links." into nyc-dev
...
am: edc31f9593
2016-09-21 02:38:10 +00:00
Elliot Waite
f3bbfdaf9d
Fix some at links.
...
am: 28d87163e1
2016-09-21 02:38:06 +00:00
Ajay Panicker
93a622150f
[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
2016-09-21 02:37:38 +00:00
Ajay Panicker
dddb99f020
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours
...
am: 6b16f71975
2016-09-21 02:37:35 +00:00
Ajay Panicker
853e39d3d9
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
2016-09-21 02:35:59 +00:00
Marie Janssen
32ae78598d
Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb am: 0ed17e5c8d am: 9013d67f0c
...
am: 7e5b9e3d32
2016-09-21 02:26:05 +00:00
Ajay Panicker
13ac17ab3a
[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
2016-09-21 02:24:44 +00:00
Marie Janssen
bf11fae04e
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3 am: 6f514cc82b
...
am: 5742a055e2
2016-09-21 02:24:18 +00:00
Ajay Panicker
3ed9e7693d
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
2016-09-21 02:24:08 +00:00
Ajay Panicker
c147db7a79
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
2016-09-21 02:23:37 +00:00
Ajay Panicker
95b604ccb5
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev
...
am: 60bf672485
2016-09-21 02:22:08 +00:00
Ajay Panicker
fc7822f58a
[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
2016-09-21 02:21:15 +00:00
TreeHugger Robot
85973e91d2
Merge "Improve Javadoc for AnimatedVectorDrawable" into nyc-mr1-dev
2016-09-21 02:16:35 +00:00
Elliot Waite
edc31f9593
Merge "Fix some at links." into nyc-dev
2016-09-21 02:15:17 +00:00
