Commit Graph

566521 Commits

Author SHA1 Message Date
Tianjie Xu
27dcfb808c Merge "Catch security exceptions in RoR APIs" 2021-04-21 03:22:56 +00:00
Benedict Wong
36478cfdaa Merge "Fix NPE in dump and add additional dump data" 2021-04-21 03:04:53 +00:00
James Mattis
1b7a5e282c Merge "Correctly count nri uid request counts" 2021-04-21 02:06:33 +00:00
Treehugger Robot
7342dafaa5 Merge "Adding a permission to Shell for testing" 2021-04-21 01:49:34 +00:00
Andy Hung
b1060eb9f5 Merge changes from topics "360RA channel mask", "audio channels"
* changes:
  AudioFormat: Support 13ch audio layout for 360 Reality Audio
  AudioFormat: Add channel mask constants for immersive 3D audio
2021-04-20 23:52:21 +00:00
Suprabh Shukla
508e114192 Adding a permission to Shell for testing
Adding UPDATE_DEVICE_STATS to enable testing alarms with WorkSource
objects.

Test: atest CtsAlarmManagerTestCases

Bug: 185530825
Change-Id: Ia0f8afa6dc1a13c95553b691f352c6d8c7ae5ccf
Merged-In: Ia0f8afa6dc1a13c95553b691f352c6d8c7ae5ccf
2021-04-20 15:32:03 -07:00
Paul Duffin
9234c21fa1 Merge "Fix build error due to null annotations in core platform API" 2021-04-20 21:34:30 +00:00
Kei Murayama
209bf897de AudioFormat: Support 13ch audio layout for 360 Reality Audio
- Add definitions for the front bottom channels. The name
   of the definitions are standardized in ITU-R BS.2051-1.
 - Add definition for 13ch mask which consists of surround 5
   channels, top 5 channels and bottom 3ch channels. This
   channel mask is ideal speaker layout used by Sony 360
   Reality Audio. Virtualizer can place individual sounds in
   a 360 spherical sound field from these channels on any
   headphones.

Ignoring checkstyle warning, "'|' should be on a new line",
to keep existing codestyle.

Bug: 185100731
Test: atest AudioFormatTest
Test: Play wav with 13ch mask after OUT_CHANNEL_COUNT_MAX to 24
Change-Id: I2b4deaac740a08ae3b1b8d8453650a876e2d6206
2021-04-20 14:16:21 -07:00
Andy Hung
8008740a46 AudioFormat: Add channel mask constants for immersive 3D audio
Bug: 185842397
Test: atest AudioFormatTest
Test: atest AudioTrackTest
Change-Id: I1c85e30c65cf6681928861e7d0cc9d987e4648ce
2021-04-20 14:16:06 -07:00
Daulet Zhanguzin
f84ac0f599 Fix build error due to null annotations in core platform API
Change https://r.android.com/1667508 adds nullability annotations to
the core platform APIs which broke this code with the error:

javadoc: error - In doclet class com.google.doclava.Doclava,  method
start has thrown an exception
java.lang.reflect.InvocationTargetException
com.sun.tools.javac.code.Symbol$CompletionFailure: class file for
androidx.annotation.RecentlyNonNull not found

Bug: 183938110
Bug: 185929373
Test: m checkbuild

Change-Id: I83e3071f851720a9f719cb226f0e84fd731a8f37
Merged-In: I83e3071f851720a9f719cb226f0e84fd731a8f37
2021-04-20 22:06:32 +01:00
Benedict Wong
a3b8122623 Fix NPE in dump and add additional dump data
This change fixes a NPE when the VcnGatwayConnection attempts to print
for a null underlying network. Additionally, it also prints the existing
configs in order to better identify whether a VCN config is failing to
be privisoned, or failing to start.

Test: manual testing
Change-Id: I44d65633364a5f16d75519cead6729969eb1c06f
2021-04-20 13:41:56 -07:00
Benedict Wong
c66289ebd2 Merge changes Ib0690243,I0cabce70,I8f13a0d8,I81efeaa4,I488f6208
* changes:
  Switch to using NetworkScore instead of legacy integer
  Remove use of network scores, and provider IDs in VcnNetworkProvider
  Improve dump detail
  Disable INTERNET/DUN when mobile data toggled off
  Remove hidden connectivity method access in FrameworksVcnTests
2021-04-20 20:37:15 +00:00
Nataniel Borges
6528da5667 Merge "Revert "Set a floor value for BLE Batch Scan report delay of 5000ms"" 2021-04-20 15:52:32 +00:00
Nataniel Borges
5aa369359e Revert "Set a floor value for BLE Batch Scan report delay of 5000ms"
This reverts commit ea303904fd.

Reason for revert: b/185890964

