LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,049 Commits 2 Branches 0 Tags
bb26bd6f94eb078e873f0fbe2adc96bf4bd68aeb
Commit Graph

12049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
bb26bd6f94 Merge "Replace InterfaceConfiguration usage with stable aidl" am: c0c71a50d6 am: 75cd8abbc7 am: 4ff4b9910f am: 50e11a6414 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488356

Change-Id: I60b7d3c863121e4f766913c4b536795f6cc3b758
 2020-11-18 10:47:38 +00:00
Chiachang Wang
50e11a6414 Merge "Replace InterfaceConfiguration usage with stable aidl" am: c0c71a50d6 am: 75cd8abbc7 am: 4ff4b9910f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488356

Change-Id: Iec15205660c6a9bddb3cf644d91713a720e4178a
 2020-11-18 09:57:33 +00:00
Chiachang Wang
4ff4b9910f Merge "Replace InterfaceConfiguration usage with stable aidl" am: c0c71a50d6 am: 75cd8abbc7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488356

Change-Id: I29d12cfa0b7ad7f048b253284077411484acc4a3
 2020-11-18 09:28:34 +00:00
Chiachang Wang
75cd8abbc7 Merge "Replace InterfaceConfiguration usage with stable aidl" am: c0c71a50d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488356

Change-Id: I7be60028fb07d0d6fcc65d110c2d198a85ff2b29
 2020-11-18 09:14:35 +00:00
Chiachang Wang
c0c71a50d6 Merge "Replace InterfaceConfiguration usage with stable aidl" 2020-11-18 09:05:59 +00:00
Chiachang Wang
db04f067b0 Replace InterfaceConfiguration usage with stable aidl 
Replace InterfaceConfiguration with InterfaceConfigurationParcel
for the incoming ConnectivityService mainline since mainline
modules could not use @hide API.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I17ce8741e985fd30e3c8f0c34e79564a82890dc6
 2020-11-18 14:46:13 +08:00
Lucas Lin
cde9b30cad Merge "Separate 2 tests to verify canBeSatisfiedBy()" am: 59c5a7ee61 am: 2fd5ddbffd am: 1102259c8a am: e4674acfbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495268

Change-Id: I9aeddaa3e331f609bbdba8ab0c2d6e014123f242
 2020-11-17 12:43:30 +00:00
Automerger Merge Worker
a3c19abab3 Merge "Merge "Fix the comments left on aosp/1481197" am: 51a4f05ef8 am: ba157d8b07" into rvc-d1-dev-plus-aosp am: 95fd9d13c5 am: 38aaba118c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494036

Change-Id: I18a1e42198fc6febc3d88e740f6750b046def0c0
 2020-11-17 12:43:15 +00:00
Lucas Lin
e4674acfbe Merge "Separate 2 tests to verify canBeSatisfiedBy()" am: 59c5a7ee61 am: 2fd5ddbffd am: 1102259c8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495268

Change-Id: Ifcad77aabc1ee8b3ec40c7c23c61a6dfcc4e678b
 2020-11-17 12:21:49 +00:00
Automerger Merge Worker
38aaba118c Merge "Merge "Fix the comments left on aosp/1481197" am: 51a4f05ef8 am: ba157d8b07" into rvc-d1-dev-plus-aosp am: 95fd9d13c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494036

Change-Id: I583b1b7dd5ab13a35c41b76f1425f15b5a3117bf
 2020-11-17 12:21:12 +00:00
Lucas Lin
1102259c8a Merge "Separate 2 tests to verify canBeSatisfiedBy()" am: 59c5a7ee61 am: 2fd5ddbffd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495268

Change-Id: If94d24c57b5f982180b04bad236c524183e4c5af
 2020-11-17 11:56:30 +00:00
Automerger Merge Worker
95fd9d13c5 Merge "Merge "Fix the comments left on aosp/1481197" am: 51a4f05ef8 am: ba157d8b07" into rvc-d1-dev-plus-aosp 2020-11-17 11:56:14 +00:00
Lucas Lin
34bf1ff904 Merge "Fix the comments left on aosp/1481197" am: 51a4f05ef8 am: ba157d8b07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494036

