Commit Graph

632082 Commits

Author SHA1 Message Date
Suprabh Shukla
ea1decfcda Merge "Add an API for a prioritized alarm" into sc-dev 2021-03-25 09:01:57 +00:00
TreeHugger Robot
0e414a7878 Merge "Add network created callback support" into sc-dev 2021-03-25 08:52:56 +00:00
Fiona Campbell
acc5fbcb39 Merge "Store Brightness Per Display" into sc-dev 2021-03-25 08:40:15 +00:00
Hyundo Moon
30b3a36edc Merge "System MR2: Supplement Javadoc for startScan/stopScan" into sc-dev 2021-03-25 08:02:51 +00:00
TreeHugger Robot
0c805c2516 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 32c1220518 -s ours am: 47efb227cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25ce3c45cd83aa2fcef1bc4e11cddd397521326f
2021-03-25 07:32:43 +00:00
Dorin Drimus
9c523065f9 Merge "Adapt first time VPN connection warning to TV form factor" am: 2af1306a77 am: 601e1dd64c am: dd6a619444
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652319

Change-Id: I8bafe3ec70b1b0fa3fe49d195ced8841da57863f
2021-03-25 07:32:17 +00:00
TreeHugger Robot
230fac1c9c Merge "Make TypedArray implement AutoCloseable" into sc-dev 2021-03-25 07:10:52 +00:00
TreeHugger Robot
47efb227cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 32c1220518 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7f2640c4e8dd51aaaa0362d1c7cd9e72340d43c
2021-03-25 07:06:20 +00:00
Hui Yu
564c4dc529 Merge "BG-FGS-Launch restriction also checks for the caller's targetSdkVersion." into sc-dev 2021-03-25 07:02:09 +00:00
Sudheer Shanka
d2cd698106 Merge "Add DeviceConfig namespace for media." into sc-dev 2021-03-25 06:56:08 +00:00
Sudheer Shanka
ab2bcd687f Merge "Add a new permission ACCESS_BLOBS_ACROSS_USERS." into sc-dev 2021-03-25 06:53:45 +00:00
TreeHugger Robot
946747109a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a7e812a641 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4727b4454161556f5b87e6a32ae2230c50a302b
2021-03-25 06:50:48 +00:00
Dorin Drimus
dd6a619444 Merge "Adapt first time VPN connection warning to TV form factor" am: 2af1306a77 am: 601e1dd64c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652319

Change-Id: I392fe75794808f472b443d57ec6544d270364e3b
2021-03-25 06:46:58 +00:00
Remi NGUYEN VAN
143600af4e Merge "Fix apex_available on service-connectivity" into sc-dev 2021-03-25 06:30:33 +00:00
Tiger Huang
5905279553 Merge "Re-land: Make window stable while resizing" into sc-dev 2021-03-25 06:24:43 +00:00
TreeHugger Robot
32c1220518 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-25 06:23:49 +00:00
TreeHugger Robot
aa029a2526 Merge "Abandon in-flight app-search session when user stops" into sc-dev 2021-03-25 06:10:10 +00:00
TreeHugger Robot
a7e812a641 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-25 06:10:07 +00:00
TreeHugger Robot
55a5d06172 Merge "Remove SessionState and cookie from biometrics" into sc-dev 2021-03-25 06:07:39 +00:00
Dorin Drimus
601e1dd64c Merge "Adapt first time VPN connection warning to TV form factor" am: 2af1306a77
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652319

Change-Id: I267072399a8d60097704b4c5e35b67ffc26077e4
2021-03-25 06:05:45 +00:00
Pavel Grafov
46ad0cd297 Merge "Allow COPE DPC to confirm compliance explicitly" into sc-dev 2021-03-25 05:43:56 +00:00
Alexander Dorokhine
30ccdcd621 Merge "Remove deprecated methods from AppSearch APIs." into sc-dev 2021-03-25 05:34:38 +00:00
Dorin Drimus
2af1306a77 Merge "Adapt first time VPN connection warning to TV form factor" 2021-03-25 05:27:57 +00:00
Alexander Dorokhine
65c4fd881e Remove deprecated methods from AppSearch APIs.
These methods were only available for dogfooder transition.
None of these methods shipped in a stable SDK.

Bug: 181887768
Bug: 183395357
Test: Build, presubmit
Change-Id: I74feebd2721208c97475df9b74f734a17a41d5e2
2021-03-24 22:14:38 -07:00
Evgenii Stepanov
9c1d00870e Merge "Cleanup nativeHeapZeroInit and memtagMode implementation." into sc-dev 2021-03-25 05:02:08 +00:00
Pinyao Ting
b3c71c2f97 Merge "Move from getDataUserCePackageDirectory to getDataSystemCeDirectory." into sc-dev 2021-03-25 04:48:40 +00:00
Bill Yi
b4abed8fa6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I839198e64ea8ea374d42a1894e71e29351bd2639
2021-03-25 04:46:25 +00:00
TreeHugger Robot
aeb2ba8da6 Merge "Accept strings for more parameters in Suspend Dialog" into sc-dev 2021-03-25 04:38:58 +00:00
Treehugger Robot
fa07059fe9 Merge "media: make ParameterDescriptor static" am: 201c39ba90 am: e29ed20fff am: 1632f384c0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653567

