Commit Graph

2734 Commits

Author SHA1 Message Date
Ying Xu
7682ce6076 Merge "Use java.util.Objects.hashCode to get hashcode." am: 3890689bb2 am: c4f797652c
am: ce80092aaf

Change-Id: Iec9e028d5c05d427cc3b1f81e97defb873b13d64
2017-06-15 19:56:18 +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
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
Naveen Kalla
d9b212630c Add RIL_UNSOL_MODEM_RESTART message
RIL_UNSOL_MODEM_RESTART will be sent by vendor RILs when it detects
a modem restart along with the reason for restart which could be a
crash signature if the modem restarted due to a crash or a some
other string such as a user-initiated restart or AT command
initiated restart.

Test: Manual
Merged-In: Idf08e20a49e82d40f6aa0854d23384c35c2efc3a
Change-Id: Idf08e20a49e82d40f6aa0854d23384c35c2efc3a
2017-05-12 13:57:19 -07:00
Ying Xu
97208056fe Merge "Add the new RIL requests and NetworkScanResult." 2017-05-12 20:56:40 +00:00
Toshiya Ikenaga
464157757a Add IMEI_NOT_ACCEPTED error code for IMS
Bug: 38256949
Change-Id: Ib14bd9f3e6b26db7c27170c56ec65e96c18abd67
2017-05-12 15:03:24 +00:00
nharold
8dc741fda0 Merge "Add hidden APIs to get the cached SignalStrength from SST" am: 5b8a9c873f am: cca5fbe779 am: 8d361350ff
am: c5c4f5a45e

Change-Id: I8f8d3c142a6a01cfe47a1c14e349b04ed97d857a
2017-05-12 07:17:10 +00:00
yinxu
b36a4cb402 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
2017-05-11 20:49:16 -07:00
nharold
c5c4f5a45e Merge "Add hidden APIs to get the cached SignalStrength from SST" am: 5b8a9c873f am: cca5fbe779
am: 8d361350ff

Change-Id: Ief9ba9b1fcd36db763d403c60be53b42c3d18890
2017-05-12 03:18:54 +00:00
nharold
5b8a9c873f Merge "Add hidden APIs to get the cached SignalStrength from SST" 2017-05-11 23:57:16 +00:00
Jayachandran C
666a12f423 Add new reason code for IMS Call ended during conference merge process
Test: Following scenarios for VoLTE and CS call and
      verified the cause sent in PreciseCallState.

 1) Conference call merge
 2) Conference call, one remote party ends the call
 3) Conference call, all remote parties end the call
 4) Conference call, hangup locally
 5) Normal call and hangup locally
 6) Normal call and remote party ends the call

Bug: 38225047
Change-Id: I36edb0cbff4b130b0942a46dc6c15a7d842789c2
2017-05-11 13:23:26 -07:00
Brad Ebinger
da21d753c7 Merge "Notify ImsService Status Correctly" into oc-dev
am: 9684d718fa

Change-Id: Ia056fd9cc30e673056e7e9b5140c498bb6abce1b
2017-05-10 23:54:32 +00:00
Brad Ebinger
1bb9181380 Merge "Notify ImsService Status Correctly" 2017-05-10 23:00:54 +00:00
Nathan Harold
fb8d0e934d Add hidden APIs to get the cached SignalStrength from SST
Add APIs in TelephonyManager to pull the SignalStrength that is
currently cached in ServiceStateTracker

Bug: 36133439
Test: tested with sl4a
Change-Id: I6adbecb8126a715da836fcde7f832fedb2f06bc3
2017-05-10 21:34:03 +00:00
TreeHugger Robot
907d05aa67 Merge "Notify ImsService Status Correctly" 2017-05-10 18:16:18 +00:00
TreeHugger Robot
3f2cb59c43 Merge "Support different SIM power states" 2017-05-10 17:44:07 +00:00
Brad Ebinger
eca799105f Notify ImsService Status Correctly
Modifies ImsService to allow multiple status callbacks in
for one ImsFeature. This better handles one ImsFeature
for normal/emergency calling.

Bug: 38001858
Test: Unit Testing
Merged-In: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
Change-Id: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
2017-05-10 16:45:14 +00:00
Brad Ebinger
e1b49b7654 Notify ImsService Status Correctly
Modifies ImsService to allow multiple status callbacks in
for one ImsFeature. This better handles one ImsFeature
for normal/emergency calling.

Bug: 38001858
Test: Unit Testing
Merged-In: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
Change-Id: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
2017-05-10 16:41:20 +00:00