Commit Graph

6323 Commits

Author SHA1 Message Date
Hall Liu
054f7c02b8 Merge "Update documentation for TelephonyManager#getImei" into qt-dev
am: 6d574ed355

Change-Id: I864acd0cddb3c016b3c71ab43b0e7155bc5ab1b7
2019-06-19 19:42:16 -07: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
408704dfea Merge "Store subscriber ID / IMSI into telephony database" into qt-dev 2019-06-19 18:09:33 +00:00
Malcolm Chen
bf231035c9 Merge "Mark two unfinished APIs as "DO NOT USE"." into qt-dev
am: a8a95549ff

Change-Id: Ieab28d08087e13bbfd406f25d0f5500f401dcbce
2019-06-18 20:28: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
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
Jack Yu
5e640ac80e 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
Change-Id: Ic18934adb870a0114c913855cdb68e0ef33caa79
2019-06-13 08:53:35 -07:00
Xiangyu/Malcolm Chen
71c3b209ed Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." into qt-dev
am: 1f7ee0bc98

Change-Id: Ieb76ab05d801e02a644ac614ee78df94492ed0a3
2019-06-11 19:34:23 -07:00
Malcolm Chen
6499e6d95b 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
2019-06-11 22:22:53 +00:00
Amit Mahajan
67f8039799 Merge "Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()" into qt-dev
am: be063ffb59

Change-Id: I221da0882cec481f4f0e892d8eb19c196889db1a
2019-06-07 15:35:47 -07:00
Amit Mahajan
be063ffb59 Merge "Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()" into qt-dev 2019-06-07 22:25:36 +00:00
TreeHugger Robot
070e64b1e5 Merge "Fixed tethering failed when device is on CBRS" into qt-r1-dev 2019-06-07 20:55:12 +00:00
Jack Yu
a952d2018b Fixed tethering failed when device is on CBRS
Fixed by using the correct sub id for CBRS subscription

Bug: 133852860
Test: Manual
Change-Id: If01e17becce9684556345eb76512f617b9a9278c
2019-06-07 11:07:43 -07:00
Amit Mahajan
900aad9924 Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()
This is basically reverting to earlier behavior.

Test: basic sanity
Bug: 134375393
Change-Id: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
2019-06-07 10:40:09 -07:00
Nazanin Bakhshi
4e97d2c105 Store subscriber ID / IMSI into telephony database
Bug: 131916175
Test: manual
Change-Id: I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7
Merged-In: I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7
2019-06-05 15:20:31 -07:00
Xiangyu/Malcolm Chen
9ad9609f4c Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am: b613fec2f8

Change-Id: I26ed9920543db1d26ca451d288533940f42f33a7
2019-06-05 11:21:22 -07:00
Xiangyu/Malcolm Chen
b613fec2f8 Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev 2019-06-05 18:03:17 +00:00
Brad Ebinger
0954b1f704 Merge "Switch DDS during MSIM emergency call" into qt-dev
am: fcc6df7c6d

Change-Id: Ibad3c48368e759864b686affdfbe3d5aa2a4b738
2019-06-05 01:11:43 -07:00
Brad Ebinger
1faea364d3 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.

Fixes: 131203278
Merged-In: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
Change-Id: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
2019-06-04 20:44:28 +00:00
Qingxi Li
e06624716d Remove all eSIM Invisible Profiles during FDR
Bug: 132360644
Test: E2E
Change-Id: Ic4e58ed7c8cf5892d8f49605e268c3d131b35ea9
(cherry picked from commit 1854f47f80)
2019-06-03 20:46:58 +00:00
TreeHugger Robot
cc36a441dd Merge "Catch NPE in getServiceStateForSubscriber" into qt-dev 2019-06-01 01:31:17 +00:00
Malcolm Chen
034cb343a1 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
2019-05-31 17:39:53 -07:00
Evan Tyra
c08d2d981c Catch NPE in getServiceStateForSubscriber
ITelephony can enter a bad state with an incorrect SubId and throw an
NPE as shown in the attached bug. This is not an expected error, so a
bugreport will be triggered on userdebug builds on catch.

