Commit Graph

445048 Commits

Author SHA1 Message Date
Lucas Lin
6056ec00bf Merge "Set WifiAwareNetworkInfo into setTransportInfo()" 2020-04-09 02:28:32 +00:00
Peter Collingbourne
6e478ee41d Merge "Implement initial policy for memory tag checks." 2020-04-08 18:32:33 +00:00
Colin Cross
9f95dad19b Merge "Revert^2 "Fix static dependency on libprotobuf-cpp-lite-ndk"" 2020-04-08 18:29:30 +00:00
Fabian Kozynski
bbef1d22ed Merge "Show QS data saver info dialog until enabled" 2020-04-08 17:05:54 +00:00
Treehugger Robot
3fc764c833 Merge "Add keyboard layout for Belarusian" 2020-04-08 16:31:10 +00:00
Cody Kesting
7badb011b3 Merge "Make UiccAccessRule certificate utils accessible." 2020-04-08 16:19:38 +00:00
lucaslin
ab199d8f5a Set WifiAwareNetworkInfo into setTransportInfo()
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
Merged-In: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
2020-04-08 10:09:16 +00:00
Paul Hu
033bccd37d Merge "Address aosp/1274403 leftover comment" 2020-04-08 07:36:35 +00:00
Xin Li
9fd000bfec Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" 2020-04-08 06:26:03 +00:00
Paul Hu
43a219ee83 Merge "Fix TetheringIntegrationTests failure" 2020-04-08 06:12:29 +00:00
paulhu
e03ec757ee Address aosp/1274403 leftover comment
Bug: 152828142
Test: atest EntitlementManagerTest

Change-Id: I81f2d268c9f26bc4488b06032477a73d071f73f8
2020-04-08 11:45:08 +08:00
paulhu
114dab3670 Fix TetheringIntegrationTests failure
Bug: 150644681
Test: atest TetheringIntegrationTests
Change-Id: I5a537eca9b1aab3694a11a2dab147a31f289314c
2020-04-08 09:57:57 +08:00
Treehugger Robot
a37b682ee4 Merge "Synchronize adapter registration with mCallbacks" 2020-04-08 01:15:52 +00:00
Xiangyu/Malcolm Chen
2641543774 Merge "multiSimAllowed should be consistent with max active modem property." 2020-04-08 00:50:17 +00:00
Xiangyu/Malcolm Chen
349a19d904 Merge "Remove @ModemCount enum definitions." 2020-04-07 23:45:33 +00:00
Xiangyu/Malcolm Chen
beccb937dd Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." 2020-04-07 23:45:00 +00:00
Siarhei Vishniakou
5b6275cd33 Add keyboard layout for Belarusian
Add a keyboard layout for entering Belarusian text. This will be used
for connecting a physical keyboard and typing in Belarusian.

Bug: none
Test: connect a keyboard to a Pixel phone. Open Google search and select
"Belarusian" keyboard layout, type with keyboard.

Signed-Off-By: Siarhei Vishniakou <svv@google.com>
Change-Id: I212d8cec8bd5affcd4b825be2fa5467c2fe8976f
2020-04-07 15:51:02 -07:00
Malcolm Chen
c6910afb5d multiSimAllowed should be consistent with max active modem property.
Bug: 153023231
Test: manual - using test app
Change-Id: I2d38dd9a0a860ee451fe51372a62c2910b88c88f
Merged-In: I2d38dd9a0a860ee451fe51372a62c2910b88c88f
2020-04-07 15:43:24 -07:00
Xin Li
ab1261dddc DO NOT MERGE - Merge QQ2A.200405.005 into master
Bug: 150877681
Change-Id: Iacdd23c38aef7ff04c5d289720318d41cbf18158
Merged-In: I9265f01ed2f6e4aca7728d278f06ceea5633dac5
2020-04-07 15:13:00 -07:00
Eric Laurent
f340f3a01d Merge changes I3aab572e,Iff9abda2
* changes:
  [AudioServer][Strategies] Fix Min/Max index overwritting
  AudioSystem: add annotation on API used by CTS media
