Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,895 Commits 3 Branches 0 Tags
c9fb4e5c6bb3dd71aa02aae135f5433e72daecb8
Commit Graph

3037 Commits

Author SHA1 Message Date
Nathan Harold
9c9f6c0e6a am 71feb72b: Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev 
* commit '71feb72b76777afa10dca555287f954d63deeb9d':
  Fix a typo in the docstring of getAllCellInfo()
 2015-06-08 20:07:24 +00:00
Andrew Flynn
0c13fa8466 am 21a4f17c: Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 
* commit '21a4f17c942165684bc590de594984912459396d':
  Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
 2015-06-08 20:07:10 +00:00
Nathan Harold
71feb72b76 Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev 2015-06-08 20:05:07 +00:00
Andrew Flynn
21a4f17c94 Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 2015-06-08 19:59:51 +00:00
Andrew Flynn
2b5348b413 Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService" 
This reverts commit 7f8be9d89b.

Change-Id: Ib99d2b8f83c2775cf5df4330a4f20bc791a83e5e
 2015-06-08 19:59:29 +00:00
Nathan Harold
fde06fd323 Fix a typo in the docstring of getAllCellInfo() 
Change-Id: I5ac23e708926a1ca649ace3890af417c9607e0e9
 2015-06-08 12:38:40 -07:00
Amit Mahajan
158988c971 am 829c0977: Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev 
* commit '829c097761e39b608b8b965a2c03f11ce5a95d2b':
  Adding temporary logging to debug CTS failure (for CellLocationTest).
 2015-06-08 17:39:05 +00:00
Amit Mahajan
08ffeb63c9 am 9b5e2124: Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev 
* commit '9b5e2124d0bc80370e80e0525e34a46eda61ded7':
  Changing getSimState to use slot idx instead of sub id.
 2015-06-08 17:39:01 +00:00
Andrew Flynn
410bceba5b am 2429e6a8: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit '2429e6a8d96a4eba83e22c35595fa05e0f5e51f2':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-08 17:38:55 +00:00
Amit Mahajan
829c097761 Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev 2015-06-08 17:27:29 +00:00
Amit Mahajan
9b5e2124d0 Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev 2015-06-08 17:26:03 +00:00
Andrew Flynn
2429e6a8d9 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-08 17:25:12 +00:00
Amit Mahajan
9387f1dfe3 Changing getSimState to use slot idx instead of sub id. 
Bug: 20736251
Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
 2015-06-08 17:01:23 +00:00
Etan Cohen
024557b2af Merge changes Ie0dd7a44,I5b3c0a48 into mnc-vt-dev 
* changes:
  Merge commit 'e79fed5' into merge
  Merge commit 'abfdaea' into merge
 2015-06-06 00:10:37 +00:00
Etan Cohen
89a2c471bc Merge commit 'abfdaea' into merge 
Change-Id: I5b3c0a48c9d47bcb02d49132077f9e258481de2d
 2015-06-05 17:07:48 -07:00
Sanket Padawe
6bf85052a9 am 912f705f: Merge "Suppress default logging in SubscriptionManager." into mnc-dev 
* commit '912f705f1f98ba2fc744601994dfbe12f391b0ae':
  Suppress default logging in SubscriptionManager.
 2015-06-06 00:06:36 +00:00
Sanket Padawe
912f705f1f Merge "Suppress default logging in SubscriptionManager." into mnc-dev 2015-06-05 23:45:45 +00:00
Sanket Padawe
28964eb236 Suppress default logging in SubscriptionManager. 
Bug: 20465753
Change-Id: Ieeb493be7b32382c6adf1cf0664cf3e96cedace7
 2015-06-05 16:13:51 -07:00
Jonathan Basseri
ef0e89b33f am 64128563: Merge "Renaming carrier config variable keys." into mnc-dev 
* commit '6412856358493455692955147991d858cfe16f80':
  Renaming carrier config variable keys.
 2015-06-05 22:41:16 +00:00
Jonathan Basseri
69822f0d63 Renaming carrier config variable keys. 
API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: Ibe55ad5a31ef618455e763b5c5265fc817c934ab
 2015-06-05 15:08:55 -07:00
Andrew Flynn
7f8be9d89b notifyCarrierNetworkChange:TelephonyManager->CarrierService 
Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
  new internal callers that want to bind to it.

Bug: 21572049
Bug: 21630803
Change-Id: Idcbcd107966fe92d7edc23c261e11db61160f615
 2015-06-05 09:20:17 -04:00
Nancy Chen
461b45070f am 65561b5c: Merge "Add carrier package name field to check for carrier vvm app." into mnc-dev 
* commit '65561b5c5100d4d4b18d5086cba52d796122e78d':
  Add carrier package name field to check for carrier vvm app.
 2015-06-04 21:20:28 +00:00
Nancy Chen
65561b5c51 Merge "Add carrier package name field to check for carrier vvm app." into mnc-dev 2015-06-04 21:09:45 +00:00
Amit Mahajan
f657d0b8b9 am b2556363: Fixed punctuation in comment. 
* commit 'b2556363e7c142d7e0ab8f62e1a82662600a0821':
  Fixed punctuation in comment.
 2015-06-04 19:38:57 +00:00
Amit Mahajan
1fcaf41221 am b8a4ba86: Merge "Update getVoiceMessageCount() comments." into mnc-dev 
* commit 'b8a4ba86d87b7bdfe8b88300de8b29f1578b26c6':
  Update getVoiceMessageCount() comments.
 2015-06-04 19:27:11 +00:00
Amit Mahajan
b2556363e7 Fixed punctuation in comment. 
Bug: 21559800
Change-Id: I47dc8e7be809cc586c307e72c7e9e11d5268cd5f
 2015-06-04 12:19:40 -07:00
