Commit Graph

3564 Commits

Author SHA1 Message Date
Chen Xu
1a1b0608ca Merge "A test api to override carrier information" into pi-dev
am: b71c76036c

Change-Id: I1d0be7c706e6dfffa3d83c96e7e48c2accd6269e
2018-04-02 20:52:47 -07:00
Jeff Sharkey
0d07a2e777 Merge changes from topic "planz" into pi-dev
am: 93e11759d6

Change-Id: I342eb26c7e50582c1ce34a7c8b70dadbb7881858
2018-04-02 18:59:01 -07:00
Jeff Sharkey
bfbae60fd4 Obtain NPMS through helper method.
am: a435ab5124

Change-Id: Ic5db497a0d5793de4bdba2474e2abf17ddf201fc
2018-04-02 18:52:26 -07:00
Chen Xu
b71c76036c Merge "A test api to override carrier information" into pi-dev 2018-04-03 01:14:24 +00:00
TreeHugger Robot
93e11759d6 Merge changes from topic "planz" into pi-dev
* changes:
  Tests for SubscriptionManager APIs.
  Obtain NPMS through helper method.
2018-04-02 21:56:59 +00:00
TreeHugger Robot
7bedbabd0b Merge "Make changes to MBMS API following recs" into pi-dev 2018-03-31 04:17:41 +00:00
Hall Liu
6705ef997f Merge "Make changes to MBMS API following recs" am: feb60e0864
am: 2fa2a9d06f

Change-Id: I3b1aef24454fa45ffbbf6bb003743e662eac0353
2018-03-31 02:54:39 +00:00
Xiangyu/Malcolm Chen
4c9370d606 Merge "Adding debug message inside NetworkServiceCallback." into pi-dev
am: 17d19b7d52

Change-Id: Icfec1153ed29ae096083d3260294b7b580e0285e
2018-03-31 02:36:05 +00:00
Brad Ebinger
cf49f62de5 Merge "Unhide @SystemApi Constructor" into pi-dev
am: 77fcc0da3b

Change-Id: Idbf2a71018f1bd06f8445b07fc52bc65cb6776f6
2018-03-31 00:53:48 +00:00
Hall Liu
feb60e0864 Merge "Make changes to MBMS API following recs" 2018-03-31 00:28:06 +00:00
Xiangyu/Malcolm Chen
17d19b7d52 Merge "Adding debug message inside NetworkServiceCallback." into pi-dev 2018-03-31 00:02:10 +00:00
Hall Liu
c21bf59665 Make changes to MBMS API following recs
* Change all error handling logic to return an error code via the async
callback
* Add an UNKNOWN code for errors for future backwards compatibility, and
prohibit the middleware from sending this code.
* Add IntDef for errors through the async callback
* Amend documentation for download()
* Implement support for arranging downloaded files into a hierarchy
following that of the server.

Change-Id: I4d5c8f6229b216d9aa84397e628e62279033cc74
Fixes: 76449215
Test: CTS
2018-03-30 16:38:14 -07:00
Hall Liu
17449f95dd Make changes to MBMS API following recs
* Change all error handling logic to return an error code via the async
callback
* Add an UNKNOWN code for errors for future backwards compatibility, and
prohibit the middleware from sending this code.
* Add IntDef for errors through the async callback
* Amend documentation for download()
* Implement support for arranging downloaded files into a hierarchy
following that of the server.

Change-Id: I4d5c8f6229b216d9aa84397e628e62279033cc74
Fixes: 76449215
Test: CTS
2018-03-30 14:42:24 -07:00
Brad Ebinger
77fcc0da3b Merge "Unhide @SystemApi Constructor" into pi-dev 2018-03-30 21:36:35 +00:00
Jeff Sharkey
003d3e61e6 Tests for SubscriptionManager APIs.
Ensure that new SubscriptionManager APIs behave as documented.  Test
based on device claiming FEATURE_TELEPHONY, and require that we have
a valid getDefaultDataSubscriptionId() to run our tests against.

Test: atest android.telephony.cts.SubscriptionManagerTest
Bug: 77327990, 71816837
Change-Id: Ib90ceeacf546c9b36ecf69694442cb661a62d353
2018-03-30 15:31:27 -06:00
Jeff Sharkey
a435ab5124 Obtain NPMS through helper method.
Regression from an earlier partial revert, grr.

Test: manual
Bug: 77327990
Change-Id: I6193a1c3e213c8db145b19232e435f09c92def20
2018-03-30 13:25:20 -06:00
Malcolm Chen
5b51830764 Adding debug message inside NetworkServiceCallback.
Adding debug message inside NetworkServiceCallback when mCallback
is null.

