LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,945 Commits 2 Branches 0 Tags
92e314d92ccbdbe0570e3cced506d97e92c77ed5
Commit Graph

6945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
92e314d92c Merge "Change the icon for the LOGGED_IN notification." am: 2c3f94e392 am: fce3635550 am: c67e20d59c 
am: d663a3ba0a

Change-Id: I4012c9df9dd740af620003aef4e69d839549fed9
 2019-05-17 15:49:39 -07:00
Paul Hu
930749ace6 [automerger skipped] Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev am: b725fc0059 am: b200928ed4 -s ours 
am: 061a8ddb77 -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history

Change-Id: I4c26ebf6630baf255d861e5fa4d2410de3658395
 2019-05-17 15:33:29 -07:00
Xin Li
7abf22a015 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 8f33552b32 -s ours am: 704e63b17e -s ours am: b7496ba841 
am: f23b29e0dd -s ours
am skip reason: subject contains skip directive

Change-Id: I9dbd552f229601b95fa8338da70f28fb5c76e861
 2019-05-17 11:42:11 -07:00
Lorenzo Colitti
d663a3ba0a Merge "Change the icon for the LOGGED_IN notification." am: 2c3f94e392 am: fce3635550 
am: c67e20d59c

Change-Id: I529ac4a707cdd9696186991a4f34cf5eaf26c8d8
 2019-05-17 01:38:24 -07:00
Paul Hu
061a8ddb77 [automerger skipped] Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev am: b725fc0059 
am: b200928ed4 -s ours
am skip reason: change_id Ia28eea113e19b9c44998677e5b8093be178a06a3 with SHA1 bea628fb59 is in history

Change-Id: I4546fd5f500f7438f2efaaad95a67a5f01bc068d
 2019-05-17 01:11:43 -07:00
Lorenzo Colitti
c67e20d59c Merge "Change the icon for the LOGGED_IN notification." am: 2c3f94e392 
am: fce3635550

Change-Id: I9013d2d147979ffc03bc0da6b9a503f8ce623b70
 2019-05-17 00:41:51 -07:00
