Commit Graph

565398 Commits

Author SHA1 Message Date
Rafal Slawik
7bc8d20b51 Merge "Add missing AMC reviewers" 2021-03-11 11:54:35 +00:00
Treehugger Robot
721f75ec5a Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance" 2021-03-11 11:20:11 +00:00
Yo Chiang
ffdc8928ac Merge "Ignore InterruptedException from Thread.sleep()" 2021-03-11 10:58:38 +00:00
Rafal Slawik
13c2ee55f7 Add missing AMC reviewers
Ensure that everyone from AMC rotation can approve platform changes.

Bug: 182373120
Test: n/a
Change-Id: I074fcd2b8635e930e16f20e59e4683d27ecdd519
2021-03-11 10:02:38 +00:00
Yo Chiang
d110e02fad Ignore InterruptedException from Thread.sleep()
It's probably harmless that Thread.sleep() is interrupted, so ignore the
error.

Bug: 165471299
Test: None
Change-Id: I86e07fe82875172c84f96176b4368ead7b60d09d
2021-03-11 08:44:03 +00:00
Lorenzo Colitti
78cf2f60e5 Merge "Unbreak extraInfo values returned to apps." 2021-03-11 08:06:03 +00:00
Janis Danisevskis
7a46c3c1fd Merge "Modify AttestationUtils to use public Keystore API" 2021-03-11 06:47:41 +00:00
James Lin
6c165b2da9 Merge "Update the RCS UCE APIs." 2021-03-11 06:28:00 +00:00
Janis Danisevskis
12ddcc8874 Merge "Keystore 2.0: Fix TODOs in public doc comments." 2021-03-11 06:19:34 +00:00
Lorenzo Colitti
f0f69b46e2 Merge "Set extraInfo on cellular TestNetworkAgents." 2021-03-11 03:31:49 +00:00
Ady Abraham
d14c779c66 Merge "Update test expectations with changed names of D8 synthetics" 2021-03-11 02:26:37 +00:00
Aaron Huang
a06c417b0f Merge "Remove IBatteryStats from ConnectivityService module" 2021-03-11 02:04:41 +00:00
Yuntao Zhou
6305e68c6e Merge "Fix minor typo in ContentCaptureManager Javadoc" 2021-03-11 01:51:47 +00:00
Yuntao Zhou
538f58916a Fix minor typo in ContentCaptureManager Javadoc
Noticed on https://developer.android.com/reference/android/view/contentcapture/ContentCaptureManager

Change-Id: I7bb01264947b93e0784497cbad5a5609cb4296d3
2021-03-11 01:51:21 +00:00
Lucas Lin
d2b8d781f8 Merge "Expose TYPE_VPN_* constants" 2021-03-11 01:30:02 +00:00
Jeff Sharkey
958a1ab393 Merge "Add OWNERS file to AM test helper app" 2021-03-11 01:08:49 +00:00
Jackal Guo
e6d4ca9b8a Merge "Update OWNERS for prebuilt_info" 2021-03-11 00:41:09 +00:00
Chiachang Wang
c506ddca23 Merge "Remove hidden APIs usage regarding to dump" 2021-03-11 00:28:54 +00:00
Chiachang Wang
e7aa80c818 Remove hidden APIs usage regarding to dump
Classes inside the incoming connectivity module will not be able
to access hidden APIs. The hidden DUMP_FLAG_PRIORITY_* flags
usage should be replaced. It was used to control the dump
priority. DEFAULT priority for services which is treated the
same as NORMAL priority. ConnectivityServiceInitializer took
both NORMAL and HIGH. It trigger different information dumped.
It's replaced with dumpsys that does not send "--dump-priority"
arguments to the service. Thus, design is replaced with
local parsing inside ConnectivitySerivce to provide equivalent
dump.

