Commit Graph

8270 Commits

Author SHA1 Message Date
Automerger Merge Worker
725abe99eb Merge "Add API for apps to check if they are the network owner" am: 584869a699 am: 4a9782699d am: c0e65d1aaf
Change-Id: Ibe4cc2bd1d588dcbccd83f53ee3da9d067ae85b6
2020-01-24 18:47:28 +00:00
Automerger Merge Worker
c0e65d1aaf Merge "Add API for apps to check if they are the network owner" am: 584869a699 am: 4a9782699d
Change-Id: Ifbcc5782a2413ec455896af52a9ac26bc3cda82c
2020-01-24 18:35:13 +00:00
Qingxi Li
4a9782699d Merge "Add API for apps to check if they are the network owner"
am: 584869a699

Change-Id: I1316c7fccd9b7a35ff6d8a79a8afa13644d9ab54
2020-01-24 10:24:12 -08:00
Qingxi Li
584869a699 Merge "Add API for apps to check if they are the network owner" 2020-01-24 18:12:52 +00:00
Qingxi Li
bb3347b118 Add API for apps to check if they are the network owner
This CL extends NetworkCapabilities#mEstablishingVpnAppUid
to the network owner app UID and introduces a new public API
to get this owner app's UID.

Bug: 142072839
Test: atest FrameworksNetTests
Change-Id: Id83cdea62b89b586aff74e51e3fee60e53d37d4c
2020-01-24 17:28:23 +00:00
Automerger Merge Worker
515ea576a9 Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 8f1c6d2bfd am: a358c3c92b am: b3d88f7fae
Change-Id: Iec4dcf4c39edb8994ed72b9550845ea5962e836a
2020-01-24 17:16:19 +00:00
Automerger Merge Worker
5c8b31eaf7 Merge "Define ConnectivityDiagnosticsCallback IBinder impl." am: b9db44d909 am: 47b9f70ebd am: da5eb4d249
Change-Id: I5a77211d1f940166c02c4aac31c9add9466c76b1
2020-01-24 17:15:46 +00:00
Automerger Merge Worker
468fae8f2d [automerger skipped] Merge changes I7065d081,Ic7c3a331,Ia432057b am: 3b219bf784 am: 6043cc09ed am: 6cae47f6e6 -s ours
am skip reason: Change-Id I7065d081c11bc606d691f76ac8b499dd075d6504 with SHA-1 de933af7a7 is in history

Change-Id: Ifa5a0b23acc51bc01d480046a4354376083ff84a
2020-01-24 17:15:22 +00:00
Automerger Merge Worker
0126e1171b [automerger skipped] Allows the caller to specify configuration by TetheringRequest am: cc1bc1b1a4 am: 1817c9fc4d am: 545d3c6830 -s ours
am skip reason: Change-Id Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3 with SHA-1 10ddd02848 is in history

Change-Id: I036e4263a187c92c88c7fc3d33484efd6b687fcb
2020-01-24 17:15:06 +00:00
Automerger Merge Worker
dbfa4c8d0c [automerger skipped] Make TetheringManager to system API am: eeea0be5b7 am: 6ea097c34e am: 5511101bae -s ours
am skip reason: Change-Id Ia432057bf9056727c4a0ca97d160a49274d33581 with SHA-1 75721e4b20 is in history

Change-Id: Ic852b8740f89c0107c770375fbae6f00e96a31c4
2020-01-24 17:15:03 +00:00
Automerger Merge Worker
b3d88f7fae Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 8f1c6d2bfd am: a358c3c92b
Change-Id: Iaa36b7036d916ef7a48314a3dfa224750e720c62
2020-01-24 16:50:29 +00:00
Automerger Merge Worker
da5eb4d249 Merge "Define ConnectivityDiagnosticsCallback IBinder impl." am: b9db44d909 am: 47b9f70ebd
Change-Id: I771e82db91ed72b5263c1ea73a4b36f85e9f4e61
2020-01-24 16:50:19 +00:00
Automerger Merge Worker
6cae47f6e6 Merge changes I7065d081,Ic7c3a331,Ia432057b am: 3b219bf784 am: 6043cc09ed
Change-Id: I801b7f351988322648108a15f7e5d06a47d3a102
2020-01-24 16:49:47 +00:00
Automerger Merge Worker
545d3c6830 Allows the caller to specify configuration by TetheringRequest am: cc1bc1b1a4 am: 1817c9fc4d
Change-Id: Icb6d93cc76b7d5511ec0c556c0ed512198bfb781
2020-01-24 16:49:44 +00:00
Automerger Merge Worker
5511101bae Make TetheringManager to system API am: eeea0be5b7 am: 6ea097c34e
Change-Id: Iabb947b90eaaedbce30478e4294823acce085cdb
2020-01-24 16:49:41 +00:00
Automerger Merge Worker
a358c3c92b Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 8f1c6d2bfd
Change-Id: I5e53fec27728a65e05c7fdf7501dee1052c52e78
2020-01-24 16:39:47 +00:00
Automerger Merge Worker
47b9f70ebd Merge "Define ConnectivityDiagnosticsCallback IBinder impl." am: b9db44d909
Change-Id: I1d60026a7b31af2bc329187685780744c20d7c8c
2020-01-24 16:39:32 +00:00
Automerger Merge Worker
6043cc09ed Merge changes I7065d081,Ic7c3a331,Ia432057b am: 3b219bf784
Change-Id: I1e5d79606f63540f2d9ae3187057e2ba84f4dcb8
2020-01-24 16:38:56 +00:00
Automerger Merge Worker
1817c9fc4d Allows the caller to specify configuration by TetheringRequest am: cc1bc1b1a4
Change-Id: I2595221b08eb389dcbe8643f3839707a15bc6ac0
2020-01-24 16:38:45 +00:00
Automerger Merge Worker
6ea097c34e Make TetheringManager to system API am: eeea0be5b7
Change-Id: I9660401878cdbc2feedc7e950f4f02538ca070eb
2020-01-24 16:38:38 +00:00
Cody Kesting
8f1c6d2bfd Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." 2020-01-24 16:38:22 +00:00
Cody Kesting
b9db44d909 Merge "Define ConnectivityDiagnosticsCallback IBinder impl." 2020-01-24 16:38:08 +00:00
Lorenzo Colitti
3b219bf784 Merge changes I7065d081,Ic7c3a331,Ia432057b
* changes:
  Add API for tethering clients change
  Allows the caller to specify configuration by TetheringRequest
  Make TetheringManager to system API
