407 Commits

Author SHA1 Message Date
Nancy Chen
b0cad32c3c Add API method to extract subscription ID from phone account (1/3)
Since Telephony uses subscription ids and Telecom uses Phone Accounts,
there should be an easy way to interface between the two. Since the
value of the subscription id and "id" of the phone account should be the
same in the case of a SIM phone account, we just need to check that the
phone account in question is a SIM phone account and convert the string
to a long.
This lays in groundwork for the following bugs:

Bug: 17925501
Bug: 17917937
Change-Id: I926e969b365d9e9878436302117e8786ec5513b8
2014-10-13 14:01:49 -07:00
Ihab Awad
6d39d66900 am f5afb4d6: Revert "Add color to PhoneAccount objects (1/3)"
* commit 'f5afb4d617d591225cc504b52ba9b6f1605a5c87':
  Revert "Add color to PhoneAccount objects (1/3)"
2014-10-12 04:33:12 +00:00
Ihab Awad
f5afb4d617 Revert "Add color to PhoneAccount objects (1/3)"
This reverts commit 0000cd81c84d73d3f878cd581fb89b7ea257a05a.
2014-10-11 17:16:39 -07:00
Ihab Awad
d410a2f4ee am a516e445: Merge "Add color to PhoneAccount objects (1/3)" into lmp-sprout-dev
* commit 'a516e445651724da3a833d08540c42fabe4f34b7':
  Add color to PhoneAccount objects (1/3)
2014-10-11 02:49:21 +00:00
Ihab Awad
a516e44565 Merge "Add color to PhoneAccount objects (1/3)" into lmp-sprout-dev 2014-10-10 23:02:12 +00:00
Ihab Awad
82816c11bd Add color to PhoneAccount objects (1/3)
Change-Id: I1887ba14f284453784299434cbc3d67c950d4266
2014-10-10 11:04:21 -07:00
mike dooley
6e24a156cd am 3175824a: am 879142bf: Fix hangouts conference calling regression.
* commit '3175824a783c5d45df91ccf84fab8304f4d353c4':
  Fix hangouts conference calling regression.
2014-10-09 19:17:14 +00:00
mike dooley
879142bf1c Fix hangouts conference calling regression.
Check the connection-by-id hash table instead of conference-by-id hash
table when setting conferenceable connections.

Bug: 17919110
Change-Id: Ia8a5ab3fb96926e600d21eca7737a0044b233563
2014-10-09 01:15:58 +00:00
Tyler Gunn
663edb8bfb am 329bd662: am 3bde32e6: Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev
* commit '329bd662cc0dccaf41d441ea44db2895df48f0df':
  Fixing where call goes from disconnecting to active to disconnecting state.
2014-10-07 20:55:45 +00:00
Tyler Gunn
4afc6afd20 Fixing where call goes from disconnecting to active to disconnecting state.
- Adding disconnecting state to telecom used to communicate that a call is
being disconnected to InCall UI (rather than it existing only as a state
in the InCall UI).

Bug: 17821930
Change-Id: I6c2d9521915ba154c0468eea62c12c30060edd2e
2014-10-07 10:14:55 -07:00
Yorke Lee
7a394311ad am 770ed6ec: Fix build break
* commit '770ed6ec920ec10798c5b7a7b4850ccc0b2a531f':
  Fix build break
2014-10-07 03:31:21 +00:00
Yorke Lee
770ed6ec92 Fix build break
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
(cherry picked from commit 9858af0ec68ad28db60047587c8eb6232b4a6591)
2014-10-07 03:13:12 +00:00
Yorke Lee
9858af0ec6 Fix build break
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
2014-10-06 18:58:52 -07:00
Yorke Lee
0b27c28377 am 7e552595: am 4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
* commit '7e552595bda0825787820e3d9bb58b5fad32cd01':
  Add ability to add sim-initiated MO call to UI (2/4)
2014-10-07 01:04:30 +00:00
Yorke Lee
c3cf982d18 Add ability to add sim-initiated MO call to UI (2/4)
Add supporting (hidden) APIs to TelecomManager to add the ability to
add a previous unknown call to Telecom

Bug: 17787391

Change-Id: Ibdfaee81a55e11451c146751cf970980dccad435
2014-10-06 15:09:00 -07:00
Evan Charlton
7363517f07 am 25b85bcc: am 8f8bffa1: Merge "Add @SystemApi to missing TelecomManager methods" into lmp-dev
* commit '25b85bcc41ccdd912cba7b9b6462f177e85b3b08':
  Add @SystemApi to missing TelecomManager methods
