Commit Graph

3809 Commits

Author SHA1 Message Date
Malcolm Chen
bd4ae76753 Abstract set APIs in SubscriptionManager
Put common codes of set APIs in Subscription into an unified method.
So that later it's easier to add APIs.

Bug: 112167869
Test: unittest
Change-Id: Idd2312c98fc178f078c75937ba2d8c2e414f3c3a
Merged-In: Idd2312c98fc178f078c75937ba2d8c2e414f3c3a
2018-08-15 17:00:48 -07:00
Mathew Inwood
b558baa4cc Merge "Add @UnsupportedAppUsage annotations" 2018-08-15 13:32:04 +00:00
Xiangyu/Malcolm Chen
03fcb263ab Merge "Remove old SubscriptionInfo constructors." 2018-08-14 18:58:25 +00:00
Malcolm Chen
fdcf6469f1 Remove old SubscriptionInfo constructors.
Bug: 92796390
Test: build
Change-Id: Id5ce174b43934e690f6c1682e502b3b7e344a865
Merged-In: Id5ce174b43934e690f6c1682e502b3b7e344a865
2018-08-13 16:33:18 -07:00
Nathan Harold
d3395b08c2 Merge "Merge CellInfo TYPE Enums" 2018-08-10 23:56:54 +00:00
Youming Ye
2052fba20a Merge "Fix permission check for TelephonyManager#isTtyModeSupported." 2018-08-10 18:21:25 +00:00
Mathew Inwood
ba503117f4 Add @UnsupportedAppUsage annotations
For packages:
  android.providers.settings
  android.provider

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: I993adf36dc31a5e224e88217c9e8dc140b6ba880
Merged-In: I3865ac184fcb6f52c6bfab9729611b065b27722e
2018-08-10 09:37:35 +01:00
Youming Ye
9b3eb9c9b5 Fix permission check for TelephonyManager#isTtyModeSupported.
TelephonyManager now calls TelecomManager#isTtySupported directly, instead of calling from its implementation PhoneInterfaceManager.

Bug: 79502396
Test: Manual
Change-Id: I686b93d31850103f1cfb7003fe0506d08a424f27
2018-08-09 17:32:11 -07:00
Hall Liu
01f0135ba4 Merge "Don't insert certain numbers into the call log" 2018-08-09 23:43:22 +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
Hall Liu
51c7daaa75 Don't insert certain numbers into the call log
For regulatory requirements, prevent certain sensitive numbers from
being logged in the call log. The numbers can either be specified in the
carrier config or in the mcc config for the device.

Bug: 111470439
Test: unit, manual
Change-Id: Icc4db12def802c2ce5485422a0ec199e3e7452fa
Merged-In: Icc4db12def802c2ce5485422a0ec199e3e7452fa
2018-08-09 21:57:57 +00:00
Nathan Harold
9257722c5c Merge "Construct NeighboringCellInfo from CellInfo" 2018-08-09 21:31:55 +00:00
Hall Liu
1a622a4215 Merge "IMS: Adding support for TIR/TIP permanent provisioning" 2018-08-09 20:24:18 +00:00
Ashit Sood
51832a756a IMS: Adding support for TIR/TIP permanent provisioning
- Adding ProvisionStatus to ImsSsInfo

Test: Manual
Bug: 79133104
Change-Id: I26bdfc573a64aaba7d853c1f9cd592fa95e294c0
2018-08-08 21:27:38 -07:00
Nathan Harold
45fb10525e Construct NeighboringCellInfo from CellInfo
As part of removing neighboring cell info this
CL adds support for constructing a NeighboringCellInfo
object from a CellInfo object.

Bug: 62490173
Test: tested manually using SL4A with both O-MR1 and current
    target SDKs
Change-Id: I278487e506b07ab97589da85f69f1188c73b6eb9
2018-08-08 11:02:28 -07:00
Nathan Harold
bb67bab55f Merge "Throw on revoked location permission - framework" 2018-08-02 22:16:07 +00:00
Svet Ganov
56c4148e41 Throw on revoked location permission - framework
When we fixed proper handling of location permisison gating
sensitive telephony calls we stopped throwing a security
exception when the permission is not held by the caller.
While this is not a security issue there is no reason to
change this behavior which is checked by CTS. This CL starts
throwing a security exception if the permission is not held.

Test: atest android.permission.cts.NoLocationPermissionTest