Test: Local
Bug: 134067547
Change-Id: Ib8f3b69eb3870c3567578aadaee6cf2693526fbd
2019-06-01 00:02:46 +00:00
Pengquan Meng
d7673a30d9 Merge "Add new WiFi Calling string without hyphen" into qt-dev 2019-05-31 23:31:27 +00:00
Jack Yu
0d26d718b3 Supported data enabled override for different scenarios
Added override rules support for always allowing mms and
internet data during voice call.

Test: Manual + unit tests
Bug: 132113695
Change-Id: I2266d7f428901ccbba6bf538a7c7696e6566b96c
2019-05-31 11:06:15 -07:00
Nazanin Bakhshi
1e3ee721c7 Merge "Revert "Store subscriber ID / IMSI into telephony database"" into qt-dev 2019-05-31 17:55:18 +00:00
Nazanin Bakhshi
7ca2360714 Revert "Store subscriber ID / IMSI into telephony database"
This reverts commit 3dc7e3a4f6.
Bug: 134113745
Bug: 131916175
Reason for revert: <breaking presubmit>

Change-Id: Icd9235fc09eb6c1eacdb5b3bc02585cf23de7fc4
Merged-In: I501aed14d73b7cc19f9c492a7fe451eac127e8e4
2019-05-31 17:54:03 +00:00
Nazanin Bakhshi
75de2d5464 Merge "Store subscriber ID / IMSI into telephony database" into qt-dev 2019-05-30 23:07:29 +00:00
Etan Cohen
08236f3d3a Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev 2019-05-30 22:16:09 +00:00
Nazanin Bakhshi
3dc7e3a4f6 Store subscriber ID / IMSI into telephony database
Bug: 131916175
Test: manual
Change-Id: Ia353d23cff698d973bd63ac59fd92dd0f2978317
Merged-In: Ia353d23cff698d973bd63ac59fd92dd0f2978317
2019-05-30 20:05:19 +00:00
Pengquan Meng
7f47da0737 Add new WiFi Calling string without hyphen
Add a new Wi-Fi calling format, that is "%s WiFi Calling".

Bug: 131833909
Test: build
Change-Id: Id91d588668ce22987b39d565f67ac5eb4d6fc71a
2019-05-29 14:57:33 -07:00
Jack Yu
a74f2d8c34 Considered network preference when simulating legacy data RAT
Correctly supported the legacy data RAT when both cellular
and IWLAN are in service. In this case only report
RAT as IWLAN when any type of APN is preferred on IWLAN.
Otherwise still use the RAT reported by cellular network
service.

Bug: 133516945
Test: Manual

Change-Id: Ifdddad1d5ee95f4576d5002a1b66caafc172cb58
2019-05-29 11:36:44 -07:00
chen xu
4878165365 skip permission check for TelephonyManager API getMmsUserAgent
Bug: 133637995
Test: Manual test
Change-Id: Ib9f211120c34e9b48c02f990088c32fb307a64f2
2019-05-28 15:38:54 -07:00
sqian
82cfdba17a Add "+" in EmergencyNumber API
Bug: 133244926
Test: Treehugger
Change-Id: I09b0127ce929ec51fbb5c387c383e76dcde5f0b5
2019-05-24 18:42:14 +00:00
Andrei-Valentin Onea
71a267b66f Merge "Move blacklisted methods back to greylist" into qt-dev 2019-05-24 12:02:31 +00:00
Etan Cohen
9c94c2c9dc Modify Encrypted IMSI, remove deprecated protocols
Bug: 133431451
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: Ib96a2f54529266eb8e406ae2174938ab8e8f8b1e
2019-05-23 11:57:02 -07:00
TreeHugger Robot
f087f06ed9 Merge "Document device ID access restriction target SDK behavior" into qt-dev 2019-05-23 18:35:44 +00:00
Amit Mahajan
3aa54b1fff Merge changes from topic "Correct subId in divideMessage()" into qt-dev
* changes:
  Fix the default sub id returned by SmsManager.
  Divide a message text into correctly sized parts