2020-04-07 21:08:45 +00:00
Treehugger Robot
99f24661cb Merge "[AudioServer] Fix CTS for volume groups based on non public streams" 2020-04-07 18:51:25 +00:00
François Gaffie
2645982dbe [AudioServer][Strategies] Fix Min/Max index overwritting
When a strategy holds 2 stream types, following the same volume group
(aka same volume curves), when audioservice initializes, it may
overwritte the Min/max for the volume group.

This is due to the fact that the second stream type is not recognized
and falls back on default volume group (aka Music). So, Min/max are
overwritten with music Min/max.

This CL fixes the bug by formatting correctly the AudioAttributesGroups
of a product strategy by checking not only the volume group id but
also the stream type.

Test: build & run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioProductStrategyTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupChangeHandlerTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testPermissionsForVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateProductStrategies
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateVolumeGroups
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributesWithInvalidAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testVolumeGroupCallback

Change-Id: I3aab572ef4daeecce13bbcef6278edcc42b7d594
Merged-In: I3aab572ef4daeecce13bbcef6278edcc42b7d594
Signed-off-by: François Gaffie <francois.gaffie@renault.com>
2020-04-07 18:13:41 +00:00
François Gaffie
adcbf9004a AudioSystem: add annotation on API used by CTS media
Add @TestApi for the class so some methods and
constants can be visible to test API.
  Also @hide for all other members of the class
that are not @TestApi, as they are exposed to the
test API visibility.

Bug: 136121584
Test: run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioProductStrategyTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupChangeHandlerTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testPermissionsForVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateProductStrategies
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateVolumeGroups
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributesWithInvalidAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testVolumeGroupCallback
Signed-off-by: François Gaffie <francois.gaffie@renault.com>

Change-Id: Iff9abda2cf971d9c234dcf7df7c2b9a4ad5294c3
Merged-In: Iff9abda2cf971d9c234dcf7df7c2b9a4ad5294c3
2020-04-07 18:07:26 +00:00
James Lin
9f4da761af Merge "[RCS] Add apis to register and unregister UCE publish state changed." 2020-04-07 17:10:41 +00:00
Colin Cross
5d5bcb829a Revert^2 "Fix static dependency on libprotobuf-cpp-lite-ndk"
0d485b050c

Change-Id: Ica45851c95ca2be1bec7c48f34e4584fe884ce2c
2020-04-07 16:50:32 +00:00
Ugo Yu
4607481605 Synchronize adapter registration with mCallbacks
Move register/unregister callback to the caller thread.
This fixes a problem that if an app registers adapter while the
BluetoothManagerService is turning on Bluetooth, the app would
get a null IBluetooth and would not receive any callback after
Bluetooth is turned on.

Bug: 149890859
Test: Manual
Change-Id: Ia79f6bd1fd6ffab814a15053aeaae031faf875dd
2020-04-07 16:34:17 +00:00
Mark Chien
507e5f0959 Merge "Add TetheringServiceTest unitest" 2020-04-07 15:39:38 +00:00
Luke Huang
04bee1894a Merge "Use the lastest frozen netd_aidl_interface in framework" 2020-04-07 15:26:24 +00:00
Junyu Lai
e694c0af58 Merge "Fix NetworkStatsApiTest failed on Q device" 2020-04-07 10:49:19 +00:00
Luke Huang
23632382c4 Use the lastest frozen netd_aidl_interface in framework
Bug: 140541991
Test: build
Change-Id: I984969e09f8d5196945a7412c51bd8880223ad9e
2020-04-07 08:35:42 +00:00
Treehugger Robot
9a20934af4 Merge "Add trivial dependencies tests for the network stack" 2020-04-07 08:34:44 +00:00
junyulai
821300b5cd Fix NetworkStatsApiTest failed on Q device
Currently, the addEntry method is used in constructor of test,
which is not correct since there is no such method in Q devices.

Thus, initialize of NetworkStats variables outside of constructor.

Test: atest NetworkStatsApiTest
Test: atest CtsNetTestCasesLatestSdk:NetworkStatsApiTest on Q device
Bug: 150644692
Change-Id: Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea
2020-04-07 15:07:16 +08:00
Lucas Lin
bc806f782e Merge "Add more tests in NetworkCapabilitiesTest.java" 2020-04-07 06:45:09 +00:00
Treehugger Robot
3b2c7fd54a Merge "Rename vts-core to vts" 2020-04-07 06:13:40 +00:00
Treehugger Robot
72746119bc Merge "Fix a stupid NPE" 2020-04-07 05:53:10 +00:00
Chalard Jean
443a18a512 Add trivial dependencies tests for the network stack
Test: this
Bug: 153033018
Change-Id: Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81
2020-04-07 14:42:00 +09:00
Dan Shi
2ae3b6d727 Rename vts-core to vts
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL moves all tests in vts-core to vts.
It won't change test logic or behavior.

