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

2589 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Nancy Chen
968c16ce6d am 12be45d7: am 9016ecab: am 0145e17d: Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev 
* commit '12be45d7c48bf3c0722a794bb44c37b7264e7244':
  Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.
 2014-10-23 22:02:54 +00:00
Legler Wu
2b0a2ad3a3 am c11a944a: [DS] Change the copyright 
* commit 'c11a944a572719fa04f467fc5f5761a8abc9630b':
  [DS] Change the copyright
 2014-10-23 20:56:46 +00:00
Legler Wu
c11a944a57 [DS] Change the copyright 
Change the copyright as Android.

    Review: https://partner-android-review.git.corp.google.com/#/c/185241

Change-Id: Id548867805a65c2887ca19cb79d155b5a8c82753
 2014-10-23 20:27:51 +00:00
Nancy Chen
9016ecab3b am 0145e17d: Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev 
* commit '0145e17db742dff963ea581bc944f99358d2dace':
  Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.
 2014-10-23 19:49:25 +00:00
Nancy Chen
3ace54b895 Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount. 
Settings and Dialer need label, icon, and color for UI display of
subscriptions/SIMs. Add getters for these methods in SubInfoRecord. Sets
up for the following changes:
+ getIcon will return a drawable instead of a resource ID
+ getColor will return a color value instead of an index
PhoneAccount will also be adding these changes which will be adopted
from SubInfoRecord. Adds changes that were reverted from ag/563976.

Bug: 17971273
Change-Id: Ie2beedf8475c6deb48a6ab83bc9656c1142cc004
 2014-10-22 21:44:45 -07:00
xin He
9698656e07 am a86aa5d1: am 4329f15b: am 265e3da0: am 5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 
* commit 'a86aa5d14b849fa9c57ed9a3d06a5ee21b2ea239':
  Show ProgressDialog when waiting for radio to turn on when provisioning.
 2014-10-22 21:40:26 +00:00
xin He
4329f15b50 am 265e3da0: am 5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 
* commit '265e3da00668a0769be331349541050dd6603c2b':
  Show ProgressDialog when waiting for radio to turn on when provisioning.
 2014-10-22 21:22:18 +00:00
Tyler Gunn
6a7ed1eb40 Propagating isMultiParty indicator from RIL up into Telephony layer. 
- Adding isMultiParty() method to IImsCallSession AIDL.

Bug: 18058253
Change-Id: I1c44d3db0f7aa00a3ae6efb1231c5ddd39ab20ac
 2014-10-22 11:26:40 -07:00
xin He
265e3da006 am 5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 
* commit '5085c4c2933219831bde11a482c8b2934e4a259f':
  Show ProgressDialog when waiting for radio to turn on when provisioning.
 2014-10-22 17:22:51 +00:00
Paul Jensen
1de55d3cc8 Show ProgressDialog when waiting for radio to turn on when provisioning. 
Turning on the cellular radio when user selects the provisioning notification
can take 30-60s so a UI is needed to keep the user informed that the radio is
coming up. This is only for provisioning APN support (only AT&T tablets now).

bug:15990642
Change-Id: Ibea894ee934bae2045c0462ae79bfa39d0ef3f05
 2014-10-21 16:06:35 -07:00
Andrew Lee
e56ad3eddd am ba2f181a: am 74af6700: Merge "Add video calling setting to TelephonyManager." into lmp-mr1-dev 
* commit 'ba2f181aa1607e9bd2bf1b723dac8a6c855fab14':
  Add video calling setting to TelephonyManager.
 2014-10-21 21:39:52 +00:00
Andrew Lee
4a3084a46d Add video calling setting to TelephonyManager. 
We want to add a user setting to enable/disable video calling. This
is a telephony-level setting which the user sets using Telephony's
Call Settings, and applies universally to video calls.

But this setting needs to be accessible in places such as Dialer,
so these changes are to support storing the setting in
TelephonyManager (to be implemented in PhoneInterfaceManager) and
providing access to the setting for applications like Dialer
through TelephonyManager.

+ Add function definitions to ITelephony.
+ Add function wrapper implementations in TelephonyManager.

Bug: 16014284
Change-Id: I1dce8bf5ae4f0ee115698ce9627ba8fc424dd855
 2014-10-21 13:49:42 -07:00
Amit Mahajan
edc2c734b0 am 15803d4a: am 1213bf83: Merge "Add a constant for invalid profile id value" into lmp-mr1-dev 
* commit '15803d4ace0e996295e74a04da2aafd550c7737c':
  Add a constant for invalid profile id value
 2014-10-20 22:27:51 +00:00
Amit Mahajan
1213bf83e9 Merge "Add a constant for invalid profile id value" into lmp-mr1-dev 2014-10-20 22:17:39 +00:00
Wink Saville
f9bec04d89 am f4d86a1d: am f44628e3: am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev 
* commit 'f4d86a1dd9d758f9479a7d486e610930266205d0':
  Radio Capability Support.
 2014-10-20 21:34:37 +00:00
Wink Saville
f44628e313 am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev 
* commit '6bacccbfbcdc7952bac7e25c3e3f2d6a6151a215':
  Radio Capability Support.
 2014-10-20 21:24:27 +00:00
Libin.Tang@motorola.com
52a65f8e8f am 3a332602: am 846b71da: change setProvisionedValue/setProvisionedStringValue to return operation result. 
* commit '3a332602e344755fefecbf86d51a69257641e4b2':
  change setProvisionedValue/setProvisionedStringValue to return operation result.
 2014-10-20 18:28:22 +00:00
