Commit Graph

2749 Commits

Author SHA1 Message Date
Brad Ebinger
ed6e29f292 Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev 2017-08-30 18:31:43 +00:00
Brad Ebinger
27ca268756 Adds ERROR state to ImsConfig
Adds the ERROR return state for bool provisioning values
so that we can throw an Exception in some cases.

Bug: 64540800
Test: Manual
Change-Id: I0b79837c694d245999031ec65783857e114b7c75
2017-08-29 16:29:18 +00:00
Tyler Gunn
b229ddabda Handle alternate status values.
Some carriers use sendrecv to indicate a call in a conference is active,
and sendonly to indicate that the remote party has held the call.
Adding support for these status values.

This ensures that remotely held calls for these carriers are set to held.

Test: Manual
Bug: 33272103
Change-Id: I4a950c4e143d5ac396b30569dbda0b1cf4e92a3e
2017-08-28 17:44:55 +00:00
fionaxu
a40b8b7431 Merge "app link handling under restricted mobile data" into oc-dr1-dev
am: 93bf6200eb

Change-Id: I1a506e9f8dae6fd76c74c3f9d7f93c40ce64a387
2017-08-08 09:02:23 +00:00
TreeHugger Robot
93bf6200eb Merge "app link handling under restricted mobile data" into oc-dr1-dev 2017-08-08 08:57:16 +00:00
Jonathan Basseri
b901f055b5 Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
am: 35a563ef62

Change-Id: Ib898af17ce2985a1e19759dd9296f3cea8077018
2017-08-07 16:24:31 +00:00
fionaxu
d60a9d0e58 app link handling under restricted mobile data
1. new actions to allow default carrier app dynamically enable/disable
app-link filtering
2. new intent to notify registered carrier apps of other default
networks
3. signal-to-actions config to sepcify carrier actions on default
network change
default network available -> disable intent filter for app-link
defaut network lost -> enable intent filter for app-link
4. new carrier actions to allow carrier apps to register/unregister
other network status dynmacially

Bug: 62487488
Test: Manual
Change-Id: Ie9fa9f3f4ca38f9f26a90a3dbf95f7f20a8ad773
2017-08-04 18:13:12 -07:00
Jonathan Basseri
6442cc90b5 Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.

Bug: 63050313
Test: no compilation errors
Merged-In: I64f31d111213281edeaeda6a09b163b860261b2d
Change-Id: I541b445b410329798acdaaaccc50955cd1574ae2
2017-08-04 16:53:03 -07:00
Brad Ebinger
276e2fac5f Merge "Change IMS callback AIDLs to be oneway" into oc-dr1-dev
am: cfcac665c1

Change-Id: I2b4249a9d9422c80ce6da3343ed39476153f8ea0
2017-07-27 22:50:46 +00:00
Brad Ebinger
14c4f3db48 Change IMS callback AIDLs to be oneway
A bad behaving service was causing the IMS registration
callbacks to block indefinetly waiting for the callback
binder implementation in another process to finish. Since
we update the IMS registration in a loop, we were never getting
to the updates for the other processes.

This change moves the AIDL definition to oneway. Since these
are callback AIDLs, the caller doesn't need to wait
for the callbacks to return before sending the others.

Bug: 63137625
Test: Manual
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
2017-07-27 12:57:03 -07:00
Jeff Sharkey
17bebd2fd7 Expose SubscriptionPlan API.
Clean up SubscriptionPlan, add docs, and expose as public API.

Deprecate older constants in CarrierConfigManager, and point users
towards new API.  (The goal of CarrierConfigManager is to express
key/value pairs that are identical for all users on a particular
carrier, not to configure details that vary between users.)

Since a CarrierService may itself not have access to the plan
details, allow them to "delegate" the capability to configure plans
to another package name.

Factor out new RecurrenceRule class which is used by both
NetworkPolicy and SubscriptionPlan internally.  Polish it to support
arbitrary periods, and continue to test it through NPMST.

Bug: 63391323
Test: bit FrameworksCoreTests:android.util.RecurrenceRuleTest
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Exempt-From-Owner-Approval: Bug 63673347
Change-Id: I93fae4a43e58e9e4c32f8bf345a257dcd607f088
2017-07-20 14:55:57 -06:00
Derek Tan
f1328fee0d Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev 2017-07-07 23:12:44 +00:00
Derek Tan
cda9a836a9 Prevent any app except LPA to create logical channel to AID of ISD-R.
Bug: 33077154
Test: manual verification using LPA and Tycho.

