OSDN Git Service
Ben Lin [Thu, 22 Sep 2016 02:54:23 +0000 (02:54 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev am:
ba0ee69a15 -s ours
am:
5340d7d849 -s ours
Change-Id: I653293d3e43fff57b4ddd651d01b10e46be6160c
Ben Lin [Thu, 22 Sep 2016 02:53:21 +0000 (02:53 +0000)]
DO NOT MERGE ANYWHERE am:
5e1e779098 -s ours
am:
d979b4e187 -s ours
Change-Id: Iaef7d9494b81c77abb11b2fc93e944bcd10172d5
Amith Yamasani [Thu, 22 Sep 2016 01:38:17 +0000 (01:38 +0000)]
Merge "Don't inform usage stats of interaction for a toast" into nyc-mr1-dev am:
be2db1ef72
am:
349a5ba1dc
Change-Id: I38817a0d71f679bcdb4d54f82840d0fcb3eb04a3
Amith Yamasani [Thu, 22 Sep 2016 01:36:21 +0000 (01:36 +0000)]
Don't inform usage stats of interaction for a toast am:
43caafa2b6
am:
0775c2e29a
Change-Id: I3ee09b516288baca8eab2fb88ea905f91c042610
Ben Lin [Wed, 21 Sep 2016 23:42:11 +0000 (23:42 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev
am:
ba0ee69a15 -s ours
Change-Id: I9fbfd898747aa183b91df605d85d91c797992ba3
Ben Lin [Wed, 21 Sep 2016 23:42:08 +0000 (23:42 +0000)]
DO NOT MERGE ANYWHERE
am:
5e1e779098 -s ours
Change-Id: I3a51fc93e7b754d7a5697ba2ef19c38b9af0e42c
Ben Lin [Wed, 21 Sep 2016 22:34:52 +0000 (22:34 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev
Amith Yamasani [Wed, 21 Sep 2016 21:58:17 +0000 (21:58 +0000)]
Merge "Don't inform usage stats of interaction for a toast" into nyc-mr1-dev
am:
be2db1ef72
Change-Id: I569b016f00e3e11ab5996392119afcc55e385a57
Amith Yamasani [Wed, 21 Sep 2016 21:57:54 +0000 (21:57 +0000)]
Don't inform usage stats of interaction for a toast
am:
43caafa2b6
Change-Id: I7b1c81eef73870b115be65dae2e2bd9094333dff
Amith Yamasani [Wed, 21 Sep 2016 21:38:18 +0000 (21:38 +0000)]
Merge "Don't inform usage stats of interaction for a toast" into nyc-mr1-dev
Andre Eisenbach [Wed, 21 Sep 2016 21:02:34 +0000 (21:02 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected" am:
e2d9cc4bc9 am:
c1777a853c
am:
7b9a3d7134
Change-Id: Id5f74592e87454f6bc5cf4aacb7e99383e38196c
Andre Eisenbach [Wed, 21 Sep 2016 20:57:33 +0000 (20:57 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected" am:
e2d9cc4bc9
am:
c1777a853c
Change-Id: I4b953e164c4d77342d63e4a59502e4997a5a04c9
Andre Eisenbach [Wed, 21 Sep 2016 20:51:07 +0000 (20:51 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected"
am:
e2d9cc4bc9
Change-Id: I7e83f318b9a8ab0520d4df66d9faa96e768df612
Chris Tate [Wed, 21 Sep 2016 20:47:24 +0000 (20:47 +0000)]
Merge "Fix WallpaperManager APIs" am:
73e89cd290 am:
6e1400f43f
am:
2cc80a362a
Change-Id: I57bc74595d92a6c1bfe0d2c9cc75e442723c4f4c
Chris Tate [Wed, 21 Sep 2016 20:39:56 +0000 (20:39 +0000)]
Merge "Fix WallpaperManager APIs" am:
73e89cd290
am:
6e1400f43f
Change-Id: I1b220d887daefe160472fb41959a03eb20e1b98e
Andre Eisenbach [Wed, 21 Sep 2016 20:38:31 +0000 (20:38 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected"
Etan Cohen [Wed, 21 Sep 2016 20:35:02 +0000 (20:35 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." am:
84b3d2040a am:
337baf9d42
am:
ebe497e40b
Change-Id: I336641dfcfba46ad80936acbc73db869e0a0922a
Chris Tate [Wed, 21 Sep 2016 20:34:49 +0000 (20:34 +0000)]
Merge "Fix WallpaperManager APIs"
am:
73e89cd290
Change-Id: I6dd139e8ccb71e6c64141733f9de031b20694179
Etan Cohen [Wed, 21 Sep 2016 20:27:06 +0000 (20:27 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." am:
84b3d2040a
am:
337baf9d42
Change-Id: I9163d5c6f37ba32ad3ee076b345b89d44d96275f
Chris Tate [Wed, 21 Sep 2016 20:26:00 +0000 (20:26 +0000)]
Merge "Fix WallpaperManager APIs"
Etan Cohen [Wed, 21 Sep 2016 20:21:25 +0000 (20:21 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
am:
84b3d2040a
Change-Id: I3c20098f26db9e30c18407d01b21ffe729318cce
Etan Cohen [Wed, 21 Sep 2016 20:14:13 +0000 (20:14 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
Tyler Gunn [Wed, 21 Sep 2016 20:12:51 +0000 (20:12 +0000)]
Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev am:
103922f8c6
am:
7cf3d36095
Change-Id: Ie1723fe35a6b005e962929661236ccdfa3845cc9
Tyler Gunn [Wed, 21 Sep 2016 20:11:29 +0000 (20:11 +0000)]
Fix potential NPE in RemoteConnection. am:
9c2c583ad7
am:
16a2464291
Change-Id: I09c0719a180c58eb690f2eebffb65aa79d0e9f87
Tyler Gunn [Wed, 21 Sep 2016 20:03:24 +0000 (20:03 +0000)]
Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev
am:
103922f8c6
Change-Id: Ib67ba89902ebcdb8c8f0a9202e937a2e8ace4aa2
Tyler Gunn [Wed, 21 Sep 2016 20:03:22 +0000 (20:03 +0000)]
Fix potential NPE in RemoteConnection.
am:
9c2c583ad7
Change-Id: I12d99b4c374da49c051285db3c5b1a4652db6241
Tyler Gunn [Wed, 21 Sep 2016 19:56:47 +0000 (19:56 +0000)]
Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev
Amith Yamasani [Tue, 20 Sep 2016 23:06:22 +0000 (16:06 -0700)]
Don't inform usage stats of interaction for a toast
If the process is forced to the foreground due to a toast,
don't inform usage stats of an interaction. Otherwise app standby
will be defeated easily.
Bug:
31544592
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdle_toast
Change-Id: I100d839ef8cf361704fd5db4b26dcc878672a235
Andre Eisenbach [Wed, 21 Sep 2016 18:00:57 +0000 (18:00 +0000)]
Merge "Protect REFRESH_BATCHED_SCAN broadcast" am:
6eb62f8ee3 am:
9271f57c34
am:
4ceb8fe4b1
Change-Id: I787be32af00a25c5a22e4e8fa6f7f57d34f48da1
Andre Eisenbach [Wed, 21 Sep 2016 17:55:24 +0000 (17:55 +0000)]
Merge "Protect REFRESH_BATCHED_SCAN broadcast" am:
6eb62f8ee3
am:
9271f57c34
Change-Id: I3c66beb4f502d967992b2b2070fcb1068744edc5
Etan Cohen [Thu, 15 Sep 2016 19:15:10 +0000 (12:15 -0700)]
[NAN] Refactor WifiNanManager to create separate sessions per connect.
Separate session enables separate namespace for functions which depend
on a connection to exist.
(cherry-pick of commit
a2eb21d1233e921487e3dada1d10ba3e14611168)
Bug:
31470256
Test: unit tests, integration (sl4a) tests.
Change-Id: I8be0bc609e55319446cef149ba49cd6f7a5f446a
Jack He [Tue, 20 Sep 2016 23:06:32 +0000 (16:06 -0700)]
List btopp.intent.action.ACCEPT broadcast as protected
Bug:
31604112
Test: manual
Change-Id: Ic5ee837bb895fc5b39b6d1abdd91d8f1d33f62ae
Andre Eisenbach [Wed, 21 Sep 2016 17:49:45 +0000 (17:49 +0000)]
Merge "Protect REFRESH_BATCHED_SCAN broadcast"
am:
6eb62f8ee3
Change-Id: I013391d9b75b6a968f5c7c449ce7cac0501448f4
Andre Eisenbach [Wed, 21 Sep 2016 17:38:47 +0000 (17:38 +0000)]
Merge "Protect REFRESH_BATCHED_SCAN broadcast"
Ajay Panicker [Tue, 28 Jun 2016 23:12:37 +0000 (16:12 -0700)]
Protect REFRESH_BATCHED_SCAN broadcast
Bug:
29754520
Test: cherry-pick from internal tree
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
(cherry picked from commit
58dd0cd65e7ac9ca0c9ccbf42087baf2df751c61)
Neil Fuller [Wed, 21 Sep 2016 16:46:25 +0000 (16:46 +0000)]
Merge "Track API changes associated with AbstractMethod refactoring" am:
117ef7eb9d am:
3fa8bc066b
am:
8ed37211bd
Change-Id: I4771be30b206c9f36e5127608c0f27d5bfb6b0ae
Fan Zhang [Wed, 21 Sep 2016 16:36:25 +0000 (16:36 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am:
32bd448cc1 am:
9c4561370d am:
9096780031
am:
1c49ec372b
Change-Id: I38d7255f965de9a10726aaa04078a5ae4b061421
Fan Zhang [Wed, 21 Sep 2016 16:35:29 +0000 (16:35 +0000)]
Fix NPE for WifiConfiguration in AccessPoint. am:
51365c3b4c am:
05df69d52a am:
20370bb9b1
am:
32edfcd626
Change-Id: I06a590cb7bfef1e39a48d2f9e2e2d4f2b6643920
Neil Fuller [Wed, 21 Sep 2016 16:28:46 +0000 (16:28 +0000)]
Merge "Track API changes associated with AbstractMethod refactoring" am:
117ef7eb9d
am:
3fa8bc066b
Change-Id: I4931c55a7390f2d186821f1f734af1f42a0a9798
Fan Zhang [Wed, 21 Sep 2016 16:27:53 +0000 (16:27 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am:
32bd448cc1 am:
9c4561370d
am:
9096780031
Change-Id: Iddb1191aa59d0466754de8d6f12f9b31e7138985
Fan Zhang [Wed, 21 Sep 2016 16:26:53 +0000 (16:26 +0000)]
Fix NPE for WifiConfiguration in AccessPoint. am:
51365c3b4c am:
05df69d52a
am:
20370bb9b1
Change-Id: I179d99b1025f41387f561745991683ad99034630
Neil Fuller [Wed, 21 Sep 2016 16:18:36 +0000 (16:18 +0000)]
Merge "Track API changes associated with AbstractMethod refactoring"
am:
117ef7eb9d
Change-Id: Icceb5e5aa4ba12ac837b838e07d338a805f37614
Fan Zhang [Wed, 21 Sep 2016 16:05:43 +0000 (16:05 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am:
32bd448cc1
am:
a2d2f7339b
Change-Id: I537519602248894ccb0b99dee4ec31c5a8ebfd8e
Fan Zhang [Wed, 21 Sep 2016 16:05:28 +0000 (16:05 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am:
32bd448cc1
am:
9c4561370d
Change-Id: I77194b8ef5f71f36020cf02c010d47dd07c12a93
Neil Fuller [Wed, 21 Sep 2016 16:01:56 +0000 (16:01 +0000)]
Merge "Track API changes associated with AbstractMethod refactoring"
Fan Zhang [Wed, 21 Sep 2016 15:57:19 +0000 (15:57 +0000)]
Fix NPE for WifiConfiguration in AccessPoint. am:
51365c3b4c
am:
3005c2f52a
Change-Id: Ie1b12189ac52ddc9358b08d39d354818e5f75c61
Fan Zhang [Wed, 21 Sep 2016 15:57:12 +0000 (15:57 +0000)]
Fix NPE for WifiConfiguration in AccessPoint. am:
51365c3b4c
am:
05df69d52a
Change-Id: I963115016cae383f47e4dfbb262200b945fd3b0d
Fan Zhang [Wed, 21 Sep 2016 15:38:27 +0000 (15:38 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
am:
32bd448cc1
Change-Id: I36857b40705fa91f80bfdff1843a9db7bcb382b1
Fan Zhang [Wed, 21 Sep 2016 15:38:22 +0000 (15:38 +0000)]
Fix NPE for WifiConfiguration in AccessPoint.
am:
51365c3b4c
Change-Id: I2b06936d69ae65910105dce9327df3920ebbcd60
Fan Zhang [Wed, 21 Sep 2016 15:38:12 +0000 (15:38 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
am:
32bd448cc1
Change-Id: I11d2bdcbd0635510ae7a53574749404a96162773
Fan Zhang [Wed, 21 Sep 2016 15:38:08 +0000 (15:38 +0000)]
Fix NPE for WifiConfiguration in AccessPoint.
am:
51365c3b4c
Change-Id: I7d653816e70f38f0cce3a6bc8f0eaade8593866a
Fan Zhang [Wed, 21 Sep 2016 15:29:56 +0000 (15:29 +0000)]
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
Neil Fuller [Wed, 21 Sep 2016 12:03:29 +0000 (12:03 +0000)]
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" am:
0acc91e4fc am:
2d7008a71c
am:
a70325bced
Change-Id: If4fbdf31e9b6c2cf418acb67866fb4096f1a0049
Neil Fuller [Wed, 21 Sep 2016 11:58:27 +0000 (11:58 +0000)]
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" am:
0acc91e4fc
am:
2d7008a71c
Change-Id: I931f4f0f5d9be7b11725ab42f5eefcb2770d70b6
Neil Fuller [Thu, 8 Sep 2016 11:08:22 +0000 (12:08 +0100)]
Track API changes associated with AbstractMethod refactoring
No actual API change.
Bug:
28666126
Bug:
31052885
Test: make test-art-host and cts run of CtsLibcoreTestCases
Change-Id: I8755509f9b6e5387e071a3550b197167bab6ae04
Neil Fuller [Wed, 21 Sep 2016 11:52:17 +0000 (11:52 +0000)]
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs"
am:
0acc91e4fc
Change-Id: I5833ef112d1d9031a48b899723cc4f10703d062d
Neil Fuller [Wed, 21 Sep 2016 11:45:18 +0000 (11:45 +0000)]
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs"
Lorenzo Colitti [Wed, 21 Sep 2016 10:03:36 +0000 (10:03 +0000)]
Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev am:
4813790d95 am:
488ca21f0a
am:
ac66b6bd0a
Change-Id: I4cab05a13a1713cb0dbf2bbdbe0aed49101d1309
Lorenzo Colitti [Wed, 21 Sep 2016 09:57:56 +0000 (09:57 +0000)]
Rematch wifi networks when the avoid bad wifi setting changes. am:
836d8788a8 am:
caf1f0bf0e
am:
e913dded2b
Change-Id: Id45ac22c3070de67fb3455c6d8a3c44d22388ff6
Robin Lee [Wed, 21 Sep 2016 09:53:56 +0000 (09:53 +0000)]
Merge "Merge commit '
16a33074d8e38cf3d082c68e972a0e12fb2ad09f' into manual_merge_16a3307" into nyc-mr1-dev-plus-aosp
Lorenzo Colitti [Wed, 21 Sep 2016 09:53:25 +0000 (09:53 +0000)]
Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev am:
4813790d95
am:
488ca21f0a
Change-Id: I5284a99c478a77187ce0e115b07248d89e6886a6
Lorenzo Colitti [Wed, 21 Sep 2016 09:52:30 +0000 (09:52 +0000)]
Rematch wifi networks when the avoid bad wifi setting changes. am:
836d8788a8
am:
caf1f0bf0e
Change-Id: I6d5fca7707fdc26c953df626c7eddc3f108b949c
Michal Karpinski [Wed, 21 Sep 2016 09:45:59 +0000 (18:45 +0900)]
Rename DnsEventListenerServiceTest to NetdEventListenerServiceTest
Change-Id: I67e645306444938a4675e91a9db5d716c0bd4881
Lorenzo Colitti [Wed, 21 Sep 2016 09:47:33 +0000 (09:47 +0000)]
Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev
am:
4813790d95
Change-Id: I1cacc2f888f429932b6506c9e9d216f2a502e354
Lorenzo Colitti [Wed, 21 Sep 2016 09:47:28 +0000 (09:47 +0000)]
Rematch wifi networks when the avoid bad wifi setting changes.
am:
836d8788a8
Change-Id: I589cfdb8792997fe94d22c551c8a53e48e45db1a
Lorenzo Colitti [Wed, 21 Sep 2016 09:42:05 +0000 (09:42 +0000)]
Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev
Michal Karpinski [Wed, 21 Sep 2016 09:21:17 +0000 (18:21 +0900)]
Merge commit '
16a33074d8e38cf3d082c68e972a0e12fb2ad09f' into manual_merge_16a3307
Change-Id: I0d98f0b7f1bd23c00eaa73ff0a48c75cf8f11199
Neil Fuller [Tue, 6 Sep 2016 18:04:18 +0000 (19:04 +0100)]
Tracking unhiding of java.lang.reflect.Parameter APIs
Bug:
28666126
Change-Id: I37926f8f221dca7e99ffd233a0990fcfa4d56040
Michal Karpinski [Wed, 21 Sep 2016 08:47:59 +0000 (08:47 +0000)]
Merge "Rename the DnsEventListenerService to NetdEventListenerService" am:
1e3f586c10
am:
e2f6138710
Change-Id: I001724d2145058df0b51e581855fd663f815c209
Michal Karpinski [Wed, 21 Sep 2016 08:39:42 +0000 (08:39 +0000)]
Merge "Rename the DnsEventListenerService to NetdEventListenerService"
am:
1e3f586c10
Change-Id: Ie83aa7e6225a42c11c03eae45f593e74b94efc82
Michal Karpinski [Wed, 21 Sep 2016 08:34:38 +0000 (08:34 +0000)]
Merge "Rename the DnsEventListenerService to NetdEventListenerService"
Michal Karpinski [Thu, 15 Sep 2016 08:07:08 +0000 (17:07 +0900)]
Rename the DnsEventListenerService to NetdEventListenerService
The service will be extended to include listening for connect events as well.
Test: this is just a renaming change
Bug:
29748723
Change-Id: I4e50e24d1bfb0b5ead4010cc7df3434d38b753d8
Ajay Panicker [Wed, 21 Sep 2016 06:40:38 +0000 (06:40 +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 am:
9030016e5f
am:
d840ae0ffc
Change-Id: I2e982d5680c0d167108b9d3c51e350af27d12d0b
Ajay Panicker [Wed, 21 Sep 2016 06:35:05 +0000 (06:35 +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
am:
9030016e5f
Change-Id: I795156bf2fba87dc1969ac60c2fc0225165d8c90
Ajay Panicker [Wed, 21 Sep 2016 06:22:55 +0000 (06:22 +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:
0eb01572ee
Change-Id: Ic7d6f9255bb4ad82cf423687570d8f97af7dd74b
Android Build Merger (Role) [Wed, 21 Sep 2016 06:13:15 +0000 (06:13 +0000)]
Merge "[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 am:
89024c7477 am:
d460de187e" into nyc-mr1-dev-plus-aosp
Ajay Panicker [Wed, 21 Sep 2016 06:11:59 +0000 (06:11 +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 am:
89024c7477
am:
d460de187e
Change-Id: I1cd15bbe0dc6005e80ac86aa5d01d01b242b8e52
Android Build Merger (Role) [Wed, 21 Sep 2016 06:11:36 +0000 (06:11 +0000)]
Merge "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 am:
4a496b0810 am:
03ff2e19cb" into nyc-mr1-dev-plus-aosp
Ajay Panicker [Wed, 21 Sep 2016 06:11:00 +0000 (06:11 +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 am:
4a496b0810
am:
03ff2e19cb
Change-Id: I64e383f28438becd8be42a51913f40b1649bdf96
Lorenzo Colitti [Wed, 21 Sep 2016 05:22:33 +0000 (14:22 +0900)]
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
Ajay Panicker [Wed, 21 Sep 2016 06:09:47 +0000 (06:09 +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:
c061dcda05
Change-Id: I213de9a0eda5b374833557d4aed2c1b9184a6a15
Ajay Panicker [Wed, 21 Sep 2016 06:04:40 +0000 (06:04 +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
am:
89024c7477
Change-Id: I0c48d8983c1b35f406e9fbe15dcc3b8f650bef5f
Ajay Panicker [Wed, 21 Sep 2016 06:03:44 +0000 (06:03 +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
am:
4a496b0810
Change-Id: I3386d471bc4c242fb769e1f20ff7755281434ed3
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
Ajay Panicker [Wed, 21 Sep 2016 05:42:24 +0000 (05:42 +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 am:
7b11b2deff
am:
d58a9e684c
Change-Id: I3c88f4154732f3ed7c32ff102425809dbf0213b4
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
Ajay Panicker [Wed, 21 Sep 2016 05:40:13 +0000 (05:40 +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: Idb4e7d7bbbfa5ba491a4e938dc2f20aa89e8fa87
Ajay Panicker [Wed, 21 Sep 2016 05:40:03 +0000 (05:40 +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 am:
48f906c852
am:
1752ec7e01
Change-Id: Idccb00ef60e713ddeb681f407133f5936186c8f1
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
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
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
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
Ajay Panicker [Wed, 21 Sep 2016 05:25:30 +0000 (05:25 +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
am:
7b11b2deff
Change-Id: Icf0963c53b5684f19a01f72608d8cf83756f32d4
Ajay Panicker [Wed, 21 Sep 2016 05:23:32 +0000 (05: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 am:
c147db7a79 am:
3e238e3396 -s ours am:
998001b4b2 am:
d9421e7758
am:
48f906c852
Change-Id: I098c0cdb31cf4ca5da368d57cdf67089fe8a0cf8
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
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
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
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
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
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
OSDN Git Service
