Commit Graph

640958 Commits

Author SHA1 Message Date
Yan Yan
fcadf51f2c Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel" am: bc545c8a8a am: 7a52d5a3eb am: 1df96ea6ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652997

Change-Id: If056d1a90cc4dce3882168ca23302fcd086b40ae
2021-04-22 10:08:28 +00:00
Yan Yan
55b1e5fbf5 Convert TunnelConnectionParams to/from PersistableBundle am: c0b7c4fa5a am: e80e82bb67 am: 7a961913b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653048

Change-Id: Idbd09b9f8a7143e586b23db47bcffcd0b82ea0c0
2021-04-22 10:08:15 +00:00
Yan Yan
30dd69e144 Create TunnelConnectionParams interface am: 83956e2a5d am: 586eca54de am: bf54f022db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654113

Change-Id: I76bec559bfad6b36c7533d1b76b09fc474c3883e
2021-04-22 10:08:03 +00:00
lucaslin
64c30c6107 Remove sendNetworkConditionsBroadcast
sendNetworkConditionsBroadcast is removed, so
TestNetworkStackService.kt cannot override it anymore,
otherwise there will be a build break when running this
test.
Also add a comment for NETWORK_CONDITIONS_MEASURED in
AndroidManifest.xml.

Bug: 175213041
Test: atest FrameworksNetIntegrationTests
Change-Id: I7b43940dc32826c70fa82f471b35bc5cb8394aad
2021-04-22 10:05:50 +00:00
Remi NGUYEN VAN
b473ff1590 Merge "Fix netId testing on Q and R" into sc-dev 2021-04-22 09:56:52 +00:00
Aaron Huang
5fbf0f36b9 Rename getAllNetworkStateSnapshot which should be pluralized
Address API review feedback, ConnectivityManager#getAllNetworkStateSnapshot
should be pluralized so rename the method to getAllNetworkStateSnapshots

(cherry picked from ag/14221105)
Bug: 183972554
Test: make, FrameworksNetTests
      FrameworksServicesTests
Merged-In: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
Change-Id: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
2021-04-22 17:45:22 +08:00
Nikita Iashchenko
7716e67ea3 Merge "Remove usage of Math.randomLongInternal" am: c931f43bcd am: 267fc8b764
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682025

Change-Id: I8492bed0324d81efdadeb29ae8abb7d36956d6cd
2021-04-22 09:44:15 +00:00
Nikita Iashchenko
e5400b4085 Merge "Remove usage of optimized reflection getters" am: 9d0bfe1b0a am: f10f3736ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682029

Change-Id: I870f7eee1c5f113b00aa560e4951084be8daf3d5
2021-04-22 09:43:59 +00:00
Yan Yan
1df96ea6ac Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel" am: bc545c8a8a am: 7a52d5a3eb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652997

Change-Id: I3ad0d93a976c7f4dc875e21f337405401164f1c5
2021-04-22 09:43:16 +00:00
Yan Yan
7a961913b2 Convert TunnelConnectionParams to/from PersistableBundle am: c0b7c4fa5a am: e80e82bb67
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653048

Change-Id: I0f19cf955b644aaeab81deccb95788228ffd9980
2021-04-22 09:43:14 +00:00
Yan Yan
bf54f022db Create TunnelConnectionParams interface am: 83956e2a5d am: 586eca54de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654113

Change-Id: Ia25ae4538a89172a81286f2b996d513b1c9328e1
2021-04-22 09:43:11 +00:00
Stevie Kideckel
32b16fa4fc Merge "Expose GridView/Layout APIs via @RemotableViewMethod" into sc-dev 2021-04-22 09:33:43 +00:00
Neil Fuller
e1aaa7f9d1 Merge "Update settings for Date / Time / Zone" into sc-dev 2021-04-22 09:31:08 +00:00
Nikita Iashchenko
267fc8b764 Merge "Remove usage of Math.randomLongInternal" am: c931f43bcd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682025

Change-Id: I0b6c829078415f9b5c1a75ece580583ff7a1bb46
2021-04-22 09:26:26 +00:00
Francois Gaffie
5253a31c7a HwAudioSource: wrong native handle check
Playing status of audio source is checked using the native handler
not 0.
However, if AudioSystem#startAudioSource fails, the native handler
returned is not 0, but an error code.
In fact AudioPolicyManager sets the PORT to NONE (0) and sets an error
status.
JNI layer transforms the failure status into a native handler returned
to the caller.

Bug: 186088557
Test: make

Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: Iaa920c073885c2556a93a1b5ae23467fa6ffad4f
2021-04-22 11:24:52 +02:00
Francois Gaffie
81b0519f04 AudioSystem: startAudioSource: ensure port handle initialized
In case of failure, port handle reported is not initialized
by JNI layer. Any failing call to native AudioSystem::startAudioSource
will not set the port handle, but returning an error status.
JNI checks for port handle validity rather than error status.

