Hugo Benichi
fd587d55c8
Merge "NsdManager: unit test coverage for servive registration" am: b0e408450c am: bc57faa1ac am: 9a3e69d9b6
...
am: 4c1fa0a879
2017-05-02 06:56:15 +00:00
Hugo Benichi
4c1fa0a879
Merge "NsdManager: unit test coverage for servive registration" am: b0e408450c am: bc57faa1ac
...
am: 9a3e69d9b6
Change-Id: Ideabb1c929ddd4307e66831cddb20e2feac2c6d9
2017-05-02 06:49:52 +00:00
Lorenzo Colitti
29fd201d7b
Merge "Add a method to start the captive portal login app." into oc-dev am: 5555b1e3d1
...
am: 4d3453c255
2017-05-02 04:51:08 +00:00
Lorenzo Colitti
4d3453c255
Merge "Add a method to start the captive portal login app." into oc-dev
...
am: 5555b1e3d1
Change-Id: Ic7c14bd3dfd07f97c04901f043ed1cd3b1eee6e4
2017-05-02 04:44:31 +00:00
Hugo Benichi
b00460ae8e
NsdManager: unit test coverage for servive registration
...
This patch adds test coverage for NsdManager#registerService() and
NsdManager#unregisterService(). This test shows a potential defect in
the api: if unregisterService() fails, the associated listener is always
unregistered from NsdManager. If the service initially registered is
still registered, this potentially make it impossible to unregister.
Test: added new unit test
Bug: 37013369, 33298084
Change-Id: Ia089b6d2f2a349907a8b29d9a3acd7f59e177887
2017-05-02 13:31:24 +09:00
Lorenzo Colitti
755e796e5e
Add a method to start the captive portal login app.
...
Bug: 36203355
Bug: 36656914
Test: ConnectivityServiceTest (including new test) passes
Change-Id: I82a9a9a8da47870ba3f1bbef5941b37e970c844f
2017-05-01 16:01:15 +09:00
Lorenzo Colitti
67288eb53d
Merge "Address ConnectivityManager API comments." into oc-dev am: f782c1d836
...
am: 5a8680d7a4
2017-04-28 04:11:54 +00:00
Lorenzo Colitti
5a8680d7a4
Merge "Address ConnectivityManager API comments." into oc-dev
...
am: f782c1d836
2017-04-28 04:04:21 +00:00
Lorenzo Colitti
f782c1d836
Merge "Address ConnectivityManager API comments." into oc-dev
2017-04-28 03:58:16 +00:00
Lorenzo Colitti
38ea810b27
Address ConnectivityManager API comments.
...
Bug: 36370941
Test: marlin builds and boots
Change-Id: I693ee5270bf186c88c7c5056293519f7237504ff
2017-04-28 00:58:00 +09:00
Hugo Benichi
c39f81e439
Merge "NsdManager: unit tests for argument validation" am: 3cff7deecb am: d97e358f7a am: 48947de481
...
am: 0e50827fea
2017-04-27 13:16:11 +00:00
Hugo Benichi
8aaf306011
Merge "NsdService: disentangle NativeDaemonConnector from ctor" am: fa97f11b20 am: 47748b754c am: 5d0bd13538
...
am: b2ce5b2847
2017-04-27 13:14:10 +00:00
Hugo Benichi
0e50827fea
Merge "NsdManager: unit tests for argument validation" am: 3cff7deecb am: d97e358f7a
...
am: 48947de481
Change-Id: I8a51ff51071adc60fe9f4d99ec629edabbed353d
2017-04-27 13:09:02 +00:00
Hugo Benichi
b2ce5b2847
Merge "NsdService: disentangle NativeDaemonConnector from ctor" am: fa97f11b20 am: 47748b754c
...
am: 5d0bd13538
Change-Id: Ic8ddf92c7c64d4214a75bea6d6e5083f4612a76a
2017-04-27 13:06:59 +00:00
Hugo Benichi
99917e5cfb
NsdManager: unit tests for argument validation
...
Test: new tests pass.
Bug: 37013369, 33298084
Change-Id: Ia514d2bbd967d46fed54e379f319b572ade22c62
2017-04-27 16:35:48 +09:00
Hugo Benichi
ee4eb706eb
NsdService: disentangle NativeDaemonConnector from ctor
...
This patch disentangles the creation of NativeDaemonConnector from the
creation of NsdService by introducing a wrapper type DaemonConnection.
This allows to mock this dependency in unit tests.
Test: enhanced previously introduced new tests.
Bug: 37013369, 33298084
Change-Id: I894b7cddfc509f86d0134d214c88c063b81b5e0a
2017-04-27 16:35:30 +09:00
Hugo Benichi
f5ca9cc774
Merge "NsdService: bootstrap unit tests" am: 163201bd74 am: dd53c962b2 am: d29ce6ae8c
...
am: 3489494edc
2017-04-27 06:01:38 +00:00
Hugo Benichi
3489494edc
Merge "NsdService: bootstrap unit tests" am: 163201bd74 am: dd53c962b2
...
am: d29ce6ae8c
Change-Id: Iaf0679790e934baaaf48bcb04098aa18deca4d60
2017-04-27 05:49:47 +00:00
Hugo Benichi
163201bd74
Merge "NsdService: bootstrap unit tests"
2017-04-27 05:22:54 +00:00
Erik Kline
a02a6b1658
Merge "Clarify some IpManager/ApfFilter debugging output." into oc-dev am: 40ccb1b5aa
...
am: 00dc131391
2017-04-27 04:08:10 +00:00
Erik Kline
00dc131391
Merge "Clarify some IpManager/ApfFilter debugging output." into oc-dev
...
am: 40ccb1b5aa
Change-Id: Ie883f62bdc731c8da3b3d5ac1df827e1fd5b44be
2017-04-27 03:58:12 +00:00
Erik Kline
9ee878a8bb
Merge "Clarify some IpManager/ApfFilter debugging output." am: ce94c07ffd am: 3cc7ccfc69 am: b1914ebb50
...
am: b3da49d3fb
2017-04-27 00:46:41 +00:00
Erik Kline
b3da49d3fb
Merge "Clarify some IpManager/ApfFilter debugging output." am: ce94c07ffd am: 3cc7ccfc69
...
am: b1914ebb50
Change-Id: If64f2b8a5cdf8b946a82a0c97a42cf61ef5e0b08
2017-04-27 00:35:25 +00:00
Erik Kline
c6e8acfab2
Clarify some IpManager/ApfFilter debugging output.
...
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- "adb shell dumpsys wifi ipmanager" shows updated output
Bug: 34793131
Change-Id: I6dec135b97343943efb421ef7b2e84c4751dd5ea
(cherry picked from commit af579eb5b516296a8ec0b02d824f2ba646e60ca2)
2017-04-26 17:17:04 +09:00
Erik Kline
55af7a2f07
Clarify some IpManager/ApfFilter debugging output.
...
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- "adb shell dumpsys wifi ipmanager" shows updated output
Bug: 34793131
Change-Id: I6dec135b97343943efb421ef7b2e84c4751dd5ea
2017-04-26 17:14:47 +09:00
Etan Cohen
35e04cc4fb
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: ff8fdb4ad3 am: 3c6305cc55 am: 887fd90742
...
am: 8e405c10f6
2017-04-25 13:46:42 +00:00
Etan Cohen
8e405c10f6
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: ff8fdb4ad3 am: 3c6305cc55
...
am: 887fd90742
Change-Id: I8480ac43d89dc85b541e6255c3cdc597393896cf
2017-04-25 13:40:42 +00:00
Etan Cohen
ff8fdb4ad3
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
2017-04-25 13:21:36 +00:00
Hugo Benichi
81a38c1efd
Merge "NetworkCapabilities: remove duplicated TRANSPORT_NAMES" into oc-dev-plus-aosp
...
am: c3d2f25a5d
Change-Id: I1e039236d7d4eda6354c81440fbbc43346376f23
2017-04-25 08:09:32 +00:00
Hugo Benichi
f2e9c2179e
NetworkCapabilities: remove duplicated TRANSPORT_NAMES
...
Due to multi-branch automerging issue, TRANSPORT_NAMES got inserted
twice into NetworkCapabilities both by commits 0ff6fce27b25e35a987b
2017-04-25 16:31:06 +09:00
Hugo Benichi
d8fa466b27
NsdService: bootstrap unit tests
...
Test: new tests part of $ runtest frameworks-net
Bug: 37013369, 33298084
Change-Id: Ief45f838268380b4b2a128390fbf34d55a3b922b
2017-04-25 10:42:58 +09:00
Jeff Sharkey
38826fad5a
Merge "Even more auto-doc work." into oc-dev am: 880f4f4cc2
...
am: f4f9d15ba0
2017-04-24 22:43:34 +00:00
Jeff Sharkey
f4f9d15ba0
Merge "Even more auto-doc work." into oc-dev
...
am: 880f4f4cc2
Change-Id: I78199f8366fbda65a4b4917675291d946e29285c
2017-04-24 21:38:03 +00:00
Hugo Benichi
95772274c2
Merge "Merge "Move byte logics from ApfFilter into BitsUtil" am: 21b9b3a8ff am: 12c1074c8b am: a80bb82b4e" into oc-dev-plus-aosp
...
am: 79ffb5a284
Change-Id: I9674c965169fd9dfd0412c80d9362f891bdeb59d
2017-04-24 21:09:19 +00:00
Hugo Benichi
749e718ed2
Merge "Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am: 10b5024d5e am: 23d41ee68e am: 876ebaa8e1" into oc-dev-plus-aosp
...
am: 584f97470c -s ours
Change-Id: Icb2bf64f15e720dc33c870bc23538b03a0a34dd6
2017-04-24 20:51:54 +00:00
Jeff Sharkey
2ac6299690
Even more auto-doc work.
...
Update docs based on what new lint detector found. Add new @IntDef
to parameters or methods returning constants or flags, and add
@RequiresPermission to methods mentioning permissions.
Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I7f640f7883fcb66b911a52ae93b83f77306571ec
2017-04-24 13:20:46 -06:00
Hugo Benichi
15b9dca8a2
Merge "Move byte logics from ApfFilter into BitsUtil" am: 21b9b3a8ff am: 12c1074c8b
...
am: a80bb82b4e
Change-Id: I5f13b006b57cc8a3ab0560626077d003ce4fe8c8
2017-04-24 19:07:37 +00:00
Hugo Benichi
6a89c4ce72
Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am: 10b5024d5e am: 23d41ee68e
...
am: 876ebaa8e1
Change-Id: I0dfcea2b92287115c385f1b7678034f643d5daba
2017-04-24 19:06:20 +00:00
Hugo Benichi
07801b8ed0
Merge changes I5187d17c,I49a76582 am: 3e544160d3 am: f2e5cf715d am: 31259c219f
...
am: e95c037e6d
2017-04-22 01:07:59 +00:00
Hugo Benichi
eed5fd8d6a
Move byte logics from ApfFilter into BitsUtil
...
This patch extracts into BitUtils byte manipulation helper methods
and unsigned type manipulation helper methods from ApfFilter into
an independent and reusable structure.
Test: $ runtest frameworks-net
Change-Id: I0f33af10457a63dbde5983f14353a79b8cd877d9
2017-04-22 10:07:03 +09:00
Hugo Benichi
92e3061d40
Merge "NsdManager: add unit tests" am: 479e4e67bf am: 40ab8401b2 am: d2181235b9
...
am: e7f6a89cb6
2017-04-22 01:06:17 +00:00
Hugo Benichi
e95c037e6d
Merge changes I5187d17c,I49a76582 am: 3e544160d3 am: f2e5cf715d
...
am: 31259c219f
Change-Id: I174179db3a08ba51aef737cfb3956d1cf789b362
2017-04-22 00:59:36 +00:00
Hugo Benichi
25e35a987b
Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)
...
This patch is a partial cherry-pick from commit
c356ea7eb9c356ea7eb9
2017-04-22 09:58:42 +09:00
Hugo Benichi
e7f6a89cb6
Merge "NsdManager: add unit tests" am: 479e4e67bf am: 40ab8401b2
...
am: d2181235b9
Change-Id: I7a5202be0e6a6274f3bd11737f30fee0ef947235
2017-04-22 00:57:48 +00:00
Hugo Benichi
3e544160d3
Merge changes I5187d17c,I49a76582
...
* changes:
ConnectivityService: regroup bool <-> int conversions
ConnectivityService: move reportNetworkConnectivity to handler
2017-04-22 00:34:07 +00:00
Hugo Benichi
479e4e67bf
Merge "NsdManager: add unit tests"
2017-04-22 00:31:28 +00:00
Robert Greenwalt
67bb8b1401
Merge "Mark Restricted APN connections as restricted." am: e3143d9943 am: 1778682242 am: 88a6acb9f6 -s ours
...
am: 756d33bfaf
2017-04-21 23:50:37 +00:00
Robert Greenwalt
756d33bfaf
Merge "Mark Restricted APN connections as restricted." am: e3143d9943 am: 1778682242
...
am: 88a6acb9f6 -s ours
Change-Id: I7a0019557721593761ae605db8e28bf4e15c06b0
2017-04-21 23:36:13 +00:00
Treehugger Robot
e3143d9943
Merge "Mark Restricted APN connections as restricted."
2017-04-21 23:12:52 +00:00
Robin Lee
611b3fd2f9
Merge "Use Vpn rules (not firewall) for always-on VPN" am: dfc99e9da8 am: cd8557d15a am: 4de3794c26
...
am: 3f31fd009f
2017-04-21 22:24:31 +00:00
