Commit Graph

5560 Commits

Author SHA1 Message Date
Etan Cohen
5faec91513 Merge "Add IPv6 link-local address generation from EUI-48" am: a2a9df3e3a
am: 674479afe5

Change-Id: I63de4fa185649d9389a771860c479899e90b37e4
2018-11-19 16:48:22 -08:00
Etan Cohen
a8923c5aea Add IPv6 link-local address generation from EUI-48
Add a utility method to convert an EUI-48 to an IPv6 link-local
address based on RFC 4291 (EUI-64 generation) followed by RFC 4862.

Bug: 117605977
Test: atest MacAddressTest
Merged-In: I80b683e69da6beff3b37fc345fc15aa9610d09b7
Change-Id: I80b683e69da6beff3b37fc345fc15aa9610d09b7
2018-11-16 21:50:24 -08:00
Sahin Caliskan
661f548304 Merge "Fix RcsManager and add empty RcsThread class" am: 170c382729
am: 28534639bc

Change-Id: Iac6549fc8216edd7b6f6469f3bf4bc1a06432cd2
2018-11-16 09:59:24 -08:00
Sahin Caliskan
1256486a8f Fix RcsManager and add empty RcsThread class
This change fixes the RcsManager setup and adds an empty RcsThread class. Please see go/rcs-in-telephony-doc for details.

Test: Builds fine
Bug: 109759350
Merged-in: Ie3fe476ab11d515ffab6dcc6ccf5ec801a4c9057
Change-Id: Ie3fe476ab11d515ffab6dcc6ccf5ec801a4c9057
2018-11-15 23:28:24 +00:00
Junyu Lai
9c10dcc0f1 Merge "Use spy in PermissionMonitorTest." am: df01b11de1
am: 999733c5fa

Change-Id: I9eac5d82c0b5e3eb5593407aa2eb82cb8c71dc2e
2018-11-09 01:11:47 -08:00
Junyu Lai
df01b11de1 Merge "Use spy in PermissionMonitorTest." 2018-11-09 08:47:03 +00:00
junyulai
345155e8b4 Use spy in PermissionMonitorTest.
Bug: 118811303
Test: runtest frameworks-net
Change-Id: Id61a9efecf1d1ed5a9045b78ecfec9239e13967b
2018-11-09 12:37:16 +08:00
soma, kawata
ec46ff7a1c Merge "Add skip464xlat test in Nat464XlatTest" am: aef8fe0d47
am: 913f72f4cb

Change-Id: Iee577b9b65ca9b576da966d6ca2468da9aa749ef
2018-11-08 05:10:10 -08:00
soma, kawata
88b8f6360a Add skip464xlat test in Nat464XlatTest
Bug: 69949375
Test: Nat464XlatTest, ConnectivityServiceTest

Change-Id: Ibc66d9c2dc8e3d1f118e5f6940e7b3fd4646efd1
2018-11-06 06:02:50 +00:00
Vishnu Nair
6ec0815612 Merge "[DO NOT MERGE] AM: Use ActivityMetricsLogger to get app launch times" into pi-dev
am: a6fc25f6d3

Change-Id: I4bcc8c3a777d6537788b38cd27b2f670fbb9770b
2018-11-02 21:24:55 -07:00
Vishnu Nair
cf23504955 [DO NOT MERGE] AM: Use ActivityMetricsLogger to get app launch times
- Make ActivityMetricsLogger the single source of truth for activity metrics and
use it to provide data for Tron, logcat, event logs and {@link android.app.WaitResult}
- Remove LaunchTimeTracker
- Remove workaround added for b/80084651
- Remove thisTime from WaitResult and logs
- Remove am_activity_fully_drawn_time EventLog Tag
- Update WaitResult parsing logic in AppLaunch
- Discard metrics if a launching activity is already visible.
- original bug: 67683350

Compatibility Changes:
- thisTime removed from logcat and eventlog. Only totalTime will be displayed.
- Change in activity visiblity during launch will invalidate totalTime. am start -w
  will only report WaitTime in this case.
- am_activity_fully_drawn_time is removed from event log.

Bug: 117235762
Test: atest  google/perf/app-startup/third-party-apps/cold-dropcache-stable-test -v
Test: manual tests
Test: check applaunch.txt matches test run