This CL ensures JNI checks first status to report an error, otherwise
asserts on handle validity.

Bug: 186088557
Test: make

Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: I4eb8046a1263aeb7d464d35a360a8adb77c4b1a5
2021-04-22 11:24:34 +02:00
Anton Hansson
83d858004c Remove dependencies on art-notices jar
These notices are now included in the art stub itself.

Bug: 173186484
Bug: 184839599
Test: m android_stubs_current && unzip -l | grep NOTICE
Change-Id: I0cfbedd729ed1178297674b5d589205d1f942abe
2021-04-22 10:23:44 +01:00
Neil Fuller
3dfd5c1073 Add OWNERS for android/providers
Test: treehugger only
Change-Id: Iaeeb71ea59c4e6281c9d2bb9423c692429bdf73a
2021-04-22 10:22:55 +01:00
Nikita Iashchenko
f10f3736ea Merge "Remove usage of optimized reflection getters" am: 9d0bfe1b0a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682029

Change-Id: I0506f91963cce67b60cdca85303d859c3aaee0a1
2021-04-22 09:22:20 +00:00
Yan Yan
7a52d5a3eb Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel" am: bc545c8a8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652997

Change-Id: I40cbcb74cdfa95357827675fd1ace10b9fa1586b
2021-04-22 09:18:06 +00:00
Yan Yan
e80e82bb67 Convert TunnelConnectionParams to/from PersistableBundle am: c0b7c4fa5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653048

Change-Id: I71e0b9735af25bb3d2f8de17df1dac3df0e10106
2021-04-22 09:16:46 +00:00
Yan Yan
586eca54de Create TunnelConnectionParams interface am: 83956e2a5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654113

Change-Id: I0c67adb36b0bf69729a40a46eb2dd018db308312
2021-04-22 09:13:35 +00:00
Nikita Iashchenko
c931f43bcd Merge "Remove usage of Math.randomLongInternal" 2021-04-22 09:10:52 +00:00
Nikita Iashchenko
9d0bfe1b0a Merge "Remove usage of optimized reflection getters" 2021-04-22 09:10:01 +00:00
Jackal Guo
011805bf48 Merge "Apply package visibility to LauncherApps.Callback" into sc-dev 2021-04-22 08:54:29 +00:00
Riddle Hsu
b63dedbb2d Merge "Also check idle to handle stopping activities" into sc-dev 2021-04-22 08:52:10 +00:00
Yan Yan
bc545c8a8a Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel"
* changes:
  Replace VcnControlPlaneConfig with TunnelConnectionParams
  Convert TunnelConnectionParams to/from PersistableBundle
  Create TunnelConnectionParams interface
2021-04-22 08:39:20 +00:00
Ilya Matyukhin
ce09e187f6 Update framework with IFace getSensorConfig
Bug: 183738533
Test: atest CtsBiometricsTestCases
Change-Id: I95f10b133c62e4cda680bba925ec1c956f636b7f
2021-04-22 01:25:12 -07:00
Philip Junker
463493f57d Merge "Add TestApi to suppress other LightsSession clients" into sc-dev 2021-04-22 08:04:21 +00:00
Remi NGUYEN VAN
3dd687dc4b Add AOSP certificates for connectivity resources
Instead of the platform certificate, use a dedicated certificate.

The AOSP certificates are only used for testing as they have known keys,
and are replaced when resigning production images.

Key generated with:
openssl req -x509 -newkey rsa:4096 -nodes -days 999999 -keyout key.pem \
    -out com.android.connectivity.resources.x509.pem
openssl pkcs8 -topk8 -inform PEM -outform DER -in key.pem -out \
    com.android.connectivity.resources.pk8 -nocrypt

Fixes: 184808224
Fixes: 185462051
Test: m
Change-Id: I25cddc8d5ab948da9d3a2dbcd202ece1f61dd5a2
2021-04-22 16:52:19 +09:00
Wilson Wu
3e0705d6e8 Merge "Prevent addtional removeSurface calls" into sc-dev 2021-04-22 07:41:49 +00:00
Aaron Huang
00475ff23d Merge "Add owners for VpnManagerService" am: 2984d87873 am: 79bb916144 am: eebc8afb52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684465

Change-Id: I8d7df112b875b3eadf6dea4cf23d68f46fa2bbd5
2021-04-22 07:13:22 +00:00
TreeHugger Robot
a440a2ccf0 Merge "Update test font name in TypefaceCreatePerfTest" into sc-dev 2021-04-22 07:10:26 +00:00
Pinyao Ting
81a06ed762 Merge "Postponing package rescan to prevent blocking device startup" into sc-dev 2021-04-22 07:02:29 +00:00
Tony Huang
1c7fcdb9ca Make AppTransition animations sharable (3/n)
Handle animation include keyguard, voice interaction and relaunch
in default shell transition.