Bug: 76392715
Test: existing test
Change-Id: Icd27d4082e1e4b60efe65abfff99c4165717fd4a
2018-03-29 19:05:12 -07:00
fionaxu
5b509b81a0 A test api to override carrier information
This API should only be used for testing purpose e.g., CTS/GTS/SL4A
By overriding carrier information, we could force a particular carrier id,
carrier's config, but also any country or carrier overlays to be loaded
when using a test SIM with a call box.

Bug: 72332597
Test: atest CtsTelephonyTestCases:CarrierIdentificationTest

Change-Id: Icd5804375ef9334c9f6c382cc6a774b9c9c15213
2018-03-29 12:30:09 -07:00
Brad Ebinger
37121d467c Unhide @SystemApi Constructor
There are a few small classes that never got properly
exposed as @SystemApi. These classes were not caught
because vendors currently build against the source
directly and have access to hidden APIs. We can not
change the vendor code at this point (different vendor
code for each year for all supported devices), but
we can start pulling back the API for new devices.

1) Keep all public mutable fields @hide and put
todo (and file bug b/74402619) to make fields
private or final.

2) Add public constructor that populates all fields
so that @hide public mutable fields can be set to
private/final in the future.

3) Provide getters for fields that will not be
public in the future.

In this way, we can make minimal API changes for P,
support new vendor/3rd party ImsServices, and phase
out old ImsService implementations that still build
against the source instead of using the correct
@SystemApi.

Bug: 77278031
Bug: 74402619
Test: Manual
Change-Id: Ifa3b6d0cbdb12e92efc699b760ca874768a89a7c
2018-03-29 11:36:28 -07:00
Treehugger Robot
b57de56276 Merge "Move alpha long/short to the base CellIdentity according API Review." 2018-03-29 16:45:52 +00:00
TreeHugger Robot
d63c009d5f Merge "Add additional logging for EMBMS edge cases" into pi-dev 2018-03-29 03:01:34 +00:00
Hall Liu
2b6911b9c8 Merge "Add additional logging for EMBMS edge cases" am: de57d0d024
am: 8b8591ce46

Change-Id: I0970e3a9eb83cd11c6bcbd014f6365e6c7884876
2018-03-29 01:38:25 +00:00
TreeHugger Robot
a210ef2687 Merge "Add constants for reporting criteria" into pi-dev 2018-03-29 00:23:37 +00:00
Hall Liu
7c94698cfa Add additional logging for EMBMS edge cases
Add logging when failing to delete temp files or write download
tokens.

Test: logging only
Bug: 77237200
Change-Id: Id7836f3660d37d8cd94580d221c95b2c15c2cb68
2018-03-28 22:38:48 +00:00
Cassie
ae2b65a95a Move alpha long/short to the base CellIdentity according API Review.
Bug: 74831568
Test: Telephony sanity
Change-Id: I0ef69e3f18fca111191e1c6329ae13c0860869ba
Merged-In: I0ef69e3f18fca111191e1c6329ae13c0860869ba
2018-03-28 22:28:33 +00:00
Hall Liu
de57d0d024 Merge "Add additional logging for EMBMS edge cases" 2018-03-28 22:25:44 +00:00
Holly Jiuyu Sun
18e47b6108 Merge "Address comments from API Review." 2018-03-28 21:56:40 +00:00
Treehugger Robot
8d8921d7fc Merge "Clean new TelephonyManager API." 2018-03-28 18:40:17 +00:00
Brad Ebinger
7a5653599c Merge "Parse SMS locally upon error to get message ref" 2018-03-28 16:59:41 +00:00
Andy Chou
3628901bed Merge "Specifies the carrier's default voicemail number for roaming network." into pi-dev
am: a547a51818

Change-Id: Ib684023316d56af18066d1a9461630429fcb2afb
2018-03-28 08:40:41 +00:00
Andy Chou
a547a51818 Merge "Specifies the carrier's default voicemail number for roaming network." into pi-dev 2018-03-28 08:28:53 +00:00
Holly Jiuyu Sun
84dca72d92 Address comments from API Review.
Bug: 74975825
Bug: 74976716
Bug: 74976875
Test: test on phone
Merged-In: I5417e5dd95c75fd3fd9fa98d7559511bd0fcd8a0
Change-Id: I5417e5dd95c75fd3fd9fa98d7559511bd0fcd8a0
2018-03-27 21:38:47 -07:00
Jiuyu Sun
44f79e1314 Merge "Address comments from API Review." into pi-dev
am: a78a764fe3

Change-Id: I5aa5100fc837a813b8af60d26a05b29707aa5380
2018-03-28 04:37:53 +00:00
Jiuyu Sun
a78a764fe3 Merge "Address comments from API Review." into pi-dev 2018-03-28 04:18:51 +00:00
Svetoslav Ganov
d16a343efb Merge "Throw on revoked location permission - framework" into pi-dev
am: 4acd39d3db