Change-Id: Ib033594b961be9227256eba2a519dd6c2e3db573
(cherry picked from commit 132ee83808)
(cherry picked from commit 017cddcbcb)
(cherry picked from commit f8accc5b30)
(cherry picked from commit af0ea31549)
2018-11-02 13:27:00 -07:00
Paul Hu
dffb7d988c Merge "Support backward compatibility for restricted network permission" 2018-11-01 07:20:05 +00:00
paulhu
3b0f5ea29e Support backward compatibility for restricted network permission
Some native daemons legacy design work with SYSTEM_UID. If none of
SYSTEM_UID apps declare the restricted network permission, it will
result in permission denial in daemons. Allow SYSTEM_UID in the
devices shipped before Q to support backward compatibility.

Bug:114245686
Test: 1. runtest frameworks-net
      2. atest FrameworksNetTests
      3. Native daemons with SYSTEM_UID can work normally

Change-Id: I6f3f0d83bcae74ef5389535b528af3baf649fa48
2018-11-01 10:38:11 +08:00
junyulai
c33ac0d43b Fix negative uid stats caused by 464xlat adjust when eBPF is on.
When using xt_qtaguid to count per uid stats,
NetworkStatsService needs to adjust the 464xlat traffic since
iptables module would double count for ipv4 and ipv6 packet.
But for eBPF, the per uid stats is collected in a different
hook, so the adjustment on root uid would only be needed in tx
direction.

Bug: 112226716
Test: 1. Make ipv4 traffic in ipv6-only network and check data
         usage.
      2. Make ipv4 traffic in a client which connect to
         ipv6-only hotspot.
      3. runtest frameworks-net
      4. cts-tradefed run cts -m CtsNetTestCases -t \
                 android.net.cts.TrafficStatsTest
      5. cts-tradefed run cts -m CtsUsageStatsTestCases

Change-Id: Ic9a84f5446eddc943c255d5f3b89dad171f53cac
2018-10-30 21:23:38 +08:00
Treehugger Robot
d1d3b374b7 Merge "Refactor UidRange by using stable aidl structure" 2018-10-29 00:17:34 +00:00
junyulai
8ed8915e53 No-op refactoring of VPN lockdown status check.
Currently, if VPN lockdown is disabled, the blocking judgement
inside VPN will return false immediately. It will make
ConnectivityService hard to check blocked status by a given
VPN lockdown status.

Thus, move this check into ConnectivityService and check it
externally.

Bug: 117814902
Test: 1. manual test with 3rd-party vpn app
      2. runtest frameworks-net

Change-Id: Ia8319b1a1a12f1058c24badf2431f2ec69bc78e7
2018-10-25 16:43:50 +08:00
Luke Huang
77017913a4 Refactor UidRange by using stable aidl structure
Use stable aidl generated structure instead of UidRange

Test: runtest frameworks-net passes
Test: manual testing of UidRange related function works
Change-Id: Iaf1c10777dc1e71df2be2a57533a10257b12626b
2018-10-24 19:45:09 +09:00
markchien
69955497d4 Reduce excess local prefix computations
only recomputing on the LISTEN_ALL callback

Test: - build, flash, booted
      - runtest frameworks-net

bug: 110335330

Change-Id: I606574f1a8a2899ed4688d7d5ec2cbe0f2638a94
2018-10-22 12:37:42 +09:00
Junyu Lai
43d8774f68 Merge "Add tests for the network blocked status change"
am: af0de1a2e9

Change-Id: I0f3f93807d9089239f572c487d791acd7a324a2e
2018-10-19 09:18:38 -07:00
Mike Yu
f9729757f9 Add tests for the network blocked status change
onBlockedStatusChanged is intruduced for network blocked status.
The changes in this patch are:
  - Test onBlockedStatusChanged which tells apps whether the
    network is blocked.
  - Fixed the tests which is affected by the order changed in
    onAvailable.

Test: as follows
    - runtest frameworks-net
    - runtest -x NetworkPolicyManagerServiceTest.java
Bug: 74575553
Change-Id: I383c037ed895ef69c478dc3cff69fb1e27c42845
2018-10-19 19:52:50 +08:00
Mathieu Chartier
96cb6d97e1 Merge "Sleep 1s before force stop and use killBackgroundApp"
am: 2417859fa5

Change-Id: I92d83f16123dd16f68eb0d95d83f9dbabd493d01
2018-10-18 23:52:16 -07:00
Mathieu Chartier
5615adf824 Sleep 1s before force stop and use killBackgroundApp
Leave a bit of time before force stopping the application. This might
help prevent bad numbers.