Change-Id: I79cddf5e4a65486b8f1286ea430360479ad2b93d
Merged-In: I79cddf5e4a65486b8f1286ea430360479ad2b93d
2020-04-07 05:34:54 +00:00
Colin Cross
32c3f23f37 Merge "Revert "Fix static dependency on libprotobuf-cpp-lite-ndk"" 2020-04-07 04:25:34 +00:00
Colin Cross
0d485b050c Revert "Fix static dependency on libprotobuf-cpp-lite-ndk"
Revert "Use stl to depend on libc++"

Revert "Use libnativewindow for platform variant of libRSSupport"

Revert "Use libnativewindow for platform variant of android_nati..."

Revert "Set sdk_version for cc_genrules used by modules with sdk..."

Revert "Use sdk variant of Soong modules when LOCAL_SDK_VERSION ..."

Revert "Add sdk mutator for native modules"

Revert submission 1242911-sdk_version_variant

Reason for revert: b/153394225
Reverted Changes:
Ife99745fb:Use libnativewindow for platform variant of libagq...
I1bae84c43:Use libnativewindow for platform variant of androi...
I6e6021ed3:Use stl to depend on libc++
Ife99745fb:Use libnativewindow for platform variant of libRSS...
I2c9f439b9:Fix static dependency on libprotobuf-cpp-lite-ndk
Iff2aff9cf:Set sdk_version for cc_genrules used by modules wi...
I7d72934aa:Add sdk mutator for native modules
Ief378a007:Use sdk variant of Soong modules when LOCAL_SDK_VE...

Bug: 149591340
Change-Id: Iff337b01c8471068fac0645109cd8617a0f55527
Fixes: 153394225
2020-04-07 04:21:21 +00:00
lucaslin
cb86457ddb Add more tests in NetworkCapabilitiesTest.java
Test deduceRestrictedCapability(), getAdministratorUids(),
setAdministratorUids(), getNetworkSpecifier(), getOwnerUid(),
setLinkDownstreamBandwidthKbps(), setLinkUpstreamBandwidthKbps()
and setSignalStrength().

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Change-Id: I90c7a8c47710ea4ad8e8d2682c10440fd7f82270
2020-04-07 11:58:22 +08:00
Treehugger Robot
d72172d5de Merge "Use an original text for next force 7bit encoding" 2020-04-07 02:32:15 +00:00
Colin Cross
71acbf9920 Merge "Fix static dependency on libprotobuf-cpp-lite-ndk" 2020-04-07 01:52:10 +00:00
Daniel Bright
30970c1745 Merge "Remove simColors from public.xml and rename" 2020-04-06 19:49:55 +00:00
Mark Chien
c8b4f60e85 Merge "Add IPv6TetheringCoordinator unit test" 2020-04-06 15:25:37 +00:00
Xiao Ma
4af7c5e2cb Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." 2020-04-06 10:43:28 +00:00
Lorenzo Colitti
a941cd53cb Merge "Refactor the Nat464Xlat function for simplicity." 2020-04-06 10:38:54 +00:00
markchien
b2d27d39ed Add IPv6TetheringCoordinator unit test
Bug: 148636687
Test: atest IPv6TetheringCoordinatorTest
Change-Id: I939323ce09adb9c66b1e2b83d58b0f892aa8f011
2020-04-06 18:25:41 +08:00
Lorenzo Colitti
74107e4dd1 Merge "Migrate to TetherOffloadRuleParcel in IpServer" 2020-04-06 08:40:51 +00:00
Paul Hu
14a8cf0f5e Merge "Fix EntitlementManager issues" 2020-04-06 07:33:26 +00:00
Xiao Ma
31853376a4 Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic.
Bug: 130741856
Test: atest TetheringTests
Change-Id: I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38
2020-04-06 15:59:22 +09:00