Commit Graph

40 Commits

Author SHA1 Message Date
Nathan Harold
e473d05388 Merge "Improve Range Checks on CellIdentity Classes" am: 7b2d8029ca
am: 684cc9528c

Change-Id: I6e21b1042db7a601190d7e7a0286c49280f79e63
2019-04-11 17:57:42 -07:00
Nathan Harold
251d0a9a99 Improve Range Checks on CellIdentity Classes
Add range checks to ensure that parameters passed
to CellIdentity are within range; if not then set
them to the UNAVAILABLE value.

Bug: 122834811
Test: atest FrameworksTelephonyTests
Change-Id: I0d3699823be60722a1b741efd60b56f23bbc3e86
2019-04-11 13:25:30 -07:00
Nathan Harold
4f41475f9a Update Javadocs for CellInfo Classes
-Add nullability annotations for getMccString
 and getMncString.
-Add IntRange to CellSignalStrength#getLevel()
-Fix a few docstring errors.

Bug: 129902021
Test: make && make update-api && make offline-sdk-docs
      (no functional change)

Merged-In: I61d645f79a23226ab902fc657fe7b07ffd674a0b
Change-Id: I61d645f79a23226ab902fc657fe7b07ffd674a0b
2019-04-09 20:04:15 +00:00
Nathan Harold
78cf8acf00 Update Javadocs for CellInfo Classes
-Add nullability annotations for getMccString
 and getMncString.
-Add IntRange to CellSignalStrength#getLevel()
-Fix a few docstring errors.

Bug: 129902021
Test: make && make update-api && make offline-sdk-docs
      (no functional change)

Change-Id: I61d645f79a23226ab902fc657fe7b07ffd674a0b
(cherry picked from commit b858d8c682261aae4ab5b99e5c0c99b627b329cb)
2019-04-09 11:25:34 -07:00
Hall Liu
5b4ad4fa6d Allow requestNetworkScan to return sanitized info am: c9d7430685 am: 87217889f1
am: 9e1d425b58

Change-Id: I3fab8c08100a68aba55eefb27b587e73849bc108
2019-04-01 14:29:04 -07:00
Hall Liu
c9d7430685 Allow requestNetworkScan to return sanitized info
If an app doesn't have location permissions or if the system location
switch is off, allow requestNetworkScan to still function, but sanitize
the returned CellInfo objects first and disallow certain input arguments

Bug: 126779616
Test: CTS
Change-Id: Ic9c44043bd30d402f128bf0723f2b0bf6c420e3e
2019-03-26 16:00:33 -07:00
Jeff Sharkey
9e8f83db6d All Parcelable CREATOR fields are @NonNull.
If they were null, then the Parcelable would fail to work.

Bug: 126726802
Test: manual
Change-Id: I7929ffa2f20e5de1c8e68e8263cca99496e9d014
Exempt-From-Owner-Approval: Trivial API annotations
2019-02-28 23:29:04 -07:00
Mathew Inwood
55418eada5 Limit access to suspected false positives.
Members modified herein are suspected to be false positives: i.e. things
that were added to the greylist in P, but subsequent data analysis
suggests that they are not, in fact, used after all.

Add a maxTargetSdk=P to these APIs. This is lower-risk that simply
removing these things from the greylist, as none of out data sources are
perfect nor complete.

For APIs that are not supported yet by annotations, move them to
hiddenapi-greylist-max-p.txt instead which has the same effect.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Change-Id: Ia937d8c41512e7f1b6e7f67b9104c1878b5cc3a0
Merged-In: I020a9c09672ebcae64c5357abc4993e07e744687
2018-12-28 14:26:35 +00:00
Mathew Inwood
31755f94e1 Limit access to suspected false positives.
Members modified herein are suspected to be false positives: i.e. things
that were added to the greylist in P, but subsequent data analysis
suggests that they are not, in fact, used after all.

Add a maxTargetSdk=P to these APIs. This is lower-risk that simply
removing these things from the greylist, as none of out data sources are
perfect nor complete.

For APIs that are not supported yet by annotations, move them to
hiddenapi-greylist-max-p.txt instead which has the same effect.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Change-Id: I020a9c09672ebcae64c5357abc4993e07e744687
2018-12-28 11:50:04 +00:00
Nathan Harold
7ce5baf9a9 Refactor CellInfo Constructors
Bug: 119224773
Test: atest FrameworksTelephonyTests
Change-Id: Ibf56797b5be2508656409a3437ff79210334bfd6
2018-12-26 09:45:31 -08:00
Nathan Harold
13d6b11987 Annotate getMobileNetworkOperator() as Nullable
Add Nullable annotations for the classes that support
getMobileNetworkOperator().