Change-Id: I6fca5804b1b70803cf0e3666da2870c299f089e5
 2020-11-17 11:54:58 +00:00
Lucas Lin
c67d5ebb5d Merge "Fix the comments left on aosp/1481197" am: 51a4f05ef8 am: ba157d8b07 am: bae14aa611 am: dce5a4370c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494036

Change-Id: I0758a4e38d349ffe01d8e1fd78c5b6337cdb9242
 2020-11-17 10:01:41 +00:00
Lucas Lin
dce5a4370c Merge "Fix the comments left on aosp/1481197" am: 51a4f05ef8 am: ba157d8b07 am: bae14aa611 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494036

Change-Id: Iefb07ae46a42b5ad751298470e11ec2c94716e37
 2020-11-17 09:50:57 +00:00
Lucas Lin
2fd5ddbffd Merge "Separate 2 tests to verify canBeSatisfiedBy()" am: 59c5a7ee61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495268

Change-Id: I8b2d43d11570f90b1bfa23c27fccb592269b16c9
 2020-11-17 09:22:34 +00:00
Lucas Lin
59c5a7ee61 Merge "Separate 2 tests to verify canBeSatisfiedBy()" 2020-11-17 08:38:07 +00:00
Lucas Lin
bae14aa611 Merge "Fix the comments left on aosp/1481197" am: 51a4f05ef8 am: ba157d8b07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494036

Change-Id: Iea77eb0ed2ca0b5603d1257496bd1e8a14ed0d77
 2020-11-17 08:11:57 +00:00
Lucas Lin
ba157d8b07 Merge "Fix the comments left on aosp/1481197" am: 51a4f05ef8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494036

Change-Id: I7f13f380db5fe30e67be9cedc9429519b9fd4b6e
 2020-11-17 07:47:54 +00:00
Lucas Lin
51a4f05ef8 Merge "Fix the comments left on aosp/1481197" 2020-11-17 07:06:46 +00:00
Dan Shi
ac6adb0744 Merge "Revert "Move BasicShellCommandHandler to frameworks/lib/modules-..."" 2020-11-12 22:46:35 +00:00
Dan Shi
f42e56f08e Revert "Move BasicShellCommandHandler to frameworks/lib/modules-..." 
Revert "Update import path of BasicShellCommandHandler"

Revert "Update path for BasicShellCommandHandler"

Revert "Update path for BasicShellCommandHandler"

Revert "Update rule for BasicShellCommandHandler"

Revert submission 12975279-move_BSCH

Reason for revert: b/173120275
Reverted Changes:
Ib750f4774:Move BasicShellCommandHandler
I43c0dc327:Update import path of BasicShellCommandHandler
I73d58c07c:Update path for BasicShellCommandHandler
I21f103949:Update path for BasicShellCommandHandler
I8a2873df6:Move BasicShellCommandHandler to frameworks/lib/mo...
I91df774a3:Update rule for BasicShellCommandHandler

Exempt-From-Owner-Approval: to fix b/173120275

Change-Id: Iaa44f9aa4c1621f331275dc76ecb7505100fe9c5
 2020-11-12 22:44:12 +00:00
Junyu Lai
e0873a4c09 Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 38ec07ff9e am: 63fbab6e6a am: 99b7bcd09c am: 62229d3d33 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490617

Change-Id: I2c5895c223a5843cfe11a1736a243b6847ad1b9a
 2020-11-12 10:19:29 +00:00
Junyu Lai
62229d3d33 Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 38ec07ff9e am: 63fbab6e6a am: 99b7bcd09c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490617

Change-Id: Ie76caf460ac86251cd0ceca981bdf2c7e4bcfc44
 2020-11-12 09:47:50 +00:00
Junyu Lai
99b7bcd09c Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 38ec07ff9e am: 63fbab6e6a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490617

Change-Id: I11a56ed8d67f321a66fecc7550383db7d9f9c897
 2020-11-12 09:35:38 +00:00
Junyu Lai
63fbab6e6a Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 38ec07ff9e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490617

