Commit Graph

7457 Commits

Author SHA1 Message Date
Automerger Merge Worker
3e89b5faac use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs am: 125e446c18 am: d65fff9418
Change-Id: Iebb765ba462c5327e3950d5ed99978f583ca3e99
2019-12-14 06:21:39 +00:00
Automerger Merge Worker
8b5ab0fce2 Merge changes I5c5c4eb3,I36712447,I5b78d449 am: fd5241f120 am: 2d5bf0b845
Change-Id: I02040c779e3537d02389a7c6408761122dcad284
2019-12-14 06:19:49 +00:00
Chen Xu
d65fff9418 use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs
am: 125e446c18

Change-Id: If49ebee7c6bec81559641096482d82cce0515148
2019-12-13 22:08:45 -08:00
Jack Yu
fd5241f120 Merge changes I5c5c4eb3,I36712447,I5b78d449
* changes:
  Throw illegal argument exception when slot index is invalid
  Code clean up
  Improved debug message
2019-12-14 04:15:39 +00:00
Chen Xu
125e446c18 use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs
Bug: 135956699
Test: unit test
Change-Id: Id631875ba6639ebf4fa569696a982c49d9c93e8f
(cherry picked from commit dd79281f97)
Merged-in: Id631875ba6639ebf4fa569696a982c49d9c93e8f
2019-12-13 16:48:29 -08:00
Automerger Merge Worker
619bf038e3 Merge "Remove "import JobService" to remove build time dependency" am: ac335868bf am: 848155a0fb
Change-Id: Icff1d6211fbbe2a511aac937a6765a678419ebed
2019-12-14 00:24:08 +00:00
Automerger Merge Worker
8133ad5ee3 Merge "Allow addSubscriptionsIntoGroup with grouUuid that isn't assigned." am: c937749b18 am: 4643b919cd
Change-Id: I098ea6ecf3af00503b6f82f35b1044762222b1f7
2019-12-13 23:54:11 +00:00
Treehugger Robot
ac335868bf Merge "Remove "import JobService" to remove build time dependency" 2019-12-13 23:51:39 +00:00
Xiangyu/Malcolm Chen
c937749b18 Merge "Allow addSubscriptionsIntoGroup with grouUuid that isn't assigned." 2019-12-13 23:43:50 +00:00
Jack Yu
5def2c6004 Throw illegal argument exception when slot index is invalid
Test: Manual
Bug: 144097779
Merged-In: I5c5c4eb313fd42317a2b0feed0946b8e4003ad62
Change-Id: I5c5c4eb313fd42317a2b0feed0946b8e4003ad62
(cherry picked from commit 0d75aee571)
2019-12-13 15:34:33 -08:00
Jack Yu
45811ecc85 Code clean up
Remove database version 1~11 support since the format hasn't changed
in the past 7 years.

Bug: 135956699
Test: Manual
Merged-In: I367124471f16073bb47a31c094d161d36969acc1
Change-Id: I367124471f16073bb47a31c094d161d36969acc1
(cherry picked from commit 21effc8643)
2019-12-13 15:34:01 -08:00
Jack Yu
35eed63424 Improved debug message
Printed out polygon information

Test: Manual
Merged-In: I5b78d4494418f07dd0a4340c7ef4bd1e499af536
Change-Id: I5b78d4494418f07dd0a4340c7ef4bd1e499af536
(cherry picked from commit 3b6b57b685)
2019-12-13 15:32:11 -08:00
Makoto Onuki
2da2629125 Remove "import JobService" to remove build time dependency
This is needed to move the jobscheduler classes to its own jar for
mainline.

Bug: 137763703
Test: Doc change only, presubmit
Merged-in: I117ffc23362a61923a9f93c1532ab582e2421402
(cherry-pick from I117ffc23362a61923a9f93c1532ab582e2421402)

Change-Id: I1b3fba3e90f4b3c943f44b63eeb776f5da973591
2019-12-13 13:56:36 -08:00
Jack Yu
39424f4b70 Merge "When SPN is empty, use PNN in mobile network settings" 2019-12-13 21:55:00 +00:00
Automerger Merge Worker
fd02e6e693 Merge "ServiceState merges voice and data into a single value" am: 72f579d5f2 am: 4b108f74f6
Change-Id: Ia68eb336d8b916cb93b83ba14b6423560f29a42d
2019-12-13 21:48:35 +00:00
Automerger Merge Worker
75332fe95e Merge "Expose ACTION_EMERGENCY_ASSISTANCE as SystemAPi" am: ba4eb1d6b4 am: 68a76f5c4c
Change-Id: I3953180c29faba0bcc14c4c3f6a56a7455ec3a47
2019-12-13 21:47:01 +00:00
SongFerng Wang
72f579d5f2 Merge "ServiceState merges voice and data into a single value" 2019-12-13 21:07:17 +00:00
Meng Wang
ba4eb1d6b4 Merge "Expose ACTION_EMERGENCY_ASSISTANCE as SystemAPi" 2019-12-13 21:00:21 +00:00
Jack Yu
5c6eb0e739 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