Bug: 172183305
Test: m ; flash and boot up
Test: adb bugreport ; adb dumpsys connectivity
Change-Id: Ib3c9d8692eb4382cd106734a1a716df6f48ffca4
2021-03-11 00:28:47 +00:00
Jing Ji
46ab35ec5f Add OWNERS file to AM test helper app
Test: N/A
Change-Id: I7eafb4e513a1e7216a05c87c5dbf670a1d3ebc13
2021-03-10 16:08:09 -08:00
Tianjie Xu
5921cd5389 Merge "Log a message if there is no escrow data for RoR" 2021-03-10 23:29:35 +00:00
Sooraj Sasindran
2f85c69c74 Merge "Update documentation according API review" 2021-03-10 23:13:15 +00:00
Kevin Han
20414370df Merge "Add local service interface for app hibernation" 2021-03-10 22:37:27 +00:00
Jeff Sharkey
5232082243 Merge "Make FileUtils#createDir threadsafe" 2021-03-10 22:02:14 +00:00
Benedict Wong
03c0059bb1 Merge changes Iad296830,I826711bb,Ieb2a9b20,I6b688b00
* changes:
  Declare VCN exposed networks as NOT_VCN_MANAGED
  Allow underlying cell without unwanted NOT_VCN_MANAGED capability
  Override network and use config IKE session
  Remove usage of hidden Connectivity APIs
2021-03-10 21:53:01 +00:00
Hall Liu
53252b14e5 Merge "Add onBindClient for testing" 2021-03-10 19:24:43 +00:00
Janis Danisevskis
274a93e953 Keystore 2.0: Fix TODOs in public doc comments.
Bug: 174580379
Test: N/A
Change-Id: If893c408156b2481a22730de22f1a7ba391d88eb
2021-03-10 11:22:22 -08:00
Benedict Wong
de1f0c3edb Declare VCN exposed networks as NOT_VCN_MANAGED
This change marks VCN-exposed networks as generic use, NOT_VCN_MANAGED
networks. This is the result of changes to the default NetworkCapability
set, where NOT_VCN_MANAGED was removed from the default capabilities.

Bug: 182212201
Test: atest FrameworksVcnTests
Change-Id: Iad296830201d7317537fac6bea53c79d4e41cae3
2021-03-10 10:27:23 -08:00
Lorenzo Colitti
8a7bb857ac Unbreak extraInfo values returned to apps.
These were broken by aosp/1553463, which made filterNetworkInfo
unconditionally call setDetailedState with a reason of "" and an
extraInfo of null.

Fix both synchronous getter APIs (e.g., getNetworkInfo) and
CONNECTIVITY_ACTION broadcasts by calling a new
filterForLegacyLockdown method that behaves similarly to how the
now-deleted LockdownVpnTracker#augmentNetworkInfo used to behave.

While I'm at it, move back to private a method that was public
only because LockdownVpnTracker used it.

Fix: 181855958
Test: new unit test coverage
Change-Id: I2c7b88fcec9dd36b45cb51db8d19b3ee8bad44a6
2021-03-11 00:59:14 +09:00
Sooraj Sasindran
60310d719e Update documentation according API review
Bug: 174580495, 174580077
Change-Id: I2791eb1351057a55caa99e9e1b95d26a31d708f2
Test: build
2021-03-10 15:15:19 +00:00
Riddle Hsu
90e336819c Merge "Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo" 2021-03-10 15:13:14 +00:00
James Mattis
a4e69024bb Merge "frameworks: add test group for auto tests" 2021-03-10 15:12:49 +00:00
Lorenzo Colitti
e93309bff7 Set extraInfo on cellular TestNetworkAgents.
This makes the test more realistic, since telephony always puts
the APN name in the extraInfo field. It also makes it easy to
test that various APIs properly return the extra info without
plumbing a new parameter through TestNetworkAgentWrapper,
NetworkAgentWrapper, and InstrumentedNetworkAgent.

Also make the extraInfo and the legacyType available to tests.
This will be used in future tests that assert the contents of
extraInfo.

Bug: 181855958
Test: test-only change
Change-Id: If4eddb6cd9e70bb33e10d72aceebaea843244246
2021-03-10 23:33:08 +09:00
Jackal Guo
91a252e974 Update OWNERS for prebuilt_info
Align OWNERS with prebuilt file and info.

