Commit Graph

6217 Commits

Author SHA1 Message Date
Nathan Harold
b954b207d0 Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev
am: ade0186795

Change-Id: I94821c8390473ea96c2c8f9a674e736587807477
2018-04-12 16:36:10 -07:00
Jeff Sharkey
d6e49befda Merge "Remove poorly defined notification APIs." into pi-dev
am: 36efb71088

Change-Id: I45a479a7baeaea642e3ceaef1448b0527b37bb34
2018-04-12 16:01:35 -07:00
TreeHugger Robot
ade0186795 Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev 2018-04-12 22:34:16 +00:00
Jeff Sharkey
1df7ee5757 Remove poorly defined notification APIs.
They were rushed in at the last second, and feedback from stakeholders
reveals they're not ready for prime time.

Bug: 77851691
Test: builds, boots
Exempt-From-Owner-Approval: SDK finalization
Change-Id: I96f6c80610627878a29543b345419924774a60e0
2018-04-12 18:27:08 +00:00
Wale Ogunwale
b129fadef8 Merge "Clean up APIs before declaring API 28." into pi-dev
am: fb10508cfa

Change-Id: Ic20ef429dbae1c9c5702094e1203838517b3ec38
2018-04-12 05:33:09 -07:00
Wale Ogunwale
fb10508cfa Merge "Clean up APIs before declaring API 28." into pi-dev 2018-04-12 12:19:56 +00:00
Chen Xu
5327a38956 Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" into pi-dev
am: 1be0392273

Change-Id: I89b46de2f70ca8a33eb57bc3ddf7c4a8c41d1034
2018-04-11 18:30:01 -07:00
Chen Xu
1be0392273 Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" into pi-dev 2018-04-12 01:02:21 +00:00
Jeff Sharkey
568a972669 Merge "APIs to disable data usage notifications." into pi-dev
am: f0b9fbebc0

Change-Id: I7b5bd380f00b6e94da79f43b354ecfc52df3f8e4
2018-04-11 16:14:26 -07:00
TreeHugger Robot
f0b9fbebc0 Merge "APIs to disable data usage notifications." into pi-dev 2018-04-11 23:05:03 +00:00
Jeff Sharkey
0a5570d49d APIs to disable data usage notifications.
Certain carriers have requested the ability to disable the warning,
limit, and rapid data usage notifications shown by the OS, so give
them that ability on a per-subId basis.  (The notifications are still
enabled by default.)

Unhide NOT_CONGESTED to match setSubscriptionOverrideCongested().

Fix bug in getPrimarySubscriptionPlanLocked() to find the first
currently active plan; the first non-recurring plan may be no longer
active.  Fix bug in SubscriptionPlan which allowed invalid negative
or zero-length Period objects.

Bug: 77851691, 77506882, 77662747
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Test: atest android.telephony.cts.SubscriptionManagerTest
Exempt-From-Owner-Approval: SDK deadline, responding to API feedback
Change-Id: Ib6e6dbadd5022937c3f0661ab4b66aa617f0b5af
2018-04-11 22:07:40 +00:00
fionaxu
272e8cf87e Change getGroupIdLevel1() to use subId from TelephonyManager Instance
Bug: 77905912
Test: Build
Change-Id: I720971ce115147b994e27611a0dcf052989180ec
2018-04-11 21:26:48 +00:00
Hall Liu
035b4827ca Merge "Make setServiceId a TestApi" into pi-dev
am: d41e669fca

Change-Id: I0ca985c9741b3f710c636595b7eb9b2b326e67fb
2018-04-11 13:30:18 -07:00
Hall Liu
d41e669fca Merge "Make setServiceId a TestApi" into pi-dev 2018-04-11 20:21:48 +00:00
Jeff Sharkey
3990ee1c9f Clean up APIs before declaring API 28.
As part of finalizing an SDK, we need to ensure that no new APIs are
marked @Deprecated, since they're typically cleanup that someone
forgot to finish.

Someone forgot to replace Slice.getTimestamp() with Slice.getLong().

Bug: 77588754
Test: builds, boots
Exempt-From-Owner-Approval: SDK finalization
Change-Id: Ic0ec91a43d161a69c1e840c42046ad500b7aeca0
2018-04-11 13:49:21 -06:00
Jack Yu
ea440a765e Merge "DO NOT MERGE - Hide IWLAN system API" into pi-dev
am: 10fb6582eb

