Commit Graph

3306 Commits

Author SHA1 Message Date
nharold
e7e42ceb02 Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: 6d5aea8811 am: ad96984eb5
am: 0a177afbb8

Change-Id: I2ce9d740b82f591b847150ec1eaffa39bfbd0241
2018-02-20 23:21:59 +00:00
nharold
0a177afbb8 Merge "Fix ConnectivityServiceTest for NATT Keepalive" am: 6d5aea8811
am: ad96984eb5

Change-Id: I3c28cbb55f8226776792df9cacf1b5e527389157
2018-02-20 23:07:53 +00:00
nharold
ad96984eb5 Merge "Fix ConnectivityServiceTest for NATT Keepalive"
am: 6d5aea8811

Change-Id: Idbdffc7bbd2d9a96f6e6052810722df04a20a65c
2018-02-20 22:55:38 +00:00
nharold
6d5aea8811 Merge "Fix ConnectivityServiceTest for NATT Keepalive" 2018-02-20 19:17:23 +00:00
Chalard Jean
473b3b7f03 Merge "DO NOT MERGE : fix useless import" 2018-02-18 23:14:42 +00:00
Scott Kennedy
9c356d7590 Merge "Add @Nullable to return values in Uri" am: cfc6897a39 am: a03c35d74a
am: 68636f2e8a

Change-Id: Iac3c67b843418ca3529be782667c02f4a35fee9c
2018-02-17 08:08:30 +00:00
Scott Kennedy
68636f2e8a Merge "Add @Nullable to return values in Uri" am: cfc6897a39
am: a03c35d74a

Change-Id: Ia145a065eabe75e72051287005cd5ab341fe2824
2018-02-17 07:58:31 +00:00
Treehugger Robot
cfc6897a39 Merge "Add @Nullable to return values in Uri" 2018-02-17 04:49:23 +00:00
Nathan Harold
63dd81390d Fix ConnectivityServiceTest for NATT Keepalive
Fix test breakages I caused when adding cell
support for NATT keepalives.

-Make the minimum keepalive interval a constant in
 ConnectivityManager and use it in tests.
-Re-Disallow IPv6 Keepalives

Bug: 73327535
Test: 'runtest -x ConnectivityServiceTest' now passes
Change-Id: I5ec4367d250ee371014e65c897c3897a25a05e2d
2018-02-16 16:34:50 -08:00
Chalard Jean
77fb07e9e9 DO NOT MERGE : fix useless import
This was added to avoid a merge conflict at a sensitive time.
It can (and should) go.

Test: no code change
Change-Id: I11d73e2d988ae61a168aa0f1cc7c2c506f509d30
2018-02-16 17:21:39 +09:00
Hugo Benichi
a654f06d40 Merge "Add missing'}' in javadoc of public API method" am: f50d9fbdc1 am: 054bed5968
am: 7b2ffeff58

Change-Id: I2cfda60077c57d151fb8599845cd202bbc4e625d
2018-02-16 07:58:57 +00:00
Hugo Benichi
7b2ffeff58 Merge "Add missing'}' in javadoc of public API method" am: f50d9fbdc1
am: 054bed5968

Change-Id: I51ad1f6b8d42f4c791c07d41297f02d3e798ccd9
2018-02-16 07:50:57 +00:00
Treehugger Robot
f50d9fbdc1 Merge "Add missing'}' in javadoc of public API method" 2018-02-16 03:19:35 +00:00
Scott Kennedy
e26450b714 Add @Nullable to return values in Uri
This makes it much easier to add null-safety when calling this from Kotlin.

Test: refactoring CL. Existing unit tests still pass.
Change-Id: I55c33ad4ff1306afd80c1a5562c54dfcb6068b0b
2018-02-15 23:53:47 +00:00
Chalard Jean
243a087568 Merge changes I3d68dbf8,I6ea524bb,I978d9119 am: edab226d0e am: 6fe110fa36
am: 3d3fa22698

Change-Id: Ic6d639358c3310820bd925df93d4843d7edffc57
2018-02-15 14:23:57 +00:00
Lorenzo Colitti
cfaaecf9ce Merge changes Icd56662d,I0ece820f am: 47ef64b0d2 am: bf66580c0b
am: 00d125652e

Change-Id: Idbfe334fec6ded270635eb204686a89d4666a61a
2018-02-15 14:14:36 +00:00
Chalard Jean
3d3fa22698 Merge changes I3d68dbf8,I6ea524bb,I978d9119 am: edab226d0e
am: 6fe110fa36

Change-Id: Iebc6a31b975fd7ba429bd9bae89cd9783776d1c3
2018-02-15 13:09:26 +00:00
Lorenzo Colitti
00d125652e Merge changes Icd56662d,I0ece820f am: 47ef64b0d2
am: bf66580c0b

Change-Id: I5faf7049c376eb400a41231448d9414471ae6777
2018-02-15 11:52:34 +00:00
Chalard Jean
edab226d0e Merge changes I3d68dbf8,I6ea524bb,I978d9119
* changes:
  Deprecate CONNECTIVITY_ACTION.
  Publish FOREGROUND and add NOT_SUSPENDED capabilities.
  Send null UIDs to apps instead of single-uid lists.
