Commit Graph

6650 Commits

Author SHA1 Message Date
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
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
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
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
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
Nazanin Bakhshi
cf5e620a19 Merge "Store subscriber ID / IMSI into telephony database" 2019-07-01 23:26:18 +00: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
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
TreeHugger Robot
5d02fcb146 Merge "Reverted to the old logic for APN selection" into qt-dev 2019-06-24 22:34:53 +00: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
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
4a686288a5 Merge "Fix SubInfo#toString consistency." am: f15b5b38db
am: 79d5cbd0e1

Change-Id: Iebe58fc9a6dc39d21be58f1adf01c1313594583f
2019-06-20 17:33:37 -07:00
Brad Ebinger
d1cb346d4f Make RcsMessageStore a top level API
RcsManager was handling both DB APIs and RcsFeature logic, which
made it confusing. Instead, make RcsMessageStore->RcsMessageManager,
which is a top level API.

Test: Manual
Change-Id: I9b9f96154d0705797cedade3d6cee27719897164
2019-06-20 23:28:43 +00:00
Hunter Knepshield
49fa37256f Fix SubInfo#toString consistency.
MCC was previously running into the country ISO.

"... mnc 260mCountryIso=US ..."

Some fields had odd spacing/delimiters.

Test: compilation (trivial)
Change-Id: I217fbbdf3a2783e8b98ceecbf62e21482b58db37
2019-06-20 20:32:57 +00:00
Hall Liu
302a2ecb05 Merge "Update documentation for TelephonyManager#getImei" into qt-dev
am: 6d574ed355

Change-Id: I150dac83fe13425232dce11a6b05c4b98a8172b5
2019-06-19 19:14:06 -07:00
Malcolm Chen
aa3512ba9c Make sure on non-dds phone, try MMS data connection when PS is not
attached.

Before setting up data connection, we check if it's on non-dds and
voice is registered on non-LTE network, if true we'll setup the data
connection even if it's not attached.

Bug: 134086103
Test: manual
Change-Id: I43e150c1d0cc4065da07f4a5ec738b967e7a9a6d
Merged-In: I43e150c1d0cc4065da07f4a5ec738b967e7a9a6d
2019-06-19 23:01:49 +00:00
Malcolm Chen
56ea64d703 Triggering notifications when dual CDMA SIM combinations are detected
Define dual CDMA SIM combination extras.

Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.

Change-Id: I5caf39478dd0814aa1b2def801b1c3a107355682
Merged-In: I5caf39478dd0814aa1b2def801b1c3a107355682
2019-06-19 22:48:08 +00:00
Hall Liu
6ee5ddcfbd Update documentation for TelephonyManager#getImei
Update the documentation for getImei to reflect that default SMS apps
are allowed to call this API.

Fixes: 135627578
Test: compiles
Change-Id: Ifef46c9cdb16e8485f3b5bf6d582aca320052b5c
2019-06-19 21:39:40 +00:00
Nazanin Bakhshi
e1ec8bbfde Merge "Store subscriber ID / IMSI into telephony database" into qt-dev
am: 408704dfea

Change-Id: If85b86ff85ceef52a4d76141696c95405f0e1868
2019-06-19 11:23:00 -07:00
Nazanin Bakhshi
1eaf7a8c02 Store subscriber ID / IMSI into telephony database
Bug: 131916175
Test: manual
Change-Id: I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7
Merged-In: I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7
(cherry picked from commit 6cf9e9df0e)
2019-06-19 18:15:12 +00:00
Nazanin Bakhshi
408704dfea Merge "Store subscriber ID / IMSI into telephony database" into qt-dev 2019-06-19 18:09:33 +00:00
Malcolm Chen
c95eecca78 Merge "Mark two unfinished APIs as "DO NOT USE"." into qt-dev
am: a8a95549ff

Change-Id: I19e2e8b28d9be380c233749d04108f436a3e7ae6
2019-06-18 20:29:48 -07:00
Malcolm Chen
bfa821b43a 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
2019-06-18 23:35:05 +00:00
Nathan Harold
c51d10eaef Merge "Use TM SubId in getDataState and getDataActivity" am: 28a7b5974d
am: 08698af50e

Change-Id: I6a4ea5cf947eb8145bbf31d807e76a64980b042e
2019-06-18 11:30:43 -07:00
Nathan Harold
28a7b5974d Merge "Use TM SubId in getDataState and getDataActivity" 2019-06-18 17:44:15 +00:00
Jack Yu
0ee8d6b347 Merge "Fixed incorrect merge service state" am: 30b14a9d70
am: fbcd558697

Change-Id: I963cedb002267d8d3bf74f645d27b7fca3312368
2019-06-17 23:11:57 -07:00
Jack Yu
2bbd84cea3 Merge "Fixed tethering failed when device is on CBRS" am: fa9c857b21
am: df9fb2aae8

Change-Id: Ia75de613314fcf7ff764090c833c9f4b440db6f1
2019-06-17 23:09:07 -07:00
Jack Yu
30b14a9d70 Merge "Fixed incorrect merge service state" 2019-06-18 05:25:35 +00:00
Nathan Harold
b2ab846cf4 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.

