Commit Graph

5572 Commits

Author SHA1 Message Date
Eric Schwarzenbach
df5e92833e Merge "Add PhysicalChannelConfig." am: c584d2772d am: 3deaafd8cd
am: 9d3738232c

Change-Id: I707415785137603f787ff5e12035d58980a21d18
2018-01-24 17:02:09 +00:00
Eric Schwarzenbach
9d3738232c Merge "Add PhysicalChannelConfig." am: c584d2772d
am: 3deaafd8cd

Change-Id: Id6ec6d693ec05d363b2847d0e4eee72fea24aef9
2018-01-24 16:52:03 +00:00
Eric Schwarzenbach
c584d2772d Merge "Add PhysicalChannelConfig." 2018-01-24 16:17:53 +00:00
Nicolas Geoffray
b5928a2b81 Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am: 1f568c14ac
am: b91d1b3e3a

Change-Id: I8cae11d0c9e4b72bc821af2a424380adaa59847d
2018-01-24 12:40:45 +00:00
Nicolas Geoffray
1f568c14ac Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" 2018-01-24 10:44:10 +00:00
Neil Fuller
4cfc02a316 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.
2018-01-24 10:07:48 +00:00
Holly Jiuyu Sun
d201c4dd51 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fd5b7e1c3 am: 5598f5ab23
am: 687a28d77d

Change-Id: I56abcc7731ca08ed67a5123f826bfbc9ca4f74d0
2018-01-24 09:42:42 +00:00
Cassie Han
a600b31201 Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." am: eb9452a08d am: 8e3dcbb5d3
am: b828fa2bfc

Change-Id: I086a958cab93dcbc47103e5d0c7d91dba5aab412
2018-01-24 09:37:29 +00:00
Nicolas Geoffray
5c9dcc0e72 Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."
AOSP build broken.

Bug: 71914112

This reverts commit 2f87d7b2ee.

Change-Id: I53537a6da7616fe6dbbb79927b32720bbeaf1f69
2018-01-24 09:11:40 +00:00
Holly Jiuyu Sun
687a28d77d Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fd5b7e1c3
am: 5598f5ab23

Change-Id: Ib79c5a2d05c09c8a36dd2e761719f37520735c00
2018-01-24 08:10:38 +00:00
Eric Schwarzenbach
5c6b3a3557 Add PhysicalChannelConfig.
Adds a field to PhoneStateListener to listen for changes to the
PhysicalChannelConfig list.

Bug: 72117533
Test: make
Change-Id: I353a4b90354d54948bce75968fb5fe1803efd093
2018-01-23 23:08:56 -08:00
Cassie Han
b828fa2bfc Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." am: eb9452a08d
am: 8e3dcbb5d3

Change-Id: Iacd500459bb8418d41bae56131ecdac0ac6471bd
2018-01-24 06:17:42 +00:00
Holly Jiuyu Sun
48c6e980f5 Merge "Add cardId in EuiccCardManager API." am: a85291bfcf am: 50b8d3ef75
am: 9d5d23b69a

Change-Id: Ie922ef52b4fb5b6ee95bb5976b16d5f54d9b43a1
2018-01-24 05:39:57 +00:00
Holly Jiuyu Sun
9d5d23b69a Merge "Add cardId in EuiccCardManager API." am: a85291bfcf
am: 50b8d3ef75

Change-Id: I7fdb6666728bfa31405d23c5880dba2c63a89e41
2018-01-24 05:33:02 +00:00
Holly Jiuyu Sun
8fd5b7e1c3 Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." 2018-01-24 05:08:19 +00:00
Cassie Han
eb9452a08d Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." 2018-01-24 04:55:32 +00:00
Holly Jiuyu Sun
a85291bfcf Merge "Add cardId in EuiccCardManager API." 2018-01-24 04:06:40 +00:00
Holly Jiuyu Sun
e3ff07125c Merge "Make getIEuiccContronller() protected and non-static for CTS." am: 2378a2ca0b am: 24ba89dafe
am: 083022a701

Change-Id: I130b3e8aef6c45e5931d838a3dfd2817dcb7afe8
2018-01-24 02:29:45 +00:00
Holly Jiuyu Sun
083022a701 Merge "Make getIEuiccContronller() protected and non-static for CTS." am: 2378a2ca0b
am: 24ba89dafe