Change-Id: I5545dddcb5c8499ac9c53325cbafd424124429e1
 2020-11-12 09:02:13 +00:00
Junyu Lai
38ec07ff9e Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 
* changes:
  Remove unused variables
  Return offloaded traffic when querying from TrafficStats API
  Add hardware tethering traffic in testTethering test
  Remove unused getTetherStats
 2020-11-12 08:45:15 +00:00
junyulai
2fae9c3667 Add hardware tethering traffic in testTethering test 
Test: atest com.android.server.net.NetworkStatsServiceTest#testTethering
Bug: 162292214
Change-Id: Ifec6bde5fd3231f2135f12536c42e42ec6b707de
 2020-11-12 14:22:31 +08:00
Chiachang Wang
2628efa2db Merge "Move BasicShellCommandHandler to frameworks/lib/modules-utils" 2020-11-12 05:08:48 +00:00
lucaslin
43e1a7971e Separate 2 tests to verify canBeSatisfiedBy() 
In Android R, NetworkSpecifier#satisfiedBy() has changed to
NetworkSpecifier#canBeSatisfiedBy(), but its subclass -
MatchAllNetworkSpecifier hasn't.
In Android S, both of MatchAllNetworkSpecifier and
NetworkSpecifier has changed satisfiedBy() to canBeSatisfiedBy().
So if running the latest CTS on R device, it will verify
NetworkSpecifier#canBeSatisfiedBy() instead of
MatchAllNetworkSpecifier#satisfiedBy() and get the unexpected
result.
The fix is to separate 2 tests to verify canBeSatisfiedBy(), one
is for Android R or older version and the other is for Android
S+.

Bug: 172401624
Test: Run MatchAllNetworkSpecifierTest on Android R and S.
Change-Id: I1391bae9a0fc0298beb8fe80b5f388b492244566
 2020-11-12 12:48:16 +08:00
Chiachang Wang
a636262ced Merge "Replace the way to add legacy routing" am: e94bf1bc3c am: 1b1c460be6 am: e7ef9769d1 am: c2a352ecef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490244

Change-Id: Ibf3ef520e841a065225b15992fb924ada58ea828
 2020-11-11 06:44:07 +00:00
Chiachang Wang
c2a352ecef Merge "Replace the way to add legacy routing" am: e94bf1bc3c am: 1b1c460be6 am: e7ef9769d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490244

Change-Id: Ie6fee224b995af4ace0b74a5508e21f1e008ba0b
 2020-11-11 06:14:25 +00:00
Chiachang Wang
e7ef9769d1 Merge "Replace the way to add legacy routing" am: e94bf1bc3c am: 1b1c460be6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490244

Change-Id: I363c642663877d7ac521f8e9d5729040deca7f9a
 2020-11-11 05:57:28 +00:00
Chiachang Wang
1b1c460be6 Merge "Replace the way to add legacy routing" am: e94bf1bc3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490244

Change-Id: I6a278e3ae1ac4f5eaba92d28edf4a53d5381832e
 2020-11-11 05:23:20 +00:00
Chiachang Wang
e94bf1bc3c Merge "Replace the way to add legacy routing" 2020-11-11 05:06:58 +00:00
James Mattis
d40282e0be Merge "Updating network preference comments" am: 5aff64e718 am: c22a6a5cd0 am: 25dfe8eb37 am: f2ba675a29 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490233

Change-Id: Ic1b025dd4598c211a3b9c5065e034b4cc001dc99
 2020-11-10 19:57:53 +00:00
James Mattis
f2ba675a29 Merge "Updating network preference comments" am: 5aff64e718 am: c22a6a5cd0 am: 25dfe8eb37 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490233

Change-Id: I2cd6b804cdadfce11d298c32a29ba0c1f9820209
 2020-11-10 19:33:34 +00:00
James Mattis
25dfe8eb37 Merge "Updating network preference comments" am: 5aff64e718 am: c22a6a5cd0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490233

Change-Id: I6e73148769cc20edc1fa26ebd211472d46877ed0
 2020-11-10 19:13:56 +00:00
