4664 Commits

Author SHA1 Message Date
Robert Greenwalt
01712b1aa6 Merge "Add updateMethod callback" am: a0974dbc0f
am: 7791ac2e28

Change-Id: I3402217fddc77d03b191ac7af0d938c6fa931486
2017-06-13 20:59:09 +00:00
Robert Greenwalt
7791ac2e28 Merge "Add updateMethod callback"
am: a0974dbc0f

Change-Id: I9dc2564d0856db617c0deb6bff35ca3cf6b6010c
2017-06-13 20:51:39 +00:00
Pankaj Kanwar
f13b8a78f6 Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am: aadb414f02 am: 717b5bf3e0
am: 8532bc3b59

Change-Id: Idd49ae115d660cb21ed7baf4e66f5ec0f89e3e53
2017-06-13 20:50:15 +00:00
Robert Greenwalt
a0974dbc0f Merge "Add updateMethod callback" 2017-06-13 20:38:51 +00:00
Pankaj Kanwar
8532bc3b59 Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am: aadb414f02
am: 717b5bf3e0

Change-Id: I8133ca2e269f74dd2c7b8a17f81de24567fcdc2e
2017-06-13 20:38:46 +00:00
Pankaj Kanwar
717b5bf3e0 Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
am: aadb414f02

Change-Id: I2f2189aa6483dfe17fe6ed7f42e8b23166c67444
2017-06-13 20:30:36 +00:00
yinxu
a88d1990b7 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
Change-Id: Ie7865ed2101d9564e26870a8ebbb0ceb7bd9bd1b
2017-06-13 13:27:39 -07: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
pkanwar
5aa279287c Radio Interface changes to pass the encryption object, including the
key,to the modem.

We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG: 35606429
Test: manual
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
2017-06-13 08:35:32 -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
Pankaj Kanwar
91a4d3df01 Merge "Address IMSI privacy issues."
am: ef6b81e5b2

Change-Id: I41c06fc9bf9012f93e10b59c49d5a7314331ea5f
2017-06-13 00:37:13 +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
0d14298f80 Merge changes from topic 'ims-handover-api' into oc-dr1-dev
am: e15da2649b

Change-Id: I98a44fe768bdffaaaca742b1c9e8e10f42c73a90
2017-06-12 22:46:58 +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
Robert Greenwalt
52bde254ba Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6 am: af04c43e3b
am: 40b0ef4579

Change-Id: I6b40f88b1793b157ec3babcb39caf5d916c6301d
2017-06-10 00:26:26 +00:00
Robert Greenwalt
40b0ef4579 Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6
am: af04c43e3b

Change-Id: I5fb2897cb5456f92ea4da17d333f091f2f2c1e42
2017-06-10 00:17:22 +00:00
Robert Greenwalt
af04c43e3b Merge "Changed Locale in ServiceInfo to a list."
am: a1df5b25e6

Change-Id: I7477fa88ae9cc83605d2172294bf2ecbcafc567e
2017-06-10 00:10:33 +00:00
Robert Greenwalt
a1df5b25e6 Merge "Changed Locale in ServiceInfo to a list." 2017-06-10 00:03:58 +00:00
Hall Liu
bebeade687 Merge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebfc1
am: cfbb73bcde

Change-Id: Ib841554ba1ad15eceefcbb2ee32599e1087b9f76
2017-06-09 22:24:40 +00:00
Hall Liu
cfbb73bcde Merge "Update documentation for streaming methods" am: 186a588d57
am: 01604ebfc1

Change-Id: Ia7772c9f8b231af0cf48c50c09ec72fa38007df3
2017-06-09 22:06:22 +00:00
Hall Liu
01604ebfc1 Merge "Update documentation for streaming methods"
am: 186a588d57

Change-Id: I44825b99a968b110bb23373d59aa0bb5ecaf7eac
2017-06-09 21:58:50 +00:00
Hall Liu
186a588d57 Merge "Update documentation for streaming methods" 2017-06-09 21:44:29 +00:00
Chen Xu
5d9f5613c3 Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
am: fce339c49c

Change-Id: I1b2478820fbc282aa0448d1e1966f0cf81a2b207
2017-06-09 21:06:48 +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
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
da7fe3f117 Merge "Add IApnSourceService.aidl" am: 1d5d409f6f am: 7b78a176a9
am: b699e98285

Change-Id: Ib0d3d447d6058cbc6e348f76e55429627a917591
2017-06-09 19:13:20 +00: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
Jordan Liu
7b78a176a9 Merge "Add IApnSourceService.aidl"
am: 1d5d409f6f

Change-Id: Id76c6c83d18482594730f7e584231f7f4714b46d
2017-06-09 17:33:56 +00: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
Tyler Gunn
37300eb77e Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am: 980582e555
am: f512d86f5b

Change-Id: Ic863586ac031b340a30db6f408240f68b270ad76
2017-06-08 20:41:57 +00: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
da88ca6f10 Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am: 980582e555

Change-Id: I50666f5d3c4e224221a07a170598a5ea25d5f5ef
2017-06-08 20:15:58 +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
Hall Liu
7d576f60f2 Merge "Embms download setup" am: da5b77fa9b am: a807ee8f1c
am: b6a16546b5

Change-Id: I70d37518b24034a1e133bf6e9248feb64d439e6a
2017-06-08 05:55:56 +00:00
Hall Liu
b6a16546b5 Merge "Embms download setup" am: da5b77fa9b
am: a807ee8f1c

Change-Id: I6a78b3873814283d768c7e9a642b882bef8b11fc
2017-06-08 01:32:43 +00:00
Hall Liu
a807ee8f1c Merge "Embms download setup"
am: da5b77fa9b

Change-Id: I18b378fd0c999e40e3dc8cf9d1248414489880c6
2017-06-08 01:26:28 +00:00
Hall Liu
0842831e23 Embms download setup
Add MbmsDownloadReceiver and MbmsTempFileProvider to facilitate MBMS
download.
Fill in the download method in MbmsDownloadManager

Test: testapps
Change-Id: Ibb30f3b2b9d14b9df6b53c06916c21e3ca3a42c6
2017-06-07 13:58:18 -07: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