bug: 74074103

Merged-In: Ic891d62b408c692f84a345f24503f7f25d583e35
Change-Id: Ic891d62b408c692f84a345f24503f7f25d583e35
(cherry picked from commit 33b1509375)
2018-08-02 11:35:00 -07:00
Nathan Harold
8f4fdd4e78 Merge "Pass SdkVersion to getNeighboringCellInfo"
am: cec3f1fafb

Change-Id: I46ede415a660852938506b9bd4eebff409da5929
2018-08-01 15:51:30 -07:00
Malcolm Chen
9afe59bf1c Have proper permission check in getConfigForSubId
In CarrierConfigManager, add pass context in constructor, so that
when calling CarrierConfigLoader#getConfigForSubId, it can pass
callingPackage.

Bug: 73136824
Test: regression
Change-Id: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
Merged-In: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
2018-07-31 18:43:01 -07:00
Nathan Harold
3892d05850 Pass SdkVersion to getNeighboringCellInfo
Bug: 62490173
Test: tested manually with SL4A (P and P+ SDK)
Change-Id: I65bae72ab8379f996486e7f4326eddf1b305658a
2018-07-30 17:19:59 -07:00
Treehugger Robot
c14a4be799 Merge "Have proper permission check in getConfigForSubId" 2018-07-30 19:49:20 +00:00
Malcolm Chen
6cc64f7244 Have proper permission check in getConfigForSubId
In CarrierConfigManager, add pass context in constructor, so that
when calling CarrierConfigLoader#getConfigForSubId, it can pass
callingPackage.

Bug: 73136824
Test: regression
Change-Id: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
Merged-In: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
2018-07-28 01:41:06 +00:00
Hall Liu
9e76e3acb9 Merge "Add carrier config for auto redialing 911"
am: b91316f203

Change-Id: Ie77021a09bb896faaa5fc5686563b0ddbf645d48
2018-07-26 17:52:16 -07:00
Hall Liu
b91316f203 Merge "Add carrier config for auto redialing 911" 2018-07-26 20:22:03 +00:00
Hall Liu
f31f38562f Add carrier config for auto redialing 911
Bug: 111235453
Test: manual (modify IMS stack locally to always return the 380 error
when dialing in airplane mode)

Change-Id: I029d2227ce62bb11fa91e9d5338a667d6e3dd59b
2018-07-25 18:48:55 -07:00
Nathan Harold
232487ff44 Merge "Access Identity and SignalStrength from CellInfo"
am: c99ced9db8

Change-Id: Ibec751dc256381a504d0366725f6d43b624f27ab
2018-07-23 15:53:55 -07:00
Nathan Harold
c99ced9db8 Merge "Access Identity and SignalStrength from CellInfo" 2018-07-23 21:35:00 +00:00
Nathan Harold
7b3f7a44af Access Identity and SignalStrength from CellInfo
Accessing common CellIdentity and CellSignalStrength
information should not require RTTI. Thus, add
overloaded methods that allow the access the common
versions of these functions from a top level CellInfo.

Bug: 10151416
Test: compilation

