LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,086 Commits 2 Branches 0 Tags
d54efcdd35ff96355d05cb4d2acd565cd92d3e58
Commit Graph

7086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
d54efcdd35 [automerger skipped] Merge "Clean up for multiple validation result update" into qt-dev am: 4d6330deae am: e2aa14774c -s ours 
am: 6b6820d1c4 -s ours
am skip reason: change_id I9087ef791b3fee5399ba8e83ef9d8a544845a4dd with SHA1 cd41d6e7b6 is in history

Change-Id: Ia8c40bf424472bc252fd1d806dbc8e51440685b9
 2019-05-28 03:08:40 -07:00
Chalard Jean
c2f2e3ff16 Merge "[automerger skipped] Merge "Reinstate access to a forgotten member" into qt-dev am: e97ef6d1d9 -s ours am: 6ec76e4292 -s ours 
am: 096dfb7dce -s ours
am skip reason: change_id I6f6b2cf75793532d3d537a223b8e15d7304a1e3f with SHA1 8759c1ec9e is in history

Change-Id: I805663e87ba6459367d0ade870d3441a46facf21
 2019-05-28 03:04:10 -07:00
Chalard Jean
ba399cbdd9 [automerger skipped] Merge "Reinstate access to a forgotten member" into qt-dev am: e97ef6d1d9 am: 4cabc6d502 -s ours 
am: 7ebbdf4292 -s ours
am skip reason: change_id I6f6b2cf75793532d3d537a223b8e15d7304a1e3f with SHA1 8759c1ec9e is in history

Change-Id: I16d152f60485ae696cd62441a65907054dce3f1c
 2019-05-28 03:02:41 -07:00
Chiachang Wang
6b6820d1c4 [automerger skipped] Merge "Clean up for multiple validation result update" into qt-dev am: 4d6330deae 
am: e2aa14774c -s ours
am skip reason: change_id I4424663292c5ad29eb7a888fa6975835721a5d2e with SHA1 9ec2c725c8 is in history

Change-Id: Ic2bf6d593170287595890d7eb70b279d0310aed7
 2019-05-28 02:58:40 -07:00
Android Build Merger (Role)
096dfb7dce Merge "[automerger skipped] Merge "Reinstate access to a forgotten member" into qt-dev am: e97ef6d1d9 -s ours am: 6ec76e4292 -s ours am skip reason: change_id I6f6b2cf75793532d3d537a223b8e15d7304a1e3f with SHA1 8759c1ec9e is in history" into qt-r1-dev-plus-aosp 2019-05-28 09:57:18 +00:00
Chalard Jean
21746a0fb5 [automerger skipped] Merge "Reinstate access to a forgotten member" into qt-dev am: e97ef6d1d9 -s ours 
am: 6ec76e4292 -s ours
am skip reason: change_id I6f6b2cf75793532d3d537a223b8e15d7304a1e3f with SHA1 8759c1ec9e is in history

Change-Id: I3f5e3ff6c5a2515cbede4d1049fa017f592f93d9
 2019-05-28 02:56:31 -07:00
Chalard Jean
7ebbdf4292 [automerger skipped] Merge "Reinstate access to a forgotten member" into qt-dev am: e97ef6d1d9 
am: 4cabc6d502 -s ours
am skip reason: change_id I6f6b2cf75793532d3d537a223b8e15d7304a1e3f with SHA1 8759c1ec9e is in history

Change-Id: I309dc78288401e59d4ff65ca2cac4a007ddbfe80
 2019-05-28 02:55:34 -07:00
Chalard Jean
6ec76e4292 [automerger skipped] Merge "Reinstate access to a forgotten member" into qt-dev 
am: e97ef6d1d9 -s ours
am skip reason: change_id I6f6b2cf75793532d3d537a223b8e15d7304a1e3f with SHA1 8759c1ec9e is in history

Change-Id: Id859f70e1e7584d3640a43a041126b82b308d84e
 2019-05-28 02:50:36 -07:00
Chiachang Wang
4d6330deae Merge "Clean up for multiple validation result update" into qt-dev 2019-05-28 09:44:47 +00:00
Chalard Jean
e97ef6d1d9 Merge "Reinstate access to a forgotten member" into qt-dev 2019-05-28 09:38:51 +00:00
Luke Huang
3f131de6ff [automerger skipped] Merge changes from topic "am-d829724f7889490d818e6069212702eb" into qt-r1-dev-plus-aosp 
am: 8d70675679 -s ours
am skip reason: change_id Idc6db433585de067e45088b43665c8e37b310397 with SHA1 1e2382d098 is in history

