Commit Graph

4469 Commits

Author SHA1 Message Date
Hugo Benichi
548498fd1c Merge "MacAddress: add @NonNull annotations" am: 7d767a4710 am: a7c125e5b2
am: b2cf723e43

Change-Id: Ib525e2429609ce12c2be5bbeacffa217b65bebe3
2018-01-16 10:40:56 +00:00
Hugo Benichi
b2cf723e43 Merge "MacAddress: add @NonNull annotations" am: 7d767a4710
am: a7c125e5b2

Change-Id: Icaa08c082797c6dbc3382e0662e24e1c84114175
2018-01-16 10:30:20 +00:00
Hugo Benichi
7d767a4710 Merge "MacAddress: add @NonNull annotations" 2018-01-16 07:10:50 +00:00
Lorenzo Colitti
71e0522832 Merge "Change the netId to nethandle mapping." am: 333dc71728 am: feaf412e19
am: a5b81cd2ad

Change-Id: I06e09bfaeb1040b97afa392faace339eb5bab4ad
2018-01-16 05:32:55 +00:00
Lorenzo Colitti
a5b81cd2ad Merge "Change the netId to nethandle mapping." am: 333dc71728
am: feaf412e19

Change-Id: Idd1b2f462c1c78bdb68b43a4aa77bf2358f7cb52
2018-01-16 05:16:34 +00:00
Hugo Benichi
5e5c4b40f9 MacAddress: add @NonNull annotations
This patch adds to the MacAddress class:
  - getAddressType() method which replaces addressType(), for naming
  consistency
  - @NonNull annotations on all input and output reference values for
  all public methods (@hide and public).

TYPE_UNKNOWN, which currently cannot be observed with a non @hide
method, is also removed from the public api.

Bug: 71866627
Test: $ runtest frameworks-net
Change-Id: I2af70408d46f431b7b32183e6b48ddae9a261a2c
2018-01-16 13:32:59 +09:00
Treehugger Robot
333dc71728 Merge "Change the netId to nethandle mapping." 2018-01-16 02:58:56 +00:00
Hugo Benichi
c7f97171c3 Merge "ConnectivityService: synchronize access on mLockdownEnabled" am: 2a0316897e am: 2d59e3cab0
am: 6d19220966

Change-Id: I7cb4d1e9e1fc3dc5ca116dcc94840920cd4a3d64
2018-01-16 02:42:53 +00:00
Hugo Benichi
6d19220966 Merge "ConnectivityService: synchronize access on mLockdownEnabled" am: 2a0316897e
am: 2d59e3cab0

Change-Id: Icadee616fc95e1c126285524dfe49331fcf87462
2018-01-16 02:31:48 +00:00
Hugo Benichi
2a0316897e Merge "ConnectivityService: synchronize access on mLockdownEnabled" 2018-01-16 00:20:52 +00:00
Lorenzo Colitti
3d1632d6c9 Change the netId to nethandle mapping.
Being able to update this handle is necessary to ensure that
system-only OTAs do not break vendor code that relies on
nethandles.

Bug: 63052780
Test: walleye builds, boots, networking works
Test: MultinetworkApiTest CTS tests passes
Change-Id: I049a4ad2610ca68b8f56377b63be7e5e8ce76039
2018-01-16 02:08:09 +09:00
Erik Kline
c447396451 Merge "change NMS removeNetwork to netd binder variant" am: e61ee4198e am: b73571b981
am: 88cdfd6879

Change-Id: I38905b12f24f16860de1db18cd12d93fc661c684
2018-01-15 14:54:30 +00:00
Erik Kline
88cdfd6879 Merge "change NMS removeNetwork to netd binder variant" am: e61ee4198e
am: b73571b981

Change-Id: I6de7f38c7081e14d817cc7aad44cb5b6a978328b
2018-01-15 14:38:08 +00:00
Erik Kline
31645bd68e change NMS removeNetwork to netd binder variant
Also: require NETWORK_STACK instead of CONNECTIVITY_INTERNAL.

Bug: 34953048
Bug: 64133961
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net
Change-Id: I26f07f51a8a2f4a8bb43a276da7c5e66c355c848
2018-01-15 19:51:37 +09:00
Erik Kline
16509a73d6 Merge changes I47ccfa99,I5db1de3e am: 3e2ccb4ff1 am: 03f3294103
am: c4bfb71ab9

Change-Id: Ic774b944238d6df07511df8e467d66cefcd4fa81
2018-01-11 12:52:19 +00:00
Erik Kline
c4bfb71ab9 Merge changes I47ccfa99,I5db1de3e am: 3e2ccb4ff1
am: 03f3294103