Change-Id: Ica3ee854446d0a2f0b596d2c7bc6381ebf963584
2018-04-11 12:29:29 -07:00
TreeHugger Robot
10fb6582eb Merge "DO NOT MERGE - Hide IWLAN system API" into pi-dev 2018-04-11 18:36:31 +00:00
Jack Yu
a7025bae0a DO NOT MERGE - Hide IWLAN system API
Hide IWLAN system API for P. Will expose those APIs when IWLAN
full mode support is in place.

Test: Telephony sanity tests
Bug: 64132030
Change-Id: Ic56a04538fc532a7326c8a9234182899d52f15c1
2018-04-10 17:15:31 -07:00
Jordan Liu
1422ec907e Merge "Update getIccAuthentication documentation" into pi-dev
am: ae4518c736

Change-Id: I4f06b912bf68a5dea611cb12ebcffd71a8fae7e8
2018-04-10 15:37:08 -07:00
Hall Liu
07f1843e28 Make setServiceId a TestApi
Bug: 77152869
Test: CTS
Change-Id: I26f60b48865953971de02c50db48e0ff66f4e2a0
2018-04-10 21:11:27 +00:00
Jordan Liu
dd20bc3448 Update getIccAuthentication documentation
Explain what it means if the function returns null. This is based on the
spec at TS 31.102 section 7.3.1.

Bug: 74392381
Test: manual
Change-Id: Ic84d94589431109079a866027953ab9dbef103b8
2018-04-10 09:27:47 -07:00
Jeff Sharkey
4cd485f8e5 Merge "API council requested tweaks to SubscriptionPlan." into pi-dev
am: 5e0d360411

Change-Id: I447d4041d1dd0751147d13792b07d6617b27978a
2018-04-09 17:09:34 -07:00
Jeff Sharkey
5e0d360411 Merge "API council requested tweaks to SubscriptionPlan." into pi-dev 2018-04-09 23:20:43 +00:00
Brad Ebinger
9d7893150f Merge "Add GTS test APIs for testing ImsService" into pi-dev
am: cb7b92697a

Change-Id: Id60cf07121cf98ab3f0a10af10cf70beb25feb54
2018-04-09 15:53:13 -07:00
Brad Ebinger
cb7b92697a Merge "Add GTS test APIs for testing ImsService" into pi-dev 2018-04-09 22:40:13 +00:00
Android Build Merger (Role)
fd8ca1dbc4 Merge "Merge "Marking some hidden API as TestApi." into pi-dev am: 50c069f7c1" into pi-dev-plus-aosp 2018-04-06 18:52:41 +00:00
Xiangyu/Malcolm Chen
1444be002d Merge "Marking some hidden API as TestApi." into pi-dev
am: 50c069f7c1

Change-Id: I9fc4f78ed60d066eba840413b40b88c60b4c5d1a
2018-04-06 11:51:35 -07:00
Jayachandran Chinnakkannu
41602c8c90 Merge "Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED" am: 0222c2cac1
am: d18d68b96f

Change-Id: If20f74a2f0cd5618ae56bbb9488bacd551cabacd
2018-04-06 11:42:27 -07:00
Xiangyu/Malcolm Chen
50c069f7c1 Merge "Marking some hidden API as TestApi." into pi-dev 2018-04-06 18:32:12 +00:00
Nathan Harold
178020a2f8 Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE
There is still confusion about the scope of the
KEY_CARRIER_NAME_OVERRIDE. This CL further clarifies
that the carrier, for purposes of this string, is the
service provider. Thus, the CARRIER_NAME_OVERRIDE will
still be subject to SPN display rules.

Note: to use this override in scenarios such as roaming
where the display rules may not choose the name of the
home operator (and thus not choose this override), a
service provider may choose to use other flags such as
KEY_FORCE_HOME_NETWORK_BOOL and
KEY_SPN_DISPLAY_RULE_USE_ROAMING_FROM_SERVICE_STATE_BOOL
to achieve the desired display behavior.

Bug: 77461054
Test: none (docstring-only change)
Change-Id: Id866df7ef9ce593de1f9d31d2556af4bfc766a8e
2018-04-06 11:27:40 -07:00
Jayachandran C
7957147bbe Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED
Test: Build
Bug: 77657541
Change-Id: Ia6b576c222776cbc7e54e15cb54e39775e76ea56
2018-04-06 01:10:38 -07:00
Siddharth Ray
abad19e771 Merge "Persistence of LPP profile" into pi-dev
am: a6c06bdf5a

