Commit Graph

31100 Commits

Author SHA1 Message Date
Colin Cross
3c21dc5ade Merge "Revert "Add genrule for combined srcjar of modules"" am: 4d506d7420 am: ddf88a50cc am: 7a8204d670
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490422

Change-Id: I825e55b27c1a429ce4631599b6d8824dafc3dc91
2020-11-06 22:53:10 +00:00
Colin Cross
4d506d7420 Merge "Revert "Add genrule for combined srcjar of modules"" 2020-11-06 19:28:34 +00:00
Colin Cross
9018bfbf0f Revert "Add genrule for combined srcjar of modules"
This reverts commit ddf171aaf8.

Reason for revert: b/172663078

Bug: 169034951
Bug: 172663078
Change-Id: Ibd1269d72f15b43817ffec50eb94f72671e7538b
Merged-In: Ifb5f56bf5468969ad026f10186763ef604113adc
2020-11-06 19:26:56 +00:00
Anton Hansson
6af2ef3ce6 Merge "Add genrule for combined srcjar of modules" am: 1452dc60ca am: 730982b142 am: c36ad8233e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489716

Change-Id: I0d543aa3ed7c65fd388c6e4ba62092fb7b8e7792
2020-11-06 16:30:09 +00:00
Anton Hansson
1452dc60ca Merge "Add genrule for combined srcjar of modules" 2020-11-06 14:55:18 +00:00
Treehugger Robot
15e1f8f5eb Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e am: f2abffe107 am: df8410e677
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1451015

Change-Id: I654b14fb0386d5bea6d22e37a394b00c1f66a87c
2020-11-06 02:14:41 +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
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
Anton Hansson
ddf171aaf8 Add genrule for combined srcjar of modules
The sources of the stubs are shipped as part of the public SDK.
Currently the SDK depends on the output of the monolithic metalava run,
but it can be assembled by merging the srcjars of the individual runs.

There is a diff -- module stub sources contain javadoc comments. I don't
think has any negative impact. Also package-info.html files are
included, which probably is fine.

Bug: 169034951
Test: diff new output with existing monolith
Change-Id: Idfc94cdb3317d3bde0b29fd8da0a9ccef47377f9
Merged-In: Idfc94cdb3317d3bde0b29fd8da0a9ccef47377f9
(cherry picked from commit 5d0687a2ef)
2020-11-05 20:26:56 +00:00
Tyler Gunn
e7fe523116 Merge "Add support for DTMF and RTP header extension communications." am: 49612b38d8 am: 884d18b7d1 am: b18d3a92c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487449

Change-Id: Id3ccaaa4f6d55d24620711b90e014c4058bba7d9
2020-11-05 20:06:57 +00:00
Anton Hansson
dc1367d460 resolve merge conflicts of 8e6e52ec8b to rvc-qpr-dev-plus-aosp
Bug: 171029603
Change-Id: Ie846f5b9bc1ee906fc6f01d05899fddfd1918266
Merged-In: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
2020-11-05 19:59:32 +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
78d5048610 Merge "Move testapi API files for symmetry with others" 2020-11-05 17:23:24 +00:00
Treehugger Robot
72f2a2c52a Merge "Ability to configure NR dual connectivity" am: aa756e198c am: d54065a670 am: 0589ecb8ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486306

Change-Id: I963cdcb960124643aa12760073dd34351921cd75
2020-11-05 16:11:33 +00:00
Anton Hansson
c43bbaa053 Merge "Make current-api-xml use generated current.txt" am: 3ab2ebfe26 am: 18503252ef am: 81a0d7c236
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488696

Change-Id: Ie0ef20c88773c7ced7c7ef3392eb77f64c040b2d
2020-11-05 15:30:42 +00:00
Treehugger Robot
aa756e198c Merge "Ability to configure NR dual connectivity" 2020-11-05 15:23:46 +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
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
Paul Hu
d667289cc6 Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb2b am: b8eb5b0ee1 am: b892146fb4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021

Change-Id: Ibe2ed0ef2cf3e2c654c8a1fca8dc045fc2666f08
2020-11-05 09:37:59 +00:00
Paul Hu
01bec3bb2b Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" 2020-11-05 07:55:10 +00: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
Grace Jia
1628da1ed5 Merge "Add missed information relative parameter and fields." am: 3014218c9e am: 25c392d7a1 am: e776e16151
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1167604

