Commit Graph

99 Commits

Author SHA1 Message Date
Pengquan Meng
6aa5213eee Add 5G NSA status to ServiceSate
This added the 5G FrequencyRange to the ServiceState and 5G connection
status to NetworkRegisterationState.

Bug: 111453000
Test: atest FrameworksTelephonyTests
Merged-In: Iee824b2cfd9b48b56d6541b6eef617d23677a873
Change-Id: Iee824b2cfd9b48b56d6541b6eef617d23677a873
2018-11-16 10:47:00 -08:00
chen xu
e6e2a64783 new SystemAPI for roamingType in NetworkRegistrationState
Bug: 79262189
Test: telephony unit test
Change-Id: I443f3c109872ad595fc55fa77fe5e10e1c19b32f
2018-11-07 13:42:51 -08:00
Chen Xu
d4e2c6cd5a Merge "Revert "Revert "Telephony light grey list clean up for Q""" 2018-10-29 17:20:48 +00:00
Chen Xu
4c0b06d1d1 Revert "Revert "Telephony light grey list clean up for Q""
This reverts commit bab59cb9db.

Reason for revert: Put maxTargetSdk=P now will move APIs onto light greylist
because per-SDK versioned dark greylist is not yet supported by ART. We can
keep doing annotation work without breaking existing apps targeting on P.

Bug:117934933
Bug:112477300

Change-Id: I5e0e693dde49fac3044cd73fd6360c4485f312ec
Merged-in: I5e0e693dde49fac3044cd73fd6360c4485f312ec
2018-10-26 23:31:40 +00:00
chen xu
f513b528bd NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType
Bug: 117954963
Test: telephony unit test
Change-Id: I3e31955992de63f7002cbfd7b91ec408b2ff7b75
2018-10-21 14:29:53 -07:00
Chen Xu
bab59cb9db Revert "Telephony light grey list clean up for Q"
This reverts commit 253bdb7175.

Reason for revert: This CL caused MMS break because Bugle is using the
hidden API in Q's darkgrey list. The proper fix should either come from
Bugle team if their apk moved to Q, or compat team to explore why this
caused issue for app target on P.

Change-Id: Icc6c190cde79c10d9045183c0b80cdf008e95578

Bug: 117899984
2018-10-19 18:05:32 +00:00
chen xu
253bdb7175 Telephony light grey list clean up for Q
Bug: 112477300
Test: Telehony unit test
Change-Id: I5229224fe9a65b3647a42070f287e23f67084bda
Merged-in: I5229224fe9a65b3647a42070f287e23f67084bda
2018-10-15 10:19:43 -07:00
Chen Xu
6bd29ab2df Merge "refactor data/voice roaming states" 2018-10-12 18:02:17 +00:00
chen xu
0281169e6d refactor data/voice roaming states
1. migrate set/get roamingType from ServiceState to
NetworkRegState.set/get roamingType
2. migrate set/get roamingStateFromRegstate from ServiceState
to NetworkRegState.regState
3. new System API for neworkRegistration.isRoaming().

Bug: 116127096
Test: ServiceStateTest, ServiceStateProviderTest

Change-Id: Ib89744089c98713819c8d313240d629ddb77d0bf
2018-10-11 15:10:32 -07:00
Yangster
4ccebeadc7 Phone service state change atom.
Background: BatteryStatsService tracks the phone scanning time metric. In Q,
we are migrating the dumpsys-based collection to the new infra. This CL is to
instrument the new logging mechanism.

Test: statsd test
FIX: b/116748990

Change-Id: I3cf5e0026bfc6f594c5f7b524f14b3a43b702afb
2018-10-10 19:45:10 +00:00
Jack Yu
37a1fc31b5 Renamed get network registration states API
Using the term "for" is more appropriate than "from".

Test: Build
Bug: 73659459
Change-Id: I9e06a35979b887a14822862f290798a7f75a54f8
2018-10-02 17:01:51 -07:00
Jack Yu
b4ae477213 Reworked getNetworkRegistrationStates API
Added two new APIs for getting network registration states
from domain and transport type. Deprecated the old APIs.

