Commit Graph

30925 Commits

Author SHA1 Message Date
Meng Wang
bf85462494 Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca313 am: f5997ba830 am: aabfda3787 am: 1fc9d9db6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392756

Change-Id: Iac3cf3a8d3e240bf23006610d515c1003fdbdbdc
2020-08-18 20:22:39 +00:00
Meng Wang
aabfda3787 Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca313 am: f5997ba830
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392756

Change-Id: Ibac117099202d1fd2589c828270e3f3b09577479
2020-08-18 20:00:40 +00:00
Meng Wang
5c8e5ca313 Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" 2020-08-18 19:34:51 +00:00
Eric Laurent
f976180608 audio: add device definitions for BLE Audio
Add device type enums for BLE Audio.
Device types for BLE audio headset and BLE audio speaker are added
to AudioDeviceInfo class.
Conversions to internal device types are added to AudioSystem.
(cherry picked from commit 6239d7ee87)

Bug: 161358428
Test: make flash and boot
Change-Id: I0a39ffc49c0e7e5b36975656a33a2dd2946b60b7
Merged-In: I0a39ffc49c0e7e5b36975656a33a2dd2946b60b7
2020-08-18 06:03:21 +00:00
Meng Wang
f3c71997ee Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID
Bug: 164250692
Test: make
Change-Id: I917085cf6f962c7f5cc7088e2e5298597f661514
Merged-In: I917085cf6f962c7f5cc7088e2e5298597f661514
2020-08-18 02:22:11 +00:00
Eric Laurent
3428e2f956 Merge "audio: add device definitions for BLE Audio" into rvc-dev-plus-aosp am: 6605a82524 am: e2b9de76dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12373865

Change-Id: I6efc88aeeb57428a2855178db95bd05328e8d29c
2020-08-18 02:04:12 +00:00
Eric Laurent
d77752dbf2 audio: add device definitions for BLE Audio
Add device type enums for BLE Audio.
Device types for BLE audio headset and BLE audio speaker are added
to AudioDeviceInfo class.
Conversions to internal device types are added to AudioSystem.

Bug: 161358428
Test: make flash and boot
Change-Id: I0a39ffc49c0e7e5b36975656a33a2dd2946b60b7
Merged-In: I0a39ffc49c0e7e5b36975656a33a2dd2946b60b7
(cherry picked from commit 6239d7ee87)
2020-08-14 01:09:51 +00:00
Grace Jia
f98b0c5eb1 Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de am: 6a55cd1644 am: 300b3cce72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908

Change-Id: I26980870eb16299663f7553314d1f68ee90067f0
2020-08-13 19:22:10 +00:00
Grace Jia
6a55cd1644 Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908

Change-Id: I49034d851b111792fa54b3d2f236d56513bb00f9
2020-08-13 18:46:06 +00:00
Grace Jia
329c6ff777 Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." 2020-08-13 18:06:19 +00:00
Hans Boehm
c8a5932211 Merge "API and boot image updates to import RI BigInteger" am: 47ce951f33 am: 2996c1be22 am: 7949fea1f9 am: 6b9c4df784
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331800

Change-Id: I626ece4f28a89c85b0553873aed1d946d94605e7
2020-08-13 01:34:48 +00:00
Hans Boehm
7949fea1f9 Merge "API and boot image updates to import RI BigInteger" am: 47ce951f33 am: 2996c1be22
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331800

Change-Id: I497efcccc6d456789a9b095942681625e93334ff
2020-08-13 00:51:24 +00:00
Hans Boehm
47ce951f33 Merge "API and boot image updates to import RI BigInteger" 2020-08-13 00:15:01 +00:00
Grace Jia
9a09c67075 Add adhoc conference APIs to RemoteConnection and
RemoteConnectionService.

Plumb through the adhoc conference APIs via these new APIs.

Bug: 159944852
Test: atest CtsTelecomTestCases:RemoteConnectionTest
Change-Id: Icfa27e0616dd35ba350f7a491e5c95337a286b9d
2020-08-11 19:26:33 +00:00
Treehugger Robot
2cf9b73e4c Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" am: e3b0b6d007 am: 1e16995094 am: 2b97b69661 am: 6a6e0c282d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392003

