Commit Graph

4533 Commits

Author SHA1 Message Date
Ying Xu
38529959bf Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev 2017-06-19 04:30:35 +00:00
Jeff Davidson
963a20772e Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev 2017-06-16 19:40:02 +00:00
yinxu
6488e3f891 Adds error codes and maximum RAN/Bands/Channels
Added error codes which are mapped from the RadioError which is returned
from RIL, also added some errors which will be generated at telephony.
Those errors will be returned to the user with the onError() callback.

Added the maximun number of RAN/Bands/Channels in 1 scan request.

Test: Telephony sanity tests
Bug: 30954762

Merged-in: Ie7865ed2101d9564e26870a8ebbb0ceb7bd9bd1b
Change-Id: Ie7865ed2101d9564e26870a8ebbb0ceb7bd9bd1b
(cherry picked from commit a88d1990b7)
2017-06-16 10:16:39 -07:00
Tyler Gunn
7772487d98 Merge "Add Telephony connection event for call forwarded supp service notice." into oc-dr1-dev 2017-06-16 04:24:54 +00:00
Jeff Davidson
f0d8c896c7 Define a meta-data attribute for a carrier icon.
This is just a centralized key that a carrier app and various eSIM
infrastructure can agree upon. It may be used to allow the carrier app
to show a custom icon instead of its launcher icon when some UI is
rendering the identity of the carrier. Use of this meta-data is
entirely up to callers.

Fixes: 62580015
Test: TreeHugger
Change-Id: Iaaab8cb8b5108d92b8f687d213daa7917f53fe65
2017-06-13 12:42:16 -07:00
Tyler Gunn
d323c19fc9 Add Telephony connection event for call forwarded supp service notice.
Test: Test Harness
Bug: 33761801
Change-Id: I8ffc8079b43c54594e596f29cec641ca051d4796
2017-06-13 11:19:12 -07:00
Jeff Davidson
83f8bc81be eUICC API error code cleanup.
-Remove result classes in cases that a simple int will do. Split the
int error code space (now shared across all calls) into two parts -
predefined errors (0 or negative) and custom errors (positive).

-Replace "generic error" with "error" in naming.

-Remove detailed code from any result returned by the LPA. There is
still a detailed code in the platform API, which is equal to the
result code returned by the LPA.

Fixes: 38206601
Test: TreeHugger
Change-Id: I304081db2127a22d6dd67b6494b4f3279614d19c
2017-06-13 17:51:07 +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
Chen Xu
cdec393aa3 Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev 2017-06-09 19:39:56 +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
Tyler Gunn
f512d86f5b Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am: 980582e555

Change-Id: Id41b469e278c194337da36a0b34d02efa99b8906
2017-06-08 20:26:55 +00:00
Tyler Gunn
980582e555 Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev 2017-06-08 20:06:59 +00:00
Tyler Gunn
02212db446 Add carrier config for allowing USSD requests via telephony manger APIs.
Test: Manual
Bug: 62293605
Change-Id: I713df20c7faffb16df6c74d5f62a7023a3e35439
2017-06-06 15:37:18 -07:00
Jeff Sharkey
28f6dc9512 Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37
am: 67cb5f5210

Change-Id: Ic4c30cdb8bbfda5b3703eb3c7c36c1bf8ab3a216
2017-06-06 16:17:39 +00:00
Jeff Sharkey
ec68b46bc8 Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4
am: 7a2e4a8486

Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb
2017-06-06 15:48:24 +00:00
Jeff Sharkey
67cb5f5210 Merge "Give Doclava our manifest; more permission docs." into oc-dev
am: 65d4cbba37

Change-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e
2017-06-06 15:28:26 +00:00
Jeff Sharkey
bfc4fcde9f Give Doclava our manifest; more permission docs.
We've seen some @SystemApi methods protected with non-system
permissions, so give Doclava the platform AndroidManifest.xml so it
can parse the actual permission protection levels to look for APIs
that are letting in non-system apps.

Also document more @SystemApi permissions.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api
Bug: 62263906
Change-Id: Ie0f0a5fb0033817bcc95060f2183a52ae4ae7b06
2017-06-05 17:38:19 -06:00
Pankaj Kanwar
972bad878e Merge "Carrier Config changes to support IMSI encryption." 2017-06-05 23:05:03 +00:00
Jeff Sharkey
7a2e4a8486 Merge "Annotate @SystemApi with required permissions." into oc-dev
am: c1406978a4

Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1
2017-06-05 22:28:21 +00:00
Jeff Sharkey
d86b8fea43 Annotate @SystemApi with required permissions.
Most @SystemApi methods should be protected with system (or higher)
permissions, so annotate common methods with @RequiresPermission to
make automatic verification easier.

Verification is really only relevant when calling into system
services (where permissions checking can happen on the other side of
a Binder call), so annotate managers with the new @SystemService
annotation, which is now automatically documented.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api && make -j32 offline-sdk-docs
Bug: 62263906
Change-Id: I2554227202d84465676aa4ab0dd336b5c45fc651
2017-06-05 13:27:11 -06:00
TreeHugger Robot
d6fb3081d9 Merge "Add device and carrier flags for video calling fallback" 2017-06-02 23:35:49 +00:00
Brad Ebinger
a5ce1b4483 Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am: 75b7ef15f6 am: bbe9e26247 am: 99533575b2
am: ab9ad6446a

Change-Id: I50ec5d2c4646592d7633e2e453dfa342b4c2cbcf
2017-06-02 22:40:53 +00:00
Brad Ebinger
ab9ad6446a Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am: 75b7ef15f6 am: bbe9e26247
am: 99533575b2

