Nadav Bar
2e8c7896bf
Merge "Add a system TextToSpeech implementation that initiates the connection through the system server." into sc-dev am: e8d124dc20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13612148
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3a124df5b058cedb4c22e877fc3834b1f560cb3
2021-02-20 06:31:39 +00:00
Nadav Bar
e8d124dc20
Merge "Add a system TextToSpeech implementation that initiates the connection through the system server." into sc-dev
2021-02-20 06:21:18 +00:00
Hangyu Kuang
52736623c1
Merge "transcoding: Do not throw exception in registerClient." into sc-dev am: 8495870326
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13630932
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I86e46bc72650c171c95e69372fbf2977ed35956e
2021-02-20 05:53:48 +00:00
Hangyu Kuang
8495870326
Merge "transcoding: Do not throw exception in registerClient." into sc-dev
2021-02-20 05:45:57 +00:00
Chiachang Wang
b56502c056
Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771 am: 63bc7bd3c2 am: 7fcc3efb9c am: 2540861d4f am: 6aca8c36e0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c067aee69645e23e31427b04c3b6a614993529b
2021-02-20 05:32:16 +00:00
Chiachang Wang
6aca8c36e0
Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771 am: 63bc7bd3c2 am: 7fcc3efb9c am: 2540861d4f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52c41154ae3364774e63376fbdd5a9f42727b65f
2021-02-20 05:04:03 +00:00
Ahaan Ugale
62165ca6c1
Merge changes Ib24f0773,I2da8f72c into sc-dev am: 6ab4236761
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13527192
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0fbae8dccdebf7638e42071a5f00ab2012bb3b4c
2021-02-20 04:41:05 +00:00
Kevin Chyn
029c2aeb2c
Merge changes from topic "revert-13630975-revert-13593269-QAPPBSWOVZ-FERZONVHNV" into sc-dev am: be83ac78d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13619196
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib5a48eb40773f48ac1f7f4cc24abd075dca68e4f
2021-02-20 04:40:03 +00:00
Ahaan Ugale
6ab4236761
Merge changes Ib24f0773,I2da8f72c into sc-dev
...
* changes:
VIMS: Decouple recognizer init from interactor in PackageMonitor.
VIMS: Decouple recognizer from interactor in initForUser().
2021-02-20 04:29:37 +00:00
Kevin Chyn
be83ac78d2
Merge changes from topic "revert-13630975-revert-13593269-QAPPBSWOVZ-FERZONVHNV" into sc-dev
...
* changes:
Revert^2 "Try to ensure tests run sequentially"
Fix NPE during fingerprint removal
Revert^2 "Update RemovalClient to support new biometric AIDL"
2021-02-20 04:27:26 +00:00
Chiachang Wang
2540861d4f
Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771 am: 63bc7bd3c2 am: 7fcc3efb9c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1e81aa264d988cc50f2d42f8b9592f050a01b69f
2021-02-20 04:22:17 +00:00
George Chang
c66f4118e3
Merge "Add tests for require unlock for NFC" into sc-dev am: 42f0a047df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13612053
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9de50a43cf88246fbb8322f759d752b881f25f5e
2021-02-20 04:04:13 +00:00
James Mattis
a1c0bebee5
Merge "Unit tests for Multi-Default with Existing APIs" am: ed4288b164 am: 372d3e6868 am: 4b7b85456a am: 863c453b51
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579208
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id320e99542ee6fc462e16d5656a127c36af01403
2021-02-20 04:03:34 +00:00
George Chang
42f0a047df
Merge "Add tests for require unlock for NFC" into sc-dev
2021-02-20 03:58:05 +00:00
hkuang
4ee60be4db
transcoding: Do not throw exception in registerClient.
...
Bug: 180715402
Test: atest MediaProviderTests:com.android.providers.media.scan.ModernMediaScannerTest#testParseDateTaken_Hopeless
Change-Id: Ibe670f9dd645c772bc52cb62cdd93197ae142b4c
2021-02-20 03:56:37 +00:00
Chiachang Wang
7fcc3efb9c
Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771 am: 63bc7bd3c2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I20a0f2d4a59222083d1c17a7732b7fe0b8461502
2021-02-20 03:41:04 +00:00
James Mattis
863c453b51
Merge "Unit tests for Multi-Default with Existing APIs" am: ed4288b164 am: 372d3e6868 am: 4b7b85456a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579208
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibae6928e620a5029986b71b2cf13c3137d39be9d
2021-02-20 03:29:18 +00:00
Kevin Chyn
81b6ccf7da
Merge "RemovalClient should preempt auth" into sc-dev am: 8e257383fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13632147
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5e05ead7e038cb5fa160e00e9026ec59814ba8a3
2021-02-20 03:06:39 +00:00
Ahaan Ugale
de203c37c3
VIMS: Decouple recognizer init from interactor in PackageMonitor.
...
On package modification, set the recognizer independently of the
interactor.
This will allow keeping the default recognizer provider a different
package from the interactor.
There should be no change to how the interactor is set.
Bug: 167597525
Test: manual
Test: atest CtsVoiceInteractionTestCases
Change-Id: Ib24f077365cbb0850c61196c2825737db1c1c090
2021-02-20 02:49:18 +00:00
Ahaan Ugale
50cabe923d
VIMS: Decouple recognizer from interactor in initForUser().
...
When initializing settings for a user, set the recognizer independently
of the interactor.
This will allow the default recognizer to be provided by a different
package from the interactor.
There should be no change to how the interactor is set.
Bug: 167597525
Test: manual
Test: atest CtsVoiceInteractionTestCases
Change-Id: I2da8f72c768b27df21534e265a3d1fb6919c7140
2021-02-20 02:49:01 +00:00
James Mattis
4b7b85456a
Merge "Unit tests for Multi-Default with Existing APIs" am: ed4288b164 am: 372d3e6868
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579208
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I71645ff80bf4da307e12f1a96dba832c434c0eff
2021-02-20 02:40:47 +00:00
Kevin Chyn
8e257383fd
Merge "RemovalClient should preempt auth" into sc-dev
2021-02-20 02:30:14 +00:00
Alex Salo
5809dee78b
Merge "Add sensor for flip to screen off. See go/flip-to-screen-off-design-doc for design details."
2021-02-20 02:24:04 +00:00
Winson Chiu
cec6661787
Merge "Only run domain verification filtering for valid Intents" into sc-dev am: b23fc47d7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13632988
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id09690576dfe4c4dbe76fbb8ff578d3f5df0eaec
2021-02-20 02:09:56 +00:00
Evan Rosky
da8c4c40b0
Merge "Don't rotate inputflinger's display" into sc-dev am: aa1d38db25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13488460
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd72b7734f59bf0b25800392245ebe04ddd95f08
2021-02-20 02:09:31 +00:00
Winson Chung
5397888793
Merge "Update task top activity after applying launch flags" into sc-dev am: f0531b3fcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13593410
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic93ab45c54251d7b26e5ad2186ef4b3fa6197ead
2021-02-20 02:09:15 +00:00
Karthik Bharadwaj
b701c84886
Merge "Send Microphone Disabled Setting Regardless Of Current State" into sc-dev am: f69fbd5a10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13606032
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22f0602c22bd20278a446a94a994e750a0171534
2021-02-20 02:09:02 +00:00
TreeHugger Robot
d82422263d
Merge "Move launcher activities to the back when back pressed on root task" into sc-dev am: 04d9bf62ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13421173
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d96fcecef001d09b6c9e67b25ad26b5e3494408
2021-02-20 02:08:31 +00:00
Sergey Volnov
68f77b187b
Merge "Make sure we call finishProxyOp for null attribution tags." into sc-dev am: d9c4e6fa4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13619192
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e0791aee642cd05c0ad7caec6464401353b7f5f
2021-02-20 02:07:36 +00:00
James Mattis
372d3e6868
Merge "Unit tests for Multi-Default with Existing APIs" am: ed4288b164
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579208
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibc47b166c6ea68ef0c059edfd1a0aa93c0aa1fc3
2021-02-20 02:04:02 +00:00
Chiachang Wang
63bc7bd3c2
Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771
...
* changes:
[IT06]Move INetworkActivityListener into connectivity module
[IT05] Remove the unused network activity logic out from NMS
[IT4.7] Add network activity info into dumpsys for debugging
[IT4.6] Unbundle NMS out from ConnectivityManager
[IT4.5] Update radio power from CS directly
2021-02-20 02:02:46 +00:00
Winson Chiu
b23fc47d7f
Merge "Only run domain verification filtering for valid Intents" into sc-dev
2021-02-20 02:00:36 +00:00
Evan Rosky
aa1d38db25
Merge "Don't rotate inputflinger's display" into sc-dev
2021-02-20 01:46:25 +00:00
James Mattis
ed4288b164
Merge "Unit tests for Multi-Default with Existing APIs"
2021-02-20 01:38:52 +00:00
Winson Chung
f0531b3fcb
Merge "Update task top activity after applying launch flags" into sc-dev
2021-02-20 01:31:14 +00:00
Karthik Bharadwaj
f69fbd5a10
Merge "Send Microphone Disabled Setting Regardless Of Current State" into sc-dev
2021-02-20 01:30:46 +00:00
TreeHugger Robot
04d9bf62ab
Merge "Move launcher activities to the back when back pressed on root task" into sc-dev
2021-02-20 01:15:53 +00:00
Sergey Volnov
d9c4e6fa4f
Merge "Make sure we call finishProxyOp for null attribution tags." into sc-dev
2021-02-20 01:15:40 +00:00
TreeHugger Robot
4ac7df9192
Merge "[incremental] Use file range mapping for .so if available"
2021-02-20 00:54:02 +00:00
TreeHugger Robot
9dc163d7d9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bdc8e8a85 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13630925
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib1fffd44bc89382d6d0e4201012f46219f241c47
2021-02-20 00:28:43 +00:00
TreeHugger Robot
9bdc8e8a85
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-02-20 00:15:34 +00:00
Ram Muthiah
0b9cdf2aa3
Merge "Remove display tests from presubmit." into sc-dev am: 4f7e0ecd17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13628786
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7faffe2ff4531304de2d17a4964f27cf53c5bac1
2021-02-20 00:13:05 +00:00
Makoto Onuki
4e9f3452b0
Merge "Add a missing NULL check for postActivityStartTokenRemoval()" am: 5fea1d9a01 am: 1c691ff753 am: a4e94c8b2c am: 8d7caa8afa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593831
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2cffe6ed4625abb559180b8aadc634dc809cd525
2021-02-20 00:11:53 +00:00
Ram Muthiah
4f7e0ecd17
Merge "Remove display tests from presubmit." into sc-dev
2021-02-19 23:47:22 +00:00
Makoto Onuki
8d7caa8afa
Merge "Add a missing NULL check for postActivityStartTokenRemoval()" am: 5fea1d9a01 am: 1c691ff753 am: a4e94c8b2c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593831
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac0f9a52b6a36657845b289df3a254b870d287cc
2021-02-19 23:38:48 +00:00
bquezada
2be8baec1f
Add sensor for flip to screen off. See go/flip-to-screen-off-design-doc for design details.
...
Test: atest FaceDownDetectorTest & Tested with local device.
Bug: 164517126
Bug: 169780171
Change-Id: I7bc634a0ce4b4ae56e017e8cde127cd9c722e0eb
2021-02-19 23:32:28 +00:00
Chloris Kuo
e7fdc59600
Merge "NAS Feedback API Change" into sc-dev am: f8cc3c16d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13563511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1820ffeb35b0865d54b6434ddb3c83384067b176
2021-02-19 23:18:34 +00:00
Winson
33710636a8
Only run domain verification filtering for valid Intents
...
Re-adds the BROWSABLE+DEFAULT check, which got dropped before. The
no-intent-picker change only applies to Intents with those categories.
Bug: 180662982
Test: manual, am start
Change-Id: I05aa5b0ba75498f304a25025ee9aed687631381f
2021-02-19 15:13:26 -08:00
Makoto Onuki
a4e94c8b2c
Merge "Add a missing NULL check for postActivityStartTokenRemoval()" am: 5fea1d9a01 am: 1c691ff753
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593831
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib5ce8805a0d414a60958a83978dca5ce2598dd64
2021-02-19 22:59:57 +00:00
Michael Wright
83877eb559
Remove display tests from presubmit.
...
They seem to be leaving the system in a bad state, eventually resulting
in an OOM / allocation failure due to fragmentation.
Bug: 180636644
Test: atest services/tests/servicestests/src/com/android/server/display/
Change-Id: Iead04a9a6a8569648f1c63a66446e3c60fd38739
2021-02-19 22:43:18 +00:00