Hui Wang
d61cc80ef1 Add a constant for invalid profile id value 
Change-Id: I0cac2e38572e4b04081fd3347be05e57cc899008
 2014-10-20 10:41:09 -07:00
Libin.Tang@motorola.com
846b71daaf change setProvisionedValue/setProvisionedStringValue to 
return operation result.

Change-Id: I24f127280d4692633ede7e17a63ababee1b6c71f
 2014-10-20 17:33:44 +00:00
Wink Saville
2af2d57d57 Radio Capability Support. 
New design of capability switch for L.
Add new RIL requests:
     RIL_REQUEST_GET_RADIO_CAPABILITY
     RIL_REQUEST_SET_RADIO_CAPABILITY
     RIL_UNSOL_RADIO_CAPABILITY

These commands allow the framework to communicate what the Radio
Capabilities for each logical modem has or should be using.

It can support 2/3/4G switch and has flexible architecture to support
future technology.

Change-Id: Iedf7f608d2ba3c06a883500f2d85abb98e69d9c1
 2014-10-20 10:31:05 -07:00
xinhe
1ee9604032 am 1a352f4f: am 36eaa869: Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev 
* commit '1a352f4f6b68f5a22baaed3545d5e8d601616019':
  Sprint: MMS proxy authorization does not include NAI
 2014-10-15 23:57:24 +00:00
xinhe
6bb21401a4 Sprint: MMS proxy authorization does not include NAI 
Read the NAI from CSIM and pass it to MMS module
Bug:17752727

Change-Id: Ib7f53bed87183bd9e67103c676218b5748be668f
 2014-10-15 16:31:19 -07:00
Amit Mahajan
6e51a36a97 am 7c2b29ac: am 1ea2aeda: am 589a4896: am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev 
* commit '7c2b29ac45342074ec74860d6ba4a66bc8a8de5f':
  Fix to show low LTE signal strength as -140 instead of 0.
 2014-10-11 04:55:26 +00:00
Amit Mahajan
1ea2aeda29 am 589a4896: am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev 
* commit '589a4896b0c45f03604db1eb0292ef1c936adaff':
  Fix to show low LTE signal strength as -140 instead of 0.
 2014-10-11 02:50:08 +00:00
Amit Mahajan
589a4896b0 am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev 
* commit 'c6c18618e999f24675e23b67e6c488d700199579':
  Fix to show low LTE signal strength as -140 instead of 0.
 2014-10-11 00:24:13 +00:00
Amit Mahajan
b5c78682ad Fix to show low LTE signal strength as -140 instead of 0. 
Bug: 17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
 2014-10-10 17:05:46 -07:00
Shriram Ganesh
2610090667 am 91f7af97: am 69f35c8e: IMS: Unsol TTY notification support 
* commit '91f7af977a26122ddc0bcb8e264258856bad9318':
  IMS: Unsol TTY notification support
 2014-10-10 17:16:37 +00:00
Shriram Ganesh
fae794a51a am 79fd7a57: am 163900a6: Ims: Send user selected TTY mode to lower layers. 
* commit '79fd7a57d3f1de1701c84dbebaefe24e10e1d26d':
  Ims: Send user selected TTY mode to lower layers.
 2014-10-10 17:16:32 +00:00
Etan Cohen
eaecf6a2c9 am d5ea3240: am c3f8a8b1: am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit 'd5ea324063b2dedc844b1aca65d485b03196a6a1':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-10 17:14:18 +00:00
Shriram Ganesh
69f35c8e1b IMS: Unsol TTY notification support 
Code changes to support UNSOL_TTY_NOTIFICATION handling.

Change-Id: I74bba5d06198e016db259ec1f7d28663d475cb92
 2014-10-10 16:24:13 +00:00
Shriram Ganesh
163900a6a1 Ims: Send user selected TTY mode to lower layers. 
Irrespective of whether TTY device is connected or not
send TTY mode setting to modem whenever user changes it
from settings.

Change-Id: I2797cdffea0c10c90cd4f213bd0ea9d63c09f29d
 2014-10-10 16:23:24 +00:00
Etan Cohen
c3f8a8b1ec am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit '4354e6046e4a35b2f35348c6c131fdd600ac26af':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-10 00:30:14 +00:00
Etan Cohen
4354e6046e am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit '5e5bc4b13cd1fc657da940c14e2333d8d3b18080':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-09 19:29:43 +00:00
Etan Cohen
5e5bc4b13c TD_SCDMA is more like GSM than CDMA - re-classifying. 
Bug: 17788412
Change-Id: Icc6a692a1f038624dde772f8d8f197aab604c166
 2014-10-09 16:58:04 +00:00
Amit Mahajan
ec20fc9273 am 190202f7: am dbbf4932: am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3 
* commit '190202f7e586e02e098b330ac84eb441a56005d3':
  Sms7BitEncodingTranslator
 2014-10-07 05:23:20 +00:00
Amit Mahajan
dbbf493220 am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3 
* commit 'd9a3f89a0727590a069c563a8b97fe99b866d67c':
  Sms7BitEncodingTranslator
 2014-10-07 05:12:44 +00:00
Amit Mahajan
d9a3f89a07 Merge commit '69555fc2' into fix-merge-conflict3 
Conflicts:
	core/res/res/values/symbols.xml

Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
 2014-10-06 21:57:42 -07:00