Change-Id: Ie29e837b6f952249683440f09630a587795238fa
2017-06-02 22:33:39 +00:00
Brad Ebinger
bbe9e26247 Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause"
am: 75b7ef15f6

Change-Id: I7075ab7524d363ade4f42d7d3d33251243707e8a
2017-06-02 22:19:31 +00:00
Ta-wei Yen
9d20d98919 Add device and carrier flags for video calling fallback
These flags let the system dialer/contacts/SMS app determine if
integration with video calling apps are allowed if the carrier video
calling is not available.

EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK in PhoneAccount.getExtras()
should be checked first. This flag is disabled by default and OEMs
will need to enable it.

If the device supports the fallback, then
CarrierConfigManager.KEY_ALLOW_VIDEO_CALLING_FALLBACK_BOOL should be
checked so individual carriers can ban the feature. This flag is
allowed by default.

Change-Id: Id46f684254402acb9142f87684ddff2d830f1701
Fixes: 62264468
Test: manual
2017-06-02 14:01:12 -07:00
Brad Ebinger
df0a75fa74 Adds ACCESS_CLASS_BLOCKED Disconnect cause
Adds the ACCESS_CLASS_BLOCKED Disconnect cause in order
to allow the dialer to take action when this happens
during a VT call.

Bug: 33821263
Test: Build
Change-Id: I9afdd90f0a8a562b626b730dbb1b03cf37776ebd
2017-06-02 13:20:35 -07:00
pkanwar
232573f50f Carrier Config changes to support IMSI encryption.
Adding 2 config parameters to CarrierConfigManager:
1. imsi_key_download_url.
2. imsi_key_expiration_days_time.

BUG: 35606429
Test: manual

Change-Id: I191dd0db5fa84a57faea88cb59c2c0b2604064b2
2017-06-02 08:56:13 -07:00
Robert Greenwalt
7e02821d7b Merge "Move appName inside Downloadrequest." am: 142a392b75 am: 196cb3dff6 am: 7c3314f19c
am: c593bd3cc7

Change-Id: Ic957a8056b96e0ad2da7c5529aa54c2e7a969e0e
2017-06-01 17:31:08 +00:00
Robert Greenwalt
c593bd3cc7 Merge "Move appName inside Downloadrequest." am: 142a392b75 am: 196cb3dff6
am: 7c3314f19c

Change-Id: Iaa997634e7d9370fb634d9741ba4266db6cb9b2f
2017-06-01 17:20:49 +00:00
Robert Greenwalt
196cb3dff6 Merge "Move appName inside Downloadrequest."
am: 142a392b75

Change-Id: I6512d4bc2406f23571c1d4e6425353930fb9b847
2017-06-01 17:05:40 +00:00
Robert Greenwalt
142a392b75 Merge "Move appName inside Downloadrequest." 2017-06-01 16:52:34 +00:00
Tyler Gunn
b5c3a138f8 Merge "Ensure null/empty phone number does not crash international number check." into oc-dev am: 0f542b48fb
am: 58e8a224e3

Change-Id: I14a17436328f6324842cbc7c257baf9e4cf60c7f
2017-06-01 07:22:47 +00:00
Tyler Gunn
58e8a224e3 Merge "Ensure null/empty phone number does not crash international number check." into oc-dev
am: 0f542b48fb

Change-Id: I6b534dbb9253ad66c850c8d55a8e4b0b619ac64e
2017-06-01 07:14:29 +00: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
Robert Greenwalt
4b88cf4502 Move appName inside Downloadrequest.
Simplifies vendor API.

Test: builds
Change-Id: I1e59e8014aa0fe1c0d46bca3347f428347fa0365
2017-05-31 16:13:36 -07:00
Jack Yu
2f74c02826 Merge "Added video calling data usage per-uid support"
am: 36fdb346f2

Change-Id: I3901efbfafcfab7e076b669f0313dce860e97072
2017-05-31 21:44:13 +00:00
Tyler Gunn
438559e183 Ensure null/empty phone number does not crash international number check.
Add empty/null check for isInternationalNumber.

Test: Added unit tests.
Bug: 62162029
Change-Id: I779a1f78cbbe11adeefeca7fc83cfc1cfa431c61
2017-05-31 14:35:39 -07: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
a3adf3363b Merge "Added video calling data usage per-uid support" 2017-05-31 01:29:20 +00: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
Hall Liu
d01a9a4f1c Merge "Add new error codes in MbmsException" am: 8e7057ccf3 am: 20d98578f2 am: aac7e3a182
am: b2a5eceb2f

Change-Id: I4ecca51f60b02f31554dfab3efe0fed96f8b6ea8
2017-05-30 13:51:31 +00:00
Hall Liu
b2a5eceb2f Merge "Add new error codes in MbmsException" am: 8e7057ccf3 am: 20d98578f2
am: aac7e3a182

Change-Id: Ie426c6334590f30656166b0a7851fe75fa3d4684
2017-05-27 01:31:58 +00:00
Hall Liu
20d98578f2 Merge "Add new error codes in MbmsException"
am: 8e7057ccf3

Change-Id: Ie8bf825d1fe7c40c94abd0245e69d597afb2f9bc
2017-05-27 01:18:33 +00:00
Hall Liu
8e7057ccf3 Merge "Add new error codes in MbmsException" 2017-05-27 01:08:31 +00:00
Hall Liu
80a8687a87 Add new error codes in MbmsException
Test: builds
Change-Id: I523961f588ef5ada97e06f5a910875c123f97989
2017-05-26 15:49:32 -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