Commit Graph

1851 Commits

Author SHA1 Message Date
Shuo Qian
c77146ceb1 Merge "ECBM SystemProperty cleanup" am: 4718606368 am: 40cde7b71f am: 36611a0958
am: 56d3af6680

Change-Id: Ida75e1835bc99a328baeee71b6838581800916b0
2017-04-12 22:11:17 +00:00
Shuo Qian
56d3af6680 Merge "ECBM SystemProperty cleanup" am: 4718606368 am: 40cde7b71f
am: 36611a0958

Change-Id: Ib68a4e3b34ad4d76e4b254350b523eaa424b30f9
2017-04-12 21:11:58 +00:00
Shuo Qian
4718606368 Merge "ECBM SystemProperty cleanup" 2017-04-12 20:52:20 +00:00
Brad Ebinger
f5001109c5 Merge "Move @SystemApi access to ImsService" into oc-dev am: 509a311976
am: 442d7645a2

Change-Id: I215d2ba6dd947a3979aa17b6695a77cb7b50288f
2017-04-11 23:29:11 +00:00
Brad Ebinger
442d7645a2 Merge "Move @SystemApi access to ImsService" into oc-dev
am: 509a311976

Change-Id: I98a548a4a7f2df635d8132a93948ece3fb70be0a
2017-04-11 23:20:16 +00:00
Brad Ebinger
509a311976 Merge "Move @SystemApi access to ImsService" into oc-dev 2017-04-11 23:12:11 +00:00
shuoq
d199113e97 ECBM SystemProperty cleanup
- Add getEmergencyCallbackMode() method in the TelephonyManager.java
to get the boolean value for ECBM callback mode from the phone through
ITelephony.aidl/java interface

- Use the added TelephonyManager Api to replace the 'get' of
PROPERTY_INECM_MODE system property in the framework/base

Test: manual
Bug: 30361624

Change-Id: I355d69820b157f23e077a95a13f8509ee0fa5874
2017-04-11 14:59:29 -07:00
Amit Mahajan
3afaab9090 Merge "Add p2 option in openLogicalChannel." am: f954f2d5cc am: 7c6fa75512 am: 9c113787a4
am: ef23fff630

Change-Id: I6ebee0796c58bb6716285c3bb10d3bd7056efea1
2017-04-11 21:59:03 +00:00
Amit Mahajan
ef23fff630 Merge "Add p2 option in openLogicalChannel." am: f954f2d5cc am: 7c6fa75512
am: 9c113787a4

Change-Id: Iad26507830edceb39433766d7b6e3f0bb708c0e2
2017-04-11 21:50:19 +00:00
Amit Mahajan
f954f2d5cc Merge "Add p2 option in openLogicalChannel." 2017-04-11 21:25:43 +00:00
Nathan Harold
4e745fd4e9 Merge "Deprecate TelephonyManager.getCellLocation()" into oc-dev 2017-04-11 20:58:34 +00:00
Jack Yu
014ba37090 Merge "Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" into oc-dev am: 4011fff255
am: 0dc7e95b2c

Change-Id: I23dcb38dbd351979de707b94fe03868bba6c4053
2017-04-11 19:35:27 +00:00
Jack Yu
0dc7e95b2c Merge "Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" into oc-dev
am: 4011fff255

Change-Id: Ia233a19c30a880ea5631ae37ba0d91d91f49abfa
2017-04-11 19:21:19 +00:00
Nathan Harold
33dd867f86 Deprecate TelephonyManager.getCellLocation()
This API has been long-marked for deprecation. It has numerous problems:
-It does not support LTE
-It returns a limited subset of information
-It uses old (and poorly-chosen) sentinel values for fields that are
 not provided.

Bug: 36076138
Test: compilation
Change-Id: I87004710e5d046d4534ad3a0a938540440b0e83b
(cherry picked from commit c12d6c5983)
2017-04-10 18:04:39 -07:00
nharold
fddda44b19 Merge "Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b25 am: a51173943a am: 599a4c7326" into oc-dev-plus-aosp
am: 74568130ce