Change-Id: I243bb389f22e0f651aef0397f24aee7c12af7ad0
2021-03-25 04:32:16 +00:00
Treehugger Robot
38dcf6a83c Merge "Fix null pointer exception if USBPort is removed" am: 066cd28370 am: fd5364769f am: 616b2a267f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1308901

Change-Id: I07eedad3dff519386abb45a172e8c26d837574e5
2021-03-25 04:31:45 +00:00
Treehugger Robot
d2cc19e8f1 Merge "Remove BluetoothHeadset#setPriority which was deprecated in Android 11" am: cdf9e7ef43 am: 283653d4b1 am: c93442cac9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650990

Change-Id: I40ae55301eb6b33e596e7c7976dda4caa837e70c
2021-03-25 04:31:19 +00:00
Curtis Belmonte
0c859405ea Merge "Add strings for traffic light face auth/enrollment" into sc-dev 2021-03-25 04:31:11 +00:00
Harpreet "Eli" Sangha
43dca7ac9d Merge "UWB: Annotate AngleMeasurement Parameters" am: bef37a3dc8 am: 19fc9b4b92 am: 10440a0441
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652207

Change-Id: I205de3d09a782d14a0af5f12bf9d25e2fa53bf14
2021-03-25 04:30:50 +00:00
TreeHugger Robot
9f94445e2e Merge "Fixed formatting on services/Android.bp" into sc-dev 2021-03-25 04:28:36 +00:00
TreeHugger Robot
cd5c6bc667 Merge "Camera: Connect activity resizing state to camera service" into sc-dev 2021-03-25 04:12:39 +00:00
TreeHugger Robot
c62ea7c7d8 Merge "Do not leak objects created from JNI" into sc-dev 2021-03-25 04:10:30 +00:00
Treehugger Robot
1632f384c0 Merge "media: make ParameterDescriptor static" am: 201c39ba90 am: e29ed20fff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653567

Change-Id: I5d7de95191f9da3b23ea1ed6ba3851b2958181fd
2021-03-25 04:06:08 +00:00
Treehugger Robot
616b2a267f Merge "Fix null pointer exception if USBPort is removed" am: 066cd28370 am: fd5364769f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1308901

Change-Id: Ia64a294b4059dfd76b67446a8153d2b41bf75d0b
2021-03-25 04:05:24 +00:00
TreeHugger Robot
07a84b6cc8 Merge "MediaRouter2: Add RouteDiscoveryPrefernce.EMPTY as @SystemApi" into sc-dev 2021-03-25 04:05:15 +00:00
TreeHugger Robot
d5dc9e47a4 Merge "Unhide api for setHotwordDetectionServiceConfig" into sc-dev 2021-03-25 03:49:32 +00:00
Ying Xu
f65611ef1a Merge "Make sure the correct QS tiles are used for Provider Model" into sc-dev 2021-03-25 03:49:15 +00:00
Lajos Molnar
b8f4c0e6a5 Merge "media: add CBR_FD video encoding bitrate mode" into sc-dev 2021-03-25 03:47:52 +00:00
Treehugger Robot
e29ed20fff Merge "media: make ParameterDescriptor static" am: 201c39ba90
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653567

Change-Id: I61c83705059bbb78b0096e52d3a0a02eeceb7220
2021-03-25 03:47:20 +00:00
Treehugger Robot
c93442cac9 Merge "Remove BluetoothHeadset#setPriority which was deprecated in Android 11" am: cdf9e7ef43 am: 283653d4b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650990

Change-Id: I83473c7f34f0047f8d2d75e5140a217f7fa3efaf
2021-03-25 03:44:03 +00:00
Treehugger Robot
fd5364769f Merge "Fix null pointer exception if USBPort is removed" am: 066cd28370
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1308901

Change-Id: I0a6809b6acc6213abed97ef8d6899c786e39a9b1
2021-03-25 03:43:58 +00:00
Harpreet "Eli" Sangha
10440a0441 Merge "UWB: Annotate AngleMeasurement Parameters" am: bef37a3dc8 am: 19fc9b4b92
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652207

Change-Id: Icb4ac4cb4eda8fc932c40a409bf95e6a6fb2f5db
2021-03-25 03:43:41 +00:00
Remi NGUYEN VAN
452342325d Fix apex_available on service-connectivity
arc-services depends on service-connectivity, so it also needs to be
available to the platform.

Bug: 183668370
Test: m
Change-Id: Id82125e98abf59b1cc8cb3fceab376597f0496ed
2021-03-25 12:17:51 +09:00
Treehugger Robot
201c39ba90 Merge "media: make ParameterDescriptor static" 2021-03-25 03:16:34 +00:00
Treehugger Robot
066cd28370 Merge "Fix null pointer exception if USBPort is removed" 2021-03-25 03:14:45 +00:00
Treehugger Robot
c296c46843 Merge "Use a longer test timeout in integration test" am: 565f1a95bd am: e7da14afc4 am: 660a2c9642
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287

Change-Id: Ie457ecaa93f96d221f75d4eb59d44bc7857c67fb
2021-03-25 03:11:16 +00:00