Merge "Assign the bit calculation as long to prevent overflow" am: d125112aa2 am: 7f5c1bc46c am: 67bdf0e830
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307
Change-Id: Ia3a1974227ebfd0069b288203df3551a561556eb
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-04-07 06:06:50 +00:00
ec27c044d3
Merge "Assign the bit calculation as long to prevent overflow" am: d125112aa2 am: 7f5c1bc46c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307
Change-Id: I68844967fbef3cffb7211ce72fd502ae19c331c8
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-04-07 05:39:01 +00:00
67bdf0e830
Merge "Assign the bit calculation as long to prevent overflow" am: d125112aa2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307
Change-Id: I548347851e102f81cd13516a6a409e74c59859f4
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-04-07 04:56:41 +00:00
7f5c1bc46c
Merge "Assign the bit calculation as long to prevent overflow"
Chiachang Wang
authored and
Gerrit Code Review
commited 2021-04-07 04:24:46 +00:00
d125112aa2
Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 7fe967c611 am: 938579f701 am: dfe1a80db6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279
Change-Id: I05777492db3ab9d7b4c6c69131f9404780e4e832
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-07 02:47:49 +00:00
4755f52830
Assign the bit calculation as long to prevent overflow
...
The value should be assigned as a long to do the bit calculation
as the mNetworkCapabilities is intended to be a long. Otherwise,
the value will be temporary assigned into an integer then
assigned to the target long. When the bit shift calculation
is out of the integer scope, the calculation will overflow and
result in unexpected bebavior.
Without assigning to a long, ConnectivityServiceTest will get
Out-Of-Memory in StringBuilder while generating toString() in
NetworkCapabilities after updating tests to verify
NET_CAPABILITY_VSIM and NET_CAPABILITY_BIP.
Bug: 130869457
Test: atest FrameworksNetTests
Change-Id: I4d34c1215c7efb6dc352c314107792e3fa512ad7
Chiachang Wang
commited 2021-04-07 02:06:33 +00:00
7dd2a3d7db
Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 7fe967c611 am: 938579f701
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279
Change-Id: I9fe5fb1cbbbae44e91efe90107c220a7b64d9755
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-07 02:00:09 +00:00
dfe1a80db6
Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 7fe967c611
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279
Change-Id: I6653d668d1fdc4370f8d5db1da41214b9755bb4d
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-07 01:16:24 +00:00
938579f701
Merge "ConnectivityManager: Address review comments from aosp/1595396"
Treehugger Robot
authored and
Gerrit Code Review
commited 2021-04-07 00:36:27 +00:00
7fe967c611
Merge "NetworkCapabilities: Hide copy constructor" am: 516de2b183 am: 5a76723653 am: 2435d5a787
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151
Change-Id: Ia04c6e313a5c960c4874cd57cf91c6619d1505da
Roshan Pius
authored and
Automerger Merge Worker
commited 2021-04-06 18:25:52 +00:00
8429766378
Merge "NetworkCapabilities: Hide copy constructor" am: 516de2b183 am: 5a76723653
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151
Change-Id: If4d2d06c0e3ca6793dcb6139d3cd197e33f5aab7
Roshan Pius
authored and
Automerger Merge Worker
commited 2021-04-06 17:36:58 +00:00
2435d5a787
Merge "NetworkCapabilities: Hide copy constructor" am: 516de2b183
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151
Change-Id: I4e3b8ca8158102bf71b6ab2ca796bdfeeedd7d55
Roshan Pius
authored and
Automerger Merge Worker
commited 2021-04-06 16:49:29 +00:00
5a76723653
ConnectivityManager: Address review comments from aosp/1595396
...
Bug: 156867433
Test: atest android.net
Test: atest com.android.server
Change-Id: I7f5d043732ae22edd14bf581b7dc676c9236b545
Roshan Pius
commited 2021-04-06 16:42:51 +00:00
f75ffaaded
Merge "NetworkCapabilities: Hide copy constructor"
Roshan Pius
authored and
Gerrit Code Review
commited 2021-04-06 15:57:47 +00:00
516de2b183
Merge "Ignore checking TRANSPORT_USB when Android version is older than S" into sc-dev
Lucas Lin
authored and
Android (Google) Code Review
commited 2021-04-06 08:40:23 +00:00
ec0c39f789
[automerger skipped] Merge "Add session ID to VpnTransportInfo" am: 133733bdd2 am: dc50757d4d am: 537e4415b1 -s ours
...
am skip reason: skip tag Change-Id I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d with SHA-1 5acb6b6d4e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218
Change-Id: Idcdd09ad0e7c11482dc048dd30f4a72a7e294b2f
Frank Li
authored and
Automerger Merge Worker
commited 2021-04-06 07:57:52 +00:00
5d3ca7b19c
Merge "Downgrade DNS fail message from Error to Warning" am: 46b0f02e22 am: bd83b9f1d6 am: d3f719156d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662360
Change-Id: Id5a17d24b9f7bd012df60b4cf1b1d088a34805bc
Ken Chen
authored and
Automerger Merge Worker
commited 2021-04-06 07:56:55 +00:00
13598d6591
Merge "Cleanup setGlobalProxy" am: 0656c4314c am: 42fbe21e61 am: 53f5943e4e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640148
Change-Id: Ic9757060f398aaf871141dc5199bf49988637937
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-04-06 07:55:54 +00:00
50da27813b
Merge "Add session ID to VpnTransportInfo" am: 133733bdd2 am: dc50757d4d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218
Change-Id: I554a86b2445f0449e5556871f553158dff19e192
Frank Li
authored and
Automerger Merge Worker
commited 2021-04-06 07:35:06 +00:00
537e4415b1
Merge "Downgrade DNS fail message from Error to Warning" am: 46b0f02e22 am: bd83b9f1d6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662360
Change-Id: Id681bbbafa73df18cc49d0dd03caeb37fcd99b7e
Ken Chen
authored and
Automerger Merge Worker
commited 2021-04-06 07:33:32 +00:00
d3f719156d
Merge "Cleanup setGlobalProxy" am: 0656c4314c am: 42fbe21e61
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640148
Change-Id: I0a8d51af2280d47f3924f66d56e529f57057b3bb
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-04-06 07:30:44 +00:00
53f5943e4e
Merge "Add session ID to VpnTransportInfo" am: 133733bdd2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218
Change-Id: I736118ea676708ef6630d2153a3986459b31850c
Frank Li
authored and
Automerger Merge Worker
commited 2021-04-06 07:01:12 +00:00
dc50757d4d
Merge "Downgrade DNS fail message from Error to Warning" am: 46b0f02e22
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662360
Change-Id: Ife7da1c0494d24e140ea9fdc64f7018340cc3e40
Ken Chen
authored and
Automerger Merge Worker
commited 2021-04-06 06:55:39 +00:00
bd83b9f1d6
Merge "Add session ID to VpnTransportInfo"
Frank Li
authored and
Gerrit Code Review
commited 2021-04-06 06:50:48 +00:00
133733bdd2
Merge "Cleanup setGlobalProxy" am: 0656c4314c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640148
Change-Id: I0052f30d52f00f40b933eb1573b1a0de37e9cba2
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-04-06 06:50:15 +00:00
42fbe21e61
Merge "Downgrade DNS fail message from Error to Warning"
Ken Chen
authored and
Gerrit Code Review
commited 2021-04-06 06:35:04 +00:00
46b0f02e22
Merge "Cleanup setGlobalProxy"
Chalard Jean
authored and
Gerrit Code Review
commited 2021-04-06 06:19:01 +00:00
0656c4314c
Merge "Adding per-app support for app add/remove" am: 922249e2bb am: 08119d7700 am: a208c33fcf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633904
Change-Id: I72d9981b2a6febc218c30926e58072f43e8bf0a5
James Mattis
authored and
Automerger Merge Worker
commited 2021-04-06 06:12:06 +00:00
eac282f62e
Merge "Downgrade the log level of exception log" am: 7faee617b9 am: 1ca675172c am: 42f972825d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660002
Change-Id: I5ab24f6bc5d9e52aeb78c9464bffe8d51bf5c70e
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-06 06:11:29 +00:00
5ecb359fea
Merge "Adding per-app support for app add/remove" am: 922249e2bb am: 08119d7700
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633904
Change-Id: I6132b72fb299bf51a6667adcf801c9b751bf9feb
James Mattis
authored and
Automerger Merge Worker
commited 2021-04-06 05:25:46 +00:00
a208c33fcf
Merge "Downgrade the log level of exception log" am: 7faee617b9 am: 1ca675172c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660002
Change-Id: I47bdd7a0c7355185372647f6f39d41c67f7a361b
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-06 05:25:11 +00:00
42f972825d
Merge "Adding per-app support for app add/remove" am: 922249e2bb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633904
Change-Id: I8f17e1a2a7e920cb1d49fe66d06728714580ef76
James Mattis
authored and
Automerger Merge Worker
commited 2021-04-06 04:50:32 +00:00
08119d7700
Merge "Downgrade the log level of exception log" am: 7faee617b9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660002
Change-Id: Ic9d45e57e3ffc224670d85e4e09e02a4e134987f
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-06 04:47:21 +00:00
1ca675172c
Merge "Adding per-app support for app add/remove"
James Mattis
authored and
Gerrit Code Review
commited 2021-04-06 04:35:37 +00:00
922249e2bb
Merge "Downgrade the log level of exception log"
Treehugger Robot
authored and
Gerrit Code Review
commited 2021-04-06 04:01:59 +00:00
7faee617b9
Downgrade DNS fail message from Error to Warning
...
Most DNS fails are caused by network issues, like connection timed out.
Lower log severity from error to warning to conform to go/greenlog.
Test: 1. connect to a WiFi AP without WAN
2. atest CtsNetTestCases:android.net.cts.DnsResolverTest
3. adb logcat | grep resNetworkResult:android
Bug: 181269159
Change-Id: Ifeaf250c91a4b9123d200bd62f085c11009f2491
Ken Chen
commited 2021-04-06 02:30:56 +00:00
5d1c4661da
Downgrade the log level of exception log
...
This exception log is usually printed when the device connects to
a wifi. The cause is that when the device connects to a wifi,
wifi will send CONNECTING state first, then CONNECTED state.
And in CONNECTING state, wifi will send the LinkProperties to
ConnectivityService and ConnectivityService will try to update
that LinkProperties(including interface) to netd. But the netid
hasn't set to netd yet before wifi CONNECTED, so this exception
log will be printed.
There is no really issue in this case, so downgrade the log level
might be a better thing for all Android developer.
Bug: 181269159
Test: m
Change-Id: I61c09352225a610fcd6d3dd33b782ee114c35fc5
lucaslin
authored and
Lucas Lin
commited 2021-04-06 02:02:50 +00:00
3967e5f614
Merge "Add visibility of framework-connectivity.impl for wifi test" into sc-dev
Chiachang Wang
authored and
Android (Google) Code Review
commited 2021-04-06 00:23:37 +00:00
9be3432c2e
Merge "Remove unstable IpPrefix" am: 3f6415a2f5 am: 2babf25cf0 am: 75968dae24
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662674
Change-Id: Idfa92d12a45385412c2013637c657acfb9fec3a2
Steven Moreland
authored and
Automerger Merge Worker
commited 2021-04-06 00:05:48 +00:00
eed29df970
Merge "Remove unstable IpPrefix" am: 3f6415a2f5 am: 2babf25cf0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662674
Change-Id: I41d891c9a4e0c3c0c42fcc425ea5230d23dbb86e
Steven Moreland
authored and
Automerger Merge Worker
commited 2021-04-05 23:19:09 +00:00
75968dae24
Merge "Remove unstable IpPrefix" am: 3f6415a2f5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662674
Change-Id: I7517ae6cefa96ee3ca38fbcca36970677cb6469b
Steven Moreland
authored and
Automerger Merge Worker
commited 2021-04-05 22:37:44 +00:00
2babf25cf0
Merge "Remove unstable IpPrefix"
Steven Moreland
authored and
Gerrit Code Review
commited 2021-04-05 21:59:47 +00:00
3f6415a2f5
Adding per-app support for app add/remove
...
Adding support for per-app network functionality to react to application
installs, removals and updates. Also, opportunistic cleanup of a couple
annotations.
Bug: 177092163
Bug: 176494815
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk
Change-Id: I45acbd0d2ef50d575f14a944ce82b185ed69f219
James Mattis
commited 2021-04-05 09:55:44 -07:00
bd275dcf3d
NetworkCapabilities: Hide copy constructor
...
Only used by connectivity service, no need to mark it public.
Bug: 184537591
Test: Compiles
Change-Id: Ie0d515d73e30a4e15141a3d92aa739192badeb13
Roshan Pius
commited 2021-04-05 09:29:30 -07:00
f458be1093
Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6 am: 0fa2dde613 am: adef15dabb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659999
Change-Id: I015c98915193a28d3b53b309b38479247346519b
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-05 15:09:51 +00:00
bbd768d50f
Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6 am: 0fa2dde613
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659999
Change-Id: Iaebc7427cafaf77c025885f2ac317cbead21b068
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-05 14:24:03 +00:00
adef15dabb
Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659999
Change-Id: I7a77b050fd844f76e4f7aafa319017382ac06602
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-04-05 13:44:51 +00:00
0fa2dde613
Merge "Fix broken testCaptivePortalApp"
Treehugger Robot
authored and
Gerrit Code Review
commited 2021-04-05 13:05:41 +00:00
5110c6dad6
Merge "Fix a bug where the wrong profile is queried" am: 167cc4a044 am: 92bbfaf0a2 am: 1bc19cb6a9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662362
Change-Id: I5498b7eb2b1b3e4e195ac47d8d3b471496b779b6
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-04-05 08:10:29 +00:00
01a6b34d1d
Merge "Fix a bug where the wrong profile is queried" am: 167cc4a044 am: 92bbfaf0a2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662362
Change-Id: I314686498e3412866e6e17fc2d4377523007589f
Chalard Jean
authored and
Automerger Merge Worker
commited 2021-04-05 07:20:07 +00:00
1bc19cb6a9