Change-Id: Ia8b18e60a606a2b0df916f22d774034dee24517f
 2019-05-27 23:05:18 -07:00
Luke Huang
d141a66ed1 [automerger skipped] Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev am: d8bc2b5a15 am: ec07250973 
am: eb5b80daf1 -s ours
am skip reason: change_id Idc6db433585de067e45088b43665c8e37b310397 with SHA1 1e2382d098 is in history

Change-Id: I10bb7c8d36a774fb5ddf4cee37eaba9b3df8e45c
 2019-05-27 23:02:33 -07:00
Android Build Merger (Role)
8d70675679 Merge changes from topic "am-d829724f7889490d818e6069212702eb" into qt-r1-dev-plus-aosp 
* changes:
  Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev am: d8bc2b5a15 am: f0b1dc8df4
  [automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug am: 51b9f6c069 -s ours am: 2fdaf771d6 -s ours am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history
 2019-05-28 05:58:48 +00:00
Luke Huang
ae3583ee45 Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev am: d8bc2b5a15 
am: f0b1dc8df4

Change-Id: Ib9455ba1651241408c1ace6f90d64a23c8ec8dfb
 2019-05-27 22:57:40 -07:00
Luke Huang
eb5b80daf1 Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev am: d8bc2b5a15 
am: ec07250973

Change-Id: I385b8c885f4e32a65a50c64fb4730e0f0dc5b6fd
 2019-05-27 22:57:34 -07:00
Luke Huang
0911250db9 [automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug am: 51b9f6c069 -s ours 
am: 2fdaf771d6 -s ours
am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history

Change-Id: Icf444abe7175a0709701fa2865d6c324f911a06f
 2019-05-27 22:57:32 -07:00
Luke Huang
f0b1dc8df4 Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev 
am: d8bc2b5a15

Change-Id: I8cd6013a4312d945936a38026285b2e33f6c7c49
 2019-05-27 22:52:59 -07:00
Luke Huang
2fdaf771d6 [automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug 
am: 51b9f6c069 -s ours
am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history

Change-Id: Ie4e69c27646febd06df2b93361f431dbd51bde4f
 2019-05-27 22:52:47 -07:00
Luke Huang
d8bc2b5a15 Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev 
* changes:
  Remove broken test testRfc6724Sort
  Add Rfc6724 style sort for DnsResolver and fix potential bug
 2019-05-28 05:38:49 +00:00
Luke Huang
4aa400f7eb Remove broken test testRfc6724Sort 
This test is conitnuely fail in cuttlefish.
Lack of ipv6 default route in cuttlefish caused the test failed.
The reason is that the result of rfc6724Sort depends on on the route in system.
It is not good to expect any route should exists, so remove it.

Bug: 133649648
Test: atest DnsUtilsTest

Merged-In: Idc6db433585de067e45088b43665c8e37b310397
(cherry picked from commit 91b35f88429d77ddce0e3f539690e6370b89915b)

Change-Id: Idb6f4c094d3466772e3bfc98a57505bf38f381ef
 2019-05-28 03:24:14 +00:00
Xiao Ma
ee744ee6f2 Merge "Wipe the data in IpMemoryStore database upon network factory reset." am: 5ad000a641 am: 0b9f498f86 am: 71950d27d8 
am: 322abd62d9

Change-Id: Ia13ff10a57c2043f6676976f23ecfb2d2a9a6ef0
 2019-05-27 18:22:55 -07:00
Xiao Ma
322abd62d9 Merge "Wipe the data in IpMemoryStore database upon network factory reset." am: 5ad000a641 am: 0b9f498f86 
am: 71950d27d8

Change-Id: Ic042119f35a50cd9abb4c243fc3ba4d767fe2cd4
 2019-05-27 18:17:43 -07:00
Xiao Ma
71950d27d8 Merge "Wipe the data in IpMemoryStore database upon network factory reset." am: 5ad000a641 
am: 0b9f498f86

Change-Id: I13ad04454e638905b74dd42a1c83266c7c37652f
 2019-05-27 18:12:49 -07:00
Xiao Ma
5ad000a641 Merge "Wipe the data in IpMemoryStore database upon network factory reset." 2019-05-28 00:52:00 +00:00
Luke Huang
1e2382d098 Merge "Remove broken test testRfc6724Sort" am: ac6c768bd6 am: 79e97b7d21 am: 577b90a8ef 
am: 35c43432dc

Change-Id: Idc6db433585de067e45088b43665c8e37b310397
 2019-05-27 11:19:15 -07:00
Chalard Jean
fb50499c8f Merge "Reinstate access to a forgotten member" am: c73af87b45 am: 2f4bd91b99 am: bdee05bfd1 
am: c055af9d6d

Change-Id: I99cd44b7ac4ab41b41d0f1345881dd852c9e5e88
 2019-05-27 11:17:57 -07:00
Luke Huang
35c43432dc Merge "Remove broken test testRfc6724Sort" am: ac6c768bd6 am: 79e97b7d21 
am: 577b90a8ef

Change-Id: Id9bd0d7cb15a7c04102013f9008abc9ce344d5d2
 2019-05-27 07:38:27 -07:00
Luke Huang
577b90a8ef Merge "Remove broken test testRfc6724Sort" am: ac6c768bd6 
am: 79e97b7d21

Change-Id: I37aa8acc6beeb1e20b99098b1f9e8d5ef800c4eb
 2019-05-27 07:33:33 -07:00
Luke Huang
ac6c768bd6 Merge "Remove broken test testRfc6724Sort" 2019-05-27 14:12:05 +00:00
Chalard Jean
ddfa1f5f4d Reinstate access to a forgotten member 
Followup to aosp/964440

Bug: 131764329
Test: none
Merged-In: I6f6b2cf75793532d3d537a223b8e15d7304a1e3f
Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66
(cherry picked from commit 41bd3c57b4ba347ac6eb4546855daf5473264a29)
 2019-05-27 12:21:15 +00:00
Chalard Jean
c055af9d6d Merge "Reinstate access to a forgotten member" am: c73af87b45 am: 2f4bd91b99 
am: bdee05bfd1

Change-Id: If2cce67f40381e3edc8d43a263ea0e5be4af39d0
 2019-05-27 04:38:07 -07:00
Chalard Jean
bdee05bfd1 Merge "Reinstate access to a forgotten member" am: c73af87b45 
am: 2f4bd91b99

Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66
 2019-05-27 04:33:13 -07:00
Treehugger Robot
c73af87b45 Merge "Reinstate access to a forgotten member" 2019-05-27 11:14:37 +00:00
Luke Huang
179c33f322 Remove broken test testRfc6724Sort 
This test is conitnuely fail in cuttlefish.
Lack of ipv6 default route in cuttlefish caused the test failed.
The reason is that the result of rfc6724Sort depends on on the route in system.
It is not good to expect any route should exists, so remove it.

Bug: 133649648
Test: atest DnsUtilsTest
Change-Id: I91f89782b9b989fa1a49e666bb5ce2df3a0dbbf7
 2019-05-27 17:49:32 +08:00
Xiao Ma
555e408928 Wipe the data in IpMemoryStore database upon network factory reset. 
Bug:128499160
Test: manual
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Ib563463a861a5d27b1e9b5fbb92342249b573802
 2019-05-27 15:05:09 +09:00
Chiachang Wang
1be379bbb4 Clean up for multiple validation result update 
This is a follow-up commit for aosp/955431 to update commets
and minor updates in unit test.

Test: atest com.android.server.ConnectivityServiceTest#testCaptivePortalOnPartialConnectivity
Bug: 130683832
Change-Id: I581eae8daeddd2c4c186e7b40e27fef2aaa7ab43
Merged-In: I9087ef791b3fee5399ba8e83ef9d8a544845a4dd
Merged-In: I4424663292c5ad29eb7a888fa6975835721a5d2e
(cherry picked from commit 3d3a9fff7b7fa0df4ee627cb082668e642d6f754)
 2019-05-27 00:54:53 +00:00
Chiachang Wang
cd41d6e7b6 Merge "Clean up for multiple validation result update" am: 7a5b9c2d0a am: 0d018cdaec am: 9ec2c725c8 
am: 807fa67f75

Change-Id: I9087ef791b3fee5399ba8e83ef9d8a544845a4dd
 2019-05-25 08:42:17 -07:00
Chiachang Wang
807fa67f75 Merge "Clean up for multiple validation result update" am: 7a5b9c2d0a am: 0d018cdaec 
am: 9ec2c725c8

Change-Id: Ia9dc0f944d6f7aa146124b6899832e27cd530950
 2019-05-25 03:09:42 -07:00
Chiachang Wang
9ec2c725c8 Merge "Clean up for multiple validation result update" am: 7a5b9c2d0a 
am: 0d018cdaec

Change-Id: I4424663292c5ad29eb7a888fa6975835721a5d2e
 2019-05-25 02:53:44 -07:00
Chiachang Wang
499630e2af Merge "[automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev am: 399b7500af -s ours am: fcf0ced706 -s ours 
am: e188af49a9 -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history

Change-Id: I1576f42c89041bd6f3bea1ff37a4141333dc9bb5
 2019-05-24 23:11:42 -07:00
Chiachang Wang
7634b7b7c9 [automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev am: 399b7500af am: ff9340a1b0 -s ours 
am: 7b5d4c2fae -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history

Change-Id: Ia4aab74014d166e1145e2c65b5018b0ace47c3fd
 2019-05-24 23:09:34 -07:00
Android Build Merger (Role)
e188af49a9 Merge "[automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev am: 399b7500af -s ours am: fcf0ced706 -s ours am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history" into qt-r1-dev-plus-aosp 2019-05-25 05:38:36 +00:00
Chiachang Wang
85885358e2 [automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev am: 399b7500af -s ours 
am: fcf0ced706 -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history

Change-Id: I5ddb5d0d856960d226d41ca561d665be1accd4d2
 2019-05-24 22:37:54 -07:00
Chiachang Wang
7b5d4c2fae [automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev am: 399b7500af 
am: ff9340a1b0 -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history

Change-Id: Ic0b0150bb5c5ddcaeff17b27f454d96b795892ca
 2019-05-24 22:34:22 -07:00
Chiachang Wang
fcf0ced706 [automerger skipped] Merge "Update multiple validation result to ConnectivityService" into qt-dev 
am: 399b7500af -s ours
am skip reason: change_id I243db4c406cca826e803c8035268bc0c6e6e01e2 with SHA1 2c593ec776 is in history

Change-Id: I09ce684da6680c5c20de4e3f0a7cf741f85131ec
 2019-05-24 22:01:20 -07:00
Chiachang Wang
fab45b825b Merge "Update multiple validation result to ConnectivityService" am: 5af07137d7 am: a0e9af113c am: 2c593ec776 
am: 0a10069a9a

Change-Id: I30037422737750078de3ec6c93c7ee953440f73f
 2019-05-24 18:22:37 -07:00
Chenbo Feng
811e90ece8 [automerger skipped] Merge "Fix the internet permission for native services" into qt-dev am: 2e17b24023 -s ours am: 6e300a80fb -s ours 
am: 6879cc6bc1 -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 158ac5a39e is in history

Change-Id: Ied672c64c5dfba005b51485013bf8d3892cca485
 2019-05-24 18:20:31 -07:00
Etan Cohen
c3be83c399 [automerger skipped] Merge changes from topic "on_unavailable_fix" into qt-dev am: 285b665784 -s ours am: d954300cb5 -s ours 
am: 37eb1e4f65 -s ours
am skip reason: change_id Ia2cc04b42288ea987483e5ab0e0a10093dc49502 with SHA1 c8289e40a4 is in history

Change-Id: I85bfb02cecefcbe771d2e09e148a0a97acba75f7
 2019-05-24 17:51:13 -07:00
Chenbo Feng
d917ae5dc9 [automerger skipped] Merge "Fix the internet permission for native services" into qt-dev am: 2e17b24023 am: f68f9d9f36 -s ours 
am: 073dcff305 -s ours
am skip reason: change_id I84cde7d3757953bc0bf761727d64a715bcdd68bb with SHA1 99869f413a is in history

Change-Id: I2e5c8a3bd6266d178c98cc77359dccfa9043024d
 2019-05-24 17:48:13 -07:00
Chenbo Feng
e5d445afee Merge "Fix the internet permission for native services" am: dcc6ebb96f am: 5d4822bcd2 am: d053460495 
am: 8b9a2f571b

Change-Id: I0a16f0e31605fb4fe52b1fe7478e4a203ffd7c6b
 2019-05-24 17:22:44 -07:00