Test: Manual
Bug: 73659459
Change-Id: I3143df320f2942213aa0f10fe3cca9851bd82bb8
2018-10-02 12:11:36 -07:00
Treehugger Robot
29664b8206 Merge "Fix oldMergedSS is altered to OUT_OF_SERVICE." 2018-09-01 02:02:24 +00:00
yifan.bai
257be4778a Fix oldMergedSS is altered to OUT_OF_SERVICE.
ServiceState.copyFrom would throw NPE if s.mCellBandwidths is null.
To fix, if s.mCellBandwidths is null, init mCellBandwidths to be null.

Test: Build pass;
Test: atest FrameworksTelephonyTests:ServiceStateTrackerTest

Bug: 112714563
2018-08-31 05:38:42 +00:00
Mathew Inwood
a838206e94 Add @UnsupportedAppUsage annotations
For packages:
  android.telephony
  android.telephony.cdma
  android.telephony.data
  android.telephony.euicc
  android.telephony.gsm
  android.telephony.ims
  android.telephony.ims.aidl
  android.telephony.ims.compat
  android.telephony.ims.compat.feature
  android.telephony.ims.compat.stub
  android.telephony.ims.feature
  android.telephony.ims.stub
  android.telephony.mbms
  android.telephony.mbms.vendor

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I02d900d6d0ec9a6b2172a71911fec61d04e4d235
Merged-In: I22547ac0ed384d74d61cfd51d20c140e392a597f
2018-08-23 09:37:53 +01:00
Jack Yu
d6284d9e0a Reordered the params for network registration
Test: Build
Bug: 73659459
Merged-In: I1af2c49a937177173b760d30b030da20f03c01d7
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
(cherry picked from commit 7928c4d1c3)
(cherry picked from commit c683c3930e)
2018-07-14 00:30:29 +00:00
Jack Yu
f2add90de4 DO NOT MERGE - Revert "Hide IWLAN system API"
This reverts commit ea440a765e, reversing
changes made to 0b90c524cb.

Test: Build
Bug: 73659459
Change-Id: Id5a5147c6478cf10661aebe52b445bd16195885e
2018-07-12 19:41:33 -07:00
Nathan Harold
3b08d8ff77 Merge changes I0d635067,I1424973b
am: 4d7a010983

Change-Id: I4372305da9b4b6b488bdeda0ec97b412e92bce58
2018-06-29 15:39:19 -07:00
Nathan Harold
7ee5f2185d Simplify equals() method of ServiceState
For whatever reason, ServiceState used a
somewhat-convoluted check for null and
class type. Updating to use a canonical
and brief approach.

Bug: 8675309
Test: compilation
Change-Id: I0d635067a06093affff478e13c28bbbe2bfda7df
2018-06-27 18:55:49 -07:00
Nathan Harold
b220fde296 Update ServiceState.hashCode()
hashCode() was missing about 10 fields and was
using some unnecessary bespoke logic to generate
hashes for individual fields. This CL simplifies
the hashCode() implementation and adds the missing
fields.

Bug: 8675309
Test: compilation
Change-Id: I1424973b11fcc6480d6f8c83d5fd0eb1b5533c7f
2018-06-27 17:13:03 -07:00
Jack Yu
a7025bae0a DO NOT MERGE - Hide IWLAN system API
Hide IWLAN system API for P. Will expose those APIs when IWLAN
full mode support is in place.

Test: Telephony sanity tests
Bug: 64132030
Change-Id: Ic56a04538fc532a7326c8a9234182899d52f15c1
2018-04-10 17:15:31 -07:00
Malcolm Chen
a1d5e9fb97 Marking some hidden API as TestApi.
Bug: 77488839
Test: cts
Change-Id: Id4adaa7d844ef2b0d54e54a450d326bbebc1e12d
2018-04-03 17:44:41 -07:00
Treehugger Robot
d3e1c76a99 Merge "Change null behavior of getCellBandwidths" 2018-03-23 21:06:45 +00:00
Eric Schwarzenbach
4e93e44115 Change null behavior of getCellBandwidths
Returns empty array instead of null when there are
no cell bandwidths.

