Commit Graph

6703 Commits

Author SHA1 Message Date
Brad Ebinger
1064533bb7 Merge "Call out IllegalArgumentException in docs for ImsMmTelManager" am: ec63e6e9ed am: c00a1b9d2a
am: cc996be8a6

Change-Id: Ia353ee0ad2d90a1e922de5aba8d820763af53855
2019-07-24 14:51:18 -07:00
Brad Ebinger
c00a1b9d2a Merge "Call out IllegalArgumentException in docs for ImsMmTelManager"
am: ec63e6e9ed

Change-Id: Id51fdb8b8456c799f5939a7acd22fd024b935180
2019-07-24 14:12:05 -07:00
Brad Ebinger
ec63e6e9ed Merge "Call out IllegalArgumentException in docs for ImsMmTelManager" 2019-07-24 20:54:08 +00:00
Treehugger Robot
24eac6a4c7 Merge "Add @NonNull annotation to CONTENT_URI" 2019-07-19 08:54:31 +00:00
Brad Ebinger
9b490a16d9 Call out IllegalArgumentException in docs for ImsMmTelManager
There are situations where the ImsMmTelManager APIs will
throw an IllegalArgumentException that were not explicitly called
out. These situations are now documented correctly.

Also internally moved to a SystemSpecificException that is
rethrown as an IllegalArgumentException in case we need to
add other Exception cases to the API.

Will follow up with API changes that deprecate the current
APIs and throw a checked exception instead.

Bug: 137222412
Bug: 137225292
Test: manual
Change-Id: I416b20dc4e7723c752cc028866348c97dbeeb5a8
2019-07-16 14:55:57 -07:00
Brad Ebinger
0eea7ac8f4 Merge "Switch DDS during MSIM emergency call" 2019-07-12 22:59:43 +00:00
Brad Ebinger
545a4c369e Merge "Make RcsMessageStore a top level API" am: bac258f22e am: 53f6c34039
am: 36cc070c24

Change-Id: Iaf09d213817a8df251e1d846bd50d7a571960b5c
2019-07-12 15:23:16 -07:00
Brad Ebinger
53f6c34039 Merge "Make RcsMessageStore a top level API"
am: bac258f22e

Change-Id: If235ead8a75dc080e1e129d83bf7f24c3c996d8c
2019-07-12 14:53:26 -07:00
Brad Ebinger
bac258f22e Merge "Make RcsMessageStore a top level API" 2019-07-12 21:40:40 +00:00
Xiangyu/Malcolm Chen
5e83291083 Merge "Mark two unfinished APIs as "DO NOT USE"." 2019-07-12 19:04:17 +00:00
Hunter Knepshield
c3b90ecd40 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev
am: 4c452a6534

Change-Id: Ic5baff7a7530d473e6f78899442f6834df33cb3b
2019-07-12 11:33:37 -07:00
TreeHugger Robot
4c452a6534 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev 2019-07-12 18:00:48 +00:00
Xiangyu/Malcolm Chen
dbb897ee22 Merge changes from topic "135105735" into qt-r1-dev
am: 896cdfa547

Change-Id: Ie661fdc8a29645fa1b319cf1db8a896a8d21deae
2019-07-12 10:43:52 -07:00
Xiangyu/Malcolm Chen
896cdfa547 Merge changes from topic "135105735" into qt-r1-dev
* changes:
  Use new API to get mergedSubscriberIds based on grouping.
  Provide @hide API to return merged IMSIs from grouping.
2019-07-12 17:19:48 +00:00
Leland Miller
1510dc9a0a Add @NonNull annotation to CONTENT_URI
Test: None, simple annotation
Bug: 124791757
Change-Id: Ic56c4e15c73a414f7da257585578eaaaec5f9818
2019-07-12 10:10:03 -07:00
Jordan Liu
44f9007474 Merge "Use TM SubId in getDataState and getDataActivity" am: 3968a18c27 am: 6ef6ff9ca1
am: 853c565de9

Change-Id: I450f32dbe6ce710afaf81950bcf5b683d2b479a6
2019-07-11 18:50:25 -07:00
Jordan Liu
6ef6ff9ca1 Merge "Use TM SubId in getDataState and getDataActivity"
am: 3968a18c27

Change-Id: I69e39b4867b78182217357d14ef96c966e3b7dd3
2019-07-11 18:30:26 -07:00
Brad Ebinger
e63e96e57a Switch DDS during MSIM emergency call
Add carrier config to force DDS switch if device
does not support SUPL on non DDS for emergency and
also does not support control plane fallback.