Change-Id: I3112e4d98738b7b00e290ced238c3878e4ad51b1
2017-04-11 00:00:55 +00:00
nharold
f72fd56b06 Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b25 am: a51173943a
am: 599a4c7326

Change-Id: I243647791bc08dbc2653d6d51af07a41c8ba3f97
2017-04-10 23:31:06 +00:00
Jack Yu
9f63ac3536 Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED
This broadcast intent will no longer work for the apps
running in the background. Apps should use Connectivity
Manager to listen for network changes.

Test: Telephony sanity tests
bug: 37156634
Change-Id: I5297cc5a624857d3e11a6d5fdf9369ab99ce88d4
2017-04-10 16:23:32 -07:00
Jeff Davidson
f83ccd0e6c API plumbing to support carrier app downloading.
-Include UiccAccessRules in a DownloadableSubscription, so the LPA can
tell the platform which apps are permitted to manage a particular
embedded subscription.

-Include the calling package in the API, so the platform can match the
package against the UiccAccessRule package list.

Bug: 33075886
Test: TreeHugger
Change-Id: Ifc7d3eca07d5ebea0e09398dfc1e253f1a273813
2017-04-07 14:30:41 -07:00
Ying Xu
98852767b3 Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev 2017-04-07 18:47:58 +00:00
Nathan Harold
c12d6c5983 Deprecate TelephonyManager.getCellLocation()
This API has been long-marked for deprecation. It has numerous problems:
-It does not support LTE
-It returns a limited subset of information
-It uses old (and poorly-chosen) sentinel values for fields that are
 not provided.

Bug: 36076138
Test: compilation
Change-Id: I87004710e5d046d4534ad3a0a938540440b0e83b
2017-04-07 11:31:41 -07:00
Chen Xu
a775faf40f Merge "remove deprecated API sendDialerCode" into oc-dev am: 31fcda576f
am: 6fd0d2b37f

Change-Id: I8239752191b094626e85935dcc6470a297742317
2017-04-07 16:12:54 +00:00
Chen Xu
6fd0d2b37f Merge "remove deprecated API sendDialerCode" into oc-dev
am: 31fcda576f

Change-Id: Ia1ca68529e16deaa990d07b651592a9a80806531
2017-04-07 16:03:02 +00:00
Chen Xu
31fcda576f Merge "remove deprecated API sendDialerCode" into oc-dev 2017-04-07 15:53:11 +00:00
Brad Ebinger
7bb8587133 Move @SystemApi access to ImsService
Keeping a separate ImsServiceBase class for binding
is redundant. Moving @SystemApi access to ImsService
instead.

Test: Compile and Run
Change-Id: I95ed659efe1c74ccac321d1a9079f7c1b683c66b
2017-04-06 16:29:56 -07:00
Junda Liu
f9a1528e0d Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am: ded8a6b7f6 am: c86e5802c6 am: efb72ba71c
am: b99d392425

Change-Id: I57b1a18ab684aaad2bd26dbf30bc591b2cddfa8f
2017-04-06 20:16:33 +00:00
Junda Liu
b99d392425 Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." am: ded8a6b7f6 am: c86e5802c6
am: efb72ba71c

Change-Id: Ib678a10ef5d4792581c40d8ac15a183604d35ba2
2017-04-06 18:39:43 +00:00
Junda Liu
ded8a6b7f6 Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key." 2017-04-06 18:17:41 +00:00
Ajay Nambi
eca5ebb075 Add p2 option in openLogicalChannel.
- Add support for iccOpenLogicalChannelWithP2.
- Needed to support OMAPI 3.0 defined
by SIM Alliance.
- Deprecate iccOpenLogicalChannel(String) API and
pass down an invalid p2 value to keep original behavior