Bug: 73751023
Test: make, runtest
Change-Id: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
Merged-In: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
(cherry picked from commit c119a86350)
2018-03-23 12:10:09 -07:00
Eric Schwarzenbach
c119a86350 Change null behavior of getCellBandwidths
Returns empty array instead of null when there are
no cell bandwidths.

Bug: 73751023
Test: make, runtest
Change-Id: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
2018-03-22 16:51:19 -07:00
Jack Yu
46d2bc06d6 Renamed getNetworkId and getSystemId
1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()

Test: Build
Bug: 74976831
Merged-In: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
Change-Id: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
(cherry picked from commit 2661fac133)
2018-03-16 11:07:37 -07:00
Jack Yu
6b4e6a17e9 Merge "Renamed getNetworkId and getSystemId" into pi-dev 2018-03-16 17:39:54 +00:00
Jack Yu
260f2fa1fe Added CTS test cases for getNetworkId() and getSystemId()
Bug: 32718590
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState
Merged-In: I5826a59d85028f0350ee39c69553f4e488d6456b
Change-Id: I5826a59d85028f0350ee39c69553f4e488d6456b
(cherry picked from commit 1b8b38928b)
2018-03-16 00:26:33 -07:00
Jack Yu
2661fac133 Renamed getNetworkId and getSystemId
1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()

Test: Build
Bug: 74976831
Change-Id: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
2018-03-15 16:39:19 -07:00
Eric Schwarzenbach
2c1a177902 Add Duplex mode to ServiceState.
Adds getChannelNumber() to CellIdentity.
Creates a static utility class to calculate the duplex mode from an
EARFCN.

Bug: 73728783
Test: runtest frameworks-telephony
Change-Id: I5b5c4efa7e17594ce9397cf65e129147affe96bd
Merged-In: I5b5c4efa7e17594ce9397cf65e129147affe96bd
(cherry picked from commit a483ce3bfd)
2018-03-09 13:22:30 -08:00
Eric Schwarzenbach
a483ce3bfd Add Duplex mode to ServiceState.
Adds getChannelNumber() to CellIdentity.
Creates a static utility class to calculate the duplex mode from an
EARFCN.

Bug: 73728783
Test: runtest frameworks-telephony
Change-Id: I5b5c4efa7e17594ce9397cf65e129147affe96bd
2018-03-08 07:39:32 -08:00
TreeHugger Robot
3a3bb15763 Merge "Added CTS test cases for getNetworkId() and getSystemId()" 2018-02-24 00:37:08 +00:00
Treehugger Robot
ab5bc3be50 Merge "Fixed service state CTS test failing" 2018-02-23 15:41:32 +00:00
Treehugger Robot
e9a215b238 Merge "Add comments according to the API review process." 2018-02-23 05:32:35 +00:00
Jack Yu
1b8b38928b Added CTS test cases for getNetworkId() and getSystemId()
Bug: 32718590
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState
Change-Id: I5826a59d85028f0350ee39c69553f4e488d6456b
2018-02-22 17:37:38 -08:00
Jack Yu
7d20eae135 Fixed service state CTS test failing
Added missing member variables in copyFrom().

Bug: 73298491
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState CtsTelephonyTestCases:TelephonyManagerTest#testGetServiceState
Change-Id: I750816a13801a911d68e0a774fd59602c81c5687
2018-02-22 14:35:43 -08:00
Cassie
e1c880242b Add comments according to the API review process.
* Explain what developers should use instead in the @deprecated note for Telephony#BEARER
 * Please add more documentation for network type bitmask - reference to just TelephonyManager is not sufficient because it has so much stuff in it.
 * Also remove the @hide tag for private constants in ServiceState.

Bug: 73751228
Test: Basic telephony sanity
Change-Id: Ie7405a961db4494104750bf406f20b1b4fb8191a
2018-02-22 09:08:48 -08:00
Malcolm Chen
574b41a1bd Add NetworkRegistrationState into SS's list.
Add hidden API to add NetworkRegistrationState into SS's
NetworkRegistrationState list.

