Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,167 Commits 3 Branches 0 Tags
73e648b2a6397bddb4da73ca7cfb2ae80c0e7abe
Commit Graph

3052 Commits

Author SHA1 Message Date
Tyler Gunn
64b7f1df2d am 69c4e2c5: Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 
* commit '69c4e2c57eb587709452d3319136da19db5e465b':
  Remove use of STATE_AUDIO_ONLY in a comparison.
 2015-06-09 22:13:34 +00:00
Tyler Gunn
69c4e2c57e Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 2015-06-09 22:04:10 +00:00
Tyler Gunn
bc6f12ee42 Remove use of STATE_AUDIO_ONLY in a comparison. 
- Cleanup javadoc to make it more explicit how to use STATE_AUDIO_ONLY.
- Use VideoProfile.isAudioOnly() instead of doing == comparison.

Bug: 21645094
Change-Id: I5a67290a996f8f338aebab72a4d3cb57f1b1993b
 2015-06-09 14:34:11 -07:00
Fyodor Kupolov
c69efef11f am 4056b814: Merge "Do not enforce PHONE_STATE_PERMISSION to register listener" into mnc-dev 
* commit '4056b814023cf168d125d63e1bf0abb231f2434f':
  Do not enforce PHONE_STATE_PERMISSION to register listener
 2015-06-09 19:55:10 +00:00
Fyodor Kupolov
309b2f63f3 Do not enforce PHONE_STATE_PERMISSION to register listener 
PHONE_STATE_PERMISSION should not be required to register to the following
event types:
- PhoneStateListener.LISTEN_CALL_STATE
- PhoneStateListener.LISTEN_DATA_ACTIVITY
- PhoneStateListener.LISTEN_DATA_CONNECTION_STATE

In case of LISTEN_CALL_STATE, an empty string should be passed instead of
incomingNumber, when caller has no PHONE_STATE_PERMISSION.

Bug: 21588537
Change-Id: I5b6d0308924f7e4cd13a983b8e0c9b3a5bbb119b
 2015-06-09 12:44:39 -07:00
Shriram Ganesh
4aef69ab52 MWI,phantom call,Suppl services, error codes 
1. IMS MWI Feature
- Add new API to update waiting
voice message count, for UI
propagation based on RFC 3842

2. phantom call support

Supplementary services

3. IMS : Incoming Call Barring
- Modified existing API to support
   request like registration,activation,
   deactivation,erasure,interogation.

4.Unsol supplementary service notification
- send unsol supplementary notification to UI
- add call history info

Miscellaneous
5. Ims: Originate conference call in DIALING state

6. IMS: Addition of Extras to ImsCallProfile
- Add EXTRA string definitions to ImsCallProfile

7. IMS: Definition of error code
- answered elsewhere
- FDN call failure

Change-Id: I52a64e9a5df3479189f62921a01655a50fb386fc
 2015-06-09 08:31:44 -07:00
Zach Johnson
bbc2568ee1 am d56958c4: Merge "Ignore carrier apps when checking for idleness" into mnc-dev 
* commit 'd56958c440dffd85349adee5ca0bf4d0893215c6':
  Ignore carrier apps when checking for idleness
 2015-06-09 00:14:55 +00:00
Zach Johnson
d56958c440 Merge "Ignore carrier apps when checking for idleness" into mnc-dev 2015-06-09 00:06:29 +00:00
Prerepa Viswanadham
c0979958fd am 8711ed64: Merge changes from topic \'modemActivityInfo\' into mnc-dev 
* commit '8711ed644bab42c03ab9a22c14e1cb2825a107a6':
  API for get modem activity info
  Activity info and stats from modem
 2015-06-08 23:57:18 +00:00
Prerepa Viswanadham
8711ed644b Merge changes from topic 'modemActivityInfo' into mnc-dev 
* changes:
  API for get modem activity info
  Activity info and stats from modem
 2015-06-08 23:44:51 +00:00
Jonathan Basseri
9da4d7d5fc am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 
* commit '623bf636de8f6f53ffa46127ed3fa5477be0a094':
  Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
 2015-06-08 22:36:07 +00:00
Jonathan Basseri
5ea0c8f1c6 Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId 
Per discussion with API council, "notify" makes more sense than "reload"
here.

Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
 2015-06-08 14:59:09 -07:00
Zach Johnson
b4b9ca7580 Ignore carrier apps when checking for idleness 
Also introduce a way to check if a package has
carrier privileges for any active phone.

Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
 2015-06-08 13:49:13 -07:00
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
Prerepa Viswanadham
3d0f09433a API for get modem activity info 
Change-Id: I4785e1dfce14468de8ba5a376c7c3aa57178ce7b
 2015-06-05 02:11:26 +00:00
Prerepa Viswanadham
5c72899431 Activity info and stats from modem 
Change-Id: Ifa8e520673c7e5549b0066a16a744810f1f0730c
 2015-06-05 02:10:51 +00: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