385735 Commits

Author SHA1 Message Date
Chiachang Wang
0f449289da Fix a bug where private DNS to v4-only servers don't validate.
Bug: 132670008
Test: Manual
Test: atest NetworkStackTests
Change-Id: I8ae6fa6f3800f5f6c9ee88ffe3b8ada34b96dee6
(cherry picked from commit aea0808d3b26dab24005afc39eb7ec4f4f333bae)
2019-05-15 16:18:56 +08:00
Aaron Huang
24f14ed21b Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement"
am: 4d492d89fa

Change-Id: Ibcbb62c0ca08e9ed489d167e3ddd16b3c38bff6a
2019-05-14 23:40:57 -07:00
Aaron Huang
4d492d89fa Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" 2019-05-15 06:17:43 +00:00
Paul Hu
f672e96b87 Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode"
am: 910b72f109

Change-Id: I670b9847a2e3b3b794ee4694a0838440cabdc39f
2019-05-14 21:17:33 -07:00
Paul Hu
910b72f109 Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" 2019-05-15 03:42:32 +00:00
Jack Yu
019f54d32f Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode"
am: 149edbd87b

Change-Id: Ia204a5ceebfc97f0f15cae94b1ec4f4aca78c231
2019-05-14 20:32:49 -07:00
Jack Yu
149edbd87b Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode" 2019-05-15 03:04:55 +00:00
Jack Yu
a255aeab99 Fixed incorrect metered/unmetered APN in AP-assisted mode
From now all data traffic through IWLAN will be unmetered. Only
data through cellular will be checked for metered/unmetered.

Test: Unit tests
Bug: 132433959
Merged-In: Id1498fb8627dd7221a5ab7cde72929e6ee25b425
Change-Id: Id1498fb8627dd7221a5ab7cde72929e6ee25b425
(cherry picked from commit 7ff7865d7b17cc015f2d38f6a5f503f0e4169c17)
2019-05-14 17:19:16 -07:00
Nathan Harold
20b6c2408a Merge "PhoneStateListener msim improvement"
am: ec7a701aa6

Change-Id: I9eeef5afafe6d3bfdaa745021af01717a3956f7a
2019-05-14 13:17:16 -07:00
Nathan Harold
0bd6a76978 Merge "listen to correct intent extra for defaultSubIdChange"
am: 686ef19fd7

Change-Id: I773b4ed86583503df81c2e43b54b18aef78d8dd3
2019-05-14 13:10:49 -07:00
Nathan Harold
ec7a701aa6 Merge "PhoneStateListener msim improvement" 2019-05-14 19:51:47 +00:00
Nathan Harold
686ef19fd7 Merge "listen to correct intent extra for defaultSubIdChange" 2019-05-14 19:45:49 +00:00
Steven Moreland
957e646823 Merge "HwBinder: register with registerAsServiceInternal"
am: dc1372dd0d

Change-Id: Iaf68c56e2cdd31e64bd2047646dde9ef007ef130
2019-05-14 08:45:37 -07:00
Steven Moreland
dc1372dd0d Merge "HwBinder: register with registerAsServiceInternal" 2019-05-14 15:26:29 +00:00
Andrei-Valentin Onea
d9a8aaa62b Merge "Add publicAlternatives to @UnsupportedAppUsage"
am: 2ac6496fb8

Change-Id: I73939680b531f32e54e62e7f50f7d75d364eefda
2019-05-14 08:25:17 -07:00
Andrei-Valentin Onea
2ac6496fb8 Merge "Add publicAlternatives to @UnsupportedAppUsage" 2019-05-14 15:13:42 +00:00
Andrei-Valentin Onea
aa4871c6b7 Merge "Extend OWNERS for UnsupportedAppUsage.java"
am: cc3a1ccbce

Change-Id: I15141613709022df185b9a03aac65bd46f583be6
2019-05-14 08:10:46 -07:00
Andrei-Valentin Onea
cc3a1ccbce Merge "Extend OWNERS for UnsupportedAppUsage.java" 2019-05-14 14:53:58 +00:00
Richard Uhler
f1fe530c7a Merge "Use embedded native libs for NetworkStack.apk."
am: 8ead7ab7a2

Change-Id: I1a6099b9476c23c7566304b9565a06a1b0bec247
2019-05-14 07:45:21 -07:00
Richard Uhler
8ead7ab7a2 Merge "Use embedded native libs for NetworkStack.apk." 2019-05-14 14:22:05 +00:00
Richard Uhler
87462d79ff Use embedded native libs for NetworkStack.apk.
So that the /system version of NetworkStack.apk can be re-installed on
/data without causing problems. This is useful for testing and necessary
for supporting rollback to the system version of NetworkStack.apk.

