Commit Graph

4555 Commits

Author SHA1 Message Date
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
TreeHugger Robot
730e4a5651 Merge "Make dun APNs as read-only by default." into oc-dr1-dev 2017-07-06 23:50:32 +00:00
Brad Ebinger
58d47a6f04 Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev 2017-06-28 21:06:34 +00:00
Brad Ebinger
ce07d61ce7 IMS: Check for binderstate before calling endSession
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.

Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.

Notify Ims state change only for the supported feature state
change to clients.

Test: Manual
Bug: 62816014
Merged-In: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
Change-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
(cherry picked from commit 913e11fcdf)
2017-06-28 20:39:23 +00:00
Jeff Davidson
f28843dd3f Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev 2017-06-28 17:23:49 +00:00
Ying Xu
e5ad3821e3 Merge "Use Bundle for inter-process message" into oc-dr1-dev 2017-06-28 16:47:50 +00:00
pkanwar
db07b66d3a 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
(cherry picked from commit 6d50fec388)
Merged-In: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
2017-06-28 00:31:58 +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
yinxu
5604943709 Use Bundle for inter-process message
The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I77945b247530b85c0b82876d528549498a711550
2017-06-27 14:52:45 -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
Amit Mahajan
94222f4c06 Make dun APNs as read-only by default.
Test: Verified tethering manually for T-Mo and AT&T
Bug: 38186417
Change-Id: Iae2beede0e20810cba4d96f897756896adf77b30
2017-06-20 11:42:53 -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
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
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
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