2018-02-15 11:25:36 +00:00
Lorenzo Colitti
47ef64b0d2 Merge changes Icd56662d,I0ece820f
* changes:
  Restrict OWNERS in android.net.*
  Add OWNERS to the libandroid_net library.
2018-02-15 10:03:26 +00:00
Lorenzo Colitti
fd76d5040b Restrict OWNERS in android.net.*
Test: None
Change-Id: Icd56662dcbc86b49015d094fd8ae2ade235aa475
2018-02-15 16:43:44 +09:00
Benedict Wong
1f3228d242 Merge "Copy IpSecConfig when IpSecTransforms are created" am: 2c8456b22e am: 3988c929ad
am: fe9728d494

Change-Id: I511e6b0cadfc24f24a492ae63c48a8b4baa89edb
2018-02-15 06:01:49 +00:00
Benedict Wong
fe9728d494 Merge "Copy IpSecConfig when IpSecTransforms are created" am: 2c8456b22e
am: 3988c929ad

Change-Id: I041cd94be9cefc997b95478444661b557d95e3dc
2018-02-14 21:25:08 +00:00
Chalard Jean
054cd16781 Deprecate CONNECTIVITY_ACTION.
That was its destiny.
Use NetworkCallbacks instead.

Test: runtest frameworks-net, but this is only doc changes
Change-Id: I3d68dbf817de92c66d899a7cc4519c5639e4c049
2018-02-14 15:14:44 +09:00
Chalard Jean
804b8fb968 Publish FOREGROUND and add NOT_SUSPENDED capabilities.
NOT_SUSPENDED and FOREGROUND are capabilities that need to
be public so as to reach feature parity with what information
can be gotten through the use of CONNECTIVITY_ACTION and
synchronous calls to ConnectivityManager. This change makes
them public, and wires up the NOT_SUSPENDED capability.
This deprecates in effect the old onSuspended and onResumed
callbacks, but these have never been public.

This also converts the onAvailable path from a multiple
binder call design to a simpler, single binder call. This
is only for internal convenience

Test: runtest frameworks-net
Test: cts
Test: also manual testing
Change-Id: I6ea524bb361ecef0569ea2f9006c1e516378bc25
2018-02-14 15:14:41 +09:00
Benedict Wong
9dd3a38527 Copy IpSecConfig when IpSecTransforms are created
This change prevents IpSecTransforms from being inadvertently modified
by changes to the IpSecConfig. Specifically, once the transform is
created, it takes a copy of the config, rather than a reference.

Bug: 69385347
Test: New tests added, and all test passing
Change-Id: I89b8660c175ca20aa70352dcda893434ff7fd42b
2018-02-13 23:23:13 +00:00
nharold
29d6c4367c Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode" am: 43699e90f3 am: e736f83caf
am: 0f7857e587

Change-Id: Ib33ccecfe2fc600c05a208d24df10a474addb0e5
2018-02-10 02:11:15 +00:00
nharold
0f7857e587 Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode" am: 43699e90f3
am: e736f83caf

Change-Id: If7330b4fdf5d2ccbddb590ab81a4b19c1f612b66
2018-02-10 01:57:50 +00:00
Nathan Harold
5a920ca377 Require NETWORK_STACK Permission for IpSec Tunnel Mode
At least until further permissions are agreed upon,
the NETWORK_STACK permission is sufficient to ensure
that access to the tunnel mode APIs is secure, and
this permission will always be a sufficient condition.
Thus, adding NETWORK_STACK.

Bug: 66955045
Test: compilation
Change-Id: I2dc36896a52d2e71fad55041507d68ca91191ffc
2018-02-08 21:16:51 +00:00
Hugo Benichi
ca867dc524 Add missing'}' in javadoc of public API method
Bug: 73052508
Test: pure documentation change
Change-Id: I92514629da1b000dd3d1165acd8efcdec75b49b9
2018-02-07 21:17:43 +09:00
Jong Wook Kim
2dcd15de37 Merge "MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator" am: 9f16828767 am: 775861bb12
am: b6b2957b8e

Change-Id: I5f2d395705841b7da03b1552b16507466e47ef84
2018-02-07 09:26:56 +00:00
Jong Wook Kim
b6b2957b8e Merge "MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator" am: 9f16828767
am: 775861bb12

Change-Id: I6dba4e244c660d29f107e471250d39e9caafb17e
2018-02-07 05:32:01 +00:00
Jong Wook Kim
f0a55cc9ed MacAddress: Use SecureRandom and add a 46 bit randomized MAC generator
Use SecureRandom instead of Random since Random is time based and can
increase the chance of generating same MAC address across multiple
devices.

createRandomUnicastAddress should randomize all bits of the address,
except for locally assigned bit and unicast bit. The previous method
that only randomizes NIC and use Google Base OUI is renamed to
createRandomUnicastAddressWithGoogleBase.