Bug: 131703417
Bug: 132195177
Test: Confirm NetworkStack.apk now includes .so files.
Test: adb install --staged NetworkStack.apk
      adb reboot
      Device reboots without problems.

Change-Id: I7c9a1702a2c18e0333b5e409f04b7658fe685f97
Merged-In: I7c9a1702a2c18e0333b5e409f04b7658fe685f97
(cherry picked from commit 103dbe38b44281b5ad8262370380ae0fc683408e)
2019-05-14 15:18:01 +01:00
Chalard Jean
92c8b67ce2 Update throws documentation for requestNetwork*
Bug: 78126688
Test: builds
Change-Id: I8b5bb052bf73feed0dfafafaf44fcd07f58186ce
2019-05-14 22:16:29 +09:00
Aaron Huang
d287837d98 apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement
Remove IPv6 related codes since we don't support IPv6 NAT-T keepalive
as the kernel doesn't support IPv6 UDP encapsulation.

Renaming keepaliveAck to keepaliveResponce since NAT-T keeaplive
response is not an ack. Also, add generateV4NattKeepaliveFilters()
if multicast filter is disabled.

Verify incoming packet contains 1 byte payload but it is not 0xff will
pass NAT-T keepalive filter.

Bug: 33530442
Test: atest FrameworksNetTests
      atest NetworkStackTests

Change-Id: Ifb9e088c0c8d71c763ebd9ad122103d0f97ca278
2019-05-14 19:58:16 +08:00
Paul Hu
9144bdf0e1 Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission"
am: cfcbda3345

Change-Id: I065b5403d2f89d158e76f63c9b125ad30e603633
2019-05-14 04:06:04 -07:00
Paul Hu
cfcbda3345 Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" 2019-05-14 10:48:48 +00:00
paulhu
9852560e44 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
Andrei Onea
fac84c9a50 Extend OWNERS for UnsupportedAppUsage.java
Add compat-team members as owners of UnsupportedAppUsage.java

Test: n/a
Change-Id: I85c15cca2675b6b52049da16955710797067d05b
2019-05-14 11:31:15 +01:00
chen xu
2a5483ff77 PhoneStateListener msim improvement
1. Docuemnt the scope of each callback event either apply to specific
subscriptions or not.
2. TelephonyRegistry store separate state e.g, precisecallstate, callAttribute
for each slot to support msim.
3. Add missing subscription match check when notify callbacks.

Bug: 130423985
Bug: 132181378
Test:  atest CtsTelephonyTestCases:PhoneStateListenerTest
Merged-In: I4b014e00528a1f05e0b5f237229c561f8260e2bd
Change-Id: I4b014e00528a1f05e0b5f237229c561f8260e2bd
(cherry picked from commit d5deeb15e9eae9b14deede4f89ac14c69430f25b)
2019-05-13 21:38:12 -07:00
chen xu
d274cc61fc listen to correct intent extra for defaultSubIdChange
TelephonyRegistry listen for the wrong intent extra PhoneConstants.SLOT
which has been removed recently. Thus when receive default subscription
id changed event, we mistenkenly thought phone ID is invalid,
thus we never update mDefaultPhoneId and mDefaultSubId and fails to
notify listeners on default subscription

Bug: 131915645
Test: Manual
Merged-In: Ibb79e55c0756b30669cbd5c69c181f9f9c4d186b
Change-Id: Ibb79e55c0756b30669cbd5c69c181f9f9c4d186b
(cherry picked from commit addc27001e2a6512cfb3422b687986ecc7104ade)
2019-05-13 21:26:40 -07:00
Jordan Liu
3af50a6033 Merge "Update getMergedSubscriberIds to pass subId"
am: f1aca7cf4e

Change-Id: I6560d494c1df2c2d3334db672ceefe23b4b5e4ac
2019-05-13 11:32:46 -07:00
Chenbo Feng
a4cbe3d728 Merge "Clean up the permission control code in framework"
am: 78d6a42e99

Change-Id: Iff2316f72df4cff56829b281882dc920d63937bd
2019-05-13 11:20:31 -07:00
Jordan Liu
f1aca7cf4e Merge "Update getMergedSubscriberIds to pass subId" 2019-05-13 18:16:18 +00:00
Elliott Hughes
d47c87a2e6 Merge "Don't explicitly specify no prefix/suffix."
am: 480d18c472

