Sahin Caliskan
4c070fa443
Merge "Fix RcsManager and add empty RcsThread class"
2018-11-13 16:17:06 +00:00
Xiangyu/Malcolm Chen
ea0fb2dbcc
Merge "Fix mis-ordered merge in PhoneStateListener.java" am: a97bdb957f am: d57e403dd0
...
am: 322e77d3d1
Change-Id: If79bf6eff63fe2ca430a73835388e441bebbbb7f
2018-11-12 23:22:35 -08:00
Xiangyu/Malcolm Chen
322e77d3d1
Merge "Fix mis-ordered merge in PhoneStateListener.java" am: a97bdb957f
...
am: d57e403dd0
Change-Id: I7759d933eae873879a5e3677397baebd1c356747
2018-11-12 23:07:47 -08:00
Chen Xu
d7daccbfc0
Merge "support parent carrier id" am: 00496a1181
...
am: eb45abb8aa
Change-Id: I117ec195fa3deb381273e707fadcb059f99771ce
2018-11-12 22:42:58 -08:00
Xiangyu/Malcolm Chen
a97bdb957f
Merge "Fix mis-ordered merge in PhoneStateListener.java"
2018-11-13 06:38:50 +00:00
Chen Xu
00496a1181
Merge "support parent carrier id"
2018-11-13 06:08:46 +00:00
Amit Mahajan
b608ad49f9
Merge "Define new intent ACTION_LINE1_NUMBER_ERROR_DETECTED"
2018-11-13 05:46:26 +00:00
andychou
c9e506a2d1
Merge "Add PreciseDisconnectCause for SIP status code 481 Transaction Does Not Exist" am: 36ac46a915
...
am: b4ce0e3f2e
Change-Id: I0b57d71afa81ea671403b36e7d797eeb7ed675b1
2018-11-12 20:23:38 -08:00
Treehugger Robot
36ac46a915
Merge "Add PreciseDisconnectCause for SIP status code 481 Transaction Does Not Exist"
2018-11-13 03:48:59 +00:00
Malcolm Chen
27de0e51eb
Fix mis-ordered merge in PhoneStateListener.java
...
Bug: 119131284
Test: build
Change-Id: I9ab7a0a992e4000efb1a1b89ec198f9da74876d9
2018-11-12 19:34:38 -08:00
Chen Xu
e2cecc8c0b
Merge "new SystemAPI for roamingType in NetworkRegistrationState" am: 24df195e78 am: 0c9e00dd03
...
am: 29f4070ffd
Change-Id: I7532464329575f2eed3127aa9e44c02bd8777557
2018-11-12 18:17:45 -08:00
Chen Xu
bd328743d8
Merge "do not link hidden intdef in the comments" am: a79188986a am: ebe6360ccc
...
am: 6e6268f6cb
Change-Id: I80b7fc0ef2b51cde24eb5ef416f30b38e5aaad27
2018-11-12 18:07:46 -08:00
Chen Xu
29f4070ffd
Merge "new SystemAPI for roamingType in NetworkRegistrationState" am: 24df195e78
...
am: 0c9e00dd03
Change-Id: I188a31f6b5f22c73c6892e30972c5a0d06f82ed1
2018-11-12 17:55:45 -08:00
Chen Xu
6e6268f6cb
Merge "do not link hidden intdef in the comments" am: a79188986a
...
am: ebe6360ccc
Change-Id: Id2861e50a61e5683d7a697553309971a1fe3ca05
2018-11-12 17:50:44 -08:00
Chen Xu
24df195e78
Merge "new SystemAPI for roamingType in NetworkRegistrationState"
2018-11-13 01:16:25 +00:00
Sahin Caliskan
9458ebccfc
Fix RcsManager and add empty RcsThread class
...
This change fixes the RcsManager setup and adds an empty RcsThread class. Please see go/rcs-in-telephony-doc for details.
Test: Builds fine
Bug: 109759350
Change-Id: Ie3fe476ab11d515ffab6dcc6ccf5ec801a4c9057
2018-11-12 15:52:54 -08:00
chen xu
3901ea4923
do not link hidden intdef in the comments
...
Bug: 118351153
Bug: 119119026
Test: build
Change-Id: I26be8e6d83e205589d10e6b7bd71297907aa5119
2018-11-12 14:35:32 -08:00
chen xu
a8d3d48941
support parent carrier id
...
The parent-child relationship can be used to further differentiate a
single carrier by different networks, by prepaid v.s. postpaid
or even by 4G v.s. 3G plan. parent carrier id it's an optional field.
A carrier id with a valid parent_carrier_id is considered fine-grained carrier id,
will not be returned as API getSimCarrierId but will be returned as
new API getSimPreciseCarrierId.
Bug: 110559381
Change-Id: Ica273cbad16b4773edc41b79ff4bf7570de40ec1
2018-11-12 11:30:16 -08:00
Chen Xu
3235c5c489
Merge "support parent carrier id"
2018-11-12 19:10:03 +00:00
Calvin Pan
87d67c4f19
Merge "Create new API for MNO carrier id" am: 7e74c4e431
...
am: 2c8b12a1da
Change-Id: I2e2c9928255a213f4a6489d3b4f77b27bfcb9846
2018-11-12 10:41:03 -08:00
Calvin Pan
7e74c4e431
Merge "Create new API for MNO carrier id"
2018-11-12 18:09:25 +00:00
Pengquan Meng
275161b420
Merge "Add 5G NR cellInfo" am: 4a7a3934b6
...
am: 89d69159c9
Change-Id: I28b7d4f95923d12919aa6946cafe1bf5a919db20
2018-11-12 08:58:46 -08:00
Pengquan Meng
4a7a3934b6
Merge "Add 5G NR cellInfo"
2018-11-12 16:28:57 +00:00
andychou
d9b97ecefe
Add PreciseDisconnectCause for SIP status code 481 Transaction Does Not Exist
...
Add ImsReasonInfo.CODE_SIP_TRANSACTION_DOES_NOT_EXIST and
PreciseDisconnectCause.SIP_TRANSACTION_DOES_NOT_EXIST
It will map by PRECISE_CAUSE_MAP in ImsPhoneCallTracker.java
Bug: 78204171
Test: local build pass
Change-Id: I10ec05256f748007657e4a8e60d07b1fd8a4f8b2
Merged-In: Iaa9673e4fa9568078161231df1b06735b862ca09
2018-11-12 15:21:41 +00:00
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
calvinpan
354b9771aa
Create new API for MNO carrier id
...
New telephony APIs to getSimMnoCarrierId and GET_CURRENT_APN_LIST
Bug: 115709816
Test: Build pass
Change-Id: I415ee634d8392d5120d5d8f79d927c0349d9a42e
Merged-in: I415ee634d8392d5120d5d8f79d927c0349d9a42e
2018-11-12 08:07:10 +00:00
chen xu
dd44d8132a
support parent carrier id
...
The parent-child relationship can be used to further differentiate a
single carrier by different networks, by prepaid v.s. postpaid
or even by 4G v.s. 3G plan. parent carrier id it's an optional field.
A carrier id with a valid parent_carrier_id is considered fine-grained carrier id,
will not be returned as API getSimCarrierId but will be returned as
new API getSimPreciseCarrierId.
Bug: 110559381
Change-Id: Ica273cbad16b4773edc41b79ff4bf7570de40ec1
2018-11-10 12:01:04 -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
Amit Mahajan
1bf4e92c50
Define new intent ACTION_LINE1_NUMBER_ERROR_DETECTED
...
Test: build
Bug: 115843312
Change-Id: Ibcc9ce533fbc6980a371eb6239a53dc9cdebb22a
2018-11-09 13:38:49 -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
f922b8e6ee
Add 5G NR cellInfo
...
- Add CellInfoNr
- Add CellIdentityNr
- Add CellSignalStrengthNr
Bug:111453000
Test: atest FrameworksTelephonyTests:
Merged-In: I45a8042fcbeb9faa7f8cc8db45eeb2c85125397e
Change-Id: I45a8042fcbeb9faa7f8cc8db45eeb2c85125397e
2018-11-08 13:39:57 -08: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