Bug: 135205433
Test: manual (automated test is infeasible)
Change-Id: Icf27eab40b1f979892123dc4185db2a138c1ffc2
2019-06-17 18:29:09 -07:00
Jack Yu
807a82b3aa Fixed tethering failed when device is on CBRS
Fixed by using the correct sub id for CBRS subscription

Bug: 133852860
Test: Manual
Merged-In: If01e17becce9684556345eb76512f617b9a9278c
Change-Id: If01e17becce9684556345eb76512f617b9a9278c
(cherry picked from commit a952d2018b)
2019-06-17 18:29:09 -07:00
Jack Yu
e089e39454 Fixed incorrect merge service state
The existing logic for merging service state when device is on
IWLAN does not work properly on AP-assisted mode devices. Fixed
by copying the IWLAN preferred flag into IMS service state so
it can get the correct data RAT for AP-assisted mode devices.

Bug: 134706530
Test: WFC manual tests
Merged-In: Ic18934adb870a0114c913855cdb68e0ef33caa79
Change-Id: Ic18934adb870a0114c913855cdb68e0ef33caa79
(cherry picked from commit 5e640ac80e)
2019-06-17 17:16:13 -07:00
Hunter Knepshield
286ca032c2 do not print phone number which is considered as pii
do not print phonenumber in subscriptionInfo

Bug: 133191331
Change-Id: Ibdc4689f41a8dac162b617d6972bb72b3dd86e4e
Merged-In: Ibdc4689f41a8dac162b617d6972bb72b3dd86e4e
2019-06-17 14:19:46 -07:00
Nazanin Bakhshi
a120f95d26 Store subscriber ID / IMSI into telephony database
Bug: 131916175
Test: manual
Change-Id: I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7
Merged-In: I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7
(cherry picked from commit 4e97d2c105)
2019-06-14 17:39:06 -07:00
Taesu Lee
b17cdd14c1 Merge "Assume successful delivery if no Message Status" am: 94deb1ca38
am: 05d08d1a1e

Change-Id: Ibf823cc8bd8353940c0d238d3a398f68fa930d86
2019-06-13 17:26:55 -07:00
Treehugger Robot
94deb1ca38 Merge "Assume successful delivery if no Message Status" 2019-06-13 23:32:09 +00:00
Amit Mahajan
15fbc62662 Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()
This is basically reverting to earlier behavior.

Test: basic sanity
Bug: 134375393
Merged-in: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
Change-Id: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
(cherry picked from commit 900aad9924)
2019-06-13 14:31:19 -07:00
Amit Mahajan
2bc637ecb9 Fix the default sub id returned by SmsManager.
SmsManager.getDefaultSmsSubscriptionId() did not handle the case
of no default set with a single SIM present. This CL adds the
handling for that.

Test: manual SMS sanity on single sim and DSDS devices
Bug: 132259056
Merged-in: I72ee7af9f0b2662e1ac26b7d3db60c667d06c471
Change-Id: I72ee7af9f0b2662e1ac26b7d3db60c667d06c471
(cherry picked from commit 1c0a7a16c1)
2019-06-13 14:30:40 -07:00
Brad Ebinger
05f4ff0a95 Trampoline SMS disambig dialog to Telephony
SmsManager used to display a "select default SMS
subscription" dialog every time SmsManager was used
and no default SMS subscription was set. This change
fixes the following issues:
1_ getSubscriptionId no longer pops up a disambig
dialog.
2) The disambig dialog no longer sets the
default, rather it waits for the response from the
user and performs the operation when it receives
a response.
2a) Dialogs can no longer be created from background
services, so we now have a restriction that if
the disambig dialog is shown via a background service,
we will use phone 0 as default (backwards compat for
apps targeting <Q) or fail (on apps targeting Q+).
3) If there is only one active subscription, use that
to perform the operation on MSIM devices instead of
asking and only displaying the one active subscription.
4) Certain non "user-facing" APIs that are used by
carrier apps no longer will pop up a UI.

Bug: 131713446
Bug: 130853716
Bug: 129141025

Test: run SmsManagerTestApp; atest TelephonyFrameworksTests

Merged-In: Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83
Change-Id: I6be1c6d7bf6b6ee614b6a7d0369147e3b1890588
2019-06-13 18:30:14 +00:00
Brad Ebinger
26b242f75e No longer show disambig when calling SmsManager#getSubId
SmsManager#getSubId used to show a disambig dialog to
pick a default SMS subscription when
SmsManager#getSubscriptionId was called. Since it was used
internally as well, it would cause many of these dialogs
to pop up over and over again.

Do not display the dialog anymore and instead move the
dialog pop up to the methods that actually require the use
of the dialog, such as sending a text.

Bug: 130853716
Test: Manual, Default SMS app
Merged-In: Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83
Change-Id: I71ad38f76750c750b149e4cdcb6fcf99ed89212e
2019-06-13 18:29:59 +00:00