Change-Id: I270dc16de0e24728c694830fbe920786b6d90174
2021-04-20 15:50:03 +00:00
Nazanin Bakhshi
68bf2c52e5 Merge "Refactoring and mocking to make sure unit test doesn't call the real service" 2021-04-20 15:44:00 +00:00
Paul Duffin
653935b511 Merge "Move icu related hidden API flag file contents to icu" 2021-04-20 11:30:10 +00:00
Paul Duffin
ef13360a02 Merge "Move art related hidden API flag files to art" 2021-04-20 11:02:23 +00:00
Treehugger Robot
461594522b Merge "Don't update volume in AudioService when SAM is on and ARC is off" 2021-04-20 10:44:34 +00:00
Treehugger Robot
1f43a69d91 Merge "Roll forward: add a test for ParseException" 2021-04-20 10:03:56 +00:00
Remi NGUYEN VAN
fe737812ce Merge "Revert "Add a test for ParseException"" 2021-04-20 09:25:07 +00:00
Treehugger Robot
e063867f7b Merge "Update TEST_MAPPING imports for connectivity" 2021-04-20 08:45:19 +00:00
Ken Chen
1b06ec2530 Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to shell" 2021-04-20 07:12:33 +00:00
Remi NGUYEN VAN
52c46df5d9 Update TEST_MAPPING imports for connectivity
Connectivity CTS tests were moved from cts/tests/net to
packages/modules/Connectivity.

Bug: 185751610
Change-Id: Id4efd99c419706a52ad5d708888097bd6312d4e6
Test: treehugger is needed to test
2021-04-20 07:10:41 +00:00
Remi NGUYEN VAN
8f5efb2702 Roll forward: add a test for ParseException
The test simply creates an exception and verifies that it has the
required fields.

The constructor tests are only run on S+ as they are not part of the
API before that.

Change-Id: Ic30a34d3203c1b40923ba783a34f0cfed53a07ae
Test: atest FrameworksNetTests
2021-04-20 16:04:33 +09:00
Remi NGUYEN VAN
c3915fc7e7 Revert "Add a test for ParseException"
This reverts commit 54e707a62e.

Reason for revert: Test broken on R: b/185751610

Change-Id: I9f5d25c0ba81011848ab3cf7ec44aa329fbb3b0f
2021-04-20 16:04:33 +09:00
James Mattis
e13786d7b3 Correctly count nri uid request counts
Correctly count nri uid request counts in the per-app functionality in
connectivity currently used by set profile and set oem network
preference APIs. Previously, upon creation, nris would be created prior
to removing them. This would cause the uid request counts to
artificially increase and incorrectly throw an error if the request
count limit was hit even though in actuality an apps request count was
valid.

E.g., if there was an existing request for per-app functionality and
its owning app made a change to the per-app requests, it would double
count the existing requests. If the current count was say, one under the
limit, an error would be thrown even though it was being replaced which
should have resulted in no net change to the request count limit if
working correctly.

This patch will allow for the requests to be removed prior to creation
so that request counts are tabulated correctly.

Bug: 185849563
Bug: 183785319
Test: atest FrameworksNetTests
Change-Id: I13da0c81256cc02bea6aff2fe1ef99d6f6b0e764
2021-04-19 19:28:23 -07:00
Treehugger Robot
ce2a2c80dd Merge "Set a floor value for BLE Batch Scan report delay of 5000ms" 2021-04-20 02:27:23 +00:00
Rahul Sabnis
ea303904fd Set a floor value for BLE Batch Scan report delay of 5000ms
Tag: #feature
Bug: 167340030
Test: Manual
Change-Id: I4ef99a9562f1447a2ccee42a344384a38a487c19
2021-04-19 17:29:02 -07:00
Nazanin
52cb2e1571 Refactoring and mocking to make sure unit test doesn't call the real service
Bug: 180938364
Test: utest
Change-Id: Ic6a5a84c1d985fa02f8cf52c8c2ff144669b30c1
2021-04-19 17:12:05 -07:00
Tianjie Xu
d746cc814f Merge "Revisit the lifetime of the RebootEscrowProvider" 2021-04-19 23:02:01 +00:00
Tianjie Xu
f58b4a1109 Merge "Addresses TODO in ResumeOnRebootService Javadoc" 2021-04-19 23:01:55 +00:00
Hans Boehm
6c61c65f19 Merge "Don't fork USAPs with open argument buffer" 2021-04-19 22:33:21 +00:00
Sarah Chin
958f9efba5 Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" 2021-04-19 20:29:09 +00:00
Benedict Wong
78f9acd7e7 Switch to using NetworkScore instead of legacy integer
This change switches the VcnNetworkAgent from using the legacy score
integer, and switches to using the new NetworkScore, using the legacy
integer as a internal representation.