Bug: 178678389
Test: manual
Change-Id: I45e3f400bc3537bbbcd9d45f388312b8fe962579
2021-04-22 14:49:16 +08:00
Kevin Han
9b97b2d0cb Merge "Send boot complete broadcast when unhibernated" into sc-dev 2021-04-22 06:46:39 +00:00
Aaron Huang
eebc8afb52 Merge "Add owners for VpnManagerService" am: 2984d87873 am: 79bb916144
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684465

Change-Id: I65218978d2028e2a918f4a16580ef073492dbb46
2021-04-22 06:45:19 +00:00
TreeHugger Robot
f782ec1c21 Merge "Update the new animation for collapsing toolbar" into sc-dev 2021-04-22 06:40:23 +00:00
Aaron Huang
79bb916144 Merge "Add owners for VpnManagerService" am: 2984d87873
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684465

Change-Id: Icb34ffc9305bd7dcf3f2e1fa8f87ece46c3bc168
2021-04-22 06:25:51 +00:00
Alex Buynytskyy
8fd347c4f5 Fix protection level for USE_INSTALLER_V2 permission.
Use the same as for android.permission.INSTALL_PACKAGES.

Bug: 186000084
Fixes: 186000084
Test: build/flash and check that vending has both permissions
Change-Id: I3c8563031e4c5aa3371a36fcb3f5900cb92eda0a
2021-04-22 06:24:25 +00:00
TreeHugger Robot
0dfb0badf0 Merge "Update battery saver footer strings" into sc-dev 2021-04-22 06:23:56 +00:00
Lucas Dupin
7f5bc353d4 Do not reload theme when managed profile
When a managed profile is added, if setup wizard was not finished,
do not reload the theme, postpone until it's done

Bug: 185572689
Test: atest ThemeOverlayControllerTest
Change-Id: I0cb1b2316a6837d85cf708403a34c2459a1dcc5a
2021-04-21 23:06:12 -07:00
Aaron Huang
2984d87873 Merge "Add owners for VpnManagerService" 2021-04-22 06:05:04 +00:00
Jacky Kao
6bb72ebad5 Merge "Fix the crash due to multi-register callbacks" into sc-dev 2021-04-22 06:04:14 +00:00
Yan Yan
4eaa894d84 Replace VcnControlPlaneConfig with TunnelConnectionParams
Use the more generic object TunnelConnectionParams in VCN.
TunnelConnectionParams may also be used in VPN in the future.

Test: atest FrameworksVcnTests
Bug: 180664474
Change-Id: Ie433f9df614e1f51cdff200d915b68b61e5ca35e
2021-04-21 22:52:22 -07:00
Yan Yan
c0b7c4fa5a Convert TunnelConnectionParams to/from PersistableBundle
Add utility class to convert TunnelConnectionParams to and from
PersistableBundle.

Bug: 180664474
Test: atest EncryptedTunnelParamsUtilsTest
Change-Id: I93ae068eb6d1e1c4d3fcbaccbaae867db8d07a38
2021-04-21 22:49:47 -07:00
Yan Yan
83956e2a5d Create TunnelConnectionParams interface
TunnelConnectionParams represents configurations for setting up a
secure encrypted tunnel with a remote endpoint. TunnelConnectionParams
will be used to configure a VCN and will be used for VPN configuration
in the future.

Bug: 180664474
Test: make update-api
Change-Id: Ic8e5c8535e84971517f16c54ce8b8645cfc7f944
2021-04-21 22:48:21 -07:00
Treehugger Robot
80eddc41aa [automerger skipped] Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: a2da3ebb16 am: 88f1ec460a am: 35bd9bdb61 -s ours
am skip reason: skip tag Change-Id I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7 with SHA-1 2326bc47bb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675629

Change-Id: I9be0b8d219ff67948ed19a45d60381ba69c963df
2021-04-22 05:47:34 +00:00
Chris Ye
6d576bf9a2 Add Sony DualShock3 controller sensor axes mapping.
Add sensor axes mapping to Sony DualShock3 key layout files.

Bug: 186075116
Test: Manually pairing Sony DualShock3 game controller and launch the
sensor demo app.

Change-Id: Ibfdeb527542c33a65ca565bc890ab2af34c6c1cc
2021-04-21 22:40:41 -07:00
Remi NGUYEN VAN
d1f850d369 Fix netId testing on Q and R
Do not call getNetId() on Q as it did not exist yet. Add a separate test
for getNetId(), only run after Q.

Also add testing for getNetIdForResolv and fromNetworkHandle on Q and R.

Bug: 185731396
Test: atest NetworkTest
Change-Id: I03f9eb0c94b09dc285018e9887fe20d95a93ae45
2021-04-22 14:38:51 +09:00