Bug: 118675404
Test: compilation (no functional change)
Change-Id: I914ec8242aff2f578dfe1f97f2e7cfe2d109c7dc
2018-12-18 13:41:25 -08:00
Nathan Harold
a629ea3928 Define CellInfo.UNAVAILABLE for Unreported Fields
For all CellInfo classes, there is a common value for
fields that are unreported by the modem: Integer.MAX_VALUE.
To better document this value, this CL defines it as a
constant "UNAVAILABLE" to indicate that for whatever reason
the framework is not reporting this value to the caller.

Bug: 28171234
Test: make; make offline-sdk-docs
Change-Id: I0aa692e3f1b5478284d262ef97fd65b90bce8293
2018-10-25 23:00:11 +00:00
Nathan Harold
713eef404e Merge "Add Conversion from CellIdentity to CellLocation" 2018-08-23 23:01:23 +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
Nathan Harold
7590feeb3a Add Conversion from CellIdentity to CellLocation
Add OO conversion from CellIdentity to CellLocation
in the respective CellIdentity classes.

Bug: 67711865
Test: manual
Change-Id: I4e2dab7de5e5c5fa3bb42a22b14934874560c9fc
2018-08-21 20:44:25 +00:00
Nathan Harold
65c4b15d42 Merge CellInfo TYPE Enums
CellIdentity and CellInfo had redundant enums to
designate the structure type. This CL merges the
better-formatted enums from CellIdentity to
CellInfo, removing the set from CellIdentity.
For cases where the structure type must be determined
at runtime based on a CellInfo record, (where
polymorphic behavior isn't/shouldn't be supported),
this provides a consistent mechanism for determining
the type without using RTTI.
In addition, this CL fixes two other minor issues:
1) The constructor for CellInfoWcdma() provided the
   wrong parcel type to the parent class.
2) The TYPE_TDSCDMA had a typo in CellInfo and was
   written as TYPE_TDCDMA.

Bug: 112003199
Bug: 67711865
Test: runtest frameworks-telephony
Change-Id: I5ca3c2de1433dfcef264e1273a658d1a0fe864b6
2018-08-09 23:26:01 +00:00
Cassie
21ed3c58e8 Move alpha long/short to the base CellIdentity according API Review.
Bug: 74831568
Test: Telephony sanity
Change-Id: I0ef69e3f18fca111191e1c6329ae13c0860869ba
2018-03-23 11:07:18 -07:00
Xi Han
cd6bb7242c Merge "Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity." into pi-dev 2018-03-20 20:49:13 +00:00
Cassie
9ba450d805 Add @Nullable annotations to getOperatorAlphaLong and
getOperatorAlphaShort to CellIdentity.

Bug: 75984192
Test: Unit test
Change-Id: I71feb20075559c7b28d4aa346a603f0d11ca69da
2018-03-20 10:47:26 -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
Cassie
d062c3221a Expand use of 'Str' suffix in CellIdentity to 'String'
Expand use of 'Str' suffix in CellIdentity to 'String' to match general
usage across Android according to the API Review.

Bug: 73751308
Test: Unit test
Change-Id: Ib25a06056832be610ff1fb9c025467259eb543ed
2018-02-28 11:45:29 -08:00
Eric Schwarzenbach
a9d9b021be Update CellInfo API to accomodate new fields.
Adds CellConnectionStatus to top level CellInfo type. Adds cell bandwidth
to the CellIdentityLte.

Bug: 72117223
Test: runtest frameworks-telephony

Change-Id: Id5f3b5a2bd4119c099f5e739d5579974e7adc897
2018-01-25 07:25:04 +00:00
Jack Yu
6cd44734b0 Added Cell identity for TD-SCDMA and a base class CellIdentity
Added CellIdentityTdscdma for TDS-CDMA cell identity. Also added
a base class for existing CellIdentityXxx so that the network
service can return specific RAT cell identity through the
network service callback API which takes generic cell identity
as the parameter.

This is the preliminary change for IWLAN refactoring since cell
identity is part of the CS/PS network registration.