Bug: 185204197
Test: FrameworksVcnTests
Merged-In: Ib0690243f176a2f074358fcc8430f1fd7c3d0d3c
Change-Id: Ib0690243f176a2f074358fcc8430f1fd7c3d0d3c
(cherry picked from commit ffc912dace)
2021-04-19 13:13:05 -07:00
Benedict Wong
39659bf29a Remove use of network scores, and provider IDs in VcnNetworkProvider
This change updates the VcnNetworkProvider and associated
requestListeners to no longer use the network score and provider IDs, in
order to match the new NetworkProvider APIs.

Bug: 185204197
Test: atest FrameworksVcnTests
Merged-In: I0cabce702cfd8457fd1a152af07a847b87d67028
Change-Id: I0cabce702cfd8457fd1a152af07a847b87d67028
(cherry picked from commit fff0f8ba33)
2021-04-19 13:13:04 -07:00
Benedict Wong
7bdcb188b2 Improve dump detail
This change improves the formatting and detail provided by the VCN dump

Bug: 8675309
Test: atest FrameworksVcnTests
Merged-In: I8f13a0d8fe54e9bf8948e9576e9705024fe79611
Change-Id: I8f13a0d8fe54e9bf8948e9576e9705024fe79611
(cherry picked from commit 1ce20d65e0)
2021-04-19 13:13:04 -07:00
Benedict Wong
061c84ba27 Disable INTERNET/DUN when mobile data toggled off
This change disables INTERNET and DUN capabilities once the mobile data
toggle is turned off. Additionally, when the toggle is flipped, any
existing networks advertising either of those two capabilities will be
restarted in order to remove the capabilities.

Bug: 184864726
Test: atest FrameworksVcnTests
Merged-In: I81efeaa4b129443b08a597ff45e0037ddefeb414
Change-Id: I81efeaa4b129443b08a597ff45e0037ddefeb414
(cherry picked from commit fcacb06752)
2021-04-19 13:12:43 -07:00
Chiachang Wang
580fda2670 Remove hidden connectivity method access in FrameworksVcnTests
Due to connectivity modularization work, hidden connectivity
methods and members are not accessible outside the module.
Remove the corresponding usage.

The test case in VcnNetworkProviderTest are not able to create
NetworkRequests with request id assigned. The loop to create
different request is removed. After that, the test does not
provide more test coverage than other tests. Thus, Remove the
test case directly.

Bug: 182859030
Test: atest FrameworksVcnTests
Merged-In: I488f62089d1dbe93c232f892885d944bef896df6
Change-Id: I488f62089d1dbe93c232f892885d944bef896df6
(cherry picked from commit 18f3a26efa)
2021-04-19 13:12:43 -07:00
Jing Ji
598675abef Merge "Update Kotlin sample code for CountDownTimer and Parcelable" 2021-04-19 19:23:06 +00:00
Treehugger Robot
f7cde977db Merge "Hide RCS PUBLISH mapping due to complicated structure" 2021-04-19 19:09:22 +00:00
Treehugger Robot
ca53d40161 Merge "Clarify SipDelegateImsConfiguration getVersion Documentation" 2021-04-19 19:08:51 +00:00
Hans Boehm
fab68e1481 Don't fork USAPs with open argument buffer
Delay execution of any zygote command that may end up forking USAPs
until we've released our own ZygoteCommandBuffer. Otherwise we fork
the child with an open ZygoteCommandBuffer, preventing it from
opening its own.

Bug: 182084594
Test: Build and boot AOSP, with USAPs enabled and disabled.
Change-Id: I2366367d2155a120092fbdcae13cbb3d7f4e1d16
2021-04-19 11:42:15 -07:00
Steven Moreland
12d2d7fd9c Merge "reflect libbinder->libpermission: appops" 2021-04-19 17:20:21 +00:00
Yan Yan
3022c5437c Merge "Use #setNetwork and #getNetwork for IkeSessionParams" 2021-04-19 17:04:25 +00:00
Aurimas Liutikas
6dd6c5a603 Merge "Cleanup nativeHeapZeroInit and memtagMode implementation." 2021-04-19 16:52:58 +00:00
Sally Yuen
afbb23d1d3 Merge "Add UiAutomation shell permission tests to Shell presubmit tests" 2021-04-19 16:14:01 +00:00
Treehugger Robot
6e7f16ac1e Merge "CEC: Drop TODOs marked as fixed/obsolete" 2021-04-19 09:46:37 +00:00
Treehugger Robot
5e7d4961e6 Merge "Add missing synchronized(mLock) into Autofill onServiceDied" 2021-04-19 08:58:17 +00:00
v-qianliguo
60db8208a8 Add missing synchronized(mLock) into Autofill onServiceDied
Test: N/A
Signed-off-by: v-qianliguo <v-qianliguo@xiaomi.com>
Merged-In: Ic16ed5e4ac507f02e56f9e9cd94d4b4cfb028d69
Change-Id: I5c9640ab0695386effdbaaad7b72e143668af876
2021-04-19 08:04:14 +00:00
Chiachang Wang
32032cbfe3 Merge "Update the permission check for dump" 2021-04-19 05:37:09 +00:00