Amit Mahajan
b8a4ba86d8 Merge "Update getVoiceMessageCount() comments." into mnc-dev 2015-06-04 19:14:07 +00:00
Amit Mahajan
5347753188 Update getVoiceMessageCount() comments. 
Bug: 21559800
Change-Id: I7a737ae8a93c59391f232b5da6e3b36874126f3a
 2015-06-04 12:05:18 -07:00
Nancy Chen
97f5ccd1cc Add carrier package name field to check for carrier vvm app. 
The carrier's vvm app's package name will be checked so that if it is
already installed, the dialer vvm will be disabled.

Bug: 2112648e#
Change-Id: I0433037f3bc5c5a380c76a03090d61c430e47e4b
 2015-06-04 12:00:25 -07:00
Etan Cohen
4067829047 Merge "Rename VoLTE/WFC enable API to available - add VT available API." into mnc-vt-dev 2015-06-04 04:59:35 +00:00
Amit Mahajan
2e7ca76a8a Adding temporary logging to debug CTS failure (for CellLocationTest). 
Bug: 21209629
Change-Id: Ic99cf02f26d3cca7260a3a0141ce13eff9a885bc
 2015-06-03 14:53:43 -07:00
Jonathan Basseri
b06411a90f Merge "Document procedure for adding carrier config variables." into mnc-dev 2015-06-03 20:59:13 +00:00
Tyler Gunn
bb6d060585 Merge "API Cleanup: Remove VideoState class." into mnc-dev 2015-06-03 17:13:41 +00:00
Tyler Gunn
87b73f370e API Cleanup: Remove VideoState class. 
- Remove VideoState class.
- Replace references to VideoState constants with VideoProfile equivalent.
- Push VideoState static methods into VideoProfile.

Bug: 21573551
Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
 2015-06-03 10:09:59 -07:00
Jonathan Basseri
97769b0c43 Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev 2015-06-02 23:14:45 +00:00
Brian Attwell
115c04410e Rename PhoneNumberUtils APIs 
In response to more API review.

Bug: 21571895
Change-Id: Ia1fa69da07a3427997919ba61c77fcbad7e79f2a
 2015-06-02 21:34:33 +00:00
Jonathan Basseri
f31ac338af Migrating MmsConfig to CarrierConfigManager. 
Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

This was originally Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a

Bug: 21085630
Change-Id: I5a55873465c36ea8a7e3915b8b98a65b47c60dfa
 2015-06-02 14:29:04 -07:00
Jonathan Basseri
abdf79aba0 Merge "Revert "Migrating MmsConfig to CarrierConfigManager."" into mnc-dev 2015-06-02 21:15:05 +00:00
Jonathan Basseri
27a7b78e40 Revert "Migrating MmsConfig to CarrierConfigManager." 
Forgot to update-API

This reverts commit 9444f4be82.

Change-Id: I8e1bb7ff5b86d478ae7a79497d28ee9310209de6
 2015-06-02 21:13:48 +00:00
Adrian Roos
56dbe3ee4b Merge "Hide and disable emergency assist API" into mnc-dev 2015-06-02 20:50:55 +00:00
Jonathan Basseri
9444f4be82 Migrating MmsConfig to CarrierConfigManager. 
Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

Bug: 21085630
Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a
 2015-06-02 10:08:08 -07:00
Jonathan Basseri
08e318e586 Document procedure for adding carrier config variables. 
Readers of CarrierConfigManager.java should find enough info in the
comments to add new variables and override them in either their own
carrier app or the default carrier app.

Change-Id: Ib1d87c24543491ad8b4ef0b1d08148a07fb1ace3
 2015-05-29 10:12:23 -07:00
Brian Attwell
19d9d0ca2e Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev 2015-05-28 23:43:47 +00:00
Brian Attwell
1a15ab91bc Rename "end" to "endExclusive" in addPhoneTtsSpan 
Bug: 21209482
Change-Id: If505acecf5ca398560a9a23ea23ff8dd741e4025
 2015-05-28 16:23:37 -07:00
Amit Mahajan
ff0c25ce31 Merge "Cleaning up logging in TelephonyManager." into mnc-dev 2015-05-28 23:05:29 +00:00
Etan Cohen
a107edd21b Rename VoLTE/WFC enable API to available - add VT available API. 
Renamed API to use consistent semantics: available refers to the current
state of the service rather then whether feature is enabled by device/carrier/
user.

Added VT API to match VoLTE/WFC.

Change-Id: Ifb31f123db77e731e75a982b8594168f59a289e7
 2015-05-28 15:57:20 -07:00
Tyler Gunn
abfdaead4c Add new carrier config settings. 
1. Add new carrier config setting for "bool_allow_emergency_video_calls".
This allows us to control on a per-carrier basis whether emergency
video calls are allowed.
2. Add carrier config setting "bool_allow_video_pause", which
was previously in overlay files in packages/services/Telephony (Figured I
would clean this up while I'm here).

Bug: 20089489
Change-Id: I97e0983b4a7c8e8086ab58e7e839011e62fabcaf
 2015-05-28 15:09:10 -07:00
Amit Mahajan
56548d578c Cleaning up logging in TelephonyManager. 
Bug: 21474174
Change-Id: I4555ada69c233ee9e9d9e45c1d619e8b779d9016
 2015-05-28 11:39:23 -07:00
Nancy Chen
ec7100d011 Merge "Update docstring for STRING_VVM_TYPE to point to possible values." into mnc-dev 2015-05-28 17:17:19 +00:00
Narayan Kamath
7ff76d637f Add a hidden telephony API for querying SIM derived locales. 
bug: 19818550
Change-Id: Ide6c05ad8fe7b0cff6f20ddfe755e83e9b3a21aa
 2015-05-28 08:59:27 +00:00