Change-Id: I9bbc329c80183fb93c604e05d9ea975a2cc5a3d4
2020-11-04 22:41:15 +00:00
Grace Jia
3014218c9e Merge "Add missed information relative parameter and fields." 2020-11-04 21:16:48 +00:00
Sooraj Sasindran
11a66cb266 Ability to configure NR dual connectivity
Provide ability to configure EUTRANR dual
connectivity

Bug: 162373679
Test: build
Change-Id: I48f5ef0a5f84157de9feffa8c5aa85d226163068
2020-11-04 10:28:10 -08:00
Allen Su
508f7d3f5b Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" am: 15075fcca0 am: e9fd3958f6 am: 3ce8089ecf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478280

Change-Id: Icb4c73706da8322786c1884e2ca396bd8fd988e6
2020-11-04 08:56:46 +00:00
Allen Su
15075fcca0 Merge "[IMS]Add bitrate and bandwidth into ImsStreamMediaProfile" 2020-11-04 07:53:42 +00:00
allenwtsu
2fd9ba433d [IMS]Add bitrate and bandwidth into ImsStreamMediaProfile
Pipe these information for Dialer to determine HD+ icon

Bug: 169586285
Bug: 172304392
Test: build pass
Change-Id: If4149c3020230eff8da06a37a3cf4bf69c011a6d
2020-11-03 16:42:09 +00:00
Anton Hansson
741ca84e64 Merge "Remove unused API tracking files" am: b665c63c5c am: fc2e622c9d am: 863dccdc87
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480757

Change-Id: If628aebd78f0dcac4f1daeec201cca4dccb81689
2020-11-03 16:30:34 +00:00
Anton Hansson
b665c63c5c Merge "Remove unused API tracking files" 2020-11-03 15:07:12 +00:00
Anton Hansson
3611a8d3a1 Merge "Remove filegroups for *current.txt files" am: 2a8f6d0027 am: f9a5e2a76e am: 059abfa49c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484121

Change-Id: I644ceb9051e5b8ce10c1555876f2bf5a61360b6a
2020-11-03 10:47:51 +00:00
Anton Hansson
2a8f6d0027 Merge "Remove filegroups for *current.txt files" 2020-11-03 09:31:05 +00:00
Yi Kong
475fb2a707 Merge "Add NAMESPACE_PROFCOLLECT_NATIVE_BOOT for profcollect feature experiments" am: c4aedd1f87 am: 02709d5394 am: d2b9bd8405
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471526

Change-Id: I8fd2dd7166b12f80135a949c187f6298ca01e701
2020-11-03 01:58:06 +00:00
Yi Kong
c4aedd1f87 Merge "Add NAMESPACE_PROFCOLLECT_NATIVE_BOOT for profcollect feature experiments" 2020-11-03 00:37:13 +00:00
Treehugger Robot
e36940b5da Merge changes from topic "setDataEnabled" am: b43f1dc00b am: 38bf0c92d1 am: ee7f357d0c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481057

Change-Id: I599441bb34ae1874c8b675484d4a05fcc18c2438
2020-11-02 23:11:54 +00:00
Sooraj Sasindran
898ce879ff Support api to control data by thermal service am: 70c1d66847 am: 760d579771 am: 74fdb20969
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481056

Change-Id: Iceffbd60fc326bb4982297003c8f081f28c2126e
2020-11-02 23:11:32 +00:00
Grace Jia
3280596f6e Add missed information relative parameter and fields.
Test: android.provider.cts.CallLogTest
Bug: 144452099
Change-Id: Idb5fb877a5e947b00ae1d7d4046f0bef26af8550
2020-11-02 18:09:01 +00:00
paulhu
86054e5e42 Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API
Connectivity service module is using some AppOpsManager @hide
APIs but they are not able to call after CS become a
mainline module. Thus, expose them to System APIs.

Bug: 170593746
Test: make update-api
Change-Id: Idb8ee13394ccbd266061eef0cab08a5e28948a3e
2020-11-03 00:54:55 +08:00
Yi Kong
878268ceab Add NAMESPACE_PROFCOLLECT_NATIVE_BOOT for profcollect feature experiments
Bug: 79161490
Test: build
Change-Id: Icf8c24f6d5b63a28272e383e5ab0641032710cdd
2020-11-03 00:48:10 +08:00
Anton Hansson
1c4fab45a3 Remove filegroups for *current.txt files
Export the merged txt files instead.