Change-Id: I6d8bbbb78924ad8f93e34721a56bfe83bdf16a04
2018-04-05 21:02:28 -07:00
TreeHugger Robot
a6c06bdf5a Merge "Persistence of LPP profile" into pi-dev 2018-04-06 03:48:14 +00:00
Malcolm Chen
5477297519 Merge "Unhide constructors of DataService and NetworkService." into pi-dev
am: 271ba383b6

Change-Id: If6a55e8d996d3b4ef1595271577b005933c752db
2018-04-05 18:08:38 -07:00
TreeHugger Robot
271ba383b6 Merge "Unhide constructors of DataService and NetworkService." into pi-dev 2018-04-06 00:52:32 +00:00
Malcolm Chen
83f59c61dd Unhide constructors of DataService and NetworkService.
DataService and NetworkService are System level classes. We shouldn't
hide their constructors otherwise their System level sub-class
can't be instantiated properly.

Test: gts
Bug: 77531655
Change-Id: I1a58b4857dbcf939ac124e20eb0a801ad5a9b597
2018-04-05 15:02:17 -07:00
Siddharth Ray
9943c7b149 Persistence of LPP profile
LPP profile will persist by default when SIM is removed.
Persistence will be lost once a different carrier's SIM is inserted.

BUG:64897529
Change-Id: I970599bed27d9278fb2732db65a1ce393afe93fe
2018-04-04 17:07:35 -07:00
Jeff Sharkey
0fc6d03b62 API council requested tweaks to SubscriptionPlan.
Return new shiny Range<> object instead of Pair<>.  Tell developers
what permission to check on refresh broadcast.  Describe what
exceptions might be thrown, and that an empty list is okay.

Allow creation of plans with richer Period object, instead of forcing
them into rigid week or day options.

Protect SubscriptionPlan broadcast.

Test: atest android.util.RecurrenceRuleTest
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Bug: 74945820
Change-Id: I7e555798e0cfaa214ca93d9df627c6443fc5d986
2018-04-04 16:06:27 -06:00
fionaxu
b877688ca2 throw runtimeException for applicable TM APIs
1. This CL revert some API change from ag/3710629.
2. throw runtime exception when running in a non-1000 UID.
3. throw for methods that persist some sort of state and readers could continue to
return placeholder values.
4. for rest of TelephonyManager API cleanup b/74401420.

Bug: 74016743
Test: Build
Change-Id: I2846efc11eebce4a923762f56f09daaf37c44763
(cherry picked from commit f20f0d916f)
Merged-in: I2846efc11eebce4a923762f56f09daaf37c44763
2018-04-04 01:38:55 +00:00
Pankaj Kanwar
d40c477b2e Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" into pi-dev 2018-04-04 01:21:17 +00:00
Malcolm Chen
a1d5e9fb97 Marking some hidden API as TestApi.
Bug: 77488839
Test: cts
Change-Id: Id4adaa7d844ef2b0d54e54a450d326bbebc1e12d
2018-04-03 17:44:41 -07:00
Brad Ebinger
cb18b163dc Add GTS test APIs for testing ImsService
Bug: 77141737
Test: Manual
Change-Id: Ia41a96b5013bc6a7f534c347db72a14348c1fc5d
2018-04-03 15:16:38 -07:00
Pankaj Kanwar
9a7abe6cd1 Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"
This reverts commit 84a8bb80a1.

Bug: 77306455
Test: manual

Change-Id: Ied14258726d71262642f8d72db5ee11ea671836b
2018-04-03 16:48:00 +00:00
Pankaj Kanwar
644d5ea61c Merge "Address IMSI privacy issues." 2018-04-03 16:05:51 +00:00
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
pkanwar
26509cda7e Address IMSI privacy issues.
Added method resetCarrierKeysForImsiEncryption
to allow for keys to be reset.

Bug: 35606429
Test: manual
Change-Id: Id2e92917b50fa2163b2bab112df6e80b5e9c5795
Merged-In: Id2e92917b50fa2163b2bab112df6e80b5e9c5795
2018-04-03 00:26:27 +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