Commit Graph

183 Commits

Author SHA1 Message Date
sqian
0bcdd6cbd4 Explain the difference of isValid, isActive, isUsable
Bug: 118675257
Test: compile
Change-Id: Ibec1bf7929991ca0e2910684f5216ab8372d4e95
2019-03-14 11:34:01 -07:00
Malcolm Chen
b82864c801 Only return one mobile subscription per group in Settings.
Right now getSelectableSubscriptionInfoList returns all subscriptions
that are visible and available. But we should only show one per
subscription group. So updating getSelectableSubscriptionInfoList
to make sure of it.

Bug: 126438122
Test: manual - group Fi primary subscriptions and make sure only
one Fi subscription is shown in Settings UI.
Change-Id: I867296b4f8efbdf2e9885ef34dd45806fa0abbca
Merged-In: I867296b4f8efbdf2e9885ef34dd45806fa0abbca
2019-03-13 04:14:07 +00:00
Malcolm Chen
9ac7e52a93 Don't return hidden subscription in getActiveSubIdList
Now getActiveSubscriptionInfoList will not return hidden
subscriptions. And getActiveSubIdList should be consistent
with it. In the mean time, internal SubscriptionController
API should have a way to specify if caller wants hidden
subscriptions or not.

Bug: 124690005
Test: manual
Change-Id: I46ccae88167c2988d71a6e07da2937bf9644a1f0
Merged-In: I46ccae88167c2988d71a6e07da2937bf9644a1f0
2019-03-12 14:09:33 -07:00
Malcolm Chen
310718530c Don't return hidden subscription in getActiveSubscriptionInfoList.
Bug: 121396526
Test: manual
Change-Id: I3a9f3a9a2628a8e2ad1c401f6fe5e4c5866a0047
Merged-In: I3a9f3a9a2628a8e2ad1c401f6fe5e4c5866a0047
2019-03-12 13:39:15 -07:00
danielwbhuang
a335880efe Modify API return type and add callback.
1. Modify the type from boolean to void for updateAvailableNetworks().
2. Adding callback for updateAvailableNetworks().
3. Define error codes for update available networks results.

Test: build pass
Bug: 124616182
Merged-In: I32fe1407deabe36485227ec75931bec334d85abe
Change-Id: I32fe1407deabe36485227ec75931bec334d85abe
2019-03-11 20:02:16 +08:00
Xiangyu/Malcolm Chen
442084c722 Merge "Adding callback for setPreferredDataSubscriptionId." 2019-03-07 22:47:31 +00:00
Malcolm Chen
fd11df2924 Adding callback for setPreferredDataSubscriptionId.
The purpose is to provide a way to return success or failure upon
switching data to CBRS subscription.
The same callback is used for ONS to call internal API. Later it
will also be used by Carrier apps to call TelephonyManager#
setPreferredOpportunisticDataSubscription.

Bug: 122255288
Test: manual

Change-Id: Id3f43e024c902d6785017e7866f9e804a486b04f
Merged-In: Id3f43e024c902d6785017e7866f9e804a486b04f
2019-03-06 14:54:41 -08:00
chen xu
8165386bfe add NonNull and Nullable annotation to APIs
Bug: 126699430
Bug: 126699963
Bug: 126700457
Bug: 126700771
Bug: 126702453
Bug: 123939479
Test: Build
Change-Id: Ib429d2918e63f8d272fc7842b0abd83ffd5a9090
2019-02-28 14:15:58 -08:00
Malcolm Chen
d78dac0bd1 Adding validate before switch feature.
In CBRS DSDS mode, switching data to CBRS network will require
validation first. Adding a component of CellularNetworkValidator
to trigger the validation and pass the result back to PhoneSwitcher.

Bug: 118348832
Test: manual
Change-Id: I689aa494f031834b5cee76906922ebdafa9c77ed
Merged-In: I689aa494f031834b5cee76906922ebdafa9c77ed
2019-02-20 02:52:14 +00:00
sqian
a31ef445e9 Call e.rethrowFromSystemServer() to exception of setDefaultSmsSubId
Test: Treehugger
Bug: 123927534
Change-Id: Ica15965cb904b758e078b8439e5e9d3f39b9c0a2
Merged-In: Ica15965cb904b758e078b8439e5e9d3f39b9c0a2
(cherry picked from commit 04e94fcb0a)
2019-02-13 17:06:05 -08:00
Jordan Liu
75a0066880 Merge "Update documentation for SubscriptionManager listener" 2019-02-13 19:26:58 +00:00
Jordan Liu
45da505ecd Update documentation for SubscriptionManager listener
This will match the documentation in TM.listen() and PhoneStateListener.

