LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,010 Commits 2 Branches 0 Tags
a60064b09d83b4fc9a2d893c6094aaee8fe110ef
Commit Graph

13010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
a60064b09d Merge "Move shared Proxy method and constants to shared lib" am: c42519e903 am: 067b92e2a7 am: ee026c93fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bf2cb335d4154749e69147e9c549e1be548e8a3
 2021-02-08 12:12:48 +00:00
Chiachang Wang
ee026c93fb Merge "Move shared Proxy method and constants to shared lib" am: c42519e903 am: 067b92e2a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a12cbd0101d6cc637f87e524713ba5056ac6e01
 2021-02-08 11:31:48 +00:00
Chiachang Wang
067b92e2a7 Merge "Move shared Proxy method and constants to shared lib" am: c42519e903 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c6ff3c4c82d12334b52871863cc7d6d5c6872c9
 2021-02-08 11:00:55 +00:00
Chiachang Wang
c42519e903 Merge "Move shared Proxy method and constants to shared lib" 2021-02-08 10:27:05 +00:00
Chiachang Wang
0fcb9872b4 Move shared Proxy method and constants to shared lib 
The static validate() method an PROXY_* constants in Proxy are
used by both module and Settings. After Proxy is moving into
connectivity module, Setting will not able to access them.
Thus, move them to ProxyUtils in net shared lib.

Bug: 172183305
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases:ProxyInfoTest
Change-Id: I02c88aeaeb53d62b87a42a2d8ead9b140b054650
 2021-02-08 10:25:07 +00:00
Treehugger Robot
41eda8d96a Merge "[VCN03] Linger the newly connected network for a short time" am: c5bd380f2b am: 733561ba51 am: d405f3a995 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I048c81620a3ad4af481c43d27de10f92ca4fb18c
 2021-02-08 05:59:15 +00:00
Treehugger Robot
d405f3a995 Merge "[VCN03] Linger the newly connected network for a short time" am: c5bd380f2b am: 733561ba51 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30d7e79a273436e49331a0cab285c03be32f5390
 2021-02-08 05:57:46 +00:00
Chiachang Wang
f8c1fee526 Merge "Create new system API in UserHandle to get uid" am: 2173785652 am: 59a29b670e am: 7bfad333ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia28b9c251b67344c1d4d07a2d600a53ca36b170b
 2021-02-08 05:57:39 +00:00
Treehugger Robot
733561ba51 Merge "[VCN03] Linger the newly connected network for a short time" am: c5bd380f2b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icabf50b92925fe3bcb5b45e40cc1c696c73e7380
 2021-02-08 05:19:15 +00:00
Chiachang Wang
7bfad333ee Merge "Create new system API in UserHandle to get uid" am: 2173785652 am: 59a29b670e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id31355ce04a22c27bb83793b5664a3f6358fd83d
 2021-02-08 05:14:09 +00:00
Treehugger Robot
c5bd380f2b Merge "[VCN03] Linger the newly connected network for a short time" 2021-02-08 04:57:35 +00:00
Chiachang Wang
59a29b670e Merge "Create new system API in UserHandle to get uid" am: 2173785652 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8303c08be1e76ff48e60965518de4d469dc0352
 2021-02-08 04:30:03 +00:00
Chiachang Wang
2173785652 Merge "Create new system API in UserHandle to get uid" 2021-02-08 03:56:39 +00:00
Lorenzo Colitti
0124cc7c3c Merge "More cleanly separate requests and listens." am: b46257ecff am: 05bf3641ea am: 882630424c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565202

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I859c265fb73352cc8e0c2db5cdd119644c230dd3
 2021-02-07 19:52:03 +00:00
Lorenzo Colitti
882630424c Merge "More cleanly separate requests and listens." am: b46257ecff am: 05bf3641ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565202

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee85ef5889b9bd4ca72115499ac94c8abeb4feb2
 2021-02-07 19:08:37 +00:00
Lorenzo Colitti
05bf3641ea Merge "More cleanly separate requests and listens." am: b46257ecff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565202

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7ed944bb1c2b81dd3f6ff74c195a3bc5f22ea51
 2021-02-07 18:29:52 +00:00
Lorenzo Colitti
b46257ecff Merge "More cleanly separate requests and listens." 2021-02-07 18:04:50 +00:00
Lorenzo Colitti
74d34ec687 More cleanly separate requests and listens. 
Currently, NetworkRequest has several types of requests (LISTEN,
TRACK_DEFAULT, REQUEST, BACKGROUND_REQUEST), and we expect more
to be added.

There are really three categories of request:
1. Requests satisfied by only one network and will keep that
   network up, and thus need to be sent to NetworkProviders:
   REQUEST, BACKGROUND_REQUEST.
2. Requests satisfied by only one network but will not keep that
   network up: TRACK_DEFAULT