Change-Id: Ic160dbf7e56f64adc1deffef34b9f08fbda9ac54
2020-08-10 21:27:46 +00:00
Treehugger Robot
2b97b69661 Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" am: e3b0b6d007 am: 1e16995094
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392003

Change-Id: Ibd396e7b4d12e1765f71413d730d51997c5b4306
2020-08-10 20:47:00 +00:00
Treehugger Robot
e3b0b6d007 Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" 2020-08-10 20:22:05 +00:00
Steven Moreland
7542475521 Parcelable getStability SystemApi MODULE_LIBRARIES
This method is intentionally overridden by subclasses. The
infrastructure doesn't detect that this is happening, but we should
still annotate this as part of the API.

As requested by API review council.

Bug: 162811168
Test: build only
Change-Id: I27714a93b71108cc0cc62fc858c260e2a6920ba9
2020-08-06 21:22:15 +00:00
Peter Wang
8ba18c0508 Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" 2020-07-31 08:43:44 +00:00
Treehugger Robot
1054fd8e86 Merge "Allow module libs to use VINTF AIDL (part II)" 2020-07-28 19:25:45 +00:00
Steven Moreland
f846f3e206 Merge "Allow module libs to use VINTF AIDL (part II)" into rvc-dev-plus-aosp am: 31457aebae am: 93bdd4451a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12244505

Change-Id: I22b494e17c1784df81e8620eb032a73676784d79
2020-07-28 18:47:37 +00:00
Treehugger Robot
d5be65f281 Merge "Expose adhoc conference calling API as public." am: 8ebbe3c038 am: fb8f41f0c2 am: e8a4750ac5 am: bb50f0e74c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368819

Change-Id: I3c1ba14ebf107ca37baa0c254be72ef3e0e755c1
2020-07-28 18:20:50 +00:00
Steven Moreland
31457aebae Merge "Allow module libs to use VINTF AIDL (part II)" into rvc-dev-plus-aosp 2020-07-28 18:14:20 +00:00
Treehugger Robot
e8a4750ac5 Merge "Expose adhoc conference calling API as public." am: 8ebbe3c038 am: fb8f41f0c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368819

Change-Id: Ia5e17f2dbbfbb539f2415348e1ddb960354d3662
2020-07-28 17:41:13 +00:00
Treehugger Robot
8ebbe3c038 Merge "Expose adhoc conference calling API as public." 2020-07-28 17:08:47 +00:00
Steven Moreland
291348786a Allow module libs to use VINTF AIDL (part II)
Allow parcelables to be compiled which report VINTF stability.

Bug: 161501127
Test: atest aidl_integration_test
Change-Id: Idc2acb28ac0475ee69385487c7ef619951f93516
Merged-In: Idc2acb28ac0475ee69385487c7ef619951f93516
2020-07-28 01:47:10 +00:00
Steven Moreland
e5bd46e639 Allow module libs to use VINTF AIDL (part II)
Allow parcelables to be compiled which report VINTF stability.

Bug: 161501127
Test: atest aidl_integration_test
Change-Id: Idc2acb28ac0475ee69385487c7ef619951f93516
2020-07-28 01:21:13 +00:00
Grace Jia
8587ee5cd5 Expose adhoc conference calling API as public.
Bug: 159944852
Test: make
Change-Id: I2cf39a6fd8a02ca4f2d0c83c484ab12bb13f74c3
2020-07-27 11:18:36 -07:00
Steven Moreland
298d06f292 Merge "Allow module libs to use VINTF AIDL." 2020-07-24 22:54:24 +00:00
Steven Moreland
178e6ff50a Merge "Allow module libs to use VINTF AIDL." into rvc-dev-plus-aosp am: b9440149be am: 88cab6ba53
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12219679