2014-10-02 23:22:57 +00:00
Evan Charlton
ce11decc5e Add @SystemApi to missing TelecomManager methods
A few methods (which should be exposed) were missing @SystemApi
annotations.

TelecomManager#addNewIncomingCall
TelecomManager#registerPhoneAccount
TelecomManager#unregisterPhoneAccount

Bug: 17786491
Change-Id: Idf318cf6238668762c00ed0913a9c0ccd5bcb884
2014-10-02 13:55:40 -07:00
Ihab Awad
12a4df2b66 resolved conflicts for merge of ead63f02 to lmp-mr1-dev
Change-Id: I20d5f9d8aae82f0cb6f0ebf2ac1cb0af05eb8c9b
2014-10-01 14:31:01 -07:00
Ihab Awad
50e3506533 Refine implementation of GSM conferences (1/3)
Bug: 17684223
Change-Id: I05d05b594803ea2c1da4247111b70ad5f870ac46
2014-09-30 16:46:39 -07:00
Tyler Gunn
76c01a50d3 MR1 - Adding more Telecom state dumping.
- Add toString for PhoneAccount class for use when dumping state.
- Call Log.pii for PhoneAccountHandle mId since it may contain pii (eg sip
uri).

Bug: 17730966
Change-Id: Iddbd949b42704405de558f8ed8c4449242b74870
2014-09-30 22:29:32 +00:00
Sailesh Nepal
77780a4e37 Don't print error log if phone account icon is missing
Bug: 17678017
Change-Id: I212a815af26af1d344092d874c057e9481642263
2014-09-26 18:14:54 -07:00
Sailesh Nepal
faed92cdd2 am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev
* commit '5926650d6099469981369cf5235da6d2b135ba0d':
  Adding support for Cdma conference calling.
2014-09-26 04:40:34 +00:00
mike dooley
95ea5765dc Adding support for Cdma conference calling.
Adding methods to merge and swap Cdma conference
calls from hangouts.

Bug: 17658943
Change-Id: I0ce472415e3455503223fc0dab5e1a8ee415cde9
2014-09-25 15:09:02 -07:00
Junda Liu
f52ac900ca Revert "Hide CarrierPrivilege APIs in TelMgr."
This reverts commit b7aa9e4a6338811d4dacc77e6024a0b97a99e5e9.

Change-Id: I212cd4f1b7b45e0523fc47b2a9c2a6b487e9dbb5
2014-09-25 18:56:11 +00:00
Junda Liu
cfac510914 am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
* commit '63f0b87ee3a0df19eec15e73cfbfb9b97623534c':
  Hide CarrierPrivilege APIs in TelMgr.
2014-09-25 18:17:52 +00:00
Junda Liu
698b3b2981 Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 2014-09-25 17:36:11 +00:00
Junda Liu
bac6d61ab6 Hide CarrierPrivilege APIs in TelMgr.
Per API council decision, we will polish and public in MR1.

Bug: b/17639966
Change-Id: Id009cd62b4d44dd17fe7a30e0f8037c6fb373c32
2014-09-25 10:25:10 -07:00
Evan Charlton
8635c578f0 Revert "@hide ConnectionService APIs."
This reverts commit 86935c406e4a8bb0e2ad871b51009f3603df9e87.
2014-09-24 14:06:12 -07:00
Jay Shrauner
2fbab892e9 Merge "Fix NPE crash when mPhone is null" into lmp-dev 2014-09-23 20:59:15 +00:00
mike dooley
95e8070e29 Fixing ConcurrentModificationException.
Implementing review feedback.

Bug: 17572658
Change-Id: I3a060d21669a58188a24c5d6ec5fefcbca45a976
2014-09-23 17:34:10 +00:00
Tyler Gunn
711d876fd1 @hide ConnectionService APIs.
Bug: 17569532
Change-Id: I68f7237191bd6d7a1a00ba7bb4fd2f8e3d669e8f
2014-09-23 10:00:38 -07:00
Jay Shrauner
5e6162de62 Fix NPE crash when mPhone is null
Bug:17609710
Change-Id: Idb99feb6f15fd29809adde51cda1eb0d44e20101
2014-09-22 20:47:45 -07:00
Sailesh Nepal
c2a978dba3 Pass disconnect reason for failed remote connections
If a remote connection fails to create call setDisconnected
instead of setState. This allows us to pass the disconnect
reason.

Note, this CL is very low risk since it only impacts remote
connections.

Bug: 17594857
Change-Id: Id296f3f5a4bb9168b358d3bfda94e04623a6b99c
2014-09-20 18:23:05 -07:00
Nancy Chen
f4cf77c5dc Add constructor for DisconnectCause that does not require a tone.
In order to create a DisconnectCause with a label/description that does
not require specifying a tone.