3. Requests satisfied by multiple networks and will not keep any
   networks up: LISTEN.

Unfortunately the separation is not very clear. Currently, for
any valid request, either isListen() will return true or
isRequest() will return true. This makes it impossible to tell
whether a particular request should be sent to NetworkProviders,
so the current code sends TRACK_DEFAULT requests to
NetworkProviders as well. This is incorrect - a TRACK_DEFAULT
should never keep a network up, for example.

This CL attempts to clarify things by making isRequest() return
false for TRACK_DEFAULT requests and thus never sending them to
NetworkProviders. After this CL:

- isRequest will return true only for requests that attempt to
  bring up or keep up a network.
- isListen will return true only for requests that match multiple
  networks but do not keep any of them up.
- Neither will return true for TRACK_DEFAULT.

Test: atest ConnectivityServiceTest
Change-Id: I7aad30ade8f7ab2a179e53483d9afd8675f64a12
 2021-02-07 18:20:59 +09:00
Serik Beketayev
b4d83595ff Merge "Revert "[Mainline] Migrate android.utils package items"" am: 8115741902 am: bb9c442c90 am: 3eb2f4625d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579467

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I095637d096ed0a38c9d7baa2148bd7e514a46a9a
 2021-02-07 04:45:03 +00:00
Serik Beketayev
3eb2f4625d Merge "Revert "[Mainline] Migrate android.utils package items"" am: 8115741902 am: bb9c442c90 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579467

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f4812a5404b1b63fae605406aa0b22e1a991ab3
 2021-02-07 04:14:35 +00:00
Serik Beketayev
bb9c442c90 Merge "Revert "[Mainline] Migrate android.utils package items"" am: 8115741902 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579467

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05e76b48f1e2ce22b04b5a05c0cb8a0fd71a103e
 2021-02-07 03:55:21 +00:00
Serik Beketayev
8115741902 Merge "Revert "[Mainline] Migrate android.utils package items"" 2021-02-07 03:11:47 +00:00
Serik Beketayev
5b49047760 Revert "[Mainline] Migrate android.utils package items" 
Revert submission 1553146-android_util

Reason for revert: Build Breakage aosp-master/db845c-userdebug @ 7128996
Reverted Changes:
Ia39f6e03f:[Mainline] Migrate android.utils package items
Iaf99140d6:[Mainline] Migrate android.utils package items

Change-Id: I5bdaec5d1a87436510c3e05fadaf0124d86b1bdf
 2021-02-06 09:19:47 +00:00
Serik Beketayev
9c5331d698 Merge "[Mainline] Migrate android.utils package items" am: 2cb320d17b am: 002b5a72a0 am: 09b3f4e417 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552837

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1e8075c9cf3179f049be59d2b16a83b42ebae47
 2021-02-06 08:54:38 +00:00
Serik Beketayev
09b3f4e417 Merge "[Mainline] Migrate android.utils package items" am: 2cb320d17b am: 002b5a72a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552837

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I107d60d02b888e3ac5faa03b1b9dc6a8492e6d14
 2021-02-06 08:28:46 +00:00
Serik Beketayev
002b5a72a0 Merge "[Mainline] Migrate android.utils package items" am: 2cb320d17b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552837

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20f8a0ad33c592c799103d86f64e7755f54fa85a
 2021-02-06 07:26:16 +00:00
Serik Beketayev
2cb320d17b Merge "[Mainline] Migrate android.utils package items" 2021-02-06 07:00:12 +00:00
James Mattis
645774646b Merge changes Iabad7300,I85363e28 am: d86b977679 am: e2fc895c34 am: 9febeffaf7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539241

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05f6ae928a5bfa8b56837fa5c55803b2233d36a1
 2021-02-06 06:07:15 +00:00
Treehugger Robot
7297b81489 Merge "[Mainline] Core Platform APIs migration" am: e205128f1f am: a774bdaacd am: cecb88898f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546370

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c34c147b6a60c7e6ae09b60d0378b6500ec7218
 2021-02-06 06:06:55 +00:00
James Mattis
9febeffaf7 Merge changes Iabad7300,I85363e28 am: d86b977679 am: e2fc895c34 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539241

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic22bfe536e8113ad721a32001911dc496221d871
 2021-02-06 05:40:37 +00:00
Treehugger Robot
cecb88898f Merge "[Mainline] Core Platform APIs migration" am: e205128f1f am: a774bdaacd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546370

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9075b5338d14a939bedb13fcb57fe4ee527d990
 2021-02-06 05:40:14 +00:00
James Mattis
e2fc895c34 Merge changes Iabad7300,I85363e28 am: d86b977679 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539241

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ff19fad0ddb74c3eccd7fb7d16214e483a3b8a7
 2021-02-06 05:14:28 +00:00