Change-Id: Ib0a14fb8c6fa5d7de1573b440947164d6b0b2a6a
2020-07-24 21:25:52 +00:00
Steven Moreland
95dd53bb5f Allow module libs to use VINTF AIDL.
Currently a native APEX can get and use a VINTF AIDL. However, this
can't be passed over JNI to be used by Java code.

This does not open VINTF AIDLs to any type of apps, where AIDL as an API
is completely disallowed. Also, no Java ServiceManager APIs are
available, and they couldn't be until b/139325468 is fixed.

Bug: 161501127
Test: atest binderVendorDoubleLoadTest

Change-Id: I1ab977248b1c39a7d08e0ca34389a7ba168c05b0
2020-07-24 18:35:55 +00:00
Steven Moreland
a7fb8cb669 Allow module libs to use VINTF AIDL.
Currently a native APEX can get and use a VINTF AIDL. However, this
can't be passed over JNI to be used by Java code.

This does not open VINTF AIDLs to any type of apps, where AIDL as an API
is completely disallowed. Also, no Java ServiceManager APIs are
available, and they couldn't be until b/139325468 is fixed.

Bug: 161501127
Test: atest binderVendorDoubleLoadTest

Change-Id: I1ab977248b1c39a7d08e0ca34389a7ba168c05b0
Merged-In: I1ab977248b1c39a7d08e0ca34389a7ba168c05b0
2020-07-24 18:12:19 +00:00
Hans Boehm
7cec0bba9a API and boot image updates to import RI BigInteger
This reorders methods, omits a redundant "implements" spec, and adds
<x>ValueExact() methods, which are in OpenJDK 8, but hadn't been
implemented on Android.

Also update the boot image profile to compile BigInteger-required
methods that used to be native. Some of these must be compiled to
avoid ART test timeouts.