Bug: 27360148
Change-Id: I2ab6cfb7a54c451f32936df51b8298f35a6dc67f
2017-04-04 22:08:02 +00:00
Hall Liu
d4edd23f40 Merge "IMS: RTT interface changes" am: 814fdf9312 am: bc56b97770 am: 7d1712e5b9
am: 85313f8c35

Change-Id: I440d62ac4b49d2b1d1475259237d67b5ee937fd1
2017-04-04 21:44:14 +00:00
Hall Liu
85313f8c35 Merge "IMS: RTT interface changes" am: 814fdf9312 am: bc56b97770
am: 7d1712e5b9

Change-Id: Ia5c6a16a69c71cfd96479e8df403669d5aaff6f9
2017-04-04 21:37:53 +00:00
Hall Liu
814fdf9312 Merge "IMS: RTT interface changes" 2017-04-04 21:21:17 +00:00
Sanket Padawe
c29fff5032 Merge "Make some intents public in SubscriptionManager."
am: 35e9a94dee

Change-Id: Ic9812badf9368b1398110e446956641d27e6e2ff
2017-04-04 16:59:13 +00:00
Treehugger Robot
35e9a94dee Merge "Make some intents public in SubscriptionManager." 2017-04-04 16:48:33 +00:00
Sanket Padawe
e4f5f79c65 Make some intents public in SubscriptionManager.
+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1
Merged-in: Ibb1d1faae9a002ccb530446e24897955c12076e1
2017-04-03 15:53:05 -07:00
Pankaj Kanwar
a3c05485db Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev
am: 37bbb789af

Change-Id: I5181ea040e2406c9b7bc2bb8c16f2b1a8d35946e
2017-04-03 22:41:17 +00:00
Pankaj Kanwar
37bbb789af Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev 2017-04-03 22:36:03 +00:00
yinxu
2c7ea1bbe5 Add a carrier option to hide the option of "Enhanced 4G LTE Mode"
The option "Enhanced 4G LTE Mode" currently may be hidden according to
the VoLTE state of the plateform and device. With this new option we can
choose to hide the "Enhanced 4G LTE Mode" irrespective of VoLTE state.

Bug: 36220377
Test: manual
Change-Id: I516ad050e623a368f2c2ef3d81650eb20c20fd5b
(cherry picked from commit 0bf350c9c9199b78c611cfca62ffef3ad1ea0564)
2017-04-03 15:25:43 -07:00
Sanket Padawe
cfbec2293f Merge "Make some intents public in SubscriptionManager." into oc-dev am: 9077faab1f
am: a374081697

Change-Id: I68cac494b2cae5217657098672a49ce99a6feca4
2017-04-03 22:23:28 +00:00
Sanket Padawe
a374081697 Merge "Make some intents public in SubscriptionManager." into oc-dev
am: 9077faab1f

Change-Id: I5cfb95fd6965c58adfb86e4a607123b648d10b24
2017-04-03 22:16:54 +00:00
Sanket Padawe
9077faab1f Merge "Make some intents public in SubscriptionManager." into oc-dev 2017-04-03 22:10:29 +00:00
Jeff Davidson
9bcef123f4 Merge "Squashed merge of master-sim into master." 2017-04-03 20:26:59 +00:00
pkanwar
95941f7c97 Address API concerns for isConcurrentVoiceAndDataAllowed and
OnReceiveUssdResponseCallback.

Bug: 35766890
Test: Existing tests.
Change-Id: I1ddbdadafa2611edb0ecfce53d5cf32434e5236c
(cherry picked from commit 89731a8389)
2017-04-03 19:39:42 +00:00
Chad Brubaker
d6ce1adabf Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev am: e35d50622c
am: a8c068f723

Change-Id: Id57b91b68ce6a4e1f31e8670798b59b82593ea96
2017-04-03 18:25:36 +00:00
Jeff Davidson
35cda39422 Squashed merge of master-sim into master.
Includes the following commits:

==

New system feature: eUICC.

