Commit Graph

7404 Commits

Author SHA1 Message Date
Brad Ebinger
8a9766e621 Merge "Expose SRVCC state changes as @SystemAPI" am: c10b96899e am: 657343b811
am: 30858dc7ac

Change-Id: Iddb02abd34c1971b906acf734a878aad22387c57
2018-11-12 04:50:17 -08:00
Shuo Qian
86d66b4d3e Merge "Merge "Introduce getRssi() in CellSignalStrengthLte" am: 5bdf255e0d am: e819bd7a1e" into pi-dev-plus-aosp
am: c8e008b0b4

Change-Id: Icb0e4c780f842b4153287c376fe7be583f1d2540
2018-11-12 04:23:52 -08:00
Brad Ebinger
30858dc7ac Merge "Expose SRVCC state changes as @SystemAPI" am: c10b96899e
am: 657343b811

Change-Id: I43bdae25b265586db2417e7f512eac04800de047
2018-11-09 15:27:27 -08:00
Brad Ebinger
c10b96899e Merge "Expose SRVCC state changes as @SystemAPI" 2018-11-09 23:02:38 +00:00
Shuo Qian
61db02b01a Merge "Introduce getRssi() in CellSignalStrengthLte" am: 5bdf255e0d
am: e819bd7a1e

Change-Id: I77c5ba0bf87afde281473134a306595c052820cc
2018-11-09 14:47:08 -08:00
Shuo Qian
5bdf255e0d Merge "Introduce getRssi() in CellSignalStrengthLte" 2018-11-09 22:07:50 +00:00
Youming Ye
941e60fa2c Merge "Add possibility to configure SPN during Wi-Fi Calling and Flight mode" am: 777235c467 am: ecf6966392
am: 7e9dd747a8

Change-Id: Ifdaf40b1b3aa3b4f4d707afdbb7978c813f842ae
2018-11-09 13:44:51 -08:00
Calvin Pan
41ad850c96 Merge "Add CarrierId column in TelephonyProvider" am: 1df5ca6a71
am: dfed97ba6d

Change-Id: I89d20cb9ca28ad4fb26fbbf5cf2ba81985fa71ba
2018-11-09 06:02:41 -08:00
Calvin Pan
1df5ca6a71 Merge "Add CarrierId column in TelephonyProvider" 2018-11-09 13:30:51 +00:00
Youming Ye
7e9dd747a8 Merge "Add possibility to configure SPN during Wi-Fi Calling and Flight mode" am: 777235c467
am: ecf6966392

Change-Id: I44684992b63a472c211cd504fe506d0b71bf5386
2018-11-08 17:21:50 -08:00
Youming Ye
777235c467 Merge "Add possibility to configure SPN during Wi-Fi Calling and Flight mode" 2018-11-09 01:01:28 +00:00
calvinpan
3689c96951 Add CarrierId column in TelephonyProvider
Add a column in provider to migrate mno and mvno to carrierid.

Bug: 115709816
Test: runtest --path tests/src/com/android/providers/telephony/TelephonyProviderTest.java
Change-Id: I9c0c0fd069acc7f182d94f422ff15f45ebf187a9
Merged-In: I9c0c0fd069acc7f182d94f422ff15f45ebf187a9
2018-11-08 23:45:23 +00:00
Jayachandran Chinnakkannu
cfe08258f1 Merge "resolve merge conflicts of c4555ee941 to pi-dev-plus-aosp" into pi-dev-plus-aosp 2018-11-08 23:00:47 +00:00
Nathan Harold
db0e08c750 Merge "Add toString() method for NetworkScanResult" am: aaa6722976 am: c7ad900967
am: 524ce01fa1

Change-Id: I8101aea3035b99f923e6fd083e025ee5f5a24342
2018-11-08 14:34:28 -08:00
Nathan Harold
524ce01fa1 Merge "Add toString() method for NetworkScanResult" am: aaa6722976
am: c7ad900967

Change-Id: I860489666c819802b8dcfe2184c15509d26f5b54
2018-11-08 14:17:41 -08:00
Nathan Harold
aaa6722976 Merge "Add toString() method for NetworkScanResult" 2018-11-08 21:54:26 +00:00
Pengquan Meng
d5c7fb6cdf Merge "Add 5G NR cellInfo" 2018-11-08 21:31:10 +00:00
Jayachandran C
1fd2abcf1d resolve merge conflicts of c4555ee941 to pi-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I897faef1bc1a32a5cf11a048b3a9dd1c40a9bc24
2018-11-08 13:13:58 -08:00
Pengquan Meng
a2c7fc711a Merge "Use flatten component name for Carrier Settings activity" 2018-11-08 19:51:03 +00:00
sqian
5b76bfc0d0 Introduce getRssi() in CellSignalStrengthLte
Previous people designed that the lte signal strength from HAL is rssi
in ASU, but the new need of getRssi() API requires dBm unit.

