Commit Graph

688048 Commits

Author SHA1 Message Date
Oli Lan
c4227ee28f Merge "Bad lock object." 2022-04-11 17:01:30 +00:00
Kai Peng
546fbc8bf7 Bad lock object.
Locking on an interned string can cause unexpected locking collisions, and we should lock the mLock object here.

Change-Id: I8b6557371b0cb79e1bcbc732982cf66b9de663a5
2022-04-11 12:41:44 +00:00
Treehugger Robot
f743f382c9 Merge "Update test owners for SSL*,Uri*,Url*" 2022-04-11 11:16:08 +00:00
Orion Hodson
c7db718dda Update test owners for SSL*,Uri*,Url*
Bug: 171966843
Test: checkowners.py OWNERS
Change-Id: I15ba32283148c097661cc4273c67ebb15ca845fc
2022-04-11 09:59:00 +01:00
Robert Horvath
7881ffd09f Merge "Add Low Power Standby support to NetworkPolicyManagerService" 2022-04-11 08:48:34 +00:00
Miguel Aranda
4e7f5518f1 Merge "Correct AdditionPerfTest to return void." 2022-04-11 08:37:13 +00:00
Chiachang Wang
b7e998e235 Merge "Update the java doc" 2022-04-11 02:54:46 +00:00
Bill Yi
bbe0c62d66 Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" 2022-04-08 18:08:24 +00:00
Treehugger Robot
7af43734b1 Merge "media: fix ImageReader to handle P010 images" 2022-04-08 17:16:51 +00:00
Evan Laird
c5fbfeb8f5 Merge "Show 4G LTE and 4G LTE+ data connection type" 2022-04-08 15:05:57 +00:00
Miguel
24ec182f8d Correct AdditionPerfTest to return void.
Test: atest AdditionPerfTest
Change-Id: I920864a557cedd96ff0a6364506946feb15b0df9
2022-04-08 14:53:28 +00:00
Robert Horvath
56317f3ccf Add Low Power Standby support to NetworkPolicyManagerService
Bug: 190822356
Test: atest NetworkPolicyManagerServiceTest
Merged-In: I6c554df71b12bcf06f1c98ef70c35242bc90a689
Change-Id: I4b3f2625e9eed296055813e4641da9f85f8c7929
2022-04-08 14:50:42 +00:00
Alan Stokes
59137a2227 Merge "Log pending odsign metrics on start" 2022-04-08 08:20:49 +00:00
Bill Yi
95267eaf87 Merge SP2A.220405.004 to aosp-master - DO NOT MERGE
Merged-In: Iae1a66165221f45051be17c4d047b5bd5be3999b
Merged-In: I0c82fda5497bace30d49989b8e84ebc98250ca8c
Change-Id: I2c75988c023cec548e3a576cb0c3a1a13bb0016f
2022-04-07 18:40:59 -07:00
Eric Biggers
7e3c5382cc Merge changes Idc218e5f,I26c3fafc
* changes:
  Remove more FDE methods from StorageManager
  Drop FDE status checks from DevicePolicyManagerService
2022-04-08 00:09:30 +00:00
Wonsik Kim
584cde2e6d media: fix ImageReader to handle P010 images
Bug: 210947256
Test: atest android.media.decoder.cts.ImageReaderDecoderTest
Test: atest android.hardware.camera2.cts.ImageReaderTest
Change-Id: I6541f7d49cb932c85374bf9acf777038b888e873
2022-04-07 16:51:46 -07:00
Eric Biggers
bd13f84152 Remove more FDE methods from StorageManager
Now that these methods are no longer called, and none of them are a
public API or have @UnsupportedAppUsage, they can be removed.

inCryptKeeperBounce() actually had one known app user via reflection,
despite the method not having @UnsupportedAppUsage.  However, that user
only made the call if Build.VERSION.SDK_INT < VERSION_CODES.P, so it is
not being used anymore.

Bug: 208476087
Change-Id: Idc218e5f355bb61257b07cf5b5b6df5f4c6ece11
2022-04-07 16:38:36 +00:00
Eric Biggers
234ee35c93 Drop FDE status checks from DevicePolicyManagerService
Since FDE (Full Disk Encryption) is no longer supported, there is no
need for DevicePolicyManagerService.getEncryptionStatus() to check for
FDE-specific encryption statuses.

