Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
171,003 Commits 3 Branches 0 Tags
8ff1a5ee0df9abba4fc63bcfc93efbda4a176255
Commit Graph

643 Commits

Author SHA1 Message Date
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
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
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

* commit '1caab41f31b2fd1129dff58fc678361b691af9db':
  Revert "Additional changes to SubscriptionManager API as per API council."
 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

* commit '68c21d6736a2ec54d36c8b33b815062c568e4707':
  Additional changes to SubscriptionManager API as per API council.
 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.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
 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
Preeti Ahuja
d4180cc2d4 Telephony: STK CC feature implementation 
Add strings and constants required for stk cc feature.

Bug: 17646476
Change-Id: I28c5c199f6138c4db2a00d524592667a481db8cd
 2014-11-18 13:01:02 -08:00
Shishir Agrawal
b9b2aa2f19 am 2f74e913: am c9f1b3a0: Merge "Add new API to set voicemail number." into lmp-mr1-dev 
* commit '2f74e913c85ccb405e4fe18a8f3c4c90153663a8':
  Add new API to set voicemail number.
 2014-11-18 02:07:57 +00:00
Shishir Agrawal
c9f1b3a0e8 Merge "Add new API to set voicemail number." into lmp-mr1-dev 2014-11-17 23:49:29 +00:00
Stuart Scott
a7697fa81f am 343a88da: am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev 
* commit '343a88da1b93642f8d8b75f7de43918378b573f8':
  Updating Subscription Info Icon
 2014-11-17 19:53:16 +00:00
Stuart Scott
da5be611d8 Updating Subscription Info Icon 
bug: 18356155

Change-Id: I8d944e9b547701d51a9c58709cb9777a07c5227e
 2014-11-17 19:11:40 +00:00
Andrew Lee
38f99e55d5 am 49b03c23: am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 
* commit '49b03c2374d035524908251113d27733219e9323':
  Add telephony.DisconnectCause for merged IMS call.
 2014-11-13 02:25:22 +00:00
Andrew Lee
840162d2b4 Add telephony.DisconnectCause for merged IMS call. 
When merged, IMS calls are consolidated into one call. Thus they
"disconnect", even though the user can continue to comminucate
with the party on that call.

We want to recognize this scenario so we can control relevant
behaviors (ie.don't play the "end call" tone in this case).

Bug: 18291234
Change-Id: I93247f88ed74467470504bec88fcfb7ed714f0ff
 2014-11-12 15:52:32 -08:00
Shishir Agrawal
5c1a63c223 Add new API to set voicemail number. 
The API is protected by system or carrier privilege.

Bug: 17393589
Change-Id: I33f4a00b30e0f5d72e5d53553a187d974872eab6
 2014-11-12 09:38:18 -08:00
Wink Saville
93fc415e62 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 
automerge: e76308c

* commit 'e76308c5d62984132192119f3d0bc407f89a2100':
  Update SubscriptionManager API as per API council.
 2014-11-12 03:22:11 +00:00
Junda Liu
829519dfaa Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f 
automerge: 5716ebe

* commit '5716ebe50debab01ede01b2f99abde85a250c82c':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
 2014-11-12 03:12:51 +00:00
Wink Saville
43bbf30a06 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-12 01:13:04 +00:00