Change-Id: I4ef85529d0f63d46849d5afe76df90a27171e7db
2017-06-27 15:03:51 -07:00
Jeff Davidson
7b69a86b02 Add EuiccManager#retainSubscriptionsOnFactoryReset API.
By default, all subscriptions are wiped on first boot after a factory
reset. This ensures that if data is wiped outside of userspace (e.g.
in fastboot/recovery), the profiles are wiped, as there's no way to
offer this option to users in those modes - the radio isn't available
for us to access the eUICC.

This API provides a way to bypass this wipe if the user opts to retain
the policies for a wipe done from userspace (e.g. by unchecking the
"Wipe eUICC" checkbox in platform settings before wiping). We tell the
LPA to note this and skip the wipe on the ensuing factory reset.

Change-Id: I2fe472417497e28b043841a5aa2dc9efa45ebbff
Test: TreeHugger
Fixes: 62681577
2017-06-27 09:23:07 -07:00
TreeHugger Robot
776220d029 Merge "Pass calling package to resolution UI." into oc-dr1-dev 2017-06-27 00:48:39 +00:00
Ying Xu
231e291b06 Merge "Fix the inconsistency of scan status." into oc-dr1-dev 2017-06-26 23:10:00 +00:00
Jack Yu
5af2d63721 Merge "Refactored area update info support" into oc-dr1-dev 2017-06-23 23:13:58 +00:00
yinxu
548475c58d Fix the inconsistency of scan status.
In types.hal and ril.h, the scan status is defined as:
    PARTIAL = 0x01
    COMPLETE = 0x02

But in NetworkScanResult.java, the scan status is defined as:
    public static final int SCAN_STATUS_PARTIAL = 0
    public static final int SCAN_STATUS_COMPLETE = 1

This CL makes changes to NetworkScanResult.java so that the scan status
is consistent both in Telephony and RIL.

Cherry-picked cleanly from:
https://android-review.googlesource.com/#/c/422183/

Test: Telephony sanity tests
Bug: 30954762

Merged-in: Iadcd344ad3fe682da98a1a41c2964583f67dc792
Change-Id: Iadcd344ad3fe682da98a1a41c2964583f67dc792
(cherry picked from commit ad50361ece)
2017-06-23 15:39:13 -07:00
Jack Yu
93c4285623 Refactored area update info support
1. Refactored area update information support so it
   is not limited to channel 50 and Brazil.
2. Added channel 60 for India.

Test: Manual
bug: 37746109
Merged-In: Ic1c4683ecfe0556547ba15eb9b9e780644f17bff
Change-Id: Ic1c4683ecfe0556547ba15eb9b9e780644f17bff
2017-06-23 14:37:56 -07:00
Chen Xu
93ea43386e Merge "Handle invalid destination address gracefully" into oc-dr1-dev 2017-06-23 21:34:18 +00:00
Brad Ebinger
beca22868c Merge "Add method that checks the Binder status of ImsConfig" into oc-dr1-dev 2017-06-23 18:32:15 +00:00
fionaxu
b6c5aef338 Handle invalid destination address gracefully
Bug: 37578305
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java --test-method testSendTextWithInvalidDestAddr
Change-Id: I2e79acb66178586d29dc89ad018f2726ed654a85
2017-06-22 12:32:15 -07:00
Brad Ebinger
c24bc10f42 Add method that checks the Binder status of ImsConfig
Adds a method to check whether or not the ImsConfig
binder has died.

Bug: 62723694
Test: maual, follow bug procedure
Change-Id: I9df6533e7e7dc69487cea50fada6c89599b031a3
2017-06-22 11:40:39 -07:00
yinxu
f0b2b823c0 Use java.util.Objects.hashCode to get hashcode.
Cherry-picked cleanly from:
https://android-review.git.corp.google.com/#/c/415268/

Test: Telephony sanity tests

Merged-in: I8b845f2e5e44b242278b8955807d1b40e67e1414
Change-Id: I8b845f2e5e44b242278b8955807d1b40e67e1414
(cherry picked from commit 26439f5616)
2017-06-19 10:40:08 -07:00
Jeff Davidson
b4c67ec3c8 Pass calling package to resolution UI.
The calling package is important for the UI to be able to tell the
user who is asking to perform the operation which needs consent. For
example, it should be able to tell the user which carrier app is
asking to download a profile.

