Wink Saville
05e2ada58a
am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
...
automerge: 6cc44cc
2014-12-12 04:42:38 +00:00
Wink Saville
a54bf65833
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
...
Rename isValidSubId to isValidSubscriptionId.
Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
2014-12-11 13:37:50 -08:00
Shishir Agrawal
23172c706b
am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd
...
* commit '960dccebf576d53059fd7d026cdd1b81fb0b5974':
Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
2014-12-11 00:24:33 +00:00
Shishir Agrawal
951dcdd940
Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev
2014-12-10 23:19:16 +00:00
Wink Saville
3a426694ff
am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev
...
automerge: afd6f5a
2014-12-10 19:23:23 +00:00
Wink Saville
eb4de87683
Merge "Update API and documentation for invalid subscriptions id's" into lmp-mr1-dev
2014-12-10 17:56:58 +00:00
Shishir Agrawal
5fb1118d8c
Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
...
The calls allow us to specify MCC/MNCs (for GSM) and SIDs for CDMA that should
not be considered as roaming for the current ICCID.
Bug: 13288143
Change-Id: Iae97b02f3eb9954fedf1b005c9ecd2aa09138505
2014-12-09 10:37:16 -08:00
Wink Saville
7a4df2b7d8
am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
...
* commit '2f5cb843553a596d314596c2bb776541db864d63':
Add subId as parameter for get/setDataEnabled.
2014-12-09 18:06:03 +00:00
Wink Saville
15b29ac7fa
Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
2014-12-09 17:52:27 +00:00
Narayan Kamath
8ff1a5ee0d
am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."
...
* commit '5620604261a24419bb87a4540f1a4ff333d32a3f':
Fix PhoneStateListener constructor javadoc.
2014-12-09 11:25:04 +00:00
Wink Saville
98513d7bd4
Update API and documentation for invalid subscriptions id's
...
Bug: 18668873
Change-Id: I3ee987b77fef856e97ea09898c695147cb87a517
2014-12-08 12:44:16 -08:00
Jeff Sharkey
d5b5576dd6
am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
...
* commit '5b41696c56c124124d48168227a83b63bd55aea7':
Offer to "merge" subscribers for data usage.
2014-12-08 19:44:27 +00:00
Ihab Awad
657f25e964
am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev
...
* commit '2b45554454b6b9db3e2626fe3ca3cd5f42f960ca':
Add Text-to-Speech annotations for phone number displays (1/3)
2014-12-08 19:35:17 +00:00
Stuart Scott
6b0025ea7c
am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev
...
* commit 'eb29c7332c40aacfae3dfb77588b262a043c94ee':
Add mapping between RAT and Network Mode
2014-12-08 19:17:22 +00:00
Jeff Sharkey
3256601f5e
Offer to "merge" subscribers for data usage.
...
There are some cases where multiple subscriber identities (IMSI)
should be treated as "merged together" from a data usage
perspective. This is done by extending the template used for
matching purposes to support multiple subscribers.
Then, when we query historical usage or set network policies, we
normalize the matching template to merge to any other identities
that should be included. When normalizing, the "lowest" identity
is always used for equality and storage purposes, which allows
identities to come and go over time.
This change also fixes data usage recording for multi-SIM devices
by passing along the concrete subscriber identity for each network
interface. Also correctly create default policies for multi-SIM
devices. This change also drops setPolicyDataEnable() until it can
be wired up to the right underlying NetworkAgent. (This means we
still bring up the network, and then rely on iptables rules to block
traffic when over the limit, instead of proactively disabling the
connection.)
Bug: 18012787
Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
2014-12-08 08:42:59 -08:00
Karol Wrótniak
69d3e55193
Fix PhoneStateListener constructor javadoc.
...
Removed sentence in visible javadoc of #PhoneStateListener() which
was useless because it referred to another hidden constructor.
Change-Id: I14a956ac29881000e48bf31e0090e9e1f93bf6e3
2014-12-08 13:13:24 +00:00
Ihab Awad
0855e7aea2
Add Text-to-Speech annotations for phone number displays (1/3)
...
Bug: 17321294
Change-Id: Id7e48e683694e2f9ea2a7dd7fa7d69acc727489d
2014-12-05 15:27:08 -08:00
Stuart Scott
997ddc8e3e
Add mapping between RAT and Network Mode
...
bug:18416275
bug:18415493
Change-Id: I0b29ec953ec9eb29248a22d582013127ee0fea41
2014-12-05 20:28:14 +00:00
Wink Saville
36ffb0494d
Add subId as parameter for get/setDataEnabled.
...
Bug: 18279333
Change-Id: I2496a2fd92b154e5e6981cbf6b5b5939cda59122
2014-12-05 11:10:30 -08:00
Wink Saville
58a3561f74
am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev
...
* commit '0304c529b6a166547aaf104a46bc876780ba7416':
Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
2014-12-04 21:17:43 +00:00
Robert Greenwalt
83c0b096b7
am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev
...
* commit '98f81182fb61953e0712bd788941710b6ad842c2':
Separate voice/data roaming state and type
2014-12-04 20:23:55 +00:00
Wink Saville
82611e6d9c
Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev
2014-12-03 23:32:46 +00:00
Robert Greenwalt
647b437d07
Merge "Separate voice/data roaming state and type" into lmp-mr1-dev
2014-12-03 22:18:24 +00:00
Wink Saville
47920fac33
Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
...
Bug: 18364932
Change-Id: I836b751a443635efcfb9987bb3b91f55c4dff9d6
2014-12-02 17:08:14 -08:00
Stuart Scott
cc4cd6e1ab
am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev
...
* commit '15b2d9ab44690156e067020e12b329997ef5bba6':
Subscription Info density-dependent text size and localized SIM slot index
2014-12-02 21:18:29 +00:00
Stuart Scott
4e779ecd56
Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev
2014-12-02 21:04:54 +00:00
Jing Zhao
e6edb161a7
Separate voice/data roaming state and type
...
It is possible for voice and data to register on different networks so
that the roaming state for them could be different. Provide separated
APIs to handle voice and data roaming.
Also, add the configuration of CDMA international roaming indicators.
Bug: 17318123
Change-Id: Iede9132cbf94bc9971702bd9232374585edd5cd0
2014-12-02 12:33:06 -08:00
Junda Liu
92205a3365
am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev
...
* commit '50e2d6c2ce079c00531ecbcf112593cb0263e47a':
Add hasMatchedTetherApnSetting to telmgr API.
2014-12-02 18:45:41 +00:00
Junda Liu
ef6178a99c
Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev
2014-12-02 18:18:24 +00:00
Shishir Agrawal
7158dfb1be
am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
...
* commit '592707c5250655cbed2b48848701b288605c01ac':
TelephonyManager.setLine1NumberForDisplay should return a boolean.
2014-12-01 20:29:07 +00:00
Shishir Agrawal
0201a6f6f1
TelephonyManager.setLine1NumberForDisplay should return a boolean.
...
The call can fail and should return the success status of the call.
Bug: 18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
2014-12-01 11:48:53 -08:00
Amit Mahajan
719638afea
am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev
...
* commit 'b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
Change to use DATA_ROAMING setting correctly with subId.
2014-12-01 19:32:06 +00:00
Stuart Scott
7151cde3ca
Subscription Info density-dependent text size and localized SIM slot index
...
Change-Id: I49fed470ea82c91ff7d77df2c3447b17a203a38d
2014-12-01 11:14:53 -08:00
Amit Mahajan
65940c4ceb
am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev
...
* commit '476520f744a950fc27d6ac466c301a909d92481a':
Adding helper functions to retrieve settings that are stored per subId.
2014-11-26 12:02:28 +00:00
Amit Mahajan
5ed82c8ca0
Change to use DATA_ROAMING setting correctly with subId.
...
Bug: 18466745
Change-Id: Ib2d7979d164ca3cf32c6619340fae1dc578ca686
2014-11-25 16:29:10 -08:00
Amit Mahajan
3749541a20
Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev
2014-11-25 20:39:09 +00:00
Amit Mahajan
421a53900d
Adding helper functions to retrieve settings that are stored per subId.
...
Bug: 18392680
Change-Id: I360bc19c4501020afd9dfa1cfb7e66ce2fad9536
2014-11-24 15:57:41 -08:00
Wink Saville
b4c5410987
am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
Additional changes to SubscriptionManager API as per API council.
2014-11-24 18:06:09 +00:00
Wink Saville
d09c4cad65
Additional changes to SubscriptionManager API as per API council.
...
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:08:16 -08:00
Junda Liu
38531581fc
Add hasMatchedTetherApnSetting to telmgr API.
...
Bug: b/18158411
Change-Id: Id1285b79194ad21fb728fd18fb09026e51354656
2014-11-21 16:21:30 -08:00
Wink Saville
49414b5b21
am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
...
automerge: 1caab41
2014-11-21 02:41:53 +00:00
Wink Saville
07fb24576a
am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
automerge: 68c21d6
2014-11-21 02:39:23 +00:00
Shishir Agrawal
84b988e6ee
am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev
...
* commit '0783a61d8a6f17ca0fe3d0e55a3c48aceec823d4':
Carrierprivileges: Addressing API council suggestions.
2014-11-21 00:43:23 +00:00
Wink Saville
816e19eb6d
Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
2014-11-20 20:31:49 +00:00
Wink Saville
2d1ee98227
Revert "Additional changes to SubscriptionManager API as per API council."
...
This reverts commit baf21da1e1
2014-11-20 20:29:51 +00:00
Wink Saville
4a57e90817
Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
2014-11-20 20:20:02 +00:00
Shishir Agrawal
a9b6777154
Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev
2014-11-20 17:44:36 +00:00
Wink Saville
baf21da1e1
Additional changes to SubscriptionManager API as per API council.
...
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
2014-11-19 16:03:09 -08:00
Shishir Agrawal
ab57c29092
Carrierprivileges: Addressing API council suggestions.
...
- hasCarrierPrivileges - renamed to getCarrierPrivilegeStatus
- setLine1NumberForDisplay should not be usable by apps that have MODIFY_PHONE_STATE
- setVoiceMailNumber should not be usable by apps that have MODIFY_PHONE_STATE
- setOperatorBrandOverride should not be usable by apps that have MODIFY_PHONE_STATE
Not addressed:
- setGlobalPreferredNetworkType() should not be usable by apps that have MODIFY_PHONE_STATE
The underlying call is needed by system apps (OMADM) too.
Bug: 18356155
Change-Id: Idc6468a0bd0b0c52b9de1d8446f98c90ac0b3238
2014-11-18 17:05:12 -08:00
Amit Mahajan
51064ec6f0
am ca1e3e5e: am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev
...
* commit 'ca1e3e5e830c1e2eb63a3653117bb6c9c0589ebe':
Telephony: STK CC feature implementation
2014-11-18 21:56:06 +00:00