Change-Id: Ia5313c8daab24242ae4a00bfdc23eb4f23634558
2018-01-24 02:21:14 +00:00
Xiangyu/Malcolm Chen
592ae5cb9f Merge "Add TransportType in AccessNetworkConstants.java" am: afd65d9d1c am: dae9a8e839
am: c240b8c25f

Change-Id: Ie866867f99c8699703b6d12d0af78fbff5d5f59b
2018-01-24 01:36:58 +00:00
Xiangyu/Malcolm Chen
c240b8c25f Merge "Add TransportType in AccessNetworkConstants.java" am: afd65d9d1c
am: dae9a8e839

Change-Id: I593635999bdfa290b012313d9967bddfc5e7bfe1
2018-01-24 01:23:32 +00:00
nharold
277ff08723 Merge changes from topic "signal-strength-cleanup" am: fb24180fe0 am: 2621c9f6ad
am: d5c9522b43

Change-Id: I8c30c1401e97adcb026a25607a737bd336685807
2018-01-24 01:19:36 +00:00
Nathan Harold
1b274d9365 Cleanup SignalStrength Parcel am: 9becf4b334 am: 02f4ec2eed
am: a644d93ec9

Change-Id: Id3abf1f4c2f1faaef6dd44e702590f157fcac7d2
2018-01-24 01:15:14 +00:00
Holly Jiuyu Sun
c2779f56fb Add cardId in EuiccCardManager API.
Removed getEid() API.

Bug: 38206971
Test: test on phone
Change-Id: I7e484f889a780900acd3a05a96fbbc632e1ec682
2018-01-23 17:11:30 -08:00
Holly Jiuyu Sun
2378a2ca0b Merge "Make getIEuiccContronller() protected and non-static for CTS." 2018-01-24 01:09:44 +00:00
nharold
d5c9522b43 Merge changes from topic "signal-strength-cleanup" am: fb24180fe0
am: 2621c9f6ad

Change-Id: I30b5deb01ed68dc0e235e9997fa147aadb924749
2018-01-24 01:08:33 +00:00
Nathan Harold
a644d93ec9 Cleanup SignalStrength Parcel am: 9becf4b334
am: 02f4ec2eed

Change-Id: I9e862b15ab4b5871d9d7e00af86ab9049b5b7b50
2018-01-24 01:05:07 +00:00
Nathan Harold
02f4ec2eed Cleanup SignalStrength Parcel
am: 9becf4b334

Change-Id: I44e6b2187bbcb2334adb40be5d438f581d9638bb
2018-01-24 00:54:13 +00:00
Xiangyu/Malcolm Chen
afd65d9d1c Merge "Add TransportType in AccessNetworkConstants.java" 2018-01-23 23:39:10 +00:00
Holly Jiuyu Sun
2f87d7b2ee Add getUiccSlots() and switchSlots() in TelephonyManager.
Bug: 71914112
Test: test on phone
Change-Id: Ib7e9e40e5ecda48bdcd1f332dc7d6c422c08d942
2018-01-23 15:26:34 -08:00
nharold
fb24180fe0 Merge changes from topic "signal-strength-cleanup"
* changes:
  Fix getAsuLevel returns "99" in Lte and TdScdma.
  Cleanup SignalStrength Parcel
2018-01-23 23:23:48 +00:00
Cassie
866f494dc2 Move android.provider.Telephony.SECRET_CODE to Telephony.Intents.
Bug: 69616728
Test: Basic telephony sanity
Change-Id: Ia053f9be082ceb139a284598ee2398a25daa7e08
2018-01-23 15:06:53 -08:00
Jeff Sharkey
5dd54fdfb6 Merge "Expose existing SubscriptionPlan APIs." 2018-01-23 22:39:11 +00:00
Jack Yu
2376cbe33f Merge "Combined flags of data service requests into one reason param" am: 7d441c9b27 am: 28f64b869c
am: eeac3b9d62

Change-Id: I6b33b760ff26e1aaf7fdf3929ca71c7c14d78b36
2018-01-23 22:09:11 +00:00
Jack Yu
eeac3b9d62 Merge "Combined flags of data service requests into one reason param" am: 7d441c9b27
am: 28f64b869c

Change-Id: I5823943d1e3bed41f4bd26fa1d718d6a2e6acc48
2018-01-23 22:00:39 +00:00
Amit Mahajan
b641b585bb Merge "Added new slot status related broadcast." am: cdc0a084d1
am: 40effae0f3

