Paul Hu
5e62891a8a
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 18a60acfdf am: 9bd19b3127
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad6f9e6cabc5f7eccd0aad020b398950f0495703
2021-03-03 02:17:02 +00:00
Paul Hu
9bd19b3127
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 18a60acfdf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ad8f2d923e9415460c02002750a3766978272a6
2021-03-03 01:34:48 +00:00
Sandy Alfaro Lopez
aee4bb286f
Merge "DO NOT MERGE Allow the Car Setup Wizard appl to send CAR_INFORMATION notifications" into rvc-qpr-dev am: fb715d8c5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13496867
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1e5bdec358b4346c4919cb0e5d3363d8cc4dbb3
2021-03-03 01:34:28 +00:00
Sandra Alfaro
8b1706a7aa
DO NOT MERGE Allow the Car Setup Wizard appl to send CAR_INFORMATION notifications am: f9574845a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13496867
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c72f632fc3cb890b468893d7d6d4cb7f12931d0
2021-03-03 01:34:16 +00:00
Paul Hu
18a60acfdf
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS"
2021-03-03 01:07:20 +00:00
Sandy Alfaro Lopez
fb715d8c5c
Merge "DO NOT MERGE Allow the Car Setup Wizard appl to send CAR_INFORMATION notifications" into rvc-qpr-dev
2021-03-03 01:04:25 +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
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
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
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
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
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
Tyler Gunn
c90335033b
Merge "CallDiagnosticService API"
2021-03-02 21:33:02 +00:00
Jayachandran C
82984a8ca1
Add QoS filter matching and unit tests
...
Bug: 158315614
Test: atest com.android.internal.telephony.dataconnection.QosCallbackTrackerTest
Merged-In: I7d6d66eba5612182703826b60b4d735230572eea
Change-Id: I7d6d66eba5612182703826b60b4d735230572eea
2021-03-02 13:31:26 -08:00
Hui Wang
7f0e4d9f78
Merge "Notify rcs config as needed when RCS service ready" am: a340c35a86 am: 18fb42d639
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612066
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7ec6a9aaf0fae912be8819fb2e0b522a127ca18
2021-03-02 21:30:58 +00:00
Hui Wang
30ec6207cf
Merge "Support telephoy command to set test mode for RCS single registration" am: 3727cc1834 am: aa4c7d0fe5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612065
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifcfba0585ecdf76f99946b86b6b5b96ecae82456
2021-03-02 21:30:54 +00:00
Jeff Sharkey
c22eeb41a8
Merge "Add to owners" am: 41a4f1e44c am: a9a58d94a1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611655
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic05c353ed894e4deb1257b81486cb56c2aa36057
2021-03-02 21:30:17 +00:00
Treehugger Robot
5dd48a49e9
Merge "add to owners" am: 61ff46fee0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608275
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0b93635dc39b5774d2f7bffec5faf0d2219d46ac
2021-03-02 21:30:07 +00:00
Sally Yuen
e1921f4164
Merge "Add OWNERS for A11yInteractionController and accessibility core tests" am: d379746bb9 am: 26d1ed8f94
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612071
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29123baf9066c7e023ecd8e832a83e7f576ecc79
2021-03-02 21:30:01 +00:00
Yan Yan
2b5329cf52
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: 8c7f74fa35 am: d57ace3aa4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ab124e454f007c0330de636bc9e8b2729fcf4dd
2021-03-02 21:29:39 +00:00
Jeff Sharkey
bf44fe48e6
Merge "Create new directory to move ServiceWatcher into" am: b0a8269167 am: 11e82fe9a8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612759
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I874e77fd67c9b9362659b4e71801792ce09bf5e3
2021-03-02 21:29:18 +00:00
Hall Liu
dee1a5ad8c
Expose ApnSetting#TYPE_*_STRING constants
...
Expose these string representations of APN types as SystemApi, and add
utility methods to convert between these and their integer equivalents.
Fixes: 173133122
Test: atest ApnSettingTest TelephonyRegistryTest
Change-Id: I8095ebc4f766be52042eec1c8ee043bf2e2dabfb
Merged-In: I8095ebc4f766be52042eec1c8ee043bf2e2dabfb
2021-03-02 13:25:47 -08:00
Hui Wang
18fb42d639
Merge "Notify rcs config as needed when RCS service ready" am: a340c35a86
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612066
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I86cc208bb12d6d40876d06553f8a70200e8d9fac
2021-03-02 21:23:28 +00:00
Hui Wang
aa4c7d0fe5
Merge "Support telephoy command to set test mode for RCS single registration" am: 3727cc1834
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612065
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I305fa30ce15217ac7f858051a2aacc1b71fd174b
2021-03-02 21:20:08 +00:00
Jeff Sharkey
a9a58d94a1
Merge "Add to owners" am: 41a4f1e44c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611655
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf6cc33ebc09f4640afbc3ffe169a40ba8eea71f
2021-03-02 21:16:00 +00:00
Sandra Alfaro
f9574845a6
DO NOT MERGE Allow the Car Setup Wizard appl to send CAR_INFORMATION notifications
...
Bug: 171739119
Test: atest NotificationManagerServiceTest NotificationManagerTest
Change-Id: I3a7eb3197e3bc1d239b87c0f50a7db3e8b17d63b
2021-03-02 13:13:51 -08:00
Sally Yuen
26d1ed8f94
Merge "Add OWNERS for A11yInteractionController and accessibility core tests" am: d379746bb9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612071
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I25e4fc3280c382440aefbbcb4981a0e5faa18017
2021-03-02 21:13:09 +00:00
Yan Yan
d57ace3aa4
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: 8c7f74fa35
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic9cc8508fb44e10371bc76bb31f20340f8663b18
2021-03-02 21:08:15 +00:00
Abhijeet Kaur
9ca2676072
[automerger skipped] Merge "Removed unused mount mode constants" am: 14f35d5f2d am: b68c51d4c4 -s ours
...
am skip reason: Change-Id I62b66083f2099b429474872b6f9c7cffb9fb906d with SHA-1 6d5527d540 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id54fb43e7cc13a428a9e1d96f053b2104da60fd1
2021-03-02 21:05:50 +00:00
Treehugger Robot
343ddc51b9
Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 4dd42cdd5f am: 8203ac16dc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib59b32356b55200798c5e8c6f85174049b99770c
2021-03-02 21:05:36 +00:00
Treehugger Robot
5f95c2d8a9
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: 60faefffe9 am: 0e300026f9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5a804c1011080df3b09b01930817b5d0c46cef4a
2021-03-02 21:05:02 +00:00
Jeff Sharkey
11e82fe9a8
Merge "Create new directory to move ServiceWatcher into" am: b0a8269167
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612759
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If55a943fad67c1fff22669473e5ea2279d0a1d7e
2021-03-02 21:03:10 +00:00
Abhijeet Kaur
b68c51d4c4
Merge "Removed unused mount mode constants" am: 14f35d5f2d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I80d0c585e742f33ce90fac787f54b5c0903f070f
2021-03-02 20:59:46 +00:00
Treehugger Robot
8203ac16dc
Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 4dd42cdd5f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8eb6681328ad1f4a85bcc8c6c4b9446c23616b7a
2021-03-02 20:52:02 +00:00
Treehugger Robot
0e300026f9
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: 60faefffe9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b19538843007e38e170163120f38477e4b76be8
2021-03-02 20:47:52 +00:00
Remi NGUYEN VAN
e268e877c6
Merge "Move OemNetworkPreferences aidl to connectivity" am: 2e03331755 am: 1762e31642
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91bc4b0463d092f59c3e5d2e59bc4704c336a710
2021-03-02 20:44:00 +00:00