Change-Id: I18f31c5cec075dcd68cc493e24c2d551138dd73c
2018-07-19 15:24:14 -07:00
Hall Liu
fce4acd679 Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""" 2018-07-16 22:52:10 +00:00
Jack Yu
5e7bbe01c4 Merge "Added documentation for network registration state"
am: 3c1604da8b

Change-Id: Icf8f0fff21c1190d3bde21cdbe378d6b75b51506
2018-07-15 17:12:41 -07:00
Hall Liu
79b6840516 Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""
This reverts commit 0082b161ca.

Reason for revert: build breaks fixed

Change-Id: I75ea63ceaae6e970ce51a971c9a4635d0ce3f9e4
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-14 00:32:56 +00: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
b494f72750 Added documentation for network registration state
Also renamed denial reason to reject cause to match
the 3GPP spec.

Bug: 73659459
Test: Build
Change-Id: Ia67ebf94771c7ff5f5d90f6cdd303cb2716f9186
(cherry picked from commit b4094993f7)
2018-07-13 14:50:02 -07:00
Jack Yu
1bee26f4c3 Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master 2018-07-13 19:28:23 +00:00
Treehugger Robot
f92ad05fa5 Merge "Revert "Update SubscriptionInfo o use strings for mccmnc"" 2018-07-13 16:34:30 +00:00
Yueming Wang
0082b161ca Revert "Update SubscriptionInfo o use strings for mccmnc"
This reverts commit 0c149bd2d8.

Reason for revert:  reverting this topic as it breaks several branches.

Change-Id: Ia01984242e54b5db5d853135b322ebb1284a4d43
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-13 11:15:50 +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
Hall Liu
08a4eb9445 Merge "Update SubscriptionInfo o use strings for mccmnc"
am: 0babf1815c

Change-Id: I1833cb2d5437cccb61cc8f6dcd884a45a2b3250f
2018-07-12 15:22:52 -07:00
Hall Liu
0babf1815c Merge "Update SubscriptionInfo o use strings for mccmnc" 2018-07-12 21:13:16 +00:00
Nathan Harold
f5f908c525 Merge "Remove Duplicate Override for Operator Alphas"
am: 24eaa6ab3d

Change-Id: I15004a7df3d922ba50d187769299723e888febae
2018-07-12 12:35:18 -07:00
Jack Yu
1cbcc50d0a Merge "Revert "Added documentation for network registration state"" 2018-07-12 18:16:26 +00:00
Nathan Harold
24eaa6ab3d Merge "Remove Duplicate Override for Operator Alphas" 2018-07-12 18:08:05 +00:00
Jack Yu
7e1be05b14 Revert "Added documentation for network registration state"
This reverts commit b4094993f7.

Reason for revert: Caused merge conflict. Need to come up with a better solution.

Change-Id: Id7b7f35c25775a7a095b77a90724cf3a0f8daf7e
2018-07-12 17:39:12 +00:00
Nathan Harold
22590b06e8 Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"
am: c1e5c3ea82

Change-Id: I4bbedcc3f47706d677a1c66273bf1643c8f21be5
2018-07-11 12:09:10 -07:00
Jack Yu
b4094993f7 Added documentation for network registration state
Also renamed denial reason to reject cause to match
the 3GPP spec.

Bug: 73659459
Test: Build
Change-Id: Ia7b4a53070c06edd98ae767fd6f56c4000d8e4d0
2018-07-11 11:08:48 -07:00
Nathan Harold
c1e5c3ea82 Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" 2018-07-11 17:58:50 +00:00
Hall Liu
0c149bd2d8 Update SubscriptionInfo o use strings for mccmnc
Add methods to get mcc/mnc as strings so that the leading-zero
ambiguity is resolved.

Test: manual (db update), unit tests
Bug: 35064313
Change-Id: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-10 15:51:26 -07:00
Nathan Harold
59356594d2 Remove Duplicate Override for Operator Alphas
These methods override the base class methods
and don't actually add any value. Removing them
as redundant.

Bug: 76153768
Test: telephony unit test - testCellIdentityTdscdma()
Change-Id: I98200a7198e182e6279851c51082bf625ee09fe9
2018-07-10 13:50:44 -07:00
Nathan Harold
054b79d49f Update Wcdma and Tdscdma CellInfo for HAL 1.2
In HAL 1.2 WCDMA and TDSCMA were updated to bring
them in line with the other CellInfo types. WCDMA
was missing support for Rscp and Ec/No; the former
being the primary measurement used for WCDMA signal
strength. TDSCDMA was missing support for RSSI, and
the definition for RSCP was incorrect, so it was fixed
to use the PCCPH RSCP.

Furthermore, TDSCDMA support was unavailable except
in the CellIdentity. This patch pipes support from the
HAL to the framework, adding CellInfoTdscdma, which is
primarily for Asia.

-Add RSCP and Ec/No fields to CellSignalStrengthWcdma
-Add CellInfoTdscdma and CellSignalStrengthTdscdma
-Add UARFCN and Alphas support for CellIdentityTdscdma
-Fix a bug in the equals() check for CellIdentity
-Update documentation for CellInfo<RAT> classes and
 the getLevel() methods of CellSignalStrength<RAT>

Bug: 76153768
Test: RILTests added for TDSCDMA
Merged-In: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
Change-Id: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
(cherry picked from commit 88f44024bb)
2018-07-10 13:24:36 -07:00
Jordan Liu
50f29d8ecf Merge "Type Allocation Code & Manufacturer Code"
am: ff801e5fd7

Change-Id: I95b5fd3d2fb977db3f37dcf23c2125c521c1ccd1
2018-07-06 12:06:39 -07:00