Test: atest FrameworksTelephonyTests
Merged-In: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
Change-Id: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
(cherry picked from commit c9654c1b57)
2019-07-11 17:57:13 -07:00
Malcolm Chen
dcc97e11b1 Mark two unfinished APIs as "DO NOT USE".
The two APIs at this point are not well defined and implemented due to
design changes after they were introduced. Marking them as DO NOT USE
until further re-define or clean up.

Test: build
Bug: 135222940
Change-Id: I3f06040fdda25c7aa27be45cd90177136f7e996f
Merged-In: I3f06040fdda25c7aa27be45cd90177136f7e996f
2019-07-11 17:04:19 -07:00
Malcolm Chen
ac56a4254e Provide @hide API to return merged IMSIs from grouping.
Bug: 135105735
Test: test app. Apply grouping and call the new API, to make sure
it returns correct values.

Change-Id: I99586976d3421d4b35be465201ee33cbb2dfd1d9
2019-07-11 13:19:36 -07:00
Nathan Harold
af984d0d4e Use TM SubId in getDataState and getDataActivity
-Update getDataState() API to use the SubId specified
 by the TelephonyManager instance.

-Update the getDataActivity() API to use the SubId
 specified by the TelephonyManager instance.

(This CL is an un-revert of aosp/984377)

Bug: 135205433
Test: manual (automated test is infeasible)
Change-Id: I035f2c44a7955e88608b1c336acb72fb68c3e450
2019-07-11 11:52:55 -07:00
Sooraj Sasindran
8a7ebca21b Merge "Send error if ONS is not available" into qt-r1-dev
am: b5bf60eb09

Change-Id: Ifb13364e194a178612d74314424904eb8eeee01e
2019-07-10 16:14:33 -07:00
Hunter Knepshield
b26cbbd53d Check Carrier Privilege on Hidden Subs
When calling CheckCarrierPrivilegeForAnySubId the
hidden subscriptions were not being taken into account
due to getAllActiveSubscriptionIds being a public method
that intentionally ignores hidden subscriptions.

NOTE: This is identical to ag/8193293, except that the
SubscriptionManager modifications don't make
getActiveSubscriptionIdList() static (it was causing test failures). A
further bug can be pursued to make everything static all at once.

Bug: 135684437
Test: manual
Change-Id: Iad6a3c2635e5eac2d33a16aa460b98394fd817f4
2019-07-10 13:14:44 -07:00
Sooraj Sasindran
318471896d Send error if ONS is not available
Send error for data switch api if ONS is not available

Bug: 136294842
Test: regression test
Change-Id: If844939c0936729e4487b6e4f75cd58d28195718
2019-07-09 17:43:01 -07:00
Chen Xu
48aeaefd3b Merge "Added disallowed APN types configuration support" into qt-r1-dev
am: a240c31268

Change-Id: Ib9cc7dc5b6f68bd0c77f034b4aeb734fd912dd12
2019-07-02 11:07:53 -07:00
Jordan Liu
d521d87d45 Merge "Revert "Check Carrier Privilege on Hidden Subs"" into qt-r1-dev
am: 85a55afa3e

Change-Id: Iefbc1fe1cb0967703a897068f433517108f087a0
2019-07-01 20:30:50 -07:00
TreeHugger Robot
85a55afa3e Merge "Revert "Check Carrier Privilege on Hidden Subs"" into qt-r1-dev 2019-07-02 02:11:37 +00:00
Nazanin Bakhshi
cf5e620a19 Merge "Store subscriber ID / IMSI into telephony database" 2019-07-01 23:26:18 +00:00
Jordan Liu
3c41bb707b Revert "Check Carrier Privilege on Hidden Subs"
This reverts commit 6fc804b3f9.

Reason for revert: causes test failures b/136421546

Change-Id: I3b1dcd78aea6beeadb82626145e868954286bbee
2019-07-01 23:03:50 +00:00
Nathan Harold
00cf005bd1 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev
am: 09ef9e13a7

Change-Id: Ibb3792dfc28f93dfe96ea67367963b115dbff155
2019-06-28 23:22:35 -07:00
Nathan Harold
09ef9e13a7 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev 2019-06-29 06:07:52 +00:00
Jack Yu
ac9a731d27 Added disallowed APN types configuration support
The change added the configuration support for disallowed APN
types for WWAN or WLAN transport. This is to meet carrier policy
that certain traffic for APN types are not allowed on given
transport.

Bug: 135551751
Test: Manual + unit tests
Change-Id: I63c44d1e774b7491929406929e1a5a556db9515a
2019-06-28 17:53:44 -07:00
Nathan Harold
3b0cf87a5b Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea am: f5ee9c61be
am: 22d0ed63cc