Merged-In: I2ef14204d0db018e7f67578a57e56fdbea8b698c
Change-Id: I2ef14204d0db018e7f67578a57e56fdbea8b698c
(cherry picked from commit 9d95aff922)
2019-12-13 11:12:21 -08:00
Automerger Merge Worker
3c2fdd6805 Merge "Do not get CM instance in getActiveModemCount unless needed." am: 31bbebe179 am: 94486daaa2
Change-Id: I5ceb9b78bd2afc146279e87128500c853be79278
2019-12-13 18:52:15 +00:00
Xiangyu/Malcolm Chen
31bbebe179 Merge "Do not get CM instance in getActiveModemCount unless needed." 2019-12-13 18:27:06 +00:00
Automerger Merge Worker
6e94d2cfbf Merge "Supplementary Services(SS) gray out when airplane mode on in Call Settings menu." am: 4b30f26d79 am: f91708e02d
Change-Id: I3dbc97a8fc87b2efa3a6a9b8afe1ab56e6a431b1
2019-12-13 03:42:24 +00:00
SongFerng Wang
4b30f26d79 Merge "Supplementary Services(SS) gray out when airplane mode on in Call Settings menu." 2019-12-13 03:19:59 +00:00
Automerger Merge Worker
2254697a3f Merge "Telephony: do not use hidden API ArrayUtils." am: c6b5fbaf17 am: e8f1598321
Change-Id: Iec49ae0db1aee5614957a32f6d0a8cf5374597d3
2019-12-13 02:26:53 +00:00
Malcolm Chen
710a09aac6 Allow addSubscriptionsIntoGroup with grouUuid that isn't assigned.
Bug: 133776718
Test: manual & unittest
Change-Id: I06b1e348e67d6283a482010d947bf749574d90f0
Merged-In: I06b1e348e67d6283a482010d947bf749574d90f0
2019-12-12 16:59:31 -08:00
Malcolm Chen
e54a3031c9 Do not get CM instance in getActiveModemCount unless needed.
TM#getActiveModemCount might be called before ConnectivityService is
initialized. So do not try to get ConnectivityService instance unless
it's needed (very rarely). Otherwise it will throw WTF exception.

Bug: 144373595
Test: sanity
Change-Id: I7a90ec45a0a3700a0c6852c505d68f438f26768c
Merged-In: I7a90ec45a0a3700a0c6852c505d68f438f26768c
2019-12-13 00:56:15 +00:00
Meng Wang
e1df98d2e2 Telephony: do not use hidden API ArrayUtils.
Make a local copy instead.

Bug: 137202333
Test: make
Merged-In: I3218bca2d296c548b9d8427f70df8f7a33d0d449
Change-Id: I3218bca2d296c548b9d8427f70df8f7a33d0d449
2019-12-12 16:52:30 -08:00
Automerger Merge Worker
675c99fbe4 Merge "Add APN type XCAP" am: 7c03a80247 am: d74193446c
Change-Id: Ie74716546ce86dc951e411bff829c1f842cfc51e
2019-12-12 23:39:01 +00:00
Sarah Chin
aefc64b0f2 Change defaults for FREQUENCY_RANGE and NR_STATE
Change value from -1 to 0 to match proto

Bug: 141323073
Test: atest TelephonyMetricsTest
Change-Id: I4509f22cdae656de3ad011de3a1664e27d35986a
Merged-In: I4509f22cdae656de3ad011de3a1664e27d35986a
(cherry picked from commit 65277dfec2)
2019-12-12 23:21:09 +00:00
Sarah Chin
7c03a80247 Merge "Add APN type XCAP" 2019-12-12 22:39:01 +00:00
Sarah Chin
9146586e64 Merge "Change defaults for FREQUENCY_RANGE and NR_STATE" 2019-12-12 22:09:24 +00:00
Sarah Chin
ded54498d3 Change defaults for FREQUENCY_RANGE and NR_STATE
Change value from -1 to 0 to match proto

Bug: 141323073
Test: atest TelephonyMetricsTest
Change-Id: I4509f22cdae656de3ad011de3a1664e27d35986a
Merged-In: I4509f22cdae656de3ad011de3a1664e27d35986a
2019-12-12 12:57:35 -08:00
Sarah Chin
66ebce9a50 Add APN type XCAP
Test: atest ApnSettingTest
Bug: 73792201
Change-Id: I662f743cca3c6b2f919d84cf0570f23a1f6d9791
Merged-In: I662f743cca3c6b2f919d84cf0570f23a1f6d9791
2019-12-12 11:55:47 -08:00
Hall Liu
06fc4257b7 Merge "Add ImsReasonInfo constant for retrying without RTT" 2019-12-12 19:29:37 +00:00
SongFerngWang
afd025f4ab ServiceState merges voice and data into a single value
The voice and data is the same for operator name at ServiceState.
So ServiceState merges voice and data into a single value.
- merge the voice and data OperatorAlphaLong,OperatorAlphaShort, and
OperatorNumeric.

Bug: 144663018
Test: Build pass.
      atest NetworkControllerDataTest (PASS)
      atest ServiceStateTest (PASS)
      atest TelephonyMetricsTest (PASS)
      atest ServiceStateProviderTest (PASS)