Bug: 113074174
Test: Treehugger
Change-Id: I2982365a2e7fe1a56a393d123b9b0a30807d4d15
2018-11-08 10:54:41 -08:00
Brad Ebinger
efed9824e4 Expose SRVCC state changes as @SystemAPI
ImsService needs to be able to register for SRVCC state
changes.

Test: Telephony Unit tests
Bug: 117555643
Change-Id: I87631b51a19cdd46d6b4d15f3631345de03bb771
2018-11-08 10:14:04 -08:00
Calvin Pan
330f457890 Merge "Create new API for MNO carrier id" 2018-11-08 16:25:12 +00:00
Chen Xu
123559814a Merge "separate URL for WFC settings" am: 9d4ebdf379
am: 5e5e921d22

Change-Id: Ia2ac301a7c66359593c5793821b4282d5fc8c251
2018-11-07 19:52:48 -08:00
Chen Xu
9d4ebdf379 Merge "separate URL for WFC settings" 2018-11-08 03:23:20 +00:00
Pengquan Meng
df2fc73166 Merge "Move configs to CarrierConfig for MobileNetworkSettings" am: a9ca5c9999
am: 8a45ac103e

Change-Id: I12f1c1f0df3c9138023cdc6b4e9b564a36406849
2018-11-07 18:07:11 -08:00
Shuo Qian
2764aaee13 Merge "Introduce Emergency number functions APIs" am: 24cddced04
am: 1bc7e852ef

Change-Id: I7748108ebaa6a22702b7d59c67aa9623438bcffc
2018-11-07 17:58:54 -08:00
Chen Xu
059810b73e Merge "separate URL for WFC settings" 2018-11-08 01:35:46 +00:00
Pengquan Meng
a9ca5c9999 Merge "Move configs to CarrierConfig for MobileNetworkSettings" 2018-11-08 00:47:22 +00:00
Shuo Qian
24cddced04 Merge "Introduce Emergency number functions APIs" 2018-11-08 00:40:10 +00:00
sqian
8d391c8580 resolve merge conflicts of 61444e09ff to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: 109809543
Change-Id: If49f6adecb3cae911ba758753679565f9f5d317b
Merged-In: I9f750a72edfc282c80f7547647bcddaf2da51d9b
2018-11-07 23:55:06 +00:00
sqian
5ac293f040 Introduce Emergency number functions APIs
- getCurrentEmergencyNumberList
- getCurrentEmergencyNumberList (per categories)
- isCurrentEmergencyNumber

Note: the implementaion from PhoneInterfaceManager is empty, but the names
of the APIs need to be finalized so that the usages and test plan are not
blocked.

Bug: 112657134
Test: Treehugger
Change-Id: I1e310941aea6d5288fd6c99071be6b46a8d98197
Merged-In: I854db34f4378f35f99c3d8133bf35f3d0b3aad2b
Merged-In: Ic0a22dd9c2023362bbb65b80cb78990ace7caac4
2018-11-07 14:57:44 -08:00
Pengquan Meng
3d4e67cee3 Use flatten component name for Carrier Settings activity
This change uses the flatten component name instead of the separate
package name and class name for carrier settings activity.

Bug: 115429501
Test: Build
Change-Id: Ia531c3322183a2eba6962c8ee139c7854e2560ec
2018-11-07 14:54:24 -08:00
Pengquan Meng
50b8cd0e84 Add 5G NR cellInfo
- Add CellInfoNr
- Add CellIdentityNr
- Add CellSignalStrengthNr

Bug:111453000
Test: atest FrameworksTelephonyTests:
Change-Id: I45a8042fcbeb9faa7f8cc8db45eeb2c85125397e
2018-11-07 14:11:05 -08:00
Treehugger Robot
d605b5ab3d Merge "Add telephony commands about SMS apps" 2018-11-07 21:46:13 +00:00
Xiangyu/Malcolm Chen
83048a8841 Merge "Changing setPreferredData so that it takes subId." am: fbc4e55540
am: 2a0bb8b78a

Change-Id: Ie53724738d03d4607352c9179fb604843e2d680b
2018-11-07 12:56:32 -08:00
chen xu
bf38b068d4 separate URL for WFC settings
we have @SystemAPI exposed in ImsMMTelManager#getVoWiFiModeSetting
and ImsMMTelManager#getVoWiFiRoamingModeSetting and vtEnabled.
We should expose @System URI allowing listeners to be notified
on settings changes.