Treehugger Robot
a774bdaacd Merge "[Mainline] Core Platform APIs migration" am: e205128f1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546370

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0007ea53f7c4b4c1bbd0d397b848fb951278ec9
 2021-02-06 05:04:31 +00:00
James Mattis
d86b977679 Merge changes Iabad7300,I85363e28 
* changes:
  Stubbed setOemNetworkPreference in Connectivity
  Update OemNetworkPreferences to use 1:1 Map
 2021-02-06 04:33:51 +00:00
Treehugger Robot
e205128f1f Merge "[Mainline] Core Platform APIs migration" 2021-02-06 04:11:00 +00:00
junyulai
f6d98ec185 [VCN03] Linger the newly connected network for a short time 
This is mainly used by VCN, where VCN-eligible networks might
be registered before VCN management service can fire request
to prevent the newly created network from being torndown
immediately by ConnectivityService.

Test: atest ConnectivityServiceTest#testNewNetworkLingering
      atest ConnectivityServiceTest#testNewNetworkLingering_bgNetwork
      atest FrameworksNetTests --rerun-until-failure 20
Bug: 175180558
Change-Id: I7768daf4cf2d8f6d8057b5107412e06104ba82e0
 2021-02-06 11:22:31 +08:00
Aaron Huang
5b748de126 Merge "Update VpnTest for new restricted API" am: 20507cf1f9 am: 1fb754cc9c am: 4bec1c714d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9188685fe0bb5ee7dfe2c0538fea6644b2cd642e
 2021-02-05 12:50:16 +00:00
Aaron Huang
4bec1c714d Merge "Update VpnTest for new restricted API" am: 20507cf1f9 am: 1fb754cc9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76d0e305bbace9c41a1ca44bad660391bbe79297
 2021-02-05 12:01:40 +00:00
Aaron Huang
1fb754cc9c Merge "Update VpnTest for new restricted API" am: 20507cf1f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47baf5985f00722b5be3402668cfe7ff4942e6d1
 2021-02-05 11:22:34 +00:00
Aaron Huang
20507cf1f9 Merge "Update VpnTest for new restricted API" 2021-02-05 10:52:54 +00:00
Treehugger Robot
9ebafad0d5 [automerger skipped] Merge "Add @Nullable to Object#equals()" am: 009f021811 am: 2a61f079a8 am: 7113304b38 -s ours 
am skip reason: Change-Id I5eedb571c9d78862115dfdc5dae1cf2a35343580 with SHA-1 e2b9459da9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie94057a64223064bd8b74af521ccc3c67f8e54d0
 2021-02-05 10:51:19 +00:00
Junyu Lai
277e5fb51e Merge "[VCN09] Rename linger timer" am: 5ae251610d am: 7604c69dff am: ea671ec39e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33c7298e0fbc67e4461363f9371f496bf12f5c4c
 2021-02-05 10:50:58 +00:00
Remi NGUYEN VAN
02c343e23b Merge "Remove legacy network factories" am: e035041e55 am: a18ae04565 am: aee39eb58d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04893919701674bdaec026a14207bfb350a3cd08
 2021-02-05 10:50:14 +00:00
Treehugger Robot
7113304b38 Merge "Add @Nullable to Object#equals()" am: 009f021811 am: 2a61f079a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d13a249fabc93baaa0d01de3f9c6cec7ddd11e4
 2021-02-05 10:20:50 +00:00
Junyu Lai
ea671ec39e Merge "[VCN09] Rename linger timer" am: 5ae251610d am: 7604c69dff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2290180e6891e9f568140ecf9e79dd9b237e06bd
 2021-02-05 10:20:27 +00:00
Remi NGUYEN VAN
aee39eb58d Merge "Remove legacy network factories" am: e035041e55 am: a18ae04565 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If74d226cc09ea1f1b1a70423084fbd018dba2e63
 2021-02-05 10:20:00 +00:00
Treehugger Robot
2a61f079a8 Merge "Add @Nullable to Object#equals()" am: 009f021811 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I523eb00d30bfedeb6e7533a94868016171846a59
 2021-02-05 10:01:23 +00:00
Lorenzo Colitti
87ce7654bf Merge changes Ieb7f33bc,I81b56862 am: df7233f8e1 am: 92860eb233 am: 90cf1ed3f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie296e709b883fc2930b83dffbfb1366dd4a7e7e7
 2021-02-05 09:55:17 +00:00
Junyu Lai
7604c69dff Merge "[VCN09] Rename linger timer" am: 5ae251610d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b69d6ac4d273b836c5ce36c79fc3ebb6c964634
 2021-02-05 09:40:31 +00:00
Treehugger Robot
009f021811 Merge "Add @Nullable to Object#equals()" 2021-02-05 09:36:41 +00:00