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

2811 Commits

Author SHA1 Message Date
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
ac5aedb018 am aa3c3e86: am 7635aab1: Merge "IMS: Peer capabilities support" into lmp-mr1-dev automerge: 5ff25cb 
* commit 'aa3c3e864e58a0802fb988619816ec6a37191b71':
  IMS: Peer capabilities support
 2014-11-11 18:55:30 +00: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
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
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
f5845fb756 am a93dee63: am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89 
* commit 'a93dee63de4ce37343577e171571ac9e1d6effa0':
  Clean up public API of SubInfoRecord.
 2014-11-04 03:28:04 +00: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
c79e91a698 am 0c8f8980: am 30e51130: Merge "Improve a calculation method for LTE antenna reception level" into lmp-mr1-dev automerge: 40d7655 
* commit '0c8f8980f6094bad867bd91910f584875fa10193':
  Improve a calculation method for LTE antenna reception level
 2014-10-31 22:47:50 +00: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
34378f3c5d am 6a44c194: am e1678ddf: Merge "Handle MMI for multi-SIM (1/3)" into lmp-mr1-dev automerge: 346f907 
* commit '6a44c194e7a40af82918cf31d44c00d30e92fa24':
  Handle MMI for multi-SIM (1/3)
 2014-10-31 22:17:54 +00: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
018780687c am 2a369533: am 7577f3dd: am 16723098: Merge "Communicating participant changes to conference controller." into lmp-mr1-dev 
* commit '2a369533947c5552ba8e1c5cc9fb657952e3f0e0':
  Communicating participant changes to conference controller.
 2014-10-31 00:00:52 +00: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
305b15fe39 am 1ba2b168: am 52f811ec: Merge "Remove checks to support new sim color selection." into lmp-mr1-dev 
automerge: ef87aff

* commit 'ef87affff7056d600e137d098995064d698ec0ab':
  Remove checks to support new sim color selection.
 2014-10-30 14:52:14 +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
Tyler Gunn
3bffcf78b5 Communicating participant changes to conference controller. 
- Add new ConferenceParticipant parcelable class which represents a
single participant contained in the conference event package.
- Adding callbacks/listeners to Connection to handle changes to
participant state.

Bug: 18057361
Change-Id: Iadfebe84959f30f8e835f282aa994c0b92768aa6
 2014-10-28 13:51:27 -07:00
Sanket Padawe
d95198eb36 Remove checks to support new sim color selection. 
Remove checks to support new sim color selection in multi-sim settings UI.

Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
 2014-10-28 13:06:08 -07:00
Wink Saville
831296e84f am ae85478d: am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev automerge: e5b4c12 
* commit 'ae85478d3dbed145825293c307bde4213ff175f3':
  Change subId to int from long
 2014-10-28 07:16:13 +00:00
Wink Saville
ae85478d3d am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev 
automerge: e5b4c12

* commit 'e5b4c1219a32a086508d83101c10605dd894e4d2':
  Change subId to int from long
 2014-10-27 21:30:48 +00:00
Wink Saville
4dec130c39 Merge "Change subId to int from long" into lmp-mr1-dev 2014-10-27 17:34:47 +00:00
Tyler Gunn
d2831cb0ca am c313c441: am 928debf5: Merge "IMS call merge call-back changes." into lmp-mr1-dev automerge: cf96936 
* commit 'c313c441b5f7c0aacb1261d8abf776a80381cfba':
  IMS call merge call-back changes.
 2014-10-25 02:36:02 +00:00
Tyler Gunn
c313c441b5 am 928debf5: Merge "IMS call merge call-back changes." into lmp-mr1-dev automerge: cf96936 
* commit '928debf59a1c8249a6a502574f806955f2a166cc':
  IMS call merge call-back changes.
 2014-10-24 23:03:06 +00:00
Tyler Gunn
f764e80757 IMS call merge call-back changes. 
Renaming callSessionMerged to callSessionMergeStarted.
Adding callSessionMergeComplete callback for when merge successfully
completes.

Bug: 18056632
Change-Id: I8fc73b6c9db5e7970de81d8c3e09abc80f1a262f
 2014-10-24 14:06:40 -07:00
Tyler Gunn
23bcc29286 am c89c7be4: am 43ac9389: am 3682ced7: Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev 
* commit 'c89c7be438c6894abf36bfbdea5217ada3e30442':
  Propagating isMultiParty indicator from RIL up into Telephony layer.
 2014-10-24 15:01:22 +00:00
Tyler Gunn
c89c7be438 am 43ac9389: am 3682ced7: Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev 
* commit '43ac9389bb7f19078e4d1ecd2d87bde3262ad6be':
  Propagating isMultiParty indicator from RIL up into Telephony layer.
 2014-10-24 14:53:16 +00:00
Tyler Gunn
3682ced751 Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev 2014-10-24 14:41:14 +00:00
Wink Saville
63f03dd94c Change subId to int from long 
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
 2014-10-23 21:54:09 -07:00
Legler Wu
a0839c6f6c am b8b65586: am d9afc9c5: am 2b0a2ad3: am c11a944a: [DS] Change the copyright 
* commit 'b8b65586ef434493c84d8cbba477af2d6c9814f8':
  [DS] Change the copyright
 2014-10-23 22:18:09 +00:00
Nancy Chen
84300978a2 am 968c16ce: am 12be45d7: am 9016ecab: am 0145e17d: Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev 
* commit '968c16ce6dec72cb68618c28e6e4709bb0c5f8ca':
  Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.
 2014-10-23 22:17:45 +00:00
Legler Wu
b8b65586ef am d9afc9c5: am 2b0a2ad3: am c11a944a: [DS] Change the copyright 
* commit 'd9afc9c5361406bf3eae91f168af24a415d9b111':
  [DS] Change the copyright
 2014-10-23 22:03:53 +00:00