Bug: 38049463
Test: TreeHugger + E2E verification
Change-Id: I890f811405cb05672e1271f092ddca60501e7ddc
2017-06-16 02:40:40 +00:00
Tyler Gunn
e15da2649b Merge changes from topic 'ims-handover-api' into oc-dr1-dev
* changes:
  Add callSessionMayHandover API to ImsCallSession.
  IMS: Support for Possible Call Session Handover
2017-06-12 22:35:45 +00:00
Chen Xu
25c1a060bc Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am: cdec393aa3

Change-Id: I2e175c9a475d2cc2ad225154dbc5c2f855173975
2017-06-09 21:00:26 +00:00
Tyler Gunn
3a5130c766 Add callSessionMayHandover API to ImsCallSession.
This matches the new AIDL definition in the API.

Test: Manual
Bug: 62489988
Change-Id: I97ad5b5359f19d533b5b8644fd37008c0c69bf9c
2017-06-09 13:16:06 -07:00
Anju Mathapati
f9c1c97c01 IMS: Support for Possible Call Session Handover
Adding the callSessionMayHandover API that allows
for the lower layers to indicate that the call session
may handover based on actions taken by the user/UI
layer.
The API provides current and target RAT information
pertaining to the possible handover.

Bug: 62489988
Test: Manual
Change-Id: I006462ce5688bb99a94d5135574fb2c17878685a
2017-06-09 13:15:25 -07:00
Jordan Liu
6d783e3529 Add IApnSourceService.aidl
This service is bound to by TelephonyProvider on devices where we don't
use the apns-conf.xml file.

Bug: 37283190
Test: manual
Change-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
Merged-In: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
2017-06-09 10:41:37 -07:00
fionaxu
4efae6f244 add an extra for rebroadcast of SIM_STATE_CHANGED
Bug: 62459330
Test: Manaual Test
Change-Id: I0e1c676d99a38273047a84d4467cff44dae7c5af
2017-06-08 22:50:18 -07:00
Jack Yu
f9d559ce7c Added video calling data usage per-uid support
Now the VT call data usage will be counted under
current dialer's data usage as well as the total
device data usage.

Test: Manual
bug: 37671326

Change-Id: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
2017-05-30 16:04:00 -07:00
Brad Ebinger
2cbc277dc0 Merge "Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 25ce41cf4c am: be34238840 am: 689edc736f" into oc-dev-plus-aosp
am: f5fb04573b

Change-Id: I3447422054e0f563e9314686c1638c43e7df296e
2017-05-25 23:50:59 +00:00
Brad Ebinger
095f72cc4c Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 25ce41cf4c am: be34238840
am: 689edc736f

Change-Id: Ifd9fc089d7165506f6953e810c040de868f5bafe
2017-05-25 23:10:21 +00:00
Brad Ebinger
25ce41cf4c Merge "Add IMEI_NOT_ACCEPTED error code for IMS" 2017-05-25 22:31:53 +00:00
Przemyslaw Szczepaniak
3a9f256329 resolve merge conflicts of 2ce1b38e85 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia1eb0590edf2b074f6cbf16060cda2257091edd8
2017-05-18 10:57:09 +01:00
Jack Yu
bd7d89c133 Consolidated all data allow/disallow logic into one method
Consolidated all data allow/disallow logic into one method
and got rid of the obsolete isDataPossible. This is the
preliminary work for checking if data is allowed just right
before data connection entering connected state.

Test: Telephony sanity tests and unit tests
bug: 33847610
Merged-In: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
Change-Id: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
2017-05-17 21:16:39 -07:00
yinxu
5a798bc18a Add the new RIL requests and NetworkScanResult.
Those new RIL requests will be used to start and stop network scan, and
the scan result will be returned from RIL in the format of
NetworkScanResult.

Test: Telephony sanity tests
Bug: 30954762
Merged-in: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
Change-Id: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
(cherry picked from commit b36a4cb402)
(cherry picked from commit 84c9e01f10)
2017-05-16 23:02:39 -07:00
pkanwar
03c3442f4d Address IMSI privacy issues.
Added getCarrierInfoForImsiEncryption and
setCarrierInfoForImsiEncryption methods.

Bug: 35606429
Test: runtest --path ..ImsiEncryptionInfoTest.java
Change-Id: I62bdc8ac5e57b749fc5675c28579ec2d9183643d
2017-05-16 14:43:59 -07:00
yinxu
84c9e01f10 Add the new RIL requests and NetworkScanResult.
Those new RIL requests will be used to start and stop network scan, and
the scan result will be returned from RIL in the format of
NetworkScanResult.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
(cherry picked from commit b36a4cb402)
2017-05-16 13:34:59 -07:00
Grace Chen
73b63bd5ac Merge "Support different SIM power states" am: 0517b719bc am: 1bbe5b21f3
am: c742ab7a44

