Commit Graph

529410 Commits

Author SHA1 Message Date
Daniel Bright
98a2cb4729 Merge "Allows APN to be unthrottled through an indication" am: bc99f76305
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479020

Change-Id: Ica2a83344b5888ab9a423515005bd6c5ba7e5284
2020-11-06 05:24:04 +00:00
James Mattis
2feb4fb0a0 Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I57d85884e4bf6039cf645ed58e2c7b0c8fd404a2
2020-11-06 05:19:47 +00:00
Daniel Bright
bc99f76305 Merge "Allows APN to be unthrottled through an indication" 2020-11-06 05:04:14 +00:00
James Mattis
f2c37de2ba Merge "Adding multilayered requests to NetworkRequestInfo" 2020-11-06 04:33:24 +00:00
Treehugger Robot
f2abffe107 Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1451015

Change-Id: I7e3750c38b1796fb7ba20bdd544fb9831e5eb874
2020-11-06 01:18:29 +00:00
Treehugger Robot
1f65c6b62e Merge changes Ib3c9affb,I1dbe3d02,I88681f21
* changes:
  Keystore 2.0 SPI: Adding the keystore AIDL interface to frameworks
  Keystore 2.0: KeyProperties SignaturePadding is now public but hidden
  Keystore SPI: Add SecurityLevelEnum to KeyProperties
2020-11-06 01:01:00 +00:00
James Mattis
716cef8b90 Adding multilayered requests to NetworkRequestInfo
Updating NetworkRequestInfo for "multilayered requests" functionality so that
requests can support a network hierarchy. I.e., requests network
with capability A first and if not available, request network with
capability B. This CL is the first step in adding that support by
updating the request object from a single request to a collection.

Bug: 171991028
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I64a124802986e4cf4aa7de158c6690fdf9851cb2
2020-11-05 13:55:50 -08:00
Sudheer Shanka
109471deae Merge "Fix NetworkPolicyManagerService deadlock" am: cce157aaee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418834

Change-Id: I405abd8d9d80916c1f19eebfc791e0402c5ba40f
2020-11-05 21:48:40 +00:00
Sudheer Shanka
cce157aaee Merge "Fix NetworkPolicyManagerService deadlock" 2020-11-05 21:19:12 +00:00
Janis Danisevskis
145e11ff93 Keystore 2.0 SPI: Adding the keystore AIDL interface to frameworks
Adds the dependency to the new Keystore 2.0 AIDL spec to the frameworks
module.

Bug: 159476414
Test: None
Change-Id: Ib3c9affbe0dfcbd78ff47b41907f5650444711a4
2020-11-05 13:11:12 -08:00
Janis Danisevskis
62c1d2869d Keystore 2.0: KeyProperties SignaturePadding is now public but hidden
In anticipation of the new Keystore 2.0 SPI we made this nested class
public (like its siblings) so that the new SPI which resides in a
different package may access it. It is hidden though because it does not
constitute public API surface.

Test: None
Bug: 171305684
Change-Id: I1dbe3d02c03f97f843813c26c16aaef7152ca478
2020-11-05 13:11:12 -08:00
Janis Danisevskis
d2c944bc4d Keystore SPI: Add SecurityLevelEnum to KeyProperties
This patch adds the SecurityLevelEnum to KeyProperties. This enum can be
used by the public API surface to express levels of enforcements of key
properties. And to select a designated residence for a newly generated
or imported key.

The values UNKNOWN and UNKNOWN_SECURE are used to convey to older target
APIs API levels that have not been defined when they where published.

Test: None
Change-Id: I88681f21b8a8ea9a383d32ba99f3ab7d7c8909c3
2020-11-05 13:11:12 -08:00
Steven Moreland
090ca078f3 Merge "libstatslog: disable on darwin" am: 2f76449ef7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488537