James Mattis
c22a6a5cd0 Merge "Updating network preference comments" am: 5aff64e718 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490233

Change-Id: I99561b2d7673c5f5f45ac793c453b4f10bd663e1
 2020-11-10 18:35:28 +00:00
Lucas Lin
c970b724ce Merge changes I67e5fa23,I223b207c am: 3ae04504d6 am: 3d4fd4e946 am: b2b8dc920d am: ece8c4b0ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483969

Change-Id: I9d4fd09d4dbd017b416eb0e93a8ea5670076bdda
 2020-11-10 18:06:23 +00:00
James Mattis
5aff64e718 Merge "Updating network preference comments" 2020-11-10 17:30:36 +00:00
lucaslin
684a06de6d Fix the comments left on aosp/1481197 
Bug: 172040168
Test: atest FrameworksNetTests
Test: Manual test NO_INTERNET, SIGN_IN, PARTIAL_CONNECTIVITY,
      VPN_ALWAYS_ON notifications.
Change-Id: Ibd05366481e6ddadf8b323335c2c35d40d340d0d
 2020-11-10 14:54:52 +08:00
Chiachang Wang
fd3fa0a549 Replace the way to add legacy routing 
ConnectivityService is going to become a mainline module which
is not able to access hidden API. Thus, replace the usage from
NMS to INetd.

Bug: 170598012
Test: atest FrameworksNetTests ConnectivityManagerLegacyTest
Change-Id: Ice1bd1effab26555917bc1766354aeaebd41ad66
 2020-11-10 14:53:55 +08:00
Lucas Lin
ece8c4b0ab Merge changes I67e5fa23,I223b207c am: 3ae04504d6 am: 3d4fd4e946 am: b2b8dc920d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483969

Change-Id: I7acb1ccf4ff3d3d16863c08e1fee407b69427d54
 2020-11-10 06:50:50 +00:00
Lucas Lin
b2b8dc920d Merge changes I67e5fa23,I223b207c am: 3ae04504d6 am: 3d4fd4e946 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483969

Change-Id: Idc58f24797aa1e3d24058a024b1ea31199f46353
 2020-11-10 06:09:03 +00:00
Lucas Lin
3d4fd4e946 Merge changes I67e5fa23,I223b207c am: 3ae04504d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483969

Change-Id: I74209eccb2fd5473d65968f765f3eb54ee99954e
 2020-11-10 05:47:18 +00:00
Lucas Lin
3ae04504d6 Merge changes I67e5fa23,I223b207c 
* changes:
  Use hasIpv[4|6]DefaultRoute instead of hasIPv[4|6]DefaultRoute
  Use local defined constants for notification channels
 2020-11-10 05:28:33 +00:00
James Mattis
dce028e5b5 Updating network preference comments 
Updating comments for network preferences to better clarify that
preferences which include more than one network type will then rely on
scoring to determine which of those networks are chosen.

Bug: 171795464
Test: atest FrameworksNetTests
Change-Id: I9eb5683f2cd69281bbee9fb70028d45f07720914
 2020-11-09 21:06:09 -08:00
Chiachang Wang
5eb17941e9 Move BasicShellCommandHandler to frameworks/lib/modules-utils 
BasicShellCommandHandler is used by mainline modules and the
framwork. There is a new repo that was created for putting
this kind of utility class. Move BasicShellCommandHandler for
the incoming ConnectivityService mainline and updating the
related usage.

Bug: 170598012
Test: m ; verify with adb shell cmd
Change-Id: I8a2873df6e7d8342b7a8b466bda155f74c807ee3
 2020-11-10 09:54:14 +08:00
Mathew Inwood
c9e5d3befe [automerger skipped] Merge "Add maxTargetSdk restriction to unused APIs." am: d04f969c9d am: 96d3ff7659 am: a6e533d62a -s ours am: 72b5226810 -s ours 
am skip reason: Change-Id I626caf7c1fe46c5ab1f39c2895b42a34319f771a with SHA-1 d771d6e94d is in history

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

Change-Id: Ie7a69520ba03c3454455d1fe0d0daf95d12840ed
 2020-11-09 16:32:35 +00:00