Bug: 124204168
Test: no behavior change
Change-Id: Ifde6382e4b6947417a89032805499c48288f8438
2019-02-12 10:31:35 -08:00
Malcolm Chen
77b2b559e1 Add API to handle user's subscription selection changes.
When user selects a eSIM subscription, Settings app informs Telephony.
Telephony needs to take actions such as writting it into global
settings, switch profiles and notify registrants, for example
AlternativeNetworkAccessService.

Bug: 120945564
Test: unittest
Change-Id: I846d9444aac368d183e06744c9eb8aa0c08dfe6a
Merged-In: I846d9444aac368d183e06744c9eb8aa0c08dfe6a
2019-02-07 17:42:34 -08:00
Amit Mahajan
ba71c5f015 Include phoneId as extra when subId is not available.
Test: basic sanity
Bug: 122819162
Change-Id: Ia55b5550930b1e34e14e46c718261ec11ac56f43
2019-02-07 12:34:21 -08:00
Vasu Nori
aea0391cf6 Implementation of Remote-SIM.
Design doc http://shortn/_GG690j15js

1. Modified SmsManager to send message thru Bluetooth if the subscription
   is for a Remote-SIM.
2. Added new column 'subscriptionType' to SubscriptionInfo.
3. SubscriptionManager:
  a. Added new constants for Local SIM and Remote SIM
  b. Added hidden APIs to add/remove Remote SIM subscriptions

Bug: 112321331
Test: tested manually and w/ unittests
Change-Id: Ib15553a806691a258fc00f7aaf812b8a9d49c2e9
2019-01-23 14:25:32 -08:00
Xiangyu/Malcolm Chen
b4a450a13c Merge "Remove mistake of calling iSub twice in getSelectableSubscriptionInfoList" 2019-01-21 22:45:09 +00:00
Malcolm Chen
c3d7de01c7 Add helper API to hide subscriptions when getting active subscriptions
Adding a hidden API that only return user visible active subscriptions.

Bug: 121396526
Test: manual
Change-Id: Ib69f1c2c51d22c2a58cfa93c662dc65521f7874f
Merged-In: Ib69f1c2c51d22c2a58cfa93c662dc65521f7874f
2019-01-21 21:17:25 +00:00
Malcolm Chen
28eeb3ac37 Remove mistake of calling iSub twice in getSelectableSubscriptionInfoList
Don't call getAvailableSubscriptionInfoList twice in
getSelectableSubscriptionInfoList.

Test: build
Change-Id: Ie5821b1d8a01834228401ce6bb1e9ae251168760
Merged-In: Ie5821b1d8a01834228401ce6bb1e9ae251168760
2019-01-21 13:04:59 -08:00
Xiangyu/Malcolm Chen
609ed3380f Merge "Make setMetered and setOpportunistic public." 2019-01-15 23:31:34 +00:00
Nazanin Bakhshi
396e01a168 Merge "add getPreferredDataSubId to SubscriptionManager and rename setPreferredData -> serPreferredDataSubId" 2019-01-15 17:25:31 +00:00
Nazanin Bakhshi
e0215a7026 add getPreferredDataSubId to SubscriptionManager
and rename setPreferredData -> serPreferredDataSubId

Bug: 117833883
Test: sanity
Change-Id: I67b18f1ef450c3d9e5615b3d2ec8a53a0691d7af
Merged-In: I67b18f1ef450c3d9e5615b3d2ec8a53a0691d7af
2019-01-14 18:00:40 -08:00
Malcolm Chen
d4dc4ee269 Make setMetered and setOpportunistic public.
Making SubscriptionManager#setMetered and #setOpportunistic public
APIs. Adding proper permission checks and descriptions.

Bug: 120138251
Test: cts, unittest

Change-Id: Id6f074b15a1c03d00ede2665d44595fa7be965e4
Merged-In: Id6f074b15a1c03d00ede2665d44595fa7be965e4
2019-01-14 13:52:32 -08:00
Pengquan Meng
eb7ac7396a cherry-picked "Add multiple esim support for SubscriptionManager"
Bug: 112902036
Test: atest FrameworksTelephonyTests
Merged-In: Iea25c78e4f9c0b1e16add5f796b293e7ace08c67
Change-Id: Iea25c78e4f9c0b1e16add5f796b293e7ace08c67
2019-01-14 13:45:58 -08:00
Grace Chen
5be6e9cb27 Add profile class in SubscriptionInfo database
Bug: 116732485
Test: Basic telephony sanity

