Commit Graph

2760 Commits

Author SHA1 Message Date
Jonathan Basseri
e022fa6aae Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7 am: 7728849a39 am: 0fed7e3282
am: 96bfbcdcd4

Change-Id: I918dc3e55ca50416d6a92341e1f8b8eef33415fd
2017-08-02 02:37:46 +00:00
Jonathan Basseri
96bfbcdcd4 Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7 am: 7728849a39
am: 0fed7e3282

Change-Id: If811c7aa40c5be4b0ffcfa5addef8c4b147a1c71
2017-08-02 02:27:55 +00:00
Jonathan Basseri
ab7c6a22a9 Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6 am: aaeca1e977
am: 89a2a41572

Change-Id: I55d117ed2e61cd54b9e64034b0e5df8be00ce9e6
2017-08-02 02:07:20 +00:00
Jonathan Basseri
7728849a39 Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
am: 85a215bae7

Change-Id: I30dddd90e5984519219865752f563a45962be593
2017-08-02 01:58:18 +00:00
Jonathan Basseri
89a2a41572 Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6
am: aaeca1e977

Change-Id: I9935e8825683fb23fc03e38a93380add8fe4408a
2017-08-02 01:51:21 +00:00
Jonathan Basseri
379128e5c2 Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit 6f4657363c.

Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
2017-08-02 01:10:47 +00:00
Jonathan Basseri
02cc8151a6 Merge "Move getNetworkCountryIso impl from TM to PIM."
am: 58bbef15d8

Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b
2017-08-01 22:34:44 +00:00
Jonathan Basseri
6f4657363c 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
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657
2017-08-01 22:24:05 +00:00
Brad Ebinger
50e2ebe0c7 Merge "Change IMS callback AIDLs to be oneway" into oc-dr1-dev am: cfcac665c1
am: 0f48181e16

Change-Id: Ie650e896cc0ff5ddd6329fb4be5e469453a9ee37
2017-07-27 23:03:54 +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
Ying Xu
e30cfbea60 Merge "Fix the inconsistency of scan status." am: 41be35a1bd
am: ac2d00a195

Change-Id: Ibcdbe63349031ea95d137dd18465bec5de6efd7a
2017-06-26 17:27:21 +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
yinxu
ad50361ece 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.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: Iadcd344ad3fe682da98a1a41c2964583f67dc792
2017-06-23 15:30:22 -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
Ying Xu
ce80092aaf Merge "Use java.util.Objects.hashCode to get hashcode." am: 3890689bb2
am: c4f797652c

Change-Id: If7d2093b6ff24bffeeb75a6eb0e91d047b872dad
2017-06-15 19:44:45 +00:00
yinxu
26439f5616 Use java.util.Objects.hashCode to get hashcode.
Test: Telephony sanity tests
Change-Id: I8b845f2e5e44b242278b8955807d1b40e67e1414
2017-06-14 10:54:05 -07:00
Pankaj Kanwar
3f095ca368 Merge "Address IMSI privacy issues." am: ef6b81e5b2
am: 91a4d3df01

Change-Id: I15e60cbbff06d7f66e86d755ae87b2e3513ca4a9
2017-06-13 00:45:04 +00:00
pkanwar
ce7e7c71c9 Address IMSI privacy issues.
Added getCarrierInfoForImsiEncryption and
setCarrierInfoForImsiEncryption methods.

CP from Master

Bug: 35606429
Test: runtest --path ..ImsiEncryptionInfoTest.java
Change-Id: I62bdc8ac5e57b749fc5675c28579ec2d9183643d
2017-06-13 00:14:36 +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
Chen Xu
fce339c49c Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am: cdec393aa3

Change-Id: I657161b898c66efdf13c48c322e25cefc7733750
2017-06-09 20:57:02 +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
b699e98285 Merge "Add IApnSourceService.aidl" am: 1d5d409f6f
am: 7b78a176a9

Change-Id: I8fd54598aae183364ba44a0d5ca2f4331436292a
2017-06-09 19:04:48 +00: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
Jordan Liu
e5c7420f45 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-08 15:56:38 -07:00
Jack Yu
b67a128206 Merge "Added video calling data usage per-uid support" am: 36fdb346f2 am: 2f74c02826
am: ce10610a9c

Change-Id: I0a068e0eb7e833ad28611cf2be1a8bc18d99830a
2017-06-01 05:53:47 +00:00
Jack Yu
a14e8bde2c 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

Merged-In: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
Change-Id: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
2017-05-31 12:37:24 -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