Call killbackgroundApp after doing force-stop to make sure nothing is
still running.

Bug: 117094510
Bug: 117888316
Test: atest google/perf/app-startup/third-party-apps/cold-dropcache-stable-test
Change-Id: I47792f99b38edf2c40f61cc3f6817d82e6339d12
2018-10-18 22:03:47 +00:00
Sundong Ahn
a1bc1b1331 Merge "Build com.android.media.remotedisplay with java_sdk_library"
am: 1ad4aed0b9

Change-Id: Icb633bd7f8cc0ed932c0aa70ef9dfe475722ada0
2018-10-14 18:48:01 -07:00
Treehugger Robot
1ad4aed0b9 Merge "Build com.android.media.remotedisplay with java_sdk_library" 2018-10-15 01:32:16 +00:00
Neil Fuller
d252f61f66 Merge "Remove explicit dependencies on "core" libraries"
am: 18f9a2c24d

Change-Id: I326380ec0c10f29c09c64f4044a9c79c9ab2648f
2018-10-12 03:12:22 -07:00
Neil Fuller
066ca17372 Remove explicit dependencies on "core" libraries
The dependencies are unnecessary since bouncycastle, okhttp
and conscrypt are included in the "standard libraries".

Test: build
Bug: 113148576
Change-Id: Ic8d15d911decbdd6391db8c1231b845353586a54
2018-10-11 16:57:18 +01:00
Luke Huang
f81dce0f79 Merge "Refactor tetherGetStats by using stable aidl structure"
am: 335253df0f

Change-Id: Ibaefeee3e115cc04163f1b07cdba148f9e9ab3b5
2018-10-10 23:10:10 -07:00
Luke Huang
335253df0f Merge "Refactor tetherGetStats by using stable aidl structure" 2018-10-11 05:58:22 +00:00
Colin Cross
bfff7e2fe8 Merge changes from topic "aapt2-manifest-elements"
am: e75f2f504e

Change-Id: I2cf054f942109e539c2439887078a6e182603456
2018-10-10 16:13:26 -07:00
Treehugger Robot
e75f2f504e Merge changes from topic "aapt2-manifest-elements"
* changes:
  Remove workarounds for b/79755007
  AAPT2: Add the rest of supported manifest elements
  AAPT2: Add supported manifest elements
2018-10-10 22:29:57 +00:00
Yan Yan
47a589c945 Merge changes I10c01f2b,Ie05bc535
am: 277d42a035

Change-Id: I2e55a266f65268ca734c028d4da7add14a281d75
2018-10-05 11:47:12 -07:00
Yan Yan
277d42a035 Merge changes I10c01f2b,Ie05bc535
* changes:
  Check to ensure UDP-encap is used only for IPv4
  Add UDP encapsulation tests for IpSecService.
2018-10-05 17:38:41 +00:00
evitayan
e4259d3e53 Check to ensure UDP-encap is used only for IPv4
This commit checks if UDP-encapsulation is used
for unsupported address family and throws
IllegalArgumentException when it happens.

Bug: 74213459
Test: Tests added in testCreateTransportModeTransformWithEncap
      and testCreateTunnelModeTransformWithEncap.
      Command: runtest frameworks-net
      Verified on taimen.
Change-Id: I10c01f2bad6aca23430849ea9ef6c1eb157ae131
2018-10-04 11:44:00 -07:00
evitayan
0a7d3e3424 Add UDP encapsulation tests for IpSecService.
This commit adds tests to ensure that IpSecService properly
handles UDP-encapsulation transforms correctly.

Bug: 76110065
Test: Added: testCreateTransportModeTransformWithEncap,
             testCreateTunnelModeTransformWithEncap.
      Command: runtest frameworks-net
      Verified on taimen.
Change-Id: Ie05bc5354266806c2d03b0b3d73a4696a89eccf2
2018-10-04 10:37:47 -07:00
Luke Huang
13b79e83aa Refactor tetherGetStats by using stable aidl structure
Use stable aidl structure instead of persistbundle

Test: runtest frameworks-net passes
Test: manual testing of tetherGetStats function works

Change-Id: I6835541d450446ba7993ac9f5b783d34229b79cb
2018-10-04 16:24:44 +08:00
Remi NGUYEN VAN
94b0562628 Merge "Send hostname and MTU options in DHCP ACK/OFFER"
am: 3b12359e4c