Change-Id: I2c17e2010e34cc6857d48209a3d0f4f5a7dee8dc
2019-05-13 11:12:13 -07:00
Treehugger Robot
78d6a42e99 Merge "Clean up the permission control code in framework" 2019-05-13 18:04:50 +00:00
Treehugger Robot
480d18c472 Merge "Don't explicitly specify no prefix/suffix." 2019-05-13 17:53:23 +00:00
Aaron Huang
917c9f146b Merge "Dropping NAT-T keepalive packet from APF"
am: c4104f029f

Change-Id: Icef6ec0d4ce20053f9e0aeed53a265747e187acf
2019-05-13 04:41:38 -07:00
Aaron Huang
c4104f029f Merge "Dropping NAT-T keepalive packet from APF" 2019-05-13 11:33:37 +00:00
Jelle Fresen
3fce78c5d5 Merge "Ignore /.idea and *.iml files"
am: 1f1f263a8c

Change-Id: I558dc2cdd59dc9d6b5985632d29fc455aef3011c
2019-05-13 03:56:21 -07:00
Treehugger Robot
1f1f263a8c Merge "Ignore /.idea and *.iml files" 2019-05-13 10:42:23 +00:00
Junyu Lai
85d4ff85b1 Merge "Fix concurrent modification exception in KeepaliveTracker"
am: 9916a63bf6

Change-Id: Ibd23240fdf8fb56b4216e2482152f605374f76db
2019-05-13 03:39:29 -07:00
Junyu Lai
9916a63bf6 Merge "Fix concurrent modification exception in KeepaliveTracker" 2019-05-13 10:09:48 +00:00
Jelle Fresen
ad998a66a6 Ignore /.idea and *.iml files
Historically the .idea directory was created in the root of the
checkout. Now we generate the .idea directory in frameworks/base, so we
need to start ignoring it here.

Test: git status
Change-Id: I9b8142768173f3db153fda494f0c49697b703a38
Merged-In: I9b8142768173f3db153fda494f0c49697b703a38
2019-05-13 19:04:59 +09:00
junyulai
cf43dbdbc6 Fix concurrent modification exception in KeepaliveTracker
In aosp/951200, the clean up function delete the item in the
hash map that holds the record while iterating it, where the
list used to iterate the records is backed by the hash map,
so changes to the map are reflected in the list and caused
the concurrent modification exception.

Bug: 132341736
Test: 1. atest com.android.server.ConnectivityServiceTest \
         #testNattSocketKeepalives --generate-new-metrics 300
      2. atest FrameworksNetTests --generate-new-metrics 10

Change-Id: I0481a469ee23231e5f0ab738a06b5e09f6cdb680
2019-05-13 14:48:41 +08:00
Paul Hu
b7ed49dc0e Merge "Add ApfCapabilities common test cases"
am: ce5ecd9304

Change-Id: Iafcc1bad3e4d5a6bd574231ccf79b0e775617ae2
2019-05-12 10:15:31 -07:00
Paul Hu
ce5ecd9304 Merge "Add ApfCapabilities common test cases" 2019-05-12 16:57:18 +00:00
Stanley Tng
171f3255d0 Merge "Increase the timeout for Hearing Aids Pairing"
am: 586890eb9b

Change-Id: I9e5955fa41363870575e0333acd2316aa7c42add
2019-05-10 17:14:57 -07:00
Elliott Hughes
f31f126ed8 Don't explicitly specify no prefix/suffix.
Bug: http://b/129068177
Test: treehugger
Change-Id: I987c88c17b7d1fd01129545bdbd4178de446188c
2019-05-10 17:02:14 -07:00
Treehugger Robot
586890eb9b Merge "Increase the timeout for Hearing Aids Pairing" 2019-05-10 22:46:23 +00:00
Jordan Liu
857c4cbf5f Update getMergedSubscriberIds to pass subId
Bug: 131189269
Test: manual
Merged-In: I0d237b646969442b71597e66c9cb491c02a144d3
Change-Id: I0d237b646969442b71597e66c9cb491c02a144d3
(cherry picked from commit 973a60d76ec29e7295237ef8b6670f81917b071b)
2019-05-10 14:39:11 -07:00
Ian Kasprzak
8c4a6891de [automerger skipped] Merge "Reland: Add FrameworksNetTests dependency on libcgrouprc"
am: 85548fdfbf -s ours
am skip reason: change_id I85891485157ed86e069039dfe3092028ff703dd5 with SHA1 94dc6d68e9 is in history

Change-Id: Iec27ecd2f0c0636b066fa0fe83c049fff656343f
2019-05-10 13:37:45 -07:00