Bug: 72450936
Test: runtest frameworks-net
Change-Id: Icda650638c2c1c9fd90d509a87e86347c0e05f2d
2018-02-07 01:28:46 +00:00
Hugo Benichi
fbbd75839d Merge "Update OWNER files for connectivity" am: 771e229a23 am: ce0c31d392
am: 9a70530107

Change-Id: I1754c7bd602db58bd6c4e72d5f0dd77786d730da
2018-02-05 00:54:50 +00:00
Hugo Benichi
9a70530107 Merge "Update OWNER files for connectivity" am: 771e229a23
am: ce0c31d392

Change-Id: I5a995856aa347874b534312212ca73ffff0193c0
2018-02-05 00:39:54 +00:00
Hugo Benichi
771e229a23 Merge "Update OWNER files for connectivity" 2018-02-04 23:18:52 +00:00
Pavel Maltsev
9c70dc79dd Merge "Enable multiple active Ethernet interfaces" am: 0a6c539901 am: ac908d6728
am: 3379a3eff9

Change-Id: Ibd84c2ba3252e3d65ba4a63a0be912747ea18df9
2018-02-04 01:06:51 +00:00
Jeff Sharkey
c7dc046e0e Merge "Polished rapid data usage alerting." 2018-02-03 22:07:34 +00:00
Jeff Sharkey
bfb43ea9e6 Polished rapid data usage alerting.
Switch to reading limit information from NetworkPolicy, which is
typically populated from SubscriptionPlan.  This lets users have
direct control over the limits we're using to trigger rapid usage
alerts, and makes the feature work without requiring that the carrier
wire up SubscriptionPlan information.

Let the user "snooze" the rapid usage alerting for a day at a time,
so we're less annoying to them.  Send the snooze broadcasts as
foreground, so that we don't re-post notifications while working
through a long background broadcast queue.

Fix notifications to use the "ALERTS" channel, since these alerts
really are higher priority than simple "STATUS" updates; this also
gives us HUN behavior when in full-screen apps.

Update both service and unit tests to work directly with
NotificationManager, instead of the raw AIDL.

Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug: 72444638, 72436702
Change-Id: I8d9138522a7779cc68eb9fa4777b50facb6567b7
2018-02-03 12:49:30 -07:00
Jeff Sharkey
ad357d1839 Pass in the user defined by Context.
The majority of Manager-style classes already use Context.getUserId()
when making calls into the OS, so clean up the remaining callers to
unify behind this strategy.

This gives @SystemApi developers a nice clean interface to interact
across user boundaries, instead of manually adding "AsUser" or
"ForUser" method variants, which would quickly become unsustainable.

Test: builds, boots
Bug: 72863821
Exempt-From-Owner-Approval: trivial changes
Change-Id: Ib772ec4438e57a2ad4950821b9432f9842998451
2018-02-03 02:11:45 +00:00
Pavel Maltsev
3379a3eff9 Merge "Enable multiple active Ethernet interfaces" am: 0a6c539901
am: ac908d6728

Change-Id: I95a4e5d519857950297f5948525990c4808cd5fd
2018-02-03 01:25:34 +00:00
Treehugger Robot
0a6c539901 Merge "Enable multiple active Ethernet interfaces" 2018-02-02 23:13:54 +00:00
Chenbo Feng
690a59843c Merge "Return non-negetive value in getMobileStats method" am: bb1d07e681 am: 515a54a93e
am: 7b5487cd0a

Change-Id: I304f42d473289ad876f6ceae8d6866e4248686a9
2018-02-02 17:59:53 +00:00
Chenbo Feng
7b5487cd0a Merge "Return non-negetive value in getMobileStats method" am: bb1d07e681
am: 515a54a93e

Change-Id: I54a400b4231c38db25aa1b717f302a8a52e1773e
2018-02-02 17:02:10 +00:00
Adam Vartanian
fa872759b0 Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev am: 36c202ed80 am: cf31e066a9 am: f64dcd5bb5
am: 6e6d44012f

Change-Id: Ic105693209501df8aa09d05f993f506aeb77eca5
2018-02-02 08:31:42 +00:00
Adam Vartanian
6e6d44012f Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev am: 36c202ed80 am: cf31e066a9
am: f64dcd5bb5

Change-Id: I5980a614656d41f648da5a57c933533705a89c63
2018-02-02 07:05:29 +00:00
Treehugger Robot
bb1d07e681 Merge "Return non-negetive value in getMobileStats method" 2018-02-02 04:22:34 +00:00
Hugo Benichi
1c8756154a Update OWNER files for connectivity
Test: no functional change
Change-Id: I25276c769468c37970cb1915660fee29e589008c
2018-02-02 12:49:45 +09:00
Adam Vartanian
f64dcd5bb5 Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev am: 36c202ed80
am: cf31e066a9

Change-Id: I774ce7a4046548222c3a0d913bbfcc3e0759ede3
2018-02-02 03:46:04 +00:00
Adam Vartanian
cf31e066a9 Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev
am: 36c202ed80

Change-Id: Ieb4b5cd2cafd20d4898bc781c43e41d3bed0d7dc
2018-02-01 23:44:18 +00:00