Bug: 17486242
Change-Id: If82605ff20fc9f53ed41b49e12575424c6efc2b6
2014-09-19 11:01:45 -07:00
Nancy Chen
513c892135 Replace get*PhoneAccounts* public API methods with new method (1/3)
Hide getCallCapablePhoneAccounts and getPhoneAccountsSupportingScheme
because a third party app should not be able to see all phone accounts
registered. Replace instead with getPhoneAccountsForPackage(Context)
which will only return the phone accounts registered by a particular package.

Bug: 17510811
Change-Id: I8465ef4f13b62fe83f51835cfffe1656298041a8
2014-09-17 18:34:13 -07:00
Yorke Lee
58bacc513c Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
Bug: 17512380
Change-Id: Ie26bef643bdec97f64247b5f8099f2676ae6c63e
2014-09-16 20:44:09 -07:00
Yorke Lee
1c4eb10cc1 Merge "Add missing methods to Conference object" into lmp-dev 2014-09-17 03:29:12 +00:00
Nancy Chen
ebc69cd19e Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev 2014-09-17 03:23:04 +00:00
Andrew Lee
009348e837 Merge "Fix disconnect log printf in ConnectionService." into lmp-dev 2014-09-17 01:52:54 +00:00
Andrew Lee
2678639f9e Fix disconnect log printf in ConnectionService.
Bug: 17534940
Change-Id: I41499701d1f7a3ab0816624d27094c6c86fb5b01
2014-09-16 18:17:44 -07:00
mike dooley
f34519b4dd Fix a small printf format bug.
Bug: 17534940
Change-Id: Idc3c1105c72714f138b07012d0ad9e0bf0ba17f1
2014-09-16 18:14:14 -07:00
Andrew Lee
7f3d41fd12 Add new DisconnectCause class to telecomm.
+ Add a hidden "UNKNOWN" default type to ToneGenerator.
- Hide the Telephony DisconnectCause from the public API.
+ Add a Telecomm DisconnectCause. This is parcelable, and contains
information (code, user facing message, non-user facing reason,
and tone) to help describe the disconnect state and what behaviors
an application can implement for the user experience. This reduces
the causes for a disconnect to a more generic set.
+ Lots of work to pipe this through. DisconnectCause replaces the
code and message which were formerly passed around.

Bug: 17241433
Bug: 17329632
Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
2014-09-16 12:07:41 -07:00
Nancy Chen
210ef039fb Remove ability to enable/disable phoneaccounts (1/6)
Enabling/disabling of phone accounts was only used for SIP accounts and
is no longer necessary for the purpose it was put in.
- Remove all references to enabling/disabling phone accounts
+ Rename getEnabledPhoneAccounts -> getCallCapablePhoneAccounts

Bug: 17510811

Change-Id: Id805daae3cc698c75f5e747b6a6107ab0bd3afa0
2014-09-16 10:52:48 -07:00
Yorke Lee
a0d3ca9746 Add missing methods to Conference object
Add setAudioState, onPlayDtmf and onStopDtmf to the conference object.
This fixes DTMF tones for conference calls.

Bug: 17512380
Change-Id: Ice9403d3d750131f077a3ea129b7f67430c68348
2014-09-15 19:18:13 -07:00
Yorke Lee
f13a8b797d No longer require READ_PHONE_STATE permission for getCallState
Bug: 17510808
Change-Id: Id3bb5bf2fea9489bd613063aa946389e8ceb3104
2014-09-15 15:46:57 -07:00
Yorke Lee
2ae312e306 Pipe TelephonyManager.getCallState through TelecommManager
* Add TelecommManager.getCallState (hidden API)
* Make TelephonyManager.getCallState call through to
TelecommManager, to be consistent with
TelephonyManager.ACTION_PHONE_STATE_CHANGED broadcasts for
overall call state. Telephony continues to manage call states for
individual subscriptions.

Bug: 17378767
Change-Id: Ia5e8b21df801ed3af4f6e14c110a72c92f077f88
2014-09-14 09:54:23 -07:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
2014-09-12 22:16:17 -07:00
Santos Cordon
094d24c9af Merge "Disconnect all connections if telecomm unbinds to the service." into lmp-dev 2014-09-12 06:21:43 +00:00
Santos Cordon
29f2f2e56a Disconnect all connections if telecomm unbinds to the service.
Bug: 1748658
Change-Id: I7bd3d6f28b7fa25f2ee0b308b5dc16d70d67949f
2014-09-11 19:50:24 -07:00
Tyler Gunn
2df938e56b Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (1/3)" into lmp-dev 2014-09-12 01:27:37 +00:00