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

2636 Commits

Author SHA1 Message Date
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 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
Amit Mahajan
bb35bbf198 am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit '6f10d1c34efba28856fea162f1d193319cad2576':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:57:39 +00:00
Amit Mahajan
4fea0923be Adding new setting LTE_SERVICE_FORCED. 
Bug: 18328639
Change-Id: Icbf9d7987d27af34cbe4ee1b4e9df19e139c2fc7
 2014-11-18 17:34:36 -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
990bbbb352 Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 2014-11-13 02:15:15 +00:00
xinhe
7c42036855 am f6eb33fd: am 031d8fea: Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev 
* commit 'f6eb33fd0722d69b1ee4b4d5c88820b228bd4689':
  Update enabe/disableCellBroadcast with RAN argument
 2014-11-13 00:48:18 +00:00
xinhe
031d8feaa9 Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev 2014-11-13 00:38:00 +00:00
xinhe
c93802b993 Update enabe/disableCellBroadcast with RAN argument 
Allow them to take an explicit argument indicating GSM or CDMA range and
fix the extreme alert disable error.

Bug: 18202935
Change-Id: Ibf12be65c60807834705e7cc9e94ec485ce6b60a
 2014-11-12 15:58:16 -08: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
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
Pavel Zhamaitsiak
aa3c3e864e am 7635aab1: Merge "IMS: Peer capabilities support" into lmp-mr1-dev 
automerge: 5ff25cb

* commit '5ff25cb76cad3406e365d4cfe86b3820245e9d46':
  IMS: Peer capabilities support
 2014-11-11 18:50:21 +00:00
Shriram Ganesh
482e6da972 IMS: Peer capabilities support 
Add support for querying peer capabilities

IMS: Add support for HD icon display related information

Added support to pass the restrict cause associated with the peer
in order to enable display of the HD icon when necessary.Added
support to pass local audio codec information and defined values
for new codecs not defined.

Change-Id: If05d46bdb3907a0ec7efdde48337a7932a7a5c21
 2014-11-11 16:36:15 +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
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
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
1e5275da2f am fc1e8477: am 8585e0dd: Merge "Use CharSequence for DisplayName" into lmp-mr1-dev 
* commit 'fc1e84777c957bb094f793f8d286e873d070e7e0':
  Use CharSequence for DisplayName
 2014-11-05 04:05:41 +00:00
Stuart Scott
8b564c2af8 Use CharSequence for DisplayName 
Change-Id: Ibb93424b85b11913282a4980e756b66a8d7946d5
 2014-11-04 14:47:47 -08:00
Stuart Scott
a93dee63de am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89 
* commit '9017e0613271d35dc4ea1a011268e1cf0165c907':
  Clean up public API of SubInfoRecord.
 2014-11-04 03:15:41 +00:00
Stuart Scott
95fc99b334 Clean up public API of SubInfoRecord. 
bug: 17575308
Change-Id: I047ce11fb7835d500652b7ef340a30c052e96b21
 2014-11-03 11:11:56 -08:00
Amit Mahajan
0c8f8980f6 am 30e51130: Merge "Improve a calculation method for LTE antenna reception level" into lmp-mr1-dev 
automerge: 40d7655

* commit '40d7655026ae25c776a3449af9c661a7f59b5440':
  Improve a calculation method for LTE antenna reception level
 2014-10-31 22:41:09 +00:00
Amit Mahajan
30e5113000 Merge "Improve a calculation method for LTE antenna reception level" into lmp-mr1-dev 2014-10-31 22:35:52 +00:00
Kensuke Ueda
c962b1dcfb Improve a calculation method for LTE antenna reception level 
RSRP value thresholds is relatively high compared with
other mobile phone platforms, which make android seems
low sensitive to radio. This patch sets better thresholds.

Bug: 17891524
Change-Id: I502e1c3d08b2a52c51fe93da9b77476ac827a25b
 2014-10-31 15:35:23 -07:00
Nancy Chen
6a44c194e7 am e1678ddf: Merge "Handle MMI for multi-SIM (1/3)" into lmp-mr1-dev 
automerge: 346f907

* commit '346f9070a45798d3edf38b4abaf39600630dd403':
  Handle MMI for multi-SIM (1/3)
 2014-10-31 22:11:59 +00:00
Nancy Chen
95e8a67933 Handle MMI for multi-SIM (1/3) 
+ Add Telecomm and Telephony methods for handlePinMMIForSubscriber
+ Add Select Account dialog in Dialer for MMI

Bug: 17917937

Change-Id: I26fdc68a07ca0483bf7a052598fe31b1461fd486
 2014-10-31 11:26:38 -07:00
Tyler Gunn
2a36953394 am 7577f3dd: am 16723098: Merge "Communicating participant changes to conference controller." into lmp-mr1-dev 
* commit '7577f3dd8b738d73253f0c6bfe2383ef71a9ba20':
  Communicating participant changes to conference controller.
 2014-10-30 23:44:03 +00:00
Sanket Padawe
ef87affff7 am 1ba2b168: am 52f811ec: Merge "Remove checks to support new sim color selection." into lmp-mr1-dev 
* commit '1ba2b168c0397e833272acbb4b7b8334e1789a6e':
  Remove checks to support new sim color selection.
 2014-10-30 11:03:41 +00:00
Tyler Gunn
167230987b Merge "Communicating participant changes to conference controller." into lmp-mr1-dev 2014-10-29 21:32:53 +00:00