bug: 64132030
Test: Unit tests
Change-Id: I3ca405d687667b6c43e782339edec26a6f6edfc9
2018-01-10 01:37:04 -08:00
Cassie
b799fcdd69 Quick fix the getMobileNetworkOperator() in CellIdentity.
Bug: 69915536
Test: Basic telephony sanity
Change-Id: Iac8222055aea95fbb5334876124ce9d1571ae2f6
2017-11-30 15:54:51 -08:00
Cassie
13df901de7 Update the comments for all CellIdentity*.
Bug: 63984327
Test: Basic telephony sanity
Change-Id: Icb9ba99cefb93a7c4a39cbc653ae046df8649cf9
2017-11-17 14:16:01 -08:00
Cassie
ae5885d54e Allow unknown mcc/mnc when constructing a CellIdentity from Parcel.
Bug: 63984327
Test: Basic telephony sanity
Change-Id: Ia7670b7cd49db244e7c8309419ea8d7b1280a7fa
2017-11-15 17:11:17 -08:00
Cassie Han
2200da1cdc Revert "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
Bug: 69349963
Bug: 69096589
Bug: 63984327

This reverts commit 993203c7e0.

Change-Id: I52839aa5991541399651904587aa342a858a5915
2017-11-15 17:32:31 +00:00
Cassie
993203c7e0 Allow unknown mcc/mnc when constructing a CellIdentity from Parcel.
Bug: 69096589
Bug: 63984327
Test: Basic telephony sanity
Change-Id: I0fe5b3a17b1a68c918f912ee98a00cfec4c5657b
2017-11-13 09:14:59 -08:00
Cassie
933b78d977 Add the operator name and MCC/MNC in string format into the CellIdentity.
Bug: 63984327
Test: Basic telephony sanity
Change-Id: Ia5e7f5b980efbde647f95f3e83a62d56132b90da
2017-10-25 10:04:31 -07:00
Sanket Padawe
0c86efdbd9 Cellinfo: Update to version 12
Add support for:
GSM: arfcn, bsic, ta
WCDMA: uarfcn
LTE: earfcn
Updated public APIs for getting above fields.

Bug: 23528586
Change-Id: I97e18856bb41c5592f89641eac7d4a3dbef43d5d
2016-01-26 18:42:47 -08:00
Narayan Kamath
d44d16f700 Revert "Cellinfo: Update to version 12"
This reverts commit aa2be45a56.

Change-Id: I5cc76b15b311e47bc5a892704930d218c9f72b0d
2016-01-26 09:44:54 +00:00
Sanket Padawe
aa2be45a56 Cellinfo: Update to version 12
Add support for:
GSM: arfcn, bsic, ta
WCDMA: uarfcn
LTE: earfcn
Updated public APIs for getting above fields.

Bug: 23528586

Change-Id: I538a9f392550716d8a9a90e01fc88bc082ef7b81
2016-01-25 14:14:30 -08:00
Brian Williammee
7d1d2e39f3 Improve equals and hashCode in CellIdentityXxx methods
The equals methods were a lot of dead code that boiled down to
seeing if two references pointed to the same object.  The hashCode
methods were likely to result in collisions on unequal objects.

Bug: 10328291
Change-Id: I4bd93efd1f4a34e9dec55ac05868df37368abd6a
2014-09-10 17:06:09 -07:00
Wink Saville
125cf62d59 Fix CellIdentityLte.equals
Bug: 16902094
Change-Id: I92786dc792bf318d2236212eb2acf955ec41e066
2014-08-12 22:39:35 +00:00
Wink Saville
e3a9cbc052 Add CellInfoWcdma and related classes.
Update javadoc's to define invalid values are Integer.MAX_VALUE.

Bug: 8622081
Change-Id: I513a67d4b46b72f03e0c3360abcc0ad5222c1c13
2013-04-17 16:40:17 -07:00
Wink Saville
094beeccf5 Add FW support for CellInfo RIL commands.
Bug: 8235566
Change-Id: I7ad7dabc4b6c38bfba4461b08e6e30d0eb9efea1
2013-04-08 15:19:43 -07:00
Wink Saville
599a90c2a0 Use Rlog instead of Log
Change-Id: I2332f4210ead8a6d751fc9c0505db25033641da2
2012-11-27 12:29:13 -08:00
Wink Saville
c6e4917add Refactor Cell Location public API.
Bug: 7189651
Change-Id: I173412095a5f7ae6116ee65b5315782f1c0c7688
2012-09-21 13:54:05 -07:00
Wink Saville
3caf66d2ea Unhide the new location API's
Change-Id: I41cc89998b8bd1e6686ea30475ab8905a133e312
2012-07-26 11:48:12 -07:00
Wink Saville
b208a24cf5 Revise and update CellInfo API's
Change-Id: I25a46076a244f50edb9da65816b3717e00820b34
2012-07-25 14:08:09 -07:00