Presence of this feature implies that eUICC-related APIs are expected
to function as long as an eUICC is present in the device. Note that an
eUICC may be embedded in the device but may also be removable.

==

Add empty EuiccManager API and plumbing.

==

Add stub EuiccService.

EuiccService is the class that the LPA app must implement; for now,
just define the action and priority so that the implementation can be
found. Actual methods will come later.

Also declare two relevant permissions: BIND_EUICC_SERVICE, which the
implementation must require (so that nobody else can bind to the
service directly), and WRITE_EMBEDDED_SUBSCRIPTIONS, which permits
signature|privileged apps and CTS (via development) to access
EuiccManager APIs.

==

Add UiccAccessRule based off UiccCarrierPrivilegeRules#AccessRule.

This class can be used to transfer access rules between an
EuiccService implementation and the platform.

We also add a simple encoding/decoding of a list of rules so that they
may be stored in the subscription info table.

==

Add getEid() to EuiccManager/EuiccService.

getEid() fetches the EID. It requires either a privileged permission
(READ_PRIVILEGED_PHONE_STATE) or carrier privileges on the
currently-active profile. Until there is a use case that requires
opening this up to apps with only READ_PHONE_STATE, we shouldn't do
so.

To avoid churn in the future, the API signatures for EuiccService
include a slot ID to identify which SIM slot is being used. However,
this parameter is currently not populated correctly (nor is it usable,
as no Telephony APIs accept a slot ID to address commands). There is
no need to expose it yet in the EuiccManager APIs as we expect to
follow the TelephonyManager pattern of allowing per-slot instances of
EuiccManager in the future while keeping other method signatures the
same.

==

Define Euicc UI actions in EuiccManager/EuiccService.

The EuiccManager actions are to be implemented by the platform (and
only the platform), which forwards the actions to the active
implementation.

Also, remove our explicit priority meta-data tag as we can just rely
on android:priority in the corresponding intent-filter.

==

APIs for downloading embedded subscriptions.

Includes:

-getDownloadableSubscriptionMetadata, used by the platform and LUI to
fetch metadata about a downloadable subscription. The platform will
use this to perform the necessary permission checks (only allowing
otherwise-unprivileged apps to download profiles that are permitted
per the subscription metadata), and the LUI can use this to present
the name of the profile.

-downloadSubscription, to actually perform a profile download.

The stub for startResolutionActivity is included but not implemented;
resolution activities will be handled in a follow-up change.

==

Test: TreeHugger
Change-Id: I47b1da5a69f0736012cb137e02cd6c4e07fdaace
2017-04-03 11:17:53 -07:00
Chad Brubaker
a8c068f723 Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
am: e35d50622c

Change-Id: Ibe29b902356c271e4ca33da87ed908d427dfb46d
2017-04-03 18:13:27 +00:00
Sanket Padawe
2c1a49f933 Make some intents public in SubscriptionManager.
+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1
2017-04-03 10:13:12 -07:00
Pankaj Kanwar
1ce83f009e Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." 2017-04-03 01:31:40 +00:00
pkanwar
89731a8389 Address API concerns for isConcurrentVoiceAndDataAllowed and
OnReceiveUssdResponseCallback.

Bug: 35766890
Test: Existing tests.
Change-Id: I1ddbdadafa2611edb0ecfce53d5cf32434e5236c
2017-03-31 12:16:56 -07:00
Junda Liu
8531328fc8 Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key.
Value includes which apps need to be enabled for current carrier.

Bug: b/35924008
Test: make and manual

Change-Id: Icb089d4641610b0618a8717fa3fed8d3770d5f52
2017-03-31 11:24:46 -07:00
Chad Brubaker
0c1651f289 Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS
Bug: 35853790
Test: make -j128 checkbuild
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermission2TestCases
Change-Id: I11d374cbbb6c2deaf74ac784ff995bd182fe9157
2017-03-31 11:20:02 -07:00