Change-Id: I3a4174eff2dc8ce017aae4c2d31f2facde02dbe5
2018-01-23 19:50:57 +00:00
Treehugger Robot
7d441c9b27 Merge "Combined flags of data service requests into one reason param" 2018-01-23 19:43:25 +00:00
Holly Jiuyu Sun
2c2c711a1d Make getIEuiccContronller() protected and non-static for CTS.
Test: test on phone
Change-Id: I706a0a9e064a0f2f91674cb2ff38a5929eaaf627
2018-01-23 10:35:37 -08:00
yifan.bai
5c40d8914d Fix getAsuLevel returns "99" in Lte and TdScdma.
GetAsuLevel method judges valid signal by
getLteLevel/getTdScdmaLevel. However, level is
SIGNAL_STRENGTH_NONE_OR_UNKNOWN does not mean not in
Lte/TdScdma.
For example, if mLteRsrp is in (threshRsrp[1],
threshRsrp[0]], getLteLevel would return
SIGNAL_STRENGTH_NONE_OR_UNKNOWN. But this only
means Lte signal is very weak, and ASU should be
(mLteRsrp + 140) not "99" (3GPP 27.007 Sec 8.69).

Bug: 72116430
Test: Build
Change-Id: If930c3e3d23a9af7b2e51e3560cc28607a6328c0
2018-01-23 18:32:22 +00:00
Nathan Harold
9becf4b334 Cleanup SignalStrength Parcel
Clean up the SignalStrength parcel. This CL
removes redundant constructors, simplifies the
overall initialization process, and stratifies
the components of the parcel into 2 separate
parts: the strength values from RIL, and the
config values provided by the platform.

Bug: 72116430
Test: runtest frameworks-telephony
Change-Id: Id7d2339362270b3911e96094275e1e545d6b581c
2018-01-23 18:25:44 +00:00
Malcolm Chen
8949cc2d1a Add TransportType in AccessNetworkConstants.java
Bug: 64132030
Test: build
Change-Id: I916a0b889110195d23b2a531308171cf4ea74f0c
2018-01-23 10:20:16 -08:00
Treehugger Robot
cdc0a084d1 Merge "Added new slot status related broadcast." 2018-01-23 18:00:00 +00:00
Amit Mahajan
6ba8bc8a47 Merge "Added new slot status related broadcast." 2018-01-23 16:28:16 +00:00
Jeff Sharkey
e14c843877 Expose existing SubscriptionPlan APIs.
They're ready for prime-time!

Test: builds, boots
Bug: 64133169
Change-Id: Ic6c25b9e53daaf33577c9be168ac9962c8a23eed
2018-01-23 05:51:53 -07:00
Amit Mahajan
c0a2e5f05d Added new slot status related broadcast.
Test: none
Bug: 64131518
Merged-in: I0a5825a1d121dc22f042fd71598f58e064e9e2a2
Change-Id: I0a5825a1d121dc22f042fd71598f58e064e9e2a2
2018-01-22 18:31:01 -08:00
Qingxi Li
54438137c6 Merge "Add broadcast action for carrier setup" am: b60e42becd
am: d6d448f68b

Change-Id: I085b0d23182696ba6ec639e1f48ec14ed010fecd
2018-01-23 01:25:35 +00:00
yuemingw
f197536347 Merge "Add NetworkTypeBitmask into public ApnSetting." am: 278dd4ab90 am: 97104cb905
am: aa32802268

Change-Id: Iab92157d82b1aa399aa06e77abdcf22d71f9f3b9
2018-01-23 01:22:09 +00:00
yuemingw
aa32802268 Merge "Add NetworkTypeBitmask into public ApnSetting." am: 278dd4ab90
am: 97104cb905

Change-Id: Ibef74c641596dc57d8a525316ba95ff35e07fce2
2018-01-23 01:07:24 +00:00
Chen Xu
5871db10a5 Merge "address carrier id api review feedback" am: 2f6b2726e6
am: e6211a5f01

Change-Id: I3e601111b7da73158cf1ce281abd77b6d5cfc68f
2018-01-23 01:02:36 +00:00
Treehugger Robot
b60e42becd Merge "Add broadcast action for carrier setup" 2018-01-22 23:55:49 +00:00