Change-Id: I71d696c6c725e65357f0704047d534cfc69973d6
2017-05-16 19:58:37 +00:00
Grace Chen
0517b719bc Merge "Support different SIM power states" 2017-05-16 19:30:28 +00:00
Grace Chen
b282179000 Support different SIM power states
Test: Verify SIM power states
Bug:  35844036
Merged-In: I968269e88eec40af6e3ca71cbb805a77e016da0f
Change-Id: I968269e88eec40af6e3ca71cbb805a77e016da0f
2017-05-16 10:48:15 -07:00
Ying Xu
061a71a0b4 Merge "Add API to support async network scans." am: 625d5a9dd9 am: 8d692eb811
am: 31aff5459b

Change-Id: I416017e17a3e1cd837541440ef0ac44c5184dad2
2017-05-15 17:20:58 +00:00
Ying Xu
625d5a9dd9 Merge "Add API to support async network scans." 2017-05-15 16:57:07 +00:00
Jeff Davidson
91c3d07fd9 Implement remaining core eUICC APIs.
Includes:

-getDefaultDownloadableSubscriptionList, which returns a list of
default subscriptions available for the device.
-getEuiccInfo, which returns an EuiccInfo object containing
non-sensitive information about the eUICC device.
-deleteSubscription, to delete a subscription.
-switchToSubscription, to switch to (or away from) a subscription.
-updateSubscriptionNickname, to update the nickname of a subscription
which is saved to the eUICC.
-eraseSubscriptions, to factory reset the eUICC.
-Settings.Global#DEFAULT_SM_DP_PLUS, a default SM-DP+ server which is
used to query for default subscriptions in
getDefaultDownloadableSubscriptionList.

These APIs follow the template of the APIs which have already been
implemented.

This completes the baseline implementation as designed; any additional
APIs or tweaks to the APIs will be tracked as separate bugs.

Fixes: 33075886
Test: Build/boot
Change-Id: I8057757c874f94e0c816af1ca071d656c8f145b9
2017-05-14 10:57:00 -07:00
Jeff Davidson
d02731ffff Define APIs for listing embedded subscriptions.
Two new APIs will list all embedded subscriptions along with any
active ones. One API requires the ability to read phone state and
returns all subscriptions. The other requires no special permissions
but will only return those subscriptions which the caller may manage
according to their metadata.

A list result from the LPA includes whether the current eUICC is
removable. If true, subscriptions in the list are considered
transient and always removed upon the next list update (i.e. SIM card
state change) unless that update includes the subscription. Otherwise,
they will be retained across future list operations for which the
current eUICC is removable. This allows callers to retain knowledge
about available embedded subscriptions on an inactive but still
accessible eUICC, as long as that eUICC is permanent.

The LPA may request a refresh of the list at any time; this is
intended to be used of the list or metadata is updated through a
non-API operation, e.g. a server-initiated metadata update. For
operations driven through a platform API, the list will be refreshed
automatically.

Bug: 33075886
Test: TreeHugger
Change-Id: I1887cbca835c304b9eb285fd972c7c8eaffa6e1d
2017-05-14 10:55:40 -07:00
Jayachandran Chinnakkannu
5ba29530ac Merge "Add new reason code for IMS Call ended during conference merge process" into oc-dev am: a1755c4fd6
am: 72edfe46fe

Change-Id: If924eb58b180d6e4e7ddd3547a2ddd8d9705d967
2017-05-13 01:04:16 +00:00
Jayachandran Chinnakkannu
72edfe46fe Merge "Add new reason code for IMS Call ended during conference merge process" into oc-dev
am: a1755c4fd6

Change-Id: I4643358d6823fe56c31ac279ce34fe18710c4889
2017-05-13 00:49:11 +00:00
yinxu
f19bc1a0e5 Add API to support async network scans.
This CL includes the new Java API that supports async network scans.
Applications could get faster network scan results with this new API.
The long-term goal is to support Subsecond Switching which is separate
from what this CL is doing.

Bug: 30954762
Test: Unit test, run runtest -x NetworkScanRequestTest.java
Change-Id: I78cadaf838dee8439fe7417ef39f689990bf5705
(cherry picked from commit fdfb6f4d2f)
2017-05-12 15:01:02 -07:00