Test: Treehugger
Change-Id: I41768ce1131bfa89483a416a74f3da53310a1f05
2021-03-10 20:57:29 +08:00
Rubin Xu
643fb23a74 Merge "Add locksettings unit tests to presubmit" 2021-03-10 11:05:50 +00:00
lucaslin
62b2252831 Expose TYPE_VPN_* constants
Expose TYPE_VPN_* constants so that connectivity mainline module
can access them.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: Ic8d46a392f3deda5983c52b43585707fa2c98f57
2021-03-10 16:57:57 +08:00
weihua.li
af6f90bbf1 Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo
Use memInfo.getTotalRss instead of memInfo.getTotalPss
to get the value of 'TOTAL of Rss Total'.

bug 182328162

Signed-off-by: weihua.li <weihua.li@unisoc.com>
Change-Id: I5487abe4870e10f4ee79c86c0ad0e75a3843deb1
2021-03-10 13:56:35 +08:00
Tianjie
0ab007e112 Log a message if there is no escrow data for RoR
Bug: 181957098
Test: reboot, check the message is logged
Change-Id: If531931f1da106dd553e44d82bc595eaf875b195
2021-03-09 21:52:55 -08:00
Hall Liu
eb7c9eaf16 Add onBindClient for testing
Add an overrideable method in ConnectionService that gets called when
telecom binds, since onBind is final and it's unsafe to make not-final.

Bug: 181057509
Test: atest CtsTelecomTestCases
Change-Id: I80088185402789fec499b8659ca8b74bcec05748
2021-03-09 20:29:40 -08:00
Yan Yan
a8d51aac66 Merge changes from topic "ike-params"
* changes:
  Support converting VcnControlPlaneIkeConfig to/from PersistableBundle
  Support converting IKE Options to/from PersistableBundle
  Support converting IkeConfigRequest to/from PersistableBundle
  Support converting IkeAuthEapConfig to/from PersistableBundle
  Support converting IkeAuthDigitalSignConfig to/from PersistableBundle
  Support converting IkeAuthConfig to/from PersistableBundle
  Support converting IkeSessionParams to/from PersistableBundle
2021-03-10 02:31:36 +00:00
Paul Hu
dd010bff79 Merge "Replace PendingIntent#getIntent" 2021-03-10 02:13:11 +00:00
Cody Kesting
54a3e52998 Merge "Specify exposed capabilities for VCN gateway connection errors." 2021-03-10 02:00:50 +00:00
Benedict Wong
dc1efbb3b2 Allow underlying cell without unwanted NOT_VCN_MANAGED capability
This change updates the UnderlyingNetworkTracker to rely on the
TelephonyNetworkSpecifier for selecting underlying networks. This
ensures that there is always a cellular NetworkRequest filed for
Cellular to bring up an underlying Network.

Bug: 182211364
Test: FrameworksVcnTests
Change-Id: I826711bb671440054c2090793315a5f1d57596c0
2021-03-09 17:58:39 -08:00
Chalard Jean
d36130f759 Merge "Fix a bug where listen callbacks would not be called" 2021-03-10 00:32:58 +00:00
Jun
8f7d2dfa2c frameworks: add test group for auto tests
Adding a seperate test tag into postsubmit so as to identify which tests
we want to run for automotive builds.

Test: atest --test-mapping [src]:auto-postsubmit
bug: 179917339
Change-Id: I3860fb6bf4f4174fad26cce5f7d6b43fd6494c0f
2021-03-09 15:54:39 -08:00
Benedict Wong
033a4308ce Override network and use config IKE session
This change ensures the IKE configs are used with the correct network

Bug: 163604823
Test: FrameworksVcnTests
Change-Id: Ieb2a9b202204577f6e6969ef30245baed6382aa6
2021-03-09 15:07:57 -08:00
Remi NGUYEN VAN
f182642b86 Merge "Remove unused buildNetworkIdentity" 2021-03-09 23:01:45 +00:00
Jeff Sharkey
3f0f0b686a Merge "Wait for installd to start to perform dexopt operation" 2021-03-09 23:01:37 +00:00
Ady Abraham
247ee62957 Update test expectations with changed names of D8 synthetics
Change-Id: I952afddd07355d7c5014e6ab1a3d2154ae919cd4
Test: FrameworksCoreTest:com.android.internal.os.LooperStatsTest
Bug: 182273986
2021-03-09 21:36:25 +00:00
Rahul Sabnis
8e97fea3c2 Merge "Derestrict some APIs." 2021-03-09 21:29:12 +00:00