There is more that needs to be cleaned up here, but this gets rid of the
dependency on some obsolete StorageManager methods.

Bug: 208476087
Test: atest DevicePolicyManagerTest
Change-Id: I26c3fafc1b134177324de929d3600fb2dd7f4d1d
2022-04-07 16:38:29 +00:00
Miguel Aranda
e01a01ca3e Merge "Add first set of libcore benchmarks to the System Health CB framework." 2022-04-07 14:01:23 +00:00
Miguel
1935f73e5b Add first set of libcore benchmarks to the System Health CB framework.
These will later be referenced by a google3 gcl file as part of a new
libcore test set. Doc: go/libcore-benchmarks-doc

Test: N/A
Bug: 210606618
Change-Id: I4f38b797f8f4978d00e92da07c3db8df366a6897
2022-04-07 14:01:16 +00:00
Nathalie Le Clair
f4c40e0b0b Merge "cec: fix Traditional Chinese issue for Playback [1/1] BUG:183071276" 2022-04-07 13:23:52 +00:00
Alan Stokes
32ebf109be Log pending odsign metrics on start
Bug: 202926606
Test: Manual - create file, observe logs, file is deleted
Change-Id: Ie7f35cf4ebd9e293b376da6c7a2d13b98315c587
2022-04-07 14:01:07 +01:00
Chiachang Wang
240d126ed0 Update the java doc
Bug: 184750836
Test: m
Change-Id: If7a64d0a7d607dafa353c3dfd4bcbac189d1fef3
2022-04-07 18:32:09 +08:00
Chiachang Wang
48160f9b9b Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" 2022-04-07 10:24:03 +00:00
Treehugger Robot
e8869375d9 Merge "Add OWNERS for libcore perf tests" 2022-04-07 10:20:31 +00:00
Wenhao Wang
de6f930c61 Merge "Add command to require strong auth" 2022-04-07 06:00:28 +00:00
Sudheer Shanka
ff7bc1e803 Merge "Update net/TEST_MAPPING to run more tests in presubmit." 2022-04-07 00:45:03 +00:00
Treehugger Robot
6787226865 Merge "Change aapt2 to specify full protos" 2022-04-06 19:29:13 +00:00
Dave Mankoff
5b0a11e976 Merge "Make GlobalActionsDialogLite directly injectable" 2022-04-06 17:27:04 +00:00
Wenhao Wang
5bceb30291 Add command to require strong auth
The command set-strong-auth can help to require strong auth.
Thus we can use this command to simulate the lockdown mode on cts.

Bug: 173721373
Test: atest LockSettingsShellCommandTest
Change-Id: Ifabb14c77b15e55e663902647310496f5519d5a5
2022-04-06 09:46:04 -07:00
Orion Hodson
f0cc30bd7e Add OWNERS for libcore perf tests
Bug: 210606618
Test: checkowners.py OWNERS
Change-Id: I00912add5908195092b4f5c3a0157133a8a3e60c
2022-04-06 13:51:56 +01:00
Seth Moore
d690893b54 Merge "Add new privileged permission for unique id attestation" 2022-04-06 12:40:27 +00:00
Neil Fuller
339c76a9ed Merge "Switch core network tests from postsubmit to presubmit" 2022-04-06 12:25:06 +00:00
Chiachang Wang
3cb07d737d Ignore other IKE options if IkeTunnelConnectionParams is set
Stop parsing the IKE options from the input IkeTunnelConnectionParams
if exists. The caller shuould get the relevant infortation the
params.

The field is also stored in the VpnProfile if it built from an
Ikev2VpnProfile.

Bug: 184750836
Test: atest FrameworksNetTests HostsideVpnTests
Test: build ; flash ; connect VPN successfully
Change-Id: Id05c17285915462c7a6cd51d5fb4ee5da7f465ba
2022-04-06 17:25:58 +08:00
Sarah Chin
82bb853ff6 Merge changes from topics "deactivate_no_tds", "deactivate_no_tds_revert"
* changes:
  Revert "Add data fail cause for empty TD list"
  Add data fail cause for empty TD list
2022-04-06 07:18:52 +00:00
Sarah Chin
6586f342c4 Merge changes from topics "deactivate_all_errors", "deactivate_radio_not_available"
* changes:
  DeactivateDataCall remove network on all errors
  Add ERROR_RADIO_NOT_AVAILABLE for DataServiceCallback