Change-Id: Ia4dd0dc5bc0296da541d68714f54c68a75cb32cc
2018-03-28 03:36:04 +00:00
Svet Ganov
33b1509375 Throw on revoked location permission - framework
When we fixed proper handling of location permisison gating
sensitive telephony calls we stopped throwing a security
exception when the permission is not held by the caller.
While this is not a security issue there is no reason to
change this behavior which is checked by CTS. This CL starts
throwing a security exception if the permission is not held.

Test: atest android.permission.cts.NoLocationPermissionTest

bug: 74074103

Change-Id: Ic891d62b408c692f84a345f24503f7f25d583e35
2018-03-28 00:43:55 +00:00
Xiangyu/Malcolm Chen
d0846cfb7c Merge "Clean new TelephonyManager API." into pi-dev
am: 2fc8197b4d

Change-Id: If9aee21db6ff22e00a52b8d5191cec7f157fc4e7
2018-03-27 23:44:31 +00:00
Eric Schwarzenbach
952e9f7eac Merge "Add constants for reporting criteria" am: a36ada4b95
am: 92e5b09df7

Change-Id: I86d0435f401f8c4a93087e83bbbd78f0347bb151
2018-03-27 23:12:34 +00:00
Malcolm Chen
233126ddc3 Clean new TelephonyManager API.
This is to apply API council's review opinion on a previous commit.

We are reverting previous change, which renamed isDataEnabled and
setDataEnabled to isUserMobileDataEnabled and setUserMobileDataEnabled.
So this commit will remove the new APIs isUserMobileDataEnabled and
setUserMobileDataEnabled, and also rename hidden API isMobileDataEnabled
to isDataCapable.

Bug: 71584593
Test: unittest
Change-Id: I84d65776874e7a7f6e3a9af9ff7ec7dcbd715c2c
2018-03-27 15:50:11 -07:00
Xiangyu/Malcolm Chen
2fc8197b4d Merge "Clean new TelephonyManager API." into pi-dev 2018-03-27 22:42:58 +00:00
Meng Wang
1d9cd76858 Merge "Revert "Unhide enable_apps carrier config key."" into pi-dev
am: 2cc67382c0

Change-Id: Ic92575356dbad97423a99285b4a0715c1e8e4886
2018-03-27 22:06:36 +00:00
Brad Ebinger
576e04053f Parse SMS locally upon error to get message ref
Parse the SMS locally to get the message ref when
onSmsReceived fails due to the platform being
unavailable. This allows the correct message ref
to be sent back via acknowledgeSms, instead of
the incorrect "0" value.

Bug: 74551838
Test: Manual
Merged-In: I3b75da909f1f07125c5696f7f9e525736732f3c1
Change-Id: I2f8128d8ff4e07bb3720a344cee70fa5fd5d7535
2018-03-27 21:19:43 +00:00
Eric Schwarzenbach
702f0a8ce6 Add constants for reporting criteria
Adds RILConstants and TelephonyManager constants for reporting and
setting indication filter bits.

Bug: 72117365
Test: make
Change-Id: Ia52ffdbc9ea2499893ece518aba4a99c6fe4ee90
(cherry picked from commit 7ff6e14cf4)
2018-03-27 14:00:45 -07:00
Eric Schwarzenbach
a36ada4b95 Merge "Add constants for reporting criteria" 2018-03-27 20:59:20 +00:00
Holly Jiuyu Sun
59159c437a Address comments from API Review.
Bug: 74975825
Bug: 74976716
Bug: 74976875
Test: test on phone
Change-Id: I5417e5dd95c75fd3fd9fa98d7559511bd0fcd8a0
2018-03-27 12:31:56 -07:00
Meng Wang
d5e1af54e3 Revert "Unhide enable_apps carrier config key."
This reverts commit 4793b28d3f.

Reason for revert: This is not intended as a public API.

Bug: 62907095
Test: make
Change-Id: Id79f91c72eac3929fa5ee7ac1cdd9df8671a1eb1
(cherry picked from commit f47a426206)
2018-03-27 17:28:19 +00:00
Cassie
5999b8fce0 Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev
am: c2bdecb8c8

Change-Id: Ie210a52ffb6eafa09c390bc51d39e558ee297bfc
2018-03-27 06:56:19 +00:00
TreeHugger Robot
c2bdecb8c8 Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev 2018-03-27 06:40:37 +00:00
Chen Xu
7d38883e1b Merge "throw runtimeException for applicable TM APIs" into pi-dev
am: 17aa751907

Change-Id: I44ab8310928658c38bae9522b31515ee6c36d6d2
2018-03-27 00:39:59 +00:00
Treehugger Robot
aa8f09d41a Merge "Split the DownloadStateCallback class into two" 2018-03-26 23:53:40 +00:00