Change-Id: I28a6d64c90db94ef0735f4d97f430560b733e797
Merged-In: I28a6d64c90db94ef0735f4d97f430560b733e797
2019-01-10 18:49:08 -08:00
Shuo Qian
755f2a38ac Merge "Make some SubscriptionManager APIs system APIs" 2018-12-27 21:58:00 +00:00
Xiangyu/Malcolm Chen
00baab3d29 Merge "Add APIs to indicate which subscriptions should be hidden from user" 2018-12-21 00:05:17 +00:00
Xiangyu/Malcolm Chen
90f496b14c Merge changes from topic "118349116"
* changes:
  Fix broken building offline-sdk-docs.
  Add APIs to remove sub from a group and get subs in the same gorup.
2018-12-21 00:04:57 +00:00
Malcolm Chen
0db9aa1693 Add APIs to indicate which subscriptions should be hidden from user
Bug: 120573892
Test: manual
Change-Id: I46b20241b71fef2938d7340fcf0b02173d83ed87
Merged-In: I46b20241b71fef2938d7340fcf0b02173d83ed87
2018-12-19 19:18:55 -08:00
Malcolm Chen
18350e409e Fix broken building offline-sdk-docs.
TelephonyManager#hasCarrierPrivileges(int) is hidden API so it
shouldn't be referenced in public API descriptions.

Bug: 120622105
Test: none
Change-Id: Ia6b6ec2c16b824b8eb092920089cb77cdc54bfb7
Merged-In: Ia6b6ec2c16b824b8eb092920089cb77cdc54bfb7
2018-12-19 19:17:30 -08:00
Malcolm Chen
be9240bcf0 Add APIs to remove sub from a group and get subs in the same gorup.
Add APIs in SubscriptionController so that caller with permissions
can remove subscriptions from a group or get all subscriptions with
the same group.

Bug: 118349116
Test: unittest
Change-Id: Iba4d31b437b372b3f41a6ed23f03b96a685a324c
Merged-In: Iba4d31b437b372b3f41a6ed23f03b96a685a324c
2018-12-19 19:02:12 -08:00
chen xu
64e81db02f add carrierid in subscriptionInfo
add carrierid in subscritionInfo so that apps can get
subId, carrierid and other sim related info from a single call

Bug: 119676543
Test: gts SubscriptionInfoTest
Change-Id: Ia2d01ad6bd59565adbf989b4d95e7f64f3ee6d45
(cherry picked from commit 0034bb393c)
Merged-in: Ia2d01ad6bd59565adbf989b4d95e7f64f3ee6d45
2018-12-18 23:21:57 -08:00
sqian
db49641108 Make some SubscriptionManager APIs system APIs
method public void setDefaultDataSubId(int);
method public void setDefaultSmsSubId(int);

Bug: 119232325
Test: Treehugger
Change-Id: I2775ef7a6f7f9585fe451f94da5eba541eea62af
Merged-In: I2775ef7a6f7f9585fe451f94da5eba541eea62af
(cherry picked from commit 876bb7a065)
2018-12-13 14:42:43 -08:00
Adrian Roos
6115769c16 API: Clean up redundant and ineffective usages of SystemApi and TestApi
Everything that is marked SystemApi or TestApi, but not @hide is still
part of the public SDK, it is therefore not sound to have that combination.

In the future, specifing such a combination will be considered an error
to prevent inadvertently exposing SystemApi and TestApi as public API.

Bug: 115333477
Change-Id: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Merged-In: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Test: METALAVA_PREPEND_ARGS="--error UnhiddenSystemApi" m checkapi
Exempt-From-Owner-Approval: API cleanup
2018-12-12 15:02:26 +01:00
chen xu
a2618627f0 support per carrier based iso country code.
1. apply carrierid-to-countrycode as an override table on
top of mcc-to-countrycode table which is coarse and inaccurate
especailly for dual ISMI SIM
2. persist country iso to simInfo db and notify change through
public API onSubscriptionChangedListener