2020-01-24 16:23:18 +00:00
markchien
cc1bc1b1a4 Allows the caller to specify configuration by TetheringRequest
This is initial work to allow caller to pass their prefered
configuration to start tethering. Caller may able to specify the
downstream interface ipv4 address with dhcp server disabled for
static IP configuration, or able to exempt entitlement check if
they have permission in follow up CL.

Bug: 141256482
Test: -atest TetheringTest
      -ON/OFF wifi tethering

Change-Id: Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3
Merged-In: Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3
2020-01-24 23:39:50 +09:00
markchien
eeea0be5b7 Make TetheringManager to system API
Also deprecated tethering APIs in ConnectivityManager.
Will have follow up change to remove @hide tethering function in
ConnectivityManager.

Bug: 145093446
Bug: 148038547
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ia432057bf9056727c4a0ca97d160a49274d33581
Merged-In: Ia432057bf9056727c4a0ca97d160a49274d33581
2020-01-24 23:39:49 +09:00
Jack Yu
4f48347eb5 Merge "Disabled the tests" 2020-01-24 09:24:26 +00:00
Automerger Merge Worker
2ad31443cf Merge "Add list of Administrator UIDs to NetworkCapabilities." am: c3ce33eaa9 am: d2945fdcf7 am: 657f947261
Change-Id: Idcd07e357703f7ae3f2c09de33b80b328e6bd384
2020-01-24 08:06:14 +00:00
Automerger Merge Worker
0ff42382b0 Merge "Define Bundle keys for ConnectivityDiagnostics." am: 0fd8b96249 am: 546778d792 am: 174004adec
Change-Id: Iad2482b4599ce9d2c21baf9359cbacd5fff9a88f
2020-01-24 08:03:39 +00:00
Automerger Merge Worker
2aa200b4cb Merge "Fix generic inferred type argument." am: ad1698053e am: 7d1b37fc4f am: 1421047edf
Change-Id: Ie786828d0e940acb1feeb64618ddc78757519fb4
2020-01-24 08:01:20 +00:00
Automerger Merge Worker
5b5ef7c2c4 Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 am: 1f3f2daefc am: 3b00ed1ca5
Change-Id: I4ff406efcaada5a9306afc79290cb37bdeef71f2
2020-01-24 07:59:53 +00:00
Jack Yu
ae0809b118 Disabled the tests
Will re-enable after fixing the negative time issue

Test: LinkAddressTest

Bug: 148257086
Change-Id: Ia6ce0608a2ce95be980e4f9ea62315076c4453be
2020-01-23 23:06:21 -08:00
Remi NGUYEN VAN
a09393703b Merge "Allows the caller to specify configuration by TetheringRequest" 2020-01-24 02:38:52 +00:00
Nathan Harold
f6fc8abbb0 Fix javadoc build break s/line/link/
Bug: 148248781
Test: compilation
Change-Id: I9df208a9b063b71b2f6cc3099005d1ab38044cd2
2020-01-23 18:03:46 -08:00
Jack Yu
01494a73e2 Added expiration time and deprecation time support
Added link address deprecation time and expiration
time for SSC mode 3 support.

Bug: 135717900
Bug: 142949345
Test: LinkAddressTest

Change-Id: Ibc030d2a70ded66e00dd3bdae209609b9118de78
2020-01-23 14:53:43 -08:00
Cody Kesting
9c69dd4ebb Add AIDL for registering ConnectivityDiagnosticCallbacks.
ConnectivityService needs to allow for registering and unregistering
ConnectivityDiagnosticsCallbacks as part of ConnectivityDiagnostics API.
These methods will be used by ConnectivityDiagnosticsManager so that
privileged applications can receive notifications on network events by
the system.

