Commit Graph

7386 Commits

Author SHA1 Message Date
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
Pengquan Meng
a2c7fc711a Merge "Use flatten component name for Carrier Settings activity" 2018-11-08 19:51:03 +00: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
Jack Yu
423e575909 Merge "Added APN to string method" am: 3bedd0a674 am: 56ce3a6f41
am: 94107f2fea

Change-Id: I88945b7e9492e2712d0c74456b6f645fe2ead187
2018-11-06 11:01:17 -08:00
Jack Yu
94107f2fea Merge "Added APN to string method" am: 3bedd0a674
am: 56ce3a6f41

Change-Id: I61247c8f7e8f5069b28167b9e940782f80edfaee
2018-11-06 10:48:00 -08:00
Nathan Harold
2780e30119 Add toString() method for NetworkScanResult
To enhance debug-ability of NetworkScanResult, the
toString() method should return the contents of the
structure rather than a stringified reference.

Bug: 119055885
Test: NetworkScanResultTest#testParcel
Change-Id: Ib4fce53d57d1a1cd3382c65fc2c8cb1b7d6ea92d
2018-11-06 10:37:27 -08:00
Jack Yu
3bedd0a674 Merge "Added APN to string method" 2018-11-06 18:19:31 +00:00
Shuo Qian
729518824d Merge "Revert "Make getRssi() API for LTE Received Signal Strength Indication (RSSI)"" am: 1a517ba852 am: aea5d0afcc
am: c3e1c08d03

Change-Id: I4bee4db8615f8ad37d11331ad8b0b20b70abb8c9
2018-11-05 19:47:43 -08:00
Shuo Qian
c3e1c08d03 Merge "Revert "Make getRssi() API for LTE Received Signal Strength Indication (RSSI)"" am: 1a517ba852
am: aea5d0afcc

Change-Id: Id631e020519573ee0bb280838684f390c8d26b75
2018-11-05 19:26:55 -08:00
Shuo Qian
1a517ba852 Merge "Revert "Make getRssi() API for LTE Received Signal Strength Indication (RSSI)"" 2018-11-06 03:06:20 +00:00
Pengquan Meng
cb6aaf0b72 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
Change-Id: I9371bf179895eadeaa189faee2c2afc2a7e0cb8f
2018-11-05 16:27:35 -08:00
Shuo Qian
5e80484991 Revert "Make getRssi() API for LTE Received Signal Strength Indication (RSSI)"
This reverts commit c3380f767a.

Reason for revert: b/119055885

Change-Id: I47e6dd038d97a9d5a48d36b53f9e75e356a1e409
2018-11-06 00:18:16 +00:00
Jack Yu
24d9490c48 Added APN to string method
There were some limitation of the existing method
ApnSetting.getApnTypesBitmaskFromString, which prints
hipri+default when input is default APN type.

Also added access network type and transport type to string
method.

Test: Telephony sanity tests
Bug: 73659459
Change-Id: I5a24ac4b284c9237f84c8b1a6961569c4f0a747a
2018-11-05 14:37:23 -08:00
sqian
1ed547ee3e Add telephony commands about SMS apps
See the other CL on the same topic for the details

Bug: 109809543
Test: See the other CL
Change-Id: I9f750a72edfc282c80f7547647bcddaf2da51d9b
Merged-In: I9f750a72edfc282c80f7547647bcddaf2da51d9b
2018-11-05 14:28:49 -08:00
Jayachandran Chinnakkannu
095d104070 Merge "Move the intent to SMS namespace for database corruption detection" 2018-11-05 18:43:15 +00:00
Brad Ebinger
f5544c3e92 Expose mRestrictCause as a @SystemApi
Bug: 117555643
Test: Telephony unit tests
Change-Id: I60a7028d79f7e5fa676cc12a427c6d2a8cd3961e
2018-11-05 10:33:00 -08:00
Jack Yu
8aac14b1a3 Merge "Changed the onQualifiedNetworkTypesChanged API" am: aa08473294 am: 8141dd8938
am: ea49d64ddb

Change-Id: I29c87caa6c30d8f198e06318595a2c288b2fcfaf
2018-11-03 09:25:39 -07:00
Jack Yu
ea49d64ddb Merge "Changed the onQualifiedNetworkTypesChanged API" am: aa08473294
am: 8141dd8938

Change-Id: I6198723cb22f3338c4743c8ec9af294cfdcf86fe
2018-11-03 09:09:58 -07:00
Jack Yu
aa08473294 Merge "Changed the onQualifiedNetworkTypesChanged API" 2018-11-03 15:32:55 +00:00