Automerger Merge Worker
b016c57ff3
Merge "When SPN is empty, use PNN in mobile network settings" into qt-qpr1-dev am: eae359df70
...
Change-Id: Ifaa2300cfd755979211847c4c4042c1127d2b708
2019-12-07 03:12:13 +00:00
Jordan Liu
236ae68a79
Merge "Expose some SystemApis and edit framework-cellbroadcast-shared-srcs" am: 9fd7c05eb9
...
am: 6824b2d6ed
2019-12-06 16:19:46 -08:00
Jordan Liu
9fd7c05eb9
Merge "Expose some SystemApis and edit framework-cellbroadcast-shared-srcs"
2019-12-07 00:06:23 +00:00
Jack Yu
9d95aff922
When SPN is empty, use PNN in mobile network settings
...
Added one more name source 'PNN', which has priority
higher than carrier id but lower than EF_SPN.
Bug: 143493866
Test: Manual
Change-Id: I2ef14204d0db018e7f67578a57e56fdbea8b698c
2019-12-06 15:28:30 -08:00
Meng Wang
405e5f3c15
Merge "SubscriptionPlan: move out of telephony" am: c4090312df
...
am: 3172db5841
2019-12-06 15:22:54 -08:00
Treehugger Robot
c4090312df
Merge "SubscriptionPlan: move out of telephony"
2019-12-06 23:12:58 +00:00
Shuo Qian
347e67e1a9
Merge "Make getPackagesWithPriviligesForAllActiveSubscriptions system API" am: 0024076b1a
...
am: bf43ca5c69
2019-12-06 14:17:17 -08:00
Shuo Qian
0024076b1a
Merge "Make getPackagesWithPriviligesForAllActiveSubscriptions system API"
2019-12-06 22:01:17 +00:00
Meng Wang
088c61aaf4
Merge "SubscriptionPlan: move out of telephony" am: a11df59bb4
...
am: 968927d7ff
2019-12-06 13:52:01 -08:00
Meng Wang
1ba2871a02
SubscriptionPlan: move out of telephony
...
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.
Bug: 145814152
Test: make
Change-Id: I3bfb0ec699f46b0cc34c3bc2e13bfb242bc295bf
2019-12-06 13:50:15 -08:00
Meng Wang
a11df59bb4
Merge "SubscriptionPlan: move out of telephony"
2019-12-06 21:37:52 +00:00
sqian
22f5749ccc
Make getPackagesWithPriviligesForAllActiveSubscriptions system API
...
Test: build
Bug: 145550382
Change-Id: Ia7efb9e4b22b24f3c87c7cd631548c7254b28926
Merged-In: Ia7efb9e4b22b24f3c87c7cd631548c7254b28926
(cherry picked from commit 6f27c5769d
2019-12-06 12:07:57 -08:00
Meng Wang
36673a4b44
SubscriptionPlan: move out of telephony
...
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.
Bug: 145814152
Test: make
Change-Id: I4c7ae02f9f4f154c99263521e08265d6fb367272
2019-12-06 11:47:46 -08:00
Jordan Liu
bf68dc85a4
Expose some SystemApis and edit framework-cellbroadcast-shared-srcs
...
The APIs are used in the CellBroadcastService, and the
framework-cellbroadcast-shared-srcs library is also linked there.
Bug: 135956699
Test: manual
Change-Id: I5e71ea1ee1a858c0520c241dc7365733441e0f50
Merged-In: I5e71ea1ee1a858c0520c241dc7365733441e0f50
2019-12-06 11:19:48 -08:00
Meng Wang
d32f3a1db3
Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" am: 392f3db6b0
...
am: 484b1b87e0
2019-12-05 17:20:49 -08:00
Meng Wang
392f3db6b0
Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager"
2019-12-06 00:32:40 +00:00
Meng Wang
cb7a8f3245
Merge "Move DataConnectionRealTimeInfo from telephony to core." am: 037b717fe8
...
am: d973a4b22c
2019-12-05 15:55:27 -08:00
Meng Wang
037b717fe8
Merge "Move DataConnectionRealTimeInfo from telephony to core."
2019-12-05 23:43:06 +00:00
Sarah Chin
47eee1eb10
Merge changes from topics "ngran", "update_ngran" am: 226499214c
...
am: 1cf53ac4c3
2019-12-05 13:55:37 -08:00
Sarah Chin
350bde0e7a
Updated AccessNetworkConstants and RadioAccessSpecifier am: e138c5e412
...
am: b77ce1b7ba
2019-12-05 13:55:30 -08:00
Sarah Chin
b77ce1b7ba
Updated AccessNetworkConstants and RadioAccessSpecifier
...
am: e138c5e412
2019-12-05 13:48:27 -08:00
Sarah Chin
226499214c
Merge changes from topics "ngran", "update_ngran"
...
* changes:
Update NGRAN bands
Updated AccessNetworkConstants and RadioAccessSpecifier
2019-12-05 21:37:37 +00:00
Meng Wang
62d2ff8b36
Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager
...
Because the constants are only used by TelephonyRegistryManager and
TelephonyRegistry.
Bug: 140908357
Test: make
Change-Id: I6933d1aa5b8dc35f136c8c4aed8572221ddfb755
2019-12-05 21:32:03 +00:00
Meng Wang
fdf6fc2718
Move DataConnectionRealTimeInfo from telephony to core.
...
Bug: 145232482
Test: make
Change-Id: I11cce938c15c604d0a72dd5c11727afd63cfce31
2019-12-04 17:51:42 -08:00
Allen Su
f64a2dd67b
Merge "Define EXTRA_AUDIO_CODEC_TYPE in Connection" am: d154c93041
...
am: 5cc86edf81
2019-12-04 17:47:28 -08:00
Allen Su
d154c93041
Merge "Define EXTRA_AUDIO_CODEC_TYPE in Connection"
2019-12-05 01:32:21 +00:00
Hall Liu
fb289a0e67
Merge "Deprecate KEY_IGNORE_RTT_MODE_SETTING_BOOL" am: c6ec27d2d4
...
am: a7d6573987
2019-12-04 17:29:43 -08:00
Hall Liu
c6ec27d2d4
Merge "Deprecate KEY_IGNORE_RTT_MODE_SETTING_BOOL"
2019-12-05 01:19:26 +00:00
Peter Wang
cead28dcee
Merge "[Telephony Mainline] Expose hidden APIs and consts" am: 415143daf5
...
am: cfffdedc87
2019-12-04 15:55:20 -08:00
Peter Wang
415143daf5
Merge "[Telephony Mainline] Expose hidden APIs and consts"
2019-12-04 23:39:50 +00:00
Shuo Qian
5202828d3c
Merge "Move TelephonyPermissions to TelephonyCommon" am: c5f12f75e6
...
am: b00ee2e7fe
2019-12-04 13:35:14 -08:00
Sarah Chin
445568fc62
Update NGRAN bands
...
Test: build
Bug: 143683654
Change-Id: I4b83b244caa9a168d1afbc99a32ae84bc41346d1
Merged-In: I4b83b244caa9a168d1afbc99a32ae84bc41346d1
2019-12-04 13:13:40 -08:00
Shuo Qian
caf7ef3de8
Move TelephonyPermissions to TelephonyCommon
...
Test: built
Bug: 145554073
Change-Id: I3681043a197e6daeb16dcf506d672bdcf1fc8da8
Merged-In: I3681043a197e6daeb16dcf506d672bdcf1fc8da8
(cherry picked from commit fde53bb6f1
2019-12-04 12:25:05 -08:00
Xiangyu/Malcolm Chen
603d7e7d89
Merge "Add System API to indicate whether physical SIM can be disabled." am: 454c0659a6
...
am: 0b2531862f
2019-12-04 11:48:20 -08:00
Xiangyu/Malcolm Chen
454c0659a6
Merge "Add System API to indicate whether physical SIM can be disabled."
2019-12-04 19:26:51 +00:00
Jack Yu
b496fd8765
Merge "Added sub id to SmsCbMessage" am: 258e925cd6
...
am: 35132f9a21
2019-12-04 09:47:53 -08:00
Jack Yu
258e925cd6
Merge "Added sub id to SmsCbMessage"
2019-12-04 17:34:01 +00:00
Sooraj Sasindran
64f5f52962
Merge changes Idf152091,I131f7aff am: 6e2ecfeede
...
am: b2027040ca
2019-12-04 08:48:13 -08:00
Shi Lu
4e2bae5228
Merge "Need to publish ImsReasonInfo as public API for multiple cases." am: 5957013f74
...
am: e04ec42133
2019-12-04 07:46:54 -08:00
allenwtsu
2aca989255
Define EXTRA_AUDIO_CODEC_TYPE in Connection
...
Bug: 143576354
Test: By manual
Change-Id: Ib8e701632676cfbe9993f1de2b58546f59ba580f
2019-12-04 15:21:19 +08:00
Sooraj Sasindran
6e2ecfeede
Merge changes Idf152091,I131f7aff
...
* changes:
Make hidden subscription apis as system
Do not use hidden withCleanCallingIdentity
2019-12-04 00:41:42 +00:00
Treehugger Robot
2b65793cd6
Merge "Merge Android10 QPR1 into AOSP master"
2019-12-03 23:15:02 +00:00
Shi Lu
e04ec42133
Merge "Need to publish ImsReasonInfo as public API for multiple cases."
...
am: 5957013f74
2019-12-03 14:07:36 -08:00
Jack Yu
29dfebb84c
Added sub id to SmsCbMessage
...
Added a new field subscription id to SMS
cell broadcast message.
This is the preliminary step of deprecating
CellBroadcastMessage class.
Bug: 144891074
Test: Manual
Merged-In: I23f61e77f6a9a16ce77f7892ba96fd7485c555a4
Change-Id: I23f61e77f6a9a16ce77f7892ba96fd7485c555a4
(cherry picked from commit 750b8b1972
2019-12-03 11:43:59 -08:00
Peter Wang
98598bfe16
[Telephony Mainline] Expose hidden APIs and consts
...
Exposing constants that were originally hidden
Test: build
Bug: 140908357
Change-Id: I12b8d338a58c0ffe294137171b8bac7d80a0b776
Merged-In: I12b8d338a58c0ffe294137171b8bac7d80a0b776
2019-12-03 19:12:47 +00:00
shilu
c8f41a59e9
Need to publish ImsReasonInfo as public API for multiple cases.
...
Bug:141928367
Bug:143879961
Test: manual
Change-Id: I3ceac51b62a4686ac719ea15dff782db4109654b
2019-12-03 19:09:17 +00:00
Sarah Chin
e138c5e412
Updated AccessNetworkConstants and RadioAccessSpecifier
...
Bug: 143683654
Test: atest RadioAccessSpecifierTest
Change-Id: I307c8d09483e37d805cbfd17780523040abc9e4b
Merged-In: I307c8d09483e37d805cbfd17780523040abc9e4b
2019-12-03 11:06:58 -08:00
Sooraj Sasindran
e5ac4da10c
Make hidden subscription apis as system
...
Make following APIs as system
SubscriptionInfo;->isGroupDisabled
TelephonyManager;->isModemEnabledForSlot
TelephonyManager;->setOpportunisticNetworkState
Add a new public API
SubscriptionManager;->getActiveAndHiddenSubscriptionInfoList
As they need to be accessed by system application to configure
the opportunistic subscripion info
Bug: 141122805
Test: verified that CBRS app is still working fine
Merged-In: Idf1520911272ba4b7c1f15671d6221d99ba0ab37
Change-Id: Idf1520911272ba4b7c1f15671d6221d99ba0ab37
2019-12-03 11:06:46 -08:00
Sooraj Sasindran
e6a2c0a4d3
Do not use hidden withCleanCallingIdentity
...
Do not use hidden withCleanCallingIdentity API
Bug: 140908357
Test: make
Merged-In: I131f7affd811eb7a848ea230b332b53654e6fd43
Change-Id: I131f7affd811eb7a848ea230b332b53654e6fd43
2019-12-03 11:05:05 -08:00
Jayachandran Chinnakkannu
724e258f1a
Merge "Remove usage of ITelecomService.getCallState() hidden API" am: b93721efc7
...
am: 3959d1affc
2019-12-02 13:48:22 -08:00