Bug: 146444622
Test: compiles
Change-Id: Id00b30af5692db5eef47d0d948897148578d3b32
2020-01-23 11:30:04 -08:00
Cody Kesting
f259e358f1 Define ConnectivityDiagnosticsCallback IBinder impl.
An IBinder implementation of the ConnectivityDiagnosticsCallback AIDL is
needed so that apps can receive notfications with their registered
callbacks for callbacks coming from ConnectivityService.

Bug: 143187964
Bug: 147848028
Test: compiles
Test: atest FrameworksNetTests
Change-Id: Ie62678f794d81e1edee68977ec684a911b5070b7
2020-01-23 11:30:04 -08:00
Automerger Merge Worker
657f947261 Merge "Add list of Administrator UIDs to NetworkCapabilities." am: c3ce33eaa9 am: d2945fdcf7
Change-Id: I1636f33bf5667442ee9a0b9d463e1ce4bcb2b737
2020-01-23 18:28:04 +00:00
Cody Kesting
d2945fdcf7 Merge "Add list of Administrator UIDs to NetworkCapabilities."
am: c3ce33eaa9

Change-Id: I7e5d0950ba99419d83fed6922a8f29aa530d4b00
2020-01-23 10:18:02 -08:00
Cody Kesting
c3ce33eaa9 Merge "Add list of Administrator UIDs to NetworkCapabilities." 2020-01-23 17:52:58 +00:00
Automerger Merge Worker
174004adec Merge "Define Bundle keys for ConnectivityDiagnostics." am: 0fd8b96249 am: 546778d792
Change-Id: Icbc4c95ebb4337d5c5b371e2fc7fc893e86cfe17
2020-01-23 17:05:21 +00:00
Nathan Harold
546778d792 Merge "Define Bundle keys for ConnectivityDiagnostics."
am: 0fd8b96249

Change-Id: I2a5ac28aea190d06dc2e7e6f8bb9950e0a18e3f7
2020-01-23 08:43:27 -08:00
Nathan Harold
0fd8b96249 Merge "Define Bundle keys for ConnectivityDiagnostics." 2020-01-23 16:34:16 +00:00
markchien
10ddd02848 Allows the caller to specify configuration by TetheringRequest
This is initial work to allow caller to pass their prefered
configuration to start tethering. Caller may able to specify the
downstream interface ipv4 address with dhcp server disabled for
static IP configuration, or able to exempt entitlement check if
they have permission in follow up CL.

Bug: 141256482
Test: -atest TetheringTest
      -ON/OFF wifi tethering

Change-Id: Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3
2020-01-23 23:19:23 +09:00
Cody Kesting
bfc074595d Define Bundle keys for ConnectivityDiagnostics.
ConnectivityDiagnosticsManager defines several callbacks that can be
invoked for registered ConnectivityDiagnosticsCallback instances.
onConnectivityReport and onDataStallSuspected include ConnectivityReport
and DataStallReport, respectively, both of which contain a
PersistableBundle to be used for passing information from the
NetworkStack module to the registered callback. When values will be
consistently passed inside these bundles, their keys are defined inside
ConnectivityReport and DataStallReport.

Bug: 147249364
Test: compiles
Test: atest FrameworksNetTests
Change-Id: Icc6bd4337865692b6ca7c18eacabff59ba3a5bb9
2020-01-23 00:49:17 -08:00
Cody Kesting
fc16f69943 Add list of Administrator UIDs to NetworkCapabilities.
Adds a list of administrator UIDs to NetworkCapabilties. The carrier
privilege permission model allows multiple uids to be granted
network-management privileges via certificates stored on a SIM card or
in CarrierConfigManager. The current NetworkCapabilities only allows a
single uid to be stored to track the owner of the network - this change
remedies that discrepancy.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: I3169d31e0270c976a720e80363cb268cbafd0455
2020-01-22 23:59:56 -08:00
Automerger Merge Worker
1421047edf Merge "Fix generic inferred type argument." am: ad1698053e am: 7d1b37fc4f
Change-Id: Ia4a304e8a62ca920cf51647ced2a1ea841c8dca2
2020-01-23 07:09:35 +00:00
Cody Kesting
7d1b37fc4f Merge "Fix generic inferred type argument."
am: ad1698053e

Change-Id: I5ac5579440d309c583debe5ce876721a84460c84
2020-01-22 22:45:49 -08:00
Treehugger Robot
ad1698053e Merge "Fix generic inferred type argument." 2020-01-23 06:39:57 +00:00
Automerger Merge Worker
3b00ed1ca5 Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 am: 1f3f2daefc
Change-Id: I91759cf3b68f89500352c6d952643a45e0665ee2
2020-01-23 06:18:15 +00:00
Benedict Wong
1f3f2daefc Merge changes from topic "add-ikev2-vpn-types"
am: adb79e3b39

Change-Id: I205121bbd8ef8adbe5e7a5ea1c57bbcac0efae0e
2020-01-22 22:09:41 -08:00