Bug: 136887041
Bug: 119491938
Bug: 28214673
Bug: 28251030
Bug: 2950143
Test: AOSP Boots. Ran some manual Calculator tests on Cuttlefish.
Change-Id: Idd72ec6a6fd54ed4ad96a82b26840b41a3882678
2020-07-23 14:12:34 -07:00
Treehugger Robot
3846b1e2c2 Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" 2020-07-17 08:28:38 +00:00
Peter Wang
c061cdf467 [Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and
guard with permission

Bug: 150878235
Fix: 150878235
Test: Build
Change-Id: I7f3b1f5170e032336d9b39b322c49e2b92573586
Merged-In: I7f3b1f5170e032336d9b39b322c49e2b92573586
2020-07-16 02:01:06 -07:00
Makoto Onuki
1ec5094699 Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: 06b1ba180d am: 1e085a1db4 am: a553a497fd am: 42337f43f0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884

Change-Id: Ifb1b9b7aeb1ec6e5e11b4c60be477d7154915b61
2020-07-15 16:22:41 +00:00
Makoto Onuki
a553a497fd Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: 06b1ba180d am: 1e085a1db4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884

Change-Id: Ie45f32b2d46c8ac989a4a9242017eb4c2b73484b
2020-07-15 16:00:22 +00:00
Rubin Xu
ac51bf8a40 [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain
This change includes the following commits that are related to
CertInstaller and KeyChain:

7a5c8fe4afd KeyChain: Unify manual and programmatic key installation flows
a894225c7da Added functionality to select type of certificate to be installed from the Settings app
a9131939a35 Add KeyChain.KEY_ALIAS_SELECTION_DENIED constant.
485be505f19 Fix KeyChain.KEY_ALIAS_SELECTION_DENIED

Bug: 161347472
Test: builds & manual testing
Change-Id: I560bade479b41a5b88f81ea6dfdecba689c2f4ad
2020-07-15 15:50:14 +01:00
Makoto Onuki
a13287f573 Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs
Test: build / treehugger
Bug: 146727827
Exempt-From-Owner-Approval: Cherry-picking from goog/master to aosp/master
Merged-in: Ie1ad6711c490c679ebcfacd97154380a8810ba1c
Change-Id: Ie1ad6711c490c679ebcfacd97154380a8810ba1c
2020-07-15 01:36:38 +00:00
Nathan Harold
6c4487f9d9 Merge "Deprecate CellLocation#requestLocationUpdate" am: 277f52a0f4 am: 3153f5efb9 am: ad12e8d8b8 am: a4570afac8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355809

Change-Id: I5578c6535d2d13e819e492661b139f3884703981
2020-07-13 02:41:58 +00:00
Nathan Harold
ad12e8d8b8 Merge "Deprecate CellLocation#requestLocationUpdate" am: 277f52a0f4 am: 3153f5efb9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355809

Change-Id: I87143f17132186dea7575318d0a4c28c4f3e924c
2020-07-13 02:32:34 +00:00
Jian-Yang Liu
042623ba3b Merge "Added systemui controller to control system bars." into rvc-qpr-dev am: 32fe6cf1d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12013479

Change-Id: I48e0177ec6f428dcf5a57006d2411437cc720912
2020-07-09 01:45:49 +00:00
JianYang Liu
2c403a6526 Added systemui controller to control system bars.
When config_remoteInsetsControllerControlsSystemBars is true,
DisplaySystemBarsController provides its own policy of how system
bars are displayed for specific packages. Currently limited to
only auto versions of Android.

Bug: 149585273
Test: Manual, atest BarControlPolicyTest, atest InsetsPolicyTest,
      atest DisplaySystemBarsControllerTest
Change-Id: Ie6b1cc3e2760cbc9e48d62dfbd8bc3e23ffca20c
Merged-In: Ie6b1cc3e2760cbc9e48d62dfbd8bc3e23ffca20c
2020-07-08 23:06:14 +00:00
Nathan Harold
bf3fff073f Deprecate CellLocation#requestLocationUpdate
Remove this method, which is undesirable, has unfortunate
side effects, and which is a worse way of getting the current
location than other methods such as TelephonyManager#getAllCellInfo()
(since KK) and TelephonyManager#requestCellInfoUpdate() (since QT/11).

Bug: 152648516
Test: make update-api && make (docstring-only change)
Change-Id: I3c7d345abcdd8c35cf539d33166ddf76ba987b1c
2020-07-06 13:54:42 -07:00
Jorim Jaggi
7a9fa4689a Merge "Pass in callsite of SurfaceControl constructor explicitly (1/3)" into rvc-dev am: 37cf2279c9 am: 3f8fc80e42
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920862

Change-Id: I2f30c74dab0cf842a5e06257c357cdb23798397a
2020-06-27 00:28:22 +00:00
Jorim Jaggi
41bd44e606 Merge "Pass in callsite of SurfaceControl constructor explicitly (1/3)" into rvc-dev am: 37cf2279c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920862

Change-Id: I19b6f83b3777bfeccbe90f1c531efcc59e41f54e
2020-06-27 00:14:24 +00:00
Jorim Jaggi
d42ab1b938 Pass in callsite of SurfaceControl constructor explicitly (1/3)
Creating a new Throwable (and filling in the stack trace) can take
up to 150us. Since we do this on the critical path when sending
over SurfaceControl via binder multiple times, this is too much.
Instead, add an option to pass in callsite manually.

Bug: 159056748
Change-Id: I46c339c15a07192d61c4c546e46f260684a47120
Merged-In: I46c339c15a07192d61c4c546e46f260684a47120
Exempt-From-Owner-Approval: Large scale refactor
2020-06-26 15:35:23 +02:00
Svetoslav Ganov
bf50afcb4e Merge "Handle reperenting of InlineContentView" into rvc-dev am: f8b9ddea71 am: a962563758
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907687

Change-Id: Ia18fc12a4015296d59985b376b159a1560717d90
2020-06-24 06:56:18 +00:00
Svetoslav Ganov
0de1884aef Merge "Handle reperenting of InlineContentView" into rvc-dev am: f8b9ddea71
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907687

Change-Id: I9b0919075bc6e29cf4beb6d2e92097d74ac4d99b
2020-06-24 06:44:18 +00:00
Svetoslav Ganov
f8b9ddea71 Merge "Handle reperenting of InlineContentView" into rvc-dev 2020-06-24 06:28:59 +00:00