Bug: 158465496
Test: diff current.txt / current-merged.txt
Change-Id: I028c6ef4067f40e98dc20d4892a8b87a02521e9c
2020-11-02 12:59:35 +00:00
Sooraj Sasindran
64db0761f7 Rename setDataEnabledWithReason
1. Rename setDataEnabledWithReason to
setDataEnabledForReasn

2. Allow isDataConnectionAllowed to be accessed by
same apps as isDataEnabledForReason

3. Make these apis public

Bug: 156332911
Test: cts and build
Change-Id: I8672ab8861fdec1854427ee9ce5ad8eec8774608
Merged-In: I8672ab8861fdec1854427ee9ce5ad8eec8774608
2020-10-31 16:22:53 +00:00
Sooraj Sasindran
70c1d66847 Support api to control data by thermal service
Support api to control data by thermal service
Restructure data enablement API to have single API
with reason as an input to stop adding new apis
for new usecases.

Bug: 151342791
Test: added new CTS tests and verified

Change-Id: I763c422ba54907984977d19b2774c31337e5ffe5
Merged-In: I763c422ba54907984977d19b2774c31337e5ffe5
2020-10-31 16:22:12 +00:00
Emilian Peev
dbbcb14f06 Merge "Expose Image and Plane for testing" am: 56804f0560 am: ce1dd0aafd am: b8a7381930
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463664

Change-Id: Iba02e5a7e7936e93923fcd891a91be9e874888a0
2020-10-30 22:24:17 +00:00
Anton Hansson
10c8c2525a Remove unused API tracking files
The modules that generated these api tracking files were removed in
the change Ib8ec547871045f77fb73aa82f192b5a7767d0c33.

Remove the now-stale files too.

Bug: 171029603
Test: presubmit
Change-Id: If6b849febcf0a89b6b67e7acd79b8bcd9985e6ca
Merged-In: If6b849febcf0a89b6b67e7acd79b8bcd9985e6ca
2020-10-30 08:41:50 +00:00
Snild Dolkow
2e686f164c Expose Image and Plane for testing
Test: cts builds
Test: the new cts tests run
Bug: 170981222
Reference: I39921ef80c62cc331bb2d72a8d614986d3166eb9
Change-Id: I82d9581c2892eff282de02ce5810cf819a35d1d4
2020-10-29 13:18:51 +01:00
James Mattis
59502e6ef9 Merge "Add OEM_PRIVATE NetworkCapability" am: 7415f6f9b5 am: 32fbc09bd0 am: 689181f342
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1472326

Change-Id: Id8605eb5f8f4d8b977ff04359a12061c68527971
2020-10-28 00:10:47 +00:00
James Mattis
13135f3003 Add OEM_PRIVATE NetworkCapability
Adding network capability to be used with networks to be only used by
OEM apps.

Bug: 171505922
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ib55ebec0e178b6317d92f17e1aff060dacdfb2b1
2020-10-27 13:14:06 -07:00
Chiachang Wang
cb9530f2cc Merge "Expose NetworkRegistrationInfo.getNrState() as public API" am: f177ac1348 am: b637605947 am: ab746aa210
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1467045

Change-Id: I111cbae01fb9aea68a9bc0b63bd6f5caae4011e9
2020-10-27 03:46:29 +00:00
Chiachang Wang
f177ac1348 Merge "Expose NetworkRegistrationInfo.getNrState() as public API" 2020-10-27 02:53:59 +00:00
Chiachang Wang
d32aa193fd Expose NetworkRegistrationInfo.getNrState() as public API
ConnectivityService is going to become a mainline module which
will not able to access hidden APIs. DataConnectionStat needs
to get the NR 5G state of the mobile data network for checking
if the network type is 5G or not. API in NetworkRegistrationInfo
is suggested to replace the original one in ServiceState. Thus,
expose it as a public API to support it.

Bug: 171183530
Test: make update-api ; m
Test: atest CtsTelephonyTestCases
Change-Id: I965499792286de4f1447559be66ca4be80bd0e6f
2020-10-27 02:53:11 +00:00
Hall Liu
22244c8ed3 Merge "Update PhoneStateListener#onOutgoingEmergencySms" am: c5d02da0f6 am: b37753c29a am: 75c5434ddd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470691

Change-Id: I830b4bc2db3c53c5c2f21ba1f099af8eaccbfe70
2020-10-23 21:03:16 +00:00