Bug: 118631333
Test: telephony unit test
Change-Id: Idc8a6a71ed69135644371c122c93916ef4db0b51
Merged-in: Idc8a6a71ed69135644371c122c93916ef4db0b51
2018-11-07 11:58:52 -08:00
chen xu
4eec415f5f separate URL for WFC settings
we have @SystemAPI exposed in ImsMMTelManager#getVoWiFiModeSetting
and ImsMMTelManager#getVoWiFiRoamingModeSetting and vtEnabled.
We should expose @System URI allowing listeners to be notified
on settings changes.

Bug: 118631333
Test: telephony unit test
Change-Id: Idc8a6a71ed69135644371c122c93916ef4db0b51
2018-11-07 11:53:55 -08:00
Michael Groover
6a8af2abef Merge "Enable device identifier check for 3P apps" 2018-11-07 19:32:34 +00:00
Jiuyu Sun
151046ad9f Merge "Catch SecurityException in EuiccCardController and trigger callback." 2018-11-07 19:29:11 +00:00
TreeHugger Robot
8c342c6852 Merge "Allow apps with carrier privileges to access device IDs" 2018-11-07 19:24:24 +00:00
Pengquan Meng
3539c290db Move configs to CarrierConfig for MobileNetworkSettings
Move some configs of MobileNetworkSettings to the carrier config so that
the settings app can access them.

Bug: 115429501
Test: build
Merged-In: I9371bf179895eadeaa189faee2c2afc2a7e0cb8f
Change-Id: I9371bf179895eadeaa189faee2c2afc2a7e0cb8f
2018-11-06 18:28:38 -08:00
Tyler Gunn
d851c54c66 Merge "Add disconnect cause when outgoing call fails due to ongoing OTASP prov." am: 009b2dd158 am: 226c56a6be
am: 9027a990c7

Change-Id: Ief5f5b8f84e6eb29b6d463b40b79024a7dd6c99b
2018-11-06 17:00:28 -08:00
Tyler Gunn
9027a990c7 Merge "Add disconnect cause when outgoing call fails due to ongoing OTASP prov." am: 009b2dd158
am: 226c56a6be

Change-Id: I80e04be656eedf2f47cacf269cf5e2478ca2cc90
2018-11-06 16:47:00 -08:00
Malcolm Chen
009f0a9d73 Changing setPreferredData so that it takes subId.
Bug: 92796390
Test: build
Change-Id: I189fbe3c47f51f361838a6737fb5bef3aa1f0ee9
Merged-In: I189fbe3c47f51f361838a6737fb5bef3aa1f0ee9
2018-11-06 16:17:41 -08:00
Brad Ebinger
e1219c73ef Merge "Expose mRestrictCause as a @SystemApi" am: 37d8de2b2a am: f40eeb4a18
am: 5671e61407

Change-Id: Id06585c73f8423a5e2e21412f360cc9b4c3e0982
2018-11-06 15:37:37 -08:00
Tyler Gunn
009b2dd158 Merge "Add disconnect cause when outgoing call fails due to ongoing OTASP prov." 2018-11-06 23:32:05 +00:00
Brad Ebinger
5671e61407 Merge "Expose mRestrictCause as a @SystemApi" am: 37d8de2b2a
am: f40eeb4a18

Change-Id: I59adcd2b31bdf0f7258b424d55f6e96913c729dc
2018-11-06 15:22:43 -08:00
Michael Groover
3f0267151c Enable device identifier check for 3P apps
Bug: 117781266
Test: cts-tradefed run cts -m CtsTelephony3TestCases
Test: cts-tradefed run cts -m CtsPermissionTestCases -t android.permission.cts.TelephonyManagerPermissionTest
Test: cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.TelephonyManagerTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t \
      com.android.cts.devicepolicy.DeviceOwnerTest#testDeviceOwnerCanGetDeviceIdentifiers
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t \
      com.android.cts.devicepolicy.ManagedProfileTest#testProfileOwnerCanGetDeviceIdentifiers
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t \
      com.android.cts.devicepolicy.ManagedProfileTest#testProfileOwnerCannotGetDeviceIdentifiersWithoutPermission
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t \
      com.android.cts.devicepolicy.DeviceOwnerTest#testDeviceOwnerCannotGetDeviceIdentifiersWithoutPermission

Change-Id: Ia511d6d566ab1ceacfedcd45f45500a846fcb983
2018-11-06 15:01:46 -08:00
Brad Ebinger
37d8de2b2a Merge "Expose mRestrictCause as a @SystemApi" 2018-11-06 22:54:10 +00:00
Pengquan Meng
1264b640f5 Merge "Move configs to CarrierConfig for MobileNetworkSettings" 2018-11-06 22:26:07 +00:00