Change-Id: I311f6c299daf1c8d21731187d8e78e55c5767564
2018-01-11 12:43:38 +00:00
Treehugger Robot
3e2ccb4ff1 Merge changes I47ccfa99,I5db1de3e
* changes:
  Extract DNS setting logic into DnsManager class
  Add minimal test for setting DNS properties
2018-01-11 11:33:30 +00:00
Erik Kline
cca88b079c Extract DNS setting logic into DnsManager class
In future, managing DNS-over-TLS hostname lookup and netd programming
can be encapsulated here.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 64133961
Change-Id: I47ccfa99c30c780524c45c4af605e720ccba34a0
2018-01-11 18:16:50 +09:00
Erik Kline
3fce4e528d Add minimal test for setting DNS properties
Test: as follows
Change-Id: I5db1de3ee8e179edd56c93988b821242b81c2387
2018-01-11 18:16:20 +09:00
Lorenzo Colitti
09fdb083b9 Merge "Move more core networking tests to framework/base/tests/net." am: 7571202ce2 am: 8f852c341f
am: a033382c50

Change-Id: I1eb98a82426d7b7e085316f8a67cdd1e81912538
2018-01-11 04:17:51 +00:00
Lorenzo Colitti
a033382c50 Merge "Move more core networking tests to framework/base/tests/net." am: 7571202ce2
am: 8f852c341f

Change-Id: Iab87e7ce5b62a1ff21c7aee5d0f25597713f6c65
2018-01-11 04:10:01 +00:00
Lorenzo Colitti
7571202ce2 Merge "Move more core networking tests to framework/base/tests/net." 2018-01-11 03:09:40 +00:00
Lorenzo Colitti
640bec275d Move more core networking tests to framework/base/tests/net.
Test: "runtest frameworks-net" passes except for already-failing IpConnectivityMetricsTest
Change-Id: I2a20d546089699ac67bc819f10a8fcd50c637ac4
2018-01-10 23:35:16 +09:00
Malcolm Chen
deedc136a5 Merge "Add isMobileDataEnabled in TelephonyManager." am: 7b34214a6a am: 6b943d5deb
am: 5ccf698a78  -s ours

Change-Id: Id32dd08ebec6e0f90a08a360ce1b6488adbeab40
2018-01-10 00:18:56 +00:00
Malcolm Chen
5ccf698a78 Merge "Add isMobileDataEnabled in TelephonyManager." am: 7b34214a6a
am: 6b943d5deb

Change-Id: I132cc6d3de77f20717a40884683fb0c81fbb7083
2018-01-10 00:06:27 +00:00
Treehugger Robot
7b34214a6a Merge "Add isMobileDataEnabled in TelephonyManager." 2018-01-09 23:46:55 +00:00
TreeHugger Robot
6b9527f70e Merge "incidentd: dumping jobscheduler to proto" 2018-01-09 23:15:19 +00:00
Benedict Wong
3064d7cfe0 Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46 am: c93df5ca1c
am: 96b8f818af

Change-Id: I7ff85771945c68025ce8d66ca85313bac087b3a5
2018-01-09 21:23:35 +00:00
Kweku Adams
d4a5e35022 incidentd: dumping jobscheduler to proto
Bug: 65750819
Test: flash device and check incident.proto output
Also test: $ cts-tradefed run cts-dev --module CtsIncidentHostTestCases --test com.android.server.cts.JobSchedulerIncidentTest
Change-Id: I4abc01ca893edcbaf4d2254e4f807e06f5cb91f8
2018-01-09 12:05:39 -08:00
Benedict Wong
96b8f818af Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46
am: c93df5ca1c

Change-Id: I45289bc8e8b93f7eb912a76a10b951b1a615338a
2018-01-09 19:51:19 +00:00
Malcolm Chen
120de8cbe6 Add isMobileDataEnabled in TelephonyManager.
Added a new hidden API isMobileDataEnabled in TelephonyManager.
Rename related APIs to isUserMobileDataEnabled,
isUserMobileDataEnabled and setUserMobileDataEnabled to better
clarify their functionality.

Bug: 69814555
Test: build
Change-Id: I2f186f1e7550cafbe4ee3a5af293c39274cbfeaa
Merged-In: I2f186f1e7550cafbe4ee3a5af293c39274cbfeaa
2018-01-08 18:08:22 -08:00
Benedict Wong
48db30d4c7 Add validation to IpSecConfig algorithm setters
Adds checks to ensure that users can only set the correct types of
algorithms for the Authentication, Encryption and Authenticated
Encryption algorithms.

Bug: 65223935
Test: Added tests in IpSecConfigTest, and passed on aosp_marlin-eng
Change-Id: I462c77d9eb5710b8d03a48866453649d3b6fc6bf
2018-01-04 16:56:40 -08:00
Hugo Benichi
9aa103913b MacAddress: address api review comments
1) toSafeString() is renamed to toOuiString()
2) toOuiString() returns a String that only contains the first 3 bytes
   of the mac address.