2022-04-06 07:18:52 +00:00
Treehugger Robot
5ee9c55130 Merge "Remove unused empty filegroups from frameworks/base." 2022-04-06 02:27:54 +00:00
Sarah Chin
cff800adf9 Revert "Add data fail cause for empty TD list"
Revert "Deactivate data network if TDs are empty"

Revert submission 17146764-deactivate_no_tds

Reason for revert: Internet broken
Reverted Changes:
I6dd9d3e01:Add data fail cause for empty TD list
I3b474e10f:Deactivate data network if TDs are empty

Change-Id: I43bcb551bbb8775ed489822ca3ad3fe3af7e9c0b
Merged-In: I43bcb551bbb8775ed489822ca3ad3fe3af7e9c0b
2022-04-05 16:10:22 -07:00
Sarah Chin
d64f6e7a67 Add data fail cause for empty TD list
Test: atest DataNetworkTest
Bug: 222107445
Change-Id: I6dd9d3e01c3179149cfe8e14b22602006b7caa2b
Merged-In: I6dd9d3e01c3179149cfe8e14b22602006b7caa2b
2022-04-05 16:09:32 -07:00
Sarah Chin
e36793df47 DeactivateDataCall remove network on all errors
Remove network on all errors instead of only RADIO_NOT_AVAIALBLE.

Test: atest DataNetworkTest
Bug: 219998284
Change-Id: Ia1f2e5cd63bcf93967ea4fd4a35fcb9515c5e3f3
Merged-In: Ia1f2e5cd63bcf93967ea4fd4a35fcb9515c5e3f3
2022-04-05 16:08:00 -07:00
Sarah Chin
4e8a933e81 Add ERROR_RADIO_NOT_AVAILABLE for DataServiceCallback
Test: atest DataNetworkTest, DataNetworkControllerTest
Bug: 221174412
Change-Id: Ib457e598ea5ada76813cb233be5b0a5cde260acc
Merged-In: Ib457e598ea5ada76813cb233be5b0a5cde260acc
2022-04-05 16:07:08 -07:00
Seth Moore
d18fe9e3ce Add new privileged permission for unique id attestation
This permission will eventually replace the sepolicy that we have now,
making it possible to test unique id attestation, which is no longer
possible due to the deprecation of shared uids.

Skipping automerger because the framework manifest has diverged too
much across aosp and tm-dev to allow for clean auto merges, and
presubmits block.

Test: KeyAttestationTest
Bug: 216778747
Merged-In: Iecde35b9a79456b293118d8089dd2a3b0905f5f3
Change-Id: Iecde35b9a79456b293118d8089dd2a3b0905f5f3
2022-04-05 13:56:27 -07:00
Sudheer Shanka
2cd498df68 Update net/TEST_MAPPING to run more tests in presubmit.
Bug: 226402870
Test: treehugger
Change-Id: Ib7411b0649b3d9c9b6343cd7303b756e17f82b24
2022-04-05 19:01:04 +00:00
Neil Fuller
7c37904142 Merge "Document a section of code" 2022-04-05 15:37:26 +00:00
Pablo Gamito
d41316339d Merge "Update component ids from Winscope to Flicker" 2022-04-05 14:09:39 +00:00
Neil Fuller
eab42d9fe0 Document a section of code
Document a section of code that prevents an NTP-related CTS test working
if the device is not connected to Wifi. The reason the code exists took
a little bit of research, so here it is.

Bug: 213393821
Test: Comment-only change
Change-Id: I0b5d9f298ef36e861f780a29fdf74f0226fa1567
2022-04-05 11:50:38 +01:00
Pablo Gamito
85c38bd427 Update component ids from Winscope to Flicker
Test: N/A
Change-Id: I5bc614c406535b0f282cb9d948e426e879d3a069
2022-04-04 22:31:02 +00:00
Songchun Fan
6887292748 Merge "Handle non-exist permission group correctly for pm list permissions" 2022-04-04 20:08:13 +00:00
Songchun Fan
d47a35e3a7 Merge "[DeviceConfig] true/false should be wrapped in @code tags" 2022-04-04 17:58:22 +00:00
Jon Eckenrode
ec2121901c Merge "Updated API documentation of screenWidthDp and screenHeightDp." 2022-04-04 17:36:37 +00:00