Change-Id: Ibb0e9d7f55c8f1ba6179e7afbd63e33c23628822
2019-06-27 16:06:15 -07:00
Nathan Harold
6fc804b3f9 Check Carrier Privilege on Hidden Subs
When calling CheckCarrierPrivilegeForAnySubId the
hidden subscriptions were not being taken into account
due to getAllActiveSubscriptionIds being a public method
that intentionally ignores hidden subscriptions.

Bug: 135684437
Test: manual
Change-Id: I7688e4fe25fd2c6ed22dc8edc508345c1a3d447c
2019-06-27 16:02:35 -07:00
Nathan Harold
22d0ed63cc Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea
am: f5ee9c61be

Change-Id: I3a1ffa493f8b11cdd7c8bfff4fa4f8d78d54a169
2019-06-27 15:46:06 -07:00
Nathan Harold
4d4e2474ea Merge "Revert "Use TM SubId in getDataState and getDataActivity"" 2019-06-27 22:11:18 +00:00
Nathan Harold
44173ee7b0 Revert "Use TM SubId in getDataState and getDataActivity"
This reverts commit b2ab846cf4.

Reason for revert: Decision has been made to keep the unsupported AIDL API.

Change-Id: I31219606974019ac46da789ec31ca9cb3a86eb13
2019-06-26 00:41:00 +00:00
Sooraj Sasindran
aae64e716d Merge "Check for null executor" into qt-r1-dev
am: 2f952a8462

Change-Id: Ia7b6761ddfdd41abcb2b3239ef71326ff7864dcd
2019-06-24 18:35:23 -07:00
TreeHugger Robot
2f952a8462 Merge "Check for null executor" into qt-r1-dev 2019-06-25 01:23:24 +00:00
Jack Yu
7210be3cbc Merge "Reverted to the old logic for APN selection" into qt-dev am: 5d02fcb146
am: 51867b4380

Change-Id: If4511e6e210783264b232d04e58d0e29d6677370
2019-06-24 16:26:39 -07:00
Jack Yu
75cddbf992 Merge "Reverted to the old logic for APN selection" into qt-dev
am: 5d02fcb146

Change-Id: If610d4ffd6101a18c15eb52a1d9d4d0c6e200bce
2019-06-24 16:18:56 -07:00
Jack Yu
51867b4380 Merge "Reverted to the old logic for APN selection" into qt-dev
am: 5d02fcb146

Change-Id: Iec56dfbbaeced79fb02973360ddf5df89b69609f
2019-06-24 16:18:48 -07:00
TreeHugger Robot
5d02fcb146 Merge "Reverted to the old logic for APN selection" into qt-dev 2019-06-24 22:34:53 +00:00
Sooraj Sasindran
4b2d134b8c Check for null executor
Check for null executor when invalid parameters are passed

Test: build
Bug: 135927110
Change-Id: I12014f4da00d3783506642162ad7668fc7c05d9d
2019-06-24 15:22:55 -07:00
chen xu
0276e13b96 move short code definitions to SmsManager Test API
Bug: 127560420
Test: cts
Change-Id: I6a5ba2439713105b25913ba8eb081abfaafd1a2e
(cherry picked from commit 9c7fad9235)
Merged-in: I6a5ba2439713105b25913ba8eb081abfaafd1a2e
2019-06-24 21:12:48 +00:00
Youming Ye
c6931e3fbb Merge "Add carrier config for conference participants data support" into qt-dev
am: 23b6339ebd

Change-Id: Id1e5fcf1fbdfe47c73a8e76949ce4d75f03f9ed7
2019-06-21 17:33:29 -07:00
Youming Ye
60b023bfd0 Add carrier config for conference participants data support
Bug: 132312382
Test: Manual
Change-Id: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
Merged-In: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
2019-06-21 22:30:08 +00:00
Jack Yu
ee029fcefa Reverted to the old logic for APN selection
Reverted to the old logic that we select APN based on
RAT, but adding a special handling for 2G cases. This can
deal with the case that some APN settings has EHRPD which
we incorrectly thought that APN setting can be used on CDMA
network.

Bug: 134086103
Test: Unit tests
Change-Id: I557f00d32f53498782394ea7824e316e263ca7e7
2019-06-21 13:54:37 -07:00
Hunter Knepshield
aae901dfd6 Merge "Fix SubInfo#toString consistency." am: f15b5b38db am: 79d5cbd0e1
am: 4a686288a5

Change-Id: I4902ac96635179494350bb04f6d3bdce529cb505
2019-06-20 17:47:35 -07:00
Hunter Knepshield
4a686288a5 Merge "Fix SubInfo#toString consistency." am: f15b5b38db
am: 79d5cbd0e1

Change-Id: Iebe58fc9a6dc39d21be58f1adf01c1313594583f
2019-06-20 17:33:37 -07:00