Bug: 70336442
Test: runtest frameworks-net
Change-Id: I798d8fec32dbff5687a682028e5d90eb941f81c1
Merged-In: I798d8fec32dbff5687a682028e5d90eb941f81c1

(cherry pick from commit b41f870464)
2017-12-21 08:34:05 +09:00
Benedict Wong
e6714a3685 Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4 am: 5949912523
am: 1281a3629a

Change-Id: Id6a5ff71ead4566b9a91b9e9b6c78d81f1ac0f54
2017-12-20 18:58:30 +00:00
Benedict Wong
1281a3629a Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4
am: 5949912523

Change-Id: I9036fc2768dd9664ab7407b359f3c689c7ce700e
2017-12-20 18:42:26 +00:00
Benedict Wong
590c47f6dd Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: 12045eafe6 am: 8caa274ade
am: 46a6429f68

Change-Id: I4140f386687c579044f9b5fe59dd7e05f86000fe
2017-12-19 00:41:55 +00:00
Benedict Wong
46a6429f68 Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: 12045eafe6
am: 8caa274ade

Change-Id: I2f27c76a1f493ff4f0bd423c06f159e629866d4d
2017-12-19 00:27:57 +00:00
Hugo Benichi
a30c2c823d Merge changes I798d8fec,I4a2d5866 am: c5212b6654 am: 99be302c71
am: 5864454338  -s ours

Change-Id: Ib8024661997e84e64cd56a3ca9ee17c514122ead
2017-12-19 00:23:04 +00:00
Hugo Benichi
5864454338 Merge changes I798d8fec,I4a2d5866 am: c5212b6654
am: 99be302c71

Change-Id: I41b507c4e4bf9b8b9082f5e7eaab8985b5bbef41
2017-12-19 00:06:00 +00:00
Benedict Wong
3e4e37a38b [ipsec-doze] Add fchown to IpSecService to support doze
Encap sockets are currently created as the system server, and should be
fchown'd to the user for whom it was created on behalf of.

Bug: 62994731
Test: New tests added and run to IpSecService
Change-Id: Icc49e709ae588981e69765fdb77537d7ffbac5fe
2017-12-18 16:01:58 -08:00
Benedict Wong
12045eafe6 Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" 2017-12-18 23:50:52 +00:00
TreeHugger Robot
d858917c08 Merge "Add isMobileDataEnabled in TelephonyManager." 2017-12-18 22:08:38 +00:00
Benedict Wong
768c332e51 [ipsec-qtaguid] Tag sockets upon creation of encap sockets
Added calls to tag encap sockets to that of the UID for which the encap
socket is being created on behalf of. This ensures that all data
accounting generated for the UDP-encap-ESP socket is correctly billed to
the right UID.

Bug: 62994731
Test: New tests added to IpSecServiceTest.java, passing
Change-Id: I15365ea9c982fd7b4e3cdeff314ddfba2289c86e
2017-12-18 19:46:06 +00:00
Hugo Benichi
b41f870464 MacAddress: address api review comments
1) toSafeString() is renamed to toOuiString()
2) toOuiString() returns a String that only contains the first 3 bytes
   of the mac address.

Bug: 70336442
Test: runtest frameworks-net
Change-Id: I798d8fec32dbff5687a682028e5d90eb941f81c1
2017-12-18 09:22:47 +09:00
Hugo Benichi
635a73111c Expose the MacAddress class in the api
Test: built,  flashed, $ runtest frameworks-net
Bug: 69390696
Change-Id: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d
Merged-In: Ica5efdf5ffe8ad2500a87f574508a2bcd074b33d

(cherry picked from commit d411cf61ed5b948aaf6f6234217d6c6999c35159)
2017-12-18 09:21:26 +09:00
nharold
02470067d8 Merge "Fix broken test due to API rename" am: e6238af8e5 am: ee898c81a7
am: dd0006fcd4

Change-Id: Ie52ce3da0507421313a73688e831d3802b888cfd
2017-12-14 23:38:17 +00:00
nharold
dd0006fcd4 Merge "Fix broken test due to API rename" am: e6238af8e5
am: ee898c81a7

Change-Id: I7e99991cd2c71c66e1acb3aa3957efb28c9a426a
2017-12-14 23:28:16 +00:00
Nathan Harold
4d3d0e096b Fix broken test due to API rename
A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.

Bug: 69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173
2017-12-14 23:13:45 +00:00
nharold
e6238af8e5 Merge "Fix broken test due to API rename" 2017-12-14 23:07:53 +00:00
Nathan Harold
55bd2e0e92 Fix broken test due to API rename
A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.

Bug: 69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173
2017-12-14 23:04:42 +00:00