Change-Id: I43ba8bdc322241ffa50faf0b57b2781fd5444cba
2020-11-05 20:01:24 +00:00
Steven Moreland
2f76449ef7 Merge "libstatslog: disable on darwin" 2020-11-05 19:33:54 +00:00
Treehugger Robot
cfe526b0a7 Merge "Fix anr when installing package" am: 387cf5e127
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481018

Change-Id: Ia8c5e5d8e71460657f1cb953bde50463ec5faa94
2020-11-05 19:09:58 +00:00
Treehugger Robot
387cf5e127 Merge "Fix anr when installing package" 2020-11-05 18:55:11 +00:00
Treehugger Robot
2cf1c81e8b Merge "Avoid NullPointerException on non-existing file." am: 5db706a48f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488698

Change-Id: I471f44ed7c5388566aaae9ca2f102b65c53fb78a
2020-11-05 18:39:16 +00:00
Tyler Gunn
884d18b7d1 Merge "Add support for DTMF and RTP header extension communications." am: 49612b38d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487449

Change-Id: I881bdd65e5ca5b9f2da8915523d9b47f420d3799
2020-11-05 18:36:03 +00:00
Treehugger Robot
5db706a48f Merge "Avoid NullPointerException on non-existing file." 2020-11-05 18:13:18 +00:00
Tyler Gunn
49612b38d8 Merge "Add support for DTMF and RTP header extension communications." 2020-11-05 17:57:40 +00:00
Anton Hansson
b6177fc464 Merge "Move testapi API files for symmetry with others" am: 78d5048610
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488697

Change-Id: Ib3372ff7001df05aaeb96664c7531348854740be
2020-11-05 17:42:02 +00:00
Anton Hansson
78d5048610 Merge "Move testapi API files for symmetry with others" 2020-11-05 17:23:24 +00:00
Steven Moreland
51f0cb67c1 libstatslog: disable on darwin
libbinder doesn't support mac.

Bug: 172023026
Test: N/A
Change-Id: Idc484994e7cf5125736ddd7f5c98165ee9f01e67
2020-11-05 16:12:03 +00:00
Treehugger Robot
d54065a670 Merge "Ability to configure NR dual connectivity" am: aa756e198c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486306

Change-Id: I8ca504a542be4443bae344e3522b76373694a67e
2020-11-05 15:36:17 +00:00
Treehugger Robot
aa756e198c Merge "Ability to configure NR dual connectivity" 2020-11-05 15:23:46 +00:00
Dario Freni
2d510d9b6c Avoid NullPointerException on non-existing file.
This change allows the method to throw a more informative exception
containing the file name that has not been found.

Test: used the library in sharedlibs_host_tests
Change-Id: I196385486ef4c121f1c655cd76c3ea5233e2a722
2020-11-05 14:32:18 +00:00
Anton Hansson
18503252ef Merge "Make current-api-xml use generated current.txt" am: 3ab2ebfe26
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488696