Paul Hu
b725fc0059 Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" into qt-dev 2019-05-17 06:46:36 +00:00
Xin Li
f23b29e0dd [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 8f33552b32 -s ours am: 704e63b17e -s ours 
am: b7496ba841

Change-Id: Ia5d8d317555d6e50313c2abf664a6e607837f18e
 2019-05-16 22:51:34 -07:00
Xin Li
b7496ba841 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 8f33552b32 -s ours 
am: 704e63b17e -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4e3df2aa9f8996b10dfc0a596269bd508ae2549
 2019-05-16 21:22:38 -07:00
Lorenzo Colitti
2c3f94e392 Merge "Change the icon for the LOGGED_IN notification." 2019-05-17 04:15:51 +00:00
Lorenzo Colitti
b45f7ad98b Change the icon for the LOGGED_IN notification. 
This notification is shown when the user has already logged in to
the network, so it should not have a question mark on it.

Bug: 130526201
Test: atest FrameworksNetTests
Test: manually signed in to portal
Change-Id: I8250236bc4ba251492a6cb9bf23e67666ef860d3
 2019-05-17 09:00:53 +09:00
Xin Li
7c25b83c12 [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master am: a4794fa4c4 -s ours am: 18a6c6eee0 
am: 200fb81522 -s ours
am skip reason: subject contains skip directive

Change-Id: I15afdf5031788a7ee6ed6461a2ee62845a653a98
 2019-05-16 11:31:33 -07:00
Xin Li
4a36159a1b [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: 4306eb11f0 -s ours am: 15308d614c 
am: 05240f0b9f -s ours
am skip reason: subject contains skip directive

Change-Id: If74795d76ee42ab2ec4383dc45ff311c6aef1d84
 2019-05-16 10:18:56 -07:00
Xiao Ma
4802c081e9 [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev am: cfaa8ead59 -s ours am: 12232917c0 -s ours 
am: 229c940bfc -s ours
am skip reason: change_id I8ce3bed435fbbb814d71fe48ffd305ff3f947f3f with SHA1 8f4a5a1bf8 is in history

Change-Id: I350a203a306fc3cc8a741760e0a0dfb0c441c4f4
 2019-05-16 04:01:39 -07:00
Xin Li
200fb81522 [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master am: a4794fa4c4 -s ours 
am: 18a6c6eee0

Change-Id: I985f8b208fd21e51d9d1242abff20633973e16f5
 2019-05-16 03:39:53 -07:00
Xin Li
05240f0b9f [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: 4306eb11f0 -s ours 
am: 15308d614c

Change-Id: I1ea42cf9707eab5195cc08c42277567db59df5e9
 2019-05-16 02:38:23 -07:00
Xiao Ma
fb7d869e8a [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev am: cfaa8ead59 -s ours 
am: 36d894ca5c -s ours
am skip reason: change_id I8ce3bed435fbbb814d71fe48ffd305ff3f947f3f with SHA1 8f4a5a1bf8 is in history

Change-Id: I1539837acb43af6f0325d8331e424a05fdeafabe
 2019-05-15 23:32:38 -07:00
Xiao Ma
229c940bfc [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev am: cfaa8ead59 -s ours 
am: 12232917c0 -s ours
am skip reason: change_id I1db13a48b59d743482436ecf8a20d7f12edd6e1c with SHA1 992b7f79a7 is in history

Change-Id: Ie048073d8e5b7da0a6f547a4ebcec0a8809f8b53
 2019-05-15 22:13:56 -07:00
Xin Li
18a6c6eee0 [automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master 
am: a4794fa4c4 -s ours
am skip reason: subject contains skip directive

Change-Id: Iad8736143771d3baae850bbfc2aef5d78d9ca96a
 2019-05-15 18:47:59 -07:00
Xiao Ma
36d894ca5c [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev 
am: cfaa8ead59 -s ours
am skip reason: change_id I1db13a48b59d743482436ecf8a20d7f12edd6e1c with SHA1 992b7f79a7 is in history

Change-Id: Ie908aaa904db4fd8540819b3afe2930de273e28a
 2019-05-15 17:50:03 -07:00
Xin Li
15308d614c [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master 
am: 4306eb11f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I428e3fbada5f4715f4934d7e2210e0eef51a0d40
 2019-05-15 17:32:18 -07:00
Xin Li
8f33552b32 DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. 
Bug: 132622481
Change-Id: I8a3d38c16d3de15514e2418d13d61b57b2cfd907
 2019-05-15 16:55:34 -07:00
TreeHugger Robot
a4794fa4c4 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master 2019-05-15 23:02:14 +00:00
Xin Li
4306eb11f0 DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master 
Bug: 132622481
Change-Id: I7ba1a9999b3a9bac8031dd086fa2632e45404f32
 2019-05-15 11:31:45 -07:00
Xiao Ma
6852ea4b3f [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev am: cfaa8ead59 -s ours 
am: 12232917c0 -s ours
am skip reason: change_id I8ce3bed435fbbb814d71fe48ffd305ff3f947f3f with SHA1 8f4a5a1bf8 is in history

Change-Id: I571e9103c42433241a5dfd3443c97f5082a26b28
 2019-05-15 09:33:46 -07:00
Xiao Ma
12232917c0 [automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev 
am: cfaa8ead59 -s ours
am skip reason: change_id I1db13a48b59d743482436ecf8a20d7f12edd6e1c with SHA1 992b7f79a7 is in history

Change-Id: I206c3efa264a7a8b16f07683c7c1bbf9fb29b426
 2019-05-15 09:22:19 -07:00
Xiao Ma
30dfd6ecfa Clean up the arguments annotation and verify items on IpMemoryStoreTest. 
Bug: 131133347
Test: atest FrameworksNetTests

Merged-In: I8ce3bed435fbbb814d71fe48ffd305ff3f947f3f
Merged-In: I1db13a48b59d743482436ecf8a20d7f12edd6e1c
(cherry picked from commit 7567c4ac50508c2bcd38b37fc48b299912a34cf5)

Change-Id: I78024c0e25d812639d1236faa59d383742ae2141
 2019-05-15 14:53:42 +00:00
Lorenzo Colitti
32c98046d1 [automerger skipped] Merge "Clean up the permission control code in framework" into qt-dev am: 4f47f2c827 -s ours 
am: 538c643533 -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 2bebfc2b87 is in history

Change-Id: Id93f949ff5ac017127f0066b5b428774a6a0b92f
 2019-05-15 00:05:54 -07:00
Paul Hu
5688ce39c4 Ignore NetworkTest when running CtsNetTestCases in instant app mode 
Ignore NetworkTest#testBindSocketOfConnectedDatagramSocketThrows
when running CtsNetTestCases in instant app mode due to sockect
cannot bind in instant app mode.

Bug: 123366918
Test: atest CtsNetTestCases --instant
Test: atest FrameworksNetTests

Change-Id: I1e93d4491e3d9e5a095ff4b6169b2f70e7b3b690
Merged-In: Ia28eea113e19b9c44998677e5b8093be178a06a3
Merged-In: I1e93d4491e3d9e5a095ff4b6169b2f70e7b3b690
(cherry picked from commit 73c0d48b14488c93b2f42a1e149e4be8499d3469)
 2019-05-15 06:58:27 +00:00
Chenbo Feng
bc7d61c6eb [automerger skipped] Clean up the permission control code in framework am: 2bebfc2b87 -s ours 
am: 7a8e7fc512 -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 4737299d94 is in history

Change-Id: Ib04616201b7a1254d71c47d917498bccec817459
 2019-05-14 23:53:01 -07:00
Lorenzo Colitti
538c643533 [automerger skipped] Merge "Clean up the permission control code in framework" into qt-dev 
am: 4f47f2c827 -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 2bebfc2b87 is in history

Change-Id: Ia49181982198f2074a11afc881a047f86263699b
 2019-05-14 23:49:27 -07:00
Chenbo Feng
7a8e7fc512 [automerger skipped] Clean up the permission control code in framework 
am: 2bebfc2b87 -s ours
am skip reason: change_id I25224c9576f52d2a0a0bd2182325c7aac7b28eb5 with SHA1 4737299d94 is in history

Change-Id: If4d60807fd1cc312393bf56830f09bddeff7b59f
 2019-05-14 23:43:03 -07:00
Lorenzo Colitti
4f47f2c827 Merge "Clean up the permission control code in framework" into qt-dev 2019-05-15 06:26:52 +00:00
Paul Hu
e3101f710e [automerger skipped] Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" into qt-dev am: 53e2a9b0ae -s ours 
am: 399f297121 -s ours
am skip reason: change_id I1025da29beb53259f57bd9ca5648b32f2847ed4a with SHA1 a4980fc1fd is in history

Change-Id: I57914fd792bcd76fa695dc4b626c95fbdb8be1f3
 2019-05-14 22:48:51 -07:00
Paul Hu
0063651eca Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" am: a00c638ebe am: a582a82795 
am: bea628fb59

Change-Id: I1e93d4491e3d9e5a095ff4b6169b2f70e7b3b690
 2019-05-14 22:41:10 -07:00
Paul Hu
399f297121 [automerger skipped] Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" into qt-dev 
am: 53e2a9b0ae -s ours
am skip reason: change_id I1025da29beb53259f57bd9ca5648b32f2847ed4a with SHA1 a4980fc1fd is in history

Change-Id: I0fd395b418475c6b9d8ac7dbd363d43e437d2203
 2019-05-14 21:51:21 -07:00
Paul Hu
bea628fb59 Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" am: a00c638ebe 
am: a582a82795

Change-Id: Ia28eea113e19b9c44998677e5b8093be178a06a3
 2019-05-14 21:35:43 -07:00
Paul Hu
a582a82795 Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" 
am: a00c638ebe

Change-Id: I670b9847a2e3b3b794ee4694a0838440cabdc39f
 2019-05-14 21:17:33 -07:00
Paul Hu
a00c638ebe Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" 2019-05-15 03:42:32 +00:00
Paul Hu
49ea93861d Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission 
Caller should get SecurityException if called
ConnectivityManager#startCaptivePortalApp() w/o
MAINLINE_NETWORK_STACK permission. But now it will not get any
exception and can launch captive portal app successfully.

Bug: 132662433
Test: atest android.net.cts.ConnectivityManagerTest#testStartCaptivePortalApp
      w and w/o MAINLINE_NETWORK_STACK permission
Test: atest FrameworksNetTests NetworkStackTests

Change-Id: Ib70fe6fad107f3e9dce9ce673188c5ce5dc1ad7b
Merged-In: I1025da29beb53259f57bd9ca5648b32f2847ed4a
Merged-In: Ib70fe6fad107f3e9dce9ce673188c5ce5dc1ad7b
(cherry picked from commit 72b3ab18ca302a3117f424a0f0ef6c08897c310e)
 2019-05-15 02:09:52 +00:00
Paul Hu
b50ceeee1e Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" am: c381068caa am: fb8186d0a9 
am: a4980fc1fd

Change-Id: Ib70fe6fad107f3e9dce9ce673188c5ce5dc1ad7b
 2019-05-14 04:28:35 -07:00
Paul Hu
a4980fc1fd Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" am: c381068caa 
am: fb8186d0a9

Change-Id: I1025da29beb53259f57bd9ca5648b32f2847ed4a
 2019-05-14 04:17:29 -07:00
Paul Hu
fb8186d0a9 Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" 
am: c381068caa

Change-Id: I065b5403d2f89d158e76f63c9b125ad30e603633
 2019-05-14 04:06:04 -07:00
Paul Hu
c381068caa Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" 2019-05-14 10:48:48 +00:00
paulhu
de3a2452a0 Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission 
Caller should get SecurityException if called
ConnectivityManager#startCaptivePortalApp() w/o
MAINLINE_NETWORK_STACK permission. But now it will not get any
exception and can launch captive portal app successfully.

Bug: 132662433
Test: atest android.net.cts.ConnectivityManagerTest#testStartCaptivePortalApp
      w and w/o MAINLINE_NETWORK_STACK permission
Test: atest FrameworksNetTests NetworkStackTests

Change-Id: I61be1b0647f4165665a2d4166311adeac956e0d4
 2019-05-14 18:44:16 +08:00
Chenbo Feng
2bebfc2b87 Clean up the permission control code in framework 
Delete the unused NetworkManagementService API for set/remove
permissions. Use PERMISSION_NONE to replace NO_PERMISSIONS so the
framework now use the same set of permission constant when communicate
with netd.

Bug: 128944261
Test: PermissionMonitorTest.java

Change-Id: I25224c9576f52d2a0a0bd2182325c7aac7b28eb5
Merged-In: I25224c9576f52d2a0a0bd2182325c7aac7b28eb5
(cherry picked from commit 05887f99c6ca6885db737af2f356023dc6de80a2)
 2019-05-13 14:22:58 -07:00
Chenbo Feng
b6ca681c7a Merge "Clean up the permission control code in framework" am: 0e6d2b5f4f am: 6cb0c1579d 
am: 9313f7adf9

Change-Id: Iab7ee1619565b1be23d454d158d6ec33cf106c96
 2019-05-13 11:57:23 -07:00
Chenbo Feng
9313f7adf9 Merge "Clean up the permission control code in framework" am: 0e6d2b5f4f 
am: 6cb0c1579d

Change-Id: I1af059171c5d80be7abaee636f012f3b55dac2df
 2019-05-13 11:32:59 -07:00
Chenbo Feng
6cb0c1579d Merge "Clean up the permission control code in framework" 
am: 0e6d2b5f4f

Change-Id: Iff2316f72df4cff56829b281882dc920d63937bd
 2019-05-13 11:20:31 -07:00
Treehugger Robot
0e6d2b5f4f Merge "Clean up the permission control code in framework" 2019-05-13 18:04:50 +00:00