Lucas Dupin
4973cb868b
Merge "Limit how often wallpapers can update system theme" into sc-dev
2021-03-03 01:32:20 +00:00
Calvin Pan
c74f9c2637
Merge "Add new provisioning flag for VOIMS opt-in" into sc-dev
2021-03-03 01:18:59 +00:00
Joanne Chung
81db998fb3
Merge "Update UiTranslationManager APIs to use contentcapture token parameter" into sc-dev
2021-03-03 01:09:10 +00:00
TreeHugger Robot
a5d255e395
Merge "transcoding: Tweak the Java doc with Android link" into sc-dev
2021-03-03 00:54:37 +00:00
TreeHugger Robot
103d174741
Merge "Add new flag to respect statusbar insets" into sc-dev
2021-03-03 00:42:59 +00:00
Ytai Ben-tsvi
a6ee865334
Merge "Reduce STHAL watchdog timeout to 3 seconds" into sc-dev
2021-03-03 00:32:55 +00:00
Hall Liu
b19952ce3d
[automerger skipped] Merge "Expose ApnSetting#TYPE_*_STRING constants" am: bff8389872 am: 04e788bebd am: e364276b90 -s ours
...
am skip reason: Change-Id I8095ebc4f766be52042eec1c8ee043bf2e2dabfb with SHA-1 d6c3f66329 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1610923
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib841f31fc1c0a0113db068a9cd71621b274c4cda
2021-03-03 00:22:29 +00:00
Hall Liu
54d4ac8d8a
[automerger skipped] Merge "Expose the carrier signaling broadcasts" am: b8cc532986 am: 05bc834ddc am: 4a264df43b -s ours
...
am skip reason: Change-Id I15d032ee1e31d9be847c2f084161f8555c8172c1 with SHA-1 16359f3869 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613539
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1bf28d4a7591dcfe92d637b482d3887379085793
2021-03-03 00:20:29 +00:00
Automerger Merge Worker
9ea0213283
[automerger skipped] Merge "Merge "Add QoS filter matching and unit tests" am: 1e8b0527b5 am: 8625aaea0f" into rvc-qpr-dev-plus-aosp am: d3f54fcc89 -s ours
...
am skip reason: Change-Id I7d6d66eba5612182703826b60b4d735230572eea with SHA-1 9fef221914 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1610961
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c56e454bde81380a9dbbc4e8fe32fc1baae4d6a
2021-03-03 00:20:08 +00:00
Patrick Baumann
cb602d7d3d
Merge "Adds caller check to getAllPackages()" into rvc-qpr-dev am: ec4ba204d8 am: 2d55bda434
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13617976
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I960a7a74dbe373833e60ecddbf25be2885f63564
2021-03-03 00:18:42 +00:00
TreeHugger Robot
6efc0207a2
Merge "Fix the shorcuts deletion issue in ShortcutService" into sc-dev
2021-03-03 00:18:02 +00:00
TreeHugger Robot
cd28f9ae2b
Merge "Clean up LogicalDisplayMapper" into sc-dev
2021-03-03 00:17:51 +00:00
Tyler Gunn
4b033d7316
Merge "CallDiagnosticService API" am: c90335033b am: 9882ff4bf8 am: d3bf1aa209
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607109
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie91efc29698d27946f83b751bef2fe89d612c9a2
2021-03-03 00:16:56 +00:00
Hall Liu
e364276b90
Merge "Expose ApnSetting#TYPE_*_STRING constants" am: bff8389872 am: 04e788bebd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1610923
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I519807c3b0ac093ffa6fec23cc07b48fb9ef1d36
2021-03-02 23:54:22 +00:00
Hall Liu
4a264df43b
Merge "Expose the carrier signaling broadcasts" am: b8cc532986 am: 05bc834ddc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613539
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If0dac083de7bd88455e5090d85b3761b1952aa0c
2021-03-02 23:52:41 +00:00
Automerger Merge Worker
d3f54fcc89
Merge "Merge "Add QoS filter matching and unit tests" am: 1e8b0527b5 am: 8625aaea0f" into rvc-qpr-dev-plus-aosp
2021-03-02 23:52:18 +00:00
Treehugger Robot
18a1ef423e
Merge "Add QoS filter matching and unit tests" am: 1e8b0527b5 am: 8625aaea0f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1610961
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d25d91a30ba9d0b38f2c77ea175a765b6a14eee
2021-03-02 23:52:11 +00:00
Patrick Baumann
2d55bda434
Merge "Adds caller check to getAllPackages()" into rvc-qpr-dev am: ec4ba204d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13617976
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iceb77ee1f663833202421151654151893b68ea72
2021-03-02 23:51:52 +00:00
Hall Liu
04e788bebd
Merge "Expose ApnSetting#TYPE_*_STRING constants" am: bff8389872
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1610923
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I80c60ba6cc1190da2d7283fcc49f6781337329d0
2021-03-02 23:44:44 +00:00
Winson Chung
e6e1ab1571
Merge "Move PipTouchHandler initialization to shell main thread" into sc-dev
2021-03-02 23:30:30 +00:00
Hall Liu
05bc834ddc
Merge "Expose the carrier signaling broadcasts" am: b8cc532986
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613539
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47655f8768310e556eee10066220d24f02cfb70b
2021-03-02 23:29:42 +00:00
Jayachandran Chinnakkannu
2cdad9f0a2
Add new provisioning flag for VOIMS opt-in
...
Bug: 177009570
Test: By Manual
1. Call setProvisioningIntValue() and getProvisioningIntValue()
2. Enable/disable the value and dial a VoLTE call
2-1. Set value to 1
2-2. Dial a call
2-3. From ImsPhoneCallTracker and GsmCdmaPhone's log, VoLTE is
registered and device is trying IMS PS call
2-4. Set value to 0
2-5. Dial a call
2-6. From ImsPhoneCallTracker and GsmCdmaPhone's log, VoLTE is
unregistered and device is trying (non-IMS) CS call
3. atest
Change-Id: I0b8af8fe6c9a34a56f9e2275df0a03ba093f439e
Merged-In: I0b8af8fe6c9a34a56f9e2275df0a03ba093f439e
2021-03-02 23:26:40 +00:00
Tyler Gunn
d3bf1aa209
Merge "CallDiagnosticService API" am: c90335033b am: 9882ff4bf8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607109
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If7de00877b77e4594c05eb6e4fd2ff8f0318bad5
2021-03-02 23:23:06 +00:00
Hall Liu
bff8389872
Merge "Expose ApnSetting#TYPE_*_STRING constants"
2021-03-02 23:20:15 +00:00
Treehugger Robot
8625aaea0f
Merge "Add QoS filter matching and unit tests" am: 1e8b0527b5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1610961
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icb205b790346fdd2706f1ee7427c4b4e76321552
2021-03-02 23:19:34 +00:00
Patrick Baumann
ec4ba204d8
Merge "Adds caller check to getAllPackages()" into rvc-qpr-dev
2021-03-02 23:10:45 +00:00
Hui Yu
3b65c4831f
Merge "Better grouping and documentation of BG-FGS-launch reason code." into sc-dev
2021-03-02 23:04:28 +00:00
Songchun Fan
d011cf614e
Merge "[pm/incremental] minor fix for unbind timing" into sc-dev
2021-03-02 22:55:06 +00:00
Hall Liu
b8cc532986
Merge "Expose the carrier signaling broadcasts"
2021-03-02 22:54:18 +00:00
Treehugger Robot
1e8b0527b5
Merge "Add QoS filter matching and unit tests"
2021-03-02 22:39:09 +00:00
Andy Hung
e012a2f092
[automerger skipped] Merge "AudioTrack: Add TunerConfiguration.CONTENT_ID_NONE" am: 1e21d8530b am: caff316b8a am: 1745c7a139 -s ours
...
am skip reason: Change-Id I679c809ee8834c5a608243c353bc3a76ec55243c with SHA-1 0ac9fb2ec7 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611744
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibcf7daab17393cc46133bc316ba3a449aa46b741
2021-03-02 22:33:42 +00:00
Evan Severson
33792c94ea
Merge "Update permissions OWNERS files" am: 391145ab85 am: d35d84c8fc am: 69abbcb203
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d0c9e41b15a62c547df2ca1fb2bca37c5ab7d43
2021-03-02 22:32:49 +00:00
Winson Chung
8232386d0b
Merge "Only use nearest touch frame for button nav" into sc-dev
2021-03-02 22:23:17 +00:00
Treehugger Robot
9103d8f406
Merge "add to owners" am: 61ff46fee0 am: 5dd48a49e9 am: 1dbc2e2a26
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608275
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I34eeebfa0d4e79f1b39522e8e3520fededd83501
2021-03-02 22:13:56 +00:00
Tyler Gunn
9882ff4bf8
Merge "CallDiagnosticService API" am: c90335033b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607109
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2958205678f4340e96ce6e845718e994a0231afc
2021-03-02 22:11:20 +00:00
TreeHugger Robot
3dd7039e73
Merge "Set size compat UI to max layer" into sc-dev
2021-03-02 22:09:30 +00:00
TreeHugger Robot
1a852b8969
Merge "Respect previously resolved size if layout has no size value" into sc-dev
2021-03-02 22:02:39 +00:00
TreeHugger Robot
ad44b3ceaa
Merge "Add return value annotation to getSoundTriggerMode" into sc-dev
2021-03-02 21:59:09 +00:00
Andy Hung
1745c7a139
Merge "AudioTrack: Add TunerConfiguration.CONTENT_ID_NONE" am: 1e21d8530b am: caff316b8a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611744
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If37551ac828719644d860555098d9e8354be04ee
2021-03-02 21:51:36 +00:00
Evan Severson
69abbcb203
Merge "Update permissions OWNERS files" am: 391145ab85 am: d35d84c8fc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5c35ddb5368616f4fc2932d305d8ff851ddea8a1
2021-03-02 21:51:14 +00:00
Treehugger Robot
1dbc2e2a26
Merge "add to owners" am: 61ff46fee0 am: 5dd48a49e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608275
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4514a050efe137142691167a2dba099492bbc93
2021-03-02 21:50:33 +00:00
Andy Hung
caff316b8a
Merge "AudioTrack: Add TunerConfiguration.CONTENT_ID_NONE" am: 1e21d8530b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611744
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6df3daaaf31834d5d9eb2084a46f1d9576761be4
2021-03-02 21:45:38 +00:00
Evan Severson
d35d84c8fc
Merge "Update permissions OWNERS files" am: 391145ab85
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I99f1eefce42cc8717be7c9834b685e53dec813ce
2021-03-02 21:40:58 +00:00
Hall Liu
39087a439e
Expose the carrier signaling broadcasts
...
Expose broadcasts for communicating certain changes in state between
Telephony and carrier apps.
Implement a backward-compatibility layer to support carrier apps
targeting <=R that are listening to the old hidden broadcasts.
Fixes: 173050428
Test: atest CarrierSignalTest CarrierSignalAgentTest
Change-Id: I15d032ee1e31d9be847c2f084161f8555c8172c1
Merged-In: I15d032ee1e31d9be847c2f084161f8555c8172c1
2021-03-02 13:38:53 -08:00
Hui Wang
99abec3d81
[automerger skipped] Merge "Notify rcs config as needed when RCS service ready" am: a340c35a86 am: 18fb42d639 am: 7f0e4d9f78 -s ours
...
am skip reason: Change-Id I859a9b6bd439cca01aeed8448f684e17cb80d397 with SHA-1 e4331c3492 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612066
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I70d0c3b5567299140f28e5d0b71ce32634af4afc
2021-03-02 21:37:29 +00:00
Hui Wang
2d23ea77b8
[automerger skipped] Merge "Support telephoy command to set test mode for RCS single registration" am: 3727cc1834 am: aa4c7d0fe5 am: 30ec6207cf -s ours
...
am skip reason: Change-Id Id34c212e536b47c61bc1939ef056905fc26b4df2 with SHA-1 f4e393fbdc is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612065
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia231ac90dfdecbdc7295ce0575d86c282f1ee508
2021-03-02 21:37:17 +00:00
Jeff Sharkey
31c33020fd
Merge "Add to owners" am: 41a4f1e44c am: a9a58d94a1 am: c22eeb41a8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611655
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0aace3e9d38d7b0ef8e5ce5a4586bffdaa7fe22
2021-03-02 21:36:44 +00:00
Sally Yuen
2f5d064577
Merge "Add OWNERS for A11yInteractionController and accessibility core tests" am: d379746bb9 am: 26d1ed8f94 am: e1921f4164
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612071
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5af7ce3223044c11f96e5d8a82af1969c8309c36
2021-03-02 21:36:21 +00:00
Yan Yan
b461146ffb
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: 8c7f74fa35 am: d57ace3aa4 am: 2b5329cf52
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2477f98c4aeaa6059944a204cc14db5b6fb5fc63
2021-03-02 21:35:55 +00:00
Jeff Sharkey
9ac36e4245
Merge "Create new directory to move ServiceWatcher into" am: b0a8269167 am: 11e82fe9a8 am: bf44fe48e6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612759
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia8e427051adeb6e0beada35189192960c8ed1f82
2021-03-02 21:35:27 +00:00