Julia Reynolds
d6247427ac
Merge "Api updates" into oc-dev am: f84467e19f
...
am: 7ee513c27b
2017-04-27 05:15:11 +00:00
Julia Reynolds
7ee513c27b
Merge "Api updates" into oc-dev
...
am: f84467e19f
2017-04-27 05:04:18 +00:00
TreeHugger Robot
f84467e19f
Merge "Api updates" into oc-dev
2017-04-27 04:51:46 +00:00
Jason Monk
c9085ad8e2
Merge "Revert "Revert "Integrate new looper apis into testables""" into oc-dev am: 21fb35048f
...
am: c831cf584c
2017-04-25 21:44:33 +00:00
Julia Reynolds
bad4297600
Api updates
...
- Better documentation on DEFAULT_CHANNEL_ID
- Renaming getChannel/setChannel/getTimeout/setTimeout
- Add documentation to getShortcutId
- @hide parcel constructors
Test: make, make cts
Bug: 37672218
Change-Id: I695b2620c51638a84930e9d1c5fbfd6d85699b55
2017-04-25 17:00:05 -04:00
Jason Monk
c831cf584c
Merge "Revert "Revert "Integrate new looper apis into testables""" into oc-dev
...
am: 21fb35048f
2017-04-25 20:42:12 +00:00
Jason Monk
745d0a8b77
Revert "Revert "Integrate new looper apis into testables""
...
This reverts commit fd8f615953
2017-04-25 13:49:58 -04:00
Etan Cohen
ba93a15cbd
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa06 am: 3c6305cc55 am: 887fd90742
...
am: 79d9e99632
2017-04-25 13:46:42 +00:00
Etan Cohen
79d9e99632
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa06 am: 3c6305cc55
...
am: 887fd90742
2017-04-25 13:40:42 +00:00
Etan Cohen
3c6305cc55
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
...
am: 2fd19ffa06
2017-04-25 13:27:22 +00:00
Etan Cohen
2fd19ffa06
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
2017-04-25 13:21:36 +00:00
Hugo Benichi
204cdaa5c5
Merge "Merge "Move byte logics from ApfFilter into BitsUtil" am: 21b9b3a8ff am: 12c1074c8b am: a80bb82b4e" into oc-dev-plus-aosp
...
am: 79ffb5a284
2017-04-24 21:09:19 +00:00
Tomasz Wasilczyk
22eb0e316d
Merge "Pass radio HAL callbacks back to Java client."
2017-04-24 20:19:10 +00:00
Hugo Benichi
7a0191b355
Merge "Move byte logics from ApfFilter into BitsUtil" am: 21b9b3a8ff am: 12c1074c8b
...
am: a80bb82b4e
2017-04-24 19:07:37 +00:00
Hugo Benichi
12c1074c8b
Merge "Move byte logics from ApfFilter into BitsUtil"
...
am: 21b9b3a8ff
2017-04-24 18:45:23 +00:00
Tomasz Wasilczyk
2134817b39
Pass radio HAL callbacks back to Java client.
...
Test: instrumentation, manual (KitchenSink)
Bug: b/36863239
Change-Id: I5019929bfafcdd82f62f5b81aed5c7ac796e05f1
2017-04-22 19:54:18 -07:00
Hugo Benichi
495a17b332
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
18924f495b
Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2 am: d2181235b9
...
am: 658f2e5cd7
2017-04-22 01:06:17 +00:00
Hugo Benichi
658f2e5cd7
Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2
...
am: d2181235b9
2017-04-22 00:57:48 +00:00
Hugo Benichi
40ab8401b2
Merge "NsdManager: add unit tests"
...
am: dc54ad7fc3
2017-04-22 00:40:56 +00:00
Hugo Benichi
dc54ad7fc3
Merge "NsdManager: add unit tests"
2017-04-22 00:31:28 +00:00
Robert Greenwalt
1778682242
Merge "Mark Restricted APN connections as restricted."
...
am: b90b2015d3
2017-04-21 23:23:17 +00:00
Treehugger Robot
b90b2015d3
Merge "Mark Restricted APN connections as restricted."
2017-04-21 23:12:52 +00:00
Robin Lee
e296f08fc6
Merge "Use Vpn rules (not firewall) for always-on VPN" am: e4f56a7e44 am: cd8557d15a am: 4de3794c26
...
am: 5d30d86372
2017-04-21 22:24:31 +00:00
Robin Lee
5d30d86372
Merge "Use Vpn rules (not firewall) for always-on VPN" am: e4f56a7e44 am: cd8557d15a
...
am: 4de3794c26
2017-04-21 22:17:15 +00:00
Robin Lee
cd8557d15a
Merge "Use Vpn rules (not firewall) for always-on VPN"
...
am: e4f56a7e44
2017-04-21 22:05:33 +00:00
Robert Greenwalt
a7e148a874
Mark Restricted APN connections as restricted.
...
If anything unrestricted is bundled in the whole thing has to be
unrestricted (we can't restrict based on destination or intent)
but the NOT_METERED flag wasn't taken into account.
This wasn't a problem before because telephony set that statically
and late, but a change caused it to be marked NOT_METERED earlier
which exposed this bug.
bug: 37208956
Merged-In: I7b7a1c38621ce0ecde8cf041e82b1ebb7a9c6f15
Test: new NetworkCapabilitiesTest. Fails without fix, works with.
Change-Id: I86c1b2854413a94662aa53e697d32380695ab9ac
2017-04-21 22:00:17 +00:00
Treehugger Robot
e4f56a7e44
Merge "Use Vpn rules (not firewall) for always-on VPN"
2017-04-21 21:53:15 +00:00
Etan Cohen
859748f08c
[AWARE] Add UID checking to WifiAwareNetworkSpecifier
...
Wifi Aware networks are per app - i.e. a requestor gets
a dedicated network. Change verifies that the only the
original requestor matches the created network (using UID).
Bug: 36053921
Test: Integration (sl4a) tests
Change-Id: I4ff3994731dd7ccb88e2bea333d1e6905b136f02
2017-04-21 18:47:35 +00:00
Erik Kline
506a0fb6df
Merge "Clarify IControlsTethering LOCAL_ONLY state name" am: 649c459858 am: f7c93bcd45 am: 6305795287
...
am: 09d1588183
2017-04-21 09:24:19 +00:00
Erik Kline
09d1588183
Merge "Clarify IControlsTethering LOCAL_ONLY state name" am: 649c459858 am: f7c93bcd45
...
am: 6305795287
2017-04-21 09:18:50 +00:00
Erik Kline
f7c93bcd45
Merge "Clarify IControlsTethering LOCAL_ONLY state name"
...
am: 649c459858
2017-04-21 09:07:46 +00:00
Erik Kline
5fe3718c6d
Clarify IControlsTethering LOCAL_ONLY state name
...
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug: 31466854
Bug: 32163131
Change-Id: I1f45511f00aca37480f894be4a9a004f1a3b35d7
(cherry picked from commit ca41be796a
2017-04-21 18:03:19 +09:00
Hugo Benichi
db8adb7983
NsdManager: add unit tests
...
This prepares some refactoring and the addition of a timeout to
resolveService.
Test: new tests pass
Bug: 37013369, 33298084
Change-Id: Ie8277bd5983278507bfa70495b4ce7d13895b24b
2017-04-21 05:16:37 +00:00
Erik Kline
668b722498
Add local-only hotspot info into tether state change broadcast
...
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug: 31466854
Bug: 32163131
Change-Id: I938074587dfeec221c5cdb43a392802ad3fc3589
2017-04-21 13:26:04 +09:00
Erik Kline
ca41be796a
Clarify IControlsTethering LOCAL_ONLY state name
...
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug: 31466854
Bug: 32163131
Change-Id: I1f45511f00aca37480f894be4a9a004f1a3b35d7
2017-04-21 11:12:24 +09:00
Erik Kline
931c7a8156
Merge "Merge "Switch to WifiManager.{start,stop}SoftAp()" am: 275edcb940 am: 11fdd1769b am: 7d321645a2" into oc-dev-plus-aosp
...
am: 2ed3ff115b
2017-04-20 16:34:40 +00:00
Erik Kline
57c252b9b1
Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79 am: 6af3dd0fc3 am: 3fa8908370
...
am: c9ee35581c
2017-04-20 16:29:52 +00:00
Erik Kline
dc7e445bc7
Merge "Switch to WifiManager.{start,stop}SoftAp()" am: 275edcb940 am: 11fdd1769b
...
am: 7d321645a2
2017-04-20 16:02:06 +00:00
Erik Kline
11fdd1769b
Merge "Switch to WifiManager.{start,stop}SoftAp()"
...
am: 275edcb940
2017-04-20 15:50:19 +00:00
Treehugger Robot
275edcb940
Merge "Switch to WifiManager.{start,stop}SoftAp()"
2017-04-20 15:37:31 +00:00
Erik Kline
c9ee35581c
Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79 am: 6af3dd0fc3
...
am: 3fa8908370
2017-04-20 14:02:24 +00:00
Erik Kline
6af3dd0fc3
Merge "Add local-only hotspot info into tether state change broadcast"
...
am: 4c7a999d79
2017-04-20 12:55:48 +00:00
Erik Kline
8351faa900
Add local-only hotspot info into tether state change broadcast
...
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug: 31466854
Bug: 32163131
Change-Id: I938074587dfeec221c5cdb43a392802ad3fc3589
2017-04-20 19:44:01 +09:00
TreeHugger Robot
5f21d7befa
Merge "Merge commit '695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c"
2017-04-19 22:56:55 +00:00
Robert Greenwalt
2a7fee4e33
Merge commit '695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c
...
Change-Id: I768181b347ac5676f3535d94a26ca9e81178a110
2017-04-19 14:03:30 -07:00
Robert Greenwalt
695d2c6df1
Merge commit 'd6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f
...
Change-Id: I86d5e87cc3884d8fc3eb326a92b8871ef0926aa6
2017-04-19 11:24:03 -07:00
Tomasz Wasilczyk
d7c21d3cbf
Make RadioService actually talking to the HAL.
...
For now, only opening and closing a tuner is implemented.
Test: instrumentation, KitchenSink
Bug: b/36863239
Change-Id: Ib2e14c0108c0714524d50b9557f24465c68f5ef2
2017-04-19 10:59:00 -07:00
Robert Greenwalt
1eeec7880d
Mark Restricted APN connections as restricted.
...
If anything unrestricted is bundled in the whole thing has to be
unrestricted (we can't restrict based on destination or intent)
but the NOT_METERED flag wasn't taken into account.
This wasn't a problem before because telephony set that statically
and late, but a change caused it to be marked NOT_METERED earlier
which exposed this bug.
bug: 37208956
Test: new NetworkCapabilitiesTest. Fails without fix, works with.
Change-Id: I7b7a1c38621ce0ecde8cf041e82b1ebb7a9c6f15
2017-04-18 11:29:20 -07:00
Erik Kline
ceb54c63dc
Switch to WifiManager.{start,stop}SoftAp()
...
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug: 31466854
Change-Id: I730d029128a14b936c111ae159b9708d935f4656
2017-04-18 15:22:49 +09:00