Bug: 73305596
Test: unittest
Change-Id: Ief7f22632c1f3400c01663d13b990dc9b0d59e2e
2018-02-14 14:32:29 -08:00
Malcolm Chen
0a01c6b2e1 Update ServiceState to adapt NetworkService change.
SST is re-routed to get cellular registration states from
CellularNetworkService. Updating ServiceState to adapt that
change.

Bug: 64132030
Test: unittest
Change-Id: Ifd557ce50a4419ead6125cda29c79d331508448e
Merged-In: Ifd557ce50a4419ead6125cda29c79d331508448e
2018-02-05 14:45:20 -08:00
Jack Yu
677cfaa2a0 Added support for the new 1.2 data setup/deactivate API
Added support for the 1.2 IRadio APIs that support IWLAN handover.

Test: Telephony sanity tests
Bug: 64132030
Merged-In: I8c962bb45bc4d42610faa32f0ee36080e8e6cb65
Change-Id: I8c962bb45bc4d42610faa32f0ee36080e8e6cb65
(cherry picked from commit 08063d6c1b)
2018-02-01 03:26:10 -08:00
Eric Schwarzenbach
09a7773583 Add ServiceState APIs for carrier aggregation.
Adds getDuplexMode, getChannelNumber, and getCellBandwidths to
ServiceState.

Bug: 72117602
Test: runtest
Change-Id: I04be7d0a7d88693ef21b252ecc21aa974c2f89c8
2018-01-25 01:10:29 +00:00
Jack Yu
d5f1de19f4 Added network service interface
The interface for mobile network service. This is the base class
for vendor or first party data service provider to implement
the network service for cellular or IWLAN network support.

Test: Manual
bug: 64132030
Change-Id: Ia358cbb18fc6d15dcc45c75f14b7c952f899e101
2018-01-24 19:13:45 +00:00
Treehugger Robot
0cb936a855 Merge "Exposed CDMA SID/NID get APIs" 2018-01-10 02:19:20 +00:00
Jack Yu
9cd3b7b3f5 Exposed CDMA SID/NID get APIs
Made two existing hidden APIs getSystemId() and getNetworkId()
into public APIs.

Test: Telephony sanity tests
bug: 32718590
Change-Id: I436bd2699f8f805def753878d93e7dbf524e5f44
2018-01-09 12:25:52 -08:00
Cassie
d53df96426 Expose a new public column network_type_bitmask and deprecate
bearer_bitmask gradually.

Bug: 21276001
Test: Basic telephony sanity
Change-Id: I2896ba64959863d19c98af3e656d4c7e7b4f8d16
2017-12-21 13:23:16 -08:00
Nathan Harold
03d23999d3 Remove getNetworkType() from ServiceState
This method was deprecated 4 years and 11 months ago
and set to be removed in 2013. It was replaced by
getVoiceNetworkType().

Bug: 67589287
Test: make checkbuild on goog/master
Change-Id: I5fefa755738ff2fb3f3babfcafd4dfb329314feb
2017-10-13 12:06:02 -07:00
Nathan Harold
9acfe6f90a Cleanup ServiceState.toString()
Updating the formatting of the toString() method to
name the fields that it's printing, and to use one of
the more common formats for object dumping.

Bug: 64300932
Test: compilation, dumpsys
Change-Id: I56c4679d2a4a184f659870481e2ce0699fe38613
2017-08-14 13:27:44 -07:00
Sooraj Sasindran
c5659cae01 Support Signal strength offset
Support feature to offset LTE rsrp
for higher freaquency lte bands.

Test: Verified on device that signal bars increased
Bug=30628343
Merged-In: Id0b54901a1e8832fb48ba509e6a380c43f4c9497
Change-Id: Id0b54901a1e8832fb48ba509e6a380c43f4c9497
2017-03-15 15:41:03 -07:00
Robert Greenwalt
2232ac8c59 Merge "Get the correct operator name"
am: 297e9f9a32

Change-Id: Ic4c433e9b7e70427275fbbba785bb365e0ced8d5
2016-12-02 03:39:30 +00:00
Zoran Jovanovic
47495ebad0 Get the correct operator name
If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Merged-In: I4983ad708c57a650ce4a806e1f53837825bad2db
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
2016-12-01 21:50:14 +00:00