Change-Id: I47972e25fd69471aacd52b58ffed67be1e685557
2018-10-03 19:08:34 -07:00
Remi NGUYEN VAN
3b12359e4c Merge "Send hostname and MTU options in DHCP ACK/OFFER" 2018-10-04 01:08:19 +00:00
Neil Fuller
cfc508530d Merge "Remove unnecessary dependency on bouncycastle"
am: 32fb670a0a

Change-Id: I6289757af66978259b49d4b0b648e049a96b25a7
2018-10-03 06:58:20 -07:00
Neil Fuller
32fb670a0a Merge "Remove unnecessary dependency on bouncycastle" 2018-10-03 13:36:02 +00:00
Jayant Chowdhary
a0484ac42f Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests"
am: 604b0eed1f

Change-Id: I82c3e108ed4d284840358e7f82aaac3a8404453c
2018-10-02 14:01:01 -07:00
Neil Fuller
35297c49f6 Remove unnecessary dependency on bouncycastle
Nothing in this target requires bouncycastle.
Bug: 113148576
Test: build

Change-Id: I6128fca1eca1c6cefe679721a4cf72729d27d6bb
2018-10-02 21:32:36 +01:00
Jayant Chowdhary
604b0eed1f Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests" 2018-10-02 20:14:37 +00:00
Leif Hendrik Wilden
1bceeaac85 Merge "Allow wifi and ethenet connected at same time."
am: 54d34fe8a7

Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc
2018-10-02 10:57:11 -07:00
Treehugger Robot
54d34fe8a7 Merge "Allow wifi and ethenet connected at same time." 2018-10-02 17:09:16 +00:00
Sundong Ahn
881a9872e7 Build com.android.media.remotedisplay with java_sdk_library
com.android.media.remotedisplay is built with java_sdk_library and api
files are added by running "make update-api".
The com.android.media.remotedisplay.xml is removed since it will be made
auto generation by soong when the library is built with java_sdk_library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: adb shell cmd package list libraries |\
      grep com.android.media.remotedisplay
      And check the com.android.media.remotedisplay library

Merged-In: I40e2d5456877a434f7c1ae70b6ec3692db106537
Change-Id: I40e2d5456877a434f7c1ae70b6ec3692db106537
(cherry picked from commit 6e038837be)
2018-10-02 13:35:49 +09:00
Jayant Chowdhary
14aeab6f19 Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests
libbinder and libhwbinder now also depend on libbinderthreadstate. Add
this dependency to LOCAL_JNI_SHARED_LIBS since these libraries need to
be packaged together.

Bug: 110364143

Test: atest FrameworksNetTests
Test: atest FrameworksServiceTests (no new failures)
Test: atest FrameworksUiServiceTests

Change-Id: Ibc63f041b8ee23cc4d0e9d82a508a128104e6025
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2018-10-01 15:18:18 -07:00
Leif Hendrik Wilden
fd30663181 Allow wifi and ethenet connected at same time.
This will improve the user experience on Android TV devices,
see bug for details.

In addition when connecting adb to the device by ethernet
for cts, wifi will not connect, causing lots of tests to fail.
For example:
[CTS7.1]android.net.wifi.cts.WifiInfoTest#testWifiInfoProperties
[CTS7.1]android.net.cts.ConnectivityManagerTest#testConnectivityChanged_
manifestRequestOnlyPreN_shouldReceiveIntent

Use command:settings to put global wifi_data_always_on 1 to enable it.

Bug: 26102779
Test: Manual, CTS.
Change-Id: I711d93061a6bc7164d98a858912f781e1b967406
2018-10-01 09:12:10 -07:00
Chiachang Wang
38acbcdabe Merge "Fix idle timer rule leakage"
am: 9367b9ea4c

Change-Id: I5ac912d121d094b36d46ccca385d5cf319fcb945
2018-09-30 19:57:18 -07:00
Remi NGUYEN VAN
bc3c6b1314 Merge changes I0f997d30,I288ba1f4
am: 53f8591789

Change-Id: I8309074ba0744dee5789a2fe1f3b7e20bb3bc5b9
2018-09-30 19:53:29 -07:00
Chiachang Wang
9367b9ea4c Merge "Fix idle timer rule leakage" 2018-10-01 02:20:23 +00:00