drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
193,479 Commits 1 Branch 0 Tags
Commit Graph

865 Commits

Author SHA1 Message Date
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
5c11e41b1a am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:13:01 +00: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
b638b35757 am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41 
* commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:57:27 +00:00
Wink Saville
771e952ebc am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 68c21d6 
* commit '07fb24576a5a425798a2aa004dd49682f414cbf7':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:56:45 +00: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
3e8a9053dc am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 
automerge: 84b988e

* commit '84b988e6eea690c33e5f08b3a7f41d3a8cd8d912':
  Carrierprivileges: Addressing API council suggestions.
 2014-11-21 01:47:25 +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 baf21da1e17ef358632c078128d381b3be218a08.

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
5cb315fd0f am 51064ec6: am ca1e3e5e: am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev 
* commit '51064ec6f0f75eb03f86d3b3fa091c857d603506':
  Telephony: STK CC feature implementation
 2014-11-18 22:04:29 +00: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
585ad040a1 am b9b2aa2f: am 2f74e913: am c9f1b3a0: Merge "Add new API to set voicemail number." into lmp-mr1-dev 
* commit 'b9b2aa2f19de547ad0804389e8e18dd20828ec86':
  Add new API to set voicemail number.
 2014-11-18 02:31:46 +00: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
0c29f1b832 am a7697fa8: am 343a88da: am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev 
* commit 'a7697fa81fc0682494a80e0435cb47c38ad7cbe7':
  Updating Subscription Info Icon
 2014-11-17 20:27:03 +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
c78e44e025 am 38f99e55: am 49b03c23: am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 
* commit '38f99e55d561e8bc7a5a5cbcfd518621d70994f0':
  Add telephony.DisconnectCause for merged IMS call.
 2014-11-13 02:34:31 +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
f78c50e6da am 93fc415e: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 automerge: e76308c 
* commit '93fc415e6219f59a5b1f2d6fd5e1647551a27742':
  Update SubscriptionManager API as per API council.
 2014-11-12 03:45:30 +00:00
Junda Liu
5b7dbca7ca am 829519df: Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f automerge: 5716ebe 
* commit '829519dfaab9f2c13492d97556a95300a6908ea4':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
 2014-11-12 03:44:44 +00: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
Junda Liu
2eb5a5f727 Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 2014-11-12 00:05:20 +00:00
Wink Saville
a374c3d03b Update SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
 2014-11-11 11:48:04 -08:00
Stuart Scott
870338c946 am bc1d9755: am 0e58219f: am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev 
* commit 'bc1d97556d32a45ceca5db3e2af12cd3d4cf5590':
  SubInfoRecord provides a tinted icon with the initial embossed.
 2014-11-08 00:25:14 +00:00
Stuart Scott
bc1d97556d am 0e58219f: am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev 
* commit '0e58219f7fbb3f39af109e0fa6c7ed8c47ee9f3b':
  SubInfoRecord provides a tinted icon with the initial embossed.
 2014-11-08 00:21:06 +00:00
Stuart Scott
ab45ec177a SubInfoRecord provides a tinted icon with the initial embossed. 
bug: 17575308
Change-Id: I895975dfe8d1c4db8381ef9322bd72c8fcb3e22c
 2014-11-07 23:53:39 +00:00
Junda Liu
bbdc1c0e04 Add HIDE_CARRIER_NETWORK_SETTINGS global setting. 
Also remove hidden APIs to get/set the preference.

Bug: b/17673255
Change-Id: I8957b0380bf617c953f6665cbfdcc77c3be78411
 2014-11-07 12:11:52 -08:00
Sanket Padawe
da30cd5434 am d0062dea: am d227b4aa: Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev 
automerge: 0872f2e

* commit '0872f2ee34000dcbafff8d3c0b8e93b23ac4d076':
  API changes to add carrier name to subinforecord
 2014-11-07 20:06:45 +00:00
Sanket Padawe
0872f2ee34 am d0062dea: am d227b4aa: Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev 
* commit 'd0062deacc3edcab2aa0b9da94d6605f2080ef66':
  API changes to add carrier name to subinforecord
 2014-11-07 20:03:49 +00:00
Sanket Padawe
e1013f964d API changes to add carrier name to subinforecord 
API changes required to add carrier name of sim as a member of subinforecord.

Change-Id: I08a7f53dc012967005f7b5abd1fbc08f2947da67
 2014-11-07 11:37:29 -08:00
Stuart Scott
1af72bff50 am 843133cd: am a6fc3b1a: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: c7f1ae8 
* commit '843133cd835b2923453bba95599aefa48fe8cb20':
  Fix NPE when parceling SubInfoRecord
 2014-11-06 19:30:06 +00:00
Stuart Scott
843133cd83 am a6fc3b1a: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: c7f1ae8 
* commit 'a6fc3b1a4bc6e6da5902335273b544b577823411':
  Fix NPE when parceling SubInfoRecord
 2014-11-06 19:22:22 +00:00
Stuart Scott
bc6a9601d7 Fix NPE when parceling SubInfoRecord 
bug:18256375
Change-Id: I3567f98aeb82b5c0a11060319186460678661bb2
 2014-11-05 15:07:54 -08:00
Stuart Scott
35d07c0d56 am 1e5275da: am fc1e8477: am 8585e0dd: Merge "Use CharSequence for DisplayName" into lmp-mr1-dev 
* commit '1e5275da2f04758c4857494dad4fafcae8383144':
  Use CharSequence for DisplayName
 2014-11-05 04:18:07 +00:00