2019-05-23 16:42:19 +00:00
Calvin Pan
261b3b13b0 Merge "Get the resources associated with subid to support MSIM" into qt-dev 2019-05-23 13:15:31 +00:00
Nathan Harold
39444b39ba Add permissions check for getNetworkType
-Add a function in TelephonyPermissions to check
 READ_PHONE_STATE or return NETWORK_TYPE_UNKNOWN (soft denial).
-Honor the subId in TM or use the default DATA sub when
 returning the network type.

Bug: 132466954
Test: cts - atest TelephonyManagerPermissionTest
Change-Id: I4e1767c9dc10acbadec286512752d4bb52059b74
2019-05-21 16:50:00 -07:00
Anil Admal
d566984298 Merge "Update non-framework emergency location request notification" into qt-dev 2019-05-21 20:40:22 +00:00
Amit Mahajan
1c0a7a16c1 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
Change-Id: I72ee7af9f0b2662e1ac26b7d3db60c667d06c471
2019-05-21 13:21:03 -07:00
Taesu Lee
98d41e6917 Divide a message text into correctly sized parts
Message format info is required in order to divide a message text into
correctly sized parts on a device that supports for both 3GPP and 3GPP2
formats in multi-sim. And fixed to get default SMS subId from SmsManager
in SmsMessage class instead.

Test: Manual
Bug: 132259056
Merged-in: Id2512eb62504b7e789f58b7d9697009d565c4a18
Change-Id: Id2512eb62504b7e789f58b7d9697009d565c4a18
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
(cherry picked from commit 8debeeb126)
2019-05-21 10:32:59 -07:00
Chen Xu
3c385651c4 Merge "do not print phone number which is considered as pii" into qt-dev 2019-05-21 17:28:40 +00:00
Andrei Onea
2bbb6542f7 Move blacklisted methods back to greylist
These methods used to be greylisted, but have been either accidentally
or prematurely added to blacklist.

Test: m
Bug: 133207859
Change-Id: I0f73828956d0c5e4b1c147580bb11c8073c3461b
2019-05-21 18:13:26 +01:00
TreeHugger Robot
f413c1e833 Merge "Revert "Use the SubId in the TM.getNetworkType if Valid"" into qt-dev 2019-05-21 02:51:28 +00:00
Nathan Harold
af62adcb6c Revert "Use the SubId in the TM.getNetworkType if Valid"
This reverts commit f36fee3cf7.

Reason for revert: 133129040

Bug: 133129040
Merged-In: I9a974018d4155426b1050a4b80b82f4bf4a9d996
Change-Id: Ib6f9a4e461a7e1cfa6c4648bd289a8f92475423e
2019-05-21 02:51:21 +00:00
chen xu
720da9bff0 do not print phone number which is considered as pii
do not print phonenumber in subscriptionInfo

Bug: 133191331
Change-Id: Ibdc4689f41a8dac162b617d6972bb72b3dd86e4e
2019-05-20 18:04:13 -07:00
Anil Admal
61da5f06ad Update non-framework emergency location request notification
- Incorporate notification text feedback in b/116328114 so that
  it translates well in different locales.
- Implement PWG recommendation to always notify user of non-framework
  location requests and not make it configurable. Remove es_notify_int
  configuration parameter.

Bug: 116328114
Bug: 130892418
Test: Manual plus existing tests pass.
Change-Id: Iad972eb1a6fe6c6ed5646edb00c1ea483a077553
2019-05-20 16:33:09 -07:00
Brad Ebinger
1f0eec4faf Merge "Fix parcelling issue for certain fields." into qt-dev 2019-05-20 23:21:54 +00:00