Change-Id: I67e4a822c792bf9a9e174146ef8d65d9927d7612
Merged-In: I67e4a822c792bf9a9e174146ef8d65d9927d7612
2019-12-12 22:10:04 +08:00
SongFerngWang
94e2f0c49b Supplementary Services(SS) gray out when airplane mode on in Call Settings menu.
add carrier config "KEY_DISABLE_SUPPLEMENTARY_SERVICES_IN_AIRPLANE_MODE_BOOL".

Bug: 141284019
Test: when airplane mode on, all of SS UIs are gray out.
Change-Id: I869a267fa5aaebf3b48f20bc70d21d612cd84586
Merged-In: I869a267fa5aaebf3b48f20bc70d21d612cd84586
2019-12-12 13:43:13 +00:00
Meng Wang
005a5a2d35 Expose ACTION_EMERGENCY_ASSISTANCE as SystemAPi
It's used by DefaultPermissionGrantPolicy.

Bug: 146091614
Test: make
Change-Id: I907736c7d6745660279a505761e27dfbbd1ddc97
2019-12-12 04:50:41 +00:00
Automerger Merge Worker
5bd2cfe59b Merge "Add CarrierConfig for roaming PLMNS that will need emer DDS switch" am: 7de7f018e8 am: 130286de4e
Change-Id: I767b9a8789a0eff627f4ef6ee811433c6141c807
2019-12-12 02:36:19 +00:00
Hall Liu
07105b44cf Add ImsReasonInfo constant for retrying without RTT
Add CODE_RETRY_ON_IMS_WITHOUT_RTT for the IMS stack to indicate to
Telephony that a call should be retried without RTT enabled.

Bug: 141963475
Test: manual

Change-Id: Ic3aa8856e98d8c34fd98462d71834e69b857eda4
2019-12-11 18:27:25 -08:00
Brad Ebinger
7de7f018e8 Merge "Add CarrierConfig for roaming PLMNS that will need emer DDS switch" 2019-12-12 02:10:10 +00:00
Automerger Merge Worker
85d23aa0b4 Merge "Remove ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" am: 6fce89f8b6 am: 3780da605a
Change-Id: I6df8824ca6a5ba668d49e728434cc6d9cacda8a3
2019-12-11 21:56:19 +00:00
Automerger Merge Worker
76baa0bd5d Merge "Remove ACTION_PRECISE_CALL_STATE_CHANGED and its extras." am: 79c83587c3 am: 5a0bfe164d
Change-Id: I5b5deb13c6c934de4626f874410cf4b1333cfb4a
2019-12-11 18:26:28 +00:00
Meng Wang
52a4a79b8c Remove ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED
and extra keys only used by the intent.

Those hidden constants are only used by TelephonyRegistry, blocking
telephony mainline. Remove them since no one uses the broadcast.

Bug: 140908357
Test: make
Change-Id: I8fffe2996f233f2422173e9823810523ce80f2e5
2019-12-11 10:10:55 -08:00
Meng Wang
79c83587c3 Merge "Remove ACTION_PRECISE_CALL_STATE_CHANGED and its extras." 2019-12-11 17:49:32 +00:00
Daniel Huang
2abcb6be3f Merge "Add more error codes." into qt-qpr1-dev-plus-aosp 2019-12-11 02:31:00 +00:00
Meng Wang
b857ba95e8 Remove ACTION_PRECISE_CALL_STATE_CHANGED and its extras.
Those hidden constants are only used in TelephonyRegistry, blocking
telephony mainline. Remove them since no one uses the broadcast.

Bug: 140908357
Test: make
Change-Id: I2425c157d9d24a8ec18cb66a2ce12c12e0fe49e1
2019-12-10 18:22:10 -08:00
Automerger Merge Worker
5b07e901bf Merge "Fix to handle duplicate call id for conference call" am: e31b09c825 am: 8d54779726
Change-Id: Ia7ce47824a9610e28c7b333e3d6b4e7a73872fa9
2019-12-10 22:57:13 +00:00
Brad Ebinger
f51c917af3 Add CarrierConfig for roaming PLMNS that will need emer DDS switch
When roaming, we assume that the roaming operator will support
control plane fallback for emergency SUPL. For roaming operators
that we know do not support control plane fallback, we must perform
a DDS switch before dialing an emergency number on that operator.

Bug: 144383368
Test: atest TeleServiceTests; manual
Merged-In: I4a033f89610fd409ea81c40230938720ca76541c
Change-Id: I4a033f89610fd409ea81c40230938720ca76541c
2019-12-10 22:47:17 +00:00
Treehugger Robot
e31b09c825 Merge "Fix to handle duplicate call id for conference call" 2019-12-10 22:28:24 +00:00
Automerger Merge Worker
fd536b0cfc Merge "expose datafail cause used in telephony-sdk annotation class" am: 20e05a4660 am: 65f7a4ac6b
Change-Id: Ibfa10b0c9dadceead0137e10508ce40465a2e7fd
2019-12-10 22:10:31 +00:00