Bug: 64775297
Bug: 110559381
Test: Build
Change-Id: I3ec2d90d9ce8dfba1418358de62eb4d099234757
2018-12-04 18:01:46 -08:00
Shuo Qian
9a9dbf05e0 Merge "Remove static for getSubscriptionIds" 2018-11-30 20:21:45 +00:00
Malcolm Chen
52f6dffbb1 Remove PARENT_SUB_ID since it's no longer needed.
Bug: 120141126
Test: build and flash
Change-Id: Ie482ba707ecb8b02d6c8f9e3b8bcdc30c835878e
Merged-In: Ie482ba707ecb8b02d6c8f9e3b8bcdc30c835878e
2018-11-29 11:04:16 -08:00
Xiangyu/Malcolm Chen
899c96df90 Merge "add setMetered in SubscriptionManager" 2018-11-29 18:57:55 +00:00
sqian
d8c30b9a80 Remove static for getSubscriptionIds
Bug: 118675557
Test: compile
Change-Id: Id2ba95331f87115daf6c0c074faccf812a1661c9
Merged-In: Id2ba95331f87115daf6c0c074faccf812a1661c9
(cherry picked from commit 705dec5255)
2018-11-28 12:11:52 -08:00
Chen Xu
194cd0d45a Merge "add more comments in advanced calling URL" 2018-11-28 19:40:36 +00:00
chen xu
83a8fb52e0 add more comments in advanced calling URL
Bug: 120071848
Test: Build
Change-Id: Idbcd32f965edf98204ad7b7cbacdca4291bc5687
2018-11-28 19:38:59 +00:00
Nazanin Bakhshi
b9b87be709 add setMetered in SubscriptionManager
Test: no tests
Bug: 119316354
Change-Id: I85224b4b5fdfee9391f673bb3950ad510b978133
2018-11-27 13:59:37 -08:00
Xiangyu/Malcolm Chen
542b99d8ac Merge "Fix telephony build" 2018-11-27 18:38:22 +00:00
Xiangyu/Malcolm Chen
103d515c80 Merge "Clean up SubMgr#getOpportunisticSubscriptions." 2018-11-27 18:01:58 +00:00
John Reck
c877f58a1a Fix telephony build
Correct permission tag format.

Test: make

Change-Id: I9db9ab609a924f786bb7031e6def86cbe2ac4c81
Merged-In: I9db9ab609a924f786bb7031e6def86cbe2ac4c81
2018-11-27 09:10:29 -08:00
Xiangyu/Malcolm Chen
2e64868e1d Merge "Change expected default value of setPreferredData" 2018-11-27 05:32:00 +00:00
Xiangyu/Malcolm Chen
0b4026b345 Merge "Clear calling identity in callback." 2018-11-27 00:24:14 +00:00
Malcolm Chen
003c8e5cca Change expected default value of setPreferredData
Change expected value from INVALID to DEFAULT_SUSCRIPTION_ID
when caller wants to change back to user setting.
Correct spelling.

Bug: 118491136
Test: unittest
Change-Id: I0c953ba654d5465f973db6e9c7f7bacd5db23831
Merged-In: I0c953ba654d5465f973db6e9c7f7bacd5db23831
2018-11-26 14:24:23 -08:00
Malcolm Chen
aea9b02a22 Remove parentSubId and define API to set groupSubId
Bug: 118349116
Test: unittest
Change-Id: I539a67df8f30c2f58d87a3417f78fef8b43ff56d
Merged-In: I539a67df8f30c2f58d87a3417f78fef8b43ff56d
2018-11-26 14:13:10 -08:00
Malcolm Chen
b2129eb6b1 Clear calling identity in callback.
In SubscriptionManager, when onSubscriptionsChanged is called
when opportunistic subscriptions change, clear calling identity.
Otherwise mExecutor is executed with phone process identity
which can be a security issue.

Test: build
Bug: 117794788
Change-Id: I766cdc89f0421265cab00dc40d53f355deb7b92b
Merged-In: I766cdc89f0421265cab00dc40d53f355deb7b92b
2018-11-26 14:06:49 -08:00
sqian
91412858b7 Remove dummy subscription ids
Test: Treehugger
Bug: 119144366
Change-Id: Ied6d1bd084b2632e72ef60bd96c8a1e6c9d1a16e
Merged-In: Ied6d1bd084b2632e72ef60bd96c8a1e6c9d1a16e
(cherry picked from commit bfde48f4ed)
2018-11-19 12:54:44 -08:00