Change-Id: Iae67a72df5038a527b2b704fe171c352a70d9bd6
2020-11-05 14:12:57 +00:00
Anton Hansson
552ba2c492 Move testapi API files for symmetry with others
The other non-updatable API files are in core/api/*. Also add
-non-updatable to the module to match the others.

Bug: 171029603
Test: m checkapi
Change-Id: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
Merged-In: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
(cherry picked from commit 3a1b1bd620454dd1d5b328c98634a567865cd55e)
2020-11-05 14:04:24 +00:00
Anton Hansson
3ab2ebfe26 Merge "Make current-api-xml use generated current.txt" 2020-11-05 13:52:54 +00:00
Anton Hansson
00febe2eb6 Make current-api-xml use generated current.txt
Remove the dep on the monolithic current.txt so that it can be deleted.

Bug: 158465496
Test: m current-api-xml (same before and after)
Change-Id: I6d36801592a20cb9dc8f87c7d9d4babf0986c448
2020-11-05 10:30:59 +00:00
Nikita Iashchenko
bce0208847 Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbbef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484136

Change-Id: Ifb6e71163999d084ccc1f7e648d6caea21e8a0c7
2020-11-05 10:19:49 +00:00
Nikita Iashchenko
97f35bbbef Merge "Import TLS handshake atom for Conscrypt" 2020-11-05 10:14:31 +00:00
Anton Hansson
dd64b2cbf9 Merge "Remove unused monolithic jars" am: fd4bcbd76a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486198

Change-Id: I34a339e974d9369662d23d32aa93e70677f2431f
2020-11-05 10:08:44 +00:00
Anton Hansson
fd4bcbd76a Merge "Remove unused monolithic jars" 2020-11-05 09:50:23 +00:00
Paul Hu
d5ee31aba5 Merge "Replace Context @hide APIs" am: a1c0a06580
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: I914ee12abdcba7c53fb868425592d6458a797e23
2020-11-05 08:53:01 +00:00
Paul Hu
5e56187d53 Merge "Replace AppOpsManager @hide APIs" am: a80bc72775
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: I6222db7e8f966d7df17de9c46b5e26e715ecccf2
2020-11-05 08:45:52 +00:00
Paul Hu
b8eb5b0ee1 Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb2b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021

Change-Id: I16d87836136f411e61756246817ed448d974bec4
2020-11-05 08:37:59 +00:00
Paul Hu
a1c0a06580 Merge "Replace Context @hide APIs" 2020-11-05 08:05:09 +00:00
Paul Hu
a80bc72775 Merge "Replace AppOpsManager @hide APIs" 2020-11-05 08:03:55 +00:00
Paul Hu
01bec3bb2b Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" 2020-11-05 07:55:10 +00:00
James Mattis
d4313a6d0f Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: I92bd7437dede4ae4a4bb27dfbf68a5ae74553811
2020-11-05 05:24:33 +00:00
James Mattis
df86206d82 Merge "Adding @IgnoreUpTo for testOemPrivate" 2020-11-05 04:31:51 +00:00
Bill Yi
e666aa1e3d Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 2c67d7f24a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487068

Change-Id: I2a77e6a9e5246800149980d33b19fca17fc687b6
2020-11-05 03:13:30 +00:00
Bill Yi
c847e318a5 Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: f2d4156f5b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487068

Change-Id: I8a4f97f07e021357299d524adbd155a4ea453588
2020-11-05 03:01:07 +00:00
Bill Yi
2c67d7f24a Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" 2020-11-05 01:06:53 +00:00
James Mattis
aad8075de9 Adding @IgnoreUpTo for testOemPrivate
Adding @IgnoreUpTo for NetworkCapabilitiesTest.testOemPrivate so that
this test can run on previous releases.

Bug: 172400600
Bug: 171505922
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ibc728c986ad6faeed78c631ca2675956b95c6ac1
2020-11-04 16:52:11 -08:00
Tyler Gunn
08ddbc2b6d Add support for DTMF and RTP header extension communications.
Add support for:
- reporting of incoming DTMF tones from IMS stack.
- incoming/outgoing RTP header extension data.

Test: Added unit tests where possible.
Test: Added test intents to inject test data into framework for platform
testing.
Bug: 163085177
Change-Id: If34faeba0461c677a1381c82ead4a79c607bcf13
2020-11-05 00:19:52 +00:00
Bill Yi
f2d4156f5b Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE
Merged-In: Ic1e07d28a41eea2ce59cc21702dae95d61adc24e
Change-Id: Ibc69b3e372167485bb70ae3277222bbe8ef7ff27
2020-11-04 13:57:54 -08:00
Mohammad Islam
afb34c51c2 Merge "Improve logging for why a staged session was reverted" am: 55103afd78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486201

Change-Id: I06461e3778e20d8489ce5f030e0bbdc1b3a3abf1
2020-11-04 21:56:22 +00:00
Mohammad Islam
55103afd78 Merge "Improve logging for why a staged session was reverted" 2020-11-04 21:49:57 +00:00