• Home
  • History
  • Annotate
  • only in /packages/services/Telecomm/
History log of /packages/services/Telecomm/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
cf51f62da26466176edd70b85bce0b4a839fb399 04-Jun-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4818837 from 013ab63799b48d00296a248546e3e0d3a92cb59e to pi-release

Change-Id: I62e3c85c7ee25a3076b981a2f1c91a21b640b76a
013ab63799b48d00296a248546e3e0d3a92cb59e 03-Jun-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I21f15622f6da38463c1c5da7e88c291ce5b725b8
es/values-da/strings.xml
es/values-hi/strings.xml
es/values-mr/strings.xml
es/values-sw/strings.xml
86c25822fd74739f0eef687ab0b112aa1a81e60e 03-Jun-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4818534 from 48dc5a3b1b6cb6789af545a2395b457ade3e49e3 to pi-release

Change-Id: I9edffaa5a0efd594ff87defd77c68233c6cb13dd
48dc5a3b1b6cb6789af545a2395b457ade3e49e3 01-Jun-2018 Hall Liu <hallliu@google.com> Merge "Send pipes to connection service when RTT changes" into pi-dev
e15f6284c52eaa2a69c89c284521cf181bdfcb44 31-May-2018 Hall Liu <hallliu@google.com> Send pipes to connection service when RTT changes

When the ConnectionService turns on the RTT property unexpectedly, call
startRtt to pass down the RTT pipes.

Bug: 80257914
Test: manual
Change-Id: I1882a867812eb83dd915ede6d8391231113dec08
rc/com/android/server/telecom/Call.java
9b157e052b1e89674258e692a6ab3cd087a22e02 31-May-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4813226 from 7dfa2ab2c8debe9454b8345b9a06c11a29aa447f to pi-release

Change-Id: I4e51f23b5b7aa9e3466f843f87cf03ae06a29300
7dfa2ab2c8debe9454b8345b9a06c11a29aa447f 30-May-2018 Tyler Gunn <tgunn@google.com> Fix issue with concurrent call disconnect code in Telecom.

The method holdActiveCallForNewCall is used to ensure that an active call
is either held or disconnected when there is a new incoming call.
There is a special case logic block which applies for Telephony calls
where there is an active call and a held call, and a new incoming call
comes in which the user answers. The special case is intended to
drop the held call so that the current active call can be held so that
the ringing call can be answered.

There was a flaw in that code which was causing the self-managed CS
CTS verifier test to fail. Essentially the special case logic block was
being invoked, and as a result when there was another active call which
could not be held from a different connection service, the call would be
held instead of disconnected.

Test: Ran CTS Verifier test and ensures it passes.
Test: Manually reproduce the telephony scenario which the special case
block is intended to handle.
Bug: 80407839

Change-Id: I348da7de84f83b1749af41d6985526bcefcc606a
rc/com/android/server/telecom/CallsManager.java
e5edc0e6bd59b0ef83a0e93d4340c0edd1f58d40 22-May-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4796401 from 61d00ccab3664b8b1eeec6ff59599bc587fc109e to pi-release

Change-Id: I75d4ab62c8e2fd26e0d7049df4fd6407b9768e20
61d00ccab3664b8b1eeec6ff59599bc587fc109e 21-May-2018 Hall Liu <hallliu@google.com> Merge "Switch to active BT route when changing focus" into pi-dev
70d9f410df9fc2f462bf4ffdb281aab0dd675d19 21-May-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4793706 from 0482751cb1792cf7a70df21023e3c68de700f5b7 to pi-release

Change-Id: I64ac0457b762a409ae9b2c394f9b6b8a9eddbd60
0482751cb1792cf7a70df21023e3c68de700f5b7 20-May-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iebb57450fd2716eb8899c83393224d8802309c00
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
03487b1cef2cd7285f9314b4504842615c381b46 20-May-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4793185 from 0a88abbb8082fceef20646c2fd9b0d5524bb2f3b to pi-release

Change-Id: Ia55361546bb36cd204bd5677ca20a938d215cd4d
740989589390582f097a0f8a4a44bdab9eb0d26c 19-May-2018 Hall Liu <hallliu@google.com> Switch to active BT route when changing focus

Send a BT_AUDIO_CONNECTED message right away if we try to connect to BT
audio and we find that it's already connected. This way we don't get
stuck in a quiescent state.

Change-Id: Idbfb4b77a243d300d47703643e22d5f1d8a2474c
Fixes: 79501344
Test: added a unit test.
rc/com/android/server/telecom/BluetoothHeadsetProxy.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
ests/src/com/android/server/telecom/tests/BluetoothRouteTransitionTests.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
0a88abbb8082fceef20646c2fd9b0d5524bb2f3b 18-May-2018 Hall Liu <hallliu@google.com> Merge "Remove volume logging" into pi-dev
8236964f884423258aeed51dfd81e24eadf7ca9a 18-May-2018 Hall Liu <hallliu@google.com> Remove volume logging

Remove volume logging from CARSM -- getStreamVolume is prone to long
waits, which screws up the inner workings of CARSM.

Change-Id: I43db6e39fbdc3bdce39926ae1ebfcba8b134798d
Fixes: 79563800
Test: manual
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
af6bcde342d2a862943979320c41ffea14df227b 15-May-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4781566 from f44285a11239129ee93dec1ef97d96aa70df1e0a to pi-release

Change-Id: I36ef7ce5659826f3636a8cc91eae9dbfe67f054c
f44285a11239129ee93dec1ef97d96aa70df1e0a 15-May-2018 Hall Liu <hallliu@google.com> Merge "Bring Telecom logic into agreement with Bluetooth" into pi-dev
0b6bb41820cd0093f96673618c71b50dbb3c04a9 13-May-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4778776 from 90d0828e960b44e0608b25ee641b21d01353265f to pi-release

Change-Id: Ifc51963f745193c126eea788d00205c363ce1b4c
90d0828e960b44e0608b25ee641b21d01353265f 12-May-2018 Hall Liu <hallliu@google.com> Merge "Add null check for call handle" into pi-dev
62630f727fa055e5d79c8194ed5db697104f116c 11-May-2018 Hall Liu <hallliu@google.com> Add null check for call handle

Call.getHandle() can return null for some self-managed connection
services. CallLogManager sometimes would throw a NPE that gets swallowed
by the binder.

Add null checks throughout Telecom for the call handle. Also add logging
in CSW to actually display exceptions that happen during binder
transactions.

Also replace some unholy tabs with rightous spaces in CSW.

Change-Id: I816f86441a969a410095bb12bae307323c517fed
Fixes: 78811915
Test: manual
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
3519edb0b2819005572a38ecfb5ae162e793cc80 10-May-2018 Tyler Gunn <tgunn@google.com> Merge "Fix regression in emergency dialing auto-disconnect code." into pi-dev
cc74215b6e52d550f36b929319129a5dabb4b616 10-May-2018 Hall Liu <hallliu@google.com> Bring Telecom logic into agreement with Bluetooth

Account for the BT active device being null sometimes (and not starting
calls on BT when so)
Follow the BT stack's changes on the BT active device

Fixes: 79231275
Test: unit, manual, BT team's regression suite

Change-Id: Ib6ced6baa9e0ca5fa17b854ae58f19e9d49a80fd
rc/com/android/server/telecom/BluetoothHeadsetProxy.java
rc/com/android/server/telecom/CallAudioRoutePeripheralAdapter.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
rc/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
ests/src/com/android/server/telecom/tests/BluetoothRouteTransitionTests.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteTransitionTests.java
130ad28664fe35b4283c238a6d91ef77604a0743 09-May-2018 Tyler Gunn <tgunn@google.com> Fix regression in emergency dialing auto-disconnect code.

Change to support the call focus management caused a regression in the
disconnect logic when placing an outgoing call. Some carriers do not
support holding of calls so the new logic would always disconnect a single
active call.

Reverting to the previous logic which relies on other means to tell if
we have reached the max number of held calls. In the case of a carrier
which doesn't support call holding, we'll still place the emergency call
while leaving the previous active call alone.

Test: Ensure that single active call is not disconnected when dialing
emergency call.
Test: Ensure that where an active and held call is present, the active
call is disconnected to make room for emergency call.
Fixes: 79381233

Change-Id: I248804fe7a8402fe4a6a9263ea1224a04073e03f
rc/com/android/server/telecom/CallsManager.java
949685b6eadf7a325d5d30b26668f9daa6a7a025 08-May-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4767765 from 6b772309850722b0010f9280ac59ffbc14b75e9a to pi-release

Change-Id: I191d8cece03a1ce5146a259364d87f6f7dadf65e
6b772309850722b0010f9280ac59ffbc14b75e9a 08-May-2018 Tyler Gunn <tgunn@google.com> Merge "Ensure phone state broadcast does not include 3p app addresses." into pi-dev
7233fedade70b4017c487495a35b761ab21542dd 08-May-2018 Tyler Gunn <tgunn@google.com> Merge "Change permission checks for endCall method." into pi-dev
054e6667916743f3949cd86dee55ffdfec6b35d3 07-May-2018 Tyler Gunn <tgunn@google.com> Ensure phone state broadcast does not include 3p app addresses.

Do not include the address reported by an app implementing the self-mgd
ConnectionService API. Aothough we want to report the fact we're in
a call using the phone state broadcast, it is not desirable to include
the call identifier information reported by a third party app. The phone
number is included in the phone state broadcast to help wearable
companion apps and call blocking apps, for example, operate. Since none
of these apps can operate on self-managed calls it makes no sense to
expose the number to these apps.

Test: Manual test using test app.
Bug: 79343159
Change-Id: I29eca34bba5e1ec636fdc245bb1221b2f63bbcb1
rc/com/android/server/telecom/PhoneStateBroadcaster.java
3fe1ff81866d59b6ced22bb600775a281886519b 07-May-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4765531 from 592daffc25a9d29d137ba1c529513de53e505541 to pi-release

Change-Id: I5d57c9dc7b2048729c51bcc213b1c54918d7f0d2
e27a5312eee9e11b1c4d51659097aa8e4f0e9dd8 02-May-2018 Tyler Gunn <tgunn@google.com> Change permission checks for endCall method.

Allow EITHER MODIFY_PHONE_STATE or ANSWER_PHONE_CALLS permission to use
this API.

Test: Manual test via test app.
Test: Added CTS tests.
Bug: 78290258
Change-Id: Ia5beade115387d0c07550a84aca3f210442e3516
rc/com/android/server/telecom/TelecomServiceImpl.java
592daffc25a9d29d137ba1c529513de53e505541 04-May-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I186e0963673b87ca9809a4be4baedc5c0d550ab9
es/values-da/strings.xml
es/values-mr/strings.xml
es/values-zu/strings.xml
d8ea383d083a5edb1b9240a323f683f74728588e 03-May-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4759746 from 4e6a483537d2f2f64e50a8d6fa4c67c46efc9076 to pi-release

Change-Id: I84f194a5b8aab3964b7a5cc68bdc5b641b1cb8d2
4e6a483537d2f2f64e50a8d6fa4c67c46efc9076 03-May-2018 Hall Liu <hallliu@google.com> Merge "Create new list of BT devices when querying" into pi-dev
e79cec08ef7058ea697debc42c72a4f8bc124104 02-May-2018 Hall Liu <hallliu@google.com> Create new list of BT devices when querying

Don't store a view of the available BT devices in CARSM's version of
CallAudioState. Create a new list instead.

Change-Id: Ib66706ca1844fdb2b7d6ba1a7713840d598722f3
Fixes: 79154559
Test: manual
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
7258a6b3dad8c2718dbbf13ff5ae95b461dc6842 02-May-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4756844 from 7cc0bb4431931e2cdb7af395a4751e4aa389cf5e to pi-release

Change-Id: I679cf6bf047f47a5514b9d73327c78fb968037d3
7cc0bb4431931e2cdb7af395a4751e4aa389cf5e 02-May-2018 Hall Liu <hallliu@google.com> Merge "Integrate the BT multi-hfp apis with Telecom" into pi-dev
67eb3b08235d34f0f6411f1021808c97042ecbbc 28-Apr-2018 Hall Liu <hallliu@google.com> Integrate the BT multi-hfp apis with Telecom

Add a call to setActiveDevice when setting a bluetooth device

Test: unit, testapps
Change-Id: Ibd7c7f976c2caf834228745f8bedf24767d500b8
Fixes: 78653642
rc/com/android/server/telecom/BluetoothHeadsetProxy.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
estapps/AndroidManifest.xml
estapps/res/layout/incall_screen.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/TestInCallServiceImpl.java
estapps/src/com/android/server/telecom/testapps/TestInCallUI.java
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
ests/src/com/android/server/telecom/tests/BluetoothRouteTransitionTests.java
736bd94846510a40bb8a0793de9d181e7597704c 29-Apr-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4751833 from 195e669f8054b004d8f6d9da27e1db2925ee8cb5 to pi-release

Change-Id: Icddd086353a25d5766026f3114d0a0334e3953cd
195e669f8054b004d8f6d9da27e1db2925ee8cb5 28-Apr-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I232cd42f4cc782dde561d701dea1cf4b7c39e1d4
es/values-ar/strings.xml
es/values-as/strings.xml
es/values-bn/strings.xml
es/values-km/strings.xml
es/values-or/strings.xml
c2626d685cb1f7a40062701d5c786fbd63b5f5c9 27-Apr-2018 Hall Liu <hallliu@google.com> Create RTT pipes for incoming RTT calls

Create the pipes even if the PhoneAccount doesn't have the capability --
modem will request the pipes without the RTT flag being on for certain
carriers.

Bug: 76030205
Test: manual -- RTT call to device that has RTT turned off.
Change-Id: I7892fed77c10eedabe688740576b3b835b77ee9c
rc/com/android/server/telecom/CallsManager.java
d890720f7bb10e0c00d51cd7e733c4fe5c1171c7 25-Apr-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4742838 from 9af1a325f6bd611231748788819d408af0f0d55b to pi-release

Change-Id: I6edac69e52fe408f20ceaf6ae48c758d835f3f49
9af1a325f6bd611231748788819d408af0f0d55b 23-Apr-2018 arangelov <arangelov@google.com> Pass the actual EnforcedAdmin in the sendShowAdminSupportDetailsIntent
call.

Test: Manual
Bug: 78447967
Bug: 71346595
Change-Id: Iec5b6b3d0582b6e7b190b22b7be5a52038b7c9f9
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
c4eae17084903aec8342437c429a5cb56fc37da6 18-Apr-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4728508 from 751673a674379f856aa4311d0d8fc3cab31d038c to pi-release

Change-Id: Ia7399a7ca8c3e659457bdc8a60a4be05a7222078
751673a674379f856aa4311d0d8fc3cab31d038c 17-Apr-2018 Pankaj Kanwar <pkanwar@google.com> Merge "Ensure Telecom ServiceBinder class unlinks death recipient." into pi-dev
09cf0fc991d90339321a14d2527b0588a2ec2277 17-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Don't log call as RTT if property was never set" into pi-dev
110dd5d37e3bbdc6397bb19b83cf16877cd059a5 17-Apr-2018 Tyler Gunn <tgunn@google.com> Ensure Telecom ServiceBinder class unlinks death recipient.

Telecom uses a death recipient to track binder failures. Turns out it
did not actually unlink the death recipient. Ooops.

Added code so that it unlinks in unbind() and also within the death
recipient itself (after death).

Test: Manual; ensure no longer getting system unlink warnings.
Bug: 78141360
Change-Id: If75b29ed3610af068dd2a8c23db4886a03f809a9
rc/com/android/server/telecom/ServiceBinder.java
8b39f2898557c762c5112bc9741e508f1e3e5b65 15-Apr-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4722539 from aab13d86d5fe3d32983c62068a09d0f54c3b82bf to pi-release

Change-Id: I97c5b397a809d08058e224ea89d706d4f8c6aa9b
aab13d86d5fe3d32983c62068a09d0f54c3b82bf 13-Apr-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iffe4bcbbbe4cf2812a63ee454f1c16ae628aba52
es/values-my/strings.xml
0270631d403c9c45a40d2b1d5e069d6af7e41a24 12-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add Telecom events for local ringback." into pi-dev
1e0aaa910a7b5bc1027636deaa3ff44962c50a31 10-Apr-2018 Tyler Gunn <tgunn@google.com> Add Telecom events for local ringback.

Adding telecom events for start/stop of local ringback.

Test: Manual
Fixes: 77853172
Merged-In: I68434ff58b32f12e4daa70687190b53f995a11ae
Change-Id: I68434ff58b32f12e4daa70687190b53f995a11ae
(cherry picked from commit 361b2f1f3457bacf50ceaf20b2aec1756b98d5ab)
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/RingbackPlayer.java
b2ffa6b3554a7ac63a1628f8e123ab560366a90b 12-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Ensure calls are audible upon starting" into pi-dev
2afa0353806def012579cb95146d11ad94ae9d21 12-Apr-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4716599 from 18c944952f67e2d21c3554e4074371754c3ee32b to pi-release

Change-Id: I39d5b4680828d7c2077d147a1560e953982e544a
f82325970bd20f71679796a685f8d63828b450e0 11-Apr-2018 Hall Liu <hallliu@google.com> Ensure calls are audible upon starting

Check volume on STREAM_VOICE_CALL. If zero, set it to the default before
proceeding with either an incoming or outgoing call.

Change-Id: I210d95f59fe73586dd4d3202cca3b3eb3e500d0c
Fixes: 73956232
Test: manual
rc/com/android/server/telecom/CallsManager.java
e31c886c3f8c6d2bede3cb6e1ef145083e5ff77d 10-Apr-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4710485 from b0398e4ae38ce4d532e6b815fcd0a7e8755f7d8b to pi-release

Change-Id: I63565c448491a14628e3d794b6e1b13fb3ec0621
18c944952f67e2d21c3554e4074371754c3ee32b 10-Apr-2018 Hall Liu <hallliu@google.com> Allow incoming calls while in secondary user

For consistency with behavior on the lockscreen, allow incoming calls
even if DISALLOW_OUTGOING_CALLS is set on the secondary user.

Change-Id: Ia3977604b270e43db359aa050e41682dba302592
Fixes: 77808826
Test: manual
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
b0398e4ae38ce4d532e6b815fcd0a7e8755f7d8b 09-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Exempt tests from hidden API checks." into pi-dev
c0082c6578e9df3118f4634ee91427c0b84179a1 08-Apr-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4706961 from 52701ad2c5d72111af8869f13a4d32572b09d9ad to pi-release

Change-Id: Ib5002ce709d5e4ecb3f0d6058a754777da2579e2
52701ad2c5d72111af8869f13a4d32572b09d9ad 07-Apr-2018 Hall Liu <hallliu@google.com> Merge "Check user restrictions during incoming calls." into pi-dev
2d73854b6487080619436a8d9aa0891161b5f799 07-Apr-2018 Hall Liu <hallliu@google.com> Don't log call as RTT if property was never set

Use the connection property to set mWasEverRtt instead of the streams,
since streams may be created preemptively without the call actually
being an RTT call.

Change-Id: I5a762e70d7b602620be77d6e425d313dd9ac8922
Fixes: 77657603
Test: manual
rc/com/android/server/telecom/Call.java
4b8830b4c18337232d2bd0709a6cf3eee6dc5032 06-Apr-2018 Hall Liu <hallliu@google.com> Check user restrictions during incoming calls.

Check that DISALLOW_SMS isn't set for a user before activating the
respond-with-sms functionality
Check that DISALLOW_OUTGOING_CALLS isn't set for a user before adding an
incoming call. If it is, silently reject and log the call for the main
user. (Yes, the name is misleading, but the settings UI implies that
it's supposed to be all calls).

Bug: 73804266
Test: manual
Change-Id: Idf32a3fcbe9f8a34fe314bc39d19930e5015acb8
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
def4ab55d42c546ae6cdc46e30f85fc5108a1155 06-Apr-2018 Selim Cinek <cinek@google.com> Merge "Migrated to new Person API" into pi-dev
c3d76c905c91a6fec792270bca32789170544194 06-Apr-2018 Pankaj Kanwar <pkanwar@google.com> Merge "Ensure self-managed CS can use any URI scheme." into pi-dev
6118a92b53e411bf9689f379d0f2f7c4734d2d2d 06-Apr-2018 Nicolas Geoffray <ngeoffray@google.com> Exempt tests from hidden API checks.

Bug: 64382372
Bug: 74963051

Test: m
Change-Id: I290e4ad8358c36ab3f7418bd55231c8d22c7ce46
ests/AndroidTest.xml
b59795b29a3ddd818b9793ec73616065271acd5a 24-Mar-2018 Selim Cinek <cinek@google.com> Migrated to new Person API

Test: Post notification
Bug: 75980526
Change-Id: I1f113eb5534ff8f2e047641774469d1c77035d31
rc/com/android/server/telecom/Ringer.java
8667f720e680c06fa9194b0e28ef3de72187a51a 05-Apr-2018 Hall Liu <hallliu@google.com> Merge "Move RTT system setting to Settings.Secure" into pi-dev
708a7ba677171a10570009388b2ff1510dfb8719 04-Apr-2018 Tyler Gunn <tgunn@google.com> Ensure self-managed CS can use any URI scheme.

There was previously an assumption that only SIP or TEL calls could
be placed. Removed this dependency for self-managed CS and added
TODOs so we know to clean up this assumption in the future.

Also added small fix to unit tests for existing breakage.

Test: Added CTS test coverage, ran unit tests, manual test.
Bug: 77581565
Change-Id: I812260bd1aab560503e833ad60f8daaf80d5dd90
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallList.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
55aa5d464b5874102b3840940c425422f0788bf9 05-Apr-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4701683 from ad9ed0173e97be9e6a040e1748e6cc8bb1f65e80 to pi-release

Change-Id: I234050aac306b980add7bee60711351ba323763a
ad9ed0173e97be9e6a040e1748e6cc8bb1f65e80 05-Apr-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I2b470aa6e31a708d56d71ec59fc50a607af9fec3
es/values-pt/strings.xml
4eba63bb047f49bf9682751acbb717d99fed2385 03-Apr-2018 Hall Liu <hallliu@google.com> Move RTT system setting to Settings.Secure

Bug: 76449217
Test: manual
Change-Id: I8e7c21b82a5e64cf8e6a1202a4ba9fa09a5b0aa0
rc/com/android/server/telecom/CallsManager.java
99a977623eae91cd51a9bc45ed080b203259fc0c 01-Apr-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4693621 from 341d6a1589ca666f81cef4af1a6ebe3e02619c0b to pi-release

Change-Id: I3fa30da7a367c3677b9acd4a753a5cff068d2787
341d6a1589ca666f81cef4af1a6ebe3e02619c0b 31-Mar-2018 Alan Viverette <alanv@google.com> Merge "Migrate to AAPT2" into pi-dev
fe7911322322d33b1dca27331d1b33ba43ce8f89 30-Mar-2018 Tyler Gunn <tgunn@google.com> Modify call cleanup when emergency call dialed.

Modifying the emergency dial code to drop only self-managed calls when
an emergency call is placed. The previous code would drop anything from
a phone account other than the one being dialed. At the point this code
ran, however, there was no phone account selected and no binding, so the
disconnect code was not working.

Realistically we only need to drop self-managed calls.

Bug: 76442553
Test: Manually reproduced issue to observe double disconnect signal.
Change-Id: Ia92dcd95cbcce27381fb22606a668ee3e8b9426b
rc/com/android/server/telecom/CallsManager.java
77ff680018a1d75963c697f835827a2966bd42c1 29-Mar-2018 Tyler Gunn <tgunn@google.com> Correct FocusManager issue which prevented swapping calls.

Where a conference call is active and a standalone call is dialed, the
focus manager would not allow swapping between the two calls.
The underlying issue was that the focus manager would try to focus on one
of the child calls of the conference.
Updated the focus manger interface to add an "isFocusable" method which
is used to indicate that external calls and child calls can't be focused.
Added unit test to verify this scenario.

Test: Manually tested conference scenario, added unit test to capture case.
Bug: 74375021

Merged-In: I48cb2b7918117d63996953e5497749d56e27f801
Change-Id: I48cb2b7918117d63996953e5497749d56e27f801
(cherry picked from commit eaff7c48a3ea4bbd35a7679c47823e38fb5f52a8)
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFocusManagerTest.java
26f8daa61ef2590ad120792234cae062e4208611 23-Mar-2018 Alan Viverette <alanv@google.com> Migrate to AAPT2

Bug: 73128633
Test: m TelecomUnitTests
Change-Id: I21d87f83e0d8846bf3dff471df58fd4ce2d432a8
ests/Android.mk
807cf85ea7eafe9146e5be90932c21eb249f59fd 29-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4686875 from 2e2fb4e81a2de95cc6187b902ac6c00f90e2140e to pi-release

Change-Id: I5e7db69a52634deb713d216c84c646ffc7396f40
2e2fb4e81a2de95cc6187b902ac6c00f90e2140e 29-Mar-2018 Tyler Gunn <tgunn@google.com> Merge "Send CALL intent directly to Telecom CallIntentProcessor." into pi-dev
e67ee23f676d265594abe90607d2059c1d9aeb51 29-Mar-2018 Pengquan Meng <mpq@google.com> Merge "Fixed selfManaged call issue" into pi-dev
b652dad4c19fd1f80b0244a0a42d642a4b99d21a 27-Mar-2018 Tyler Gunn <tgunn@google.com> Send CALL intent directly to Telecom CallIntentProcessor.

TelecomManager#placeCall results in a CALL intent being sent from Telecom
to itself. If there are delays in the system broadcast queue, the CALL
intent could be held up in the queue causing delays in the outgoing call
flow.

Changing the code so we instead just send the intent directly to the
call intent processor.

Test: Manually reproduced broadcast queue spamming issue and verified that
placeCall API does not block in this case any more.
Bug: 76005593
Merged-In: I4d1292d6fab2a2b7025e3bb9dd2592c7a18a5019
Change-Id: I4d1292d6fab2a2b7025e3bb9dd2592c7a18a5019
(cherry picked from commit 7878497846b9c5f66d3ffbcf45825bff356ef029)
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/components/UserCallActivity.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/CreateConnectionProcessorTest.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
2fc55272a52f53d80e4b475247baad5290d15621 20-Mar-2018 Pengquan Meng <mpq@google.com> Fixed selfManaged call issue

The self-managed call will set active directly. If there is an active
call, we should hold or disconnect it based on the holdability.

Test: runtest -x CallsManagerTest.java
Bug: 76016794
Merged-In: I053a50997facd108053380eac115464c7fa7e011
Change-Id: I053a50997facd108053380eac115464c7fa7e011
(cherry picked from commit 8229bc968c48ad87cb251f9c198495fd79a47807)
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
395c85fbfde6d4a54938278ce62647ca5ec0cb3e 28-Mar-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I2871626d077e0965d36319f33a8701f91e7418a5
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-hr/strings.xml
es/values-is/strings.xml
es/values-lt/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
de3d4b0d3008caf552450513ffeee0b517f42849 28-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4683893 from 1f3efbd7efd8d72bafdf5f64bcea2358bbbebdce to pi-release

Change-Id: I1d2676186c9e462db2199e102e223040ab4bedc9
1f3efbd7efd8d72bafdf5f64bcea2358bbbebdce 24-Mar-2018 Jack He <siyuanh@google.com> Add arguments when sending RINGER_MODE_CHANGE message

* Otherwise, CallAudioModeStateMachine.onPreHandleMessage() will
complain

Bug: 72647074
Test: make, receive incoming call in vibration mode
Change-Id: I9f7d82082440102edafde9d288ea0fc01ea01a4e
rc/com/android/server/telecom/CallAudioManager.java
456c7ba57a51fe3a8364178fe968679eee9b75e6 27-Mar-2018 Tyler Gunn <tgunn@google.com> Merge "Update self-managed CS logging and telecom test app." into pi-dev
155c1a993fb45bc0fa7d8cf7fee5313f05c7ea72 27-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4680594 from e8809de08a72465554f07d67f370c0b7eb32e499 to pi-release

Change-Id: I09cfffdc0482d66c671c16430614fdd35591989e
e8809de08a72465554f07d67f370c0b7eb32e499 27-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Force mute off and speaker on during emergency RTT" into pi-dev
f4f0539e31ca3f00d5e82c9462ecf20e2b966087 26-Mar-2018 Tyler Gunn <tgunn@google.com> Update self-managed CS logging and telecom test app.

Updating telecom test app to support:
- Focus gained and lost.
- Holdable calls.

These updates help test the new SMCS apis and call swapping functionality.

Updated telecom logging to make it more clear why things are happening:
- Add overloads of hold/unhold methods that allow specifying a reason for
the operation. This lets us make the telecom dumpsys more clear by
indicating why something was held/unheld.
- Add disconnect overload which allows specifying reason for disconnect.

Bug: 75303815
Test: Manual
Merged-In: Iedee253e592c765be84bda18e1964e551607941f
Change-Id: Iedee253e592c765be84bda18e1964e551607941f
(cherry picked from commit 6d308d7a97dda479c1b02ca395bf4b9ff3783167)
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
rc/com/android/server/telecom/ServiceBinder.java
estapps/res/layout/self_managed_call_list_item.xml
estapps/res/layout/self_managed_sample_main.xml
estapps/src/com/android/server/telecom/testapps/SelfManagedCallList.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallListAdapter.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallingActivity.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnection.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnectionService.java
9ea3d395097c0f4fffc94ac11c5b740d62c1e475 25-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4677756 from d0c6caba1e909fc4a05ddc0c04cdd82936805e7e to pi-release

Change-Id: I926788b3606fc81b0cd2f3ac39290772a05a17c7
d0c6caba1e909fc4a05ddc0c04cdd82936805e7e 14-Feb-2018 Jack He <siyuanh@google.com> Bluetooth: Enable in-band ringing in vibration mode (4/4)

* Add RINGER_MODE_CHANGE message in CallAudioModeStateMachine to re-try
startRinging() in RingingFocus state
* When HFP is connected, CallAudioRouteStateMachine will notify
CallAudioModeStateMachine about new established SCO connection.
CallAudioModeStateMachine will try to start playing ringtone at such
event in case ringtone volume condition changes
* Added and adjusted unit tests in CallAudioRouteStateMachineTest,
CallAudioModeStateMachineTest and CallAudioRouteTransitionTests

Bug: 72647074
Test: Call phone in vibration mode and hear ringtone on HFP enabled
headset, verify that ringtone is only played through headset.
Then disconnect headset and call again to verify that ringtone
does not play through phone speaker in vibration mode.
Telecom unit tests: lite_test_telecom

Change-Id: Ie00059213292005c3e3af0c771c148ec0dc22498
(cherry picked from commit fff818b3cd1f8ba91a5037bcb91b5478a5663a25)
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioModeStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteTransitionTests.java
e574daa18022e7e700b3294c0ad564f6163d982e 23-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix regression for answering a ringing call when there are 2 calls already." into pi-dev
c100da8c3913abb18cacc2a0e8c826a7a6519a29 22-Mar-2018 Tyler Gunn <tgunn@google.com> Merge "Update handover failed constant name." into pi-dev
51edfcf62b771765d3c716b082e8e39f77245f1b 22-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev
8c4e621a98b04cd390b9e194516922f9935549b0 19-Mar-2018 Tyler Gunn <tgunn@google.com> Update handover failed constant name.

Update the name of the emergency call handover failure cause.

Bug: 74831393
Test: Manual
Merged-In: Iac9c4562ac20b793fcea4fd38783e446892bef4d
Change-Id: Iac9c4562ac20b793fcea4fd38783e446892bef4d
(cherry picked from commit 46719f1afe482114790e19179925b65ada86f386)
rc/com/android/server/telecom/CallsManager.java
85530d4245a8ed37cb8b5cecc53db37fdf3c63a8 21-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4667902 from 684e9336090cc17f97ecc25894e8c670b1dd09ec to pi-release

Change-Id: Ie8e0f3ff02823a5aef869f2867532edceb6cf155
684e9336090cc17f97ecc25894e8c670b1dd09ec 20-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Take advantage of new audio-coupled haptic patterns." into pi-dev
aa6c164a887350f9b46f7e23c44f33499a9398dd 20-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4665332 from 4203e2a7067355a1f000b3faa8bad8e8e75a52ba to pi-release

Change-Id: I93aaad09a2faf43374d40eb6c19505f58d736651
0152ad2b45d1e47be5dfd0ae79ace30c066e4022 19-Mar-2018 jdesprez <jdesprez@google.com> Update AndroidTest.xml to be APCT suite ready

Test: atest TelecomUnitTests
Bug: 74440293
Change-Id: I9952c9054cc6bea0f60def5d065e0a5e7b05eeee
ests/AndroidTest.xml
4203e2a7067355a1f000b3faa8bad8e8e75a52ba 19-Mar-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I0fdeb329df1934dc540a9c98a9541a94e028bb63
es/values-am/strings.xml
es/values-az/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bs/strings.xml
es/values-ca/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rCA/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-en-rXC/strings.xml
es/values-et/strings.xml
es/values-hu/strings.xml
es/values-iw/strings.xml
es/values-kk/strings.xml
es/values-lv/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
c9a6bda515eeb3d47b37faae25dce91f50845763 18-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4662252 from be47509178a41745e6eef892fb39bacf2dd50170 to pi-release

Change-Id: Iac7542cbdf7460adeef91bfcf4dafb146411a917
60f230e42318914a30efddbdd61030ef6b258dbf 16-Mar-2018 Tyler Gunn <tgunn@google.com> Fix regression for answering a ringing call when there are 2 calls already.

In the case where there is already a held and active call and a new
incoming call is being answered, previous logic was to disconnect the
held call and then hold the previous foreground call before answering
the incoming call.

This CL fixes a regression in that functionality.

Test: Manual
Bug: 74939079
Change-Id: I150fa51cd0e67d5e39e9cf09268c50ba66d570c2
rc/com/android/server/telecom/CallsManager.java
ccd793f236ef46daf5631d3bc7c2eeca03af6e60 16-Mar-2018 Hall Liu <hallliu@google.com> Force mute off and speaker on during emergency RTT

In an emergency RTT call, force the speakerphone on at all times. Do not
allow the user to change the audio route to anything other than speaker.

In addition, when any emergency call is in progress, do not allow the
microphone to be muted. If another app attempts to mute the microphone,
immediately unmute it.

Change-Id: I4c6bb7196ddf75161975fb173f8a486dab3f4e6b
Fixes: 74436944
Test: manual
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
be47509178a41745e6eef892fb39bacf2dd50170 16-Mar-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I653a7ab9b4d4a87b514f628ce89f48da43878d4b
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-bn/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-eu/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-gu/strings.xml
es/values-hi/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-mk/strings.xml
es/values-ml/strings.xml
es/values-mn/strings.xml
es/values-mr/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-ne/strings.xml
es/values-pa/strings.xml
es/values-ro/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta/strings.xml
es/values-te/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
4cc7b3199899992da065d5920a0181ff956f20d2 15-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4656203 from b851b049c1281b7308c0547d71339067b6c1b2c9 to pi-release

Change-Id: Iec6ac98e8af5531ccb897187b4d6825a4bbdcdd2
b851b049c1281b7308c0547d71339067b6c1b2c9 14-Mar-2018 Hall Liu <hallliu@google.com> Merge "Properly set VOIP audio mode for incoming calls" into pi-dev
6499ae14f59082966d58fb8bd6322e1342e3fe9f 14-Mar-2018 Tyler Gunn <tgunn@google.com> Fix issue where work profiles cause missed calls to not show after boot.

When a user with a work profile reboots their device, Telecom tracks the
user which is pending reload of the missed call notification and defers
the process until boot complete.

This is problematic as there is only one user tracked, and during boot
the work profile user ends up overwriting the primary user.

To fix this, now tracking a list of users to load after boot complete so
that the work profile and primary work profile both reload the missed
call notification, not just the work profile user.

Test: Manually reproduced bug and verified Missed Call notification now
shows up.
Fixes: 73164872
Merged-In: I0cb35881992fcd6c23f9efe76cf365fef1f5acdd
Change-Id: I0cb35881992fcd6c23f9efe76cf365fef1f5acdd
(cherry picked from commit 0208a04eeeb91986acb5ee9153e5f2c97fdd62ab)
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
f28118c66e4ce9f09605ae3290820a3e367c1aac 14-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4653471 from 36b119a07a05b7b2e4448c6217e84a253755cb34 to pi-release

Change-Id: I5ff39eb350ddff1c59a93922a0cd22eb0c3111be
e67e3182255879535adc7f44b742a36d260d2bcf 13-Mar-2018 Hall Liu <hallliu@google.com> Properly set VOIP audio mode for incoming calls

Read the isVoipAudioMode bit on the parcelable connection that the
ConnectionService sends over upon connection creation, and use that to
set the voip audio mode bit on the Call properly.

Bug: 68753302
Test: manual
Change-Id: I0b666c65acded69011038c2e7fe7348cbbd398e6
rc/com/android/server/telecom/Call.java
36b119a07a05b7b2e4448c6217e84a253755cb34 13-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Mark self-managed calls as "read" when logged." into pi-dev
dc5a730e1da18b4c18db22192cd7d673cc07cb8d 13-Mar-2018 Tyler Gunn <tgunn@google.com> Mark self-managed calls as "read" when logged.

When self-maanged calls are logged to the call log, ensure that the is_read
flag is set to 1. This is important for missed calls. Missed calls which
are unread trigger a missed-call notification. Realistically we expect
the app to handle the missed called notification on its own, so marking
them as read makes sense.

Also updated the example self managed calling test app to support missed
calls. Yay.

Test: Added unit tests for this scenario, used manual test harness.
Fixes: 67637603
Merged-In: I0ad0917faed0e9c9902e33489f8715a73b350050
Change-Id: I0ad0917faed0e9c9902e33489f8715a73b350050
(cherry picked from commit 137df1f31a3d1e8b1ab35db9e6bd15ab48f10a8f)
rc/com/android/server/telecom/CallLogManager.java
estapps/res/layout/self_managed_call_list_item.xml
estapps/src/com/android/server/telecom/testapps/SelfManagedCallListAdapter.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnection.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnectionService.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
2625025ef3afd71f5efcf632fe360ae7cd281449 13-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4651078 from ef0d00ba0566e8db02d1689daeeaa2f32c865d88 to pi-release

Change-Id: Ibbb06791df0af1fd652921f65275c25e4577711d
db81e6ac613c959bd2edf275144e177b4a0f8718 13-Mar-2018 Hall Liu <hallliu@google.com> Initialize the RTT pipes if incoming calls request

Initialize the RTT pipes if either the UI setting is on or if the
incoming call requests RTT. Depending on carrier requirements there's a
chance that RTT could be turned on later if either is true.

Change-Id: Iaf98c6e1ae43167a40b70dc47a15f1c742ba2b7f
Fixes: 74563205
Test: manual
rc/com/android/server/telecom/CallsManager.java
ef0d00ba0566e8db02d1689daeeaa2f32c865d88 12-Mar-2018 Tyler Gunn <tgunn@google.com> Merge "Support enhanced call blocking function" into pi-dev
2cd83413d62b72984369af467d0791af5f470532 11-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4647811 from fbe3f59de13abfd9bb77170b27dbccafe89a37da to pi-release

Change-Id: Ia3c7f4c9feb97ee1af09adde468595bac0b334c3
fbe3f59de13abfd9bb77170b27dbccafe89a37da 10-Mar-2018 Hall Liu <hallliu@google.com> Merge "Follow system mic mute state in Telecom" into pi-dev
aee51f2b60f30ee4985644d2212890703996e5a5 09-Mar-2018 Tyler Gunn <tgunn@google.com> Support enhanced call blocking function

- Add settings about whether to accept or block an incoming call
from unidentified numbers by configuring the setting for each reason
(unregistered/private/pay phone/unknown).
- Show a notification when making an emergency call.

Bug: 28189985
Test: Manual
Merged-In: I134a60675c512d12fd6c235c9cf95e506fcc7b85
Change-Id: I134a60675c512d12fd6c235c9cf95e506fcc7b85
(cherry picked from commit c18a43205906c956bc4347a6fee657920c24fb81)
ndroidManifest.xml
roguard.flags
es/values/strings.xml
es/values/styles.xml
es/xml/activity_blocked_numbers.xml
es/xml/blocking_suppressed_butterbar.xml
es/xml/enhanced_call_blocking_settings.xml
es/xml/layout_customized_listview.xml
es/xml/layout_divider.xml
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/callfiltering/AsyncBlockCheckFilter.java
rc/com/android/server/telecom/callfiltering/BlockCheckerAdapter.java
rc/com/android/server/telecom/components/NonScrollListView.java
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
rc/com/android/server/telecom/settings/BlockedNumbersUtil.java
rc/com/android/server/telecom/settings/CallBlockDisabledActivity.java
rc/com/android/server/telecom/settings/EnhancedCallBlockingFragment.java
rc/com/android/server/telecom/ui/NotificationChannelManager.java
ests/src/com/android/server/telecom/tests/AsyncBlockCheckFilterTest.java
ad19cfbc8aba22914aaff339d61cd3b36b38e0e8 09-Mar-2018 Hall Liu <hallliu@google.com> Follow system mic mute state in Telecom

Listen to the new microphone mute state changed broadcast so that the
incall screen can display the mute state if it's changed by another app.

Bug: 64847052
Test: manual
Change-Id: Icec5631e24aff751efe865af2eb9b8c940bae882
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
5983dc1408a41b433c345c35b9a786072bca14e6 09-Mar-2018 Tyler Gunn <tgunn@google.com> Fix potential NPE when querying remote connection services.

It is possible that one of the remote connection services has unbound
during the query process. Ensure that if this happens we do not attempt
to access its now-null service interface.

Test: Manual
Fixes: 74196849
Merged-In: I5b41395eb1e49e8addfa0bb41d13b97862988e1d
Change-Id: I5b41395eb1e49e8addfa0bb41d13b97862988e1d
(cherry picked from commit 2f89c32f62987d4c2e962ec68147c8448ceb354c)
rc/com/android/server/telecom/ConnectionServiceWrapper.java
691674137cab99a1c4b03f17df0bf44296f8a2bd 08-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge changes Ied3b3b3e,I835f3ef9 into pi-dev

* changes:
Telecomm: Fix PhoneAccountRegistrarTest
Telecomm: Fix ConnectionServiceRepository
76888bbc46dc4c86982ac8e50bbc9904facdbb1e 08-Mar-2018 Michael Wright <michaelwr@google.com> Take advantage of new audio-coupled haptic patterns.

The new vibrator HAL has a few, device-specific haptic effects that are
tied to a particular piece of audio. The intention is to create custom
physical vibrations that are in sync with a given ringtone, producing a
significantly nicer overall experience.

Making the AsyncRingtonePlayer's Handler truly async reduces the
latency between audio and vibration by 50% to ~5ms based on a few
sample systraces.

Bug: 64185677
Test: atest RingerTest
Change-Id: I0152aa5c8bd5a50563672646dbfa6cc81246a083
rc/com/android/server/telecom/AsyncRingtonePlayer.java
rc/com/android/server/telecom/Ringer.java
ests/src/com/android/server/telecom/tests/RingerTest.java
97f30dcff55194b17bfafaaa376b73346d3258c2 07-Mar-2018 Tyler Gunn <tgunn@google.com> Update Telecom usage of renamed API constants.

Also, ensuring the handover success/failure callbacks are called (found
this while cleaning up API constants).

Test: Make Manual
Fixes: 73751004
Fixes: 73750515
Fixes: 73750817
Fixes: 74250501
Merged-In: I8f4af2d465b3acd1aaad61ce8514689237f4e9d5
Change-Id: I8f4af2d465b3acd1aaad61ce8514689237f4e9d5
(cherry picked from commit 315d312fbca9fdfedddd8837dee334bf434a1e27)
rc/com/android/server/telecom/CallsManager.java
2924102ac025907dec2f03c5f5d759135738c838 08-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4641295 from fb67b77c260dae1ac677a8cb656565caeb82c998 to pi-release

Change-Id: I4c32b5c6256f3aaa0e87f812754de31bcd399d63
fb67b77c260dae1ac677a8cb656565caeb82c998 08-Mar-2018 Tyler Gunn <tgunn@google.com> Merge "Add overlay to control vibration pattern used by device." into pi-dev
0e944f83f9a3f5551f73a05ff91d8d87e59c44f3 02-Mar-2018 Andreas Gampe <agampe@google.com> Telecomm: Fix PhoneAccountRegistrarTest

Fix state comparison in PhoneAccountRegistrarTest to actually do
something (and not compare nulls).

Found by Errorprone.

(cherry picked from commit fb7a391bacb1dd12fa38ebe35ecf6891e166e018)

Bug: 73288226
Test: m javac-check RUN_ERROR_PRONE=true
Test: atest PhoneAccountRegistrarTest
Merged-In: Ied3b3b3e38e3b73a37479dd2bdbac8a3e3fc3228
Change-Id: Ied3b3b3e38e3b73a37479dd2bdbac8a3e3fc3228
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
98c1577f1f8c155fd5b038d2c1906536a6fcfd28 01-Mar-2018 Andreas Gampe <agampe@google.com> Telecomm: Fix ConnectionServiceRepository

Fix the cache removal.

Found by Errorprone.

(cherry picked from commit 1839ce18104e214c2d0806c39baaf6e046bdc3e9)

Bug: 73288226
Test: m javac-check RUN_ERROR_PRONE=true
Test: atest TelecomUnitTests
Merged-In: I835f3ef9f85cde84bb9ec6882540fc9b71c5b85e
Change-Id: I835f3ef9f85cde84bb9ec6882540fc9b71c5b85e
rc/com/android/server/telecom/ConnectionServiceRepository.java
rc/com/android/server/telecom/ServiceBinder.java
980ccdca19b0b22118b7af25be537e8ed27ae23f 07-Mar-2018 Tyler Gunn <tgunn@google.com> Declare READ_EXTERNAL_STORAGE permission for Telecom.

We have seen some bugs where playing a ringtone installed by a third party
app results in a failure to play the ringtone.

Test: Compile
Bug: 74051324
Merged-In: I08d548b615a16e190cb7c03ffa6f731fe7ac9a3f
Change-Id: I08d548b615a16e190cb7c03ffa6f731fe7ac9a3f
(cherry picked from commit 9ca0f2cb4bbd3203b4d60c0d1140394a48cfbb97)
ndroidManifest.xml
81b12a57336ca4a442e9dbdfb583718df3612ebc 07-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4638586 from a4b839b0631cc873eab603d3bd4ff3d4297d3071 to pi-release

Change-Id: Iaf7b59763b0d74b1a29b42d2501f39ec29a00e9d
a4b839b0631cc873eab603d3bd4ff3d4297d3071 07-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Don't follow BT audio changes outside of calls" into pi-dev
784a496b1df7695472c07f8ceeb8b2bddea7074a 06-Mar-2018 Hall Liu <hallliu@google.com> Don't follow BT audio changes outside of calls

When there's no Telecom call going on, don't use BRM to follow Bluetooth
audio changes -- this will interfere with other apps trying to use HFP.

Bug: 73274274
Test: unit test update, manual
Change-Id: Ia4e71fb71baafc9e9f8702ab72f803d47c37482a
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
rc/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java
ests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
ests/src/com/android/server/telecom/tests/CallAudioManagerTest.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
867a93d3390219471f149a4b3339dcd938ad5fa2 06-Mar-2018 Pengquan Meng <mpq@google.com> Remove release timeout event

The timeout message of release focus has not remove when the
ConnectionService is released. This is because the obj of the message
changed from FocusRequest to MessageArgs.

Test: manual
Bug: 73990638
Change-Id: I7f1b71097baf0d4bd31692c1e4e7af9db47656a1
(cherry picked from commit d86cc340dff54751745158e01369d07ab1ebc20f)
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
c99026cce65ef979e4044aadb5642a17fafbfd7c 06-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Merge cherrypicks of [3698122, 3698392, 3697644, 3697645] into pi-release

Change-Id: I3e68fd0dedd6b3a5c7bcd003698efbfde24f9310
84d4a12348ad3bc83c656ec9e607d59a3bf945e5 06-Mar-2018 Pengquan Meng <mpq@google.com> Remove release timeout event

The timeout message of release focus has not remove when the
ConnectionService is released. This is because the obj of the message
changed from FocusRequest to MessageArgs.

Test: manual
Bug: 73990638
Change-Id: I7f1b71097baf0d4bd31692c1e4e7af9db47656a1
(cherry picked from commit d86cc340dff54751745158e01369d07ab1ebc20f)
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
4d8cd29827d9c22fee4c85be822f0b6229bdfa6a 06-Mar-2018 Tyler Gunn <tgunn@google.com> Add overlay to control vibration pattern used by device.

Added an overlay which is used to determine which vibration pattern a
device uses. The new vibration pattern ramps up in intensity, which may
not work well on some vibration hardware. Devices with vibration hardware
that does not work well with the new pattern can overlay the new config
overlay value to indicate that the old-style simple pattern is used
instead.

Test: Manually tested simple vs fancy vibration pattern.
Bug: 68374140
Change-Id: Icfbac1342de562a2891d7af5d11b79d111f2898d
es/values/config.xml
rc/com/android/server/telecom/Ringer.java
b4088ee18555bbca15de40d99ff47cc3e410f3a6 20-Dec-2016 Ravi Paluri <rpaluri@codeaurora.org> IMS-VT: Remove video call back attached with old video provider

If old video provider is valid, then remove video call back
attached with it.

Test: Manual
Bug: 35376544
Change-Id: I8882eed081baa1a304e939a9f1f6ddf4a582ca63
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/VideoProviderProxy.java
852b521f7d9d16c35b7e03477c91c01cd9164534 04-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4632767 from f9257363338ffab29910dc3fee39485539e8ebb1 to pi-release

Change-Id: I628b85b50e18881a56a168ba0e60b7652e625850
f9257363338ffab29910dc3fee39485539e8ebb1 03-Mar-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 41f3286691 -s ours
am: 479f48baf0 -s ours

Change-Id: If55bee2cee1fe0275cf1ad73124785b3141caf30
479f48baf01498d7e671d7c29575b4c840d1af8c 03-Mar-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 41f3286691 -s ours

Change-Id: Ib682a92fc6eb3ce02621a799a0e7aee2fd1f29d5
000704b9ff0f59ab3c05ff1673e19bd69c1bbcc9 03-Mar-2018 Hall Liu <hallliu@google.com> Merge "RTT logging tweaks"
f71cca9815adb0c7c4b22c1b2a9450ed5b2cc563 27-Feb-2018 Hall Liu <hallliu@google.com> RTT logging tweaks

Change log level of a useful line to INFO

Test: logging change
Change-Id: I923ee29e8e969f0e1fccee37a28229dd34939e85
rc/com/android/server/telecom/CallsManager.java
41f328669104d9e68a78edc88236dbd9a5b9d025 02-Mar-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I686763fca4d1a486a2dbfe315d238926c832d3b7
es/values-bs/strings.xml
es/values-tl/strings.xml
0652ff05d518031d70c10f953280d42c99541457 02-Mar-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Icddffc71a226d486ab16f33df871ceb7664e7163
Auto-generated-cl: translation import
es/values-bs/strings.xml
d0bdbf77ab9af496f7977bc90112f67228c78644 28-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4625912 from ace7e5dd881af32be91cf1e713052b08475f3c18 to pi-release

Change-Id: If80f928b01617a14f67f6ab117d2c402d43e3509
ace7e5dd881af32be91cf1e713052b08475f3c18 27-Feb-2018 Pengquan Meng <mpq@google.com> Merge "Fixed Log session for ConnectionServiceFocusManager"
13e0da6558530076810677215fded14f8be2b8ca 27-Feb-2018 Pengquan Meng <mpq@google.com> Fixed Log session for ConnectionServiceFocusManager

Bug: 73833272
Test: runtest -x ConnectionServiceFocusManagerTest.java
Change-Id: Ic7c1e815a998b93b35fffd528c707e1f4d54ffd2
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
c8dea9960024e9c0ba04352f0b9acd04319e50cd 27-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4623514 from 0238ca7257c06c31abdfcef9647fb9763ae5bd68 to pi-release

Change-Id: I0eeef0f817465e0b1620a5b993e38f70b9601571
0238ca7257c06c31abdfcef9647fb9763ae5bd68 26-Feb-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Id45a98a4720c8e8e31c1ae1e804ce6d35a65c217
Auto-generated-cl: translation import
es/values-tl/strings.xml
b4b195fc59e1ea78a7d48ce0bb3473a1150a0460 26-Feb-2018 Anton Hansson <hansson@google.com> Merge "packages/services/Telecomm: Set LOCAL_SDK_VERSION where possible." am: 67d032830a am: 7a9496abdb
am: 02b5e1b30d

Change-Id: Iccfb07c49389c5562b643e7a4feab1f9e9b4816b
02b5e1b30d2bf492a2707cb6eb9ed61d849a1e13 26-Feb-2018 Anton Hansson <hansson@google.com> Merge "packages/services/Telecomm: Set LOCAL_SDK_VERSION where possible." am: 67d032830a
am: 7a9496abdb

Change-Id: Ia49f631430c7febcb7d5e02961aae705763fae82
7a9496abdb37e63bad2f5ff9d4c0f851604f7a27 26-Feb-2018 Anton Hansson <hansson@google.com> Merge "packages/services/Telecomm: Set LOCAL_SDK_VERSION where possible."
am: 67d032830a

Change-Id: Ib25e2bfce519be7731f35ecfc50e98f70f84b7cf
67d032830ac830aea5cef70f5267ffeeba6a613c 26-Feb-2018 Anton Hansson <hansson@google.com> Merge "packages/services/Telecomm: Set LOCAL_SDK_VERSION where possible."
d52a8519ed850f29fe3370ceb8a7aec516864f56 25-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4620899 from 5082d691813e7ae6d070d876abda42cf84ce37c7 to pi-release

Change-Id: I18ed063a5644514608133e680c6c38c2e05b9c0b
5082d691813e7ae6d070d876abda42cf84ce37c7 23-Feb-2018 Omata Shou <shou.omata@sony.com> To suppress the mute function during an emergency call am: 6bc865cccb am: 28f22aac23
am: c664b2f9b0

Change-Id: I1b3d2afbdb26658f66e9a0f1bc74accba4e4b76d
c664b2f9b0ee4f5062774b797f0c8dfa4f483d9d 23-Feb-2018 Omata Shou <shou.omata@sony.com> To suppress the mute function during an emergency call am: 6bc865cccb
am: 28f22aac23

Change-Id: I36691a1d0b194fef1db6b309c9b56dca2a073b4e
28f22aac23a698974c97425f3774a71b22ed5d95 23-Feb-2018 Omata Shou <shou.omata@sony.com> To suppress the mute function during an emergency call
am: 6bc865cccb

Change-Id: Ifc6ad5f8cd1678e4f9dd07bd7a4c090186753439
6bc865cccb0ba34f3fc0ca83da8eb92c7fe22607 26-Jul-2017 Omata Shou <shou.omata@sony.com> To suppress the mute function during an emergency call

During an emergency call, the mute function is suppressed on the call
screen UI, however the user can use mute function below.
- Add an emergency call after the user turns ON mute during
a normal call
- Doing a long press the function button on the wired headset during
an emergency call

With this fix, these use cases are suppressed.

Test: manual - Checked that the mute function is suppressed in each
use case
Test: auto - Passed BasicCallTests
Bug: 64102005

Change-Id: I271ef82ce8e96cf45954436f00b844926902d521
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
5fd4b688e760f37daebf991d1a638d00d54b2932 23-Feb-2018 Anton Hansson <hansson@google.com> packages/services/Telecomm: Set LOCAL_SDK_VERSION where possible.

This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.

Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.

Test: make relevant packages
Bug: 73535841
Change-Id: I44cbcaef285632fc8471c050e69678eab6f3968f
ndroid.mk
estapps/Android.mk
ests/Android.mk
30df544812ee1a6cc434b966c6d6013a68bb1524 22-Feb-2018 Hall Liu <hallliu@google.com> RTT bugfixes, part 5 am: 996ecdb987 am: fb6b28355b
am: e7e96ec581 -s ours

Change-Id: Iecb777044f809ca2806188a71b6b0e310038e24e
e7e96ec581de976cdc1ef579e0629d3798fe665b 22-Feb-2018 Hall Liu <hallliu@google.com> RTT bugfixes, part 5 am: 996ecdb987
am: fb6b28355b

Change-Id: I483a4458189f31f7d78eb2206adc9281ed1ba130
fb6b28355b696d9c7b5201c2f43fd8d07596ccd7 22-Feb-2018 Hall Liu <hallliu@google.com> RTT bugfixes, part 5
am: 996ecdb987

Change-Id: I86139886d81c906abab20896c453c63f1b8d305c
996ecdb9877db24bb620a99c86f28a6724ec9a17 10-Feb-2018 Hall Liu <hallliu@google.com> RTT bugfixes, part 5

* Stop destroying and re-creating the RTT pipes -- they have a complex
lifecycle on the other side of the pipe

Bug: 72648661
Bug: 72762206
Test: manual, with telecom testapp dialer over the network and Dialer
simulator

Change-Id: I4fd657e4c204386826fc6e7f9e529b673d16e001
Merged-In: I4fd657e4c204386826fc6e7f9e529b673d16e001
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ParcelableCallUtils.java
4600627cf0964de5c076695c4504fce4174c32cf 21-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4613997 from 5fb40d94ac734246016ec18cccc681ee1a90edbd to pi-release

Change-Id: I86d729ffe0e47e9d1fdf4fac1ce0c0946a8c71c5
5fb40d94ac734246016ec18cccc681ee1a90edbd 20-Feb-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 041ee54441 -s ours
am: 3f0a3582f6 -s ours

Change-Id: I56905451d4999e6e8fd13ab275d3c976f7b55282
f324000946d1b9138aea2f1b32a348f96d0e4c7a 20-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4612226 from 6513f4ea184ad26a22d4b8875dba54d3040f8d5d to pi-release

Change-Id: I6a766ca35e1364981507497c258c8fed4e818cbd
3f0a3582f613c9d6f23eb1b744cca48fd3fa8117 20-Feb-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 041ee54441 -s ours

Change-Id: I32920c371ca1a1f5ee04e9635050c497b401f18b
041ee54441287c241e86ee74f5d76b4d6ffe3169 19-Feb-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib1f8ce5b7b0f68fc4993f591112af8b2b3def700
es/values-ar/strings.xml
es/values-eu/strings.xml
es/values-ja/strings.xml
6513f4ea184ad26a22d4b8875dba54d3040f8d5d 19-Feb-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ifc52fbec57379b96df4f0babf5d2c99db85cc7d3
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-eu/strings.xml
c571f941be3b2c9ca995696c38dd331c8e1bcb5c 18-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4610834 from 987b6ebbf7cdcaf95282646d1530f30c63f5f38b to pi-release

Change-Id: I762450fca5b23ea569d478290f9c43992e141709
987b6ebbf7cdcaf95282646d1530f30c63f5f38b 16-Feb-2018 Aurimas Liutikas <aurimas@google.com> Remove useless res include.

This target already uses aapt2 thus res directory no longer needs to be included.

Change-Id: I6339aaa1083c59395c65f6b969c6dbd6e07ced24
Test: None
ests/Android.mk
9f5abede824e869369b5b93ea3634ade69854c44 16-Feb-2018 Hall Liu <hallliu@google.com> RTT initialization bugfixes am: fb8d5abd22 am: bb39d8595f
am: e015900f11 -s ours

Change-Id: I1cde97952ea868c5a684dea16a991763cf7a4f7c
e015900f118b90e42b0e2c7ded6e81fb35948883 16-Feb-2018 Hall Liu <hallliu@google.com> RTT initialization bugfixes am: fb8d5abd22
am: bb39d8595f

Change-Id: I669cad9ef18f2c6bd0c03e195aae7a7350f61b77
bb39d8595f1753024d5b20879111e7dc09f3ec1a 16-Feb-2018 Hall Liu <hallliu@google.com> RTT initialization bugfixes
am: fb8d5abd22

Change-Id: I1a06627a2ba828e9790dfcbd8f979f237fd58bec
582a8bc156bd17b2257406ffa2f2a396ad93805d 16-Feb-2018 Hall Liu <hallliu@google.com> Merge "RTT bugfixes, part 5"
fb8d5abd22ed0cb328365e4c64885471b1c7c53a 30-Jan-2018 Hall Liu <hallliu@google.com> RTT initialization bugfixes

Properly dispose of old RTT data pipes
Add logging
Read the system setting to see if we should start the call with RTT
Deal with connection managers that possibly support RTT

Bug: 71873552
Test: manual
Change-Id: I12f67ca977bd97302c7e5a21a7374f085e5865ce
Merged-In: I12f67ca977bd97302c7e5a21a7374f085e5865ce
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
ea67a76715cf3b961c61559d5a35cd182087a263 10-Feb-2018 Hall Liu <hallliu@google.com> RTT bugfixes, part 5

* Stop destroying and re-creating the RTT pipes -- they have a complex
lifecycle on the other side of the pipe

Bug: 72648661
Bug: 72762206
Test: manual, with telecom testapp dialer over the network and Dialer
simulator

Change-Id: I4fd657e4c204386826fc6e7f9e529b673d16e001
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ParcelableCallUtils.java
25ec9cd68c2570d6a1acd8a20cdd9b43f61e1ba7 14-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4603395 from 513210488e219da6959ceb867b60a677b68e2bd0 to pi-release

Change-Id: I2de886e5db7b20878dd7027a8de39ad658418e92
513210488e219da6959ceb867b60a677b68e2bd0 13-Feb-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Activate recording tones functionality."
19144c1e20359e27f16a4cf5d90ce286ce7ecd9e 11-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4598635 from 13694901709887289a0ad98337a2c7faaa3cd196 to pi-release

Change-Id: Iad26c77db8bc68ac431e7143f20f99881a4c8bba
13694901709887289a0ad98337a2c7faaa3cd196 09-Feb-2018 Tyler Gunn <tgunn@google.com> Add logging of package invoking TelecomManager#endCall() API. am: 587fc27faf am: a68da876f6
am: 1b90c1b739

Change-Id: I3c89b675245d3ee783b4d8d5393f82514103d231
1b90c1b7394349f096f3960246bd8e85a6bc1234 09-Feb-2018 Tyler Gunn <tgunn@google.com> Add logging of package invoking TelecomManager#endCall() API. am: 587fc27faf
am: a68da876f6

Change-Id: I5b16a48c1ad46f03afef47ecf9f8b4bf2073b4d6
a68da876f667b786effd9a7abb90f8f419b00862 09-Feb-2018 Tyler Gunn <tgunn@google.com> Add logging of package invoking TelecomManager#endCall() API.
am: 587fc27faf

Change-Id: I87cf0f75eca16fc3072d27e7fe21248e72080823
95daef777c178e4e730bc1509abefac3617f6d06 06-Feb-2018 Tej Singh <singhtejinder@google.com> CallStateChanged atom for statsd

Logs call state changes to statsd, and makes the constants in
CallState.java reference proto enums as the source of truth.

Test: will run telecom unit tests
Change-Id: I7e221e20bc191ff7db40dcc99055575f786e602c
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallState.java
15c06f523f6bb54659fa2bfcbdb2e7c7a534e831 09-Feb-2018 Tyler Gunn <tgunn@google.com> Activate recording tones functionality.

This was put into AOSP originally, but there were unmet API dependencies
which required the tone generation to be deactivated in AOSP.

Test: Unit tests, manual test.
Bug: 64138141
Change-Id: Ie40fee3dc84662c813b3b17b03e2776a0c8a3edc
rc/com/android/server/telecom/CallRecordingTonePlayer.java
587fc27fafcab87738a3be1c9a74b435ad0d97b4 08-Feb-2018 Tyler Gunn <tgunn@google.com> Add logging of package invoking TelecomManager#endCall() API.

For debugging purposes it is useful to see in the Telecom dumpsys the
package name of the package which has invoked the endCall() API.

Bug: 73006395
Test: Manual testing to confirm logging works as expected.
Change-Id: Ic1ef69cca43c256ff36ca3e23b1607db9a33f3ab
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
51b7486a3f9d6e8b28f7e09b0f379a702f9670a6 08-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4593582 from 7757ee2a22fc2c314d36c5a7b8cff75f34bbfd8c to pi-release

Change-Id: I11920adfd54395f2b14f17949aed1a4a2deb64c2
7757ee2a22fc2c314d36c5a7b8cff75f34bbfd8c 08-Feb-2018 Pooja Jain <poojain@codeaurora.org> IMS: Add support for call deflection feature am: ad4ebc022b am: 6744e12066
am: f095fd8124

Change-Id: I66305c6c5502e8bc5e9eb3b7338e37ab95a43519
f095fd8124f6dae09e746c58c5b4688f11114fc9 08-Feb-2018 Pooja Jain <poojain@codeaurora.org> IMS: Add support for call deflection feature am: ad4ebc022b
am: 6744e12066

Change-Id: I5178d9c9a125119a514bf7c4097af4a04530eb76
6744e12066817a14f97b3c1411d1258738a3b26d 08-Feb-2018 Pooja Jain <poojain@codeaurora.org> IMS: Add support for call deflection feature
am: ad4ebc022b

Change-Id: Ida5bd3ec74128296d993d569e37a4078a9b8d06a
ad4ebc022bf8a28958606121a1a2a0c4130dc821 28-Dec-2017 Pooja Jain <poojain@codeaurora.org> IMS: Add support for call deflection feature

Call deflection feature is useful to deflect MT call to another
number.

Test: Manual

Bug: 62170348
Change-Id: Ia14931c2dd40e881252f3b5f646cf2c3c7b0e534
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/ParcelableCallUtils.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
7333aac3de968aa727d3af469b110cb056e70383 06-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4587185 from 825f6ad36e9151dbce72ca9787d6f380ae32129a to pi-release

Change-Id: I2249bf6fa15bb99e694ec9e0129c718a39da4ae4
30856605edd4ad6c29a69847fc8ac3bbddf26e22 05-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4585119 from dcabb4c24484f7e6244cb824299cc452893353e0 to pi-release

Change-Id: I8dc70bda244d3faf3a920c1edf37f4494a8d3d5c
825f6ad36e9151dbce72ca9787d6f380ae32129a 30-Jan-2018 Hall Liu <hallliu@google.com> RTT initialization bugfixes

Properly dispose of old RTT data pipes
Add logging
Read the system setting to see if we should start the call with RTT
Deal with connection managers that possibly support RTT

Bug: 71873552
Test: manual
Change-Id: I12f67ca977bd97302c7e5a21a7374f085e5865ce
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
dcabb4c24484f7e6244cb824299cc452893353e0 02-Feb-2018 Tyler Gunn <tgunn@google.com> Add ability to generate remote call recording tone. am: 5d66e1d540 am: 9f7c30cc76
am: 585847ccbf

Change-Id: If90b35ab54c52d3a0f18eb495d21b5c3326bcb02
585847ccbfcb05fd5e307c6b253568c4c772d595 02-Feb-2018 Tyler Gunn <tgunn@google.com> Add ability to generate remote call recording tone. am: 5d66e1d540
am: 9f7c30cc76

Change-Id: Ifb8bdfb2387ba820336ef837007e81eec3c7a3d1
9f7c30cc7609785ceadc7217bb7fcaff4fc6f7b8 02-Feb-2018 Tyler Gunn <tgunn@google.com> Add ability to generate remote call recording tone.
am: 5d66e1d540

Change-Id: Id0333c08abc76ad6b7d12af827ec378686694631
114de0041019d5394b51153ad35544b06c263a2a 31-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4577102 from 2a2cbc13ccca4f36f0713e5535c48c05cdf7e7bc to pi-release

Change-Id: Id19d7dcabd106eb4cb0e74803f2f5a30d846098d
5d66e1d540c9c0006445c310b34420dfdb5219ed 26-Jan-2018 Tyler Gunn <tgunn@google.com> Add ability to generate remote call recording tone.

Add Telecom support to generate a call recording tone in the outgoing
telephony audio stream when a recording app is enabled on the device.

The new CallRecordingTonePlayer will play a call recording warning tone to
the remote user via outgoing telephony audio stream. This functionality
if gated on device support and carrier config in the telephony stack.

Test: Added new unit tests. Manually changed carrier config to enable
tones on local deice, installed audio recording app and verified while it
is recording the tone is audible on remote end.
Bug: 64138141
Change-Id: Ifcf5a49704af5a1352527e705e7d2a3bc16d7fdd
ndroidManifest.xml
es/raw/record.ogg
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallRecordingTonePlayer.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallRecordingTonePlayerTest.java
2a2cbc13ccca4f36f0713e5535c48c05cdf7e7bc 30-Jan-2018 Tyler Gunn <tgunn@google.com> Handover API cleanup. am: 7c031f2244 am: a7a44d9188
am: 0a04866aaf -s ours

Change-Id: Id8f7e63a33725d5c3cd862d65f084e275fe6eeb9
0a04866aaf205d8a9bee4c3cb689d19c93c1aab3 30-Jan-2018 Tyler Gunn <tgunn@google.com> Handover API cleanup. am: 7c031f2244
am: a7a44d9188

Change-Id: I4e29ed4f3128a7b0713f25b86f07f62cf943e234
a7a44d91886e68c8919cacc232a8a2ad086cffc5 30-Jan-2018 Tyler Gunn <tgunn@google.com> Handover API cleanup.
am: 7c031f2244

Change-Id: Ice65485609cbfd35f7ab1f12fe21f7efe1440fb0
7c031f2244d820ead60523cf515f6610bf215873 19-Jan-2018 Tyler Gunn <tgunn@google.com> Handover API cleanup.

- Fix issue where empty extras bundle crashes Telecom.
- Complete plumbing of handover complete APIs to Connection and Call.
- Add runtime permission check for acceptHandover.
- Fix bug in acceptHandover where caller identity was not cleared,
resulting in some strange security exceptions.
- Use new EXTRA_IS_HANDOVER_CONNECTION sent to the ConnectionService when
the new APIs are used; this ensures that the CS knows that its a new
fangled handover, and not the legacy API.

Bug: 65415068
Test: CTS tests.
Change-Id: I4b9dafcc0707f1ce58cb6c100588d46fcf0a170f
Merged-In: I4b9dafcc0707f1ce58cb6c100588d46fcf0a170f
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
4ed27e694ab3a637e2d011b03fe5954e8e27da92 30-Jan-2018 Tyler Gunn <tgunn@google.com> Ensure self-managed calls do not use work profile initiator fix. am: cf2103291c am: 012c927109
am: ec817f2a1e

Change-Id: I34bdb3f7855edcdb5b43cfc7a62052985fb6c5a4
ec817f2a1e7e027dad2734debe19990341fc291a 30-Jan-2018 Tyler Gunn <tgunn@google.com> Ensure self-managed calls do not use work profile initiator fix. am: cf2103291c
am: 012c927109

Change-Id: Ie799de67b5ab5d9689b831a5f62ce72383cd1370
012c9271093dd19fbf88a36ffc270055aefa83b5 30-Jan-2018 Tyler Gunn <tgunn@google.com> Ensure self-managed calls do not use work profile initiator fix.
am: cf2103291c

Change-Id: Ie515ee5f5e55ab46ecce56e5187f64dc86e874f2
353e8fc30444f0b69a3f33d6ed464aa54e9427f3 29-Jan-2018 gitbuildkicker <android-build@google.com> merge in pi-release history after reset to master
efe0af8be751f14d24d3dd8ef659f2751146b46b 29-Jan-2018 gitbuildkicker <android-build@google.com> merge in pi-release history after reset to master
0f104155da1c3ac1481a3a775e788b913bc74b2c 29-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4572138 from 34c18ea4843fa15f127d5203b4ba377de5d7001d to pi-release

Change-Id: I68bc5143ccc38664ff56820ca4110e7b6c022f5e
34c18ea4843fa15f127d5203b4ba377de5d7001d 28-Jan-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I808a6a88b2f238a3ada72f3dd4ad9fc2461ca91f
Auto-generated-cl: translation import
es/values-ja/strings.xml
cf2103291c52b778f11fc6d6964ed261de443653 23-Jan-2018 Tyler Gunn <tgunn@google.com> Ensure self-managed calls do not use work profile initiator fix.

Test: Used work profile test app to reproduce problem. Confirmed fix
corrects that issue.
Bug: 70895643

Change-Id: Ifd51d3d16c7d35734711ac143d66d1813b68adc3
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallsManager.java
84be59a7d0ecfff40dbc42ecd025b820416067a2 25-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4565898 from f34f0ec8aa002a48bde7abfb101ea7c620f07b83 to pi-release

Change-Id: I7a1a29ada32922a67bb87911d956a5ce9f4ae820
f34f0ec8aa002a48bde7abfb101ea7c620f07b83 25-Jan-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 1742e353f5 -s ours
am: 0e2d1e2c3f -s ours

Change-Id: I27170e0d9776d50596aa3499aab29bb234a079c4
0e2d1e2c3f4ebbd92212123519abd8d68f03a0bc 25-Jan-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 1742e353f5 -s ours

Change-Id: I21697d779cd42e886165507ef6366c9f8daf9061
630736aad9e02d675e699562e5b838d68c47fdd1 25-Jan-2018 Tyler Gunn <tgunn@google.com> Merge "Handover API cleanup."
1742e353f57d4f8d197d215a1b7a7a0b85546cc2 25-Jan-2018 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9cee4645fe61edd1021268e968806ed6f230efd6
es/values-bs/strings.xml
es/values-mr/strings.xml
es/values-zh-rTW/strings.xml
e3c2b0b168ae732df73bd2abecc5449578dcd228 25-Jan-2018 Pengquan Meng <mpq@google.com> Integrate connectionServiceFocusManager into call flow am: 4832f208b3 am: 68e57f2d6e
am: 550821c9e8 -s ours

Change-Id: Ia8693ecc03feddc64e53e5d97168f5fc38c672f7
550821c9e80241b3107d2d9183d56357e6220626 25-Jan-2018 Pengquan Meng <mpq@google.com> Integrate connectionServiceFocusManager into call flow am: 4832f208b3
am: 68e57f2d6e

Change-Id: I69fd435ce5901a185bb617db4bbe3c2493018314
68e57f2d6e7e504baa99d453440fb543c0ba66c0 25-Jan-2018 Pengquan Meng <mpq@google.com> Integrate connectionServiceFocusManager into call flow
am: 4832f208b3

Change-Id: Ia47e04bedae451b8dcf0a5e8ed7e187919bf98fc
37a4dca8ca58f7877540bd2bdac17e4ded5d85f4 19-Jan-2018 Tyler Gunn <tgunn@google.com> Handover API cleanup.

- Fix issue where empty extras bundle crashes Telecom.
- Complete plumbing of handover complete APIs to Connection and Call.
- Add runtime permission check for acceptHandover.
- Fix bug in acceptHandover where caller identity was not cleared,
resulting in some strange security exceptions.
- Use new EXTRA_IS_HANDOVER_CONNECTION sent to the ConnectionService when
the new APIs are used; this ensures that the CS knows that its a new
fangled handover, and not the legacy API.

Bug: 65415068
Test: CTS tests.
Change-Id: I4b9dafcc0707f1ce58cb6c100588d46fcf0a170f
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
088b0ed4319cfd24698a0b0d44f43ee3d7275a03 24-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4562879 from 606ff7f93c1b95fda48a89876000cb4f63b6e47b to pi-release

Change-Id: I4560b272f4cc8c5f6f7bc2abb869eb22a69627b1
4832f208b38643bb5fc8cbe7b72635032de283ae 21-Dec-2017 Pengquan Meng <mpq@google.com> Integrate connectionServiceFocusManager into call flow

This changed allows multiple calls existed at the same time by
mataining the ConnectionService focus.

design doc: go/android-telecom-3p-enhancements
Bug: 69651192
Test: unit test

Change-Id: I57777daec2011df958d0483ad0876cff55ee0133
Merged-In: I57777daec2011df958d0483ad0876cff55ee0133
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
6551fb4959b3255654b8a3389bd42940567e6a04 21-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4557233 from ee705848eb4ee368afca4d493c20fc9692844a7e to pi-release

Change-Id: Iaee972e1f3f7545237052b73b0f445c13cd58f69
606ff7f93c1b95fda48a89876000cb4f63b6e47b 21-Dec-2017 Pengquan Meng <mpq@google.com> Integrate connectionServiceFocusManager into call flow

This changed allows multiple calls existed at the same time by
mataining the ConnectionService focus.

design doc: go/android-telecom-3p-enhancements
Bug: 69651192
Test: unit test

Change-Id: I57777daec2011df958d0483ad0876cff55ee0133
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ee705848eb4ee368afca4d493c20fc9692844a7e 18-Jan-2018 Pengquan Meng <mpq@google.com> Revert "Integrate connectionServiceFocusManager into call flow" am: fc9c8ffcac am: 0c403a280c
am: b93f637f4b

Change-Id: I05f7040fd99190f99b83db3ad9f82a4b88408a0b
b93f637f4b7ee9fc65e240bb4d11572cc9901650 18-Jan-2018 Pengquan Meng <mpq@google.com> Revert "Integrate connectionServiceFocusManager into call flow" am: fc9c8ffcac
am: 0c403a280c

Change-Id: I64df2de1fca795a61f5084bce6ab77c4f1c9df51
0c403a280c665cb71f09510d1a1dca791b3e8f25 18-Jan-2018 Pengquan Meng <mpq@google.com> Revert "Integrate connectionServiceFocusManager into call flow"
am: fc9c8ffcac

Change-Id: I45f5faee1a3133bfd851514d94e89ee7b9851b79
fc9c8ffcac8fb7c6796d0fe74152bb1fb14d74d9 17-Jan-2018 Pengquan Meng <mpq@google.com> Revert "Integrate connectionServiceFocusManager into call flow"

This reverts commit bd3cae5981ce01bc442db63792839f90706d9e7e.

This caused Duo unusable, just revert it and investigate the root caused.

Change-Id: I3107fe568671f6222e851310dd29083aff8f6eea
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
73d8f0848ae2721f703d88b76ddc968f0b9e9760 18-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4551672 from ffd2d7d09789d8da4a0cb3fa80c8105dd231aa7d to pi-release

Change-Id: I746ff838a6e81ff4b810c538b4e8a73f1a061331
247eedadfc4e016e4387e14a89cfa7eab7767646 17-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Merge cherrypicks of [3472351, 3472217, 3472670, 3472218, 3471891, 3472414, 3472671, 3472415, 3472372, 3472373, 3472672, 3472673, 3472674, 3472675, 3472676, 3472219, 3472677, 3472678, 3472679, 3472353, 3472416, 3472680, 3472220] into pi-release

Change-Id: I1eaef7a5581404c2b9585de421632f7fb6ec0e00
84c657ebd5aef3ddb1801eaddb89c0ccde2b370f 17-Jan-2018 Tyler Gunn <tgunn@google.com> Fix regression where contacts and starred contacts wouldn't ring in DND.

A recent change was made to NotificationManager which deprecated the old
means of using EXTRA_PEOPLE when calling "matchesCallFilter".
This CL updates the "matchesCallFilter" to use the new replacement
EXTRA_PEOPLE_LIST means of specifying the contact URI.

Test: Manually tested ring during DND.
Bug: 72030702
Change-Id: Ia434d343abb6e3d7ebf5039c0626bc6b2ae85757
(cherry picked from commit 296489e016dda0b03fe83d0197e3609ec5155eef)
rc/com/android/server/telecom/Ringer.java
8ab7cc08be51c573ea1fe81145fa1db5029ce98d 17-Jan-2018 Pengquan Meng <mpq@google.com> Revert "Integrate connectionServiceFocusManager into call flow"

This reverts commit d2a1ecd367b7d2435b6b1458ba8d3779fe52576b.

This CL caused Duo unusable, need investigate the reason, so just reverted the CL at this time.

Change-Id: I710259befefdb8ec55767afce5a988d3a6cb0d5d
(cherry picked from commit 0e913fde338e0a073ea17c80e55b090d0e47e08b)
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
fa273d801c54a9eb1f5c6c9e9d6887d1d35a7277 17-Jan-2018 Pengquan Meng <mpq@google.com> Revert "Fixed outgoing permitted logic"

This reverts commit a715914e279c974e3ca8c430158b4e5efc408fdf.

Change-Id: I0808a62fa1f693e2af4057d86973649dbe727a7f
(cherry picked from commit 132dd296cd9082f14ca5c219e46f2bb7db9ef18a)
rc/com/android/server/telecom/CallsManager.java
ffd2d7d09789d8da4a0cb3fa80c8105dd231aa7d 17-Jan-2018 Tyler Gunn <tgunn@google.com> Merge "Fix regression where contacts and starred contacts wouldn't ring in DND."
73fbccbd00cd92d89697db1055b9a3f28cc7f200 17-Jan-2018 Hall Liu <hallliu@google.com> Migrate CAMSM and BRM tests to Parametrized am: 561cede15a am: 2e8ff200cd
am: 8f201735ae -s ours

Change-Id: Ib4150a5f73ce7adacbd4c1f2a3e4d07d0be9812b
8f201735ae2cb5e6258d7f02d56ab2ee8a88535c 17-Jan-2018 Hall Liu <hallliu@google.com> Migrate CAMSM and BRM tests to Parametrized am: 561cede15a
am: 2e8ff200cd

Change-Id: I54f47d972238ba611b97541716d040ac0b0395fc
2e8ff200cd00e3f44b86820686010b794fa0e39e 17-Jan-2018 Hall Liu <hallliu@google.com> Migrate CAMSM and BRM tests to Parametrized
am: 561cede15a

Change-Id: Id96dde06a7620afed4e4c71b2ddd486f24afab9b
561cede15a82b48e8f2974e740cee32ddbe8d928 04-Jan-2018 Hall Liu <hallliu@google.com> Migrate CAMSM and BRM tests to Parametrized

Migrate the two other state machine unit tests suites to use the builtin
JUnit parametrized runner. Also remove the old StateMachineTestBase
class.

Test: unit tests
Change-Id: Ib4e2f0cfd1bfd53aae64aaeedee6e6d86c81359e
Merged-In: Ib4e2f0cfd1bfd53aae64aaeedee6e6d86c81359e
rc/com/android/server/telecom/CallsManager.java
ests/Android.mk
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
ests/src/com/android/server/telecom/tests/BluetoothRouteTransitionTests.java
ests/src/com/android/server/telecom/tests/CallAudioModeStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallAudioModeTransitionTests.java
ests/src/com/android/server/telecom/tests/StateMachineTestBase.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
3315a44a8aba80820fcfc66331491b8c8cfee348 17-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4548429 from e164b27a66bd5b99bc147c717c7b582a35bc3e7f to pi-release

Change-Id: I0874fcc7aebcf2c15f61867f140108639c00613e
0e913fde338e0a073ea17c80e55b090d0e47e08b 17-Jan-2018 Pengquan Meng <mpq@google.com> Revert "Integrate connectionServiceFocusManager into call flow"

This reverts commit d2a1ecd367b7d2435b6b1458ba8d3779fe52576b.

This CL caused Duo unusable, need investigate the reason, so just reverted the CL at this time.

Change-Id: I710259befefdb8ec55767afce5a988d3a6cb0d5d
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ec67ea2acfd035326135327a0120a456a09a8485 17-Jan-2018 Pengquan Meng <mpq@google.com> Merge "Revert "Fixed outgoing permitted logic""
296489e016dda0b03fe83d0197e3609ec5155eef 17-Jan-2018 Tyler Gunn <tgunn@google.com> Fix regression where contacts and starred contacts wouldn't ring in DND.

A recent change was made to NotificationManager which deprecated the old
means of using EXTRA_PEOPLE when calling "matchesCallFilter".
This CL updates the "matchesCallFilter" to use the new replacement
EXTRA_PEOPLE_LIST means of specifying the contact URI.

Test: Manually tested ring during DND.
Bug: 72030702
Change-Id: Ia434d343abb6e3d7ebf5039c0626bc6b2ae85757
rc/com/android/server/telecom/Ringer.java
132dd296cd9082f14ca5c219e46f2bb7db9ef18a 17-Jan-2018 Pengquan Meng <mpq@google.com> Revert "Fixed outgoing permitted logic"

This reverts commit a715914e279c974e3ca8c430158b4e5efc408fdf.

Change-Id: I0808a62fa1f693e2af4057d86973649dbe727a7f
rc/com/android/server/telecom/CallsManager.java
54a172214528e744b49b34c44376e5a8e11949b7 16-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Merge cherrypicks of [3464897, 3465870, 3464898] into pi-release

Change-Id: Ib6892d147181e392a94d69a3fa9d89a151147544
cded2e374df62f8aeedd65895cd9f7f3dcd9a7e4 16-Jan-2018 Pengquan Meng <mpq@google.com> Fixed outgoing permitted logic

We allowed the 3p outgoing call when the foreground call provied by
CallAudioManager is null or can be held. However, the foreground call
can be the new outgoing call itself(the call state is CONNECTING) which
caused the failure of 3p outgoing call.

This also fixed the SelfManagedConnectionService cts.

Bug: 72028628
Test: Telephony sanity

Change-Id: Ia7696c7618e064ca10ae695a6bd597f3f012d717
(cherry picked from commit a715914e279c974e3ca8c430158b4e5efc408fdf)
rc/com/android/server/telecom/CallsManager.java
2afe9027824dbe6d88fb953045e12496b0da4cbc 04-Jan-2018 Hall Liu <hallliu@google.com> Migrate CAMSM and BRM tests to Parametrized

Migrate the two other state machine unit tests suites to use the builtin
JUnit parametrized runner. Also remove the old StateMachineTestBase
class.

Test: unit tests
Change-Id: Ib4e2f0cfd1bfd53aae64aaeedee6e6d86c81359e
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
ests/src/com/android/server/telecom/tests/BluetoothRouteTransitionTests.java
ests/src/com/android/server/telecom/tests/CallAudioModeStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallAudioModeTransitionTests.java
ests/src/com/android/server/telecom/tests/StateMachineTestBase.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
e164b27a66bd5b99bc147c717c7b582a35bc3e7f 16-Jan-2018 Pengquan Meng <mpq@google.com> Merge "Fixed outgoing permitted logic"
a715914e279c974e3ca8c430158b4e5efc408fdf 16-Jan-2018 Pengquan Meng <mpq@google.com> Fixed outgoing permitted logic

We allowed the 3p outgoing call when the foreground call provied by
CallAudioManager is null or can be held. However, the foreground call
can be the new outgoing call itself(the call state is CONNECTING) which
caused the failure of 3p outgoing call.

This also fixed the SelfManagedConnectionService cts.

Bug: 72028628
Test: Telephony sanity

Change-Id: Ia7696c7618e064ca10ae695a6bd597f3f012d717
rc/com/android/server/telecom/CallsManager.java
5d16ddebeb7981a311801f54d996dca460a4333e 14-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4545621 from 9cdce41583dc050547d692022f026997ec748d0d to pi-release

Change-Id: Ia9dad8635ee14b6a4b2e3c935a23da661f2859b1
9cdce41583dc050547d692022f026997ec748d0d 13-Jan-2018 Sanket Padawe <sanketpadawe@google.com> Merge "Add permission checks for old call handover apis." am: 88ccc71c1b am: ccbe370757
am: e20ea69df7

Change-Id: I6ef1021848d466ac894a7b9bdcea2cdd1c217934
e20ea69df740c41ac2c73258d12d0a2dc463fb03 13-Jan-2018 Sanket Padawe <sanketpadawe@google.com> Merge "Add permission checks for old call handover apis." am: 88ccc71c1b
am: ccbe370757

Change-Id: Ifc3ecb6ed7ebf651e66ee19dc95e946ff3a748a9
ccbe3707573d3b0658289d8e77582ca52ef885a7 13-Jan-2018 Sanket Padawe <sanketpadawe@google.com> Merge "Add permission checks for old call handover apis."
am: 88ccc71c1b

Change-Id: I579143a5b911c315239eeeb183bf8766540b50c0
88ccc71c1bff0d6e4f5bc3f8b7d4d87f914a59ae 13-Jan-2018 Sanket Padawe <sanketpadawe@google.com> Merge "Add permission checks for old call handover apis."
b16113df0280a0c7a0c0d58b4331177424138bed 13-Jan-2018 Joseph Pirozzo <pirozzoj@google.com> Merge "Bluetooth in band ring" am: 6bbe521c55 am: 35cc19c2a8
am: 2cc259c3ea

Change-Id: Ifaccf2157515d3a87636becd45f484defbaa15a6
2cc259c3ea55160490d9859d555b126cd07ec9ba 13-Jan-2018 Joseph Pirozzo <pirozzoj@google.com> Merge "Bluetooth in band ring" am: 6bbe521c55
am: 35cc19c2a8

Change-Id: I2b2f9b157eb9abeefa781f0d7d49b83f93c06d12
35cc19c2a85afabc25b120879a2aab24257df69e 12-Jan-2018 Joseph Pirozzo <pirozzoj@google.com> Merge "Bluetooth in band ring"
am: 6bbe521c55

Change-Id: Ieebd3d997787821d723cb532856691781b774bfa
6bbe521c55dadbc210796ff5724ccc1fb9ea57ec 12-Jan-2018 Joseph Pirozzo <pirozzoj@google.com> Merge "Bluetooth in band ring"
9bebe086895e8a5b622294087cf8778f71ceea0b 12-Jan-2018 Pengquan Meng <mpq@google.com> Integrate connectionServiceFocusManager into call flow am: bd3cae5981 am: 53d48e89f4
am: 6cde4cbad9 -s ours

Change-Id: I4911967eab0a1b4b7d9cbe88c484d87172fbb47b
6cde4cbad9bd4977de24690ee492f58831b7f584 12-Jan-2018 Pengquan Meng <mpq@google.com> Integrate connectionServiceFocusManager into call flow am: bd3cae5981
am: 53d48e89f4

Change-Id: Id8c9e839659a8cc6534f0d566c69c4c44cc21427
b5de1cdb15f65f1b6b9dddd8a11406bf58371923 05-Jan-2018 Sanket Padawe <sanketpadawe@google.com> Add permission checks for old call handover apis.

Bug: 65415068
Test: manual unit tests.
Change-Id: I1ae241059f5d4a3d2d16ea96faf7f86fcf0a89cd
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/InCallAdapter.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
53d48e89f4abb5bf78cca012338b7f9e46e51a10 12-Jan-2018 Pengquan Meng <mpq@google.com> Integrate connectionServiceFocusManager into call flow
am: bd3cae5981

Change-Id: I5ac20147a6bb5b0c8f97e6697b967c4440fb7c7b
bd3cae5981ce01bc442db63792839f90706d9e7e 21-Dec-2017 Pengquan Meng <mpq@google.com> Integrate connectionServiceFocusManager into call flow

This changed allows multiple calls existed at the same time by
mataining the ConnectionService focus.

design doc: go/android-telecom-3p-enhancements
Bug: 69651192
Test: unit test

Change-Id: Ifcf64664f61d1b792daa1cab504d9045f2dbc975
Merged-In: Ifcf64664f61d1b792daa1cab504d9045f2dbc975
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
81f47a98985df7b75571bc40fa3b814cd2f1b687 12-Jan-2018 Pengquan Meng <mpq@google.com> Merge "Integrate connectionServiceFocusManager into call flow"
d2a1ecd367b7d2435b6b1458ba8d3779fe52576b 21-Dec-2017 Pengquan Meng <mpq@google.com> Integrate connectionServiceFocusManager into call flow

This changed allows multiple calls existed at the same time by
mataining the ConnectionService focus.

design doc: go/android-telecom-3p-enhancements
Bug: 69651192
Test: unit test

Change-Id: Ifcf64664f61d1b792daa1cab504d9045f2dbc975
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
87fa1b749d2b4a4d7a87111b3f79417da77ee7a4 12-Jan-2018 Hall Liu <hallliu@google.com> Parameterize CARSM unit tests am: 43f20c39ff am: 74d3c7b41b
am: 02e08d945b

Change-Id: Ic7ae51feeed482de28aa8f006b4e10f1e474d2c0
02e08d945bd640fc42b1d77ed04b1fb86c07cf41 12-Jan-2018 Hall Liu <hallliu@google.com> Parameterize CARSM unit tests am: 43f20c39ff
am: 74d3c7b41b

Change-Id: I18c9ba42baeb540456b4fcf1c1fd6d7b6b726fb6
74d3c7b41b3751dc2d3e3d428348900404a25dea 12-Jan-2018 Hall Liu <hallliu@google.com> Parameterize CARSM unit tests
am: 43f20c39ff

Change-Id: Iddb5b39a846fce884847e54495694df327bfae43
408d43ca007a1339628af21a5567e06b98b3bcae 14-Dec-2017 Joseph Pirozzo <pirozzoj@google.com> Bluetooth in band ring

Prevent the telecom service from generating a ringer if there is already
a ringer generated by a phone connected over bluetooth headset client
service.

Bug: 65673832
Test: runtest telecom-unit -c
com.android.server.telecom.tests.RingerTest
Change-Id: If232fc3c6d75bd24557162682e9cd4a900afcee4

(cherry picked from commit ee4089c11b18650e545c7fdd2c158b80b6188cb5)
rc/com/android/server/telecom/Ringer.java
ests/src/com/android/server/telecom/tests/RingerTest.java
de81ba7b9b73e1e63b513fecc6df8088e46430d5 11-Jan-2018 Joseph Pirozzo <pirozzoj@google.com> Merge "Bluetooth in band ring"
e637172c8e56839cf3fcec94d674ce2b3b446c8d 11-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4539010 from 81139e1ac426b629f02410ec6d4293ce55530710 to pi-release

Change-Id: I962f1988d468423db7c27ef891a8ad17ab09b7b9
ee4089c11b18650e545c7fdd2c158b80b6188cb5 14-Dec-2017 Joseph Pirozzo <pirozzoj@google.com> Bluetooth in band ring

Prevent the telecom service from generating a ringer if there is already
a ringer generated by a phone connected over bluetooth headset client
service.

Bug: 65673832
Test: runtest telecom-unit -c
com.android.server.telecom.tests.RingerTest
Change-Id: If232fc3c6d75bd24557162682e9cd4a900afcee4
rc/com/android/server/telecom/Ringer.java
ests/src/com/android/server/telecom/tests/RingerTest.java
81139e1ac426b629f02410ec6d4293ce55530710 11-Jan-2018 Hall Liu <hallliu@google.com> Migrate Telecom tests to JUnit4 am: 74bb635206 am: cb2b1c3098
am: ee93bd0bb1 -s ours

Change-Id: I429714f881d29f4fce8f1ee7353449c0d825c476
43f20c39ffe88a3f326e47c4b6aa7f8a72d175c5 03-Jan-2018 Hall Liu <hallliu@google.com> Parameterize CARSM unit tests

Use JUnit parametrization instead of the roll-our-own parameterization
we had going on. This potentially resolves the flakiness that was going
on before in the CARSM tests.

Test: unit tests
Bug: 69482930
Change-Id: Ib0b99e25eda12f5df862de83bb3291e4e79c5190
ests/Android.mk
ests/AndroidTest.xml
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteTransitionTests.java
ee93bd0bb17f3013d80f0e6b92ec67176fc20706 10-Jan-2018 Hall Liu <hallliu@google.com> Migrate Telecom tests to JUnit4 am: 74bb635206
am: cb2b1c3098

Change-Id: I2ebc76d77009b9d89500423594000d8e784b9612
cb2b1c30985a9b3afa65f6ea477c0ab03e36aabd 10-Jan-2018 Hall Liu <hallliu@google.com> Migrate Telecom tests to JUnit4
am: 74bb635206

Change-Id: I735c86f5e8ee41a47eb1ffb2e457acfab8611b99
707d729699d61bfac2cc7a3b9b5c3d1f9431b7c6 10-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4535700 from d894101d40e4947522b3e3bdf7e30078aad28656 to pi-release

Change-Id: Ic8fe37545845ba5be8431c51df1f8fea7ec3faba
dca551166c8686eadb6bc9659a8221b3049c4b07 10-Jan-2018 Hall Liu <hallliu@google.com> Reset speakerphone at beginning and end of calls am: 0814db7bf1 -s ours
am: ffb1179864 -s ours

Change-Id: Icf006c79208f0d7c0736649b3148dcf3d471d382
ffb117986462c7401bbfcd9d98f7966dbb28473a 10-Jan-2018 Hall Liu <hallliu@google.com> Reset speakerphone at beginning and end of calls
am: 0814db7bf1 -s ours

Change-Id: I3caec02a4b69699993b6bc825d2c05902b2afa28
74bb635206f94e6846810d9dcbd41d56c07f24f7 28-Dec-2017 Hall Liu <hallliu@google.com> Migrate Telecom tests to JUnit4

Change all tests to use AndroidJUnitRunner instead of
InstrumentationRunner.
TelecomTestCase no longer inherits from AndroidTestCase.
Update the lite_test_telecom script to use JUnit4.

This allows Telecom tests to use modern JUnit4 features. Refactorings
along those lines will be in subsequent CLs.

Bug: 69482930
Test: lite_test_telecom -a
Change-Id: I64a41fa049f2a23f28b7652d7b835d7705e2179a
Merged-In: I64a41fa049f2a23f28b7652d7b835d7705e2179a
cripts/telecom_testing.sh
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/AsyncBlockCheckFilterTest.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
ests/src/com/android/server/telecom/tests/CallAudioManagerTest.java
ests/src/com/android/server/telecom/tests/CallAudioModeStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallExtrasTest.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/CallScreeningServiceFilterTest.java
ests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFocusManagerTest.java
ests/src/com/android/server/telecom/tests/ContactsAsyncHelperTest.java
ests/src/com/android/server/telecom/tests/CreateConnectionProcessorTest.java
ests/src/com/android/server/telecom/tests/DefaultDialerCacheTest.java
ests/src/com/android/server/telecom/tests/DirectToVoicemailCallFilterTest.java
ests/src/com/android/server/telecom/tests/DtmfLocalTonePlayerTest.java
ests/src/com/android/server/telecom/tests/EventManagerTest.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/tests/IncomingCallFilterTest.java
ests/src/com/android/server/telecom/tests/IncomingCallNotifierTest.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/ProximitySensorManagerTest.java
ests/src/com/android/server/telecom/tests/RingerTest.java
ests/src/com/android/server/telecom/tests/SessionManagerTest.java
ests/src/com/android/server/telecom/tests/SystemStateProviderTest.java
ests/src/com/android/server/telecom/tests/TODO
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
ests/src/com/android/server/telecom/tests/VideoCallTests.java
ests/src/com/android/server/telecom/tests/VideoProfileTest.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
9a944e6582aa6cdabfd7178e66065a5c96a6cf9c 10-Jan-2018 Hall Liu <hallliu@google.com> Merge "Migrate Telecom tests to JUnit4"
0814db7bf10de1c51c7f4bd15b70c6f6eebd5dac 22-Dec-2017 Hall Liu <hallliu@google.com> Reset speakerphone at beginning and end of calls

Always call AudioManager#setSpeakerphoneOn(false) at the beginning and
end of calls.

Bug: 69305994
Bug: 70338906
Test: unit
Change-Id: Ifcd887ca7bdeab8cff8a2773a306548142979238
Merged-In: Ifcd887ca7bdeab8cff8a2773a306548142979238
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
d894101d40e4947522b3e3bdf7e30078aad28656 10-Jan-2018 Jack He <siyuanh@google.com> HFP: Add isInbandRingingEnabled() API (4/4) am: f8c23ee606 am: 73bceb0b3e
am: add2914ffa

Change-Id: I1155cdb74a6db26104fd296f56d24a82418b8a3d
add2914ffa6458ac5b2cbe6ce63f3773eb02234f 10-Jan-2018 Jack He <siyuanh@google.com> HFP: Add isInbandRingingEnabled() API (4/4) am: f8c23ee606
am: 73bceb0b3e

Change-Id: If1378b7553a3bbbe76bd543a930dbcdca94065a9
73bceb0b3e5ecc81fda89b407ff1287d77df7da1 10-Jan-2018 Jack He <siyuanh@google.com> HFP: Add isInbandRingingEnabled() API (4/4)
am: f8c23ee606

Change-Id: I408cbaf860a7c99d928523eb4de0f1690ac20b42
c8a396be8aae0609e4953add63952acc2ca8f871 28-Dec-2017 Hall Liu <hallliu@google.com> Migrate Telecom tests to JUnit4

Change all tests to use AndroidJUnitRunner instead of
InstrumentationRunner.
TelecomTestCase no longer inherits from AndroidTestCase.
Update the lite_test_telecom script to use JUnit4.

This allows Telecom tests to use modern JUnit4 features. Refactorings
along those lines will be in subsequent CLs.

Bug: 69482930
Test: lite_test_telecom -a
Change-Id: I64a41fa049f2a23f28b7652d7b835d7705e2179a
cripts/telecom_testing.sh
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/AsyncBlockCheckFilterTest.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
ests/src/com/android/server/telecom/tests/CallAudioManagerTest.java
ests/src/com/android/server/telecom/tests/CallAudioModeStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallExtrasTest.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/CallScreeningServiceFilterTest.java
ests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFocusManagerTest.java
ests/src/com/android/server/telecom/tests/ContactsAsyncHelperTest.java
ests/src/com/android/server/telecom/tests/CreateConnectionProcessorTest.java
ests/src/com/android/server/telecom/tests/DefaultDialerCacheTest.java
ests/src/com/android/server/telecom/tests/DirectToVoicemailCallFilterTest.java
ests/src/com/android/server/telecom/tests/DtmfLocalTonePlayerTest.java
ests/src/com/android/server/telecom/tests/EventManagerTest.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/tests/IncomingCallFilterTest.java
ests/src/com/android/server/telecom/tests/IncomingCallNotifierTest.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/ProximitySensorManagerTest.java
ests/src/com/android/server/telecom/tests/RingerTest.java
ests/src/com/android/server/telecom/tests/SessionManagerTest.java
ests/src/com/android/server/telecom/tests/SystemStateProviderTest.java
ests/src/com/android/server/telecom/tests/TODO
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
ests/src/com/android/server/telecom/tests/VideoCallTests.java
ests/src/com/android/server/telecom/tests/VideoProfileTest.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
7e84401609d62bdf0e07bc794b6d48268a8c4f53 10-Jan-2018 Pengquan Meng <mpq@google.com> Merge changes from topic "telecom-3p-cherry-pick" am: 876223c656 am: 0cd056fc9e
am: 474e3cdf24 -s ours

Change-Id: Id9ed34e083ac9d1b11c51c5a396dd1743ee2d013
f8c23ee6069b90c791f4a94448a7bf7a6a7ada4e 06-Jan-2018 Jack He <siyuanh@google.com> HFP: Add isInbandRingingEnabled() API (4/4)

* Use BluetoothHeadset.isInbandRingingEnabled() API to check whether
in-band ringing is currently enabled in the system when deciding on
audio routes for ringtone

Bug: 71646213
Test: make, toggle in-band ringing from Development Settings and observe
whether Telecom service tries to open SCO when there is an
incoming call

Change-Id: I2657102b5239f52d64f2f82d9b45f712c28bdba7
rc/com/android/server/telecom/BluetoothHeadsetProxy.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
474e3cdf24981cac81b7ef23aab89cdca7651d03 10-Jan-2018 Pengquan Meng <mpq@google.com> Merge changes from topic "telecom-3p-cherry-pick" am: 876223c656
am: 0cd056fc9e

Change-Id: Iea9913b3039d234e9777ee66691552e5835961c5
0cd056fc9e3f9424a2a9e351316450b5f951aef1 10-Jan-2018 Pengquan Meng <mpq@google.com> Merge changes from topic "telecom-3p-cherry-pick"
am: 876223c656

Change-Id: Ib953ab968282d85675a30d4d4d64090b24a35376
876223c656658d2f99278cf2184f4460c42d7a1d 09-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge changes from topic "telecom-3p-cherry-pick"

* changes:
Add connection service focus manager
Add focus api callback to ConnectionServiceWrapper
Add connection service focus api to the fake CS
a79235aa096554b40f8c78d7870d2515d8f2ad7d 09-Jan-2018 Brad Ebinger <breadley@google.com> Merge "Remove MD5 hash initialization for logging" am: 276e63416b am: aae89f9f4d
am: e63bcbb424

Change-Id: Id607fdb4aa2084d69d642c57152b2be842d9e260
f039bd3b8589ab89cc24839af1a4a22bffaf21bc 09-Jan-2018 Scott Randolph <randolphs@google.com> Earpiece availability from audio config (vs hard coded) am: 1b97fdd50c am: 8f35d0246b
am: 5a8c495c7e

Change-Id: Id9ec47c560b6265203ab645672c625c57cf730f4
e63bcbb42478fbe029ccb284615774a1238efd29 09-Jan-2018 Brad Ebinger <breadley@google.com> Merge "Remove MD5 hash initialization for logging" am: 276e63416b
am: aae89f9f4d

Change-Id: I1a9a54b5cfea7f15c50b96fa9c8b84e5af168a6a
5a8c495c7edbe79f8e878fc017516779a1ce7fdb 09-Jan-2018 Scott Randolph <randolphs@google.com> Earpiece availability from audio config (vs hard coded) am: 1b97fdd50c
am: 8f35d0246b

Change-Id: Id0d9c17659c2065aabed3390a895ecc60429ae63
aae89f9f4d93718a5161ab01fa4eac86d4675858 09-Jan-2018 Brad Ebinger <breadley@google.com> Merge "Remove MD5 hash initialization for logging"
am: 276e63416b

Change-Id: I87302debdf12811e58f105e28f31ad97e9ee099e
276e63416bb973154ff10174b096d4ed5e822ac1 09-Jan-2018 Brad Ebinger <breadley@google.com> Merge "Remove MD5 hash initialization for logging"
d7f92cf525d65af364f3b6be76f3935b609aa608 22-Nov-2017 Pengquan Meng <mpq@google.com> Add connection service focus manager

This changed introduce the ConnectionServiceFocusManager to maintain the
focus status of ConnectionService. When a ConnectionService gained the
focus, it can request the call resource. Also, the ConnectionService
should release the call resource when it lost the focus.

design doc: go/android-telecom-3p-enhancements

Bug: 69651192
Test: unit test

Change-Id: Iea7b4bfd896753ea9d6f399ba341e36150e4e621
Merged-In: Iea7b4bfd896753ea9d6f399ba341e36150e4e621
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFocusManagerTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
4845c9bc370433ae34533a21d7a3d7de8deaf465 01-Dec-2017 Pengquan Meng <mpq@google.com> Add focus api callback to ConnectionServiceWrapper

This add a default focus api callback to ConnectionServiceWrapper to
avoid the compiled error.

Bug: 69651192
Test: manually

Change-Id: I3e0f8c4cd166afbd2d82940c61f4567c407ae178
Merged-In: I3e0f8c4cd166afbd2d82940c61f4567c407ae178
rc/com/android/server/telecom/ConnectionServiceWrapper.java
1952a36d0f29ec9e880d5228ba40a52def1af437 05-Dec-2017 Pengquan Meng <mpq@google.com> Add connection service focus api to the fake CS

This added a default implementation of connection service focus api to
the fake ConnectionService to avoid the compiled error.

Bug: 69651192
Test: manual

Change-Id: I01ecc7f6a89f0d3794edd51f939a85d9a113a703
Merged-In: I01ecc7f6a89f0d3794edd51f939a85d9a113a703
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
8f35d0246ba7c0470453e0a2d7a63b3c7590f149 09-Jan-2018 Scott Randolph <randolphs@google.com> Earpiece availability from audio config (vs hard coded)
am: 1b97fdd50c

Change-Id: I90d12f9372ee275510a141550fef90ee0be0e0d5
1b97fdd50c369ac375d6c18e10e023346ccebc93 02-Nov-2017 Scott Randolph <randolphs@google.com> Earpiece availability from audio config (vs hard coded)

Teach the call routing state machine to respect the available hardware
devices instead of hard coding based on target platform when deciding if
an earpiece is avaiable. Updates the tests which relied on hard coded
values to work with the new calling convention.

Note that serval approaches to mocking the AudioManager were tried that
would have allowed removal of the extra constructor parameter updated in
this CL and used only for testability. All were thwarted by private
final classes.

Test results: Ran 17 tests for TelecomUnitTests. 17 passed, 0 failed

Bug: 65614292
Test: bit TelecomUnitTests:CallAudioRouteStateMachineTest
Change-Id: Icdb9a03cefd3e4d399fe8cd878c61524e1000d95
(cherry picked from commit 8aba9d666d449ec9b053824c1076d1f599cfd093)
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
b3741e221a5be1662643a081b8b383f39c257ace 07-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4531101 from 4045bc174e6f76ddd299491597be7085067895dd to pi-release

Change-Id: Ib9afcdee1462a795fb1ad8a43559b30bdc96b3d0
4045bc174e6f76ddd299491597be7085067895dd 05-Jan-2018 Honggang <honggang.x.luo@sonymobile.com> Merge "Fix issue that the disconnect tone doesn't sound from BTHS" am: 0a17b57d1c am: fef8b02b63
am: 99ba29fd35

Change-Id: I6376c69016d82af6dfd558b73192ea0270bb9b8f
99ba29fd35d43d44b0181227833266c7fc2d6001 05-Jan-2018 Honggang <honggang.x.luo@sonymobile.com> Merge "Fix issue that the disconnect tone doesn't sound from BTHS" am: 0a17b57d1c
am: fef8b02b63

Change-Id: Ia38edac1b704a8c802c7221cbd972be07644ee5c
fef8b02b63d25e97b2cfe3b47f65fd8f23676853 05-Jan-2018 Honggang <honggang.x.luo@sonymobile.com> Merge "Fix issue that the disconnect tone doesn't sound from BTHS"
am: 0a17b57d1c

Change-Id: I99fd5ea475baa5b16c698de596169994d224f9fd
0a17b57d1ccbb1e8c91f3be2ddccebc41e4b98d3 05-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix issue that the disconnect tone doesn't sound from BTHS"
91b653fd94d71b3534a463168a0983cb87797375 04-Jan-2018 Zheng Zhang <zhzh@google.com> Set Telecom PendingIntent as FLAG_UPDATE_CURRENT am: 9dc2bd84ad am: 8191b52509
am: 79ade239ab

Change-Id: I599d7dfd932df03923be806aca4b664611ec1f2d
79ade239ab6eb4945ec5d49e785412dcc868f5d5 04-Jan-2018 Zheng Zhang <zhzh@google.com> Set Telecom PendingIntent as FLAG_UPDATE_CURRENT am: 9dc2bd84ad
am: 8191b52509

Change-Id: I618a4fdea0b0bbd1e5b504da1110e3e2f6dc23bb
8191b525091eeb31aaa87cbc2f01d31c945f6af8 04-Jan-2018 Zheng Zhang <zhzh@google.com> Set Telecom PendingIntent as FLAG_UPDATE_CURRENT
am: 9dc2bd84ad

Change-Id: I2052c12c903843543d8f85c343df217c96e1c595
9dc2bd84ad90b26a03b23a0a7efcf9dab745c785 04-Jan-2018 Zheng Zhang <zhzh@google.com> Set Telecom PendingIntent as FLAG_UPDATE_CURRENT

In some cases, we may need handle the pending intent in more flexible
ways. The old flag FLAG_CANCEL_CURRENT would cause CanceledException.
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
2947c4642bed550c6aa1d171e360080d1ea9aef0 28-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4519870 from 1f4760e4fb0bd4e2d80b7ff7ec06c82b754ee085 to pi-release

Change-Id: I06e710fc6324fc33edad94e7624dab98a989bf3f
1f4760e4fb0bd4e2d80b7ff7ec06c82b754ee085 27-Dec-2017 Hall Liu <hallliu@google.com> Merge "Reset speakerphone at beginning and end of calls" am: f2910c6993 am: 322d648197
am: 21324c3bdb

Change-Id: Iab2f273be640b8c99e075fb609d2dc819796c950
21324c3bdb812e02b36583268099ae3aee4e22e8 27-Dec-2017 Hall Liu <hallliu@google.com> Merge "Reset speakerphone at beginning and end of calls" am: f2910c6993
am: 322d648197

Change-Id: I9df50b75871e1676c2841f05648accb7e1043bb3
322d648197fb0489a14b6a054be86b1264c0867e 27-Dec-2017 Hall Liu <hallliu@google.com> Merge "Reset speakerphone at beginning and end of calls"
am: f2910c6993

Change-Id: Ide94b15965c0231291e993dd79fe99261283483f
f2910c69932cb927ff82f8d5519830bcd05a544e 27-Dec-2017 Hall Liu <hallliu@google.com> Merge "Reset speakerphone at beginning and end of calls"
b3ccbb31fc30056ba45559659391313c27605cab 31-May-2016 Honggang <honggang.x.luo@sonymobile.com> Fix issue that the disconnect tone doesn't sound from BTHS

When the call is disconnected, the BTHF state is changed to IDLE and
SCO connection is disconnected before playing disconnect tone. So the
disconnect tone can't be sound from BTHS.

Add DISCONNECTED state for HFP and keep the state until disconnect tone
sounds from BT.

Test: manual - Checked whether the disconnect tone is sound from the
BTHS
Test: auto - Passed BluetoothPhoneServiceTest
Bug: 69645337

Change-Id: I6deca4ccee97b8b1a50c491810d2b75f6741c0e9
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
a3b5b849939318161c9b2e926ca5dfc478866815 24-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4517567 from 474b4d3450e2cc8ca87efc8a6f680bce2b25d8df to pi-release

Change-Id: I548e9440ed084f1f5a17006914c7b49e6db17763
70da38f5aa5bd4ade6af7492b3b3c40fb9a38359 22-Dec-2017 Brad Ebinger <breadley@google.com> Remove MD5 hash initialization for logging

Removes the MD5 hash initialization method
for logging in Telephony.

Test: Manual
Bug: 67823981
Change-Id: I46f2e927d5633b20eac06115cb7faddb862bcef8
rc/com/android/server/telecom/LogUtils.java
3c9edd1dfa3d3a4f4b8ce6922efcf94232367622 22-Dec-2017 Hall Liu <hallliu@google.com> Reset speakerphone at beginning and end of calls

Always call AudioManager#setSpeakerphoneOn(false) at the beginning and
end of calls.

Bug: 69305994
Bug: 70338906
Test: unit
Change-Id: Ifcd887ca7bdeab8cff8a2773a306548142979238
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
474b4d3450e2cc8ca87efc8a6f680bce2b25d8df 21-Dec-2017 Hall Liu <hallliu@google.com> Set RTT flag while logging call am: 3a75c622db am: 06541e04d9
am: adcfb0a7c9

Change-Id: I22ae8800b926cd1d118e56e0659e6f6d098f15d4
adcfb0a7c9a8a1eba4597aee01e5c09b02a66cd3 21-Dec-2017 Hall Liu <hallliu@google.com> Set RTT flag while logging call am: 3a75c622db
am: 06541e04d9

Change-Id: I9d94369ce2025ab33d7d6d1498f481d26d2dfe18
06541e04d96f14e5f571d6324e93cf4b2ba0d21c 21-Dec-2017 Hall Liu <hallliu@google.com> Set RTT flag while logging call
am: 3a75c622db

Change-Id: I1e1c426bdfdff5e6da5d959d9bbb196591fb977e
82f42a9a0693d54149f362d228027b517cdb3a19 21-Dec-2017 Tyler Gunn <tgunn@google.com> Reset audio route when self-managed calls are disconnected. am: 911d4de7b3 am: 47bc46e9a8
am: f502000e25

Change-Id: Ie115efcc5c0f9a1f25170ae7ef522a2b00d85440
3a75c622dba50cc6990dec8c0e46baa137794529 21-Nov-2017 Hall Liu <hallliu@google.com> Set RTT flag while logging call

If the call was an RTT call at any point, set the flag when logging to
the call log.

Test: make test call and check calllog.db
Bug: 63934808
Change-Id: I247f2383c37e3f8d8108a68d8f217af1874d2901
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallLogManager.java
f502000e2556b98c9bd53a5e802e683a2f4113b9 21-Dec-2017 Tyler Gunn <tgunn@google.com> Reset audio route when self-managed calls are disconnected. am: 911d4de7b3
am: 47bc46e9a8

Change-Id: I655283875b2ab53326c567641597bb3de231297e
47bc46e9a8bc5907bb39c4dd4a9db52a2da9dfee 21-Dec-2017 Tyler Gunn <tgunn@google.com> Reset audio route when self-managed calls are disconnected.
am: 911d4de7b3

Change-Id: Ice86f4b15195e08b42e3d4d10d5d3517c685bbbe
debedb6ec4f3d4ca7fbf5fab5e9dd032383d58e6 21-Dec-2017 Sanket Padawe <sanketpadawe@google.com> Implement receiver side call handover api. am: 29411c95d0 am: bb0fac753a
am: 20566154ab -s ours

Change-Id: Ie8aba9b9bf5eb2b73620db2543e5603e08a5c203
20566154ab8db66624b73d006940e40705ed237e 21-Dec-2017 Sanket Padawe <sanketpadawe@google.com> Implement receiver side call handover api. am: 29411c95d0
am: bb0fac753a

Change-Id: I87b3563746e977e81a14970b9f9dba32a6cdce23
911d4de7b37bdf3f1b987aef2840ac9e530ccbf2 19-Dec-2017 Tyler Gunn <tgunn@google.com> Reset audio route when self-managed calls are disconnected.

When self-managed calls are disconnected to make way for a new managed
call, ensure we switch back to the baseline audio route. Although audio
routing is considered across all connection services, it is counter
intuitive to the user to be in a speakerphone call (for example) in a
self-managed app and then to have a newly place managed call which
replaces it also route over speakerphone. We solve this by ensuring that
the audio route switches back to baseline whenever we disconnect all
self-managed calls in order to place a new managed call. This is
especially important when the user places an emergency call that causes
self-managed calls to disconnect.

Test: Manual test with ril.ecclist; added new unit test to cover this case.
Bug: 70640139
Change-Id: I28100410fe674fe75dc7ddd6d92e968e5970aef4
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
bb0fac753ad2e6bf5983768b069430e04e721b64 21-Dec-2017 Sanket Padawe <sanketpadawe@google.com> Implement receiver side call handover api.
am: 29411c95d0

Change-Id: I312ef711b0c9e22788cebf6fcbe674594bd98e3d
da2da5c63a76d2a3435547efe40e7774eaf355ef 20-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4511918 from d3518105e62fd20d13dac94eeb8a1a48498b7bad to pi-release

Change-Id: I43dee449323062cd86f5f3bd2a028ff996609aa9
29411c95d0a0fe3fe84a460934fe89078327311e 01-Dec-2017 Sanket Padawe <sanketpadawe@google.com> Implement receiver side call handover api.

Bug: 65415068
Test: Manual

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#

Change-Id: I22cb1bc00c19ed1e4cf4b10baf5c0f661365785a
Merged-in: I22cb1bc00c19ed1e4cf4b10baf5c0f661365785a
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
af9efc7e2eddb2a10dd683e4085410acd14ccbcf 20-Dec-2017 Sanket Padawe <sanketpadawe@google.com> Implement Call handover initiation side APIs. am: 4ebc3ca2fe am: b33da09410
am: edc7bb89cf -s ours

Change-Id: I565210f8c0bd2b9f0c54f4b58cb66fe0ee7a67c5
edc7bb89cf1d0cb672bb2bcc0c790c1c09a90334 20-Dec-2017 Sanket Padawe <sanketpadawe@google.com> Implement Call handover initiation side APIs. am: 4ebc3ca2fe
am: b33da09410

Change-Id: I02e6d0e80bdf6f65c1e6f53686c239c5a87dbcc8
b33da094104ba0979c718da11d790bac4104826a 20-Dec-2017 Sanket Padawe <sanketpadawe@google.com> Implement Call handover initiation side APIs.
am: 4ebc3ca2fe

Change-Id: I81e6b391e889846a95d3f8b665b4d0e94fa7aac0
4ebc3ca2fe1b0b3b5bf3afb8ca3935e6b9221629 21-Nov-2017 Sanket Padawe <sanketpadawe@google.com> Implement Call handover initiation side APIs.

Bug: 65415068
Test: Manual

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#

Change-Id: I9f67f63c2ed0d20dfd4a96c8c33f5e2d8ed11406
Merged-in: I9f67f63c2ed0d20dfd4a96c8c33f5e2d8ed11406
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
d3518105e62fd20d13dac94eeb8a1a48498b7bad 19-Dec-2017 Pengquan Meng <mpq@google.com> Merge "Add connection service focus manager"
1e49145fc157617bd8fc9363f533b025c9f89973 19-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4509671 from 5263f52a7d33e19090f0b02d1a034bfc14efcad2 to pi-release

Change-Id: I1b5cbc8ae7a42281ed9dc5c698d9b2bab03b0911
b1a11c8c6ea25aa7f36c8d3f5dcb33294e622232 22-Nov-2017 Pengquan Meng <mpq@google.com> Add connection service focus manager

This changed introduce the ConnectionServiceFocusManager to maintain the
focus status of ConnectionService. When a ConnectionService gained the
focus, it can request the call resource. Also, the ConnectionService
should release the call resource when it lost the focus.

design doc: go/android-telecom-3p-enhancements

Bug: 69651192
Test: unit test

Change-Id: Iea7b4bfd896753ea9d6f399ba341e36150e4e621
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ConnectionServiceFocusManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFocusManagerTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
5263f52a7d33e19090f0b02d1a034bfc14efcad2 18-Dec-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Iaa78ae23b987ad9087b0a175cc74dfc84f7e96c8
Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
441a40546b1085e34ed30dc6b3dc4133d708aa83 17-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4507345 from f00cb8c6bf49f59b22fe40a9519b4e3f7ef2b2a7 to pi-release

Change-Id: I591a630bca0b42e58149d1a70509db892260e1da
f00cb8c6bf49f59b22fe40a9519b4e3f7ef2b2a7 15-Dec-2017 Philip P. Moltmann <moltmann@google.com> Switch to modern ArgumentMatchers am: 3168f6ad52 am: 62b592c9f2
am: d29a2698af

Change-Id: I3d2547c2df6f2baab3f67afca1a18e556d28dd84
d29a2698afc1952eed68c3015242735eda77d4fb 15-Dec-2017 Philip P. Moltmann <moltmann@google.com> Switch to modern ArgumentMatchers am: 3168f6ad52
am: 62b592c9f2

Change-Id: Ie8c018821da8b676522130a82adc4a8085fd83ba
62b592c9f2d80bdf0a3010062320968ccaeda1a0 15-Dec-2017 Philip P. Moltmann <moltmann@google.com> Switch to modern ArgumentMatchers
am: 3168f6ad52

Change-Id: Iae9ca74111abb94c5a81b4ee38817d430863a4b0
3168f6ad52c588ee273ba154f142314b6b9009f8 23-Nov-2017 Philip P. Moltmann <moltmann@google.com> Switch to modern ArgumentMatchers

Test: adb shell am instrument -w -e class com.android.server.telecom.tests.TelecomServiceImplTest com.android.server.telecom.tests/android.test.InstrumentationTestRunner

Change-Id: Ie36e8f5ab02e805eb4a2e58d02b1906b042385e7
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
89d23c32c095a5b63629c4894cbda41bb83ebd36 14-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4502278 from 10dc34afed706d8907c86378afc451145b1f22b4 to pi-release

Change-Id: Ied70533e0d8ac6b49d5b82fb09d2310d4cdccabe
10dc34afed706d8907c86378afc451145b1f22b4 14-Dec-2017 Philip P. Moltmann <moltmann@google.com> Merge "Switch to modern ArgumentMatchers"
fa50a2074d610dd24fa8a3b814dfd403bd1aea93 13-Dec-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Implement receiver side call handover api."
848b05357db26138e174c2cc5fbadd92fcba120a 13-Dec-2017 Ravi Paluri <rpaluri@codeaurora.org> Merge "IMS-VT: Refresh Add call option when Video call downgrades to VoLTE" am: 69aaa09507 am: 56bffcc841
am: cc588ab607

Change-Id: Ie0b4af20b1ff0f3bf3cc64bc6064d44b01a9cf26
cc588ab6070dd379b2a408fb4fc5bf2ce1ccdb56 13-Dec-2017 Ravi Paluri <rpaluri@codeaurora.org> Merge "IMS-VT: Refresh Add call option when Video call downgrades to VoLTE" am: 69aaa09507
am: 56bffcc841

Change-Id: I9733fc810f26a8b19ce26a735ea9122f4e06ac9b
56bffcc841772aa0be836724c2f8a69525dadb87 13-Dec-2017 Ravi Paluri <rpaluri@codeaurora.org> Merge "IMS-VT: Refresh Add call option when Video call downgrades to VoLTE"
am: 69aaa09507

Change-Id: Ib67007a5418b972a7099c9783e8cfbe29afa810d
69aaa095079b206a01fd94ad7c5540ac289d174b 13-Dec-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "IMS-VT: Refresh Add call option when Video call downgrades to VoLTE"
0e9290d43f656375f16a0797e74b9527cc4d4b17 13-Dec-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
2c9d5117840635c9fa7ab0f7d47bddca9ab63245 13-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4500033 from d5352fd588568624aecac65c48d5ae16c4826f0d to pi-release

Change-Id: I579a23b8930f59d464bb9a5c9f1bd3983a2839e8
d5352fd588568624aecac65c48d5ae16c4826f0d 13-Dec-2017 Eric Erfanian <erfanian@google.com> Add assisted dialing feature propogation to call log. am: 0729486454 am: 1d70ce52d1 -s ours
am: 8b46fbbc10 -s ours

Change-Id: I2019c7edeab67ff2088e94a1139dc75d97cbce4d
8b46fbbc10791031a75d32f2596ba1d2a198865f 13-Dec-2017 Eric Erfanian <erfanian@google.com> Add assisted dialing feature propogation to call log. am: 0729486454
am: 1d70ce52d1 -s ours

Change-Id: I6346f378538bafe1fe36339fbe120eccd2279b04
1d70ce52d13107d877960c1aa6fc363d32ad56c5 13-Dec-2017 Eric Erfanian <erfanian@google.com> Add assisted dialing feature propogation to call log.
am: 0729486454

Change-Id: I88a8486c1d082b518ed55d3446d31e4b5efaa163
91ef32e2ec7cf0db59dbe2be6ec519096b2717e3 13-Dec-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I89f98eb39c664737399c8a2e41a77aef7589665d
Auto-generated-cl: translation import
es/values-bs/strings.xml
es/values-mr/strings.xml
bb93f1b61c042f728b5f4e414ebc6ba26d17e1da 23-Nov-2017 Philip P. Moltmann <moltmann@google.com> Switch to modern ArgumentMatchers

Test: adb shell am instrument -w -e class com.android.server.telecom.tests.TelecomServiceImplTest com.android.server.telecom.tests/android.test.InstrumentationTestRunner

Change-Id: Ie36e8f5ab02e805eb4a2e58d02b1906b042385e7
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
07294864544f27bdca0fd8d429d083d9b4d4d7da 07-Dec-2017 Eric Erfanian <erfanian@google.com> Add assisted dialing feature propogation to call log.

Adds the mapping between the connection property and the call feature.

This is a manual merge of:
I078a4cdcdce0455dbdbf825c89008b24bbb1b22b

Test: None.

Unfortunately there doesn't look like a good way to stub
connection properties.

Bug: 35963245
Change-Id: I8885e2e76ceab443eb0962c796cabaef12833d36
Merged-In: I078a4cdcdce0455dbdbf825c89008b24bbb1b22b
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/ParcelableCallUtils.java
306f915fd3281c1c0d082d8c7fc1e08accefa690 01-Dec-2017 Sanket Padawe <sanketpadawe@google.com> Implement receiver side call handover api.

Bug: 65415068
Test: Manual

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#

Change-Id: I22cb1bc00c19ed1e4cf4b10baf5c0f661365785a
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
12a2be58602e11ed15d6ebf40cd1753b8bd0f933 11-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4496165 from b1bfdc948dbc523f8652009d678185d44775a743 to pi-release

Change-Id: Idf0cc5add3448bc2687d682ba192b8d535a3301e
b1bfdc948dbc523f8652009d678185d44775a743 08-Dec-2017 Eric Erfanian <erfanian@google.com> Add assisted dialing feature propogation to call log. am: ae4cd3df75 -s ours
am: 2130592071 -s ours

Change-Id: I4d8c3add669706fc413d07206f138b84a45eb397
2130592071363eebf5226a8f57829f7de75f89a1 08-Dec-2017 Eric Erfanian <erfanian@google.com> Add assisted dialing feature propogation to call log.
am: ae4cd3df75 -s ours

Change-Id: Iab3bd9b91a60de5889d7ac18f6d2438092a0d185
9683d7b385c4f2a85ad455a9d350d11efae8c30f 08-Dec-2017 Eric Erfanian <erfanian@google.com> Add assisted dialing feature propogation to call log.
am: 22a5896f94

Change-Id: Ibc37484981ab6575ec285777a77769693bcfec89
ae4cd3df758ac157a7d59001feea5930f575fe6e 07-Dec-2017 Eric Erfanian <erfanian@google.com> Add assisted dialing feature propogation to call log.

Adds the mapping between the connection property and the call feature.

Test: None.

Unfortunately there doesn't look like a good way to stub
connection properties.

Bug: 35963245
Merged-In: I078a4cdcdce0455dbdbf825c89008b24bbb1b22b
Change-Id: I7db23c82754862bbcb44e636cd69d7b00022c0c3
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/ParcelableCallUtils.java
22a5896f94bc2df3bb3f2760039379e4b90dfd24 07-Dec-2017 Eric Erfanian <erfanian@google.com> Add assisted dialing feature propogation to call log.

Adds the mapping between the connection property and the call feature.

This is a manual merge of:
I7db23c82754862bbcb44e636cd69d7b00022c0c3

Test: None.

Unfortunately there doesn't look like a good way to stub
connection properties.

Bug: 35963245
Change-Id: I078a4cdcdce0455dbdbf825c89008b24bbb1b22b
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/ParcelableCallUtils.java
b6fb41a53a50fd39c82ab7eafa423a06ca406ebe 08-Dec-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Migrate Telecom to aapt2."
0fac73448bbd0551d3934fc13b38f9759b76b1e1 07-Dec-2017 Xin Li <delphij@google.com> DO NOT MERGE: Merge Oreo MR1 into master am: b15359e4ad -s ours am: 813958e9a2
am: 3b60d3302b -s ours

Change-Id: Ie0efc7df13209b9028e2be7fc44ce84cc98aead2
03c84df4612e8dac0ddbb768cd89eafcd1d7df69 07-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4489599 from 5cd2f04649c5e109f7c0dea05bbf41fc063be5a5 to pi-release

Change-Id: I3a19997f897d3e8113c1fe2390c9372304b79432
3b60d3302b4c9b8be4f24854b2d05fd7210a65e8 07-Dec-2017 Xin Li <delphij@google.com> DO NOT MERGE: Merge Oreo MR1 into master am: b15359e4ad -s ours
am: 813958e9a2

Change-Id: Ib67896eb7ea32053b92b40489b55bd0586ce5070
813958e9a26124f07326acaafb0774bfbd196b35 07-Dec-2017 Xin Li <delphij@google.com> DO NOT MERGE: Merge Oreo MR1 into master
am: b15359e4ad -s ours

Change-Id: Ic3e3f70346ed98ff2c44ef1fb20d0e2c9a742581
2c40ffc63e6dfc2d2eb6c19fda9759d2c319bdce 06-Dec-2017 Aurimas Liutikas <aurimas@google.com> Migrate Telecom to aapt2.

Test: make -j
Change-Id: I5306d72b2b37ed97b25edde4d032ef194be2df4f
ndroid.mk
ests/Android.mk
b15359e4adac1c9ab13eb1193433db241bf2472a 06-Dec-2017 Xin Li <delphij@google.com> DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I20bccf3478d41625b1c52e6415b55b852783f138
5cd2f04649c5e109f7c0dea05bbf41fc063be5a5 06-Dec-2017 Paul Duffin <paulduffin@google.com> Merge "Flatten dependency hierarchy of legacy-android-test"
f76f67524dccecf9c9fb2bd8cadfb00ad90c8265 06-Dec-2017 Pengquan Meng <mpq@google.com> Merge "Add connection service focus api to the fake CS"
53d35540aee43d1b97f82ddc117ff186ada4ec03 06-Dec-2017 Pengquan Meng <mpq@google.com> Merge "Add focus api callback to ConnectionServiceWrapper"
34edccc5a1041591eb1c9ffce6194e5a8369fcdd 05-Dec-2017 Paul Duffin <paulduffin@google.com> Flatten dependency hierarchy of legacy-android-test

Previous changes statically included legacy-android-test in preparation
for removing android.test.* and junit.* classes from the android.jar.
Unfortunately, that lead to duplicate classes between APKs and the
bootclasspath which caused build problems (Proguard) and also runtime
problems (when targeting and running on older releases).

Switching from statically including the classes to using the runtime
libraries cannot be done in one step because legacy-android-test is
statically included in libraries which are used in many APKs and so
removing it from those libraries requires that all APKs be updated at
once. Doing that atomically across dozens of projects is not practical.

This change modifies APKS that statically include the
legacy-android-test library indirectly.

* If the APK manifest uses the android.test.runner library then the APK
is modified to stop statically including legacy-android-test and
instead build against android.test.base/mock/runner libraries instead.

* Otherwise, the APK statically includes legacy-android-test.

Also, any libraries that statically include are modified to stop
statically including it and if it has source dependencies on the classes
is changed to build against the android.test.base/mock/runner libraries.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
Replaced 'legacy-android-test' with 'android.test.base' and
'android.test.runner' in LOCAL_JAVA_LIBRARIES because
TelecomUnitTests's source depends on their classes. The classes do
not need to be statically included because the classes will be
provided by the runtime, either from the default bootclasspath or
from the android.test.runner library that TelecomUnitTests
specifies in its manifest.

Bug: 30188076
Test: make checkbuild
Change-Id: I1e70d88d5c1ed215eee38cd0e420dc487dc27a83
ests/Android.mk
d6ac10d8390cf0378e594593a9dd5a84ad5610c1 05-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4484469 from 6e24cb90fb75ce18467193755c7238d89241877f to pi-release

Change-Id: I32d9a9cb784f8e98aff67b06a1e3813fd7630ba3
6f4a715b91aee5f087d85abfc2557b50bb8442f6 01-Dec-2017 Ravi Paluri <rpaluri@codeaurora.org> IMS-VT: Refresh Add call option when Video call downgrades to VoLTE

"android.telecom.extra.DISABLE_ADD_CALL" extra guards the visibility
of "Add Call" option. The option will not be shown if the extra is
present and vice-versa. When call is downgraded, the extra is removed
but is not refreshing the "Add Call" option. Fix this by refreshing
"Add Call" option when the extra is removed.

Test: Manual
Bug: 70128952
Change-Id: Ie4c34e3d681c763009073ec6afee8e2c1fbdb04b
rc/com/android/server/telecom/CallsManager.java
6e24cb90fb75ce18467193755c7238d89241877f 05-Dec-2017 Scott Randolph <randolphs@google.com> Merge "Earpiece availability from audio config (vs hard coded)"
09572bff5d1c03bea1c6c37c9ea90578b2c9a191 05-Dec-2017 Pengquan Meng <mpq@google.com> Add connection service focus api to the fake CS

This added a default implementation of connection service focus api to
the fake ConnectionService to avoid the compiled error.

Bug: 69651192
Test: manual

Change-Id: I01ecc7f6a89f0d3794edd51f939a85d9a113a703
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
9bbeebd9eac19021f2c6e326666ffb440d830163 04-Dec-2017 Tony Mantler <nicoya@google.com> Merge "Add proguard rules for lifecycle"
abda6d1f28e6fdb44e14d3ad7899eb33ba5e1301 21-Nov-2017 Sanket Padawe <sanketpadawe@google.com> Implement Call handover initiation side APIs.

Bug: 65415068
Test: Manual

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#

Change-Id: I9f67f63c2ed0d20dfd4a96c8c33f5e2d8ed11406
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
883c8f497d55c879e5423e21713204f825ef17bb 01-Dec-2017 Pengquan Meng <mpq@google.com> Add focus api callback to ConnectionServiceWrapper

This add a default focus api callback to ConnectionServiceWrapper to
avoid the compiled error.

Bug: 69651192
Test: manually

Change-Id: I3e0f8c4cd166afbd2d82940c61f4567c407ae178
rc/com/android/server/telecom/ConnectionServiceWrapper.java
744713d95674368e656516c5ae9e633e6486cf8a 30-Nov-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4476081 from c8ac9865ef16f8d2de472826b05358f5bf1bbc5b to pi-release

Change-Id: I517eda9e4f086971a01f795dfa80bfee31b6950f
8aba9d666d449ec9b053824c1076d1f599cfd093 02-Nov-2017 Scott Randolph <randolphs@google.com> Earpiece availability from audio config (vs hard coded)

Teach the call routing state machine to respect the available hardware
devices instead of hard coding based on target platform when deciding if
an earpiece is avaiable. Updates the tests which relied on hard coded
values to work with the new calling convention.

Note that serval approaches to mocking the AudioManager were tried that
would have allowed removal of the extra constructor parameter updated in
this CL and used only for testability. All were thwarted by private
final classes.

Test results: Ran 17 tests for TelecomUnitTests. 17 passed, 0 failed

Bug: 65614292
Test: bit TelecomUnitTests:CallAudioRouteStateMachineTest
Change-Id: Icdb9a03cefd3e4d399fe8cd878c61524e1000d95
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
c8ac9865ef16f8d2de472826b05358f5bf1bbc5b 30-Nov-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 435af2d798 -s ours
am: 8dcacaa38d -s ours

Change-Id: I8fbe45a345e5d13839217b718a5332359deb8ef9
8dcacaa38d5f6265beebec1a17312341f2f4edab 30-Nov-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 435af2d798 -s ours

Change-Id: I76ca232337d63226693d44ba8a6aaec1a3fa0fc0
435af2d79825ef6a09a20076068fe3e7abfa830f 30-Nov-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I94e590e56eb892e393d5c19adf4ca728b3fba4b0
es/values-ar/strings.xml
es/values-mr/strings.xml
0f020eced032e5175b7a09c4f516dbcba89f169c 30-Nov-2017 Tony Mantler <nicoya@google.com> Add proguard rules for lifecycle

Needed until package moves to aapt2

Bug: 69350851
Bug: 69257739
Test: None
Change-Id: I57c511fa521cbd28f5a621fe5dd444150af3d0f9
roguard.flags
a2fd045d8c2370aa57afce6dbadaf189b6ac3a77 22-Nov-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4464948 from c75d3c0697f61c4f81a69d6b2e690cc619170d7d to pi-release

Change-Id: I179d5cf5970b389e43a7f71935fde501c69c863a
c75d3c0697f61c4f81a69d6b2e690cc619170d7d 21-Nov-2017 Tyler Gunn <tgunn@google.com> Merge "Add volume to logs when call audio route changes." am: f0f43a1c2f am: b414ea406c
am: be79e0ac64

Change-Id: I9fe10597ec1ce74faba1292bade4e0a57ed6985a
be79e0ac64e6f17582111057c77cbea1057b92f7 21-Nov-2017 Tyler Gunn <tgunn@google.com> Merge "Add volume to logs when call audio route changes." am: f0f43a1c2f
am: b414ea406c

Change-Id: I567f0ceb7fde1acf7c82f50ac25c52964823418e
b414ea406c3409d2aac046ce1a390b75767d3366 21-Nov-2017 Tyler Gunn <tgunn@google.com> Merge "Add volume to logs when call audio route changes."
am: f0f43a1c2f

Change-Id: I263a8153ac5cec0bdb17ee9bf8967ce912b6b49b
f0f43a1c2fecc5a26cf5b6470757ceddb58b3e8f 21-Nov-2017 Tyler Gunn <tgunn@google.com> Merge "Add volume to logs when call audio route changes."
8c2d9ea9b0d2faf4c29d514d0b7c0e2b1000e95e 21-Nov-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4462748 from 1ff652409e524a727c9469efffd68624044f4e84 to pi-release

Change-Id: Ia1dc26dabb9761ca195046e6a22599afafaf5e77
1ff652409e524a727c9469efffd68624044f4e84 21-Nov-2017 Tyler Gunn <tgunn@google.com> Merge "Suppress DTMF tone start when a call is already held." am: 948bfab80a am: 57e3827fa1
am: c01cdee127

Change-Id: Ic2526d1701f8901fdfa14a270967f437f2040e6f
c01cdee127d73bd1e4f2160a484dd756fa391c51 21-Nov-2017 Tyler Gunn <tgunn@google.com> Merge "Suppress DTMF tone start when a call is already held." am: 948bfab80a
am: 57e3827fa1

Change-Id: I1464011b18909bdacded952a7fff8ee5a0badd6c
57e3827fa13204d47a4d8288477d2ac2fd296cc1 21-Nov-2017 Tyler Gunn <tgunn@google.com> Merge "Suppress DTMF tone start when a call is already held."
am: 948bfab80a

Change-Id: I66c159687b9352c279f057d3fd92505c93282108
948bfab80a54f6a5aee99fb3049475b8597bcf62 21-Nov-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Suppress DTMF tone start when a call is already held."
9075e09891306e6115f5fa80d87bde21bb67bbea 20-Nov-2017 Hall Liu <hallliu@google.com> Merge "Undo a fix and de-flake a test" am: e5a02966d8 am: 489472b948
am: 45e8e5f761

Change-Id: Ibbde94f0e63ef6ed55b4fbe29a655ffe645ca6a4
45e8e5f76104ce9847eb36a9f451a5f713e74789 20-Nov-2017 Hall Liu <hallliu@google.com> Merge "Undo a fix and de-flake a test" am: e5a02966d8
am: 489472b948

Change-Id: I6dbf3602a4c7c9aaa89d6811ee23e3c9523f9d4f
489472b9481a3b9c854a049d37722d27d63dd782 20-Nov-2017 Hall Liu <hallliu@google.com> Merge "Undo a fix and de-flake a test"
am: e5a02966d8

Change-Id: I1f7d14d2eebee431aafd6c1f38aae8705cc0a321
e5a02966d8fa5369b18356a27c8221638092207f 20-Nov-2017 Hall Liu <hallliu@google.com> Merge "Undo a fix and de-flake a test"
ad97242cf1565c31ce82cc4b8c144729b1e539d9 13-Nov-2017 Tyler Gunn <tgunn@google.com> Suppress DTMF tone start when a call is already held.

It is possible that the Dialer UX can send a DTMF tone start when a call
is already held. Detecting this and skipping the DTMF tone play in that
circumstance.

Test: Manually verified issue; added new unit tests.
Bug: 33771011
Change-Id: Ib063237d768fc2f6c512d81d356ad0874410ce7b
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
54c0d924449d79b4f27b067edaef302a41f05f82 19-Nov-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4459973 from f7c346b0b6ffcb69a22ac0cf9b084bfbaadd11cf to pi-release

Change-Id: I59cc5155d3599684ef10569110da1c673f1085bd
130209c5667523409ec1d907b7e09a42875c0738 18-Nov-2017 Hall Liu <hallliu@google.com> Undo a fix and de-flake a test

* Undo an incorrect fix from previous CL (don't manually select a phone
acct)
* De-flake testOutgoingThenIncomingCalls -- the test apparatus wasn't
properly waiting for the second call to be added to the
InCallServiceFixture.
* Speculative attempt to de-flake CARSM tests

Test: unit
Bug: 69482930
Change-Id: I0ee89f25146e406fe73ceba4005564eeccd50177
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
f7c346b0b6ffcb69a22ac0cf9b084bfbaadd11cf 18-Nov-2017 Hall Liu <hallliu@google.com> Merge "Prevent NewOutgoingCallBroadcast from being sent for self-managed calls." am: af673e9cd2 -s ours am: 35fa16bdd7 -s ours
am: 9322324635 -s ours

Change-Id: I92c758709f97a016e68b6a5e1f401f95aa5b712b
93223246350bf3c0c96d5687e31ffd488916a915 18-Nov-2017 Hall Liu <hallliu@google.com> Merge "Prevent NewOutgoingCallBroadcast from being sent for self-managed calls." am: af673e9cd2 -s ours
am: 35fa16bdd7 -s ours

Change-Id: I2ed6e7c1d648bdb292437852bf4485f380af2148
35fa16bdd73b3df2bd65c5e2eb86d9bfb31467b6 18-Nov-2017 Hall Liu <hallliu@google.com> Merge "Prevent NewOutgoingCallBroadcast from being sent for self-managed calls."
am: af673e9cd2 -s ours

Change-Id: I87ebcbefa866ede0f933822a69ebc65655135663
af673e9cd204f4fc3c4f30989766118e5b32724b 18-Nov-2017 Hall Liu <hallliu@google.com> Merge "Prevent NewOutgoingCallBroadcast from being sent for self-managed calls."
06700f472cdb499603ebb0af4076b57dc6a5b15b 22-Sep-2017 Tyler Gunn <tgunn@google.com> Prevent NewOutgoingCallBroadcast from being sent for self-managed calls.

When sending a self-managed call, prevent the new outgoing call broadcast
from being sent. It realistically has no business being sent for self
managed calls.

Test: Used Duo and Voice APKs to reproduce issue. Verified this fix corrects it.
Bug: 66671858
Merged-In: Ibe3c08fd9190e0b9f5890c3ef5acc6d943febe2e
Change-Id: I7b5272f03bd174100cd2e12641524f4adfc1892f
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
e04538f279e42688207797427665cea7b51aae01 18-Nov-2017 Tyler Gunn <tgunn@google.com> Add volume to logs when call audio route changes.

Adding the ring, call and vt volumes to the logs when switching routes.
E.g.
15:12:23.121 - AUDIO_ROUTE_SPEAKER (Volume: rng=5, call=7, bt=7)
This should help diagnose audio issues in calls.

Test: Manual
Bug: 25023149
Change-Id: I089cb32a8277e1b5c5cb5e76f8a8549195cd3796
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
5264f8c8197a4166fdc196ce58ef29bf99bd9285 17-Nov-2017 Tyler Gunn <tgunn@google.com> Ensure chosen phone account is used if it is valid. am: b8ce2aa67d am: 069eba626c
am: e58946228b

Change-Id: I07f238156a4a2a11fa8e083794dfed3270c29ce0
e58946228b23237522090890b7edd48ee462aa0e 17-Nov-2017 Tyler Gunn <tgunn@google.com> Ensure chosen phone account is used if it is valid. am: b8ce2aa67d
am: 069eba626c

Change-Id: I5848301578fff3c05b6d575db7c44ae64cc94cf5
069eba626cf2ca80b9c7309dd16e9b62258310b1 17-Nov-2017 Tyler Gunn <tgunn@google.com> Ensure chosen phone account is used if it is valid.
am: b8ce2aa67d

Change-Id: I8b3048cf0853f10a18f3a9966e202488f1e3283f
b8ce2aa67dd33416bbea42a848e9d4a8e79b5de2 15-Nov-2017 Tyler Gunn <tgunn@google.com> Ensure chosen phone account is used if it is valid.

When placing an outgoing call if a phone account is specified, there was
an issue where a list of all potential phone accounts would be returned
instead of just the one the user chose. Fixed this.

Test: Added unit test, ran broken CTS test.
Bug: 69338480
Change-Id: I81dd73cb80df463217140d8a8087cf4140084b28
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
67b62dcde74ffa97a8e0dc5d2dd0d33c65e91b41 17-Nov-2017 Tyler Gunn <tgunn@google.com> Fix NPE in TelecomManager#isOutgoingCallAllowed am: 153aafa86c am: 0ad2ed8eb9
am: eda744d5a4

Change-Id: I255abd6efa0a2029db2df37f1a7e200b5d346121
eda744d5a421a982f8112753ec4452d3af37fc91 17-Nov-2017 Tyler Gunn <tgunn@google.com> Fix NPE in TelecomManager#isOutgoingCallAllowed am: 153aafa86c
am: 0ad2ed8eb9

Change-Id: I697bb6ca4e4519d718fa758fdb5608360c0e8251
0ad2ed8eb9702b3506d4fa47df84bbf2de2efff5 17-Nov-2017 Tyler Gunn <tgunn@google.com> Fix NPE in TelecomManager#isOutgoingCallAllowed
am: 153aafa86c

Change-Id: I97914db19c3c534872f81669e45f271d1991b9b9
153aafa86c6411acc1697038a930a1d7d3f4abaa 06-Oct-2017 Tyler Gunn <tgunn@google.com> Fix NPE in TelecomManager#isOutgoingCallAllowed

There is a potential for a NPE if "excludeCall" is null. Adding null
check and unit tests to verify operation of the isOutgoingCallAllowed API,
as well as basic outgoing self-managed calls (which rely on this API).

Test: Added unit tests.
Change-Id: Ia5e92a7cb418af0d131daa2ca88b7cd4d36ab057
Fixes: 67495237
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
646ccb4c8b73612997fe676968cbc35290e87b3d 16-Nov-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4455093 from 35a93b6778a401c4e187b5c5105798641caa2d09 to pi-release

Change-Id: I764168ee5435d7febc858e635e354b4ae2fd2a26
35a93b6778a401c4e187b5c5105798641caa2d09 16-Nov-2017 Sanket Padawe <sanketpadawe@google.com> Merge "API definitions for Call Handover." am: 3b056643e7 am: b0ccadc078
am: 61c88a7790

Change-Id: I6c197bcdc515c776e150dfe1341af2a05a09e884
61c88a7790566d814d3e544379e786abfffd4bd2 16-Nov-2017 Sanket Padawe <sanketpadawe@google.com> Merge "API definitions for Call Handover." am: 3b056643e7
am: b0ccadc078

Change-Id: I0eb8cc9e2f688622a8de318da0d78dc1057e6f8f
b0ccadc0786f96a78be83fde96d2184a07c59e77 16-Nov-2017 Sanket Padawe <sanketpadawe@google.com> Merge "API definitions for Call Handover."
am: 3b056643e7

Change-Id: I71263e763afdb9f77f0d42bd4144200bc8509b52
3b056643e7f3771af5da2e81e0ba1825705d22ce 16-Nov-2017 Sanket Padawe <sanketpadawe@google.com> Merge "API definitions for Call Handover."
6d305ac638dce2942420759fb51af2b8072a5542 16-Nov-2017 Hall Liu <hallliu@google.com> Fix broken tests am: 25c842532e am: 35b558b031
am: b74299e110

Change-Id: I313ee75c85f9e09f0fc70da26aecf96669e903da
b74299e11026d320c8e0ba90f0c3dbcec1e39ae5 16-Nov-2017 Hall Liu <hallliu@google.com> Fix broken tests am: 25c842532e
am: 35b558b031

Change-Id: I16941d175d53deca96bd7f854fc8dfc1b005f8ed
35b558b03131e978d782bd8c0eb529837c343287 16-Nov-2017 Hall Liu <hallliu@google.com> Fix broken tests
am: 25c842532e

Change-Id: I82a55423e2cdee1f55fd3e20ff935ca4967df3b3
25c842532ec5f8ae6b5cd7b72bc1763f4ed8bfc7 15-Nov-2017 Hall Liu <hallliu@google.com> Fix broken tests

Test: test
Change-Id: I754d84b6826efc2f2357557d0b39f56b6702b711
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/RingerTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ccdf364c34f6d8ba72b6017c186824f75ce337ff 10-Nov-2017 Sanket Padawe <sanketpadawe@google.com> API definitions for Call Handover.

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#

Bug: 65415068
Test: manual
Change-Id: I98000d01293f3c83697a0d6a95c3c415159ce8ea
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/TelecomServiceImpl.java
db6347379c44adb2e6bf51869927b6bf226c480c 15-Nov-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4453288 from bf6393d81abf5de286396e2f19afaa4c5a955479 to pi-release

Change-Id: Id24e3fb79e6eb2ef180dd13c4b023c6fce1b3de3
bf6393d81abf5de286396e2f19afaa4c5a955479 15-Nov-2017 Xin Li <delphij@google.com> Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 726ca1a655

Change-Id: Idf1f4bd5da5f9cf3e5e256d5d1521e325f70a5c6
726ca1a655d1986b73ab6daca16c31c6e4bb4094 15-Nov-2017 Xin Li <delphij@google.com> Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: If5019cf41350611de78b6e2cd163e41ccf7bc302
88ab55e9438544c553a44cf437d998c557532f16 14-Nov-2017 Xin Li <delphij@google.com> Merge commit 'da04130a047de0290bc1b61451028e05e01661ec' into HEAD

Change-Id: Iab47b6412b78797106296f9241915ba944a985b9
031ec0f44de3d830b0c4e458b119accfbe93ec0d 14-Nov-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4450504 from e153694151381de6d22fd98de955636040417cd2 to pi-release

Change-Id: I9390b98be804ffe43d8df5f724fc99ce378285c0
e153694151381de6d22fd98de955636040417cd2 14-Nov-2017 Hall Liu <hallliu@google.com> Merge "Reconnect to Bluetooth if user switches back to it" am: c3a3cad7cd am: 3f0f10cb95
am: 0dcde981a3

Change-Id: I2039d8e2e3826ac43abf05cc9a96512ee0ba886d
0dcde981a38df9abfec2b22c0e4f60934a03cc0a 14-Nov-2017 Hall Liu <hallliu@google.com> Merge "Reconnect to Bluetooth if user switches back to it" am: c3a3cad7cd
am: 3f0f10cb95

Change-Id: Icd65d19c85cbd83761d8c912533d3409df9b49e7
3f0f10cb95f22878a431e1cafcf3633e572e0dc4 14-Nov-2017 Hall Liu <hallliu@google.com> Merge "Reconnect to Bluetooth if user switches back to it"
am: c3a3cad7cd

Change-Id: I9c7fb8954f1ed997107482a1cbc1f64ef068a33f
c3a3cad7cd18e10580d9001b44b0778ade864972 14-Nov-2017 Hall Liu <hallliu@google.com> Merge "Reconnect to Bluetooth if user switches back to it"
bf791404c458fa5a05936ffa0ff33e2f8c24ac3a 11-Nov-2017 Hall Liu <hallliu@google.com> Reconnect to Bluetooth if user switches back to it

Tweaks previous behavior of not auto-connecting to a BT device if the
user explicitly switched off the BT route. Now, if the user switches
back explicitly, we'll auto-reconnect in the future. Add a test for this
too.

Also, make some tweaks to how CARSM updates the rest of the system on
the current audio route and change tests accordingly.

Change-Id: I698fd517007c3c494f3da3343426d51c2b9b5087
Fixes: 66887677
Test: unit
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
db43b342c6a9747ed4968ce898f67bc2f4214b18 13-Nov-2017 Tyler Gunn <tgunn@google.com> Enhance PhoneAccount selection to take video capability into account. am: c74b3e2592 am: b6ebc401c5
am: 4f872d2701

Change-Id: I46e43d56366b6c5e85d5b57d2f8651058e19d4be
4f872d2701f03945bbde81968593cc8d9d4a8ef8 13-Nov-2017 Tyler Gunn <tgunn@google.com> Enhance PhoneAccount selection to take video capability into account. am: c74b3e2592
am: b6ebc401c5

Change-Id: Iaf9dc625fb2803a91eecb44c78d0bfc306e6441a
b6ebc401c5d1f011cedc0dbc253aa378299a4761 13-Nov-2017 Tyler Gunn <tgunn@google.com> Enhance PhoneAccount selection to take video capability into account.
am: c74b3e2592

Change-Id: I16e1372eea2a3e0f49ea8de2a962e0c18ddb6277
d36de85bc9b41019fb4b5f24dbeab2ce55bd1fff 12-Nov-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4447680 from 73577a75e9c3321df33d6d8c1bb91285df3b4e6d to pi-release

Change-Id: Ib8de61f68678f583ef55ed15c48ac1d6944394f3
c74b3e2592413e8ff8bcfa052f90e8a17eb7f9a3 08-Nov-2017 Tyler Gunn <tgunn@google.com> Enhance PhoneAccount selection to take video capability into account.

Enhance PhoneAccount selection logic to take into account which phone
accounts can place video calls when placing a video call.
As part of this work, moved that selection logic in startOutgoingCall into
a new method and set up a CallsManager unit test class which tests the
phone account selection logic.

Test: Added unit tests, performed manual tests using test app.
Bug: 63939933
Change-Id: If79131b311ca19ae6f6cc2878892398633315c63
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallControllerFactory.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomSystem.java
ests/src/com/android/server/telecom/tests/CallsManagerTest.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
73577a75e9c3321df33d6d8c1bb91285df3b4e6d 10-Nov-2017 Hall Liu <hallliu@google.com> Merge "Add a Log.startSession in HeadsetMediaButton" am: 8d1780fde8 am: 6e855de9b3
am: a077ebdcc5

Change-Id: I57aead41383399b0c82e88662d07532e3fc2913f
238d891eb15f051d11bf6cbaec195fbbcc82931f 10-Nov-2017 Hall Liu <hallliu@google.com> Merge "Implement multi-hfp APIs" am: 783a0cf268 am: 1f41ff90b5
am: f4d3ddfc94

Change-Id: Id2030078424c7b800c23ebceee2a770a60f5b571
a077ebdcc55f536ef9f198cf0aac488ad0c25b3e 10-Nov-2017 Hall Liu <hallliu@google.com> Merge "Add a Log.startSession in HeadsetMediaButton" am: 8d1780fde8
am: 6e855de9b3

Change-Id: I8b6d00f0138e1ccd5ea6c142f5edb5b7ac737ee1
f4d3ddfc9428c12fe3b7a86801e3cf974a081586 10-Nov-2017 Hall Liu <hallliu@google.com> Merge "Implement multi-hfp APIs" am: 783a0cf268
am: 1f41ff90b5

Change-Id: I85ed94c0b0ccd8b40952a3f00bd9f55ccf771d61
6e855de9b34f2d43ca4f4ca9abd37ec7e4de3cf0 10-Nov-2017 Hall Liu <hallliu@google.com> Merge "Add a Log.startSession in HeadsetMediaButton"
am: 8d1780fde8

Change-Id: I7516d757950c5e20075d4b36838e30ca9c39cdde
1f41ff90b5a925f6ad9d197efa393cc5fbef1964 10-Nov-2017 Hall Liu <hallliu@google.com> Merge "Implement multi-hfp APIs"
am: 783a0cf268

Change-Id: If6f52a9cfe83bd7bcd338a184fad82b49c3eac91
8d1780fde8b23f208fd8c5d334228bb5af9ef7b6 10-Nov-2017 Hall Liu <hallliu@google.com> Merge "Add a Log.startSession in HeadsetMediaButton"
783a0cf2688d0e202b809b6a0c7ce85774456253 10-Nov-2017 Hall Liu <hallliu@google.com> Merge "Implement multi-hfp APIs"
a148324f5d51103c7d73a50a636f6bd5bffb4924 09-Nov-2017 Hall Liu <hallliu@google.com> Add a Log.startSession in HeadsetMediaButton

Add a missing session here that was preventing traced logging of
calls answered via the headset media button

Test: manual
Change-Id: I5de915e9a18abe636554f5a9b344e36c7a157386
rc/com/android/server/telecom/HeadsetMediaButton.java
9086fb1d96dfc6581e7e7d4fe756a90ad592311f 08-Nov-2017 Hall Liu <hallliu@google.com> Implement multi-hfp APIs

Plumb Telecom multi-hfp APIs all the way through the stack.
Also delete BluetoothManager (deprecated) and modify tests to fully test
the multi-hfp functionality

Bug: 64767509
Test: unit tests
Change-Id: I02aafe3fca759510a013fd7cd956e3e923dd408a
rc/com/android/server/telecom/BluetoothHeadsetProxy.java
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/BluetoothManagerTest.java
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
d33da52fc87d09dc1a04f945a4978d34403b0672 07-Nov-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4437123 from 95966bdd5ccb3510c3b811bf871160f175cf0d96 to pi-release

Change-Id: I4df552ad390cbbf187c59489761cc63b79f6f4ff
95966bdd5ccb3510c3b811bf871160f175cf0d96 06-Nov-2017 Hall Liu <hallliu@google.com> Merge "Make changes to CARSM and BRM for multi-hfp" am: cc2b17ae99 am: ebf50e504f
am: e2627aa5d0

Change-Id: I9f821d4f54e23128a84f1fb8a93c6cdf04ca3e9f
e2627aa5d0e296bd9820657f8045096189ad0701 06-Nov-2017 Hall Liu <hallliu@google.com> Merge "Make changes to CARSM and BRM for multi-hfp" am: cc2b17ae99
am: ebf50e504f

Change-Id: Ia531d80484f6c2e1ee39ba84fc01286891e7ae68
ebf50e504f8b529063d6845fddf0b526ed0c3c52 06-Nov-2017 Hall Liu <hallliu@google.com> Merge "Make changes to CARSM and BRM for multi-hfp"
am: cc2b17ae99

Change-Id: Ic6e3fbe9584457f0b2420818ff7154e9915ab7ef
cc2b17ae99b09d605608a04efa4317017bfb2fb6 06-Nov-2017 Hall Liu <hallliu@google.com> Merge "Make changes to CARSM and BRM for multi-hfp"
41522f28cc95ef4217efd4fa328db3b516c29fbd 06-Nov-2017 Qi Wang <wangqi@google.com> Merge "Display the HD icon in the Call Log" am: 18bfe89e45 am: 64d2eabdc2
am: bfad7c3019

Change-Id: Ieedcf4114e6c1bd5516afd4276affef1f5e4815c
bfad7c30198dffa536b3be0a66d8eab8aec1001a 06-Nov-2017 Qi Wang <wangqi@google.com> Merge "Display the HD icon in the Call Log" am: 18bfe89e45
am: 64d2eabdc2

Change-Id: I7c61482484eef11bc9178f4b7d7526133334eb94
64d2eabdc2ac5c9044bf56c3e838a56c7e39a651 06-Nov-2017 Qi Wang <wangqi@google.com> Merge "Display the HD icon in the Call Log"
am: 18bfe89e45

Change-Id: I15505d21a07a0aa65135c63906f1a4be531de246
18bfe89e452f285322f290b9a5db9f3561c59378 06-Nov-2017 Qi Wang <wangqi@google.com> Merge "Display the HD icon in the Call Log"
132a557c896bcffd6b9ca8cb0753436564851142 03-Nov-2017 Hall Liu <hallliu@google.com> Make changes to CARSM and BRM for multi-hfp

* Update the BRM <-> CARSM interface
* Update CARSM to no longer actively connect to BT in state enter()
methods. Instead rely on messages from BRM to enter
ActiveBluetoothRoute.

Test: unit tests updated
Change-Id: Id9bf507fb4f813e1bfcce5571d61b3819e55adf3
rc/com/android/server/telecom/CallAudioRoutePeripheralAdapter.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
ests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
aade5dd57314ffc6e7d8c850ff54cc436525de62 01-Nov-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4428213 from 1d245bb6be7a168c7603ec217b15e52f748c6966 to pi-release

Change-Id: Ie8e47b327bd0da09157226931964d6a05f9aa8c9
1d245bb6be7a168c7603ec217b15e52f748c6966 01-Nov-2017 Srikanth Chintala <srikchin@codeaurora.org> Unhold BG call, in case of local disconnect am: 29644dc466 am: 178df5fc96
am: bf5e0837d4

Change-Id: I914e873bf8dec5f09563256ded910167192c94aa
bf5e0837d40a07eec0ee8351260ba0839eb985f1 01-Nov-2017 Srikanth Chintala <srikchin@codeaurora.org> Unhold BG call, in case of local disconnect am: 29644dc466
am: 178df5fc96

Change-Id: I2605f7f18012281b85e3b93df3880ad07ac613a7
178df5fc96d04b2d317749fa2be5a7e305c76690 31-Oct-2017 Srikanth Chintala <srikchin@codeaurora.org> Unhold BG call, in case of local disconnect
am: 29644dc466

Change-Id: I2afa0f07883e92833720c9dfc06afa890d768e5a
0063a1985fdc7e7bead72829d416a07113f56c9e 29-Sep-2017 Kazuya Ohshiro <kazuya.ohshiro@sony.com> Display the HD icon in the Call Log

Logged the information whether a codec for High Definition Audio
was used in the database of the Call Log.

Test: manual - Verified that the HD icon is displayed on the Call Log
if a codec for HD had been used during a call.
Bug: 68108125

Change-Id: I7eb62fb3455d6150f47a94f56071bc207226cea6
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallLogManager.java
17d485c3813886acc389da8de65b7e4f3396fea5 31-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4425573 from 2959c2799d059558b63ea07ac2e431234aba69b3 to pi-release

Change-Id: Ie96a7229bc9a701eb72e17f28e1e1cf44737eb0a
29644dc466e485eac653ff81d731912ddd3610af 19-Jul-2017 Srikanth Chintala <srikchin@codeaurora.org> Unhold BG call, in case of local disconnect

When there are active and held calls, active call disconnected
from headset, held call is not resumed. This change makes sure to
add the call to locally disconnected list so that background call
is unheld.

Bug: 63409763
Change-Id: Ib62c69ae6bee4c626cce409eedd1aabe6635718d
rc/com/android/server/telecom/CallsManager.java
2959c2799d059558b63ea07ac2e431234aba69b3 30-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 32c3dd46e3 -s ours
am: 16de4dffcb -s ours

Change-Id: Iafe8803a445748047d7cdc748557c33ece4de248
16de4dffcbc18f299ab5da446787f02410b0a4f7 30-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 32c3dd46e3 -s ours

Change-Id: I2b593dc687fd71ca088d63844219ee683394d458
32c3dd46e3a20d584eca64914418b68528ebd995 29-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Iffa351d2e3cdb7ccc54a386f495405557088db6e
es/values-ar/strings.xml
05c9dad49f45e10e80e9c0ba58d40e2cf41e4341 29-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4422293 from de9649db84ffc9a0e0c4b0a004593fe24a7a8a52 to pi-release

Change-Id: Ifc6361ae2fc531bd9fe03875bf05097c2be1a75a
de9649db84ffc9a0e0c4b0a004593fe24a7a8a52 28-Oct-2017 Tyler Gunn <tgunn@google.com> Disconnect calls from other CS when hanging over to a self-mgd CS. am: 632547e185 am: c1bf3515ab -s ours
am: 7b5665025c -s ours

Change-Id: I96cd99c82299d64d072776b301fcdd17c4a08450
7b5665025cf28cc2339df6058a259e60ce6d2b78 28-Oct-2017 Tyler Gunn <tgunn@google.com> Disconnect calls from other CS when hanging over to a self-mgd CS. am: 632547e185
am: c1bf3515ab -s ours

Change-Id: I434eb259d6ec19bc8de018cb795b0b27feb623b0
c1bf3515ab9331c37762e5f85e45d39c9f390a37 28-Oct-2017 Tyler Gunn <tgunn@google.com> Disconnect calls from other CS when hanging over to a self-mgd CS.
am: 632547e185

Change-Id: I381012bf3dbed19c6014f0ec2262dbf79fbbf0e2
632547e1858990d572bc6ddadea49bedb2134ddf 23-Aug-2017 Tyler Gunn <tgunn@google.com> Disconnect calls from other CS when hanging over to a self-mgd CS.

When handing over to a self-maanged ConnectionService, automatically
disconnect the other ongoing calls in other ConnectionServices.

Test: Manual
Merged-In: I57d3beae12013cd87bafe7f2581850adf5d9bf35
Change-Id: I4d5d51b2ec288fc4fd9c99751654c54f6c8539d6
Fixes: 63154841
rc/com/android/server/telecom/CallsManager.java
36d7736454d57b8c4c0a4349ad4ccfc647723b0d 27-Oct-2017 Tyler Gunn <tgunn@google.com> Handle Telecom binder death. am: 1a97fb26f3 am: b50a52735d -s ours
am: 49e9f4a780 -s ours

Change-Id: I447caba6465a74831fd61b4c7945504d6346cc2e
49e9f4a780a68b02ab3abc815aad866ccf04a1ea 27-Oct-2017 Tyler Gunn <tgunn@google.com> Handle Telecom binder death. am: 1a97fb26f3
am: b50a52735d -s ours

Change-Id: I2bc784d8e8fcf6d57f56352ffd77e9d73d61f998
b50a52735db2ce6dc58f30c4332a033b4fbdfc07 27-Oct-2017 Tyler Gunn <tgunn@google.com> Handle Telecom binder death.
am: 1a97fb26f3

Change-Id: Iab657ab940de3c691bbb74644d3874f2088c5136
2a1d6995f640f5e9b5933cb72c65a4e5ab3800e9 27-Oct-2017 Tyler Gunn <tgunn@google.com> Merge "Enforce MODIFY_PHONE_STATE for TelecomManager system APIs." am: 5b2a6e959a am: f8e9bcf4f3 -s ours
am: 15edd4f989 -s ours

Change-Id: I7da9689159b3de953c1a757f1d3a45aabeadcf79
15edd4f98970fb11a8f59198a16298f9633c8dfa 27-Oct-2017 Tyler Gunn <tgunn@google.com> Merge "Enforce MODIFY_PHONE_STATE for TelecomManager system APIs." am: 5b2a6e959a
am: f8e9bcf4f3 -s ours

Change-Id: I2fafaecd4e6b9503db34940fcb0111ab7b28ff61
1a97fb26f30f8d11b30ecc54f60da585c30c23d9 22-Jun-2017 Tyler Gunn <tgunn@google.com> Handle Telecom binder death.

There are instances where a ConnectionService dies, but we don't get the
onServiceDisconnected callback. This is most common in catastrophic
crashes of a ConnectionService. The result of this is that the calls
associated with that CS get orphaned in Telecom and never cleaned up.

Added a ServiceDeathRecipient implementation to ServiceBinder in Telecom
so that death of a CS is always caught.

Also made some logging changes to ensure we can more easily see when
a CS dies unexpectedly and why its calls were disconnected.

Fixed an issue where DtmfLocalTonePlayer was not finishing its subsession.

Test: Manual
Bug: 62912175
Merged-In: Icbb92dde1792520798f39db7209b5fd672b843c2
Change-Id: I5099592ec781af46c9d123ef2c53f48846b9ec19
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/DtmfLocalTonePlayer.java
rc/com/android/server/telecom/ServiceBinder.java
f8e9bcf4f363dcc73910ec69a216ba5e5a70ad7c 27-Oct-2017 Tyler Gunn <tgunn@google.com> Merge "Enforce MODIFY_PHONE_STATE for TelecomManager system APIs."
am: 5b2a6e959a

Change-Id: I70198681ed2e073ebcae9f9e00d33108be480d8c
5b2a6e959a817ac1e9ae783a8bef5c327208645e 27-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Enforce MODIFY_PHONE_STATE for TelecomManager system APIs."
3eae6c76e4fe0cd33b8c69e7216a81bca55ffaa6 18-Jul-2017 Tyler Gunn <tgunn@google.com> Enforce MODIFY_PHONE_STATE for TelecomManager system APIs.

Enforcing system-only permissions for TelecomManager APIs (see the bug
for rationale as to why some methods do not have the permission
enforced).

Test: Manual / GTS
Merged-In: I5a966e56da86d48892d917b02442ee7deffb39cb
Change-Id: I3f76602820c772b763f453a216d041454e3b94e6
Fixes: 62347125
rc/com/android/server/telecom/TelecomServiceImpl.java
444e1e3e50e05da55fa4f7379c4575a344d36b00 27-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I1c7abb16796b8dbd48b5c21d1c8afd2e204c7a16
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-ar/strings.xml
bb089e959779808915704ec6518806839cea08b0 27-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Show error dialog only when 'ask first' is not set" am: b092b90d8b am: 145e0a46da
am: e2faa238d5

Change-Id: I8697626e9ec92f6b2c08b1c06f5d95aa15e99318
e2faa238d56a58a8010289dc7f56929e55d13bed 27-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Show error dialog only when 'ask first' is not set" am: b092b90d8b
am: 145e0a46da

Change-Id: I0f4f1411050f5a9f7cf6f2f1178aea164de8c9ed
145e0a46da638f0e4a9bd459e0002b14f5043656 27-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Show error dialog only when 'ask first' is not set"
am: b092b90d8b

Change-Id: I18baabafcbfb59de4ff09e8d072cba5181bddeab
b092b90d8b70d77a6712dfeb5e427655de389d80 26-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Show error dialog only when 'ask first' is not set"
079d1a9de727190af485e6b160ee2fe4356f44aa 26-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4418112 from 1f13c3aba0884faa6f605dbe6c03c35f0834fabf to pi-release

Change-Id: I8e332937dfb19e404fc816cd43da175388f5e226
1f13c3aba0884faa6f605dbe6c03c35f0834fabf 25-Oct-2017 Brad Ebinger <breadley@google.com> Merge "Don't redial on multiple sim phone accounts" am: 1707c239d1 am: bb69d593b8
am: 736c092c57

Change-Id: I52913ab6060db1cd9e231328c3da090daf16ba27
736c092c5787192369296a5539733ca8ce51d5f8 25-Oct-2017 Brad Ebinger <breadley@google.com> Merge "Don't redial on multiple sim phone accounts" am: 1707c239d1
am: bb69d593b8

Change-Id: I0f03c4da846c081b3ae07a39a7b7c069f147be27
bb69d593b8d6f8eb4411331f387a92b3233fd511 25-Oct-2017 Brad Ebinger <breadley@google.com> Merge "Don't redial on multiple sim phone accounts"
am: 1707c239d1

Change-Id: Ib17c5d1d08db2d2f47bd96be60ed4a928d1a1d89
1707c239d1deafda0f296c70dcbd6748ef766e6e 25-Oct-2017 Brad Ebinger <breadley@google.com> Merge "Don't redial on multiple sim phone accounts"
ba01845c113c5a87e560e0f8a419fcec7cbd6550 03-Jul-2017 Srikanth Chintala <srikchin@codeaurora.org> Show error dialog only when 'ask first' is not set

For call to USSD code, if mCalls contain current call, that means
'ask first' is enabled in which case InCallUi will take care of
displaying error dialog and hence skip dialog display here in order
to avoid duplication of dialogs.

Test: manually test
Bug: 38485469
Change-Id: I54b68d3f44d92e40be1a48f64b4ec84d1971dcd6
rc/com/android/server/telecom/CallsManager.java
a67450da020aa313d0c7c503e73e71d843f36729 13-Oct-2017 Srikanth Chintala <srikchin@codeaurora.org> Don't redial on multiple sim phone accounts

Since redial among SIM phone accounts is handled in svc/telephony,
Don't need redial logic again in svc/telecom for SIM phone accounts for
emergency call failures with DisconnectCause.Error.

Bug: 67364502
Change-Id: I5be4274ed307d80087d6ce48475fc12efd8a5b36
rc/com/android/server/telecom/CreateConnectionProcessor.java
42d9dc1f9c80f3f069d40cd327ca8e2f023e9acb 21-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4410151 from 204b37c21edaf32d260ec5a493915733015023f4 to pi-release

Change-Id: Ib4198f91904bd08530463616b7b2ab9ef2a042bb
204b37c21edaf32d260ec5a493915733015023f4 20-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 84af0cfa77 -s ours am: f2bbac8e4e -s ours
am: fb968d4430 -s ours

Change-Id: Ife4ab6a68e51b41069c309d1cbb031a16ee7c27a
fb968d4430019b7fcba481ad73547ed8d0f9bc27 20-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 84af0cfa77 -s ours
am: f2bbac8e4e -s ours

Change-Id: I4ec4102d296d763d1cda01178c63ede7deeca9ff
f2bbac8e4e59b279b37fc55a47a1d4a3b6cd12cf 20-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 84af0cfa77 -s ours

Change-Id: I1ec5a4fb7f696055f5f5808190fc4c409083cb2f
84af0cfa774ad8b774185d4fc4cef52c194823cf 20-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Ia8ebb85b6eab3a9d4b39652aad3fdc59bc36971f
es/values-da/strings.xml
es/values-gl/strings.xml
es/values-hu/strings.xml
es/values-mr/strings.xml
es/values-pa/strings.xml
es/values-th/strings.xml
es/values-uz/strings.xml
4781a7ec0f1eda6d4ef68af0ce0efd5b0b4ad480 18-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4402171 from 2b9911ad20e1001a1d90022358b187e4a5645670 to pi-release

Change-Id: Ic0f37d9bb85f5a4ba39f7b905fa58d1b9f90df43
2b9911ad20e1001a1d90022358b187e4a5645670 18-Oct-2017 Srikanth Chintala <srikchin@codeaurora.org> Handling call with handle null or number empty in DirectToVoicemailCallFilter am: 3bf2228927 am: fcb8c3c17f am: 5820369042
am: da04130a04

Change-Id: I812adca4bd105a250c0dbf8c516dc6af76831b9f
da04130a047de0290bc1b61451028e05e01661ec 18-Oct-2017 Srikanth Chintala <srikchin@codeaurora.org> Handling call with handle null or number empty in DirectToVoicemailCallFilter am: 3bf2228927 am: fcb8c3c17f
am: 5820369042

Change-Id: I1e40f938aff02ef47120ae4816f3860113968f7f
5820369042fb3ce4d6b82e405ec9e944eb9962c8 17-Oct-2017 Srikanth Chintala <srikchin@codeaurora.org> Handling call with handle null or number empty in DirectToVoicemailCallFilter am: 3bf2228927
am: fcb8c3c17f

Change-Id: I9b2ee17d19b6d84267686f4f0dccb444e8ff615c
fcb8c3c17f148363a479188fb24597650fbd33ee 17-Oct-2017 Srikanth Chintala <srikchin@codeaurora.org> Handling call with handle null or number empty in DirectToVoicemailCallFilter
am: 3bf2228927

Change-Id: I9b7548c907267c16eab3d3d435d5204d9fb561d9
6f1751aaa7eda610d7eddb3000dbe9489c9fdb20 17-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: b4fc70cf71 -s ours am: b4cca0b576 -s ours
am: cbba3c34c6 -s ours

Change-Id: Ib122356a8d4f657c38e6e28bb621a03528f41766
06cd06253b70ffb521cca803d51f4cbbfc35cf1a 17-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4399706 from 80e9d9e9faf4593e53ae01dbe1fe65b63409f478 to pi-release

Change-Id: I2931681364db9caef2bd95d566ba95e3aaf72b57
cbba3c34c6f6e34f41a14b3254591b4742e4ac67 17-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: b4fc70cf71 -s ours
am: b4cca0b576 -s ours

Change-Id: Ic9b0413f075b37fc8cfe6bd9b5c301e7acaa5388
80e9d9e9faf4593e53ae01dbe1fe65b63409f478 17-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: b4fc70cf71 -s ours am: ab00ba951b -s ours
am: 5cb2e1d71e -s ours

Change-Id: I63f61312f2b7caf40077123e86b728fbcf91c28b
e5acb1da4ae4392731dbe2f1c88569edaeba3231 17-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 2cabbaaecf -s ours
am: a5ed7505ec -s ours

Change-Id: I46b5f71eb3e44dcf00b6aa06f9babd62774dec38
5cb2e1d71e43561a7a3478c2bd8caf31f31c1b4d 17-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: b4fc70cf71 -s ours
am: ab00ba951b -s ours

Change-Id: I51f3819f3fb8e915848e985cbf27aa19964a0065
a5ed7505ec589270fdcce2d170048a92f34c1e72 17-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 2cabbaaecf -s ours

Change-Id: Id05157ba890e036645d06bf0106d3da51b8a1c7c
b4cca0b57628e6609a0a954b22d84a3c0ec855f3 17-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: b4fc70cf71 -s ours

Change-Id: I0228c7cc17ed6aec7c6414e8036ea757bac64a00
ab00ba951bf9bc7480bc62ea079d14ce90b37dda 17-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: b4fc70cf71 -s ours

Change-Id: I0365334dd4e2ffc257071cc418b9d8d231a97dbd
3bf22289271e460c1ab9b51fbb364e21ca15ba4b 06-Sep-2017 Srikanth Chintala <srikchin@codeaurora.org> Handling call with handle null or number empty
in DirectToVoicemailCallFilter

Handling call handle null or number in the handle
is empty by updating the DirectToVoicemailCallFilter
with the onCallerInfoQueryComplete callback to avoid
IncomingCallFilter to wait till timeout.

Bug: 65390135
Change-Id: Ifecc2aabe1cba901e7604411980a98b2cdbeed3f
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/callfiltering/DirectToVoicemailCallFilter.java
b4fc70cf71e7b9a771ba33a33db207e3fe973147 16-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I01678f48f6f6ccc625db4074f5009983470664cd
es/values-da/strings.xml
es/values-gl/strings.xml
es/values-mr/strings.xml
es/values-pa/strings.xml
es/values-th/strings.xml
2cabbaaecf93a6434c81fc786fb39a2a806ce151 16-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I1271631124263fee3d7c16080139c534b950fb9c
es/values-gl/strings.xml
es/values-th/strings.xml
d9edb06f814cb05d5a48b7aadca3248de9dbd785 11-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4388640 from 3a2ebf4c72ba00912ec17a658001ed857e3b3763 to pi-release

Change-Id: I39a299872356eaa4538727e24bc2e5003a1960aa
3a2ebf4c72ba00912ec17a658001ed857e3b3763 10-Oct-2017 mike dooley <mdooley@google.com> This is a partial cherrypick of ag/3005393 am: 8768409002
am: a61eb2a0f9 -s ours

Change-Id: Id38230ca0f3697f8896aa6ec75a94ef93a782132
a61eb2a0f99affbba607fd007715afa77788843e 10-Oct-2017 mike dooley <mdooley@google.com> This is a partial cherrypick of ag/3005393
am: 8768409002

Change-Id: Ifc0efc8489639d55e90a9c789dac02f454481f1a
8768409002d7c0110ad231d2cbef5c7188d2e0e3 10-Oct-2017 mike dooley <mdooley@google.com> This is a partial cherrypick of ag/3005393

It just contains the fix to location permission granting for emergency
calls for the case where an emergency call is added to an existing call.

The other part of ag/3005393, to enable the feature will be done in
ag/3034149 as a config overlay.

Bug: 67104002
Test: manual
Change-Id: I8c4f308a30b32335718e5909748d3fc84eac7259
Merged-In: I12b1362749ee265557d007a989917339468e9b0d
rc/com/android/server/telecom/InCallController.java
dc806946ed19f9019cfd8a10902149e344b77eea 09-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4384511 from 322b4102b97d97e941da1f234d46ad36ef44c392 to pi-release

Change-Id: I5c9286a9558915e90012fc469397462dbc53607b
322b4102b97d97e941da1f234d46ad36ef44c392 07-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ida0db15bb09e8c9cd29c5696586db29b430d32e9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-gl/strings.xml
90e028f19115ef29a8f0164ad117cbd41a60bcb1 07-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4383207 from 1f896ae24b212d4169fd2bd3246973886827be5d to pi-release

Change-Id: Ie2027675548796800bb8adac8578a47a3ae0a1ab
1f896ae24b212d4169fd2bd3246973886827be5d 07-Oct-2017 Tyler Gunn <tgunn@google.com> Fix NPE in TelecomManager#isOutgoingCallAllowed am: f4cc311210
am: 89225903e1

Change-Id: I0319f06efeee89fcce33ee005c86e25f5eb980a2
89225903e154934162214cb7d655e89a5abf66a3 07-Oct-2017 Tyler Gunn <tgunn@google.com> Fix NPE in TelecomManager#isOutgoingCallAllowed
am: f4cc311210

Change-Id: I75cea6b949b66cd07a8cebb0150a016e4c7019c8
f4cc3112101d48b546464bfb8766e6d8d6e6ae14 06-Oct-2017 Tyler Gunn <tgunn@google.com> Fix NPE in TelecomManager#isOutgoingCallAllowed

There is a potential for a NPE if "excludeCall" is null. Adding null
check and unit tests to verify operation of the isOutgoingCallAllowed API,
as well as basic outgoing self-managed calls (which rely on this API).

Test: Added unit tests.
Change-Id: Ia5e92a7cb418af0d131daa2ca88b7cd4d36ab057
Fixes: 67495237
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
559d62ab4fcfee532a7719b3c20ee41a0a4f6a40 06-Oct-2017 mike dooley <mdooley@google.com> Re-doing the config change to enable temporary location permission for
emergency calls.

ag/2938875 enabled this feature for all releases, but we want to only
enable it for particular ones via a config overlay. So this cl makes
the default config value for this feature 'false' again.

ag/3020815 will re-enable it for google phones.

Test: manual
Bug:67104002
Change-Id: Iaa8a92446332f32cc4d860a12635913e72fe3945
es/values/config.xml
a98a8154d9f2792eac52c4d18c8994d6785a24f9 03-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4373608 from 422092bd6c7e0a0a94f23defaa9b9820aff2063a to pi-release

Change-Id: I822572b51de9ce92a4203297fed4dd7d731b16aa
422092bd6c7e0a0a94f23defaa9b9820aff2063a 02-Oct-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I86cefb4413131f83de7de1ba55f351c28c6b5c38
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-th/strings.xml
65f94b2009bb777dfd3a8f073c28f9ca99b6304e 29-Sep-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-release-4367572 snap-temp-L13500000107248413

Change-Id: I8053b9240282d72bd4bcd291e5a6b264d59d6c37
7b13246618d5bb3aba7e70931b2672ba3d3f3718 29-Sep-2017 Michael Dooley <mdooley@google.com> Merge "Re-enabling temporary location permission granting for emergency calls"
f17a01a339206499de672859528f333fc724c7c4 28-Sep-2017 Jordan Liu <jminjie@google.com> Merge changes I8c12e8e6,I4878993a am: dd6a7b3174 am: a6809eddaf am: a1e5a0c78c
am: 23fa136ee7

Change-Id: I8a857aab2b55460963fabb1397fc1be11755b63e
23fa136ee79a38ea7716fc8df9a756f2c65fa67e 28-Sep-2017 Jordan Liu <jminjie@google.com> Merge changes I8c12e8e6,I4878993a am: dd6a7b3174 am: a6809eddaf
am: a1e5a0c78c

Change-Id: I6d803ef3746ca9532aaf218dc40cb3b88409f2f5
a1e5a0c78cf5b2a33ded7f2ebd5f8f81356c3757 28-Sep-2017 Jordan Liu <jminjie@google.com> Merge changes I8c12e8e6,I4878993a am: dd6a7b3174
am: a6809eddaf

Change-Id: Iece59664c9c0d3f53d3bbbd9fda1074f5b561f16
a6809eddaf273c7833ec9f196b3de902f9107c36 28-Sep-2017 Jordan Liu <jminjie@google.com> Merge changes I8c12e8e6,I4878993a
am: dd6a7b3174

Change-Id: I446bdde4bb2e035ee55aaaee6517ee15aced0822
dd6a7b317428252fbf0892364160656a2991c952 28-Sep-2017 Jordan Liu <jminjie@google.com> Merge changes I8c12e8e6,I4878993a

* changes:
Set broadcast done when placing immediate call
Handle potential emergency numbers properly
03902b7d8b1c8a97d77f2e98a33e722d10dd5b93 21-Sep-2017 mike dooley <mdooley@google.com> Re-enabling temporary location permission granting for emergency calls

We disabled this feature to avoid the case where a user is in a call
then adds an emergency call, then disconnects the emergency call, which
could cause the original call to be disconnected too (because the dialer
process gets killed when location permission is revoked). But that
situation does not currently happen (because adding the emergency
call doesn't go through the EmergencyInCallServiceConnection, and thus
no attempt to grant temporary location permission is made). This cl
fixes that situation by also granting location permission when an
emergency call is added while there is an ongoing call, and revokes
it when all calls have ended.

Note: it is not possible to merge the original call and the emergency call.

Note: the dialer will still be killed after all calls end, if one of them
was an emergency call which was granted temporary location permission.

Bug: 37475749
Test: manual

Change-Id: I12b1362749ee265557d007a989917339468e9b0d
es/values/config.xml
rc/com/android/server/telecom/InCallController.java
d32c9db92693526cd13af5af5fef3bfbe5400b86 27-Sep-2017 Jordan Liu <jminjie@google.com> Set broadcast done when placing immediate call

Whenever using mCall.placeOutgoingCall make sure to call
mCall.setNewOutgoingCallIntentBroadcastIsDone first.

Bug: 36439795
Test: manual
Change-Id: I8c12e8e69c0aa72f9e5e3da0bc263dff0e7364db
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
ff06d06af9380eaf1a0fa1b4df380d99fd808b77 31-Aug-2016 Sandeep Kunta <skunta@codeaurora.org> Handle potential emergency numbers properly

In multisim, when prompt is enabled, call to potential emergency
numbers like 91145 which are not actual numbers are not going.
Reason being, for potential emergency numbers,
NewOutgoingCallBroadcastIntentReceiver is not started, that means
no one will set setNewOutgoingCallIntentBroadcastIsDone(). But
since these are not actual emergency prompt will be shown to user,
and when user selects sub, call will not proceed as
setNewOutgoingCallIntentBroadcastIsDone is not set.
Hence set setNewOutgoingCallIntentBroadcastIsDone in case of
potential emergency numbers as part of fix.

Test: manual - Verified the dial to a potential emergency number works
normally after user selects sub.
Bug: 36439795

Change-Id: I4878993ae1b9c9521988a7f47dffc6af8a944ac4
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
1d1f8f9abf4497c97c3a117fe1d35cf245c5d5a1 26-Sep-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-37e26775-0485-4a3d-a06c-026b3663c922-for-git_pi-release-4359872 snap-temp-L83600000106066915

Change-Id: I5628d96123e12dd5d90ac4b02db1d2a7e9d50f8a
dfe8401a3eed7c664a6ec5a8194f50d1de3a4611 26-Sep-2017 Ta-wei Yen <twyen@google.com> Merge "Mark phone number in block dialog and toast as LTR" into oc-mr1-dev am: ea9322395f
am: bab0ed479d

Change-Id: I1b46b852957408bedb880c129a964e6a8de3242e
bab0ed479da6bf3f8743ed64f48afde7467c7724 26-Sep-2017 Ta-wei Yen <twyen@google.com> Merge "Mark phone number in block dialog and toast as LTR" into oc-mr1-dev
am: ea9322395f

Change-Id: Ia52ecd5d504fcbf7eb4b36f3e3331c4486f5da22
ea9322395fa8977ea60793a6deb04a7a7cc7ab4d 26-Sep-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Mark phone number in block dialog and toast as LTR" into oc-mr1-dev
7b27ef30d9cec564c2f6939d0917bbec3f2b3395 25-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Prevent NewOutgoingCallBroadcast from being sent for self-managed calls." into oc-mr1-dev am: 8475c15871
am: 6b539a24fc

Change-Id: I9c4b5540b9f8ec382be8efe6927dfca92651127d
6b539a24fc09e04af815c00b51e9771820ac56f2 25-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Prevent NewOutgoingCallBroadcast from being sent for self-managed calls." into oc-mr1-dev
am: 8475c15871

Change-Id: Ibe3c08fd9190e0b9f5890c3ef5acc6d943febe2e
8475c15871914f3be5733264c364b10bcefaa2a0 25-Sep-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Prevent NewOutgoingCallBroadcast from being sent for self-managed calls." into oc-mr1-dev
b4f90ff10928df440c9d19c8594154283a6846a3 22-Sep-2017 Tyler Gunn <tgunn@google.com> Prevent NewOutgoingCallBroadcast from being sent for self-managed calls.

When sending a self-managed call, prevent the new outgoing call broadcast
from being sent. It realistically has no business being sent for self
managed calls.

Test: Used Duo and Voice APKs to reproduce issue. Verified this fix corrects it.
Bug: 66671858
Change-Id: I7b5272f03bd174100cd2e12641524f4adfc1892f
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
328e733744cc576c59d4dac607ef5940a024ecff 18-Sep-2017 Ta-wei Yen <twyen@google.com> Mark phone number in block dialog and toast as LTR

Screenshots:
https://screenshot.googleplex.com/7o6Kg3F3wxw
https://screenshot.googleplex.com/on5MYpCmVDQ
https://screenshot.googleplex.com/zQ5voeokptq

Change-Id: I39f738433b58135b7059953597e0e72dc9351c4b
Fixes: 30130422
Test: manual
rc/com/android/server/telecom/settings/BlockedNumbersAdapter.java
rc/com/android/server/telecom/settings/BlockedNumbersUtil.java
da0afe1995bb8691d5cc3b8fb2a4460dea6bf23d 18-Sep-2017 Sanket Padawe <sanketpadawe@google.com> Update permissions of isTTySupported as per its doc in TelecomManager. am: 45481b214e am: d96dc972eb am: 308ac74144 -s ours
am: 57009a1c6d

Change-Id: I29c51d5c399d0547c1d6373a5528156ab091b31a
57009a1c6d2254b6a66c2b39f251b4fbe768bad5 18-Sep-2017 Sanket Padawe <sanketpadawe@google.com> Update permissions of isTTySupported as per its doc in TelecomManager. am: 45481b214e am: d96dc972eb
am: 308ac74144 -s ours

Change-Id: I07601b7994eaf80edd323f170b2d84975bd2f3c1
308ac7414492956822a42f9e363656488e5f45fb 18-Sep-2017 Sanket Padawe <sanketpadawe@google.com> Update permissions of isTTySupported as per its doc in TelecomManager. am: 45481b214e
am: d96dc972eb

Change-Id: I9e3fc17a93f7728ae52bd73bc0a2169872bd1b73
d96dc972eb18a8e95a4afd1a8bf18ae7ba5d649e 18-Sep-2017 Sanket Padawe <sanketpadawe@google.com> Update permissions of isTTySupported as per its doc in TelecomManager.
am: 45481b214e

Change-Id: I15eb980d8c629f383a2796bb339486fe145432c8
b58f28cfc3937ded7b8d3986a42048b1cbd20d89 16-Sep-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: ae56c7c204 -s ours
am: 41ecd1a81b -s ours

Change-Id: I6d233671dffd6ae969dbc005eb0d6adc5ead45e0
41ecd1a81b27e3d95f7b76d1e400667d0d7cee59 16-Sep-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: ae56c7c204 -s ours

Change-Id: I456e018b78713803358e71aa5163f022dda120aa
ae56c7c204dfdaf0c6801a17c71fc67a6b06bf76 16-Sep-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I11ad22a0680ac04b40bd445e96efcc78498fcfe9
es/values-da/strings.xml
es/values-mr/strings.xml
es/values-pa/strings.xml
26d6dac411887b5506febf25cb67a5b75f88d440 14-Sep-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-b06579bd-a905-4db5-ada9-c69d40f4df90-for-git_pi-release-4335309 snap-temp-L62700000102430107

Change-Id: I77d85402e0773419c5ea538fc4c2fadef1dc3844
fdeba1c4ba067140b1f8a40081ab51225d631ed7 13-Sep-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I4a5f75be586268176d37fe09f626cb6fe8d51f5c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-da/strings.xml
es/values-mr/strings.xml
8c446cd59e2395c2fa3c2ebf88eb859f3d77a8d1 13-Sep-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-8244a883-eac1-43aa-b800-33dd285ccdd1-for-git_pi-release-4332766 snap-temp-L47800000102000453

Change-Id: I92780646d8d25d90be07882663a1808d2cbf7d11
45481b214e44301f63eaf220e66faebf3157e7c9 11-Sep-2017 Sanket Padawe <sanketpadawe@google.com> Update permissions of isTTySupported as per its doc in TelecomManager.

Test: Build
Bug: 62346128
Change-Id: Ic67576b68fb77cbbe1626aeb70b5864e17e03d9b
Merged-in: Ic67576b68fb77cbbe1626aeb70b5864e17e03d9b
rc/com/android/server/telecom/TelecomServiceImpl.java
88efa0c9ba64ac1aab894196ae2249475c7dbb12 08-Sep-2017 Sanket Padawe <sanketpadawe@google.com> Update permissions of isTTySupported as per its doc in TelecomManager.

Test: Build
Bug: 62346128
Change-Id: Ic67576b68fb77cbbe1626aeb70b5864e17e03d9b
rc/com/android/server/telecom/TelecomServiceImpl.java
7a8fa029e966eeed537ee97fadb5f55f5b0f1516 07-Sep-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-51e6d4a7-52eb-462d-9bf2-f148ba83e4bd-for-git_pi-release-4320962 snap-temp-L22700000100184372

Change-Id: I810057063b7441e797b075f50e22e6ec7869327b
a8f86424aaeda5dcd79f52168aeb7b2b70f3bef0 06-Sep-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I2883c422ffafadfbe12f632ad02ddeae0204d49b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-pa/strings.xml
1e8f9cda089912a992bac5f57f5c2ab5ba7f9e31 30-Aug-2017 Bill Yi <byi@google.com> Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 907664bb3d -s ours
am: f83a6ddc56 -s ours

Change-Id: I1d4fde838dd8bb268decc7f5f92485983099fe0d
f83a6ddc56ef532ac98eacf96f24e9bc142b624f 30-Aug-2017 Bill Yi <byi@google.com> Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 907664bb3d -s ours

Change-Id: I9cf422645c4688ecf0643334b4fa3e20e66af51e
907664bb3db302577e9e6ac54448c607fddc70fa 30-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
8d225a790492fe8355d9d2c81ed439a157d30791 30-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I43646e11707ba867a76c1f0a8cefe3ba4eb2ab75
es/values-mr/strings.xml
038f343ce54a9044f44da044be624c411e92c842 30-Aug-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-dbb5053c-c8af-4c07-a295-d7d7b281ce3f-for-git_pi-release-4306414 snap-temp-L16000000097876522

Change-Id: I8dcd220d541280e264a76ea8fcf8eb37b7fc4298
5140e4c1073bfd1ac4c2c37e6999f21acd6eb754 30-Aug-2017 Ta-wei Yen <twyen@google.com> Merge "Fix RTL numbers in BlockedNumbersActivity" into oc-mr1-dev am: 492fdf4c76
am: b175eb7410

Change-Id: I593f38aad344b955f324e933b02b75503d694d69
8bdc7dcc2d501c3ed327452344388217a1a22eed 30-Aug-2017 Tyler Gunn <tgunn@google.com> Change getAgeMillis to use elapsed system time instead of wall-clock time. am: bcf23de07a -s ours
am: 79306491e1 -s ours

Change-Id: I45578b8acaaf1ab2b0f1e0bde775bb0d4d023a40
b175eb74104b437fa1d8935d2500ff9a95e4b464 30-Aug-2017 Ta-wei Yen <twyen@google.com> Merge "Fix RTL numbers in BlockedNumbersActivity" into oc-mr1-dev
am: 492fdf4c76

Change-Id: Ie953392f0feee88660318048f6bca4bbebb4d17d
492fdf4c76411591e775747c75ce313c351694a1 30-Aug-2017 Ta-wei Yen <twyen@google.com> Merge "Fix RTL numbers in BlockedNumbersActivity" into oc-mr1-dev
79306491e110d6e84b56cfa0816897bd10cc943e 30-Aug-2017 Tyler Gunn <tgunn@google.com> Change getAgeMillis to use elapsed system time instead of wall-clock time.
am: bcf23de07a -s ours

Change-Id: I280f7bc17c0f413f0d3b7c3aed8eed3df09be45f
26422e7d19f0291ab65ccccac593ad6bd2f63ce8 29-Aug-2017 Ta-wei Yen <twyen@google.com> Fix RTL numbers in BlockedNumbersActivity

Phone numbers should always be LTR. Also removed layout_toStartOf since
it is redundant in LTR, and will cause phone numbers to align to
the left on RTL

RTL:
https://screenshot.googleplex.com/ZC7FpJp23ET
LTR:
https://screenshot.googleplex.com/hGoRSJjgyJ1
Before:
https://screenshot.googleplex.com/mt1XLgUusFX

Test: manual
Change-Id: I3381ecb229600563df8ca3dca4f7c1810f6e330d
Fixes: 30130422
es/xml/layout_blocked_number.xml
bcf23de07aed59ed34d0121a76d29b6ed9a14288 04-Aug-2017 Tyler Gunn <tgunn@google.com> Change getAgeMillis to use elapsed system time instead of wall-clock time.

Changing getAgeMillis to rely on SystemClock#elapsedRealtime() to determine
the duration of a call. This ensures that changes to the device time zone,
clock updates by the network and user initiated time changes to not
impact the duration of calls in the call log.

Test: Manual, unit
Bug: 64068300
Merged-In: I62924dc7889c86a7457d05f8fbb20ab8189ece1a
Change-Id: I62924dc7889c86a7457d05f8fbb20ab8189ece1a
(cherry picked from commit 6c3a2dd68c9ac5584f48cf5f62fa01896fccdc7d)
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ClockProxy.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
943b683889c59b0fc99d842042205674930194b4 28-Aug-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-2c5efa61-1f02-4e74-bfeb-1ca3cd5028bd-for-git_pi-release-4301718 snap-temp-L56500000097146696

Change-Id: I18e201ec14542a71423cb8456bbb836bbaacd37f
fc967fcd0f8fea53237cb6f64aaf62a231177f03 25-Aug-2017 Brad Ebinger <breadley@google.com> Adds Package check and TestApps test for PhoneAccount am: 702f8f5870 am: 962fb9a53e am: f8cf4089c4
am: 7f9a43aa93

Change-Id: Id83793c11ae5cbbe67886f39f6579418a361eb22
5c367dcf07f0e9b8e12397fb01259eaa6e1debd3 25-Aug-2017 Srikanth Chintala <srikchin@codeaurora.org> Emergency redial implementation am: 1c586c6f65 am: 9ed6ad9b14 am: 2fca9c06e3
am: ae18532de9 -s ours

Change-Id: Ifdc5a670283c027b9c0c9e98981eb2b55b9f2c8b
7f9a43aa934233976e63586d47082430ccf906ab 25-Aug-2017 Brad Ebinger <breadley@google.com> Adds Package check and TestApps test for PhoneAccount am: 702f8f5870 am: 962fb9a53e
am: f8cf4089c4

Change-Id: I69fbd016fed28fe100ab81e8f635df81b77fc237
ae18532de95bf60d4a2d619ffcdaaa384fb087e7 25-Aug-2017 Srikanth Chintala <srikchin@codeaurora.org> Emergency redial implementation am: 1c586c6f65 am: 9ed6ad9b14
am: 2fca9c06e3

Change-Id: Ia51d0eb4a628d0691bfe4e16bb2f53a485cd94cb
f8cf4089c409db372bec048651bf2edf9b0036df 25-Aug-2017 Brad Ebinger <breadley@google.com> Adds Package check and TestApps test for PhoneAccount am: 702f8f5870
am: 962fb9a53e

Change-Id: I462e207fa7efbad6fe58dc2ce5a5fa7108582477
2fca9c06e3b3be46bb76429950db0e581d7ca438 25-Aug-2017 Srikanth Chintala <srikchin@codeaurora.org> Emergency redial implementation am: 1c586c6f65
am: 9ed6ad9b14

Change-Id: Id80c5016dd5058521a809fbd9b03d1963ac6a455
962fb9a53e31358f188117b0da98a77a251ff3d8 25-Aug-2017 Brad Ebinger <breadley@google.com> Adds Package check and TestApps test for PhoneAccount
am: 702f8f5870

Change-Id: I1505dc71b2fb3e28990c3ada983d50728bdd358d
9ed6ad9b143c6db5f1fe290e60f21c989aa352d6 25-Aug-2017 Srikanth Chintala <srikchin@codeaurora.org> Emergency redial implementation
am: 1c586c6f65

Change-Id: I9db1f384fe7d6dfd2743ef347d4dd3bf8f8eafa6
8e4d9cd6984e14033ccf1765452d8f8b0a76af8f 25-Aug-2017 Hall Liu <hallliu@google.com> Merge "Include Bluetooth in baseline route calculations" into oc-mr1-dev am: db86aa5bc5
am: efa1147adb

Change-Id: I3ece51d112b7eedcdf4c21cab7cbd2e43edf53de
efa1147adb9182b629862dde478a23179f19300f 25-Aug-2017 Hall Liu <hallliu@google.com> Merge "Include Bluetooth in baseline route calculations" into oc-mr1-dev
am: db86aa5bc5

Change-Id: I91a00a8afe10708ad5345a0ed6e41ce501a0d1d9
db86aa5bc50f8c6440dce1672864e29aaeba4a5d 25-Aug-2017 Hall Liu <hallliu@google.com> Merge "Include Bluetooth in baseline route calculations" into oc-mr1-dev
702f8f5870277fc298b437bda3df5882586b3b6e 18-Aug-2017 Brad Ebinger <breadley@google.com> Adds Package check and TestApps test for PhoneAccount

1) Adds a check to ensure that a ConnectionService
is setting a PhoneAccount from the same Package name.

2) Adds TestApp test that switches PhoneAccount.

Bug: 27059146
Test: TestApp send intent to switch PhoneAccount
Change-Id: I5ac7dd8859d747b3aaaf5370af26a10225f8d6c2
rc/com/android/server/telecom/ConnectionServiceWrapper.java
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/CallServiceNotifier.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
estapps/src/com/android/server/telecom/testapps/TestConnectionServiceReceiver.java
1c586c6f65b8d7eacb44b72d86fe71e3f67e003d 04-May-2017 Srikanth Chintala <srikchin@codeaurora.org> Emergency redial implementation

If there is change in phone account
while Emergency call redial update to
Dialer so that InCallUI gets updated with
phone account label.

Bug: 27059146
Change-Id: Ie72ab2901ec05d972204ed11f115a05b79173c1d
rc/com/android/server/telecom/ConnectionServiceWrapper.java
078d408cf52331d0815c9530a825040689e153a9 25-Aug-2017 Brad Ebinger <breadley@google.com> Merge changes from topics "msim_bugfix_tests", "cp_redial_emer_phone_account"

* changes:
Adds Package check and TestApps test for PhoneAccount
Emergency redial implementation
f251602a45bb359de65bb34593d7ba7860de6134 25-Aug-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of e4653aa85 to stage-aosp-master am: 02e00dd713 am: 3e19c35fc0
am: 07ccd3a970

Change-Id: Iee1301d6b4aa4ac61100a30e4f5575496c938d13
07ccd3a9701a0c49e2111570f5f4338ad5b29819 25-Aug-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of e4653aa85 to stage-aosp-master am: 02e00dd713
am: 3e19c35fc0

Change-Id: I7a7ae3e2e97c83ef3e6b68c56d1e5f911d23c4af
3e19c35fc09fadcf037efa274e68ec2a36b7da86 25-Aug-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of e4653aa85 to stage-aosp-master
am: 02e00dd713

Change-Id: I58f95ebe898e4f0a1d331e2ffc6cc333c3ac99bd
02e00dd713b33923262ae767d40fb6f080fa14b9 25-Aug-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of e4653aa85 to stage-aosp-master

Change-Id: I9e7b395d1c12fe65f52f58df44fc670aee2ec80c
e4653aa85f57f50b5f3faff51dbc551eb3ebbee0 25-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Change getAgeMillis to use elapsed system time instead of wall-clock time."
20752bdd3a9a4eb9fbbf3dab6b9726d8eb57a050 24-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Change getAgeMillis to use elapsed system time instead of wall-clock time."
06a47b0d7baebe5637366a894dc431e48d93e24b 18-Aug-2017 Brad Ebinger <breadley@google.com> Adds Package check and TestApps test for PhoneAccount

1) Adds a check to ensure that a ConnectionService
is setting a PhoneAccount from the same Package name.

2) Adds TestApp test that switches PhoneAccount.

Bug: 27059146
Test: TestApp send intent to switch PhoneAccount
Change-Id: I5ac7dd8859d747b3aaaf5370af26a10225f8d6c2
rc/com/android/server/telecom/ConnectionServiceWrapper.java
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/CallServiceNotifier.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
estapps/src/com/android/server/telecom/testapps/TestConnectionServiceReceiver.java
a0d54307029141294015ee5517af3c494a0e7ecd 04-May-2017 Srikanth Chintala <srikchin@codeaurora.org> Emergency redial implementation

If there is change in phone account
while Emergency call redial update to
Dialer so that InCallUI gets updated with
phone account label.

Test: Unit Tests
Bug: 27059146
Change-Id: Ie72ab2901ec05d972204ed11f115a05b79173c1d
rc/com/android/server/telecom/ConnectionServiceWrapper.java
8bb2b019123e50a21709eae20edc9db043326053 04-Aug-2017 Tyler Gunn <tgunn@google.com> Change getAgeMillis to use elapsed system time instead of wall-clock time.

Changing getAgeMillis to rely on SystemClock#elapsedRealtime() to determine
the duration of a call. This ensures that changes to the device time zone,
clock updates by the network and user initiated time changes to not
impact the duration of calls in the call log.

Test: Manual, unit
Bug: 64068300
Change-Id: I62924dc7889c86a7457d05f8fbb20ab8189ece1a
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ClockProxy.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
6c3a2dd68c9ac5584f48cf5f62fa01896fccdc7d 04-Aug-2017 Tyler Gunn <tgunn@google.com> Change getAgeMillis to use elapsed system time instead of wall-clock time.

Changing getAgeMillis to rely on SystemClock#elapsedRealtime() to determine
the duration of a call. This ensures that changes to the device time zone,
clock updates by the network and user initiated time changes to not
impact the duration of calls in the call log.

Test: Manual, unit
Bug: 64068300
Change-Id: I62924dc7889c86a7457d05f8fbb20ab8189ece1a
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ClockProxy.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ebfa25aa0ba0294c7cf6e4922c7e0eb32f2e5dd8 24-Aug-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-729bcc05-d3c5-4aa4-9c1d-7a9e6ee59f06-for-git_pi-release-4296206 snap-temp-L10900000096312436

Change-Id: I5c485919f44366f46d6fad767fdb0be6bed967a7
7ea78ee5d435b20eb7ef90b6da05b9a3fd2f68d4 23-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Disconnect calls from other CS when hanging over to a self-mgd CS." into oc-mr1-dev am: 1cfe6e63dc
am: fe7355df56

Change-Id: I7815a1d2d67b972f8357985f1172f90e0ab7d6cf
fe7355df56c53a18be24d34deba63cd1508fa26c 23-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Disconnect calls from other CS when hanging over to a self-mgd CS." into oc-mr1-dev
am: 1cfe6e63dc

Change-Id: I57d3beae12013cd87bafe7f2581850adf5d9bf35
1cfe6e63dc492f92fdb6ad0b1c1420260c780678 23-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Disconnect calls from other CS when hanging over to a self-mgd CS." into oc-mr1-dev
d987c7e6979cb532f00d0eeaa247cda9ed3c185d 23-Aug-2017 Tyler Gunn <tgunn@google.com> Disconnect calls from other CS when hanging over to a self-mgd CS.

When handing over to a self-maanged ConnectionService, automatically
disconnect the other ongoing calls in other ConnectionServices.

Test: Manual
Change-Id: I4d5d51b2ec288fc4fd9c99751654c54f6c8539d6
Fixes: 63154841
rc/com/android/server/telecom/CallsManager.java
29f0cba9b94aea2010e254be9a9bb5924a9dc4bd 23-Aug-2017 Hall Liu <hallliu@google.com> Ensure that audio routes are properly logged am: 37f18d5d90 am: f994af6cca am: 7235e29fa1 am: 25b040097d -s ours
am: be2c0168e3

Change-Id: Ifa4dcfee48772ca1d69014cf50dee2235dafb22c
be2c0168e3aabccdcfa49daba6acd3b73aa4f863 23-Aug-2017 Hall Liu <hallliu@google.com> Ensure that audio routes are properly logged am: 37f18d5d90 am: f994af6cca am: 7235e29fa1
am: 25b040097d -s ours

Change-Id: I5a559063a45a923da37d145e1593e1537714fcc3
25b040097ddb363b217cb581e2aa0a558eee5bcb 23-Aug-2017 Hall Liu <hallliu@google.com> Ensure that audio routes are properly logged am: 37f18d5d90 am: f994af6cca
am: 7235e29fa1

Change-Id: I92a38e76b2c6a7f2f729de7ed65105e91a6543bc
7235e29fa1cf799e7d35bf39f93a1d1d6bfb366b 23-Aug-2017 Hall Liu <hallliu@google.com> Ensure that audio routes are properly logged am: 37f18d5d90
am: f994af6cca

Change-Id: I4a1bdf227a777ca59d224ce9f5250a26e1c20eff
f994af6ccaf24f576ebe2acfa596c10110b5d420 23-Aug-2017 Hall Liu <hallliu@google.com> Ensure that audio routes are properly logged
am: 37f18d5d90

Change-Id: I6235c51290b754ddbe63c7e9d2118f2bf159a33d
2c688cd7c893f22c282e42e02ea2e07b33b613f3 23-Aug-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-c3d19af8-7ed9-4d42-9f37-c34f7f76db73-for-git_pi-release-4293790 snap-temp-L31600000095939746

Change-Id: I10cbefa402b3ce82f849e650b1ee7b43a8224658
820ecfa5ccadbc1aeefb4f945923bcb03b9de5ef 23-Aug-2017 Hall Liu <hallliu@google.com> Include Bluetooth in baseline route calculations am: 95f2db9984 am: b5bfdc1917 am: 93bf4f7145 am: be66c70061 -s ours
am: b58bf94e74

Change-Id: Ie94a9bd6b80c7e61454ad72859c1d44fb8abe0f9
b58bf94e7461e03b3337fa6765e30bac2af98650 23-Aug-2017 Hall Liu <hallliu@google.com> Include Bluetooth in baseline route calculations am: 95f2db9984 am: b5bfdc1917 am: 93bf4f7145
am: be66c70061 -s ours

Change-Id: I4ba940c9cf935f1245f27275f1d6c562faf1cd70
be66c70061f53b782076f0436a3c502d1462d270 23-Aug-2017 Hall Liu <hallliu@google.com> Include Bluetooth in baseline route calculations am: 95f2db9984 am: b5bfdc1917
am: 93bf4f7145

Change-Id: Ie2cff93d22f389a3007c51faf6f68f42eb242305
93bf4f7145b50109fa09058c42cff198c84f1dae 23-Aug-2017 Hall Liu <hallliu@google.com> Include Bluetooth in baseline route calculations am: 95f2db9984
am: b5bfdc1917

Change-Id: I5a52d3f3f1d885d73b562dbe90964b9f538ee9dd
37f18d5d906c99745ce75955118f31428456fc9e 18-Aug-2017 Hall Liu <hallliu@google.com> Ensure that audio routes are properly logged

Make sure that the first audio route is logged in analytics.

Change-Id: I04820ba37ccf160490ed3bd87db4c34769b4aa05
Fixes: 64584823
Test: unit
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
b5bfdc19172c376bcb3b1b8963c84accba689fa4 23-Aug-2017 Hall Liu <hallliu@google.com> Include Bluetooth in baseline route calculations
am: 95f2db9984

Change-Id: I9a123b24aae1a05d28bd736905ac322dfd8106ad
629ea10deba347f47ff4b79d1afc14c22d700d68 20-Jun-2017 Hall Liu <hallliu@google.com> Include Bluetooth in baseline route calculations

Include Bluetooth in baseline route calculations to handle the scenario
where a wired headset is connected-and-disconnected while a call is on
bluetooth.

Change-Id: Ia4e4f499f1eef74e9f67c5c06e21e04befa9adfd
Fixes: 62391035
Test: ran unit tests
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
f8132b33f4743c8b7f695eb295a900397635412a 22-Aug-2017 Hall Liu <hallliu@google.com> Ensure that audio routes are properly logged am: 5cfc86b2dc
am: de5a27dc6f

Change-Id: I84231ec60d980a9dea0899c804b09f351f5d9f0f
de5a27dc6f1a26e513df2d196a30950cf6a143a2 22-Aug-2017 Hall Liu <hallliu@google.com> Ensure that audio routes are properly logged
am: 5cfc86b2dc

Change-Id: I9a6e55bd37f32a8022407c71a8f8c78e8fd43574
95f2db998498e9d5f3a45d6a6c02d6a30b09bd14 20-Jun-2017 Hall Liu <hallliu@google.com> Include Bluetooth in baseline route calculations

Include Bluetooth in baseline route calculations to handle the scenario
where a wired headset is connected-and-disconnected while a call is on
bluetooth.

Change-Id: Ia4e4f499f1eef74e9f67c5c06e21e04befa9adfd
Fixes: 62391035
Test: ran unit tests
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
f9417f72543ed5f60616ba637ef5fcddf8973214 20-Aug-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-38d4765e-6779-4912-a79f-25f77b8184a7-for-git_pi-release-4288638 snap-temp-L71800000095143664

Change-Id: I39cd1059be12e8aee26b5873e4f8f2a442911bd4
5cfc86b2dc2f912077ba6d047630ac8f4b251c06 18-Aug-2017 Hall Liu <hallliu@google.com> Ensure that audio routes are properly logged

Make sure that the first audio route is logged in analytics.

Change-Id: I04820ba37ccf160490ed3bd87db4c34769b4aa05
Fixes: 64584823
Test: unit
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
6b924f6debc0d16c489b801ac7b59823e4c72b49 17-Aug-2017 Hall Liu <hallliu@google.com> Merge "Change testapps to account for API change" into oc-mr1-dev am: d7a47b9e1f
am: 263e35f61b

Change-Id: I48a2bf27a2eee8838d3aa09cc3e3f30b77feca11
263e35f61bb218cf9877721cb1e2647e37f0ca3f 17-Aug-2017 Hall Liu <hallliu@google.com> Merge "Change testapps to account for API change" into oc-mr1-dev
am: d7a47b9e1f

Change-Id: Ic1b78784cf9e778a2c3eba1c96df37872fc347be
d7a47b9e1f9e73c7347ff6138457aaa1431e27fb 17-Aug-2017 Hall Liu <hallliu@google.com> Merge "Change testapps to account for API change" into oc-mr1-dev
d4cb43fcbd3ef030f65b274d463acb7b7edb8c33 17-Aug-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-5c36fbeb-1180-4a77-94d2-968e28da8f1f-for-git_pi-release-4280901 snap-temp-L36900000094197597

Change-Id: Ib179a6c65231ca5de4f2828a58da6514ec0c5442
40d6079d24ed1b1631ab9249add7d60feb3ee877 17-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Handle Telecom binder death." into oc-mr1-dev am: 6908075d84
am: 0fc9b83faa

Change-Id: Ic2567409fef18a8546b98f7be32cc3292ec6cd93
8222b21092302d707d68619a76717d4e7f3b50ab 17-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Enforce MODIFY_PHONE_STATE for TelecomManager system APIs." into oc-mr1-dev am: 20bbecfd86
am: 383b88a36a

Change-Id: If51d8ca2a96a72a06a2744f92b1d8419a552fc95
0fc9b83faa6c64a431aaac3a5da788576e2d8832 17-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Handle Telecom binder death." into oc-mr1-dev
am: 6908075d84

Change-Id: Icbb92dde1792520798f39db7209b5fd672b843c2
6908075d842642804631f70b6e7077ff0826023c 17-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Handle Telecom binder death." into oc-mr1-dev
383b88a36aa80a099e3ac3a280a5b001fcf87530 16-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Enforce MODIFY_PHONE_STATE for TelecomManager system APIs." into oc-mr1-dev
am: 20bbecfd86

Change-Id: I5a966e56da86d48892d917b02442ee7deffb39cb
20bbecfd8614f19b73c098bd2fad9042835e7e0b 16-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Enforce MODIFY_PHONE_STATE for TelecomManager system APIs." into oc-mr1-dev
dda3f073d5ce7c51e4705bbca6e8252a7103aaa5 16-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64680434
Change-Id: I893b118cee593e4895869d3f14f8d61ad0944519
es/values-mr/strings.xml
9e26d3d51fb28b9ff1b4ed6206c9aa7da245ac5a 16-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: c163ea9a66 -s ours
am: 51d8e8dfb1 -s ours

Change-Id: Ic9ac603758436256359c6b96c80ce90593e4a1cf
51d8e8dfb191a78a9be1cf9aba30cdb0cbb44420 16-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: c163ea9a66 -s ours

Change-Id: I90838d632f06f8d29bf3365901bbc8c3ff3f71b0
c163ea9a66e2e28630fef18319ae4f7046aa2b6a 15-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ieec4030ec6242a7153b15913e211a3616c0ef18e
es/values-en-rCA/strings.xml
es/values-mr/strings.xml
cd4488fc7b49bc4b16b77a25533446a53f53cfac 15-Aug-2017 Tyler Gunn <tgunn@google.com> Call "createConnectionComplete" callback in Telecom. am: 32caf9a4b6 am: 01e695f87f am: 6b5540e86d am: 3fb73f4532
am: 76fd0e135c

Change-Id: I6ecd7c35971b4a21f36ce4153f4f263e3d5bc503
76fd0e135c10473178f243b85ae555e7e0346536 15-Aug-2017 Tyler Gunn <tgunn@google.com> Call "createConnectionComplete" callback in Telecom. am: 32caf9a4b6 am: 01e695f87f am: 6b5540e86d
am: 3fb73f4532

Change-Id: Iad6bdb165e8b433dbd08f523629f5651b2a9d027
3fb73f45321825b09ca4f97da0e03a9ca2969a4b 15-Aug-2017 Tyler Gunn <tgunn@google.com> Call "createConnectionComplete" callback in Telecom. am: 32caf9a4b6 am: 01e695f87f
am: 6b5540e86d

Change-Id: I90901e4aaafe5ea12c10ae93d3dfb33c612ddb72
6b5540e86dbbf6c753bde32baa4e00eda2606013 15-Aug-2017 Tyler Gunn <tgunn@google.com> Call "createConnectionComplete" callback in Telecom. am: 32caf9a4b6
am: 01e695f87f

Change-Id: I7246f351d17081cdcfa51928fa89e5095e486a56
01e695f87f7725f158d18cee4c3b769d9a3afa18 15-Aug-2017 Tyler Gunn <tgunn@google.com> Call "createConnectionComplete" callback in Telecom.
am: 32caf9a4b6

Change-Id: I66c715c21beb9f6569c6a08addd3cc4b7e750594
d3228c566052e894f651c494968481824aaf9ccb 18-Jul-2017 Hall Liu <hallliu@google.com> Change testapps to account for API change

Test: builds
Bug: 63769529
Change-Id: I8f4dbc8443a33b6358062a6f299192c9d50ffd1e
estapps/src/com/android/server/telecom/testapps/TestRttActivity.java
32caf9a4b60baac9838caecb0b7c4857c799dd18 12-May-2017 Tyler Gunn <tgunn@google.com> Call "createConnectionComplete" callback in Telecom.

When done creating a connection in Telecom, call createConnectionComplete.
Note: Checks the serviceinterface for null since in the case of a
"null connection" from the ConnectionService we'll be unbound by
the time we get here.

Test: Manual
Bug: 33272455
Change-Id: Ic23f6ad65d49d2a8c70ac4d35d53feb0dd5e34bb
rc/com/android/server/telecom/ConnectionServiceWrapper.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
f7d32b57ef5e98a56a2e3960ae2f3636002bd55b 22-Jun-2017 Tyler Gunn <tgunn@google.com> Handle Telecom binder death.

There are instances where a ConnectionService dies, but we don't get the
onServiceDisconnected callback. This is most common in catastrophic
crashes of a ConnectionService. The result of this is that the calls
associated with that CS get orphaned in Telecom and never cleaned up.

Added a ServiceDeathRecipient implementation to ServiceBinder in Telecom
so that death of a CS is always caught.

Also made some logging changes to ensure we can more easily see when
a CS dies unexpectedly and why its calls were disconnected.

Fixed an issue where DtmfLocalTonePlayer was not finishing its subsession.

Test: Manual
Bug: 62912175
Change-Id: I5099592ec781af46c9d123ef2c53f48846b9ec19
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/DtmfLocalTonePlayer.java
rc/com/android/server/telecom/ServiceBinder.java
322480cc93be946c4a26b1ea9e3883aa5b928659 18-Jul-2017 Tyler Gunn <tgunn@google.com> Enforce MODIFY_PHONE_STATE for TelecomManager system APIs.

Enforcing system-only permissions for TelecomManager APIs (see the bug
for rationale as to why some methods do not have the permission
enforced).

Test: Manual / GTS
Change-Id: I3f76602820c772b763f453a216d041454e3b94e6
Fixes: 62347125
rc/com/android/server/telecom/TelecomServiceImpl.java
e0e3c22544e05dfc6cd258cac1303d4003d4af82 13-Aug-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-631994b2-37c0-4d03-8caa-bfd01530db29-for-git_pi-release-4269836 snap-temp-L23500000092503827

Change-Id: I3e89ec20b0e148013191f1d40121e21acc296249
bb1501852df3093cc7b6d2cf37d6ace65176a970 12-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ifa0145e265c2360875b03a870c66fe6b70afc2cc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-en-rCA/strings.xml
es/values-en-rXC/strings.xml
es/values-mr/strings.xml
69144ab30350a22a9a2ea3f754f18386e65f3644 11-Aug-2017 xulicheng <xulicheng@xiaomi.com> Merge "Avoid telecom crash" into oc-mr1-dev am: 15b4cf3a12
am: 0a738ec425

Change-Id: Ia2abe37af52aa41d7be3b67a7db3f6aecf363b8b
0a738ec42544080518eab45378d8fe74445d1164 11-Aug-2017 xulicheng <xulicheng@xiaomi.com> Merge "Avoid telecom crash" into oc-mr1-dev
am: 15b4cf3a12

Change-Id: I9494349bd517d55df4dfc0409f77871f0a433ef5
6cd747b6f65ef85f25e3b3d46e1734e340bed1ec 11-Aug-2017 Hall Liu <hallliu@google.com> Merge "Try BT audio connection one more time before failing" am: 48a05407ec am: fcdfdae255 am: 267a493c90 am: cea3eec57d
am: 459e2177dd

Change-Id: I5f131633ae4eec1bb3e81e356a000169f3f90c6e
ef8272054251d2b394cd04220762d11b1ec0347b 11-Aug-2017 Hall Liu <hallliu@google.com> Merge "Add wakelock to UserCallActivity" am: ff389cfef0 am: ee995e795d am: a07113d99e am: fad885ae6e
am: 8f7a63ff8d

Change-Id: Ieea8cdb155504a61bc9f58792e2ae0fcd605710c
cd0c68a9d74ce24b27c86dc6693ffaa1013116cc 11-Aug-2017 Hall Liu <hallliu@google.com> Remove an old AudioManager hack am: 5fbe88c436 am: dd24977034 am: db29f7d54b am: bb21af6f38
am: 0eb4036c2e

Change-Id: I13130b1fb6f8288884540558f24b1918b3147141
15b4cf3a126b0bf127109d906d3fac7628976624 11-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Avoid telecom crash" into oc-mr1-dev
459e2177dd9694092ccd4373dac0352afa494d56 11-Aug-2017 Hall Liu <hallliu@google.com> Merge "Try BT audio connection one more time before failing" am: 48a05407ec am: fcdfdae255 am: 267a493c90
am: cea3eec57d

Change-Id: I2a66116f02ff1e2ac2330761e793587dd2811b39
8f7a63ff8d01e03bfe17d2ccc00d96a86ffe5244 11-Aug-2017 Hall Liu <hallliu@google.com> Merge "Add wakelock to UserCallActivity" am: ff389cfef0 am: ee995e795d am: a07113d99e
am: fad885ae6e

Change-Id: I81c56e171568e0f4edf886a2ef15f95197964dca
0eb4036c2e7fef7a716bef3d9941aeae06c9b183 11-Aug-2017 Hall Liu <hallliu@google.com> Remove an old AudioManager hack am: 5fbe88c436 am: dd24977034 am: db29f7d54b
am: bb21af6f38

Change-Id: I418cf977d499bf3237ebd521850ebc959e9857ad
cea3eec57df0723f8cb5e15987830c11a2dcaa57 11-Aug-2017 Hall Liu <hallliu@google.com> Merge "Try BT audio connection one more time before failing" am: 48a05407ec am: fcdfdae255
am: 267a493c90

Change-Id: Ic5b2a421aa1dda56a305ab60de467790cb7911c6
fad885ae6e817691301f1597e9e0ebaed8372456 11-Aug-2017 Hall Liu <hallliu@google.com> Merge "Add wakelock to UserCallActivity" am: ff389cfef0 am: ee995e795d
am: a07113d99e

Change-Id: Ic22861f754730364ef2f5aa0ffd7846612aefe3e
bb21af6f384dc7aeece6a55c4a6cddbd7f3e9ba7 11-Aug-2017 Hall Liu <hallliu@google.com> Remove an old AudioManager hack am: 5fbe88c436 am: dd24977034
am: db29f7d54b

Change-Id: I1537c07eb021d3624ede79a0032af3e678ecce55
267a493c90e781d36cecf0bb3d50502f20379863 11-Aug-2017 Hall Liu <hallliu@google.com> Merge "Try BT audio connection one more time before failing" am: 48a05407ec
am: fcdfdae255

Change-Id: Ie122334215a75017da395c7d2e42b9e3131a509d
a07113d99e43cbd2ca3f0f86835734ae110637d4 11-Aug-2017 Hall Liu <hallliu@google.com> Merge "Add wakelock to UserCallActivity" am: ff389cfef0
am: ee995e795d

Change-Id: I2e2b06592bf8cd8b33967fd609e4a2f1517eb6dc
db29f7d54b6c90c4205bd9fda524603b3623a213 11-Aug-2017 Hall Liu <hallliu@google.com> Remove an old AudioManager hack am: 5fbe88c436
am: dd24977034

Change-Id: Ia867318895954f6ceb390a33ce8ada93010f7d5d
fcdfdae25576586710ed1767542e7f6d8984f61e 11-Aug-2017 Hall Liu <hallliu@google.com> Merge "Try BT audio connection one more time before failing"
am: 48a05407ec

Change-Id: I8934d5ee2e2e968f8b4a928270f2d18b6deb7936
ee995e795ddcbd8a55d5cc26893a84e7f52565b2 11-Aug-2017 Hall Liu <hallliu@google.com> Merge "Add wakelock to UserCallActivity"
am: ff389cfef0

Change-Id: Ia9c0cda3781f70c20181180c50bf4b47cc28f672
dd249770348c7535a23125540261d5a7970a9a5f 11-Aug-2017 Hall Liu <hallliu@google.com> Remove an old AudioManager hack
am: 5fbe88c436

Change-Id: I91542154698de12571f96440f8f1f90c94fc012d
48a05407ec5474071e689fd07f3f56af5493b650 11-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Try BT audio connection one more time before failing"
ff389cfef0a5d9a5c04e5eafd447c823146d4554 11-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add wakelock to UserCallActivity"
9eecb148de75e719d18a2259a7f0853a1f216427 31-May-2017 Hall Liu <hallliu@google.com> Add wakelock to UserCallActivity

Add a wakelock to make sure that the phone doesn't go to sleep in the
middle of trying to initiate an outgoing call through Bluetooth (or
something else that doesn't require the screen being on).

Change-Id: Ide945fabbb474cb8ce60fbf704698e566e9f9b01
Fixes: 38328207
Test: manual
ndroidManifest.xml
rc/com/android/server/telecom/components/UserCallActivity.java
5fbe88c436df86390dcdcaf82b3a0ccf385c11a5 27-Jun-2017 Hall Liu <hallliu@google.com> Remove an old AudioManager hack

Remove the round-trip back to normal mode when switching from in-call to
ringtone mode. It is apparently no longer necessary and is causing
problems with Bluetooth.

Change-Id: Iabe2e03c791b47cf64530678e6be4a1cec8007bc
Fixes: 62476271
Test: manual
rc/com/android/server/telecom/CallAudioModeStateMachine.java
51734cbf76394b1184602fd8cf82e403f9e943a2 18-Jul-2017 Hall Liu <hallliu@google.com> Try BT audio connection one more time before failing

When attempting to connect to bluetooth, if connectAudio() returns
false, retry twice instead of once to account for particularly slow HFP
devices.

Bug: 62753089
Test: manual, with formerly problematic device
Change-Id: Ia984db2183d807e11e39a7dff0fb382b7c2148f5
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
91112f2cace073f4f1fc249f5b0b34729bb007f5 20-Jul-2017 xulicheng <xulicheng@xiaomi.com> Avoid telecom crash

mRingingCalls may not have call when startCallWaiting be invoked

Test: Build
Bug: https://issuetracker.google.com/issues/63908285
Bug: 64542222
Change-Id: I3e3c7a7c7286fddafda27913611e84adf55c908b
Signed-off-by: xulicheng <xulicheng@xiaomi.com>
rc/com/android/server/telecom/CallAudioManager.java
7b5506ea87bc8dcfc58f291e35ab4cb086baabe5 10-Aug-2017 xulicheng <xulicheng@xiaomi.com> Avoid telecom crash am: 27437d92a6 am: f16bec4c57 am: 783ba0a048 am: e67e829a57
am: cc8fd40f8c

Change-Id: I065075d1e97790d0cd6fa8825025d8f4c134562f
cc8fd40f8c47e9b94341d00200275a2b023125bf 10-Aug-2017 xulicheng <xulicheng@xiaomi.com> Avoid telecom crash am: 27437d92a6 am: f16bec4c57 am: 783ba0a048
am: e67e829a57

Change-Id: I2734ed951aa60571733a57ec5b603d730cef8d03
e67e829a5787b7df8fbe3d3f72aea07f0be6c0d2 10-Aug-2017 xulicheng <xulicheng@xiaomi.com> Avoid telecom crash am: 27437d92a6 am: f16bec4c57
am: 783ba0a048

Change-Id: I6555ed044788333f1783e69593e57e04f2c6ccd5
783ba0a04858b331e10b53f657e753885a83372c 10-Aug-2017 xulicheng <xulicheng@xiaomi.com> Avoid telecom crash am: 27437d92a6
am: f16bec4c57

Change-Id: I4ff6ef4f8993506a181919b3f96c5611bbab92be
f16bec4c572f0fc93f7fbd79d46727a41239d06a 10-Aug-2017 xulicheng <xulicheng@xiaomi.com> Avoid telecom crash
am: 27437d92a6

Change-Id: I58a1c90c83e851af7550538104bf66595bb5041e
27437d92a6178d1419f0a9c46a46cbee36dff0ef 20-Jul-2017 xulicheng <xulicheng@xiaomi.com> Avoid telecom crash

mRingingCalls may not have call when startCallWaiting be invoked

Test: Build
Bug: https://issuetracker.google.com/issues/63908285
Change-Id: I3e3c7a7c7286fddafda27913611e84adf55c908b
Signed-off-by: xulicheng <xulicheng@xiaomi.com>
rc/com/android/server/telecom/CallAudioManager.java
586450edfbc5daa24ba15dce6d3e2962f7767a6d 07-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: ee1ab312ec -s ours am: ed3ba01c62 -s ours am: e30b5b3504 -s ours
am: 2b630313ac -s ours

Change-Id: Ib21d576f9d7a536e6281781c3f82509bbb4cb496
2b630313acb70b90abc740441106c2fb2fda0a7d 07-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: ee1ab312ec -s ours am: ed3ba01c62 -s ours
am: e30b5b3504 -s ours

Change-Id: I241e7bdfe67a676e2112a3196099dad7e4b1df6f
e30b5b35044745d3a4e1842e8c6b1d04a6610212 07-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: ee1ab312ec -s ours
am: ed3ba01c62 -s ours

Change-Id: I72790292dfe53727342dd81a3bb867bfb484f0cf
ed3ba01c623485e8d41e3547bdc7f09a59ed11fd 07-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: ee1ab312ec -s ours

Change-Id: Iba8a8047028129f2ac717c2885bafcc8ff6a0c3a
ee1ab312ec7a6798db0fcbce6d5381e07105d5c6 07-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Id04052bc5c11a46644578ccfb1137f4f9a6f47b3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az/strings.xml
es/values-bg/strings.xml
es/values-bn/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-eu/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-gu/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-is/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-kk/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk/strings.xml
es/values-ml/strings.xml
es/values-mn/strings.xml
es/values-mr/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-nb/strings.xml
es/values-ne/strings.xml
es/values-nl/strings.xml
es/values-pa/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta/strings.xml
es/values-te/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
7af6a50278c7b03a496b309cd5aee6898e5cb77a 06-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 3856da68b6 -s ours
am: a17c68765d -s ours

Change-Id: Ie4f16fe7a85b5c39ef902dc6184cdd7343832542
a17c68765d4f0bf68a45d31d553948de737ad859 06-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 3856da68b6 -s ours

Change-Id: I78cad3a3402d8ad89a198abffa2e1b4f322a4a18
3856da68b69990e45bf470b99414e0c5e525085d 06-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I89960815f1190095593fdd1072f8eaf1e40f424b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-en-rXC/strings.xml
es/values-uz/strings.xml
bc5e9a13395b6f842b0591a93db9f2ffbad68b74 06-Aug-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-64fc473b-7e45-48f5-b2f7-3c916e338608-for-git_pi-release-4249735 snap-temp-L34700000089732387

Change-Id: Id5546b9d548eae48aa65ed0b08f7180f5bc77d9e
ab024cbc3c1f7252a47c3ded53d714abcc7c410f 05-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 5f89f38416 -s ours am: 780385e577 -s ours
am: abfe8b93d6 -s ours

Change-Id: I191c66b6751d50d7f6829b02cbf0a995a3f44bff
cab137d94af4a63cd3314c66f948740fdcb30624 05-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 5f89f38416 -s ours am: e677d2c862 -s ours
am: 751a83f2f4 -s ours

Change-Id: I48338b1917a946f7f50eab59936b3af32fda08e5
abfe8b93d653d12b807d22c239e91d940cc16ead 05-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 5f89f38416 -s ours
am: 780385e577 -s ours

Change-Id: Ifd6dfd941b03e270c4de399f6a0a1785f726c6ca
751a83f2f4011b388f2c665e0cdeb6398f4333a3 05-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 5f89f38416 -s ours
am: e677d2c862 -s ours

Change-Id: Ibcc17ddca8582c98f45018574c658b368b7b36d1
e677d2c862962113a0a97a87bfb31d1a183d3041 05-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 5f89f38416 -s ours

Change-Id: I423dfcf984eeb7228112270ca417107d08a82499
780385e5770c16ba38af083b2db49819719e4f41 05-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 5f89f38416 -s ours

Change-Id: I1336068dfed47549222830c91f0a2f06e8214a95
5f89f38416b5eba0a922dd792ed5b0ab4a433a02 05-Aug-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I826e59e9d33ea13b0ba755a0e0637b1d227579ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-hu/strings.xml
es/values-uz/strings.xml
38e54fdba31aeb5c659b8ca95df9fb59b5e64a08 04-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Merge "Adding new haptic pattern for ringing incoming calls." into oc-dr1-dev am: 3b4b1f000d am: 68ded012f3" into oc-mr1-dev-plus-aosp
am: 7b3f1b1749

Change-Id: I16fbc54e9c50b2c05dacf0ee34fe7d4b01670e21
5e8403abc646b15434827e83d7a64f9d87c9775c 04-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Adding new haptic pattern for ringing incoming calls." into oc-dr1-dev am: 3b4b1f000d am: 92da0ed84d
am: a5c9e9a69b

Change-Id: Id5c6d05ef5abc8a2892d47bb9105b1f4998c3596
7b3f1b1749f325cd9a987a30d12cf1764e1afbd3 04-Aug-2017 Android Build Merger (Role) <android-build-merger@google.com> Merge "Merge "Adding new haptic pattern for ringing incoming calls." into oc-dr1-dev am: 3b4b1f000d am: 68ded012f3" into oc-mr1-dev-plus-aosp
a5c9e9a69b4d7f74d594a090841c0ddae101b46b 04-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Adding new haptic pattern for ringing incoming calls." into oc-dr1-dev am: 3b4b1f000d
am: 92da0ed84d

Change-Id: Iec2083a29b7e89b4ecf0488c5f1e5ba6effd208c
749ca7ee1f750ba1d9f92a1f083ec2f37551d4b9 04-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Adding new haptic pattern for ringing incoming calls." into oc-dr1-dev am: 3b4b1f000d
am: 68ded012f3

Change-Id: I7804480fdb2a4c897eb08b96490773164586d99e
68ded012f3aa9dd732bbca0cd63d335132b1096b 04-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Adding new haptic pattern for ringing incoming calls." into oc-dr1-dev
am: 3b4b1f000d

Change-Id: I2a863136dca969d67e04666bc8ff1bfb77a971bb
92da0ed84db85f7df775c277a38b59ad3ccabb8c 04-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Adding new haptic pattern for ringing incoming calls." into oc-dr1-dev
am: 3b4b1f000d

Change-Id: I3b7101ba9ace42ed6a4c7e089cc162e8f4788267
3b4b1f000d3f80d520365621133e8189db856c4a 04-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Adding new haptic pattern for ringing incoming calls." into oc-dr1-dev
af9c552e9aed8a0dd29a142bac326ce206283b81 03-Aug-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-d4f45cf4-9d73-4828-baa4-f73aa4280cd0-for-git_pi-release-4241208 snap-temp-L10800000088711883

Change-Id: I1bf64273111b6b8983cb58c4c44cdb4a1c586bde
c258106aade28d6c7e8c22c5f31bc26ea6b9edd2 03-Aug-2017 Hall Liu <hallliu@google.com> Send updateHeadsetPhoneState when child calls change am: 6f80b3c38d am: 4dc9c0d833 am: c74203ab7b am: 75d2ded21f
am: 566f7ce2cc

Change-Id: I4d7656529081e682c0c4154f83561c82bcef21ab
a1853ab23fdc2032ceac43919bad9a1fd28ed479 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Send updateHeadsetPhoneState when child calls change" into oc-dr1-dev am: 9bdb06ab72 am: 18023a7c0e
am: 43c2df3ede

Change-Id: I4f5ad9a15171020ba04895570f8de5752d58f955
451ea94f786ff62badc98182b9238a180752c34f 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Send updateHeadsetPhoneState when child calls change" into oc-dr1-dev am: 9bdb06ab72 am: 4f9e42c8c6
am: 251258ec40

Change-Id: Ie5792ab116a6ac4a84976454376bd6b7509f0892
566f7ce2cc3fcb6b7b3da4a79cd42bc6f04c3909 03-Aug-2017 Hall Liu <hallliu@google.com> Send updateHeadsetPhoneState when child calls change am: 6f80b3c38d am: 4dc9c0d833 am: c74203ab7b
am: 75d2ded21f

Change-Id: Idd4df3ae12921dd33d412616f7ab91c3da46fda2
75d2ded21f03551fabd377c4449f75435ffea4ed 03-Aug-2017 Hall Liu <hallliu@google.com> Send updateHeadsetPhoneState when child calls change am: 6f80b3c38d am: 4dc9c0d833
am: c74203ab7b

Change-Id: I2dacfb99dae7ff7c74cf551ddc53bef83733911d
c74203ab7b0a613932b484f7892db8d87ee9ebe8 03-Aug-2017 Hall Liu <hallliu@google.com> Send updateHeadsetPhoneState when child calls change am: 6f80b3c38d
am: 4dc9c0d833

Change-Id: Iad76d9cbc4f1bc7442a18b5162eb25c858c2c4e8
4dc9c0d833cf8c5582b79483ed689684fbc01c56 03-Aug-2017 Hall Liu <hallliu@google.com> Send updateHeadsetPhoneState when child calls change
am: 6f80b3c38d

Change-Id: Iea707773f9968f8c10c4700390ec9e6f80dd229e
43c2df3edecbca829377dbdf9794b7da42dc7326 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Send updateHeadsetPhoneState when child calls change" into oc-dr1-dev am: 9bdb06ab72
am: 18023a7c0e

Change-Id: I45ac70b73fb691fb9c34ed9a247b3d7d4e3a32ef
251258ec400360ad2a3c755331da8e508afc75e8 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Send updateHeadsetPhoneState when child calls change" into oc-dr1-dev am: 9bdb06ab72
am: 4f9e42c8c6

Change-Id: I7e5d90e1328c0b1165ca1229cc1dedc07d3517fe
18023a7c0e895835fda25dab40436292027f20f2 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Send updateHeadsetPhoneState when child calls change" into oc-dr1-dev
am: 9bdb06ab72

Change-Id: Icb123dc0dfc7d469862cf6f9dbe1fc1213754c1e
4f9e42c8c617b54bda1b9ff0ecd4697df8fe87ac 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Send updateHeadsetPhoneState when child calls change" into oc-dr1-dev
am: 9bdb06ab72

Change-Id: I78b99690c1383f73388950d175a1d06ae52dd593
6f80b3c38d678b082c6e2b85a593402592be68be 01-Aug-2017 Hall Liu <hallliu@google.com> Send updateHeadsetPhoneState when child calls change

In BluetoothPhoneService, don't debounce the notification of the state
change if the number of child calls change. It might take a while before
children are added to a conference, so we should inform the headset that
something changed so that it'll actually pick up on the child calls.

Change-Id: Ia7d458556cf8ec96293a677076c58dcaab0d7387
Test: manual
Fixes: 64041266
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
9bdb06ab7281d7816ad5581d681e3f5c8cc69952 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Send updateHeadsetPhoneState when child calls change" into oc-dr1-dev
ca1369cfe2327656b012422e28ae6c7a2ccca9a0 01-Aug-2017 David Lin <dtwlin@google.com> Fix issue with USB headset not being recognized when boots am: 22c2ce9cfe am: d764c75414
am: a39b162d0b

Change-Id: Iff41b0d130b37c61a28548db458abcaf11674017
a3e650635caed4f6b7d3b66535d9c1ac631262d4 01-Aug-2017 David Lin <dtwlin@google.com> Fix issue with USB headset not being recognized when boots am: 22c2ce9cfe am: 7ed2b496b6
am: d2d63350b7

Change-Id: I38f311a22ff90d085dd4192ca0439ffe4e833629
a39b162d0b988d5eb35edc2cc66ba3ecf1908e23 01-Aug-2017 David Lin <dtwlin@google.com> Fix issue with USB headset not being recognized when boots am: 22c2ce9cfe
am: d764c75414

Change-Id: Iae938b5ba3fed43b0c444d44f4576d812cb571af
d2d63350b756e4f4e36fa1939f5e567d18a6225a 01-Aug-2017 David Lin <dtwlin@google.com> Fix issue with USB headset not being recognized when boots am: 22c2ce9cfe
am: 7ed2b496b6

Change-Id: I9510ee7c4c8b4a6d1608c8a3ae10e01f1d972702
7ed2b496b655b5d494ef024474d626e4d3ceb433 01-Aug-2017 David Lin <dtwlin@google.com> Fix issue with USB headset not being recognized when boots
am: 22c2ce9cfe

Change-Id: I7e98cdf43e2803fc3b9a400cd694540f9cff7235
d764c75414a19d6b3bb68a4996bbbb710fdf03dc 01-Aug-2017 David Lin <dtwlin@google.com> Fix issue with USB headset not being recognized when boots
am: 22c2ce9cfe

Change-Id: Idc346daef171474bd3112aec8863f833b2d1c012
6a89ba2edab624de0dfa9af1d504f683d0130817 01-Aug-2017 Hall Liu <hallliu@google.com> Send updateHeadsetPhoneState when child calls change

In BluetoothPhoneService, don't debounce the notification of the state
change if the number of child calls change. It might take a while before
children are added to a conference, so we should inform the headset that
something changed so that it'll actually pick up on the child calls.

Change-Id: Ia7d458556cf8ec96293a677076c58dcaab0d7387
Test: manual
Fixes: 64041266
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
9d52d391d66a0fb65063f8c5063a37e3c8d32452 31-Jul-2017 Tyler Gunn <tgunn@google.com> Adding new haptic pattern for ringing incoming calls.

Adding new vibration pattern for incoming ringing calls per bug.

Test: Manual
Change-Id: I38c38d18a775561a8140229546fd38f8ea363ea9
Fixes: 62206991
rc/com/android/server/telecom/Ringer.java
22c2ce9cfe71b1d905b9af3bc28513a8eba180c4 28-Jul-2017 David Lin <dtwlin@google.com> Fix issue with USB headset not being recognized when boots

This change removes the use of obsoleted AudioManager.isWiredHeadsetOn API.

Bug: 62475394
Test: manual headset and voice call test
Change-Id: I81fb37fd26ab81b927b1cc23951c5d4e2ee6724e
Signed-off-by: David Lin <dtwlin@google.com>
rc/com/android/server/telecom/WiredHeadsetManager.java
3b7a9383b28f44f56aa8e88c160927b3acf7ef40 27-Jul-2017 Hall Liu <hallliu@google.com> Merge "Merge "Add TYPE_USB_HEADSET to WiredHeadsetManager" into oc-dr1-dev am: f163650040 am: e73ddbfe72" into oc-mr1-dev-plus-aosp
am: 5bb5bd91fe

Change-Id: If4c83abc8db6f4cd3c9efb9b3ecad545e8e0776e
392aac4bcb79ad83ff3e95de23d9a061de566a5f 27-Jul-2017 Hall Liu <hallliu@google.com> Merge "Add TYPE_USB_HEADSET to WiredHeadsetManager" into oc-dr1-dev am: f163650040 am: 4e23eb4ac7
am: 71fcebeaf8

Change-Id: Iaa0538e5375420aaaa30c873f98a19f703154aa0
5bb5bd91fe9398a956bf4107738e6e0c59caff56 27-Jul-2017 Android Build Merger (Role) <android-build-merger@google.com> Merge "Merge "Add TYPE_USB_HEADSET to WiredHeadsetManager" into oc-dr1-dev am: f163650040 am: e73ddbfe72" into oc-mr1-dev-plus-aosp
c766f7f3fdabc35b2f671eacbdfb77a36b6c2791 27-Jul-2017 Hall Liu <hallliu@google.com> Merge "Add TYPE_USB_HEADSET to WiredHeadsetManager" into oc-dr1-dev am: f163650040
am: e73ddbfe72

Change-Id: Id2745f53d9d0d86285e7371208cad1571e9654d1
71fcebeaf8ca7253e665b759bd924b3f77664e09 27-Jul-2017 Hall Liu <hallliu@google.com> Merge "Add TYPE_USB_HEADSET to WiredHeadsetManager" into oc-dr1-dev am: f163650040
am: 4e23eb4ac7

Change-Id: I6e4002e593707d6dba4456ddc3c7b98bd5db2aaa
4e23eb4ac731ca9aa93523d533b735b60937d4da 27-Jul-2017 Hall Liu <hallliu@google.com> Merge "Add TYPE_USB_HEADSET to WiredHeadsetManager" into oc-dr1-dev
am: f163650040

Change-Id: I677326704573c016e231929a472c79e796cb5ced
e73ddbfe7239d442e70fa2d2098c76a927946883 27-Jul-2017 Hall Liu <hallliu@google.com> Merge "Add TYPE_USB_HEADSET to WiredHeadsetManager" into oc-dr1-dev
am: f163650040

Change-Id: Iec335920d92827117eca9884687d25eecbd6e2a3
f1636500405fae4a373314c8dbe12ad5d8aa091a 27-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add TYPE_USB_HEADSET to WiredHeadsetManager" into oc-dr1-dev
ad9c02ecbd6874a01e726d9a369f2c9147d7449e 26-Jul-2017 Bill Yi <byi@google.com> Revert "Import translations. DO NOT MERGE"

This reverts commit 58575673fff1e9dff97785ae230a63bb070eafa7.

Change-Id: I98c0d7846446ac5372f6f03d98fe135f58bfc3f0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-bn/strings.xml
es/values-bs/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-eu/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-gu/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-is/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-kk/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk/strings.xml
es/values-ml/strings.xml
es/values-mn/strings.xml
es/values-mr/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-nb/strings.xml
es/values-ne/strings.xml
es/values-nl/strings.xml
es/values-pa/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta/strings.xml
es/values-te/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
2e6152cba706a46f81f291d43804fb838d73c45c 26-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
f3f2280b63960c1b588f1af69ade9cb3ffece8a0 25-Jul-2017 Hall Liu <hallliu@google.com> Don't unmute when answering a handover connection am: 25921e8d46 am: 70cb1637a6
am: c089313614

Change-Id: I43fe25f3da496ed68abf472e4787f2cc123be67f
28115f47aaa45a01eaf6a714c73be95cae8ffc2e 25-Jul-2017 Hall Liu <hallliu@google.com> Don't unmute when answering a handover connection am: 25921e8d46 am: 7b1c214926
am: a818e8bc60

Change-Id: I9a58ee5ac3eef397314fbd0cfe26a67db8980d6c
c089313614a768ceb1e547a3a01015c9cee0e0fc 25-Jul-2017 Hall Liu <hallliu@google.com> Don't unmute when answering a handover connection am: 25921e8d46
am: 70cb1637a6

Change-Id: I4597148b121466b34f598c9be37b45215ade9807
a818e8bc6087e06d427c8f84c30d5551b01e5219 25-Jul-2017 Hall Liu <hallliu@google.com> Don't unmute when answering a handover connection am: 25921e8d46
am: 7b1c214926

Change-Id: Ibb9df205ed265477eaffba206259f1483da8e80e
70cb1637a6c7bcbefa2bb2c7a7e30742035bfe0b 25-Jul-2017 Hall Liu <hallliu@google.com> Don't unmute when answering a handover connection
am: 25921e8d46

Change-Id: I797650bdb9ebd2e5d586e1de2ca52cd9cf14172e
7b1c214926b1ed97f799e8752d44c552dfcf1925 25-Jul-2017 Hall Liu <hallliu@google.com> Don't unmute when answering a handover connection
am: 25921e8d46

Change-Id: I8a7253d03a9ed84fbdd0f43a91e765bf1c76c6db
58575673fff1e9dff97785ae230a63bb070eafa7 25-Jul-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Icc718f9674c12a1cebc78bb909bfe1bdbd6873a0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-bn/strings.xml
es/values-bs/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-eu/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-gu/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-is/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-kk/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk/strings.xml
es/values-ml/strings.xml
es/values-mn/strings.xml
es/values-mr/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-nb/strings.xml
es/values-ne/strings.xml
es/values-nl/strings.xml
es/values-pa/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta/strings.xml
es/values-te/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
25921e8d464cf57c570b4757060daa2b41315044 25-Jul-2017 Hall Liu <hallliu@google.com> Don't unmute when answering a handover connection

We usually unmute the mic when a new call is answered. However, since
handovers go through the same code path, they'd get unmuted too. We want
to preserve the mute behavior from pre-handover, so add a special case
check.

Bug: 63795849
Test: manual
Change-Id: I7c09252d9541ab41c4bb72e5311e64d3c12b53ba
rc/com/android/server/telecom/CallAudioManager.java
16b72880ad37d7867bb676c4497b00264329a373 25-Jul-2017 Hall Liu <hallliu@google.com> Add TYPE_USB_HEADSET to WiredHeadsetManager

Add the device type -- some usb headsets weren't being recognized
properly

Change-Id: I4cca48c065d4272fb96a2fc1f23dff0961f3b59b
Fixes: 62475394
Test: manual
rc/com/android/server/telecom/WiredHeadsetManager.java
a81f4d7814acb75b99f871b0348bdef67e0f1c46 20-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
40b252da6bf60cd7c8f9c1eb045f14625ef56698 20-Jul-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Iaa2a37012bcfe99500fdd6f5fa4e28aef3f514c0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
es/values-uz/strings.xml
4fc672a3e101006050f60a317883fbcb1aaa33de 20-Jul-2017 Jimmy Wu <jimmyw@nvidia.com> Merge "Fix audio state issue for MT IMS call" am: bc7f1814b2 am: 7f998daee3 am: 971ac7b807
am: 15618de008

Change-Id: I04992ad4c3c27931476ec3ddc01c5d72479d60cf
15618de00870dee3b472a3645a5b84fe362cd164 20-Jul-2017 Jimmy Wu <jimmyw@nvidia.com> Merge "Fix audio state issue for MT IMS call" am: bc7f1814b2 am: 7f998daee3
am: 971ac7b807

Change-Id: Ie628e37405c362e4b8020ad3fa6e7e592661b605
971ac7b8071ef929c1e5a8417bfbc22d0968b137 20-Jul-2017 Jimmy Wu <jimmyw@nvidia.com> Merge "Fix audio state issue for MT IMS call" am: bc7f1814b2
am: 7f998daee3

Change-Id: Ia372ea4d89c41d43ddd40b4eeacdb005e64009b0
7f998daee3db4045a1be3579cf07806bbf9ea70c 20-Jul-2017 Jimmy Wu <jimmyw@nvidia.com> Merge "Fix audio state issue for MT IMS call"
am: bc7f1814b2

Change-Id: I06bd242281f33e2f9f42a0f14bf511c4211a4ff4
bc7f1814b29fcbf0c86e7f135393c9449ae7f344 20-Jul-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix audio state issue for MT IMS call"
c8b268f1621e69ae3cc566b2356117608592dd0d 18-Jul-2017 Hall Liu <hallliu@google.com> Try BT audio connection one more time before failing am: f789bc0180
am: 0a9da40502

Change-Id: If249b2e01ceeb874ada3cdb6664b91745b418d5c
0a9da40502b69277e81aad7da69ab0eca0ec11d1 18-Jul-2017 Hall Liu <hallliu@google.com> Try BT audio connection one more time before failing
am: f789bc0180

Change-Id: Iff477a7dd1b5bf3c40de65871855535318a9b3e3
f789bc01803194bcdfe47c8257c5cd141519076a 18-Jul-2017 Hall Liu <hallliu@google.com> Try BT audio connection one more time before failing

When attempting to connect to bluetooth, if connectAudio() returns
false, retry twice instead of once to account for particularly slow HFP
devices.

Bug: 62753089
Test: manual, with formerly problematic device
Change-Id: Ia984db2183d807e11e39a7dff0fb382b7c2148f5
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
f0148fe6ecfb84d07647aa11e04c3c98e4b754a7 12-Jul-2017 Brad Ebinger <breadley@google.com> Don't log Self-Managed calls that ended before complete am: c89cb63327
am: 16b94ec30b

Change-Id: Ie2d88f146aa7b9274d1d69f2c95e2df4103c627b
16b94ec30be832a3f5509bc8bf5c3ded89237640 12-Jul-2017 Brad Ebinger <breadley@google.com> Don't log Self-Managed calls that ended before complete
am: c89cb63327

Change-Id: I249014d7540151d5b9b2a00712adff4035d53be9
c89cb63327f756be5480c3f736c2f735410f5b74 11-Jul-2017 Brad Ebinger <breadley@google.com> Don't log Self-Managed calls that ended before complete

We used to log all handovers that did not end in
failure, including handovers that were still in
progress when the original call ended. We now only
log handovers that completed successfully.

Bug: 63096530
Test: Manual, procedure in Bug report, Telecom unit tests
Change-Id: I035f38e23ab1270f7d659e30268956d9b6785b5a
rc/com/android/server/telecom/CallLogManager.java
2f6491cd5ce46479629d40727a151eca37e9ffcb 11-Jul-2017 Brad Ebinger <breadley@google.com> Log Outgoing rejected/canceled VT calls as video am: b079fc5ba7
am: 3aa99d119f

Change-Id: Ibfbd5b02e6c11167de28a9838ddab70934d28431
3aa99d119fbfc61d6642cdcde620a3b2d0294407 11-Jul-2017 Brad Ebinger <breadley@google.com> Log Outgoing rejected/canceled VT calls as video
am: b079fc5ba7

Change-Id: I655e5549d3afe79427e2af25433d159614868ebc
65ef9a7acb09ed97009c5acac9a8131c1e168090 11-Jul-2017 Tyler Gunn <tgunn@google.com> Merge "Show time stamp of missed call notification created by Telecom" am: 49b0d0bc27 am: a1f135ff3c am: 134d03cb1d
am: 6afec93c7a

Change-Id: I291025465bd5e20049aa89270c61685f39be1407
6afec93c7a6365e8aa40788b6ec6faa7ce1375ed 11-Jul-2017 Tyler Gunn <tgunn@google.com> Merge "Show time stamp of missed call notification created by Telecom" am: 49b0d0bc27 am: a1f135ff3c
am: 134d03cb1d

Change-Id: Ic903686a7a3179f1c14ff2a2c5fec8e12d30c9fa
134d03cb1d97b7130b78e059245d9b824709536e 11-Jul-2017 Tyler Gunn <tgunn@google.com> Merge "Show time stamp of missed call notification created by Telecom" am: 49b0d0bc27
am: a1f135ff3c

Change-Id: I160d7430a94c62aad978770c5344eb03632b7efc
a1f135ff3cb8ca7b44ecca755116f3c4f18b6482 11-Jul-2017 Tyler Gunn <tgunn@google.com> Merge "Show time stamp of missed call notification created by Telecom"
am: 49b0d0bc27

Change-Id: I95af2499af9aebde0bed0f44c6aa175522b32d82
49b0d0bc274818b5e6e57f1cf13476894c080b5d 11-Jul-2017 Tyler Gunn <tgunn@google.com> Merge "Show time stamp of missed call notification created by Telecom"
b079fc5ba77b79175837c1132211b9d81cb9ad78 08-Jul-2017 Brad Ebinger <breadley@google.com> Log Outgoing rejected/canceled VT calls as video

When placing a call that is rejected or canceled before
it went to active, we used to log those calls as audio calls.

This change fixes that bug and correctly logs these
canceled/rejected calls as video calls.

Test: Manual, telecom unit tests
Bug: 63099560
Change-Id: I8eff4c99d06a50c7d19ec3cfa08524cf1ad79ac2
rc/com/android/server/telecom/Call.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/VideoCallTests.java
fe90a7982782761ba82cb5a0a045a418529b6f7f 06-Jul-2017 Brad Ebinger <breadley@google.com> Fix call log notification bug for self-managed calls am: 38141eefcd
am: ad88035821

Change-Id: If43b021a3ac4b049df377ad23ad6048c34f59e9c
ad88035821a52b5592f9f1ff2e272a6def3d401d 06-Jul-2017 Brad Ebinger <breadley@google.com> Fix call log notification bug for self-managed calls
am: 38141eefcd

Change-Id: I846df2048cc92be8785378d24fcb4b138930b664
38141eefcd12f5ff9127612da374d03a4803de54 05-Jul-2017 Brad Ebinger <breadley@google.com> Fix call log notification bug for self-managed calls

When checking for whether or not a call should show a notification
when it is missed, check to see if the call is self managed, not
if it should be logged.

Bug: 63276152
Test: Manual, Unit Tests
Change-Id: Ib8b42a4ae42bd2ca4fc5f798802a350ceb6e914c
rc/com/android/server/telecom/CallLogManager.java
00e952388def93aec4f52a87ba1f4b91a6a99db4 30-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Do not post notifications for logged self-managed connections" into oc-dr1-dev am: 3abf482621
am: 0d0a8ef0be

Change-Id: I9633acd0f96b5f4e6d5e6e197e0527fae5fb09e6
0d0a8ef0bef04377efef0a5cb90acaa27071f831 30-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Do not post notifications for logged self-managed connections" into oc-dr1-dev
am: 3abf482621

Change-Id: Ie58fe409fa9bdd86d261da0cafe47fc008c34309
3abf4826219a2dec9a868a5a2d4fb155389db509 30-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Do not post notifications for logged self-managed connections" into oc-dr1-dev
4fcbaffbf5d2caa306b2ed201b1832ca12534e47 28-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Include Video history in Rejected calls" into oc-dr1-dev am: 75201ca419
am: ee9ee5d811

Change-Id: I6a94c540aa6f83c7b9abad079e8badeb3e18ae19
ee9ee5d811cc4690ece92950943ef0b89d8c0b42 28-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Include Video history in Rejected calls" into oc-dr1-dev
am: 75201ca419

Change-Id: I34fb4a9b0e67f04ae6e3943f326f8e3258874d86
75201ca419c68d24f14ac19eabf797936d7fcaed 28-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Include Video history in Rejected calls" into oc-dr1-dev
edb8a31ce90fa69b2648e1a5cb0b42adf42b754b 28-Jun-2017 pkanwar <pkanwar@google.com> Changes to align with improvements to ImsiEncryptionInfo. am: fab79a07e8 -s ours
am: b6b58ad06d -s ours

Change-Id: I1106566e66599d0c2b5712c86fbf367daf49ea75
b6b58ad06dc75366c22cf4a7cf9874bd6c334a7b 28-Jun-2017 pkanwar <pkanwar@google.com> Changes to align with improvements to ImsiEncryptionInfo.
am: fab79a07e8 -s ours

Change-Id: I32d10dc3ff157ffae338f3b551d0f5ad8827ca7d
fab79a07e8f7b4bbca6d0c2e6d8246d7db0494d3 08-Jun-2017 pkanwar <pkanwar@google.com> Changes to align with improvements to ImsiEncryptionInfo.

BUG: 35606429
Test: NA
(cherry picked from commit 4e04c6c89b34c5540287358d5ba6403000e6fe67)

Merged-In: I625a709ea2eedfbc989dffdbbf38b2e008de38fe
Change-Id: I625a709ea2eedfbc989dffdbbf38b2e008de38fe
estapps/src/com/android/server/telecom/testapps/TestCertActivity.java
7808d9bdabcb43a075a7a6e649f00dc3a1c006e3 27-Jun-2017 Brad Ebinger <breadley@google.com> Include Video history in Rejected calls

Change the disconnected state logic to include rejected
calls as a criteria to log video history.

Bug: 63000001
Test: Manual, Telecom Unit Tests
Change-Id: Ib62046819a36a29b67632459328eb8644b02398a
rc/com/android/server/telecom/Call.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
4d85d6955479d762396a2c669a191eb0c4c031c5 26-Jun-2017 Brad Ebinger <breadley@google.com> Do not post notifications for logged self-managed connections

When a self-managed call is missed and the self-managed
PhoneAccount has specified that they want their call logged
in the call log, do not post a notification for the missed call.
Posting the missed call notification is up to the Self-Managed
ConnectionService.

Bug: 62999358
Test: Manual, run telecom unit tests
Change-Id: Ic62ef8aaf9164d10ac4d3ffbb3e06ee5b7474d34
rc/com/android/server/telecom/CallLogManager.java
fda822980132c1443bc1e715d9cca41fde259867 27-Jun-2017 Hall Liu <hallliu@google.com> Remove an old AudioManager hack am: 8c1374d3c8
am: 3dd5694e9b

Change-Id: I4b0de7ac97c25fac610410b15f373b1f4fc49015
3dd5694e9b6b4fc9b1ff8b0ee71a4973ede5afef 27-Jun-2017 Hall Liu <hallliu@google.com> Remove an old AudioManager hack
am: 8c1374d3c8

Change-Id: I7371bf3f577722a31a881b619f4e559099189654
8c1374d3c80d9a4fbe9dd075a958cc2cb22b70c2 27-Jun-2017 Hall Liu <hallliu@google.com> Remove an old AudioManager hack

Remove the round-trip back to normal mode when switching from in-call to
ringtone mode. It is apparently no longer necessary and is causing
problems with Bluetooth.

Change-Id: Iabe2e03c791b47cf64530678e6be4a1cec8007bc
Fixes: 62476271
Test: manual
rc/com/android/server/telecom/CallAudioModeStateMachine.java
5ceae7bbf3a8ce95758597c450e3272c6b2cc3d5 23-Jun-2017 Tyler Gunn <tgunn@google.com> Send event when handover source disconnects prior to acceptance of handover. am: 845a677cc7
am: f29eac59b7

Change-Id: Ic25a4faa740672761e32488ce1467d03cd744b91
f29eac59b76be270c4a94df31a4d1691fe46cdfc 23-Jun-2017 Tyler Gunn <tgunn@google.com> Send event when handover source disconnects prior to acceptance of handover.
am: 845a677cc7

Change-Id: I88b94581e5446cced4ec0f2eb733a67a979da7ea
845a677cc7ee462e7f8cb02b150c64edb3fcc528 23-Jun-2017 Tyler Gunn <tgunn@google.com> Send event when handover source disconnects prior to acceptance of handover.

When the source call disconnects prior to the acceptance of a handover,
send a call event so that the destination connection source is aware
of the fact the source disconnected. This ensures the destination is
able to either complete the handover (there are cases where a source can
disconnect prior to handover acceptance), or to abort the handover.

Test: Manual using test app
Bug: 62904673
Change-Id: I5b89113160e2697269ecbac7ef4f64844fd8a953
rc/com/android/server/telecom/CallsManager.java
dafb42f3b5d88f631bdc448de994e92d94110a2e 23-Jun-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ia5b4980d986a91ddc8744ac676362f620317a1c1
Auto-generated-cl: translation import
es/values-hu/strings.xml
04ca34550927c94369327e2f743029f76c26337d 22-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Audio routing fixes for handover scenarios." into oc-dr1-dev am: 8e3d34e45f
am: 1cf4a44cb6

Change-Id: Ic513bbc5a9414c5e2c17f05dfaa8f47822bf0f98
1cf4a44cb6f5538ae203839378811933d89f6436 22-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Audio routing fixes for handover scenarios." into oc-dr1-dev
am: 8e3d34e45f

Change-Id: Id48941d33a480b4b903b1fc57df94534a8e21e13
8e3d34e45f8562ada80e022b7098f3eeb3adc313 22-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Audio routing fixes for handover scenarios." into oc-dr1-dev
44f5783c9ca24531dc47ae8f3d52bef21894ca5d 22-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure IMS conference participants have number presentation set." into oc-dr1-dev am: a3198af063
am: f9048005e4

Change-Id: Ie8ed5a86d2befce2c58d9a5d16101df01f6e9a74
f9048005e43609aa9de730ba93e844010bcb106b 22-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure IMS conference participants have number presentation set." into oc-dr1-dev
am: a3198af063

Change-Id: I1ae4e2d61e39bfa61fe4d75662aa1f22d858dea6
a3198af063b309e14c2ca388a52dc30872f87ef2 22-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure IMS conference participants have number presentation set." into oc-dr1-dev
b821f92b0b30e295091deb8b6beccaf293f00314 21-Jun-2017 Tyler Gunn <tgunn@google.com> Audio routing fixes for handover scenarios.

1) Change maybeMoveToSpeakerPhone so when initiating a handover to
a self-managed CS for a video call, we do not enter speakerphone until
the call goes active (this is when the handover is accepted). This
ensures we don't go to speaker even if the handover is rejected.
2) Modify processIncomingCallIntent to automatically go to speakerphone
on the receiving side of a handover once the call goes active.

Test: Manual
Bug: 37772102
Change-Id: I2617ff19681eec2a54faa210a5a73e8a29d6126c
rc/com/android/server/telecom/CallsManager.java
b9bc8c4c548e58e0818ca784a334ecec36e573dc 21-Jun-2017 Tony Mak <tonymak@google.com> Fix NPE when addingIncomingCall is called with null extras am: 59a314c44c
am: ab55a05ba1

Change-Id: I050e47be91932037d1b365f316e81af27415610e
ab55a05ba1a9cee3ee088e89e6b1cfd9c2389ec9 21-Jun-2017 Tony Mak <tonymak@google.com> Fix NPE when addingIncomingCall is called with null extras
am: 59a314c44c

Change-Id: I10546c04f4fbca6438d5971378a87e635e913873
99f6bab9b8a6a1fcc01df6c40b87fd0b4262714c 20-Jun-2017 xulicheng <xulicheng@xiaomi.com> Remove InCallService after incallservice disconnected am: d733a73a8d am: 84bff550c0 am: 8168b680c9
am: 65466f5665

Change-Id: I880d81a3abd46f00496522662ec29639ae663730
65466f5665f7a8a7b5ad6b41965874d75e357567 20-Jun-2017 xulicheng <xulicheng@xiaomi.com> Remove InCallService after incallservice disconnected am: d733a73a8d am: 84bff550c0
am: 8168b680c9

Change-Id: I5cdc2b7c76fdb74486a0d776388155e771f08642
8168b680c94d2228e74401a6abf819cecc686ca6 20-Jun-2017 xulicheng <xulicheng@xiaomi.com> Remove InCallService after incallservice disconnected am: d733a73a8d
am: 84bff550c0

Change-Id: I5180acfb099728915defda18b0019029a4705c72
84bff550c03b3ec2a57973c74b79d10753682f88 20-Jun-2017 xulicheng <xulicheng@xiaomi.com> Remove InCallService after incallservice disconnected
am: d733a73a8d

Change-Id: Iad16e468a149479eae3a00779a773934dd29d825
26d478f19c2433dde5329c69aa5b7f2558e1c6ae 20-Jun-2017 Tyler Gunn <tgunn@google.com> Ensure IMS conference participants have number presentation set.

When anonymous participants are added in an IMS conference call, the
number presentation was not set. Since the address is null it meant
they would be defaulted to UNKNOWN.

Fixed to ensure the number presentation is set as well.

Test: Manual
Bug: 62475520
Change-Id: I98fbbd0c0a04ef34e9b26d092d6b45fa226f9d7b
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
59a314c44c0d5ad56c99943cfa26369b46665475 20-Jun-2017 Tony Mak <tonymak@google.com> Fix NPE when addingIncomingCall is called with null extras

Fix: b/62815961

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.ManagedProfileTest#testManagedCall

Change-Id: I3b460d8d5e005201ee08d78fa3d40a909c487c20
rc/com/android/server/telecom/CallsManager.java
4a19da92563fdd0c972c1850ed4df5155bb3ae99 16-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Fix to set audio mode for SIP call" into oc-dr1-dev am: 733c863ef2
am: adba463418

Change-Id: I815894ed1b5c6c4bd2621a03102cfee3d10a13d2
adba4634180c6ffd77c129064f95026882c6c322 16-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Fix to set audio mode for SIP call" into oc-dr1-dev
am: 733c863ef2

Change-Id: I3fb5efa8124ff4e6631cd54cefa9879935f50195
733c863ef28467113506394f5f26518f40b32045 16-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Fix to set audio mode for SIP call" into oc-dr1-dev
d733a73a8d8362f24b8aa7a4073b74736203069e 16-Jun-2017 xulicheng <xulicheng@xiaomi.com> Remove InCallService after incallservice disconnected

mInCallServices will never be cleared

Test: Build
Change-Id: I7cf168a32a39226c66ad9058a8e59e7fd26d48df
Signed-off-by: xulicheng <xulicheng@xiaomi.com>
rc/com/android/server/telecom/InCallController.java
5b8facb5650b1f414353721697a2c85cf1d056c6 17-Feb-2015 Srikanth Chintala <srikchin@codeaurora.org> Fix to set audio mode for SIP call

Set the audio mode for sip call as
MODE_IN_COMMUNICATION if the phone
account has extra
EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE with
true value.

Test: Manual
Bug: 34869196
Change-Id: I367fbfb05779f80ebde78cb8dcebeafa3f885b3b
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
2879d0b874c6ae7660da387750d4349b3053a595 18-Aug-2016 liheng.x.zhang <liheng.x.zhang@sonymobile.com> Show time stamp of missed call notification created by Telecom

If a default dialer does not implement
"android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" receiver,
a missed call notification created by Telecom is shown. But the
time stamp information in the notification is missing. So, added
time stamp of missed call notification.

Test: manual - Checked the time stamp on Telecom missed call
notification
Bug: 62644406

Change-Id: Ica1ff913106b35f0690a566df330b4ea64c2fe5d
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
7537211edc1528d30ef118ae85cdc2eef7276643 14-Jun-2017 Paul Duffin <paulduffin@google.com> Merge "Fix dependencies of packages that target earlier releases" am: d52445dedc am: 984a1233a0 am: 596c94a907
am: 91faa7fbba

Change-Id: I84019c0974145f52b638eaa264ea09ff70bcc930
3cd8605c8042267093dd3d475a6d6c4e0a54baf6 14-Jun-2017 pkanwar <pkanwar@google.com> resolve merge conflicts of e8ac034b8 to oc-dr1-dev-plus-aosp
am: 026c242e76

Change-Id: Ibc7d25f5f0cdab0eca4b1ae15bf71869cf1c5733
91faa7fbba561dcad96acf364d60b8b20e382d99 14-Jun-2017 Paul Duffin <paulduffin@google.com> Merge "Fix dependencies of packages that target earlier releases" am: d52445dedc am: 984a1233a0
am: 596c94a907

Change-Id: Ic2da15a4bcf21e0010fb39585f5f9aa19f1788c2
026c242e76b0f6512fa328bcc5d33dc38950f37d 14-Jun-2017 pkanwar <pkanwar@google.com> resolve merge conflicts of e8ac034b8 to oc-dr1-dev-plus-aosp

BUG: 35606429
Test: manual
Change-Id: Ie3e285ea93cfb96f9dfbd2f9f8cb2dd63a81a396
596c94a907968f67b942cffe4c4116fcf121788c 14-Jun-2017 Paul Duffin <paulduffin@google.com> Merge "Fix dependencies of packages that target earlier releases" am: d52445dedc
am: 984a1233a0

Change-Id: I1f3d8d78cea31b1b18c5d8519edabb5d31328e1f
e8ac034b88ce3536eb8aec8c1a761f5abce2117b 14-Jun-2017 pkanwar <pkanwar@google.com> resolve merge conflicts of fa4d17b52 to oc-dev-plus-aosp

BUG: 35606429
Test: manual

Change-Id: Ic0c0aa2cfb5e72ac8eb810b92fa29e0777cb7cd1
984a1233a09b70840b1385cf70918f6aaaef1701 14-Jun-2017 Paul Duffin <paulduffin@google.com> Merge "Fix dependencies of packages that target earlier releases"
am: d52445dedc

Change-Id: I264858093988de48044d232fefa618e0aace5929
d52445dedcde3a7c6bec765ec84713c3b98bfaef 14-Jun-2017 Paul Duffin <paulduffin@google.com> Merge "Fix dependencies of packages that target earlier releases"
fa4d17b5249ca715ec0045899e8f22b5c456e6e1 14-Jun-2017 pkanwar <pkanwar@google.com> Test app for IMSI privacy.
am: 437433ef49

Change-Id: Ic12869b353d0e801dd0d1fd34d656548745cd861
5c3308d17974d5399ea14720e8bfdde6e35aa72a 14-Jun-2017 pkanwar <pkanwar@google.com> Changes to align with improvements to ImsiEncryptionInfo.
am: ec900e5eb7

Change-Id: Ief1eaf3725654aa8de5062a4e66a85e75a9939b1
437433ef4906c19066cfbca91df6fb34f0ac3e58 04-May-2017 pkanwar <pkanwar@google.com> Test app for IMSI privacy.

Create test app to download IMIS certificates, and parse the JSON.
The test app will also persist the certificates using TelephonyManager.

Bug: 35606429
Test: Manual
Change-Id: Icef53ffbd790f05c11a37c40d63f3252c8d7301c
estapps/AndroidManifest.xml
estapps/res/layout/key_list.xml
estapps/res/layout/testcert_main.xml
estapps/res/values/donottranslate_strings.xml
611bc43afd54638347df653733a6c2b82dc39fd5 14-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fixes some of the flakiness in Telecom" into oc-dr1-dev am: 7b05c99aab
am: 559503e8ec

Change-Id: I2e396b4c99117c21c90003a13e3855f71fe49027
559503e8ec5f2f6e6911533c51b60f944c64dc01 14-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fixes some of the flakiness in Telecom" into oc-dr1-dev
am: 7b05c99aab

Change-Id: I19be53d5529c8d5b5fc3248fea899bfbc21e014e
7b05c99aab1577f705b412b9ec95aff855c60467 14-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fixes some of the flakiness in Telecom" into oc-dr1-dev
2d03c79c4c1a71679b4f2b0bf1bc64c505777507 14-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Call handover improvements" into oc-dr1-dev am: 5288d29fc5
am: 5010208ceb

Change-Id: I18068b5dc90215ce53039e9f1e4650ac76bc55f7
5010208ceb261aa27d5be9239a6e96eeabc0f143 13-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Call handover improvements" into oc-dr1-dev
am: 5288d29fc5

Change-Id: Ice52ad6d0413d36f2adf639abfb1694bba6bd296
5288d29fc5da8e433668d1c6068f9d5be088a9fd 13-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Call handover improvements" into oc-dr1-dev
141ef5805d18b0c8b71d2a50f77837e719672569 26-May-2017 Tyler Gunn <tgunn@google.com> Call handover improvements

- Set handover_from attribute when initiating a handover to another phone
account. This lets the recipient know where the call is coming from.
- Replace "handover successful" indicator on calls with a handover state.
This ensures there is sufficient state to ensure that if a call is
hung up before the handover is accepted that we don't treat that hangup
as if the handover was successful.
- Ensure failed handovers are not logged.
- Prevent EXTRA_IS_HANDOVER from being set for outgoing calls.

Test: Unit, Manual
Bug: 37977155
Bug: 38027075
Change-Id: Ie5240c28163714be71825e718daa560eb568330f
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/HandoverState.java
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/ui/IncomingCallNotifier.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnectionService.java
ests/src/com/android/server/telecom/tests/IncomingCallNotifierTest.java
81de71c6d97677d29f3c0931a5d4b1ff84e40b1e 13-Jun-2017 Paul Duffin <paulduffin@google.com> Fix dependencies of packages that target earlier releases

A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.

This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because TelecomUnitTests's manifest file (AndroidManifest.xml)
targets API level 23 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.

Replaced 'android.test.runner' with 'android.test.mock' and
'legacy-android-test' in LOCAL_JAVA_LIBRARIES because module
TelecomUnitTests uses classes from packages android.test and
android.test.mock (possible indirectly) and needs them available at
compile time.

Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.

Dependency 'android.test.mock.sdk' is used instead of
'android.test.mock' because module TelecomUnitTests builds against
internal jars not the API and so should use libraries that build
against internal jars not the API.

Bug: 30188076
Test: make checkbuild and ran a sample of tests
Change-Id: If4506e951f5c36010cfb2a5dd8df7bbf0d6bfc79
ests/Android.mk
03856a931c4ad78aaabc78e75b6d585c1defec13 13-Jun-2017 Jeff Sharkey <jsharkey@android.com> Revert "Follow revert back to oc-dev APIs."

This reverts commit a73119890564bb61aa5b96ca3404f09e03b6c6c9.
estapps/src/com/android/server/telecom/testapps/TestRttActivity.java
843848776dbc2ea514a0832136f7c0b47a7cde37 13-Jun-2017 Jeff Sharkey <jsharkey@android.com> Follow revert back to oc-dev APIs. am: a731198905
am: 702d7f32d2

Change-Id: I5f5ffacd8c90bde8af6b8202f8677f792650f963
702d7f32d20cfa4944e9538276aca786ef0a5e94 13-Jun-2017 Jeff Sharkey <jsharkey@android.com> Follow revert back to oc-dev APIs.
am: a731198905

Change-Id: I77a3766ecb73f593d6ba954496cf20bb07fef38c
ec900e5eb779f25e91aa487f64df392ee7504b3b 08-Jun-2017 pkanwar <pkanwar@google.com> Changes to align with improvements to ImsiEncryptionInfo.

BUG: 35606429
Test: NA
Change-Id: I625a709ea2eedfbc989dffdbbf38b2e008de38fe
estapps/src/com/android/server/telecom/testapps/TestCertActivity.java
a73119890564bb61aa5b96ca3404f09e03b6c6c9 12-Jun-2017 Jeff Sharkey <jsharkey@android.com> Follow revert back to oc-dev APIs.

Test: builds, boots
Bug: 62431162
Change-Id: Ibee5f29da756b6922109b95c36fd340f02e1905e
estapps/src/com/android/server/telecom/testapps/TestRttActivity.java
fcaf9c30a659a5a80cb9d09ab0a453b5ef1ad21a 11-Jun-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Changes to align with improvements to ImsiEncryptionInfo."
4e04c6c89b34c5540287358d5ba6403000e6fe67 08-Jun-2017 pkanwar <pkanwar@google.com> Changes to align with improvements to ImsiEncryptionInfo.

BUG: 35606429
Test: NA
Change-Id: I625a709ea2eedfbc989dffdbbf38b2e008de38fe
estapps/src/com/android/server/telecom/testapps/TestCertActivity.java
7bba1112556e122254013562650aac6a6af80ac6 08-Jun-2017 Brad Ebinger <breadley@google.com> Fixes some of the flakiness in Telecom

- Fixes some flakiness in the tests
- Mocks out the ToneGenerator

Test: Run Telecom Unit Tests
Change-Id: If3bd51fe4a82068cc0d712d2e499abde4fdb0481
cripts/telecom_testing.sh
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
4c919d19dcc503ea8751b09c1110682455114074 29-May-2017 Jimmy Wu <jimmyw@nvidia.com> Fix audio state issue for MT IMS call

The IMS audio routing may be via modem or via RTP stream. In case
via RTP stream, the CallAudioModeStateMachine should transit to
mVoipCallFocusState.

Test: Manual
Change-Id: Ida6a69b95fad45dfa388e034215556daba623ff2
rc/com/android/server/telecom/CallAudioModeStateMachine.java
ed317f45f4f4befd72994abb46db99c7587493fe 06-Jun-2017 Chih-Hung Hsieh <chh@google.com> Merge "Add OWNERS in packages/services/Telecomm" am: a6f3cc3e21 am: 9fdf74f766 am: c95fbbb55b
am: 72edf50854

Change-Id: If84daafb4877b50e013d04165c556c448596e057
72edf50854eb2e8fd81547a3e383da0330a848b5 06-Jun-2017 Chih-Hung Hsieh <chh@google.com> Merge "Add OWNERS in packages/services/Telecomm" am: a6f3cc3e21 am: 9fdf74f766
am: c95fbbb55b

Change-Id: Icd4ad4c2b4fe0183a6f41c840772b8596b46dca8
f02e26a4e4199acf39b25e4962621ed5466f5aa6 06-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fixes InCallControllerTests failure" into oc-dev am: 85182d30c3
am: 9980350a10

Change-Id: Ib0781051256fd4e3fb9712cdb2f6dc9537b18548
c95fbbb55b97f52d302b1d79ff3eb88f6b3d2029 06-Jun-2017 Chih-Hung Hsieh <chh@google.com> Merge "Add OWNERS in packages/services/Telecomm" am: a6f3cc3e21
am: 9fdf74f766

Change-Id: I62c72858ef1039d819af49a0e5a0e9d3ee1606cb
9980350a1078240ebbe4b8649a9fa5f8369c5fc5 06-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fixes InCallControllerTests failure" into oc-dev
am: 85182d30c3

Change-Id: Ica5633fe06f699360bac047ccaca6fb2d6fb638b
9fdf74f76655d078dbda775e4a1b92f279506c9e 06-Jun-2017 Chih-Hung Hsieh <chh@google.com> Merge "Add OWNERS in packages/services/Telecomm"
am: a6f3cc3e21

Change-Id: I569cc36228f50466d3d6e08aa3e59849565ad379
85182d30c398ba3119be17f0b8305492285a00f7 06-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fixes InCallControllerTests failure" into oc-dev
a6f3cc3e21183d567decdb34e2ab1939d34ed7e2 06-Jun-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add OWNERS in packages/services/Telecomm"
0e5ceeec34ea10dbc0c8170f9c84396af45eb4be 06-Jun-2017 Chih-Hung Hsieh <chh@google.com> Add OWNERS in packages/services/Telecomm

* Owners are selected from top CL approvals or owners.
They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/

Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I837808a5664c82a4d801f9a7518dd20e1be9d264
WNERS
efc2051c90ced1bd1086e19d918c5c613187cf2a 02-Jun-2017 Hall Liu <hallliu@google.com> Merge "Add wakelock to UserCallActivity"
420e19e53331f8ffa5c2807d28991e8dd5d5a58f 01-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Fix lack of notification of un-parent on disconnecting conference child." into oc-dev am: a32bdf7289
am: c7ab7a366b

Change-Id: I1b1722d2268804aed9dc82d96971143fe34d2097
c7ab7a366bfd0322133fa12ed50a289d67be4a9c 01-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Fix lack of notification of un-parent on disconnecting conference child." into oc-dev
am: a32bdf7289

Change-Id: I8db5151004940974b5638ad689659473fcd82895
a32bdf7289370be5a64201ce216b1ee4cf74944f 01-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Fix lack of notification of un-parent on disconnecting conference child." into oc-dev
988ccc80cafa46fcb28a74bb487fbd5a6ae7e1fc 01-Jun-2017 Tyler Gunn <tgunn@google.com> Fix lack of notification of un-parent on disconnecting conference child.

As a consequence of recent changes to improve efficiency of IMS conferences,
there was a regression when unparenting a child of a conference when it
was disconnected. We would neglect to send the connection event notifying
the InCallService of the change in parent for the call.

To fix this I split notifying of parent change into a new method which
is called in the right place for the "add existing call" case, and also
from within setParentAndChildCall. This actually reads nicer and we're
no longer sending this from setChildOf.

Test: Manual, ran CTS, ran unit tests
Bug: 62236503
Change-Id: Ie59a00a39c2ebeee44a81c2db6edf2968fa5b643
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
9a7302fadf0724b9ac9487996d1a0f48e4ea1e11 31-May-2017 Hall Liu <hallliu@google.com> Add wakelock to UserCallActivity

Add a wakelock to make sure that the phone doesn't go to sleep in the
middle of trying to initiate an outgoing call through Bluetooth (or
something else that doesn't require the screen being on).

Change-Id: Ide945fabbb474cb8ce60fbf704698e566e9f9b01
Fixes: 38328207
Test: manual
ndroidManifest.xml
rc/com/android/server/telecom/components/UserCallActivity.java
4847d54ccbe86da4de87fcda4cf6a46b253934a5 31-May-2017 Brad Ebinger <breadley@google.com> Use SmsManager for reject call with SMS am: 5e775944c0 am: b3580b0bd1 am: 1e65a4f357 -s ours
am: 3579818e06 -s ours

Change-Id: I93111d6a67ade1e7e1509186626a3be94be3e0c8
782f91109ff869a6078bb8dd9294d3172d2a6903 31-May-2017 Brad Ebinger <breadley@google.com> Fixes InCallControllerTests failure

Test: Run lite_test_telecom unit tests
Change-Id: I200f284e919aa924c6167287675e2fef3c9ba477
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
3579818e0698888bab08e0a3dc6f4ae79054fae2 31-May-2017 Brad Ebinger <breadley@google.com> Use SmsManager for reject call with SMS am: 5e775944c0 am: b3580b0bd1
am: 1e65a4f357 -s ours

Change-Id: Ia94522e526fa5d2d008843f23a29e1c222a08fe2
1e65a4f35790971407f6c6cc6aa696a337d2d438 31-May-2017 Brad Ebinger <breadley@google.com> Use SmsManager for reject call with SMS am: 5e775944c0
am: b3580b0bd1

Change-Id: I19a27d6d3c5eaccad98be3cf88c71954b5ad7039
b3580b0bd123afdd7cf8f88a590087ef1d435c60 31-May-2017 Brad Ebinger <breadley@google.com> Use SmsManager for reject call with SMS
am: 5e775944c0

Change-Id: I6716818d8e8410523d12888278e22d6a555fc5c1
96bae040ba76779f2a9abb45a951f2328d4edf38 30-May-2017 Brad Ebinger <breadley@google.com> Use SmsManager for reject call with SMS am: 90660b5f9a -s ours
am: 3ad5ac23d6

Change-Id: Iaa4a8697ecc2c1f4b47e012e31c66e160a410a4e
3ad5ac23d624597a41e14e58a33e54c28e7afeae 30-May-2017 Brad Ebinger <breadley@google.com> Use SmsManager for reject call with SMS
am: 90660b5f9a -s ours

Change-Id: I127c9489cdf8d86121c38f234903df9ffc321340
b31db5a3722cf39f8ce22b3a144290c1392b1208 30-May-2017 Brad Ebinger <breadley@google.com> Use SmsManager for reject call with SMS
am: 21241167cc

Change-Id: I1f7a69f94c398c3fe99124587c0b6e6f4b4a7c88
90660b5f9a058c452aa41478feac23f656bb206c 26-May-2017 Brad Ebinger <breadley@google.com> Use SmsManager for reject call with SMS

Instead of starting a service to send SMS when a call is
rejected, we now use the SmsManager#sendTextMessage API.

Bug: 62048610
Test: Reject call and send SMS
Change-Id: I8d648ab5c3e35539d1387ece4d11acc1c30c8ea2
rc/com/android/server/telecom/RespondViaSmsManager.java
5e775944c0f2ca7bd997a36ee8db474d726dea2b 26-May-2017 Brad Ebinger <breadley@google.com> Use SmsManager for reject call with SMS

Instead of starting a service to send SMS when a call is
rejected, we now use the SmsManager#sendTextMessage API.

Bug: 62048610
Test: Reject call and send SMS
Change-Id: I8d648ab5c3e35539d1387ece4d11acc1c30c8ea2
Merged-In: I8d648ab5c3e35539d1387ece4d11acc1c30c8ea2
rc/com/android/server/telecom/RespondViaSmsManager.java
21241167ccc1cfb8e221249e032a8bd3276c525a 26-May-2017 Brad Ebinger <breadley@google.com> Use SmsManager for reject call with SMS

Instead of starting a service to send SMS when a call is
rejected, we now use the SmsManager#sendTextMessage API.

Bug: 62048610
Test: Reject call and send SMS
Change-Id: I8d648ab5c3e35539d1387ece4d11acc1c30c8ea2
rc/com/android/server/telecom/RespondViaSmsManager.java
b388f53ce34d07388494c8344291745a603ae79c 26-May-2017 Brad Ebinger <breadley@google.com> Merge "Dereference cached Bitmaps in EventLogger" am: 456238e59e am: 752b1baba0 am: 6239d3b368 -s ours
am: 92fd1fbe65 -s ours

Change-Id: I92381919ca26864827970d5641e35843548e0fb2
92fd1fbe65b3f7ee27c18fb11c864c5f012cbe89 26-May-2017 Brad Ebinger <breadley@google.com> Merge "Dereference cached Bitmaps in EventLogger" am: 456238e59e am: 752b1baba0
am: 6239d3b368 -s ours

Change-Id: I30708410a1d87ee5eb88eea5599211f7a47f2cf3
6239d3b368b47ba5c8e9f36f783894a4174c011f 26-May-2017 Brad Ebinger <breadley@google.com> Merge "Dereference cached Bitmaps in EventLogger" am: 456238e59e
am: 752b1baba0

Change-Id: I7e2964b00410072bedc3afa4d7925486310a863b
752b1baba050a85a20db7272560f3a640308b4b8 26-May-2017 Brad Ebinger <breadley@google.com> Merge "Dereference cached Bitmaps in EventLogger"
am: 456238e59e

Change-Id: I4a294e30e93237bf95352f5ec30076df7dcbfc04
456238e59eb3682655c8b9cdb153ea5fe9a8e66e 26-May-2017 Brad Ebinger <breadley@google.com> Merge "Dereference cached Bitmaps in EventLogger"
ba425847a9f2f3055030726af17c71a846f2f535 25-May-2017 Sailesh Nepal <sail@google.com> Fix missing argument in BluetoothRouteManager logging

Change-Id: I557a95b723a5da2dcdcf71b41633bc7792d5f885
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
15bd6917198449eb47491a4df43fc1631d5a30d1 25-May-2017 Tyler Gunn <tgunn@google.com> Merge "Add ability to set parent at the same time as adding a connection." into oc-dev am: 60da84f041
am: 2d932458bc

Change-Id: I46ba03b854d6ddbd50c9862f38b525c21b2b72c7
2d932458bcc0ce43bec9425523ad036794a95c0e 25-May-2017 Tyler Gunn <tgunn@google.com> Merge "Add ability to set parent at the same time as adding a connection." into oc-dev
am: 60da84f041

Change-Id: I8312190ea419e8141f269468ca5fd23b694e72e5
60da84f041f92f5d4ae503720c51f0b68d604221 25-May-2017 Tyler Gunn <tgunn@google.com> Merge "Add ability to set parent at the same time as adding a connection." into oc-dev
78a16ae984cd45e0d358b20572effd6633003b6a 25-May-2017 Tyler Gunn <tgunn@google.com> Add ability to dump telecom state in a timeline view. am: 897e851f50 am: 5e66c1b834 am: 6784b4f7e2
am: 78c3a6e099

Change-Id: Ic07f5bc862bd0b66477ddf2a1016652d5e612bf7
78c3a6e099f51c9a015235b939f04e2fc1b16124 25-May-2017 Tyler Gunn <tgunn@google.com> Add ability to dump telecom state in a timeline view. am: 897e851f50 am: 5e66c1b834
am: 6784b4f7e2

Change-Id: I392596581a44e0d1ef8f984ea649f274c94d543a
6784b4f7e21d91822b44e2c937a6aebd93c8325c 25-May-2017 Tyler Gunn <tgunn@google.com> Add ability to dump telecom state in a timeline view. am: 897e851f50
am: 5e66c1b834

Change-Id: Iaba35b1138ebe4db0d23f6d7faee1ebb33bc39d1
5e66c1b83465f0feb9e68979d64fd16ac3f2c9bc 25-May-2017 Tyler Gunn <tgunn@google.com> Add ability to dump telecom state in a timeline view.
am: 897e851f50

Change-Id: Ia2fd3eabf11754b4cb29ce837926df68f31cfca7
25d1fafb1f78c0b5126ae4b1e0475afefdebed22 24-May-2017 Brad Ebinger <breadley@google.com> Merge "Dereference cached Bitmaps in EventLogger" into oc-dev am: 0764d82cf9
am: ac01731822

Change-Id: I6c3cee1ce4745292111e2bb12a179b395895e358
d650a032d5f0062f9d9965dc3f1f6cb0412ab2c6 24-May-2017 Brad Ebinger <breadley@google.com> Dereference cached Bitmaps in EventLogger

In Telecom, we cache the last 10 calls that have been placed in
order to provide detailed event logs during a call for bugreports.
We were also mistakenly keeping around the cached contact photo/
icon, causing unnecessarily high memory usage.

This change dereferences the Bitmaps when the calls are destroyed
so that the Bitmaps are not hanging around when the calls are
cached for Logging.

Bug: 62038439
Test: Ensure Bitmaps are not still in memory by looking at memory dump
Merged-In: I7370880b59e3096bc95e7a5b127bd355d9c96b4f
Change-Id: Iba265a10145f2db6f57b27adee59d812ccb7ca5c
rc/com/android/server/telecom/Call.java
ac0173182236f40ebc1825ce6c47e82731ebd9f2 24-May-2017 Brad Ebinger <breadley@google.com> Merge "Dereference cached Bitmaps in EventLogger" into oc-dev
am: 0764d82cf9

Change-Id: I7370880b59e3096bc95e7a5b127bd355d9c96b4f
0764d82cf91e01edd88f92b6dc256fa4d0c08c57 24-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Dereference cached Bitmaps in EventLogger" into oc-dev
e9ebf24b99c92404216f36d1d1ace6231ac72714 24-May-2017 Tyler Gunn <tgunn@google.com> Merge "Whitelist ACTION_RESPOND_VIA_MESSAGE intent." into oc-dev am: 2f737bc2d2
am: f8eda1072a

Change-Id: Ib2241f1e476110510e1a215b5c8abf6fdbaef158
f8eda1072a323f6f0fa50b60f91bf764a67f2d35 24-May-2017 Tyler Gunn <tgunn@google.com> Merge "Whitelist ACTION_RESPOND_VIA_MESSAGE intent." into oc-dev
am: 2f737bc2d2

Change-Id: If104d18b33bea3bd7631f11d3493142024f0eb8b
2f737bc2d29647225b979fb4faf1d8bae56a2fbf 24-May-2017 Tyler Gunn <tgunn@google.com> Merge "Whitelist ACTION_RESPOND_VIA_MESSAGE intent." into oc-dev
f977bdddfbb2b2c2040141d7e520a68e7f17e6ce 24-May-2017 Tyler Gunn <tgunn@google.com> Whitelist ACTION_RESPOND_VIA_MESSAGE intent.

This intent is sent only by the system to wake up an SMS app to send
an SMS message on its behalf.

Test: Manual
Bug: 62048610
Change-Id: I40376f099eb41e6e605b60f24b27664c986f0fe2
rc/com/android/server/telecom/RespondViaSmsManager.java
29b64dbe6f696ae5081461796a0c8ce742ecf950 24-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
a219bf93f81088122056600186dc581e3465532f 24-May-2017 Brad Ebinger <breadley@google.com> Dereference cached Bitmaps in EventLogger

In Telecom, we cache the last 10 calls that have been placed in
order to provide detailed event logs during a call for bugreports.
We were also mistakenly keeping around the cached contact photo/
icon, causing unnecessarily high memory usage.

This change dereferences the Bitmaps when the calls are destroyed
so that the Bitmaps are not hanging around when the calls are
cached for Logging.

Bug: 62038439
Test: Ensure Bitmaps are not still in memory by looking at memory dump
Change-Id: Iba265a10145f2db6f57b27adee59d812ccb7ca5c
rc/com/android/server/telecom/Call.java
9b02bddd63b6737180b8334962b2036dfe86e7c5 24-May-2017 Tyler Gunn <tgunn@google.com> Merge "Call "createConnectionComplete" callback in Telecom." into oc-dev am: 1fc35b9de1
am: ee174c58f8

Change-Id: Ief4bcab9056f635ff72f19835c8cf63b4bc27143
ee174c58f851657cc4209574a06d7d72576b97e9 24-May-2017 Tyler Gunn <tgunn@google.com> Merge "Call "createConnectionComplete" callback in Telecom." into oc-dev
am: 1fc35b9de1

Change-Id: I5c943ab3595914bef1861edce25c5692c71f2250
1fc35b9de1ddc6c7a88613ac92b41517ec89ba13 24-May-2017 Tyler Gunn <tgunn@google.com> Merge "Call "createConnectionComplete" callback in Telecom." into oc-dev
7658171d6d496686263d0fc9da55a0ed7a61f818 09-May-2017 Tyler Gunn <tgunn@google.com> Add ability to set parent at the same time as adding a connection.

This is used when adding the children of IMS conferences to prevent jank
in the UI.

Test: Manual
Bug: 37581781
Change-Id: I5effdcfaa51fcdf85155ab6bedffdb20270cccb5
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
20a487da0dafcdb63099f1914855dbaff5e9bd5d 24-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 72d8bb71e8 -s ours
am: 4c9c02de4e -s ours

Change-Id: If43097a14069d604346d1915d465c95424b8a9ab
4c9c02de4e33631134f98824245c35789c69366a 24-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 72d8bb71e8 -s ours

Change-Id: Ide6f4b9082a919b14ac6bf35a86631f465b48754
72d8bb71e8e7f6e428f819cb86b721d84e650704 23-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ia2c519254925c04c6bcaa94a2e4b31b2f3281396
Auto-generated-cl: translation import
es/values-eu/strings.xml
83ecc4e07a74721c195861d5133e72fd8d7ba1cb 23-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I6b9db6d64d5891a8bf36b54bb62fd0ccd1912dc7
Auto-generated-cl: translation import
es/values-eu/strings.xml
c6363323eae146ff069dbf5f58369e3c140af683 23-May-2017 Tony Mak <tonymak@google.com> Merge "Handle USER_REMOVED action in DefaultDialerCache" into oc-dev am: 2953701e61 -s ours
am: 6a4fc61609 -s ours

Change-Id: Ia02ee58a7eae26b3e70ee275fc326c57e2a6993c
6a4fc616093dbe1bd0def8ed06a625d9702df313 23-May-2017 Tony Mak <tonymak@google.com> Merge "Handle USER_REMOVED action in DefaultDialerCache" into oc-dev
am: 2953701e61 -s ours

Change-Id: Ide8bd1eeb671871040034f04278a6de1b059f608
2953701e61b83d8d73b2dfe60051cc797b244f78 23-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Handle USER_REMOVED action in DefaultDialerCache" into oc-dev
c6c051bae548cece7033082b8cb11723c6af4c80 17-May-2017 Tony Mak <tonymak@google.com> Handle USER_REMOVED action in DefaultDialerCache

When a user is removed, its entry sticks around in the dialer cache.
This causes a lot of logspam during CTS. This change removes a user from
the default dialer cache when its USER_REMOVED broadcast is sent.

Change-Id: I4c86957fae21e37b213bbf13d26c21df74d85b0a
Merged-In: I734547ad475a5926c58a8de6897bdeda10e0a9dd
Fixes: 38161359
Fixes: 33744271
Test: manual and unit
rc/com/android/server/telecom/DefaultDialerCache.java
ests/src/com/android/server/telecom/tests/DefaultDialerCacheTest.java
32e5a5f52a31c71f03d5831c3ec25c5639d4acd9 22-May-2017 Tyler Gunn <tgunn@google.com> Merge "Update notification channels on locale change." into oc-dev am: 1685eaeb50
am: 62703d31c6

Change-Id: I19d4cfc315cf25c32cb735e0fd69945599375042
62703d31c6c4d843266fe0900c55c87176c37fdd 22-May-2017 Tyler Gunn <tgunn@google.com> Merge "Update notification channels on locale change." into oc-dev
am: 1685eaeb50

Change-Id: I15ebafd46b2757d828b7fd311488e6873f0c0b31
1685eaeb50984f31a1bf94b16f8245aacc428d40 22-May-2017 Tyler Gunn <tgunn@google.com> Merge "Update notification channels on locale change." into oc-dev
25450d745dcb530cde24e774dd2f81d7d3863f71 20-May-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Test app for IMSI privacy."
897e851f50a09776462080adf912d89f68d01c52 19-May-2017 Tyler Gunn <tgunn@google.com> Add ability to dump telecom state in a timeline view.

Adding "timeline" parameter to dumpsys so that it is possible to dump
the telecom event log in a timeline format.

Test: Manual
Bug: 38450166
Change-Id: Id0f7a27b36f303c4c1a3e577afa0b40d97782dfa
rc/com/android/server/telecom/TelecomServiceImpl.java
aee5473d60bf1b2f602e880367b476c6d49fd202 19-May-2017 Tyler Gunn <tgunn@google.com> Extra security checks in placeCall. am: 1172a0112f -s ours
am: ee7509fecc -s ours

Change-Id: Icfc0c2e842c7d6d71fc0fc159ae51c452b5adedf
ee7509fecc937a9f6aab0a6c482eda1e5020a183 19-May-2017 Tyler Gunn <tgunn@google.com> Extra security checks in placeCall.
am: 1172a0112f -s ours

Change-Id: I368c5f896e75537e82801e69d05d9899d0b7b589
c0d6043c27dde2ebcd68e74e7a63ba034236f7df 04-May-2017 pkanwar <pkanwar@google.com> Test app for IMSI privacy.

Create test app to download IMIS certificates, and parse the JSON.
The test app will also persist the certificates using TelephonyManager.

Bug: 35606429
Test: Manual
Change-Id: Icef53ffbd790f05c11a37c40d63f3252c8d7301c
estapps/AndroidManifest.xml
estapps/res/layout/key_list.xml
estapps/res/layout/testcert_main.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/TestCertActivity.java
1172a0112f3641d1a73681fe6a0bdeef3455bc6c 18-May-2017 Tyler Gunn <tgunn@google.com> Extra security checks in placeCall.

Note: This is a cherry-pick from Master/AOSP-Master.

When adding self-managed calls, ensure that the package of the caller
matches the package for the outgoing call phone account, unless the
caller is able to place calls.

This means a self-managed CS can ONLY place calls for its own CS.
However, the default dialer, or other call capable apps (e.g. Auto) can
still place calls on behalf of a self-managed CS.


Test: Manual
Merged-In: If0198bed5475e09ce2ef7dec1f69e5d104215c46
Change-Id: If0198bed5475e09ce2ef7dec1f69e5d104215c46
Bug: 38377651
(cherry picked from commit 24c35e0fcb93900d9be5360ab480fad7489239b8)
rc/com/android/server/telecom/TelecomServiceImpl.java
51dc616b04e1b31f97218ef3fc53685d680f19a7 18-May-2017 Tyler Gunn <tgunn@google.com> Merge "Extra security checks in placeCall." am: 3cb2f5e569 am: 59db768a54 am: a025d4280a
am: 24c35e0fcb

Change-Id: I3ce02a97c280bd4cf6e975da0d402b20deb6432e
24c35e0fcb93900d9be5360ab480fad7489239b8 18-May-2017 Tyler Gunn <tgunn@google.com> Merge "Extra security checks in placeCall." am: 3cb2f5e569 am: 59db768a54
am: a025d4280a

Change-Id: If0198bed5475e09ce2ef7dec1f69e5d104215c46
a025d4280aeda1b8c55e7061fca00f23a11ee606 18-May-2017 Tyler Gunn <tgunn@google.com> Merge "Extra security checks in placeCall." am: 3cb2f5e569
am: 59db768a54

Change-Id: I5be83efaef66d9180c81955fd1df1625fe072d72
59db768a5440fb0c9ece65c69898804986b9d05b 17-May-2017 Tyler Gunn <tgunn@google.com> Merge "Extra security checks in placeCall."
am: 3cb2f5e569

Change-Id: I307164aa24794cd71f5cdb7e6e1c078da9f2d376
3cb2f5e5697475adbd7c86f414d0806c94878a65 17-May-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Extra security checks in placeCall."
a8f91f8dbd0ab6ecf12319714fb94caba1df0fd1 17-May-2017 Michael Dooley <mdooley@google.com> Merge "Adding config to disable temporary permission granting" into oc-dev am: b65719af5e
am: 0f5f0568cb

Change-Id: I794fb66edcc24246bc1acb8b46d28542ab8d570c
0f5f0568cbc5c390115bc4ea937f17d55423fd4c 17-May-2017 Michael Dooley <mdooley@google.com> Merge "Adding config to disable temporary permission granting" into oc-dev
am: b65719af5e

Change-Id: Ic895b3b82bb0fcfc375354665b8779716f601dee
0c7cf9a8c724247f9a0fce466c6cdddcca9262d2 17-May-2017 Tyler Gunn <tgunn@google.com> Extra security checks in placeCall.

When adding self-managed calls, ensure that the package of the caller
matches the package for the outgoing call phone account, unless the
caller is able to place calls.

This means a self-managed CS can ONLY place calls for its own CS.
However, the default dialer, or other call capable apps (e.g. Auto) can
still place calls on behalf of a self-managed CS.

Test: Created standalone test app to verify cases.
Bug: 38377651
Change-Id: I568b5131ff640ed66c094afae665630772956a17
rc/com/android/server/telecom/TelecomServiceImpl.java
b65719af5eba1bf765056a4b948e4dbbb03e491f 17-May-2017 Michael Dooley <mdooley@google.com> Merge "Adding config to disable temporary permission granting" into oc-dev
7286d1812b33ea12835a30555a2c395aa0725af6 17-May-2017 Tony Mak <tonymak@google.com> Handle USER_REMOVED action in DefaultDialerCache am: c2d48355ff am: 5ef1b63470 am: 290eacf333
am: 82ce167ba2

Change-Id: I9d654caba2dda458dbdee22e6e259b4496c774c4
82ce167ba269d6c98919b1cc398dbe381b897d8c 17-May-2017 Tony Mak <tonymak@google.com> Handle USER_REMOVED action in DefaultDialerCache am: c2d48355ff am: 5ef1b63470
am: 290eacf333

Change-Id: I734547ad475a5926c58a8de6897bdeda10e0a9dd
290eacf333364e2e30b167e2b33179e90f1506e6 17-May-2017 Tony Mak <tonymak@google.com> Handle USER_REMOVED action in DefaultDialerCache am: c2d48355ff
am: 5ef1b63470

Change-Id: I0037536f7fa89c060606c7d3de78c8d350c4abbf
5ef1b634701cfee6785dbfe7dd83fedd43fb8e12 17-May-2017 Tony Mak <tonymak@google.com> Handle USER_REMOVED action in DefaultDialerCache
am: c2d48355ff

Change-Id: Ic7ebfca285553db225fbb76d19dba5d4c589163a
c2d48355ffd2704f52d8b3b8834a2167652e95fa 17-May-2017 Tony Mak <tonymak@google.com> Handle USER_REMOVED action in DefaultDialerCache

When a user is removed, its entry sticks around in the dialer cache.
This causes a lot of logspam during CTS. This change removes a user from
the default dialer cache when its USER_REMOVED broadcast is sent.

Change-Id: I4c86957fae21e37b213bbf13d26c21df74d85b0a
Fixes: 38161359
Test: manual and unit
rc/com/android/server/telecom/DefaultDialerCache.java
ests/src/com/android/server/telecom/tests/DefaultDialerCacheTest.java
ddb03e1387a09f9c7da624b064bf4f5b90ed478c 12-May-2017 Tyler Gunn <tgunn@google.com> Call "createConnectionComplete" callback in Telecom.

When done creating a connection in Telecom, call createConnectionComplete.
Note: Checks the serviceinterface for null since in the case of a
"null connection" from the ConnectionService we'll be unbound by
the time we get here.

Test: Manual
Bug: 33272455
Change-Id: Ic23f6ad65d49d2a8c70ac4d35d53feb0dd5e34bb
rc/com/android/server/telecom/ConnectionServiceWrapper.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
55bcb0813f9a41d7542bde40b69cd6d00ee17df7 12-May-2017 Tyler Gunn <tgunn@google.com> Update notification channels on locale change.

As the name says.

Test: Manual
Bug: 38231168
Change-Id: Icaf1abd1a8ee61e2c18ccaf0afe630589a36fe6c
rc/com/android/server/telecom/ui/NotificationChannelManager.java
0f1b7b1dcb402d8b20bbc58e9b8ae217ac760427 12-May-2017 Tyler Gunn <tgunn@google.com> Merge "Fix issue where incoming call shows up while handing over call."
ce6419041e5d11e63bf5a1bc9913b42ba69a06ec 10-May-2017 mike dooley <mdooley@google.com> Adding config to disable temporary permission granting

And disable temporary permission granting by default.

Test: manual tests
Bug: 37475749
Change-Id: I53743cfd9b4f12d6c848f27acd16920d6939ad9c
es/values/config.xml
rc/com/android/server/telecom/EmergencyCallHelper.java
78e29571b847b7d25d3aeab1a1b30abd1b83fcd8 12-May-2017 Tyler Gunn <tgunn@google.com> Merge "Revert "Disable a phone number log for user build" am: 46bc3fd58a am: 64b7f379f1 am: 487621a791 am: 8f1b2f9035" into oc-dev am: 85c04756e8
am: c8b431d857 -s ours

Change-Id: I921974ede87a84c2421dda809baf61104cb6c1de
6ee7711c0c2aec95a7e2cae9796b8e181f31a460 12-May-2017 Andrew Chant <achant@google.com> Merge "let KEYCODE_MEDIA_PLAY_PAUSE answer/hangup calls" into oc-dev am: 3f09fa59e6
am: e136ce3414

Change-Id: I6e4c64d53a5114c2fb44bbfe01665263ee706bab
fc5d86e893e7b2616f79f14ab9603a4a418952e9 12-May-2017 Tyler Gunn <tgunn@google.com> Merge "Remove auto-DND while in call." into oc-dev am: 064bd03121 -s ours
am: 6b4ba27abb -s ours

Change-Id: Idab9fbdefcac84e32f37aa5003f55aea586ec363
c8b431d8573208f684651c7b96183a9ca7c7d04d 12-May-2017 Tyler Gunn <tgunn@google.com> Merge "Revert "Disable a phone number log for user build" am: 46bc3fd58a am: 64b7f379f1 am: 487621a791 am: 8f1b2f9035" into oc-dev
am: 85c04756e8

Change-Id: I6977c887f697de84742e3812a7642b025d033e70
e136ce341426e317f29853210a61ece06198f85d 12-May-2017 Andrew Chant <achant@google.com> Merge "let KEYCODE_MEDIA_PLAY_PAUSE answer/hangup calls" into oc-dev
am: 3f09fa59e6

Change-Id: I15091c9a65f06406bd6ad5806567d10922147621
6b4ba27abbbd534c15080272b0391b38bb497c79 12-May-2017 Tyler Gunn <tgunn@google.com> Merge "Remove auto-DND while in call." into oc-dev
am: 064bd03121 -s ours

Change-Id: I3ad59a2d5c24f9fe331140b5fc09fb4fc5013b5f
85c04756e8a1b48abeb5972e11763b0757b267e4 11-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Revert "Disable a phone number log for user build" am: 46bc3fd58a am: 64b7f379f1 am: 487621a791 am: 8f1b2f9035" into oc-dev
3f09fa59e6324bda190a3638a492d30918ff6b08 11-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "let KEYCODE_MEDIA_PLAY_PAUSE answer/hangup calls" into oc-dev
064bd03121b8f2f326bb115930db0232c09c4cb9 11-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove auto-DND while in call." into oc-dev
15d096bd78c71959651d71a8981b9f89520537bc 04-May-2017 Tyler Gunn <tgunn@google.com> Fix issue where incoming call shows up while handing over call.

Fixing issue where the "Answering will end your other call" UX shows up
while a handover is in process. This was a race-condition which could
happen when the handover is marked as success and the incoming handover
call is not yet active.

Solved by tracking in a Call whether it has successfully handed over or
not. Using this to filter the call out from IncomingCallNotifier.

Test: Manual
Bug: 37768995
Change-Id: I8eeacb88c0c38953f1e4709ea5777c005cbeaf39
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ui/IncomingCallNotifier.java
ests/src/com/android/server/telecom/tests/IncomingCallNotifierTest.java
60d66a2801e3823154c1b0de9567afa3c1b50fbc 03-Apr-2017 Tyler Gunn <tgunn@google.com> Revert "Disable a phone number log for user build" am: 46bc3fd58a am: 64b7f379f1 am: 487621a791
am: 8f1b2f9035

This was reverted in AOSP/Master. It should be CPed into oc-dev as
it cleans up some ERROR log messages.

Test: Manual
Merged-In: Ie26430981b13344f57252edb6dfbcb4cc95b8706
Change-Id: Ie26430981b13344f57252edb6dfbcb4cc95b8706
(cherry picked from commit 27f750d3a30f48866ac8c8e9cb998a85fde986b9)
rc/com/android/server/telecom/ConnectionServiceWrapper.java
d4afe618a538c3333e09a8943328340a60c52025 11-May-2017 Alan Viverette <alanv@google.com> Merge "Remove reference to support-v4-prebuilt" into oc-dev am: 04d2710c95
am: f63cc673cf

Change-Id: I8436636456a23ac38b577d5f0af179051960d3dc
f63cc673cf2edb1d7e704e712e41191eba02509a 11-May-2017 Alan Viverette <alanv@google.com> Merge "Remove reference to support-v4-prebuilt" into oc-dev
am: 04d2710c95

Change-Id: I6557159cd74ac9c3e5ae668a2946995ef6925633
04d2710c95adc83556d97ce4a04f8fcc09fbf0b3 11-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove reference to support-v4-prebuilt" into oc-dev
e9d36871b079d0d2c188ee48fbc6f0356f29bc37 10-May-2017 Alan Viverette <alanv@google.com> Remove reference to support-v4-prebuilt

Test: make checkbuild
Change-Id: Ie1e1a04923a194023b6fe8efe01f3afcc5503034
ests/Android.mk
0415220ec79cf8f01880257d8b32d975dda6801a 08-May-2017 Andrew Chant <achant@google.com> let KEYCODE_MEDIA_PLAY_PAUSE answer/hangup calls

By the Android USB headset spec:
https://source.android.com/devices/accessories/headset/usb-headset-spec

The Android key KECODE_MEDIA_PLAY_PAUSE should accept, reject, and end
calls when pressed appropriately.

This behavior is the same as the HEADSETHOOK behavior.
This updates the button handling code to match the spec.

Test: answered, muted, and hung-up call with USB headset adhering to spec.

Bug: 36070414
Change-Id: Id575d8b6178b76985a883e987908cf8c445c7bdf
Signed-off-by: Andrew Chant <achant@google.com>
rc/com/android/server/telecom/HeadsetMediaButton.java
96f9dd173ea073b2ec74f8be8fc8b9b8bad4d817 10-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: b5181910fa -s ours
am: 280ce174f2 -s ours

Change-Id: I231b7f10b3d44ab30a33aba460a987837a815be7
280ce174f2eed7613f0862e44cb3e163f614735e 09-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: b5181910fa -s ours

Change-Id: Ied454e7cc014a2675a66155a8e0cf45191af1e4f
b5181910fa553e19fcf2d21ce2a079bb6dc51745 09-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I88bbff28a263896e5b0b191214750496b3318fb7
Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-gl/strings.xml
es/values-in/strings.xml
es/values-km/strings.xml
es/values-ky/strings.xml
es/values-mk/strings.xml
es/values-ms/strings.xml
es/values-ne/strings.xml
es/values-si/strings.xml
es/values-sq/strings.xml
es/values-sr/strings.xml
es/values-tl/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-zh-rCN/strings.xml
710e73c776e550245a11c655465055e16dcd4c25 09-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I8aac15cabd6910a304e51c86ef474e8966ee64d7
Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-gl/strings.xml
es/values-in/strings.xml
es/values-km/strings.xml
es/values-ky/strings.xml
es/values-mk/strings.xml
es/values-ms/strings.xml
es/values-ne/strings.xml
es/values-si/strings.xml
es/values-sq/strings.xml
es/values-sr/strings.xml
es/values-tl/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-zh-rCN/strings.xml
3fdd63877b46a53645c0a88ae962bcc452c53a30 05-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
51ab3d0fe24fb13afe9e1296e6956b2d6b34bb0c 05-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 11b0c356f5 -s ours
am: fa86245b81 -s ours

Change-Id: I61669634ccdb70c2ca14028f25ed222aab5a92b5
fa86245b814c591021e192354eb5bf089b778527 05-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 11b0c356f5 -s ours

Change-Id: Iccd8b8abae1af0e5b9ebb7dc5d8ebec57407e145
11b0c356f5b67940ccb5a6ec846bcd7e1dcec1ad 05-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ibeb4124b984fd5c338678c1b93067d378705668f
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-bn/strings.xml
es/values-bs/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-eu/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-gu/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-is/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-kk/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk/strings.xml
es/values-ml/strings.xml
es/values-mn/strings.xml
es/values-mr/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-nb/strings.xml
es/values-ne/strings.xml
es/values-nl/strings.xml
es/values-pa/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta/strings.xml
es/values-te/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
9d80549bb2f624eb3cd3d33d6cbf79517e4f6d0e 05-May-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Iecbc333425692bf7f40da6782c18d2b99e3c2dc3
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-bn/strings.xml
es/values-bs/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-eu/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-gu/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-is/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-kk/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk/strings.xml
es/values-ml/strings.xml
es/values-mn/strings.xml
es/values-mr/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-nb/strings.xml
es/values-ne/strings.xml
es/values-nl/strings.xml
es/values-pa/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta/strings.xml
es/values-te/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
a6a6f7f8726f29d5971a4ceaeeb956d385b76381 04-May-2017 Tyler Gunn <tgunn@google.com> Merge "Fix USSD Api test app" into oc-dev am: 4c0a602ef2
am: 85821861eb -s ours

Change-Id: I4d2895b22ab56433372c64c058bb57255bed1159
85821861eb5885f95cdf1cc17ca0734851118b0a 04-May-2017 Tyler Gunn <tgunn@google.com> Merge "Fix USSD Api test app" into oc-dev
am: 4c0a602ef2

Change-Id: I133e537ecf724467f8dbc35ddb182bf79bab5a22
4c0a602ef289ea53f6a1477a5ebaa502585387d4 04-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix USSD Api test app" into oc-dev
0393890b28cb0d51f4daa9fb66063f4bb43a6aa7 03-May-2017 Tyler Gunn <tgunn@google.com> Merge "Confirm managed call when there are ongoing self-managed calls." into oc-dev am: ba03779236
am: 9daa42dceb -s ours

Change-Id: Idf83370e38b692ec889ceb4bdeed60969182d727
9daa42dceb2d8fe3d7fad7fde6cc7d8a9aa0fb97 03-May-2017 Tyler Gunn <tgunn@google.com> Merge "Confirm managed call when there are ongoing self-managed calls." into oc-dev
am: ba03779236

Change-Id: Ie9c99152af59dab4225a911285fcd6005248a1d6
ba03779236612e3c3cfc74a32cbffbd6c7cf119c 03-May-2017 Tyler Gunn <tgunn@google.com> Merge "Confirm managed call when there are ongoing self-managed calls." into oc-dev
c723d7d14adbdddcdcc92cbbb3ac4ab7dbd2a563 03-May-2017 Tyler Gunn <tgunn@google.com> Merge "Do not send call event if handover call has no ConnectionService bound."
754dc5de096b43b83154866e70676c6b84226824 30-Apr-2017 Tyler Gunn <tgunn@google.com> Confirm managed call when there are ongoing self-managed calls.

When the user places a managed call while there are ongoing self-managed
calls, the system will now display a dialog giving the user the option of
NOT placing the managed call, or placing the managed call and disconnecting
the ongoing self-managed call(s).

This is done by stopping the outgoing call during startOutgoingCall and
bringing up a dialog to confirm whether the user wants to place the call.
If they chose to place the call, ongoing self-mgds calls are disconnected,
the call is added, and the NewutgoingCallBroadcast is sent as usual.

If the user chooses not to start the call, the call is cancelled.

Test: Manual
Bug: 37828805
Merged-In: I8539b0601cf5f324d2fb204485ee0d9bbf03426d
Change-Id: I8539b0601cf5f324d2fb204485ee0d9bbf03426d
ndroidManifest.xml
es/values/strings.xml
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/TelecomBroadcastIntentProcessor.java
rc/com/android/server/telecom/ui/ConfirmCallDialogActivity.java
84772102530d9a38902825e857b78fe16662d399 03-May-2017 Tyler Gunn <tgunn@google.com> Merge "Confirm managed call when there are ongoing self-managed calls."
e1cab751c50c0734b0ea0072e711868405f23545 02-May-2017 Tyler Gunn <tgunn@google.com> Do not send call event if handover call has no ConnectionService bound.

If the handover TO ConnectionService returns a null Connection, failing
the handover, Telecom will still try to report to the "to" Connection
that the handover failed, when it is in reality not possible to report
that.

Adding a null CS check when sending this CallEvent.

Test: Manual
Bug: 37896563
Change-Id: I4e041dade46de173247ea6110b9da0e356af606b
rc/com/android/server/telecom/CallsManager.java
bbd78a76f8a3d103018474ecd52bead71cd5fc5a 30-Apr-2017 Tyler Gunn <tgunn@google.com> Confirm managed call when there are ongoing self-managed calls.

When the user places a managed call while there are ongoing self-managed
calls, the system will now display a dialog giving the user the option of
NOT placing the managed call, or placing the managed call and disconnecting
the ongoing self-managed call(s).

This is done by stopping the outgoing call during startOutgoingCall and
bringing up a dialog to confirm whether the user wants to place the call.
If they chose to place the call, ongoing self-mgds calls are disconnected,
the call is added, and the NewutgoingCallBroadcast is sent as usual.

If the user chooses not to start the call, the call is cancelled.

Test: Manual
Bug: 37828805
Change-Id: I8539b0601cf5f324d2fb204485ee0d9bbf03426d
ndroidManifest.xml
es/values/strings.xml
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/TelecomBroadcastIntentProcessor.java
rc/com/android/server/telecom/ui/ConfirmCallDialogActivity.java
8453f6b892c0c052846dde9ad53d5128643345bd 02-May-2017 The Android Open Source Project <initial-contribution@android.com> Import translations. DO NOT MERGE am: f9e7fbc56a -s ours
am: 0ac2ca56f7 -s ours

Change-Id: I1bceeb6f385907662f2a4994bc2e8f2064a1195a
0ac2ca56f70f1e007e675920cc16cf0b99c96c45 02-May-2017 The Android Open Source Project <initial-contribution@android.com> Import translations. DO NOT MERGE
am: f9e7fbc56a -s ours

Change-Id: I34074bf43abde23aeb2575871a154a9ad640c389
f9e7fbc56a024bc7d78bcbf96f53e2c42995b0c7 02-May-2017 The Android Open Source Project <initial-contribution@android.com> Import translations. DO NOT MERGE

Change-Id: If2768e90e016e141852b04012b8533b5b6cd3471
Auto-generated-cl: translation import
es/values-da/strings.xml
7eef71260cf28bd5d5af8a14ac7ccb0c387453d0 02-May-2017 The Android Open Source Project <initial-contribution@android.com> Import translations. DO NOT MERGE

Change-Id: Ide1bce8b3eaa1ce03031132a0ec6d6ca1fd3702a
Auto-generated-cl: translation import
es/values-da/strings.xml
fa1b42cae19c648df658882fb82a231b21bb1bc4 29-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 6d943ad019 -s ours
am: 6552957fa8 -s ours

Change-Id: I16a37ac40b1f66e6ba5136fdfd9c1593be921dff
6552957fa8c13e010bcf344701349c5b4f30ad30 29-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 6d943ad019 -s ours

Change-Id: I1b7cee1ef1711675479b249ddf18c37e7da1dedb
06ff3e666dcc9c5aae437d9674fece042cf57a09 29-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
bbaffdf93c9c1c05e5d55b9d338128cba9fd2e86 29-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ibc4784a6b84a2eaa385c673c3f3a86ab044e97e1
Auto-generated-cl: translation import
es/values-be/strings.xml
es/values-bs/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hy/strings.xml
es/values-iw/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-mk/strings.xml
es/values-nl/strings.xml
es/values-sk/strings.xml
es/values-te/strings.xml
es/values-zh-rHK/strings.xml
6d943ad0192bec1ff7ff7f37ddcb299019ae8dce 29-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ice3a79b006a07dca05e94ac998c840fab35927dc
Auto-generated-cl: translation import
es/values-be/strings.xml
es/values-bs/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hy/strings.xml
es/values-iw/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-mk/strings.xml
es/values-nl/strings.xml
es/values-sk/strings.xml
es/values-te/strings.xml
es/values-zh-rHK/strings.xml
fe37fdc0a924b79ffd22168fdb448bcf10594070 26-Apr-2017 Tyler Gunn <tgunn@google.com> Fix USSD Api test app

The test app that sends USSD with the TelephonyManager API was broken and
would never receive callbacks. Corrected the issues.

Test: Manual
Bug: 37484804
Merged-In: I692b50e497b9aceebe80c87ec6efc25b6046a64b
Change-Id: I692b50e497b9aceebe80c87ec6efc25b6046a64b
(cherry picked from commit 6aab9148451176be35e978723da82a7323c9cf29)
estapps/res/layout/testussd_main.xml
estapps/src/com/android/server/telecom/testapps/TestUssdActivity.java
2351943f3dcda2ad546d302f8faaccccd8f120e9 29-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix USSD Api test app"
ac6c63897653b7be73149e45dfe7b5a2939575f6 28-Apr-2017 Tyler Gunn <tgunn@google.com> Merge changes from topic 'sort-order' am: a84782331e am: 79f9e2cf70 am: 6e03f2a7e4
am: 91ebb1ec79

Change-Id: I94b5b96b6acef944d073fc6dcfbc71f5caf074ee
91ebb1ec79c869f5e8513a636df3ae64be39c006 28-Apr-2017 Tyler Gunn <tgunn@google.com> Merge changes from topic 'sort-order' am: a84782331e am: 79f9e2cf70
am: 6e03f2a7e4

Change-Id: I1a3aae6b0a274f90f67306f234171c7eed5c66ae
6e03f2a7e431416e6fbf9918ed00f72e1dee2500 28-Apr-2017 Tyler Gunn <tgunn@google.com> Merge changes from topic 'sort-order' am: a84782331e
am: 79f9e2cf70

Change-Id: Ia3037c9b077ad59c4181a684ca94c48df0d6dd0e
79f9e2cf700ec981afa32043a8947b9490fe0850 28-Apr-2017 Tyler Gunn <tgunn@google.com> Merge changes from topic 'sort-order'
am: a84782331e

Change-Id: I66c6ba832bb09b53fbadb2e2d4c212d1b33d3ecf
a84782331e231844ccfb610b5136057cc77bab2b 28-Apr-2017 Tyler Gunn <tgunn@google.com> Merge changes from topic 'sort-order'

* changes:
Migrate phone account sorting to use lamba expressions and add test.
PhoneAccounts sorting
702fdd02504beeed4cc89cbf767f856a74f203f5 18-Apr-2017 Tyler Gunn <tgunn@google.com> Migrate phone account sorting to use lamba expressions and add test.

Refactor the phone acconut sorting code to use lamba expressions and
to ensure sorting happens anytime phone accounts are written (rather than
just when they're added/edited).

Test: Unit
Bug: 34872161
Merged-In: I3b398a3ee004425947def808bf187003ff82ccf2
Change-Id: I3b398a3ee004425947def808bf187003ff82ccf2
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
3cc6126e75d8156243dff32a23dec89e7a3a90e1 23-Jun-2016 Srikanth Chintala <srikchin@codeaurora.org> PhoneAccounts sorting

Any time a PhoneAccount is added to the mState,
perform a sort

Sort order is:
a) Sort CAPABILITY_SIM_SUBSCRIPTION PhoneAccounts
b) Sort by EXTRA_SORT_ORDER
c) Sort by PHoneAccount label.

In case of phone account re-registration in Telecomm,
old account was getting removed and updated account
was getting appended. So, the order of PhoneAccount
was getting changed with the fix this case will
be handled.

Bug: 34872161
Mergd-In: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc
Change-Id: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc
rc/com/android/server/telecom/PhoneAccountRegistrar.java
6aab9148451176be35e978723da82a7323c9cf29 26-Apr-2017 Tyler Gunn <tgunn@google.com> Fix USSD Api test app

The test app that sends USSD with the TelephonyManager API was broken and
would never receive callbacks. Corrected the issues.

Test: Manual
Bug: 37484804
Change-Id: I692b50e497b9aceebe80c87ec6efc25b6046a64b
estapps/res/layout/testussd_main.xml
estapps/src/com/android/server/telecom/testapps/TestUssdActivity.java
561178c1da811d359a7e79dfb56b0b0cfb49f37a 28-Apr-2017 Tyler Gunn <tgunn@google.com> Merge changes from topic 'cp-phac-sort'

* changes:
Migrate phone account sorting to use lamba expressions and add test.
PhoneAccounts sorting
ea921dcdf4d9f21451c49a6b0d1b6e67e374fa2c 18-Apr-2017 Tyler Gunn <tgunn@google.com> Migrate phone account sorting to use lamba expressions and add test.

Refactor the phone acconut sorting code to use lamba expressions and
to ensure sorting happens anytime phone accounts are written (rather than
just when they're added/edited).

Test: Unit
Bug: 34872161
Change-Id: I3b398a3ee004425947def808bf187003ff82ccf2
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
d5d2dd9a546865586185ecfa7ae8b64613b76e4f 23-Jun-2016 Srikanth Chintala <srikchin@codeaurora.org> PhoneAccounts sorting

Any time a PhoneAccount is added to the mState,
perform a sort

Sort order is:
a) Sort CAPABILITY_SIM_SUBSCRIPTION PhoneAccounts
b) Sort by EXTRA_SORT_ORDER
c) Sort by PHoneAccount label.

In case of phone account re-registration in Telecomm,
old account was getting removed and updated account
was getting appended. So, the order of PhoneAccount
was getting changed with the fix this case will
be handled.

Bug: 34872161
Change-Id: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc
rc/com/android/server/telecom/PhoneAccountRegistrar.java
1e6864ed8822880578a414692f59f215e9d31902 27-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Further call handover changes."
10305f62207c7c2bf2a6ac5fb6d3eb884f4dd432 27-Apr-2017 Julia Reynolds <juliacr@google.com> Merge "Notification method renames." into oc-dev am: d62e9610c6
am: e091fb2a98

Change-Id: I3cbf3605b6b555748f7c401165088e6f668256e2
e091fb2a98f5cc27c4d2b700b212347ab2b23db8 27-Apr-2017 Julia Reynolds <juliacr@google.com> Merge "Notification method renames." into oc-dev
am: d62e9610c6

Change-Id: Icc9ec0772246a6ffc15f603b7cdeda5db5f18447
d62e9610c644ff603ff060afbb0af12dc1d53259 27-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Notification method renames." into oc-dev
0c865f0145a424a8aefa97a26407d17f1c151a31 27-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
d2fea43d55e03f75a81259b531e66365a7278e1a 26-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 0af503fccb -s ours
am: 38adc0f9ff -s ours

Change-Id: I7ae2314437a2c15db269bfc4e35e4a239d441a0b
38adc0f9ffe7463f86869c75a7e197bcfbfc1b4c 26-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 0af503fccb -s ours

Change-Id: I2edd21f4597e06b813f066cb8e32fe657bd8448b
0af503fccb77b72dc087792f7ea6a870ec89dbe7 26-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I23a86346e8f491072b96a9b360667a21defcbe0b
Auto-generated-cl: translation import
es/values-bs/strings.xml
es/values-es-rUS/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hy/strings.xml
es/values-my/strings.xml
es/values-pl/strings.xml
es/values-zh-rTW/strings.xml
0233217a6b29a1e3f0e2b7700db089254f322853 26-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Id850b49ff4c3bc5bc1e831cb3bb77b32ff062690
Auto-generated-cl: translation import
es/values-bs/strings.xml
es/values-es-rUS/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hy/strings.xml
es/values-my/strings.xml
es/values-pl/strings.xml
es/values-zh-rTW/strings.xml
5f1672b92d70fd68f0e514185c0d2787c3a1b73d 25-Apr-2017 Julia Reynolds <juliacr@google.com> Notification method renames.

Test: make
Bug: 37672218
Change-Id: I95616522b943c4f6b5e10418b824b82a44f3c173
rc/com/android/server/telecom/ui/IncomingCallNotifier.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ca07fbe6fef7b587dd7305e55d0e588d6af2ca3b 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Add support for telephony tests in testing script" am: 0647b0b1fa am: 72bb5f7ec6 am: bfc142dba0
am: 175bb305d1

Change-Id: I053628fd16817751d4a22d93dd381d3a90ab2548
a21cb4b4d153a19d5d87b01855ef8011c012800e 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Speculative fix for flaky CallAudioRouteStateMachine tests" am: 3a0d757192 am: e9ca18734e am: e1d0e4bcc6
am: 7d02b04ada -s ours

Change-Id: Ie70fb5a58144c0e6a01553383052a91e855bbc9f
175bb305d1177953355b64eae11a54683a165eb4 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Add support for telephony tests in testing script" am: 0647b0b1fa am: 72bb5f7ec6
am: bfc142dba0

Change-Id: Ie26d4647d338c4f1da22ccb5ba368967af4f2757
bfc142dba040170634ca8943abec2ad4e0d5d9bf 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Add support for telephony tests in testing script" am: 0647b0b1fa
am: 72bb5f7ec6

Change-Id: I34d47344f53e63b5e6c51a06ede571a235e9918a
72bb5f7ec6a23610239f320d1d7e50c0f818a4dd 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Add support for telephony tests in testing script"
am: 0647b0b1fa

Change-Id: I5ea71667b0af42dfb6cd1eee0a5a63399420c841
6f6f1c51c0675a67ef7d7e6ea9264429a4cb269d 18-Apr-2017 Tyler Gunn <tgunn@google.com> Further call handover changes.

Support logging self-managed calls based on PhoneAccount extra.
Support passing handover extras to the handover connection service.
Improve signalling to handover initiator on fail/success of hanndover.

Test: Manual
Bug: 37102939
Change-Id: Idd23d1f3489a640666ef20d51ed18e5b80028726
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/ui/IncomingCallNotifier.java
estapps/res/layout/self_managed_sample_main.xml
estapps/src/com/android/server/telecom/testapps/SelfManagedCallList.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallingActivity.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnection.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnectionService.java
0647b0b1fa59c65a2582b223f38c8461109b11d3 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Add support for telephony tests in testing script"
7d02b04ada6f2ee8e6d66e3974b25c58247efd27 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Speculative fix for flaky CallAudioRouteStateMachine tests" am: 3a0d757192 am: e9ca18734e
am: e1d0e4bcc6

Change-Id: I71fc4e726ec5b2df392c196f583002f76ca219ee
e1d0e4bcc62b212fd9e71c777ccd424d994cf7a1 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Speculative fix for flaky CallAudioRouteStateMachine tests" am: 3a0d757192
am: e9ca18734e

Change-Id: I3bcf4dfc80dfae4d467b925faa9eaba53e5977f4
e9ca18734e1121b8467fa4d5ee555d778056b3f5 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Speculative fix for flaky CallAudioRouteStateMachine tests"
am: 3a0d757192

Change-Id: I1d0cf71d06462c1e0a6a3db7164e300249eabbda
3a0d757192d58ba172ab5c1d61ecf60dcbb0dce0 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Speculative fix for flaky CallAudioRouteStateMachine tests"
634c1381406c04dd825fbc731b55ff63a469fb4f 25-Apr-2017 pkanwar <pkanwar@google.com> Provide an API to make USSD calls and read the responses. am: c51fcb97e0 am: a6787151a6 am: 520adf19eb -s ours
am: 3379d80ad8 -s ours

Change-Id: Ib2ccee20bb8fa305e88b9abe2cff1300d87dcbab
5dba95131ed938c28019617b3103ab3457b11992 19-Apr-2017 Hall Liu <hallliu@google.com> Speculative fix for flaky CallAudioRouteStateMachine tests

Add a wait for handler to make sure that there's no spurious
multithreading

Test: test change
Merged-In: Ic293a8a5b71cca8c218ae276a7298971e14318fc
Change-Id: Ic293a8a5b71cca8c218ae276a7298971e14318fc
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
3379d80ad82d40c6994c14e45305c699fd5628ee 24-Apr-2017 pkanwar <pkanwar@google.com> Provide an API to make USSD calls and read the responses. am: c51fcb97e0 am: a6787151a6
am: 520adf19eb -s ours

Change-Id: I11569c904367ed37a0ff2f9cb6105ac81849a912
520adf19eb2d88031c3ca226e1d8b64440423bb0 24-Apr-2017 pkanwar <pkanwar@google.com> Provide an API to make USSD calls and read the responses. am: c51fcb97e0
am: a6787151a6

Change-Id: I40aab8680f2d1dda982b38193bca66bba81fcd45
a6787151a621262ccf13518ba10693ebfa06982f 24-Apr-2017 pkanwar <pkanwar@google.com> Provide an API to make USSD calls and read the responses.
am: c51fcb97e0

Change-Id: I5a904d460b12f3f1f112c0cfa290c025c01ecdef
56b8d337188a5b9021c4449f0870d6bb81ef7026 19-Apr-2017 Hall Liu <hallliu@google.com> Speculative fix for flaky CallAudioRouteStateMachine tests

Add a wait for handler to make sure that there's no spurious
multithreading

Test: test change
Change-Id: Ic293a8a5b71cca8c218ae276a7298971e14318fc
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
c51fcb97e09d0cd247ba3b0d39134dda233e99d9 31-Oct-2016 pkanwar <pkanwar@google.com> Provide an API to make USSD calls and read the responses.

Test: will be added in a subsequent CL.
Bug: 30973910
Change-Id: Ie92441b6435775d9b6d74f9a0777064d9839d6dc
Merged-In: Ie92441b6435775d9b6d74f9a0777064d9839d6dc
estapps/AndroidManifest.xml
estapps/res/layout/testussd_main.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/TestUssdActivity.java
cca957f37bf851c10767db541eb87f3150370702 11-Apr-2017 Tyler Gunn <tgunn@google.com> Remove auto-DND while in call.

Removing the auto DND functionality while in a call.
This functionality is being phased out due to b/28688969.

Test: Unit/Manual
Bug: 37154069
Merged-In: I5690116fc6a3938e7725a4b2963741885ddc8ac0
Change-Id: I5690116fc6a3938e7725a4b2963741885ddc8ac0
(cherry picked from commit daeffaf3dbcfadfcb58b07a56169982eacb697db)
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
36a83e5e58eaab4c0f64fdd1840166c2eef10fa2 20-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Clear caller identify before registering and unregistering phone acct." into oc-dev am: 5688c1935e
am: 407432e9bc -s ours

Change-Id: I745d153a45b7ee4860cb6f9d5c4375dd7b594fbd
407432e9bc55439f9990376a04a9f51782c1ce39 20-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Clear caller identify before registering and unregistering phone acct." into oc-dev
am: 5688c1935e

Change-Id: Ic23ec9ecfa166a26ce10e21f7af3e428fa69097b
5688c1935ecd0852a2fe3982ed64e3ae8f0c5f07 20-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Clear caller identify before registering and unregistering phone acct." into oc-dev
4145cbf1380da81b3d9c9c4d24fa9aabeb06f707 20-Apr-2017 Tyler Gunn <tgunn@google.com> Fix Telecom unit tests. am: 369fd7887d
am: 14a1245081 -s ours

Change-Id: I743f807b756c132523bbd4d2fbeb233f32b83a60
14a1245081eecfc44bae6a67f4b391cfcfc9d2c5 20-Apr-2017 Tyler Gunn <tgunn@google.com> Fix Telecom unit tests.
am: 369fd7887d

Change-Id: I329358eca5653852548f7c4fda02ae526bcd5274
87681f232cb7a97c96d5e0ea5421e9fb696a22c7 19-Apr-2017 Tyler Gunn <tgunn@google.com> Clear caller identify before registering and unregistering phone acct.

Fixes issue with intent being received as expected in legacy use case.

Bug: 37430159
Merged-In: Ibac58ccd0caaad325f4c44b7fe6feda5bb878388
Change-Id: Ibac58ccd0caaad325f4c44b7fe6feda5bb878388
(cherry picked from commit 42064bc739f5efdb8563f09f763c0d4d9b33df57)
rc/com/android/server/telecom/TelecomServiceImpl.java
369fd7887da98a4eb55944c92adc9abf481b845f 19-Apr-2017 Tyler Gunn <tgunn@google.com> Fix Telecom unit tests.

Cherry-pick from internal master.
This was originally caused by a change in b/37106957.

Bug: 37106957
Merged-In: Ia60d85410ec9824cb45c3678977499dcb8962ea0
Change-Id: Ia60d85410ec9824cb45c3678977499dcb8962ea0
(cherry picked from commit ff5fb18ae3400c560644158f179ab991b104419f)
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
31a052187feaa9bddbc48813989efe731d7becc5 19-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Remove auto-DND while in call."
42064bc739f5efdb8563f09f763c0d4d9b33df57 19-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Clear caller identify before registering and unregistering phone acct." am: 91d5655e89 am: 35cfbaef3c am: c77d3e4447
am: bb33aff997

Change-Id: Ibac58ccd0caaad325f4c44b7fe6feda5bb878388
bb33aff99746518d1910cce442cf7edff884369c 19-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Clear caller identify before registering and unregistering phone acct." am: 91d5655e89 am: 35cfbaef3c
am: c77d3e4447

Change-Id: I7f99da7659a8d4abb0974a3b34b9ac7b22e0beee
c77d3e444720bd9f6e45377e3cee1a66ad80056b 19-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Clear caller identify before registering and unregistering phone acct." am: 91d5655e89
am: 35cfbaef3c

Change-Id: I224ce68a4927f2c408afc397b0910c823eb912db
35cfbaef3c3071df586b658a6d615187ad4abada 19-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Clear caller identify before registering and unregistering phone acct."
am: 91d5655e89

Change-Id: I8ad58f5f59ab552180415990b1f4ba6f53681443
91d5655e891dc45fa781d4dac1c6867d27481471 19-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Clear caller identify before registering and unregistering phone acct."
cbc9be2d2807bfbb52cc9f58f7070eb81c874dc6 19-Apr-2017 Tyler Gunn <tgunn@google.com> Clear caller identify before registering and unregistering phone acct.

This was causing a problem with the intents broadcast from CallsManager.

Test: Ran CTS, Manual
Bug: 37430159
Change-Id: I7c7486cfe13f1465bd7fafa7ad64dc426289c987
rc/com/android/server/telecom/TelecomServiceImpl.java
ff5fb18ae3400c560644158f179ab991b104419f 19-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix Telecom unit tests." am: 4ce2b184a7 am: a17d44305c am: 20ef5ef13a
am: ae54b2d111

Change-Id: Ia60d85410ec9824cb45c3678977499dcb8962ea0
ae54b2d111bfdcdce25177e193f0b6cc3a023326 19-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix Telecom unit tests." am: 4ce2b184a7 am: a17d44305c
am: 20ef5ef13a

Change-Id: I18294d80c0fc11ac2728f6e302489aea03d51264
20ef5ef13a03dd7e10ad286d0c98b1023a1c2ca1 19-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix Telecom unit tests." am: 4ce2b184a7
am: a17d44305c

Change-Id: I2b558278b13a6e30000b8a3b5a0f6b91d8d4ad7c
a17d44305c3caf6815aa5be61618a6c4be5214a1 19-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix Telecom unit tests."
am: 4ce2b184a7

Change-Id: I0adf00c639e077f9c1cb692a9ce7a699bf683a39
a4117e3b15bb92895ef3983dcfdae089e5d1224b 19-Apr-2017 Tyler Gunn <tgunn@google.com> Fix NPE in InCallController due to potential null call. am: 545b2d61fc am: c0b612ddd5 am: e4758e9927 -s ours
am: d193e0ac3f -s ours

Change-Id: Icd0cd5b30b1a0a34c6a4f9ffdd7d6145f0fc97da
4ce2b184a7b4d64100e0471ecd8290cb5637d1bb 19-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix Telecom unit tests."
d193e0ac3f97ca785dc81930d32e517655a38a26 19-Apr-2017 Tyler Gunn <tgunn@google.com> Fix NPE in InCallController due to potential null call. am: 545b2d61fc am: c0b612ddd5
am: e4758e9927 -s ours

Change-Id: I28f64626cbfa686ff3e29b87a47002ba360efa4d
e4758e9927eb3dcacc74ababc8fb1dea75fcdbe0 19-Apr-2017 Tyler Gunn <tgunn@google.com> Fix NPE in InCallController due to potential null call. am: 545b2d61fc
am: c0b612ddd5

Change-Id: I9959f6724fa90c0f2d5ad42134380c1ef04c109a
c0b612ddd5a1f356939cbc152a968f39274834df 19-Apr-2017 Tyler Gunn <tgunn@google.com> Fix NPE in InCallController due to potential null call.
am: 545b2d61fc

Change-Id: I296a643b22e7cc7e0cea81f64e7ee8f5ed25a9fa
93dc55f22d5bab2b552f9e28c14fb0cd49814d52 18-Apr-2017 Tyler Gunn <tgunn@google.com> Fix Telecom unit tests.

Ensure mock context can handle sending broadcast for the phone account
intents.
Fix register/unregister TelecomServiceImpl tests that no longer send
intents directly.

Test: Unit
Bug: 37106957
Change-Id: I414f888f1897108fd991e7b0a7e24fc9cc892c59
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
545b2d61fce18d7d0643b597c76ce85198164247 06-Apr-2017 Tyler Gunn <tgunn@google.com> Fix NPE in InCallController due to potential null call.

There is the potential for a call reference to be null due to a
reconnect to the InCallService.

Test: Manual
Bug: 37001602
Merged-In: Ia0c12e5233107d7973ea2fa112a774126bf5a097
Change-Id: Ia0c12e5233107d7973ea2fa112a774126bf5a097
rc/com/android/server/telecom/InCallController.java
daeffaf3dbcfadfcb58b07a56169982eacb697db 11-Apr-2017 Tyler Gunn <tgunn@google.com> Remove auto-DND while in call.

Removing the auto DND functionality while in a call.
This functionality is being phased out due to b/28688969.

Test: Unit/Manual
Bug: 37154069
Change-Id: I5690116fc6a3938e7725a4b2963741885ddc8ac0
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ee4764be6498604c5ceb907606d97124cdc84d02 18-Apr-2017 Colin Cross <ccross@android.com> Merge "Revert "Remove auto-DND while in call.""
1b55a2a944d260e078dbc66a0f832db11134ab63 18-Apr-2017 Colin Cross <ccross@android.com> Revert "Remove auto-DND while in call."

This reverts commit 6140bf27aa9bc1e473db01f769808ccb06bb6328.

Broke errorprone build

Change-Id: I4188fff3edd95d47371bbd24fe8933d57c35dbe5
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
bc006fe64116b02c0f6cea9425f91b2a4103d1c6 18-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Remove auto-DND while in call."
eb6e2fa48f2abd2e5642024145595ad9948bd80e 18-Apr-2017 Orion Hodson <oth@google.com> Fix duplication of CALL_ constants
am: 983fe0e53a

Change-Id: Ifd60e9b4f2d22d94c2618b27f1eeade2bdc6aec8
983fe0e53a85e161b31404e92b26d900ca581b19 18-Apr-2017 Orion Hodson <oth@google.com> Fix duplication of CALL_ constants

From merges of baf105bf8 and 4a05d5cc0.

Test: m -j32

Change-Id: I115d78d6c840ac97922ea44cff53a1508dd57849
rc/com/android/server/telecom/CallsManager.java
6140bf27aa9bc1e473db01f769808ccb06bb6328 11-Apr-2017 Tyler Gunn <tgunn@google.com> Remove auto-DND while in call.

Removing the auto DND functionality while in a call.
This functionality is being phased out due to b/28688969.

Test: Unit/Manual
Bug: 37154069
Change-Id: I73b15e9c923b68cb00daf2ac236e540c90dbfdd7
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
4d2613bbb21867fe58d8dc971588e1d7a9863bce 18-Apr-2017 Hall Liu <hallliu@google.com> Merge "Update ringer to take BT device into account" into oc-dev am: 3048c360f7
am: c061775bbf

Change-Id: I9b525749e4843197a5403253253da7f055fdf012
c061775bbf24d900986b02c48542e6ddcd94a209 18-Apr-2017 Hall Liu <hallliu@google.com> Merge "Update ringer to take BT device into account" into oc-dev
am: 3048c360f7

Change-Id: I68c2a07a4b6358ff69470393fcaa6e4e873fcdd1
f4dcb55aec828764b92bb328624db74d9147bad2 18-Apr-2017 Tyler Gunn <tgunn@google.com> DO NOT MERGE Ensure TelecomManager#isIncall returns true when in phone acct selection. am: 4a05d5cc0a
am: 6be3fbc46d -s ours

Change-Id: Ic5ee15fb6c1428007ec5c5057ed9f7e0cff0b895
3048c360f74ab61ba0bb45d403e5f2fb6be6e562 18-Apr-2017 Hall Liu <hallliu@google.com> Merge "Update ringer to take BT device into account" into oc-dev
6be3fbc46d7885200c0144cab404c0426b628ec6 18-Apr-2017 Tyler Gunn <tgunn@google.com> DO NOT MERGE Ensure TelecomManager#isIncall returns true when in phone acct selection.
am: 4a05d5cc0a

Change-Id: I7b2140754937416029d58a7fb989c414150091f7
ffcd997cc73f7b2841843b447e77bdc92685e0c8 04-Apr-2017 Hall Liu <hallliu@google.com> Update ringer to take BT device into account

When there is an HFP device connected but the phone would otherwise not
play an audible ringtone, acquire audio focus anyway so that music won't
play over top of the BT device-generated sound.

Change-Id: I898dddfb29147debf5d520583bed02d2012b6cb7
Fixes: 34084026
Test: unit tests and manual
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Ringer.java
ests/src/com/android/server/telecom/tests/RingerTest.java
1e2c2270413ca91cbd8cb53d1ceddee5bee3bf2d 18-Apr-2017 Hall Liu <hallliu@google.com> Merge "Update ringer to take BT device into account" am: 9533e0a4de am: fb7b5bf5e3 am: 2900263b1f
am: 4bd0e0e8de

Change-Id: I55816a71aa1b505ac489c43e9d3110c091c830e2
4bd0e0e8deeaf100976c754f452ed14b72dccc86 18-Apr-2017 Hall Liu <hallliu@google.com> Merge "Update ringer to take BT device into account" am: 9533e0a4de am: fb7b5bf5e3
am: 2900263b1f

Change-Id: Ic55ffd905b4408f028a073b0c13d629ed92d56cb
2900263b1f4ddd520a2fff0588710e359c7298b9 18-Apr-2017 Hall Liu <hallliu@google.com> Merge "Update ringer to take BT device into account" am: 9533e0a4de
am: fb7b5bf5e3

Change-Id: I489805c915da6528d88cda79b4e56ff00e9963aa
fb7b5bf5e38b7411cf84ed7c027c196923ce1869 18-Apr-2017 Hall Liu <hallliu@google.com> Merge "Update ringer to take BT device into account"
am: 9533e0a4de

Change-Id: I31670004e431cb8c5e9b8bc06d545c99ce81a4f6
9533e0a4de943665fd485dca3168874be623ee9d 17-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Update ringer to take BT device into account"
5fd3c66d8661d0ddc644f4c34576a44b4898df98 17-Apr-2017 Tyler Gunn <tgunn@google.com> DO NOT MERGE Send PhoneAccount register/unregistered intents to default dialer. am: 3a04bdbd0e -s ours
am: 7ce152dd76

Change-Id: I189fadabcdd7a917a107379251fc62393d7f1ffc
7ce152dd76e0795db4c9cd642823aece047ae84b 17-Apr-2017 Tyler Gunn <tgunn@google.com> DO NOT MERGE Send PhoneAccount register/unregistered intents to default dialer.
am: 3a04bdbd0e -s ours

Change-Id: I8f5d46d7a99d7a750a9a52d835284daf6f0544aa
4a05d5cc0acedb616ff6d22151f4ccf0043f0810 15-Apr-2017 Tyler Gunn <tgunn@google.com> DO NOT MERGE Ensure TelecomManager#isIncall returns true when in phone acct selection.

Cherry-pick from AOSP-Master.

am: baf105bf8b am: 82fafefe96 am: 75256f10e7
am: f6318ddade

Test: Manual
Bug: 34469716
Merged-In: Iec7e77bfbf2f0e493d8cc21187baca6a0a7d032d
Change-Id: Iec7e77bfbf2f0e493d8cc21187baca6a0a7d032d
(cherry picked from commit 44c54a2eda27f59219e078067efe1d68ee034aaa)
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
c0eedd9757534c65dd5c8600266312423333ffc0 15-Apr-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 334108b08 to oc-dev-plus-aosp
am: 0409b98501 -s ours

Change-Id: I5303df0a4080e15dd1673eef0c4bab1fd1bb35e4
0409b98501a5b4c0c00d1cad8f9a33185e1888c2 15-Apr-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 334108b08 to oc-dev-plus-aosp

Test: Manual
Change-Id: I6323bf1842cbefd5aa7a099fcc93e535d871eb52
3a04bdbd0ec0b970a3fa932b8de4f074d2faa417 14-Apr-2017 Tyler Gunn <tgunn@google.com> DO NOT MERGE Send PhoneAccount register/unregistered intents to default dialer.

A few cleanups:
1. When sending the register/unregister phone account intents, previously
there was no attempt made to ensure the intents were only sent when a
new account was added, or an existing one was removed. Cleaned this up
so that we don't over-send the intents.
2. Minor fix to account diff string in PhoneAccountRegistrar which would
cause icon to always be shown as a diff; removed since bitmaps can't be
compared.
3. Also sending the intents to the default dialer app as an explicit
intent.
Cherry-pick from aosp master to resolve conflicts.

Test: Manual
Bug: 37106957
Change-Id: I7fdaa3e225df6fe3aaf292f9b0b93042f69ca469
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/TestInCallServiceBroadcastReceiver.java
334108b08c2a52579ea48ea1b4a7e4a47465e06e 15-Apr-2017 Tyler Gunn <tgunn@google.com> Send PhoneAccount register/unregistered intents to default dialer. am: 0edfc66ef6
am: cffbbf70ab

Change-Id: Icdf15a1711bd8471b17b6092e908221703d13d61
cffbbf70ab37ea5847fbdf6b95eff6c18956fa7c 15-Apr-2017 Tyler Gunn <tgunn@google.com> Send PhoneAccount register/unregistered intents to default dialer.
am: 0edfc66ef6

Change-Id: I55d97442667dbc9f111741baf0f108e604fbc592
0edfc66ef6c5c218f26601474bb3958a7958075b 14-Apr-2017 Tyler Gunn <tgunn@google.com> Send PhoneAccount register/unregistered intents to default dialer.

A few cleanups:
1. When sending the register/unregister phone account intents, previously
there was no attempt made to ensure the intents were only sent when a
new account was added, or an existing one was removed. Cleaned this up
so that we don't over-send the intents.
2. Minor fix to account diff string in PhoneAccountRegistrar which would
cause icon to always be shown as a diff; removed since bitmaps can't be
compared.
3. Also sending the intents to the default dialer app as an explicit
intent.

Test: Manual
Bug: 37106957
Merged-In: I7fdaa3e225df6fe3aaf292f9b0b93042f69ca469
Change-Id: I7fdaa3e225df6fe3aaf292f9b0b93042f69ca469
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/TestInCallServiceBroadcastReceiver.java
ea4c6fb7dc46c96b5ecf2c2b81bce51fa58d774c 14-Apr-2017 Tyler Gunn <tgunn@google.com> Send PhoneAccount register/unregistered intents to default dialer.

A few cleanups:
1. When sending the register/unregister phone account intents, previously
there was no attempt made to ensure the intents were only sent when a
new account was added, or an existing one was removed. Cleaned this up
so that we don't over-send the intents.
2. Minor fix to account diff string in PhoneAccountRegistrar which would
cause icon to always be shown as a diff; removed since bitmaps can't be
compared.
3. Also sending the intents to the default dialer app as an explicit
intent.
Cherry-pick from aosp master to resolve conflicts.

Test: Manual
Bug: 37106957
Change-Id: I7fdaa3e225df6fe3aaf292f9b0b93042f69ca469
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/TestInCallServiceBroadcastReceiver.java
44c54a2eda27f59219e078067efe1d68ee034aaa 15-Apr-2017 Tyler Gunn <tgunn@google.com> Ensure TelecomManager#isIncall returns true when in phone acct selection. am: baf105bf8b am: 82fafefe96 am: 75256f10e7
am: f6318ddade

Change-Id: Iec7e77bfbf2f0e493d8cc21187baca6a0a7d032d
f6318ddade2ba6ad03de3e321b6ab1b5b81a01ff 15-Apr-2017 Tyler Gunn <tgunn@google.com> Ensure TelecomManager#isIncall returns true when in phone acct selection. am: baf105bf8b am: 82fafefe96
am: 75256f10e7

Change-Id: If13e76bca6899a5f858686188b01df03756f75a3
75256f10e7d3fa5f77d336b081ddd1b105e4842d 15-Apr-2017 Tyler Gunn <tgunn@google.com> Ensure TelecomManager#isIncall returns true when in phone acct selection. am: baf105bf8b
am: 82fafefe96

Change-Id: I62a77f7cee2c35343c36469b68063d4d4d15e430
82fafefe969ee7e8d43e7b8747df0bd2df4d8086 15-Apr-2017 Tyler Gunn <tgunn@google.com> Ensure TelecomManager#isIncall returns true when in phone acct selection.
am: baf105bf8b

Change-Id: If1a4b410cee0b4567cc21145dedafeec391b7e14
136f4c975b71f08b6defd80c2ec96cc95d9f2be4 04-Apr-2017 Hall Liu <hallliu@google.com> Update ringer to take BT device into account

When there is an HFP device connected but the phone would otherwise not
play an audible ringtone, acquire audio focus anyway so that music won't
play over top of the BT device-generated sound.

Change-Id: I898dddfb29147debf5d520583bed02d2012b6cb7
Fixes: 34084026
Test: unit tests and manual
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Ringer.java
ests/src/com/android/server/telecom/tests/RingerTest.java
77d668a0523661ba7fa0b0029e5a9756ab09d3e3 15-Apr-2017 Hall Liu <hallliu@google.com> Merge "Get bluetooth state on the BluetoothRouteManager looper" into oc-dev am: 13e3785347
am: 2490d8064f

Change-Id: I8f0711c572459752c30d784f05c3c6fb98326db2
2490d8064f7d6305a27229f95349a32c6595486b 15-Apr-2017 Hall Liu <hallliu@google.com> Merge "Get bluetooth state on the BluetoothRouteManager looper" into oc-dev
am: 13e3785347

Change-Id: I372e99b0a454004891889935d635187afdeb0217
13e37853474d0de25d2c0d156977b4b607c2bdf0 15-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Get bluetooth state on the BluetoothRouteManager looper" into oc-dev
baf105bf8b27ebb87887632f8227c71cf9d8ce86 12-Apr-2017 Tyler Gunn <tgunn@google.com> Ensure TelecomManager#isIncall returns true when in phone acct selection.

Change TelecomManager#isInCall to return true when a call is in phone acct
selection. Also modify isInManagedCall to be consistent in which states
it checks.

Test: Unit, manual
Bug: 34469716
Change-Id: If969015b24348d96c74622a2790bd3d742401dc6
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
0c2832a5b48eed3a0f820eb6b279e837a2685640 14-Apr-2017 Hall Liu <hallliu@google.com> Merge "Get bluetooth state on the BluetoothRouteManager looper" am: 2dcba5c1b7 am: 1b516ebaa5 am: 4b68159a24
am: 0206eeff41

Change-Id: I01a939862bd127ff009b30cbcfebb35f26759e14
08f119ffd3468792c66da0bbdc6ac5c5b30af08f 14-Apr-2017 Brad Ebinger <breadley@google.com> Fix Telecom Unit Tests 1) Add/Fix VideoProviderTests 2) Update tests to accommodate ContentProvider changes am: d7a57f03a2 am: 2f950fd842 am: d3481cda40 -s ours
am: 005ee271bd

Change-Id: I42bad893e79c2094d488ff90035ecec115403092
0206eeff4195316d18c2bd00115261bc6aea28e2 14-Apr-2017 Hall Liu <hallliu@google.com> Merge "Get bluetooth state on the BluetoothRouteManager looper" am: 2dcba5c1b7 am: 1b516ebaa5
am: 4b68159a24

Change-Id: Icaade4c4200e958f22838267fd3dd58872f11ef1
005ee271bd8b9b2988ca99efc69278483e2d84a6 14-Apr-2017 Brad Ebinger <breadley@google.com> Fix Telecom Unit Tests 1) Add/Fix VideoProviderTests 2) Update tests to accommodate ContentProvider changes am: d7a57f03a2 am: 2f950fd842
am: d3481cda40 -s ours

Change-Id: I5d300daa514f50f931188b1535a717de3b3d1ba6
4b68159a2448ba20d53258cca64917498231d755 14-Apr-2017 Hall Liu <hallliu@google.com> Merge "Get bluetooth state on the BluetoothRouteManager looper" am: 2dcba5c1b7
am: 1b516ebaa5

Change-Id: Iacde1bcf81ec4e4758b66b77fa8d949cfc2846e9
d3481cda40e6787c80a52def451458ef8030a3cf 14-Apr-2017 Brad Ebinger <breadley@google.com> Fix Telecom Unit Tests 1) Add/Fix VideoProviderTests 2) Update tests to accommodate ContentProvider changes am: d7a57f03a2
am: 2f950fd842

Change-Id: Id2577d063fc08684c0724384eeca5087c605e86d
1b516ebaa51f5149fbebf03577fca6d078e55244 14-Apr-2017 Hall Liu <hallliu@google.com> Merge "Get bluetooth state on the BluetoothRouteManager looper"
am: 2dcba5c1b7

Change-Id: I960dea3b1a72ae6d422e7cc299f637d3335dcedb
2f950fd842fdde976b4700f763ecc35ef39bbd3b 14-Apr-2017 Brad Ebinger <breadley@google.com> Fix Telecom Unit Tests 1) Add/Fix VideoProviderTests 2) Update tests to accommodate ContentProvider changes
am: d7a57f03a2

Change-Id: I03f15f45085d05f7c49207c5df5602530e8ecb06
494e761378c6889cd1733f364053896a79790a01 12-Apr-2017 Hall Liu <hallliu@google.com> Get bluetooth state on the BluetoothRouteManager looper

When calling getCurrentState() on a state machine from outside its
looper, an ArrayOutOfBoundsException may occur if the state machine is
mid-transition. This change moves the call to getCurrentState into a
Runnable that's run on the looper.

Change-Id: I079552541367733bad5aad1ca6753529f0043143
Fixes: 37224925
Test: manual
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
2dcba5c1b7882d68ba616b7354d197d37b635c6d 14-Apr-2017 Hall Liu <hallliu@google.com> Merge "Get bluetooth state on the BluetoothRouteManager looper"
6bf9294bda67196d960dd421bb78fd1a16cb1c82 13-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix issue where self-managed calls play ringtone. " into oc-dev am: 1bfc5190e6
am: c35350a8ad

Change-Id: Ic3ce0b6dca9bf5f31ffc9063df30244f4a13cf3e
c35350a8ad5aff8a651f8d855ccf41ad880255ec 13-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix issue where self-managed calls play ringtone. " into oc-dev
am: 1bfc5190e6

Change-Id: Ia402197a52b752f15841b12477b27a4eaf0dceb0
1bfc5190e623262cb08ed5d710af8ccef6f71a08 13-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix issue where self-managed calls play ringtone. " into oc-dev
58580d3a48b49fba5359bbf788d89bfd455b4217 12-Apr-2017 Brad Ebinger <breadley@google.com> Fixes Failing Telecom Tests and marks flaky ones am: 68d17c62b6
am: 8d19d5e4c1

Change-Id: I68b9e5c50c59b9b41928e1ef8f782a64844be115
8d19d5e4c1eb756a31f3f4c728ea50ccf190df38 12-Apr-2017 Brad Ebinger <breadley@google.com> Fixes Failing Telecom Tests and marks flaky ones
am: 68d17c62b6

Change-Id: Ieaf4b3039ea2f28508a69c5ebd48947c805a3414
d7a57f03a21e507a6577c2229354e589658e8efe 20-Mar-2017 Brad Ebinger <breadley@google.com> Fix Telecom Unit Tests
1) Add/Fix VideoProviderTests
2) Update tests to accommodate ContentProvider changes

Test: Telecom Unit Tests
Change-Id: I8ac65a4686937bfb3954f1d87ca8d1e4ee492644
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
ests/src/com/android/server/telecom/tests/CallScreeningServiceFilterTest.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/CreateConnectionProcessorTest.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
b4d0b9171a0f14b059e05ea2024f27d52c95bc2e 12-Apr-2017 Hall Liu <hallliu@google.com> Get bluetooth state on the BluetoothRouteManager looper

When calling getCurrentState() on a state machine from outside its
looper, an ArrayOutOfBoundsException may occur if the state machine is
mid-transition. This change moves the call to getCurrentState into a
Runnable that's run on the looper.

Change-Id: I079552541367733bad5aad1ca6753529f0043143
Fixes: 37224925
Test: manual
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
68d17c62b6bbd608cdd6668be5488836e7393909 12-Apr-2017 Brad Ebinger <breadley@google.com> Fixes Failing Telecom Tests and marks flaky ones

This change fixes the failing Telecom tests and marks the
inconsistently failing ones as @FlakyTest.

Test: Build and run Telecom Unit Tests
Change-Id: Ifc6b296f7acddc136d99f063094f3d30bc2f02d0
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
97fa69df9007f95f19d5a53d17739d93f01a5d2f 12-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
56e5c0896d074185f94920093eae2253d5f61f74 11-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add getSelfManagedPhoneAccounts TelecomManager API." into oc-dev am: 2c4235d380
am: 257c681893 -s ours

Change-Id: Ic3af382f0ad489d3b2e19c184c74b5f67f041903
39d59ad6dcd43b9d258dc107e7c015e7d7fc4db3 11-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 98e1201ead -s ours
am: 8f0d0c4aaa -s ours

Change-Id: I9da01f5f0414c12cf9f6d0a3e5a1aa650d924533
257c681893ac65b08fc6295873d731c293d07050 11-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add getSelfManagedPhoneAccounts TelecomManager API." into oc-dev
am: 2c4235d380

Change-Id: Idae515646baa03507fe6fcc37ec9c8b809211fa0
2c4235d38050f4a185cc9138c6966b304d52d56f 11-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add getSelfManagedPhoneAccounts TelecomManager API." into oc-dev
8f0d0c4aaa355474323dfc254c084e6a2d096a8c 11-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 98e1201ead -s ours

Change-Id: I1c8de54e7002efd5661caef547b6d9b5047def96
b7471f6f2568c4bb159dc1e284cf8c3704dfb2ea 11-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Support Connection handover between ConnectionServices."
98e1201ead7f4f6e2760d84dd13b7f8fc797a50e 11-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I804c2679157eb3152d3e70ecf55185f56c715b6b
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be/strings.xml
es/values-bs/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-eu/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-kk/strings.xml
es/values-km/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-mk/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-pl/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sq/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-tl/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
ad570777a43b4999c8251e0badbd416af695ef9b 11-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I8665663dbb89062cf6f191630effb6d9dc5ba8dc
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-eu/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-kk/strings.xml
es/values-km/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-mk/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-pl/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sq/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-tl/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
7d8061946f6740703446ba70fbd50ae99ae5b4c9 11-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix NPE in InCallController due to potential null call." into oc-dev am: 2617c9caf2
am: 1b1bcc9717 -s ours

Change-Id: Ib3858e0ab1d0b8b64b46f15cee0045a5a1b81bd4
1b1bcc9717bc39051529e66305c03cab3cc2cf2a 11-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix NPE in InCallController due to potential null call." into oc-dev
am: 2617c9caf2

Change-Id: Ieae46dcb265b9032c01155c1796cfff63d0a3183
2617c9caf204ec4e190c76019bef913699fd1703 11-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix NPE in InCallController due to potential null call." into oc-dev
6a17d6abeffe2d441b21b938c03b00e53a9afb1a 11-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add getSelfManagedPhoneAccounts TelecomManager API." am: 1810bfbdc3 am: 509f24eb3b am: 81e9ea9281
am: a7586c3d53 -s ours

Change-Id: Ie82b029bff8b9159cea4da9a8a962d4f74fb8932
a7586c3d53c4a2e2342716715ae67ee25db8a1c7 11-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add getSelfManagedPhoneAccounts TelecomManager API." am: 1810bfbdc3 am: 509f24eb3b
am: 81e9ea9281

Change-Id: I850e50aa89d442a72e6dd77489769ec9d43a20b3
180e73831460d9c321c8c6eadda959807672d982 11-Apr-2017 Tyler Gunn <tgunn@google.com> Fix issue where self-managed calls play ringtone.

am: 638f180c1a am: e466ad4a97 am: 47f8a077bb
am: 6013a6452d

Change-Id: I55e110795a4f899f5fef9285a2b91dae5b553490
(cherry picked from commit 2febed9af91bcf1132400dd77395141a75b3b63b)
rc/com/android/server/telecom/Ringer.java
81e9ea928139253952bcdb97eb0f0fcc4824f869 11-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add getSelfManagedPhoneAccounts TelecomManager API." am: 1810bfbdc3
am: 509f24eb3b

Change-Id: Id712a8b85a8c7ab6d27c43c1f1564b9869cba11f
2febed9af91bcf1132400dd77395141a75b3b63b 11-Apr-2017 Tyler Gunn <tgunn@google.com> Fix issue where self-managed calls play ringtone. am: 638f180c1a am: e466ad4a97 am: 47f8a077bb
am: 6013a6452d

Change-Id: I55e110795a4f899f5fef9285a2b91dae5b553490
509f24eb3b14fdf98b0fd39d16f8e8e01e91af55 10-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add getSelfManagedPhoneAccounts TelecomManager API."
am: 1810bfbdc3

Change-Id: Idff9a59cf91e28ccd1ddf2906485918333e42ddf
6013a6452d41b1711c39cd43eef1410145f8c055 10-Apr-2017 Tyler Gunn <tgunn@google.com> Fix issue where self-managed calls play ringtone. am: 638f180c1a am: e466ad4a97
am: 47f8a077bb

Change-Id: I27558769c2a23a3f08c42bd372eecabe73059981
47f8a077bb70695622e6542c6cc7ca24fc38aab0 10-Apr-2017 Tyler Gunn <tgunn@google.com> Fix issue where self-managed calls play ringtone. am: 638f180c1a
am: e466ad4a97

Change-Id: Iaa2a8fe1eca627e3d6494876c1258243f15080eb
1810bfbdc306dd33153d351b962589fdc38bbdf3 10-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add getSelfManagedPhoneAccounts TelecomManager API."
e466ad4a97dd3a8dbdf90a32caa229a0c8afd3af 10-Apr-2017 Tyler Gunn <tgunn@google.com> Fix issue where self-managed calls play ringtone.
am: 638f180c1a

Change-Id: If5343c33e2b34e31e1683ea0335abff8880cab7b
638f180c1a3ee75549d14e41630ab05e96d709f0 04-Apr-2017 Tyler Gunn <tgunn@google.com> Fix issue where self-managed calls play ringtone.

If the default dialer doesn't handle ringtones, selfmanaged calls will
play the system ringtone.

Test: Manual
Bug: 36866764
Change-Id: I5392333005d30b422aadb37e2a7578597fcd9760
rc/com/android/server/telecom/Ringer.java
ebfc91628b69167d75e8658f3e727b036036aef3 08-Apr-2017 Tyler Gunn <tgunn@google.com> Add getSelfManagedPhoneAccounts TelecomManager API.

Adding getSelfManagedPhoneAccounts TelecomManager API; this is consistent
with the getCallCapablePhoneAccounts API which is already present.

Test: CTS
Bug: 34159263
Merged-In: I542ac26f71b680ee61c680a5f4c184a462f2a339
Change-Id: I542ac26f71b680ee61c680a5f4c184a462f2a339
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
51ad72199842935970b5eccc187bccd10a4b56a8 08-Apr-2017 Tyler Gunn <tgunn@google.com> Add getSelfManagedPhoneAccounts TelecomManager API.

Adding getSelfManagedPhoneAccounts TelecomManager API; this is consistent
with the getCallCapablePhoneAccounts API which is already present.

Test: CTS
Bug: 34159263
Merged-In: I542ac26f71b680ee61c680a5f4c184a462f2a339
Change-Id: I542ac26f71b680ee61c680a5f4c184a462f2a339
(cherry picked from commit 66ab9ae7926a4976d375d1e38b97cddbc91e0303)
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
19032774936d89d06b57cbd844d70079c653abd6 10-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add getSelfManagedPhoneAccounts TelecomManager API."
c467837e7dff3eda7037bf05b8860c3416a80bd4 06-Apr-2017 Tyler Gunn <tgunn@google.com> Fix NPE in InCallController due to potential null call.

There is the potential for a call reference to be null due to a
reconnect to the InCallService.

Test: Manual
Bug: 37001602
Merged-In: Ia0c12e5233107d7973ea2fa112a774126bf5a097
Change-Id: Ia0c12e5233107d7973ea2fa112a774126bf5a097
rc/com/android/server/telecom/InCallController.java
6f9ceb2c1fbb9565cc6f6fdf32e996e8a1eab7c8 06-Apr-2017 Tyler Gunn <tgunn@google.com> Support Connection handover between ConnectionServices.

Call:
- added support for initiation of handover on receipt of the
EVENT_REQUEST_HANDOVER call event.
CallAudioManager:
- suppress disconnect tone when handover is in process for a call.
CallsManager:
- when the ConnectionService adds a new incoming call with
EXTRA_IS_HANDOVER, this indicates that the call is being added as the
destination for the handover. Adding logic to find the ongoing call on
the device which will be handed over to this new call, and confirm that
handover is supported by both ConnectionService.
- on call removal, clean up handover call references.
- When calls change state, handle completion or failure of overall
handover.
- ensure it is possible to add handover calls when there are other ongoing
calls which would normally prevent them from being added.
TestApps:
- Added ability to initiate handover from Test Incall UI.
- Added ability to receive handover from test self-mgd calling app.

Test: Manual
Bug: 37102939
Change-Id: Idfa4325bb1aee34abad5cdb3d8edb48f0186692e
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/PhoneNumberUtilsAdapter.java
rc/com/android/server/telecom/PhoneNumberUtilsAdapterImpl.java
estapps/AndroidManifest.xml
estapps/res/layout/incall_screen.xml
estapps/res/layout/self_managed_handover.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/HandoverActivity.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallList.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnection.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnectionService.java
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestInCallUI.java
66ab9ae7926a4976d375d1e38b97cddbc91e0303 08-Apr-2017 Tyler Gunn <tgunn@google.com> Add getSelfManagedPhoneAccounts TelecomManager API.

Adding getSelfManagedPhoneAccounts TelecomManager API; this is consistent
with the getCallCapablePhoneAccounts API which is already present.

Test: CTS
Bug: 34159263
Change-Id: I542ac26f71b680ee61c680a5f4c184a462f2a339
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
233c63be100d79d3869f475a89cc88348892b8d9 08-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: a25119ea44 -s ours
am: 8eebb9124a -s ours

Change-Id: I7088461d1948a5f56034080c98a07a97dc9a2a9d
8eebb9124a91cd94852c16cb9761d50473a8180d 08-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: a25119ea44 -s ours

Change-Id: Icb92c770adf03da39e3307642fef3b1ec58f1d18
a25119ea442f6ae000adcd960cde62f2b6096039 07-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I36fa4a4c7ef7f8dca13db123104cbf8a4cb2847c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az/strings.xml
es/values-bg/strings.xml
es/values-bn/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-eu/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-gu/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-is/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-kk/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk/strings.xml
es/values-ml/strings.xml
es/values-mn/strings.xml
es/values-mr/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-nb/strings.xml
es/values-ne/strings.xml
es/values-nl/strings.xml
es/values-pa/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta/strings.xml
es/values-te/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
6b93b9dbf96dbaf2e5d2362c9b69990f5bafc07f 07-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I4f1e2d7a2f5a8adedc3aad62753797aa392cd690
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-bn/strings.xml
es/values-bs/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-eu/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-gu/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-is/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-kk/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk/strings.xml
es/values-ml/strings.xml
es/values-mn/strings.xml
es/values-mr/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-nb/strings.xml
es/values-ne/strings.xml
es/values-nl/strings.xml
es/values-pa/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta/strings.xml
es/values-te/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
e4f7a2be852b583fd4f524b1497d444399454340 07-Apr-2017 Tyler Gunn <tgunn@google.com> Add Telecom notification channels. am: acc09c4487
am: e5e34cc616 -s ours

Change-Id: Ia1a1df4f0a1ff696b4afb9b766a91ca4fa01b88b
e5e34cc61627903dfb757bb54626b0896c8e0aff 07-Apr-2017 Tyler Gunn <tgunn@google.com> Add Telecom notification channels.
am: acc09c4487

Change-Id: Ic6ecb016851766851d54165afd976dbc0932db4d
70751a85b6317b69dad0b9dce4f4939bff298ba3 07-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix NPE in InCallController due to potential null call."
00dc5b6404cf39d0a771df04dfec72a3826d3f67 06-Apr-2017 Tyler Gunn <tgunn@google.com> Fix NPE in InCallController due to potential null call.

There is the potential for a call reference to be null due to a
reconnect to the InCallService.

Test: Manual
Bug: 37001602
Change-Id: Ia0c12e5233107d7973ea2fa112a774126bf5a097
rc/com/android/server/telecom/InCallController.java
acc09c44870b58e3350086a78add37bbedccfce8 04-Apr-2017 Tyler Gunn <tgunn@google.com> Add Telecom notification channels.

Test: Manual
Bug: 36866129
Merged-In: I49194128b4f526205055137d4ebaa8b282baa90f
Change-Id: I49194128b4f526205055137d4ebaa8b282baa90f
(cherry picked from commit dce902a0cd4d7060e1825cc3cde8d7f76eb67086)
es/values/strings.xml
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/IncomingCallNotifier.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
rc/com/android/server/telecom/ui/NotificationChannelManager.java
ests/src/com/android/server/telecom/tests/IncomingCallNotifierTest.java
f8516ec8d5c37b36ae1899ddda880aa395a0b6f0 06-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add Telecom notification channels."
602c3becbc109d33488d64cd78a409da0204d1cb 05-Apr-2017 Tyler Gunn <tgunn@google.com> Add call creation time property to API. am: cf32c07888
am: ed026ad23a

Change-Id: I1349aef42e74af56ea80025a30e4183ec1bbfb5a
ed026ad23a9da42580a0b9e80a7235323ed04e7e 05-Apr-2017 Tyler Gunn <tgunn@google.com> Add call creation time property to API.
am: cf32c07888

Change-Id: I8794e8c461ee0a7c50bcf884d635c41120f62f01
cf32c07888455c8c74b20cb7626db9d3741cafe3 17-Mar-2017 Tyler Gunn <tgunn@google.com> Add call creation time property to API.

Test: CTS
Bug: 36124432
Merged-In: Id2e97c254dc17601f044da50105b84d8a0d7f144
Change-Id: Id2e97c254dc17601f044da50105b84d8a0d7f144
rc/com/android/server/telecom/ParcelableCallUtils.java
dce902a0cd4d7060e1825cc3cde8d7f76eb67086 04-Apr-2017 Tyler Gunn <tgunn@google.com> Add Telecom notification channels.

Test: Manual
Bug: 36866129
Change-Id: I49194128b4f526205055137d4ebaa8b282baa90f
es/values/strings.xml
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/IncomingCallNotifier.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
rc/com/android/server/telecom/ui/NotificationChannelManager.java
ests/src/com/android/server/telecom/tests/IncomingCallNotifierTest.java
5bd24f4abe8cd74981995b3c542500f33d018b00 05-Apr-2017 Hall Liu <hallliu@google.com> Merge "Do not set PROPERTY_IS_RTT in testapps" am: e42440cca9 am: 001a02caa2 am: 5a7f4317e2
am: 099e711b8f

Change-Id: I8a2917a8e9cc8b6e109a2efb3ee30c9df5a51d95
099e711b8f31666f989dc22ec21c35bbf4004c71 05-Apr-2017 Hall Liu <hallliu@google.com> Merge "Do not set PROPERTY_IS_RTT in testapps" am: e42440cca9 am: 001a02caa2
am: 5a7f4317e2

Change-Id: I84faf74d8211d83403b3ac19d0b0c64c4a6d082e
5a7f4317e28b1d1d5c90201595eaa829ce07d80f 05-Apr-2017 Hall Liu <hallliu@google.com> Merge "Do not set PROPERTY_IS_RTT in testapps" am: e42440cca9
am: 001a02caa2

Change-Id: Ie1f45b931a20db451ebce65a58d7f011b92d282d
001a02caa2ff2c9da97e924c0cb6b25b22497902 05-Apr-2017 Hall Liu <hallliu@google.com> Merge "Do not set PROPERTY_IS_RTT in testapps"
am: e42440cca9

Change-Id: Ie0398b254dc51c7aedf3ed81fbbad8362b5a8aff
e42440cca9f3eaa3d3d13e3e8df5016c8d511e44 05-Apr-2017 Hall Liu <hallliu@google.com> Merge "Do not set PROPERTY_IS_RTT in testapps"
92a96b7707db542b0c6da2edffde1924879bea70 05-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add call creation time property to API." am: 8d9aaa2953 am: 7e86ada6ce am: 95a3f265f1
am: ba84715b52

Change-Id: I46ce7903c6e1a580d08f576d8920835c4926c2fd
ba84715b52fc001ef489823d7f7634a0f89c6afb 04-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add call creation time property to API." am: 8d9aaa2953 am: 7e86ada6ce
am: 95a3f265f1

Change-Id: I5a1b0a7ce423859dd7e2275227f0e51467df8fb6
95a3f265f186cb4f989ca7e2e50b303e2c573df7 04-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add call creation time property to API." am: 8d9aaa2953
am: 7e86ada6ce

Change-Id: Ibd69a295ec4dca65910274cb67bb994868934dbd
7e86ada6cedd6d9500b29caacb4a39c3c630d5c4 04-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add call creation time property to API."
am: 8d9aaa2953

Change-Id: Iedf68cd7ac8e88cdf4014e44328a83af8ee89d4f
8d9aaa29531dada218716f935c52c4515cd9ac96 04-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Add call creation time property to API."
bd0595e33ea8d5922c493cf2de466ee85dc26fcf 04-Apr-2017 pkanwar <pkanwar@google.com> Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback. am: f19e93c865
am: f09802bdfc

Change-Id: I1a6b1f18a6dd641170013ee0e4190a4a3eba0aaf
f09802bdfcd6eb06e5100f2584e22aa1e5be2767 04-Apr-2017 pkanwar <pkanwar@google.com> Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback.
am: f19e93c865

Change-Id: I5a21b228d7cdc4cf7e001ee5b8faef1f6e9826c9
27f750d3a30f48866ac8c8e9cb998a85fde986b9 03-Apr-2017 Tyler Gunn <tgunn@google.com> Revert "Disable a phone number log for user build" am: 46bc3fd58a am: 64b7f379f1 am: 487621a791
am: 8f1b2f9035

Change-Id: Ie26430981b13344f57252edb6dfbcb4cc95b8706
8f1b2f90357298071a6def1d465248ace4fdb619 03-Apr-2017 Tyler Gunn <tgunn@google.com> Revert "Disable a phone number log for user build" am: 46bc3fd58a am: 64b7f379f1
am: 487621a791

Change-Id: I208121f0ced14e3a2c3042381a32177de2bb343f
487621a7917249a0520a3265cd2a8272abbd792a 03-Apr-2017 Tyler Gunn <tgunn@google.com> Revert "Disable a phone number log for user build" am: 46bc3fd58a
am: 64b7f379f1

Change-Id: I4a5baf24d97b6db81838ef76905d508b141e0ec7
64b7f379f1933acbe1aa083a2680d9337d2fd31f 03-Apr-2017 Tyler Gunn <tgunn@google.com> Revert "Disable a phone number log for user build"
am: 46bc3fd58a

Change-Id: I3ec8d604d95ff6cc3a619571d707add6d84f1a12
f19e93c865ad756ada44f0592f7cde60552c04ef 29-Mar-2017 pkanwar <pkanwar@google.com> Address API concerns for isConcurrentVoiceAndDataAllowed and
OnReceiveUssdResponseCallback.

Bug: 35766890
Test: Existing tests.
Change-Id: Iec63aabc08cdbe4e7a8a20bdab320f8ea740443f
(cherry picked from commit 8d02743aba4d668b40ada9420662afd22a4e7857)
estapps/src/com/android/server/telecom/testapps/TestUssdActivity.java
46bc3fd58a0ba00e6ff4fb8ba1934ee0baf6bae5 03-Apr-2017 Tyler Gunn <tgunn@google.com> Revert "Disable a phone number log for user build"

This is causing format exceptions.

This reverts commit fac1dba0e2c508afe197994ec831adf6229cee86.

Change-Id: Ic13fd861c5195bd19533393ee5ff4a4c69bc816b
rc/com/android/server/telecom/ConnectionServiceWrapper.java
66d27bb87cc8e1b721a380fad3d22570d84f2f16 03-Apr-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback."
8eb88da3c0beb62896127e1d2a79503f2bfe420d 02-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 621959a0db -s ours am: b6b304a672 -s ours
am: 9a8e946dd2 -s ours

Change-Id: I335be4713212bbb2705b9b675ef3aeb26f33208a
9a8e946dd2da6ddd2c48364938ad5798a2111a2e 02-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 621959a0db -s ours
am: b6b304a672 -s ours

Change-Id: I26aa39e2c0ba9528a80a90eb5735c4e7bad9666f
b6b304a6726e735b6adb04454fa2be4be57a8aff 02-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 621959a0db -s ours

Change-Id: I59b1d5e111c3949411b316b063f29a31da11e51c
621959a0db3d5edc2118dd806a9f4fc5f1a8ee94 02-Apr-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I3e22357f314030f1ea5244a2bff554cf48aed306
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
7f14f38cce3863d2ef5e7e3a8a112e5e93da758f 01-Apr-2017 Bill Yi <byi@google.com> Merge "Import translations. DO NOT MERGE" into oc-dev am: 916b47f868 -s ours
am: 17ddc39902 -s ours

Change-Id: I7c77457777d552cacbb9ea31b0c1b6fa419a14b1
17ddc399021e7d67c9dbcd9aded3bb4f72ab7c1d 01-Apr-2017 Bill Yi <byi@google.com> Merge "Import translations. DO NOT MERGE" into oc-dev
am: 916b47f868 -s ours

Change-Id: If43291cc15cf7dd26eb7a87c0c22ed076ab0249c
916b47f868632bfdc8a8f6be748a945e2021a13b 01-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE" into oc-dev
37714847bd57f9d074f3bc4913b030d619619e75 01-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
faa0654f3a26d7bbabfb1e17c266fb300f140df1 31-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Self-Managed Incoming Call Disambiguation UX." into oc-dev am: 9ad69ebac7 -s ours
am: 83297df78f -s ours

Change-Id: I602164b8191d144aebdeba14b384b186e68a19ee
570bd3daea549f739f09279215c76290fdb0f94c 31-Mar-2017 Tyler Gunn <tgunn@google.com> Self-Managed Incoming Call Disambiguation UX. am: ca766d2847 -s ours
am: 6a69db52ca -s ours

Change-Id: Ib2dc8b9c5099f23b97321fd87a0ce7afd2e236d1
83297df78fb52cd88fa99a195d0442fbcb417209 31-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Self-Managed Incoming Call Disambiguation UX." into oc-dev
am: 9ad69ebac7 -s ours

Change-Id: I9d84bb69019cad0fca89ff5de62069796eb73edc
6a69db52ca004f4e5fbc3cc998249d9b92191e81 31-Mar-2017 Tyler Gunn <tgunn@google.com> Self-Managed Incoming Call Disambiguation UX.
am: ca766d2847 -s ours

Change-Id: I0d001f3f11bef889c31f25538da323f454335ab7
9ad69ebac7568bbcfbc9c226d2bc29262c2a4eea 31-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Self-Managed Incoming Call Disambiguation UX." into oc-dev
205dec4a6b44dc6c01fb4e89d8d37bcba8f10d15 31-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Self-Managed Incoming Call Disambiguation UX." am: b77f30fa1f am: be4ff39882 am: c6e9cba5a9
am: e0d7233f24

Change-Id: I15e529eda2d17bb52f5817c8bff5c79bfd3fc2f8
e0d7233f24a808e61e16f49881292269b2669583 31-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Self-Managed Incoming Call Disambiguation UX." am: b77f30fa1f am: be4ff39882
am: c6e9cba5a9

Change-Id: I6f186038a14efe86d31bcc4616f194dd40b1981f
c6e9cba5a9c13bb375064105f6858992bc0c4932 31-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Self-Managed Incoming Call Disambiguation UX." am: b77f30fa1f
am: be4ff39882

Change-Id: Ic0c4ab6f78661889abdec5a55d6b0058d556f142
ca766d28471cc41d9ef33682a41edd1f99448d42 08-Mar-2017 Tyler Gunn <tgunn@google.com> Self-Managed Incoming Call Disambiguation UX.

- Handle auto-disconnect of foreground call when answering a self-managed
call.
- Enforce restriction that the PhoneAccount associated with a self-managed
CS must have a label which is the app's name.
- Ensure self-managed phone accounts can't be registered with
call provider, connection manager, or sim sub capabilities.
- Add "incoming call" UX which is shown when a new incoming call from a
self-managed CS comes in and there is an existing call for another CS.

Test: Unit, manual
Bug: 34159263
Merged-In: I371be9baa6f56c77aa83349977c0131f0e319047
Change-Id: I371be9baa6f56c77aa83349977c0131f0e319047
ndroidManifest.xml
es/anim/on_going_call.xml
es/drawable-hdpi/ic_call_white_24dp.png
es/drawable-hdpi/ic_close_dk.png
es/drawable-hdpi/ic_ongoing_phone_24px_01.png
es/drawable-hdpi/ic_ongoing_phone_24px_02.png
es/drawable-hdpi/ic_ongoing_phone_24px_03.png
es/drawable-hdpi/ic_ongoing_phone_24px_04.png
es/drawable-hdpi/ic_ongoing_phone_24px_05.png
es/drawable-hdpi/ic_ongoing_phone_24px_06.png
es/drawable-hdpi/ic_ongoing_phone_24px_07.png
es/drawable-hdpi/ic_ongoing_phone_24px_08.png
es/drawable-hdpi/ic_ongoing_phone_24px_09.png
es/drawable-mdpi/ic_call_white_24dp.png
es/drawable-mdpi/ic_close_dk.png
es/drawable-mdpi/ic_ongoing_phone_24px_01.png
es/drawable-mdpi/ic_ongoing_phone_24px_02.png
es/drawable-mdpi/ic_ongoing_phone_24px_03.png
es/drawable-mdpi/ic_ongoing_phone_24px_04.png
es/drawable-mdpi/ic_ongoing_phone_24px_05.png
es/drawable-mdpi/ic_ongoing_phone_24px_06.png
es/drawable-mdpi/ic_ongoing_phone_24px_07.png
es/drawable-mdpi/ic_ongoing_phone_24px_08.png
es/drawable-mdpi/ic_ongoing_phone_24px_09.png
es/drawable-xhdpi/ic_call_white_24dp.png
es/drawable-xhdpi/ic_close_dk.png
es/drawable-xhdpi/ic_ongoing_phone_24px_01.png
es/drawable-xhdpi/ic_ongoing_phone_24px_02.png
es/drawable-xhdpi/ic_ongoing_phone_24px_03.png
es/drawable-xhdpi/ic_ongoing_phone_24px_04.png
es/drawable-xhdpi/ic_ongoing_phone_24px_05.png
es/drawable-xhdpi/ic_ongoing_phone_24px_06.png
es/drawable-xhdpi/ic_ongoing_phone_24px_07.png
es/drawable-xhdpi/ic_ongoing_phone_24px_08.png
es/drawable-xhdpi/ic_ongoing_phone_24px_09.png
es/drawable-xxhdpi/ic_call_white_24dp.png
es/drawable-xxhdpi/ic_close_dk.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_01.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_02.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_03.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_04.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_05.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_06.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_07.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_08.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_09.png
es/drawable-xxxhdpi/ic_call_white_24dp.png
es/drawable-xxxhdpi/ic_close_dk.png
es/values/colors.xml
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomBroadcastIntentProcessor.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/IncomingCallNotifier.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
estapps/AndroidManifest.xml
estapps/res/layout/self_managed_sample_main.xml
estapps/res/values/colors.xml
estapps/src/com/android/server/telecom/testapps/SelfManagedCallList.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallListAdapter.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallingActivity.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnection.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnectionService.java
ests/src/com/android/server/telecom/tests/IncomingCallNotifierTest.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
be4ff39882a2009b5e48ed6ca9cf79c6000bf048 31-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Self-Managed Incoming Call Disambiguation UX."
am: b77f30fa1f

Change-Id: I213b0d78a647086ce3bfa4728e4445854ab45e45
b77f30fa1f5f7eb41a5ff5482aeda0925a8ab1b9 31-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Self-Managed Incoming Call Disambiguation UX."
86ce8f4c2fe988b029806e7110e611c63c580b05 31-Mar-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I6ba65ad2fcd5680155f082fad4f34eaec01569b7
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az/strings.xml
es/values-bg/strings.xml
es/values-bn/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-eu/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-gu/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-is/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-kk/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk/strings.xml
es/values-ml/strings.xml
es/values-mn/strings.xml
es/values-mr/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-nb/strings.xml
es/values-ne/strings.xml
es/values-nl/strings.xml
es/values-pa/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta/strings.xml
es/values-te/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
d36a632b19051d80eb057dde0786189ca01b5c20 31-Mar-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Idbb8ed7a0d855ab9ab4259ba2b17a30128e6b681
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-bn/strings.xml
es/values-bs/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-eu/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl/strings.xml
es/values-gu/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy/strings.xml
es/values-in/strings.xml
es/values-is/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka/strings.xml
es/values-kk/strings.xml
es/values-km/strings.xml
es/values-kn/strings.xml
es/values-ko/strings.xml
es/values-ky/strings.xml
es/values-lo/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk/strings.xml
es/values-ml/strings.xml
es/values-mn/strings.xml
es/values-mr/strings.xml
es/values-ms/strings.xml
es/values-my/strings.xml
es/values-nb/strings.xml
es/values-ne/strings.xml
es/values-nl/strings.xml
es/values-pa/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta/strings.xml
es/values-te/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur/strings.xml
es/values-uz/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
2b17f23d3257dec66d965ac7b4a59aa2226b43a5 08-Mar-2017 Tyler Gunn <tgunn@google.com> Self-Managed Incoming Call Disambiguation UX.

- Handle auto-disconnect of foreground call when answering a self-managed
call.
- Enforce restriction that the PhoneAccount associated with a self-managed
CS must have a label which is the app's name.
- Ensure self-managed phone accounts can't be registered with
call provider, connection manager, or sim sub capabilities.
- Add "incoming call" UX which is shown when a new incoming call from a
self-managed CS comes in and there is an existing call for another CS.

Test: Unit, manual
Bug: 34159263
Change-Id: I371be9baa6f56c77aa83349977c0131f0e319047
ndroidManifest.xml
es/anim/on_going_call.xml
es/drawable-hdpi/ic_call_white_24dp.png
es/drawable-hdpi/ic_close_dk.png
es/drawable-hdpi/ic_ongoing_phone_24px_01.png
es/drawable-hdpi/ic_ongoing_phone_24px_02.png
es/drawable-hdpi/ic_ongoing_phone_24px_03.png
es/drawable-hdpi/ic_ongoing_phone_24px_04.png
es/drawable-hdpi/ic_ongoing_phone_24px_05.png
es/drawable-hdpi/ic_ongoing_phone_24px_06.png
es/drawable-hdpi/ic_ongoing_phone_24px_07.png
es/drawable-hdpi/ic_ongoing_phone_24px_08.png
es/drawable-hdpi/ic_ongoing_phone_24px_09.png
es/drawable-mdpi/ic_call_white_24dp.png
es/drawable-mdpi/ic_close_dk.png
es/drawable-mdpi/ic_ongoing_phone_24px_01.png
es/drawable-mdpi/ic_ongoing_phone_24px_02.png
es/drawable-mdpi/ic_ongoing_phone_24px_03.png
es/drawable-mdpi/ic_ongoing_phone_24px_04.png
es/drawable-mdpi/ic_ongoing_phone_24px_05.png
es/drawable-mdpi/ic_ongoing_phone_24px_06.png
es/drawable-mdpi/ic_ongoing_phone_24px_07.png
es/drawable-mdpi/ic_ongoing_phone_24px_08.png
es/drawable-mdpi/ic_ongoing_phone_24px_09.png
es/drawable-xhdpi/ic_call_white_24dp.png
es/drawable-xhdpi/ic_close_dk.png
es/drawable-xhdpi/ic_ongoing_phone_24px_01.png
es/drawable-xhdpi/ic_ongoing_phone_24px_02.png
es/drawable-xhdpi/ic_ongoing_phone_24px_03.png
es/drawable-xhdpi/ic_ongoing_phone_24px_04.png
es/drawable-xhdpi/ic_ongoing_phone_24px_05.png
es/drawable-xhdpi/ic_ongoing_phone_24px_06.png
es/drawable-xhdpi/ic_ongoing_phone_24px_07.png
es/drawable-xhdpi/ic_ongoing_phone_24px_08.png
es/drawable-xhdpi/ic_ongoing_phone_24px_09.png
es/drawable-xxhdpi/ic_call_white_24dp.png
es/drawable-xxhdpi/ic_close_dk.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_01.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_02.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_03.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_04.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_05.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_06.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_07.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_08.png
es/drawable-xxhdpi/ic_ongoing_phone_24px_09.png
es/drawable-xxxhdpi/ic_call_white_24dp.png
es/drawable-xxxhdpi/ic_close_dk.png
es/values/colors.xml
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomBroadcastIntentProcessor.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/IncomingCallNotifier.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
estapps/AndroidManifest.xml
estapps/res/layout/self_managed_sample_main.xml
estapps/res/values/colors.xml
estapps/src/com/android/server/telecom/testapps/SelfManagedCallList.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallListAdapter.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallingActivity.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnection.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnectionService.java
ests/src/com/android/server/telecom/tests/IncomingCallNotifierTest.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
847e66586972c596b2273dda9d5e14342f131053 17-Mar-2017 Hall Liu <hallliu@google.com> Do not set PROPERTY_IS_RTT in testapps

Functionality moved into framework.

Test: CTS
Change-Id: I1e9d5f9992a7260e81f9034de3f5b91dd46ef3c9
estapps/src/com/android/server/telecom/testapps/RttChatbot.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
estapps/src/com/android/server/telecom/testapps/TestRttActivity.java
90fc0b4085892daca0733e2b833fb2349778c681 30-Mar-2017 Hall Liu <hallliu@google.com> Add support for telephony tests in testing script

Test: invoke lite_test_telecom or lite_test_telephony
Change-Id: I756c75b4d2784159fecb0fac2ee6d6168a2ae403
cripts/telecom_testing.sh
3412daba72a1b6e57c542e46ef1f5d2fd28aa5f6 30-Mar-2017 Christopher Tate <ctate@google.com> Allow NEW_OUTGOING_CALL to launch possible handler apps am: 20a6dfefee
am: 690fbbd61a

Change-Id: Iab3748cce9e9dea42225c4cb2cf4f8bc00fabdbb
690fbbd61a343d0848f5469e06b30fbea08f909c 30-Mar-2017 Christopher Tate <ctate@google.com> Allow NEW_OUTGOING_CALL to launch possible handler apps
am: 20a6dfefee

Change-Id: Id739004347f0eadeaf5551c49fbd30bec3a6e4aa
20a6dfefee889a8d9ecaddc4079547b4c41afff1 29-Mar-2017 Christopher Tate <ctate@google.com> Allow NEW_OUTGOING_CALL to launch possible handler apps

Bug 36669943
Test: POC app on bug

Change-Id: I34534e110d7d1b3a343ebfbf63858035d6b00541
(cherry picked from commit 47c73e9b16dcd38e87bd19270856543aa4f8d446)
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
8d02743aba4d668b40ada9420662afd22a4e7857 29-Mar-2017 pkanwar <pkanwar@google.com> Address API concerns for isConcurrentVoiceAndDataAllowed and
OnReceiveUssdResponseCallback.

Bug: 35766890
Test: Existing tests.
Change-Id: Iec63aabc08cdbe4e7a8a20bdab320f8ea740443f
estapps/src/com/android/server/telecom/testapps/TestUssdActivity.java
47c73e9b16dcd38e87bd19270856543aa4f8d446 29-Mar-2017 Christopher Tate <ctate@google.com> Allow NEW_OUTGOING_CALL to launch possible handler apps

Bug 36669943
Test: POC app on bug

Change-Id: I34534e110d7d1b3a343ebfbf63858035d6b00541
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
a094b4e6cfd9feafbb3651e919f020485cc53361 28-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Fixes in responding call via sms" am: 926347bf56 am: 0b827de0bd am: 4d9fc4d4d0
am: 7bc4249bc9

Change-Id: I51f225736cb9b01f4fdc7cb88cd8fa4465f1de98
7bc4249bc9e8e355abc4b5606bc15584458edf2b 28-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Fixes in responding call via sms" am: 926347bf56 am: 0b827de0bd
am: 4d9fc4d4d0

Change-Id: I53ecb7a4a0d01e1e22aaeea83c5f4e501bae5bbe
4d9fc4d4d01a81873d8c42992791e1869a6288ae 28-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Fixes in responding call via sms" am: 926347bf56
am: 0b827de0bd

Change-Id: Ifa9b1053988a664d6a272238f5c43a5fc7c1badb
0b827de0bd47cda1da1339184847544c25ebebb7 28-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Fixes in responding call via sms"
am: 926347bf56

Change-Id: I698c8a33567c4183ba3d0fa976135f8cedf00299
926347bf56f2eb01cf27997a158e381adee3c296 28-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Fixes in responding call via sms"
00af1c86264d80dbdeff8d28f250b6eda7f00ebb 17-Mar-2017 Tyler Gunn <tgunn@google.com> Add call creation time property to API.

Test: CTS
Bug: 36124432
Change-Id: Id2e97c254dc17601f044da50105b84d8a0d7f144
rc/com/android/server/telecom/ParcelableCallUtils.java
c86a1ec395e764758c1d4e3380b42ab783bf47d7 24-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Add strings for incoming call UX for self-managed calls." am: 3e9c7d2039 am: 2fafee3f4c
am: f199dc70a4

Change-Id: Id7c88915bc24b0c21e1e303d0158ba632d5dc9c5
f199dc70a453576c4802ad49446d7c7e53111fb5 24-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Add strings for incoming call UX for self-managed calls." am: 3e9c7d2039
am: 2fafee3f4c

Change-Id: I09aa83150f5e7efa101cf55d473e3f59545723cb
2fafee3f4cd41a8acee46703d4c7c50be4e5b016 24-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Add strings for incoming call UX for self-managed calls."
am: 3e9c7d2039

Change-Id: I3fd7d4ef0703becef3122512495f3355917930d5
3e9c7d2039e765e95c223e77f8d3db9c987586c6 24-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Add strings for incoming call UX for self-managed calls."
de162e6eabdc6a25f807303d7edaf538f1550cde 24-Mar-2017 Tyler Gunn <tgunn@google.com> Add strings for incoming call UX for self-managed calls.

These strings are added in advance of consuming code.
There are a lot of them, but I tried to cover a lot of scenarios for
ongoing calls.

Test: Manual
Bug: 34159263
Change-Id: I5ac06c0861d99799fff2b56ccc2b7871ec128fb7
es/values/strings.xml
5d2ee7dcc52504fd3833579b91e4427b91f98b4f 24-Mar-2017 Hall Liu <hallliu@google.com> Merge "Add pending messages to dumpsys" am: 803e3cd3af am: e137040028
am: b743377c8c

Change-Id: I69ed18f4b3257b0ed23e2a07d41393fe753debaa
b743377c8cab64b0cf6b5492e05949a128f69a1c 24-Mar-2017 Hall Liu <hallliu@google.com> Merge "Add pending messages to dumpsys" am: 803e3cd3af
am: e137040028

Change-Id: I5b716ef5d58b18039cf59ca5041f6289b87f66aa
e1370400288715dfbb9839b9b909f7b6fadec130 24-Mar-2017 Hall Liu <hallliu@google.com> Merge "Add pending messages to dumpsys"
am: 803e3cd3af

Change-Id: Ia8dce40e0541e611b4093de91fc76cae6afe0d29
803e3cd3af92a718a280a4ac1287c4f519dccdac 24-Mar-2017 Hall Liu <hallliu@google.com> Merge "Add pending messages to dumpsys"
861548259cf663dc5fbad455c7bbc760b755b56d 24-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
7b07ce9e738d621674d8ef93765f020ffc47adc2 23-Mar-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ie77eae53955b54ecedb6d3ffdfd5fd1f518907d4
Auto-generated-cl: translation import
es/values-hy/strings.xml
es/values-uz/strings.xml
5187c44c1f781c41278325f6692e0fff5fae777a 23-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix Telecom Unit Tests 1) Add/Fix VideoProviderTests 2) Update tests to accommodate ContentProvider changes"
837b260f2ae7afe198c869a42af441491f95890c 23-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: 495e1a8cf4 am: 54e55acf5e
am: d373668208 -s ours

Change-Id: I2f41c5e1a4865985078d5127e9d03ec36458e5c5
d3736682088c7aeb015b53732989b705f6110da9 23-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: 495e1a8cf4
am: 54e55acf5e

Change-Id: I9595e6d8487e12795cf1fdaacb77b96c9177332e
54e55acf5e2b5b0e725fcf88b44905f7a0f71ecb 23-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
am: 495e1a8cf4

Change-Id: I116e72bd0ef84e9309466651fe8f351b02487777
d0fe76e8e74ac515cacc492fa2c783cf2247ac05 20-Mar-2017 Brad Ebinger <breadley@google.com> Fix Telecom Unit Tests
1) Add/Fix VideoProviderTests
2) Update tests to accommodate ContentProvider changes

Test: Telecom Unit Tests
Change-Id: I8ac65a4686937bfb3954f1d87ca8d1e4ee492644
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
ests/src/com/android/server/telecom/tests/CallScreeningServiceFilterTest.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/CreateConnectionProcessorTest.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
495e1a8cf4f29c2eb770727ef0539be5921205f1 22-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
36ad721d3260213ae58ad78a8c6a8ec0932a6f15 20-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.

Bug: 35767068
Test: No build failure on update.
Change-Id: I5345fd45f3f5af356f8f033a49c4e512bfc81d66
Merged-in: I5345fd45f3f5af356f8f033a49c4e512bfc81d66
rc/com/android/server/telecom/TelephonyUtil.java
05cb0f975816d2018d93590df1e385d1996c3265 20-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.

Bug: 35767068
Test: No build failure on update.
Change-Id: I5345fd45f3f5af356f8f033a49c4e512bfc81d66
rc/com/android/server/telecom/TelephonyUtil.java
323f8567892d832827c38b9fa454eeab043db27a 20-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "IMS-VT: Fix exception caused by incorrect conversion" am: 68de30a2db am: e860a630f5
am: ba74484c21

Change-Id: I56c1002813af27897cbc68578096574dcc810d04
ba74484c217202d9118bda88ffa6afc2f4e18c1d 20-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "IMS-VT: Fix exception caused by incorrect conversion" am: 68de30a2db
am: e860a630f5

Change-Id: I7d4c7346b7f81a649c1b3c2613903d160bacbd78
e860a630f5a8f24e16c044a2356713341ce97854 20-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "IMS-VT: Fix exception caused by incorrect conversion"
am: 68de30a2db

Change-Id: I01e8b709c53ffe6842d97db673ec932c32cbe911
68de30a2dbe0941a64666ad122722aced66a2802 20-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "IMS-VT: Fix exception caused by incorrect conversion"
a51c99f11f5345ab743361203db8eabe3da4daab 14-Mar-2017 Hall Liu <hallliu@google.com> Add pending messages to dumpsys

Add a record of the pending messages for the two audio state machines in
the dumpsys in order to debug errors where the state machines get
blocked on a file access.

Bug: 36056251
Test: manual - run dumpsys
Change-Id: I583014783dedb36d9fdd8a0338395f3c0ae6e542
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
772fdf6e57e44ced7d969eccedfe8cab2713e0d6 15-Mar-2017 Garik Badalyan <garikb@codeaurora.org> IMS-VT: Fix exception caused by incorrect conversion

Incorrect formatter (%d) is used to log a variable
of type String. The change fixes the code to use
proper formatter to log String variables.

Test: Manual
Change-Id: Ica9c5c9312be895e3048ddebf4f8653e444b1232
rc/com/android/server/telecom/VideoProviderProxy.java
3802daba6e8e5740492979f6205dd04b73ed4bd2 03-Mar-2017 Srikanth Chintala <srikchin@codeaurora.org> Fixes in responding call via sms

* Fix wrong message sent toast when rejected a call
When a call was rejected with an empty text message,
Telecomm displaying Message Sent toast message, but Mms
application discarding empty message. Display toast message
if message is not empty only.

* Fix display contact name in toast while responding call via sms
Send contact number to sms application instead of contact
name when number saved in contacts while responding
call via sms

Bug: 34870111
Change-Id: I5ae152482c5c467cd5748571effb69042532c5fe
rc/com/android/server/telecom/RespondViaSmsManager.java
3d4be72b13560cf46cde74ca5d32f17f7f0e0a51 16-Mar-2017 Jack He <siyuanh@google.com> Always send SWITCH_BASELINE_ROUTE in RingingBluetoothRoute am: 943ab48116 am: 4cc262e3b6
am: fc56b66a10

Change-Id: I26f6e05deb34614cf3b7bd43a6253bd3a145148d
fc56b66a10ae4e382c5d087ba5b9540a38ab817f 16-Mar-2017 Jack He <siyuanh@google.com> Always send SWITCH_BASELINE_ROUTE in RingingBluetoothRoute am: 943ab48116
am: 4cc262e3b6

Change-Id: If34e24505110a2a351f2d1c5285b8d856e538a70
4cc262e3b6c96450e39959576c0bec6faa610392 16-Mar-2017 Jack He <siyuanh@google.com> Always send SWITCH_BASELINE_ROUTE in RingingBluetoothRoute
am: 943ab48116

Change-Id: I609b1eae2204a25f135deb1e3e8287e0c1e5a843
943ab48116de0eab2e0501043ee0fb395ddc7cef 10-Nov-2016 Jack He <siyuanh@google.com> Always send SWITCH_BASELINE_ROUTE in RingingBluetoothRoute

* Always send SWITCH_BASELINE_ROUTE in RingingBluetoothRoute so that BT
SCO will not be connected when call is accepted in Privacy Mode

Bug: 19171297
Test: mm -j 40, regression on HFP
Change-Id: I9221e90fc02001fbccf920e3253d77eceb2e5a22
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
b36f7abf80b46e2c4c9b1493975430754d58e570 15-Mar-2017 Srikanth Chintala <srikchin@codeaurora.org> Held Conference call should not be automatically resumed am: 5bf7502170 am: c029061232
am: 2cbe545d7e

Change-Id: Idc062d0363d8f4b1c50b99859eb81ed27ad8bedf
2cbe545d7ecaaca02f55d3ce21ea82d913cae0dc 15-Mar-2017 Srikanth Chintala <srikchin@codeaurora.org> Held Conference call should not be automatically resumed am: 5bf7502170
am: c029061232

Change-Id: I1e834fbf08e5d01bd69f896d049f599b0878c57c
c029061232d28ded896368ff15a458138ee41d0d 15-Mar-2017 Srikanth Chintala <srikchin@codeaurora.org> Held Conference call should not be automatically resumed
am: 5bf7502170

Change-Id: I32b16b41616ed985cabfe89866a76f2882812a88
5bf75021706e526ab1d8afafc3ce992f8bc84196 03-Feb-2017 Srikanth Chintala <srikchin@codeaurora.org> Held Conference call should not be automatically resumed

While removing call, if the forground call is in hold, then
CallsManager in Telecom is trying to resume the call.
foreground call should not be resumed when the disconnected
call was one of the conference call. So, other calls state
will remain same as before.

Test: manual - conference call scenarios
Bug: 34830478
Change-Id: I27a1d4fa09d4dd8e6dbb78d2fe60efe1b230e0e6
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
7c2e59373c2b8acf49511d0d909ecec9e33db9e6 14-Mar-2017 Jordan Liu <jminjie@google.com> Merge "Remove @Postsubmit annotations" am: b6618922b8 am: c016cb7465
am: 6d7144f3f7 -s ours

Change-Id: Ida02e1bb4a6141968c89a2cddb01983d913ff652
6d7144f3f71beb2faed6fc09d3bd432714cde195 14-Mar-2017 Jordan Liu <jminjie@google.com> Merge "Remove @Postsubmit annotations" am: b6618922b8
am: c016cb7465

Change-Id: Ifc874fb9bc6158c5524a6957df76c550e7d1d3fa
c016cb7465039b60f5d27bcfe50ac0c318418ac6 14-Mar-2017 Jordan Liu <jminjie@google.com> Merge "Remove @Postsubmit annotations"
am: b6618922b8

Change-Id: Id04616a661bcb3ff602a89e1da11bcda7e68a338
b6618922b824d35d4edbe668a45c505e88f9cd7d 14-Mar-2017 Jordan Liu <jminjie@google.com> Merge "Remove @Postsubmit annotations"
6d1771a540ee2ed11310192095b1df43bd6884e9 13-Mar-2017 Paul Duffin <paulduffin@google.com> Merge "Use --multi-dex native to avoid dex limit"
0a23cd2c97366ffb5d9b43c4ead5d2b65df62ef7 13-Mar-2017 Hall Liu <hallliu@google.com> Merge "Fix unit tests and coverage" am: 1414f0e89d am: f003ab8a49
am: aa816b1517

Change-Id: I410e707cd9971ead3831738343566ab7e0e79fd0
aa816b1517bf552b973de038ec54570a30135e6f 13-Mar-2017 Hall Liu <hallliu@google.com> Merge "Fix unit tests and coverage" am: 1414f0e89d
am: f003ab8a49

Change-Id: I46d62c0ae7b1cb9ce2dc00a4e695aa4845627c35
f003ab8a49e5602f4c957ef130e49a3068e89119 13-Mar-2017 Hall Liu <hallliu@google.com> Merge "Fix unit tests and coverage"
am: 1414f0e89d

Change-Id: I2f64ced00c8bfd0da1733c66f64ec80a2a6d7176
1414f0e89d54a6a2984f0ad78000f0a492fedd49 13-Mar-2017 Hall Liu <hallliu@google.com> Merge "Fix unit tests and coverage"
7197aae46f430ca0d68c5410378299ae4854e742 11-Mar-2017 Paul Duffin <paulduffin@google.com> Use --multi-dex native to avoid dex limit

Bug: 32912773
Test: make checkbuild
Change-Id: I1c95f41cc9e1b151b32c10dd29bf0214abfafedc
ests/Android.mk
75c1b1aaae4a22fa0c7dae024b5d09eb3f032c54 11-Mar-2017 Paul Duffin <paulduffin@google.com> Merge "Refactor code incompatible with Mockito 2.7.13" am: d9215e0934 am: a33fdea93d
am: 2afb46ac6a

Change-Id: Ic060a1cb383126ffd225a8028f84adff00453dab
2afb46ac6a2e9bab83cff298f957011f52bea57a 11-Mar-2017 Paul Duffin <paulduffin@google.com> Merge "Refactor code incompatible with Mockito 2.7.13" am: d9215e0934
am: a33fdea93d

Change-Id: Iec007bd98e8a67f7ac90eea42d46e910cc2cceee
a33fdea93de71c71a7caf550b7bb210696ac9b84 11-Mar-2017 Paul Duffin <paulduffin@google.com> Merge "Refactor code incompatible with Mockito 2.7.13"
am: d9215e0934

Change-Id: I28a0ed182cce29a7c62fcb3ae5e113d776c46251
d9215e09341431a3387eea2dbaf0d5848dd1d89c 11-Mar-2017 Paul Duffin <paulduffin@google.com> Merge "Refactor code incompatible with Mockito 2.7.13"
5b8551ef79dc6e31bd945380097c13ff18b37359 11-Mar-2017 Hall Liu <hallliu@google.com> Fix unit tests and coverage

1. Fix the NPE that happened because hasVideoCall in CallsManager was
not visible to the unit tests
2. Add additional env variables to ensure that emma is in the classpath
when generating code coverage

Test: unit tests
Change-Id: Ibd621267b4af4e20c41458eb674fd120ca0a1859
cripts/telecom_testing.sh
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
d763abc02da28c8a948cbeaf548c0fc267afb3b3 10-Mar-2017 Tyler Gunn <tgunn@google.com> Fix issue where the dnd mode remains on after a call terminates. am: 4192dd7bd6 -s ours am: cb7ed483cd -s ours
am: 82d8a45950 -s ours

Change-Id: I66d453504e1a1bb2a6636c1db68dd8d8b611378d
82d8a459507008bbc81799a985bd14b6042fd2a3 10-Mar-2017 Tyler Gunn <tgunn@google.com> Fix issue where the dnd mode remains on after a call terminates. am: 4192dd7bd6 -s ours
am: cb7ed483cd -s ours

Change-Id: Id7e933593fbd9fb68b2546fbf02d72c346a0c7fb
cb7ed483cd6d7e29355a31f9ca62e24ae01c7652 10-Mar-2017 Tyler Gunn <tgunn@google.com> Fix issue where the dnd mode remains on after a call terminates.
am: 4192dd7bd6 -s ours

Change-Id: I4637c2fae29cc5059935995269aef32b744dcbaf
4192dd7bd64222384a79494fb92068ebceaf2ffb 11-Jan-2017 Tyler Gunn <tgunn@google.com> Fix issue where the dnd mode remains on after a call terminates.

There is a potential race condition when handling the
ACTION_INTERRUPTION_FILTER_CHANGED broadcast. Since we're setting the
interruption mode ourselves, we also get this broadcast. Most of the time
the broadcast is processed first and everything works. However, it looks
like there are cases where the broadcast receiver processes AFTER we have
updated mAreNotificationSuppressed to true. Thus, when we try to turn
off DND later on we assume that the user had initiated the request to turn
off DND and don't bother to do so.

The fix is to check who initiated the manual DND rule. If its telecom,
we can ignore the broadcast.

Test: Manual
Bug: 33340277
Merged-In: I42b78fd27fe9814c4f8e29afc8937c3b41f51e50
Change-Id: I42b78fd27fe9814c4f8e29afc8937c3b41f51e50
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/InterruptionFilterProxy.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
e880b18a1cdf19687d4fcfdd348ed23167720bb9 10-Mar-2017 Hall Liu <hallliu@google.com> Merge "Fix comparison bug in InCallServiceInfo" am: 5ce1a7842d am: 10197de5a4
am: d4ee3bef3e

Change-Id: I41527be5e199ead758d26595d45b91e0d5882d32
d4ee3bef3e6c8fa4c5b0a1ff63466c7eda22ceb6 10-Mar-2017 Hall Liu <hallliu@google.com> Merge "Fix comparison bug in InCallServiceInfo" am: 5ce1a7842d
am: 10197de5a4

Change-Id: Ie6a8669fa5fdac4e3cc6f192e0090d1e4e057cab
10197de5a4c1ee6e0e6dddb9ccaf318130ad57f6 10-Mar-2017 Hall Liu <hallliu@google.com> Merge "Fix comparison bug in InCallServiceInfo"
am: 5ce1a7842d

Change-Id: I88b2174502e6917e54c176c014425e297dddec31
5ce1a7842d2e84a051ece710813cc86ab85daa2d 10-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix comparison bug in InCallServiceInfo"
9f0b884fbd811e688441335a16c32cba921632ca 10-Mar-2017 Hall Liu <hallliu@google.com> Remove old pending calls if not reused am: 10139b2da3 am: 999194b20e
am: 15a2b01441

Change-Id: I8ed9cc249d174c000328c3432ca0ba6d48a823c7
9a03fe2e1894d4a3968a78af2b2ecff26f594105 10-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Disable a phone number log for user build" am: 18f843be39 am: 2092b19393
am: 74595d6091

Change-Id: I2c6466e3ae4d4d80805b4d479263baaeb271cf4c
15a2b01441496018af6ac3f03695b20f8eefc458 10-Mar-2017 Hall Liu <hallliu@google.com> Remove old pending calls if not reused am: 10139b2da3
am: 999194b20e

Change-Id: Iffced316456acdc3d761805a09f83dd4fa45d027
999194b20e0234cfd2a4dbd2a4ba2579742ba45d 10-Mar-2017 Hall Liu <hallliu@google.com> Remove old pending calls if not reused
am: 10139b2da3

Change-Id: I152cddeee93ea28c63d33c420b4f68ab1d877b9b
74595d60917cf6b67d751b3443c83e728c0f66a2 09-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Disable a phone number log for user build" am: 18f843be39
am: 2092b19393

Change-Id: I4beaa991d82b9f795d517ba2495a9ec60f81abcc
51ec415169bfbf67d9758b080e0dc36e6da6c27f 09-Mar-2017 Toshiya Ikenaga <toshiya.ikenaga@sonymobile.com> Fix audio route when undocked during video call am: db10aec637 am: e06f2b119e
am: 8af2f5b138

Change-Id: I9997a9fa0f9f0084109c360984d958f9793bcc03
2092b193936af5552457f023cf2870cfb2399b16 09-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Disable a phone number log for user build"
am: 18f843be39

Change-Id: Iff945e85104a8106629d2bd11a287a40dfc107b3
47222c0baa26102e9773e95985658ed75a3f5e27 07-Mar-2017 Hall Liu <hallliu@google.com> Fix comparison bug in InCallServiceInfo

Test: CTS
Change-Id: Id284345b13874da777e7ff29d80a8ad51cb01623
rc/com/android/server/telecom/InCallController.java
10139b2da372d561b639613031d8add781b29d0c 07-Mar-2017 Hall Liu <hallliu@google.com> Remove old pending calls if not reused

When trying to make an outgoing call, remove all of the pending outgoing
calls from the iterator if we're not going to use them again.

Test: manual
Bug: 33842702
Change-Id: I414624172b74772fa9a75626e6675afead5b6ee4
rc/com/android/server/telecom/CallsManager.java
18f843be394158cc564c06d4e1844cfec36ea3ed 09-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Disable a phone number log for user build"
8af2f5b138e71a9ff07e58d9f61e80c20c0a2d6d 09-Mar-2017 Toshiya Ikenaga <toshiya.ikenaga@sonymobile.com> Fix audio route when undocked during video call am: db10aec637
am: e06f2b119e

Change-Id: I6df05930a1f6f18e18b93f8c50dcb0cf11e2d116
e06f2b119e9d44f8f6b2cb252872df5a70fef8a0 09-Mar-2017 Toshiya Ikenaga <toshiya.ikenaga@sonymobile.com> Fix audio route when undocked during video call
am: db10aec637

Change-Id: I9e4e96b91cabb52faf2d35ebf9bc8d24d161242f
8a30e647d639ae4a08ecf8dcf4100a29a5da3a3a 09-Mar-2017 Paul Duffin <paulduffin@google.com> Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Change-Id: I3ecc0b800875fd614582d4ecd53f9d0a368160ba
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
db10aec6374e4dcc7578f51636718ffb4f2b2219 16-Feb-2017 Toshiya Ikenaga <toshiya.ikenaga@sonymobile.com> Fix audio route when undocked during video call

When user undocks during video call, audio route is set to earpiece
improperly. Fix to set to speaker in that case.

Test: manual - undocked during video call
Bug: 29529008
Change-Id: I78ef76af67400cf07d437581612eae5d78142abd
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
fac1dba0e2c508afe197994ec831adf6229cee86 12-Dec-2016 guobing.x.xiong <guobing.x.xiong@sonymobile.com> Disable a phone number log for user build

A phone number is privacy data. Therefore, it should be prevented
from logging in user build.

Test: manual - checked log
Bug: 34582911
Change-Id: Ia8cd47f1e50019a1eff18362195308e3dd38881b
rc/com/android/server/telecom/ConnectionServiceWrapper.java
0aa88d621b9a614c0a7b833713d7e22359a51320 08-Mar-2017 Hall Liu <hallliu@google.com> Merge "Send proper call state in CLCC in an IMS conference" am: fca12b76bf am: fb0b1a4b61
am: 1894dcf70a

Change-Id: Iaf6ff65ffd53c69bace644c651199ff610dd872e
1894dcf70afd1d626916ab62b59423aaf645dea1 08-Mar-2017 Hall Liu <hallliu@google.com> Merge "Send proper call state in CLCC in an IMS conference" am: fca12b76bf
am: fb0b1a4b61

Change-Id: I78ead9b04b8ec4c7a9fc49e449d7bfb0f3303ce1
fb0b1a4b614908addc05635a58749f78aff71c52 08-Mar-2017 Hall Liu <hallliu@google.com> Merge "Send proper call state in CLCC in an IMS conference"
am: fca12b76bf

Change-Id: I14fb5aa1949ea4d76ddaf69292de996966fd0991
fca12b76bf2adb8c3a27419cc20d5557cb1a9c79 08-Mar-2017 Hall Liu <hallliu@google.com> Merge "Send proper call state in CLCC in an IMS conference"
6fccadb9ac133412c216ba5628ebcc5852eeb328 08-Mar-2017 Hall Liu <hallliu@google.com> Send proper call state in CLCC in an IMS conference

When sending the calls that are part of a held IMS conference with CEP
enabled, send the state of the calls as held rather than active.

Change-Id: Icea894670e4c74754c72e0677dcb781904bad878
Fixes: 33819217
Test: manual, added unit test
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
1065173d66793001b998c03a41cdb2fa1af1d9c2 07-Mar-2017 Hall Liu <hallliu@google.com> Implement mid-call RTT initiation and teardown am: b8b5a6976b am: e4ecf59caf
am: e4273fbed3 -s ours

Change-Id: Ie4f5f1bcd7b88e6b3a23a47c506878065b9f97ed
e4273fbed348e5186346b968632bac12fa25560b 07-Mar-2017 Hall Liu <hallliu@google.com> Implement mid-call RTT initiation and teardown am: b8b5a6976b
am: e4ecf59caf

Change-Id: Ia91c1b2545c8bc26216a4675cc7f16ab7c659d8a
e4ecf59caf4301c74c3c15befbcc31c1660c603b 07-Mar-2017 Hall Liu <hallliu@google.com> Implement mid-call RTT initiation and teardown
am: b8b5a6976b

Change-Id: Ifa7fb93be70faacf4e7545fcc354cc2e60427ff7
b8b5a6976b44f92494971672ca3c1e6a71974d54 15-Feb-2017 Hall Liu <hallliu@google.com> Implement mid-call RTT initiation and teardown

Adds functionality to testapps and to framework to allow for local and
remote initiation and disconnection of RTT.

Test: manual
Merged-In: I0e8248b495a7d3750c840591f1fa5388b34a32e2
Change-Id: I0e8248b495a7d3750c840591f1fa5388b34a32e2
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
estapps/AndroidManifest.xml
estapps/res/layout/incall_screen.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
estapps/src/com/android/server/telecom/testapps/RttChatbot.java
estapps/src/com/android/server/telecom/testapps/TestCallActivity.java
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestConnectionManager.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
estapps/src/com/android/server/telecom/testapps/TestInCallUI.java
estapps/src/com/android/server/telecom/testapps/TestRttActivity.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
1edf04a086db22869f0858536eb68bbdf5736ece 07-Mar-2017 Tyler Gunn <tgunn@google.com> API review cleanups. am: 115c06ee64 am: aa59fe7535
am: 124b43d958

Change-Id: I9203a225f2c320f370343c5431d586ae87747156
124b43d9589d92c8b2bca3d4c914cb1f0c05ead2 07-Mar-2017 Tyler Gunn <tgunn@google.com> API review cleanups. am: 115c06ee64
am: aa59fe7535

Change-Id: I1684f94267584afda678fb03ff918e74ddd2dd4a
aa59fe75357b55b2c28e08aed74cf3b41d5f4d14 07-Mar-2017 Tyler Gunn <tgunn@google.com> API review cleanups.
am: 115c06ee64

Change-Id: I4141327061a178ab81735427fce28ad3cc26184e
d5d7f034a08d85fdc58fa85059187a7144cfe7d1 07-Mar-2017 Hall Liu <hallliu@google.com> Merge "Implement mid-call RTT initiation and teardown"
115c06ee64e209cda99abdc1fbd23fd65aa6da47 02-Mar-2017 Tyler Gunn <tgunn@google.com> API review cleanups.

- Modify the video call permission check to use the API version of the
caller to determine whether to use the API26
SESSION_EVENT_CAMERA_PERMISSION_ERROR event. If the caller is using an
older API, use the more generic SESSION_EVENT_CAMERA_FAILURE.
- Update the sample Self Managed calling app to use the incoming call UX
guidance specified in the Javadocs.
- Fix bug in InCallController which could cause InCallService to see
self-managed connections.

Test: Manual
Bug: 35767096
Bug: 35767711
Change-Id: I3e5e2b84eb026eec37f884029bb77d446a04e255
ndroidManifest.xml
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/VideoProviderProxy.java
estapps/AndroidManifest.xml
estapps/res/drawable-hdpi/ic_android_black_24dp.png
estapps/res/drawable-mdpi/ic_android_black_24dp.png
estapps/res/drawable-xhdpi/ic_android_black_24dp.png
estapps/res/drawable-xxhdpi/ic_android_black_24dp.png
estapps/res/drawable-xxxhdpi/ic_android_black_24dp.png
estapps/res/layout/self_managed_incoming_call.xml
estapps/res/layout/self_managed_sample_main.xml
estapps/src/com/android/server/telecom/testapps/IncomingSelfManagedCallActivity.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallList.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallNotificationReceiver.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallingActivity.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnection.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnectionService.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
40f7f7a6b82b92f8a78a186c5ffa2382964abf82 06-Mar-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I58ef047edbe0b6a35f25d25cc552c4b148609740
Auto-generated-cl: translation import
es/values-hi/strings.xml
b563bb8a7f3c6f879943a4c56201d28cef6e30d6 01-Mar-2017 Jordan Liu <jminjie@google.com> Remove @Postsubmit annotations

Since they have been replaced with @FlakyTest we can remove the
annotation and import.

Change-Id: I3493f9c56c1b978367e7fa26fc6a9018e9c36586
Merged-In: I3493f9c56c1b978367e7fa26fc6a9018e9c36586
Fixes: 35710737
Test: No change to behavior
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
576e16522256f157e0faf056e05e28c078155974 02-Mar-2017 Jordan Liu <jminjie@google.com> Merge "Remove @Postsubmit annotations"
df4d6471b20137d0bf3ae66d8ae12c42c5ece6eb 02-Mar-2017 Tyler Gunn <tgunn@google.com> Support for InCallServices receiving self-managed calls. am: 37e782b421 am: 3e62d5863c
am: 5fe85030aa

Change-Id: I20ffcace93257bfda07654d52af15a9c67d191ef
aeece4ec4184b76e0ac2e8a012af05638ad866f6 15-Feb-2017 Hall Liu <hallliu@google.com> Implement mid-call RTT initiation and teardown

Adds functionality to testapps and to framework to allow for local and
remote initiation and disconnection of RTT.

Test: manual
Change-Id: I0e8248b495a7d3750c840591f1fa5388b34a32e2
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
estapps/AndroidManifest.xml
estapps/res/layout/incall_screen.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
estapps/src/com/android/server/telecom/testapps/RttChatbot.java
estapps/src/com/android/server/telecom/testapps/TestCallActivity.java
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestConnectionManager.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
estapps/src/com/android/server/telecom/testapps/TestInCallUI.java
estapps/src/com/android/server/telecom/testapps/TestRttActivity.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
5fe85030aa846a938d8a948f722664dfbece28f5 01-Mar-2017 Tyler Gunn <tgunn@google.com> Support for InCallServices receiving self-managed calls. am: 37e782b421
am: 3e62d5863c

Change-Id: I752d0c0c148c218af3a9d78cc49ff7195a986f1e
3e62d5863cce97190012940cf7e85ce15f34d83e 01-Mar-2017 Tyler Gunn <tgunn@google.com> Support for InCallServices receiving self-managed calls.
am: 37e782b421

Change-Id: I519842bbd25d7e4b805c3c478515d0c305ae3628
37e782b421f63a81bfae1efaa1eb01f0fbdd7abf 10-Feb-2017 Tyler Gunn <tgunn@google.com> Support for InCallServices receiving self-managed calls.

Also adding isInManagedCall telecomManager API.

Test: Manual, CTS
Bug: 34159263
Change-Id: I2e30cf2800b7febf56566755f7b97e4ad46ec1ad
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/ParcelableCallUtils.java
rc/com/android/server/telecom/TelecomServiceImpl.java
a74a3211608068253b99db2dae7c3282295ac911 01-Mar-2017 Jordan Liu <jminjie@google.com> Remove @Postsubmit annotations

Since they have been replaced with @FlakyTest we can remove the
annotation and import.

Change-Id: I3493f9c56c1b978367e7fa26fc6a9018e9c36586
Fixes: 35710737
Test: No change to behavior
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
cabfa813b4866c34e9abc708fceab73167849810 01-Mar-2017 Hall Liu <hallliu@google.com> Merge "Redo DtmfLocalTonePlayer" am: f9592be953 am: 5faa4d15a0
am: 936fd6208f

Change-Id: I5f9f51a46b9ac3ab9d9afedcb84957b541b1fce4
936fd6208f3e71fa1b99b862385f085c28fa5fc8 01-Mar-2017 Hall Liu <hallliu@google.com> Merge "Redo DtmfLocalTonePlayer" am: f9592be953
am: 5faa4d15a0

Change-Id: I58b836569fe8d5b4d11ab90b3cad8081f65f9449
5faa4d15a096a0bc98e308afbda32a1bffdbf3be 01-Mar-2017 Hall Liu <hallliu@google.com> Merge "Redo DtmfLocalTonePlayer"
am: f9592be953

Change-Id: I8db00beccda8ba4500d8e907c984b9c1971f832b
f9592be953452604654e77a1d0f31d36ec0622ac 01-Mar-2017 Hall Liu <hallliu@google.com> Merge "Redo DtmfLocalTonePlayer"
5507671b2ecba6c2e2de7df1a2177776f4a8db46 01-Mar-2017 Hall Liu <hallliu@google.com> Redo DtmfLocalTonePlayer

The system of locks in DtmfLocalTonePlayer and the constant thread
creation/destruction seems to be behind a system ANR bug. This change
refactors the class to rely on a single Handler and associated
HandlerThread that lives for the entire duration of Telecom.

Bug: 34886553
Test: manual and unit
Change-Id: I1d86c644aaecdb6ff93d31e2b9e97792e3e301e0
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/DtmfLocalTonePlayer.java
ests/src/com/android/server/telecom/tests/DtmfLocalTonePlayerTest.java
8ff1b7cd7f955c3b51610b9d7b4ed03648f0ec59 01-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Introduce ANSWER_PHONE_CALLS permission"
740b45f0e93924d4a4383821e7ca6fc68fccd307 01-Mar-2017 xulicheng <xulicheng@xiaomi.com> InCallUI will in wrong audio state in some case am: f86f470ba0 am: 3dfcfd1d65
am: 0d29b2d6d9

Change-Id: I7c227af1fc04b17a4fc5fc5568137f3685f82b93
0d29b2d6d90cafd40a9add5fe5c7bcd4c6dabf2b 01-Mar-2017 xulicheng <xulicheng@xiaomi.com> InCallUI will in wrong audio state in some case am: f86f470ba0
am: 3dfcfd1d65

Change-Id: I20222a289412ee843439f062c3fc23ab2260a1fe
3dfcfd1d658b7a2e958f5af6a4ec42723717bc01 01-Mar-2017 xulicheng <xulicheng@xiaomi.com> InCallUI will in wrong audio state in some case
am: f86f470ba0

Change-Id: Id4f04ae9eb4df475ba1be2b6489516dcc0b63a2d
f86f470ba0a3fe4cd6b8cff32ee1467e7d524e7b 28-Feb-2017 xulicheng <xulicheng@xiaomi.com> InCallUI will in wrong audio state in some case

In some case, telecom will not update current audio state
to incall service, that cause some bug on UI and proximity sensor

Test: read the message!
bug:https://code.google.com/p/android/issues/detail?id=235245
Change-Id: Ib4f1e1529764953a4a90186ca0a22f4ebd159acb
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
e05bb23aec0544d1c092c99f2a303a5e144bc6f3 28-Feb-2017 Jordan Liu <jminjie@google.com> Merge "Add @FlakyTest annotation to @Postsubmit tests" am: 4e068b3436 am: 67da16dda7
am: 942dfbcbfa

Change-Id: I06b074d1704376bdefd3964f33e67912e5eb4f53
942dfbcbfa87869dcbea37eb68513caab5a288cb 28-Feb-2017 Jordan Liu <jminjie@google.com> Merge "Add @FlakyTest annotation to @Postsubmit tests" am: 4e068b3436
am: 67da16dda7

Change-Id: Ie215cf8512703eea68caae36466578bb568147ae
67da16dda7d90476e5050b44911924468e7fc787 28-Feb-2017 Jordan Liu <jminjie@google.com> Merge "Add @FlakyTest annotation to @Postsubmit tests"
am: 4e068b3436

Change-Id: I7f6eace457e4445fd59fc3f56deead303b6e52b0
4e068b34363901d4c1ee257d5b9eaf3894e5b3ea 28-Feb-2017 Jordan Liu <jminjie@google.com> Merge "Add @FlakyTest annotation to @Postsubmit tests"
c7dbd2c2c6bf5e07d5de389f2512454e577c2153 24-Feb-2017 Jordan Liu <jminjie@google.com> Add @FlakyTest annotation to @Postsubmit tests

@Postsubmit may be used for something else in the future, so replace the
annotation with the more correct and specific annotation @FlakyTest

Bug: 35710737
Test: No change to behavior
Change-Id: I740c2c9e3cfcd78481d4a6f8f179872cd7832beb
Merged-In: I740c2c9e3cfcd78481d4a6f8f179872cd7832beb
ests/Android.mk
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
38b0a37439d64639ff2070310cf2276a43e80e2f 28-Feb-2017 Jordan Liu <jminjie@google.com> Merge "Add @FlakyTest annotation to @Postsubmit tests"
310670afcb0ccdfb6f5d0eae8a9c2065246525a5 27-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Add unit tests for some VideoProfile static methods." am: cfd9d7fd68 am: da80c29ef6
am: 1ab79cb49d

Change-Id: Icba1cc4ec72b0ee2f00359e9c01ed78a79379c04
1ab79cb49d23cbd8adc2c52504b6d2f16c5ed4c5 27-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Add unit tests for some VideoProfile static methods." am: cfd9d7fd68
am: da80c29ef6

Change-Id: If2add35d20e3450b9ff4290db83d58486b470532
da80c29ef6e294af7c672a666b5d440ed893506f 27-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Add unit tests for some VideoProfile static methods."
am: cfd9d7fd68

Change-Id: I4333b696121a0bddd5fc6130f32e8e6316196b62
cfd9d7fd68aa7de47e397b0c05825fb98e23af6f 27-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Add unit tests for some VideoProfile static methods."
a53fd9cb08e469d8a520ee465a57d16471d5f54a 24-Feb-2017 Jordan Liu <jminjie@google.com> Add @FlakyTest annotation to @Postsubmit tests

@Postsubmit may be used for something else in the future, so replace the
annotation with the more correct and specific annotation @FlakyTest

Bug: 35710737
Test: No change to behavior
Change-Id: I740c2c9e3cfcd78481d4a6f8f179872cd7832beb
ests/Android.mk
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
c30d20f0a2ba6b0c32d7a8463133f8ff830a49d0 24-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Don't Ignore new extras in ConnectionRequest" am: 23a0c7ab64 am: 06aa51657b
am: 837874b017

Change-Id: I055b8a12477893cbeb684afef0927907367774a2
837874b017aea6fb27b9d2f588e40b2022eaac2d 24-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Don't Ignore new extras in ConnectionRequest" am: 23a0c7ab64
am: 06aa51657b

Change-Id: I18eab63b48ba92dacabfa1724aaffa7a8980e6cf
06aa51657b5af1a23e6ad8e2b95adab3ef4bd60c 24-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Don't Ignore new extras in ConnectionRequest"
am: 23a0c7ab64

Change-Id: I98dc5babe5a88bb31ddbfe5dba0f927293f3caff
23a0c7ab64f2b4e9a2985da94945b8d9f55f93b9 24-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Don't Ignore new extras in ConnectionRequest"
338a271d4ca2a91d36835f7ddb82663a2e435138 24-Feb-2017 Satish Kodishala <skodisha@codeaurora.org> Strip separators while sending CLCC response am: f4bd7c2179 am: 6426636365
am: 05c0ca569c

Change-Id: I7a9657a12d39819433cd7b88987d5273fb2de103
05c0ca569cf897820366e3f46a098783c897cc62 24-Feb-2017 Satish Kodishala <skodisha@codeaurora.org> Strip separators while sending CLCC response am: f4bd7c2179
am: 6426636365

Change-Id: Ide09929219e42813e3a6185a1f8f6ccbabe14a41
6426636365a384c89d897a0b0cd8eaaf53a6c25b 24-Feb-2017 Satish Kodishala <skodisha@codeaurora.org> Strip separators while sending CLCC response
am: f4bd7c2179

Change-Id: I70c775aa7b90373ff8d54c91c8100a6bd409eb09
6b0b6031da009bd85713aaa223a86d9b9ff83db3 24-Feb-2017 Brad Ebinger <breadley@google.com> Don't Ignore new extras in ConnectionRequest

The current code ignores the new extras that are added in
createConnection#onSuccess. This change modifies the
ConnectionRequest to include those extras.

This was causing a test failure on internal Telecom
unit tests.

Test: Telecom Unit Tests
Change-Id: I2fc739d374a4355176a50dd6a7ab081e2673c0f9
rc/com/android/server/telecom/ConnectionServiceWrapper.java
f4bd7c2179028999fa3964bf0d45a593171b5480 17-Nov-2016 Satish Kodishala <skodisha@codeaurora.org> Strip separators while sending CLCC response

Usecase:
1. Pair and connect with Plantronics Voyager Legend headset.
2. Make MO call to a contact with "(" or ")" in the name.
3. End the call.
4. Redial from headset.

Failure:
Headset sends ATD with number it got as part of CLCC response
for first call. Since number contains "(" and ")" characters,
error is returned from BT stack to the headset.

Rootcause:
During the first call, headset sends AT+CLCC. We send number returned
by Telephony as is which have "(" and ")" to headset in CLCC response.
Headset uses ATD with this number for redial. We return error from stack
when we see "(" or ")" so redial fails.

Fix:
Remove special characters like "(", ")", "-", " " from phone number
before sending it in CLCC response. Issue is see with Plantronics
Voyager Legend, Plantronics backbeat pro headsets.

Test: Telecom Unit Tests
Bug:33000152
Change-Id: I589b64ebd56892dec33abe430cdf6d2eacdc9b99
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
86f417aa84995ffba44ea98b32d5ba4ee338aa6f 22-Feb-2017 Hall Liu <hallliu@google.com> Add support for RTT calls (part 1) am: dd68bc36a3 am: 399f7e50b0
am: 1d36154ab9

Change-Id: Id768015a354c9a3428b4c817507d058df6ea15f7
1d36154ab9ace2609131eb86a242513c20dc53d8 22-Feb-2017 Hall Liu <hallliu@google.com> Add support for RTT calls (part 1) am: dd68bc36a3
am: 399f7e50b0

Change-Id: I195441756155f98bf31c1f8c7be97e3cfbf99060
399f7e50b0e2f58f010dc0704e98b67787106097 22-Feb-2017 Hall Liu <hallliu@google.com> Add support for RTT calls (part 1)
am: dd68bc36a3

Change-Id: Ie33cd4a343bd306836f7e23edd33cb2da07f6157
608ab6fb9b9cf2e027d5e3e3667e3ba4bdc09a53 22-Feb-2017 Tyler Gunn <tgunn@google.com> Add unit tests for some VideoProfile static methods.

Adding new standalone unit tests for videoStateToString and isAudioOnly.

Test: These are tests.
Bug: 35645334
Change-Id: Iec3f4859e691158c4603566786c6f8420eb12316
ests/src/com/android/server/telecom/tests/VideoProfileTest.java
dd68bc36a3278557b1c4d9183ed9e3dee077eb20 26-Jan-2017 Hall Liu <hallliu@google.com> Add support for RTT calls (part 1)

Adds logic for handling RTT call initiation and communication with the
InCallService and the ConnectionService and includes changes to the
testapps that exercise this functionality. This change handles RTT
initiation from the beginning of a call.

Change-Id: I3d713b662a100b2e0ad817b92005f044bcc60c62
Test: manual, through testapps
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/ParcelableCallUtils.java
estapps/AndroidManifest.xml
estapps/res/layout/incall_screen.xml
estapps/res/layout/rtt_incall_screen.xml
estapps/res/layout/testdialer_main.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/CallListAdapter.java
estapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
estapps/src/com/android/server/telecom/testapps/CallServiceNotifier.java
estapps/src/com/android/server/telecom/testapps/RttChatbot.java
estapps/src/com/android/server/telecom/testapps/TestCallActivity.java
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestConnectionManager.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
estapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
estapps/src/com/android/server/telecom/testapps/TestInCallUI.java
estapps/src/com/android/server/telecom/testapps/TestRttActivity.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
6dc6e969f2179e21402ad7ac1b453ea7273415aa 16-Feb-2017 Hall Liu <hallliu@google.com> Accept timeout from apps requesting call disconnect am: ad18dc9e33 -s ours
am: 78c5210b48 -s ours

Change-Id: I9d4019ed5355e94a5597edfa493823e53f2bf0be
78c5210b483f614d932e19af86a7e408da52945c 16-Feb-2017 Hall Liu <hallliu@google.com> Accept timeout from apps requesting call disconnect
am: ad18dc9e33 -s ours

Change-Id: Ib36d01b5c748b77ebdb09cff7bdea7569e77231c
f4fc3e0fc4178c2b7748fb0be0465d66383b1237 15-Feb-2017 Hall Liu <hallliu@google.com> Merge "Accept timeout from apps requesting call disconnect" am: b2d915147c am: f8a3007b8d am: fa72ae2e73
am: 1482b899c5

Change-Id: I95fd852526c18ad0cb9f4c1e84c9b553858f7129
ad18dc9e336c73922192e1693a836781cff6c929 15-Feb-2017 Hall Liu <hallliu@google.com> Accept timeout from apps requesting call disconnect

When processing a call disconnected via the ACTION_NEW_OUTGOING_CALL
broadcast, use the timeout specified by the app instead of the default
timeout. This allows apps that may take a bit longer to place a new call
some more time if they need it.

This also changes the default timeout to 500ms and sets a max timeout of
10s for an app-specified timeout.

Bug: 34474757
Test: manual, unit
Merged-In: I3121dcaf973a10043ffcaa0c8251aa21e18d027e
Change-Id: I1b535f17aefffe423cfbc2cb1d42352e8f4b57f0
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/Timeouts.java
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
1482b899c5cbdcef64ce0666400ac527f49aced5 15-Feb-2017 Hall Liu <hallliu@google.com> Merge "Accept timeout from apps requesting call disconnect" am: b2d915147c am: f8a3007b8d
am: fa72ae2e73

Change-Id: I3121dcaf973a10043ffcaa0c8251aa21e18d027e
fa72ae2e735ae333581cd09aca1a8f7bd843ab02 15-Feb-2017 Hall Liu <hallliu@google.com> Merge "Accept timeout from apps requesting call disconnect" am: b2d915147c
am: f8a3007b8d

Change-Id: I60b6b6520c4ad0abee9ff8b328e34ccb9bd51c7d
f8a3007b8d010d14dd79788c4e2c875345f56be4 15-Feb-2017 Hall Liu <hallliu@google.com> Merge "Accept timeout from apps requesting call disconnect"
am: b2d915147c

Change-Id: I51eec04fe08c91c8d4043805f47bf6a91ba91256
b2d915147cf394da2d3c18a16918d8ee938543ce 15-Feb-2017 Hall Liu <hallliu@google.com> Merge "Accept timeout from apps requesting call disconnect"
63e690cba4c50577c6dcfc98ca1d7e5f1b1fc3c4 15-Feb-2017 Hall Liu <hallliu@google.com> Accept timeout from apps requesting call disconnect

When processing a call disconnected via the ACTION_NEW_OUTGOING_CALL
broadcast, use the timeout specified by the app instead of the default
timeout. This allows apps that may take a bit longer to place a new call
some more time if they need it.

This also changes the default timeout to 500ms and sets a max timeout of
10s for an app-specified timeout.

Bug: 34474757
Test: manual, unit
Change-Id: I1b535f17aefffe423cfbc2cb1d42352e8f4b57f0
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/Timeouts.java
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
fb13b58abd8520c3bd606186c41932963dc8cd3a 15-Feb-2017 Michael Dooley <mdooley@google.com> Merge "Fixing bug with setting the emergency call time."
a2b067eacbd9ee7210cb0887a6b26068990d82ff 14-Feb-2017 mike dooley <mdooley@google.com> Fixing bug with setting the emergency call time.

This cl fixes a bug that caused the connection request extras
to be overwritten when the last emergency call time was added to
the extras. It also updates the unit test to detect this problem.
It also adds the emergency call time to the call intent extras
instead of to the call extras directly (the unit test was failing
without this change).

This bug causes incoming wifi calls to be missed after an outgoing
emergency call.

Test: updated BasicCallTest and manual testing

Bug: 35323451
Change-Id: I15759daac53d6f6dad53e16e065427944fe3944f
rc/com/android/server/telecom/ConnectionServiceWrapper.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
3be78d9b29b7f5d7dab50657dd9069cc8e218056 14-Feb-2017 Brad Ebinger <breadley@google.com> Cache setDefaultDialer value to fix CTS failures am: 0bee0ffb6a am: 68a7e3971f am: 7a006b01b8
am: 5fcd5482fa

Change-Id: I74424d55f7bfd7bc188a3a9bb618aaa85ae137aa
5fcd5482fa1a0d827b73614a2f96946278769ff7 14-Feb-2017 Brad Ebinger <breadley@google.com> Cache setDefaultDialer value to fix CTS failures am: 0bee0ffb6a am: 68a7e3971f
am: 7a006b01b8

Change-Id: I32cf6ac8b7620c4da26b7bacb99b55211da6e62e
7a006b01b8ef4a6b0ab7249737f29bf2f387ae5f 14-Feb-2017 Brad Ebinger <breadley@google.com> Cache setDefaultDialer value to fix CTS failures am: 0bee0ffb6a
am: 68a7e3971f

Change-Id: I00e8921cca90d6df5ccf76b4d46d410503e80465
68a7e3971f9d19e395a6a970ff9c69300c4b9fd0 14-Feb-2017 Brad Ebinger <breadley@google.com> Cache setDefaultDialer value to fix CTS failures
am: 0bee0ffb6a

Change-Id: Ic463949556fbcd0ce7336b532a19ffb0db91297f
0bee0ffb6a6d0d23b676c482b74908a132d25974 14-Feb-2017 Brad Ebinger <breadley@google.com> Cache setDefaultDialer value to fix CTS failures

When CTS tests call setDefaultDialer, they expect the changes to be made
synchronously, because they require these permissions later in the test.
The new DefaultDialerCache didn't update the cache synchronously, instead
it would update the cache when the ContentProvider updated, after a short
delay. This caused CTS tests to be flaky or fail.

I also fixed some of the Telecom Unit Test failures that were occuring.

Test: Run CTS tests.
Bug: 34094508
Change-Id: I6324c84a15c4087ff8acccaf8aae93ea586823d3
rc/com/android/server/telecom/DefaultDialerCache.java
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/DefaultDialerCacheTest.java
ccba720d2496060078a6551ffd1609c2dc7ce95c 10-Feb-2017 Eugene Susla <eugenesusla@google.com> Introduce ANSWER_PHONE_CALLS permission

See I4c33fcea6b95a30469fa6c0c37090be32b0ad52e

Test: Grant the permission and ensure the call gets answered.
Deny the permission, and ensure that the API call throws an exception.
Bug: 30932767
Change-Id: Idc214408e57e15224b1874b08d80b747ebf95f3b
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
f35235a05c4a1dc81e2b396461984ef67ed12283 09-Feb-2017 Hall Liu <hallliu@google.com> Merge "Notify BluetoothRouteManager when Bluetooth turned off" am: b29a6fd37e am: ce193c831a am: 37b5906957
am: 71c4e1e30c

Change-Id: I78fcf4cbf707ee6569eb1bb3c7136b56a6270e77
71c4e1e30c44f464516da37c25c2619fd07b87b3 09-Feb-2017 Hall Liu <hallliu@google.com> Merge "Notify BluetoothRouteManager when Bluetooth turned off" am: b29a6fd37e am: ce193c831a
am: 37b5906957

Change-Id: I5e145490d3b6a8c94dfd96c3982a3f7b4dd6da5d
37b59069573f476b516616e4aefafb4edd8e635d 09-Feb-2017 Hall Liu <hallliu@google.com> Merge "Notify BluetoothRouteManager when Bluetooth turned off" am: b29a6fd37e
am: ce193c831a

Change-Id: I17a039294ab575e0c1f0d692d3b1cd376bf11071
ce193c831ad297d7337caee6a485ce951e95a748 09-Feb-2017 Hall Liu <hallliu@google.com> Merge "Notify BluetoothRouteManager when Bluetooth turned off"
am: b29a6fd37e

Change-Id: I0f0ef9a436b7bcb5d34012862264e58bb13d507a
b29a6fd37e437cc59b5bb6e797ce93f48e2a6711 09-Feb-2017 Hall Liu <hallliu@google.com> Merge "Notify BluetoothRouteManager when Bluetooth turned off"
326e3b54920a842d8fd456f387a5b8786bf5dd1f 08-Feb-2017 Tyler Gunn <tgunn@google.com> When setting camera, ensure calling user is the same as logged in user. am: d8a27d5fc7 am: 05a2ac2df1 am: 90b7645af4
am: 7e14c632e4

Change-Id: I9d8cf60fcecd6609f3a0629df68db4d22e3d65c9
7e14c632e403e6d0a4d4e061a7930248eadc6c4e 08-Feb-2017 Tyler Gunn <tgunn@google.com> When setting camera, ensure calling user is the same as logged in user. am: d8a27d5fc7 am: 05a2ac2df1
am: 90b7645af4

Change-Id: I43936faeba5b56ceba870cf58079ded4d66a24be
90b7645af4b13f24ab923f594d6024e1f8170b25 08-Feb-2017 Tyler Gunn <tgunn@google.com> When setting camera, ensure calling user is the same as logged in user. am: d8a27d5fc7
am: 05a2ac2df1

Change-Id: I944074c727e93e66bf758ed0eea56cc4f8b6c63f
05a2ac2df1ae74ebfb3295ef22f12809361b5520 08-Feb-2017 Tyler Gunn <tgunn@google.com> When setting camera, ensure calling user is the same as logged in user.
am: d8a27d5fc7

Change-Id: I386c68d3875b044621d2e1b40c54311d86dfebbc
8625297e25ebd382f65024b7a33659c2410fd648 08-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Self-managed CS implementation continued." am: 13378b9966 am: 3bc084188e am: f9ce9ef8b7
am: f6bee08284

Change-Id: Iab916c7d79dde1b8549d1b5a2afa50773d2ef9da
f6bee08284e9d716616880e2d0d4efa164c312d5 08-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Self-managed CS implementation continued." am: 13378b9966 am: 3bc084188e
am: f9ce9ef8b7

Change-Id: Ie9ff552b79f35ad5227362a8b1b390055cdfa21a
d8a27d5fc787f8839d3185f2b9137a8c2f1d68a0 01-Dec-2016 Tyler Gunn <tgunn@google.com> When setting camera, ensure calling user is the same as logged in user.

When the VideoProvider API is used to change the camera, in addition to
performing permission checks on the caller, adding logic to ensure that
the calling UserHandle is the currently logged in User (this is to ensure
that a background app can't access the camera).

Test: Unit, manual
Bug: 32747443
Change-Id: I0856f991c520dd1f5fa0146919941c052cba8a01
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CurrentUserProxy.java
rc/com/android/server/telecom/VideoProviderProxy.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
f9ce9ef8b7169a71adc29c846bec5a892b9d34e1 08-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Self-managed CS implementation continued." am: 13378b9966
am: 3bc084188e

Change-Id: If4f66d61ed0d83d46c931906adeef5248b831347
3bc084188e06b03b3239fe126d09fa926db023b0 08-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Self-managed CS implementation continued."
am: 13378b9966

Change-Id: I58c886a134ddb30548c2289d720324e88099ec37
13378b99665c40db0a3f98110097e36a168498c2 08-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Self-managed CS implementation continued."
d4970c192024f327717601e6131e9f3c85b53fed 08-Feb-2017 Hall Liu <hallliu@google.com> Notify BluetoothRouteManager when Bluetooth turned off

When BluetoothDeviceManager gets notified that the
BluetoothHeadsetService has disconnected, notify BluetoothRouteManager
that all devices have disconnected.

Change-Id: Ie7f4e7398602f90e6669c8b58d085f84354844ca
Test: manual, added unit test
Fix: 34547045
rc/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
ests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
d274f26afb6ee54be8adf5da025f7cc055595b01 08-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Perform camera permission and app ops check when setting camera for VT." am: e0a6ed95d8 am: 787eced198 am: 26bae92d68
am: 978c3b8894 -s ours

Change-Id: I6fa248595e4ddc91d3974be82c9f2af4ce8c05a6
978c3b889486d4c465554557100991f1e9963ca8 07-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Perform camera permission and app ops check when setting camera for VT." am: e0a6ed95d8 am: 787eced198
am: 26bae92d68

Change-Id: I22fbb10001d292dee7f25854402679cf71619157
26bae92d68fce39456fed5bb9484a9b0c80224c0 07-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Perform camera permission and app ops check when setting camera for VT." am: e0a6ed95d8
am: 787eced198

Change-Id: I025aa2ecdf9d93a9b27e7d2bd1d781a0e62ed90e
787eced198fb2b438917e205d3048fd969a8cfb5 07-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Perform camera permission and app ops check when setting camera for VT."
am: e0a6ed95d8

Change-Id: I092e5789464652b7f514cc28508143fb2e888dca
e0a6ed95d81c9ec29b8ac7096fc43c62451833f7 07-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Perform camera permission and app ops check when setting camera for VT."
9e806ee181a8422040f51b06effd433c9675a66f 07-Feb-2017 Tyler Gunn <tgunn@google.com> Self-managed CS implementation continued.

As I wrote the CTS tests, I ran into a few cases that needed to be handled
properly.

1. When attempting to register a self-managed CS, if the caller has included
property call provider, sim sub, or connection mgr, we throw a security
exception.
2. Added implementation for the wait-on-handlers telecom command.
3. Prevent logging of self-managed calls.

Test: Manual, CTS
Bug: 34159263
Change-Id: Ia239c4f64411bbdd184a479170d2d9df75667c0f
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomServiceImpl.java
b595c5e3c2bacb6f825c0e7a6158327f98a9cd6d 07-Feb-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 77f7b2c92 to nyc-mr1-dev-plus-aosp am: f7a93647b0
am: d020b7ccd1 -s ours

Change-Id: I5daaa2f4f96055e476293f41eb0623bf983e39d3
d020b7ccd11cf53db66a9e2aae5a861c6a750c39 07-Feb-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 77f7b2c92 to nyc-mr1-dev-plus-aosp
am: f7a93647b0

Change-Id: Iea64b890e376a893862cf43e9c08429b4210776f
f7a93647b0242397143ba1f47f8b5342befa9423 06-Feb-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 77f7b2c92 to nyc-mr1-dev-plus-aosp

Test: Fix merge conflict.
Change-Id: Iea6ad814af2b7d0d7ebfab5ee507064a645cc572
f1dcfdb99763740e9fd1ab036f6c06a312f197ad 09-Nov-2016 Tyler Gunn <tgunn@google.com> Perform camera permission and app ops check when setting camera for VT.

When a calling InCallService attempts to use the setCamera API on the
VideoCall, Telecom will perform a permission check to ensure that the
caller has the correct camera permission and passes the app-ops camera
check. A failure to set the camera will result in a callback via the
call session event API.

This got a little messy as the app ops package name needs to come from the
InCallService, and handler usage in the VideoProvider API means we had to
pass around the uid/pid of the caller, obtained before we trampoline onto
the handler.

Test: Unit tests added, plus manual tests.
Bug: 32747443
Change-Id: Ib96114502fe459b0429a87c5d13640b68ae6a2f7
rc/com/android/server/telecom/VideoProviderProxy.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/MockVideoProvider.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
77f7b2c92e81038e064d107e042842f6c694e159 06-Feb-2017 Tyler Gunn <tgunn@google.com> Self Managed CS implementation.
am: 9517c96076

Change-Id: If8445c692938a16b2d4ef0951c69c3b9792df542
9517c960762f1ac4a3c558ff834fa1ace69f1e39 26-Jan-2017 Tyler Gunn <tgunn@google.com> Self Managed CS implementation.

Implementation for self-managed connection service APIs.

Add ability for self-managed CS to:
- register a phone account and have it be auto-enabled.
- add ability for self-managed calls, ensuring only self-manage calls
can be added.

Add implementations for new isXCallPermitted APIs.
Filter self-managed calls from InCallServices.
Ensure self managed connection creation doesn't use emergency call CS.
Add ability to set audio route from self-managed connection
Overhaul some of the CallsManager getCallsWithState methods to support
other use cases for self-managed calls (also use steams/filters.. Ooo aah)

Test: Manual
Bug: 34159263
Merged-In: I3131fd48ee5c5aa36c0e88992fa51879af07d495
Change-Id: I3131fd48ee5c5aa36c0e88992fa51879af07d495
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/TelecomServiceImpl.java
estapps/AndroidManifest.xml
estapps/res/layout/self_managed_call_list_item.xml
estapps/res/layout/self_managed_sample_main.xml
estapps/res/raw/sample_audio.ogg
estapps/res/raw/sample_audio2.ogg
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/SelfManagedCallList.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallListAdapter.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallingActivity.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnection.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnectionService.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
f0217604497fc0d3bbad8421e22713f2ca834b76 06-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Self Managed CS implementation."
3bf4a138c68c0b4cb32c2e02b0bfdb77365137c0 06-Feb-2017 Tyler Gunn <tgunn@google.com> Fixes for IMS Conferences via the RemoteConnectionService API. am: afb17686fc am: 3af3593e9a am: 0276bb77be
am: 0ecd3e64f7

Change-Id: I70c89749dc051b187947694657428164adf007e7
0ecd3e64f7e6046787d66793d5dbc0a09f83db7a 06-Feb-2017 Tyler Gunn <tgunn@google.com> Fixes for IMS Conferences via the RemoteConnectionService API. am: afb17686fc am: 3af3593e9a
am: 0276bb77be

Change-Id: Ia84e450dfd59fcf327b8ff88d30150cc868d6b28
0276bb77be3f44f7e5341f0b744d7def9baaeeb8 06-Feb-2017 Tyler Gunn <tgunn@google.com> Fixes for IMS Conferences via the RemoteConnectionService API. am: afb17686fc
am: 3af3593e9a

Change-Id: I189b1459189f423035b82f2aaf674a6072080d99
3af3593e9a66032eb1213a1b013f6b4e31083de2 06-Feb-2017 Tyler Gunn <tgunn@google.com> Fixes for IMS Conferences via the RemoteConnectionService API.
am: afb17686fc

Change-Id: Id841af63a523dd099144a49cae73ec52e9358498
afb17686fc097aae2e12d17bd8404aa43956b51e 18-Oct-2016 Tyler Gunn <tgunn@google.com> Fixes for IMS Conferences via the RemoteConnectionService API.

IMS Conferences are problematic to Telecom when a connection manager is
used. Both addExistingConnection and addConference will result in the
addition of duplicate conference participants and conferences to Telecom.
This is because Telecom does not have a means of de-duping the two, which
have new IDs created for them when they're added via a ConnectionService.

To fix this, added a workaround which packages the original existing
connection or conference id into the connection/conference extras which
are sent to the connection manager. This way, the connection mgr can use
the same connection/conference ID was was used by the original
ConnectionService, and also perform some de-duping.

Its not optimal, and this should be fixed better in the future.

Bug: 31464792
Change-Id: I7b63f145c741c29e1735f50a473585f26ef70fc7
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/ServiceBinder.java
a90ba73e6ca2e7e3ef88e41477bf595e03f9359f 26-Jan-2017 Tyler Gunn <tgunn@google.com> Self Managed CS implementation.

Implementation for self-managed connection service APIs.

Add ability for self-managed CS to:
- register a phone account and have it be auto-enabled.
- add ability for self-managed calls, ensuring only self-manage calls
can be added.

Add implementations for new isXCallPermitted APIs.
Filter self-managed calls from InCallServices.
Ensure self managed connection creation doesn't use emergency call CS.
Add ability to set audio route from self-managed connection
Overhaul some of the CallsManager getCallsWithState methods to support
other use cases for self-managed calls (also use steams/filters.. Ooo aah)

Test: Manual
Bug: 34159263
Change-Id: I3131fd48ee5c5aa36c0e88992fa51879af07d495
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/TelecomServiceImpl.java
estapps/AndroidManifest.xml
estapps/res/layout/self_managed_call_list_item.xml
estapps/res/layout/self_managed_sample_main.xml
estapps/res/raw/sample_audio.ogg
estapps/res/raw/sample_audio2.ogg
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/SelfManagedCallList.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallListAdapter.java
estapps/src/com/android/server/telecom/testapps/SelfManagedCallingActivity.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnection.java
estapps/src/com/android/server/telecom/testapps/SelfManagedConnectionService.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
468183e0352373ddc34aaec04dbb6b15735456a9 03-Feb-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: ebe66178c4 -s ours
am: 9954e6fe4f -s ours

Change-Id: Ib43b6b84f81eb4a62230c8bdcb4e49e2d46552f3
9954e6fe4f9a9ea8e80609b4805fc2e2c63ddd9c 03-Feb-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: ebe66178c4 -s ours

Change-Id: I47216649789090a91a588a5130c64b4b4c231f65
ebe66178c440717a1dbb598d332c3d6066c389de 03-Feb-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I582a3b7d42f633008ebf51337303580fd58a0663
Auto-generated-cl: translation import
es/values-bs-rBA/strings.xml
es/values-eu-rES/strings.xml
es/values-hi/strings.xml
es/values-hy-rAM/strings.xml
es/values-it/strings.xml
es/values-km-rKH/strings.xml
es/values-ne-rNP/strings.xml
es/values-pa-rIN/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
ccf69197513054e49226931afa4d20db750648b6 31-Jan-2017 Hall Liu <hallliu@google.com> Merge "Refresh default dialer cache on boot complete" am: 0dbb6ee05f am: a947682554 am: d8ec8628af
am: 90935f71ca

Change-Id: If733feafb746a3745a66e245d6967e0b910c6e84
90935f71cab5dfa56c81c0ac8b5daa6a0879a7c7 31-Jan-2017 Hall Liu <hallliu@google.com> Merge "Refresh default dialer cache on boot complete" am: 0dbb6ee05f am: a947682554
am: d8ec8628af

Change-Id: I80a2529fb081baa4978efe6bf9d069908e1d8143
d8ec8628af351fecfbc2d665f45f335e7df20d00 31-Jan-2017 Hall Liu <hallliu@google.com> Merge "Refresh default dialer cache on boot complete" am: 0dbb6ee05f
am: a947682554

Change-Id: I189b179d4224b2b624db1a7a78058f9d1fc26b3f
a94768255463b6e86c31cb2b09bbd90ae91d84b5 31-Jan-2017 Hall Liu <hallliu@google.com> Merge "Refresh default dialer cache on boot complete"
am: 0dbb6ee05f

Change-Id: Ie3cc651ac9d634fd7a2541322cdec86c28b5b85d
0dbb6ee05f7cf194a0a25e13441b029907fc9451 31-Jan-2017 Hall Liu <hallliu@google.com> Merge "Refresh default dialer cache on boot complete"
66dc44d34a109f5f0537d395cbc02f37ffacc7d9 28-Jan-2017 Hall Liu <hallliu@google.com> Refresh default dialer cache on boot complete

The package manager might not be quite ready when we check it for the
first time, so refresh the cache again in case the default dialer that
was set by the user doesn't show up while Telecom is initializing

Test: manual
Change-Id: Iba3fe39e35f942772548a1976688504f30c7eed8
rc/com/android/server/telecom/DefaultDialerCache.java
e125c92d695c73c5255dc34ec7ab36cb61b745e3 27-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix potential NPE from 326226" am: d9a5fa50bd am: e5ef92a107 am: d8223ed954
am: cd4cb5b665

Change-Id: Ia240034c791cfdf911a45e88e1c33516c975124c
cd4cb5b665b42c6f450799132f7fadd1f4a12ff5 27-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix potential NPE from 326226" am: d9a5fa50bd am: e5ef92a107
am: d8223ed954

Change-Id: Id4b7ebd58d4d616afa08601ca79dfa2e4e53e219
d8223ed95499fe35994d76146a5cf6841ac71b3b 27-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix potential NPE from 326226" am: d9a5fa50bd
am: e5ef92a107

Change-Id: I00ab2347b438dba009bfd597526a27e09bfc72a6
e5ef92a107f646e297d4dca33bd2a1fde873d0aa 27-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix potential NPE from 326226"
am: d9a5fa50bd

Change-Id: I9be0cbcf8dcf5a8a9f31e8a59d191610864ae103
d9a5fa50bd06780d118a497a5418f4a327e79da1 27-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix potential NPE from 326226"
8dabcb7e95cd1eb182b9226544f09cf823c6addc 27-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Get carrier config value by subId" am: 36bbab16d4 am: ab29eb9fd5 am: d7681b33f6
am: 71d745a8be

Change-Id: Ibb37ecc7ba9e2dfdfa487f5ced7619d76231d696
71d745a8be02bb61619d5445669c35b86b7d4e66 27-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Get carrier config value by subId" am: 36bbab16d4 am: ab29eb9fd5
am: d7681b33f6

Change-Id: I29cd9d7b8535c51755a3fc6e54261df77979abf1
d7681b33f6be862df0e34fc827da667564b1ee8e 27-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Get carrier config value by subId" am: 36bbab16d4
am: ab29eb9fd5

Change-Id: I73fac0b3122886cc477c3d4e2bcfc86f464f4748
ab29eb9fd58f8e689623d0e2cc0c9b50bc144232 27-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Get carrier config value by subId"
am: 36bbab16d4

Change-Id: I3f9ef4d3c76932c29ab44a4c76859e8cb80787f2
36bbab16d4cd6c70093badd2333da892106b6dd8 27-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Get carrier config value by subId"
15844b7446cef52f07c2aa960a47d30cae0d05cf 26-Jan-2017 Hall Liu <hallliu@google.com> Fix default phone account handle deserialization am: ded880cfb3 am: a92dd2a373 am: c9cf7c8f5d
am: 2e70d746bd

Change-Id: I73ae7284afc1f8228538c018de55bc79927b02bc
2e70d746bdd969075574bbf561e9d9109f23eeed 26-Jan-2017 Hall Liu <hallliu@google.com> Fix default phone account handle deserialization am: ded880cfb3 am: a92dd2a373
am: c9cf7c8f5d

Change-Id: Ib282a754c10cbd28d9f9c36bdcc328ccb285f218
c9cf7c8f5d3650147d3f78172498180e49667124 26-Jan-2017 Hall Liu <hallliu@google.com> Fix default phone account handle deserialization am: ded880cfb3
am: a92dd2a373

Change-Id: I3222f45ac00ad8372deb19167644e6f81fd5d4e6
518a7dd41c829677ae4575939cba9815b984db7d 26-Jan-2017 Hall Liu <hallliu@google.com> Fix potential NPE from 326226

Remove the .toString() so that null accounthandle doesn't throw an
exception

Change-Id: I594ee209207b4090b5ce3a6616bbbdb9da3c31fa
Test: none necessary
rc/com/android/server/telecom/PhoneAccountRegistrar.java
a92dd2a373bc3588b967ec6e8eaf9d3dcc5ce542 26-Jan-2017 Hall Liu <hallliu@google.com> Fix default phone account handle deserialization
am: ded880cfb3

Change-Id: Ic00eb9043b1223f994b4b2b02268e47643f08b09
e698f3199f9ec3d43060380c7c9f5952d9f9b84a 26-Jan-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I7eb76a0ef99b263f8c6bdd3413233cc0703c251b
Auto-generated-cl: translation import
es/values-it/strings.xml
ded880cfb3f6bc2e49465b3d2d5f9fa639b045f5 21-Jan-2017 Hall Liu <hallliu@google.com> Fix default phone account handle deserialization

If group id is empty in a default phone account handle, the deserializer
will return null, which means that the user's choice of default outgoing
phone account is not preserved when rebooting. This fixes the
deserialization so that the default phone account handle is initialized
with a empty group id as written instead of not being read from disk at
all.

Change-Id: I7de7b37c22ab4eae8696c7896740adeb35c69f20
Fix: 33538428
Test: manual + added unit test
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
7d5f10bb3883d73d8958c09ad22c0896c5150909 20-Jan-2017 Paul Duffin <paulduffin@google.com> Prepare for removal of legacy-test from default targets am: 99eceb05e7 am: 6ae20b7326 am: 6cc3c24f17
am: dfa9b926d9

Change-Id: I42297307c68dfb51aa69f8edd5c11f370b663d52
dfa9b926d90c5f49232993a154d4a82c9ad1661e 20-Jan-2017 Paul Duffin <paulduffin@google.com> Prepare for removal of legacy-test from default targets am: 99eceb05e7 am: 6ae20b7326
am: 6cc3c24f17

Change-Id: I1f9a4534b9c942e8ee7035906832fbb6d4309adc
6cc3c24f1755d4152a119647a287afdabbb220b9 20-Jan-2017 Paul Duffin <paulduffin@google.com> Prepare for removal of legacy-test from default targets am: 99eceb05e7
am: 6ae20b7326

Change-Id: I5bbbc119fd787f959b47b9f3ad63c607c030b0fb
6ae20b7326bafa1158eeefdc1583a130be3fba51 20-Jan-2017 Paul Duffin <paulduffin@google.com> Prepare for removal of legacy-test from default targets
am: 99eceb05e7

Change-Id: I5c997f66e52be1199e48469b5f16e0ba44c412bc
99eceb05e7ecc7badd667b4a3e23de6a660dfdda 17-Jan-2017 Paul Duffin <paulduffin@google.com> Prepare for removal of legacy-test from default targets

In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Change-Id: Ibff876026420ae1de86897d928247895a182b50c
ests/Android.mk
3bc7076f8dd0d01951031669c89ccec61dc98577 18-Jan-2017 Christopher Tate <ctate@google.com> Make sure registration broadcasts go to manifest receivers

Bug 30953212

Change-Id: I89c58b277a135cacb0543d4fd4a7d248949d6cbf
rc/com/android/server/telecom/TelecomServiceImpl.java
96e726920f5080c94e867bd2702c5bbdc85a6fd3 19-Jan-2017 Tyler Gunn <tgunn@google.com> Merge "Add self-managed connection service API." am: 9f07a4ece2 am: b48c611c36 am: 8e118cc092
am: 1dda0ee0d7

Change-Id: Ic1188106c7fef22db58a244094766510a646a644
1dda0ee0d764c55781079bd4562d54418d2278f3 19-Jan-2017 Tyler Gunn <tgunn@google.com> Merge "Add self-managed connection service API." am: 9f07a4ece2 am: b48c611c36
am: 8e118cc092

Change-Id: I5883ac7d3368c400550ddfd76f813895f4d8007b
8e118cc092d6aabe55058e7bad661eaeaa1dd747 19-Jan-2017 Tyler Gunn <tgunn@google.com> Merge "Add self-managed connection service API." am: 9f07a4ece2
am: b48c611c36

Change-Id: Icf49d1e7f744be9854e024c4d1770af30b055325
b48c611c36a849fb115d3a44e94231ad17b27367 19-Jan-2017 Tyler Gunn <tgunn@google.com> Merge "Add self-managed connection service API."
am: 9f07a4ece2

Change-Id: I997fb384a6fffc8770a5376958ee66e985f89ab4
9f07a4ece25e94c505c038ff85215294c013dd19 19-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add self-managed connection service API."
90b0fb6268a587f28fc5bfa8b4add587ac7f3579 19-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix NPE in MissedCallNotifierImpl" am: 6fc722d72a am: 447332728c am: 5363af3512
am: 66b2203add

Change-Id: Ia093d94fdeb7b7068391d082b28781a29cb0f6a0
66b2203addadae763fd23e39ed04aa66e4a61866 19-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix NPE in MissedCallNotifierImpl" am: 6fc722d72a am: 447332728c
am: 5363af3512

Change-Id: I859608408e44f79a9e726a6d39e83bd34a8e60e7
5363af35123366a858e3975276c0f482b782772f 19-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix NPE in MissedCallNotifierImpl" am: 6fc722d72a
am: 447332728c

Change-Id: I236d091c04e3ca82a6b24fae3d37092ef118e41f
447332728cf2ce2fb90cdf56afefbaadc87e6326 19-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix NPE in MissedCallNotifierImpl"
am: 6fc722d72a

Change-Id: I903ffecb6d5000598ea5fcc2e0b06d09474e99b9
6fc722d72a000793e33a57db660e3116c6defd97 19-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix NPE in MissedCallNotifierImpl"
270f1237e4d3fff509e514225627517832699f58 19-Jan-2017 Hall Liu <hallliu@google.com> Fix NPE in MissedCallNotifierImpl

Check to see if the caller info is null before trying to access its
contact display photo URI

Change-Id: I9461797074a6815b662bd7796fc3a4a6cbc558da
Fix: 34396500
Test: manual
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
52700bd5e21cfe2fddd3890cfb3b15305665d8f7 19-Jan-2017 Chris Tate <ctate@android.com> Revert "Make sure registration broadcasts go to manifest receivers"

This reverts commit 60f51bdf85a747f76f863336359902c334cec272.

Change-Id: I58f1fb8abb027e1781f5a80ba4551c40e57a3089
rc/com/android/server/telecom/TelecomServiceImpl.java
2d752f41cbb3e535530b7a7ada6f09e8e5220380 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp am: bb52d0b3e4
am: 9b17807edc -s ours

Change-Id: I6c1235b1cb9d988288994fa4ee34e44f7f9ddb44
dc8e72ef5f884a305547e1e13acd72ff47a5f96f 18-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Make sure registration broadcasts go to manifest receivers"
e9a6de855ae9a08581de7ee1056695a17e7392c3 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am: 8449ca41a0
am: 392e052cd8 -s ours

Change-Id: I4a772ad00eb0ee6640ab05d96c18ed80c50ba3f3
acb3bc8474e7cdb9c6ef4f0b23c227f6ed55d356 09-Jan-2017 Tyler Gunn <tgunn@google.com> Add self-managed connection service API.

Beginning of required changes to support self-managed CS.
1. Ensure self-managed connections have PROPERTY_SELF_MANAGED set.
2. Plumb through setAudioRoute API from connection.
3. Ensure self-managed phone accounts are auto-enabled.
4. Stub out new TelecomManager APIs.

Test: Manual; cts and unit tests will come in future CLs.
Bug: 34159263
Change-Id: I8352b2e2e3f9424ac1b612280c1b0cdca006afdb
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
9b17807edc7b986f69f9ebac95dfaa751159caf0 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
am: bb52d0b3e4

Change-Id: I33524ceaa4223833543764b7e65aae74bc3ac17a
392e052cd88617b50b82eced6d5c3651e4a0029c 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am: 8449ca41a0

Change-Id: I32e0144d7a0d6bcb1f346516cd799083d602faf5
0db1bed8dbd759bb90542215918650c5080e8e3d 18-Jan-2017 Hall Liu <hallliu@google.com> Don't acquire audio focus if no ringtone will play am: a4ae7509ef am: 4408fc1df3 am: c02437ee86
am: 1bde2c113a

Change-Id: I7d81713cf29d1475301b3db5eebcfbb6fdf1805a
bb52d0b3e430eb14dc245c15550bf837a5f6ffb0 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
6c2cdf0735953440557550884982d0082e1c6c76 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Update package names to work with the proto3 compiler am: 318e0507b4
am: dd203e6c05

Change-Id: Id70b639c94f6a5339fb436f9826d07f38fcf5a58
60f51bdf85a747f76f863336359902c334cec272 18-Jan-2017 Christopher Tate <ctate@google.com> Make sure registration broadcasts go to manifest receivers

Bug 30953212

Change-Id: Iaea8b59d8542018ea736efa27cf03d1091a34f9d
rc/com/android/server/telecom/TelecomServiceImpl.java
8449ca41a012b4a659c8aef1d8dd41a6790adf27 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

This reverts commit 318e0507b41d4ba2985ca058b8b7f6c98e0b8be9.

Change-Id: I43770c4786a2e9a2146646536aeeba3d1e20a23c
rc/com/android/server/telecom/Analytics.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
1bde2c113a77b55ad87ab2c2e1aff28ac3f3bf2b 18-Jan-2017 Hall Liu <hallliu@google.com> Don't acquire audio focus if no ringtone will play am: a4ae7509ef am: 4408fc1df3
am: c02437ee86

Change-Id: I4bfed510c0778cb8e59d5a7c54d5c41179a5eb7b
c02437ee86444216d7a539eef9c4c319589a6343 18-Jan-2017 Hall Liu <hallliu@google.com> Don't acquire audio focus if no ringtone will play am: a4ae7509ef
am: 4408fc1df3

Change-Id: Iec7b2d1100f4d9500e5b8132ecf846009da55e9a
4408fc1df3e482e1b6fb3d89d5b4652f7236d681 18-Jan-2017 Hall Liu <hallliu@google.com> Don't acquire audio focus if no ringtone will play
am: a4ae7509ef

Change-Id: I4151ea28bac89d250770af97f366fae0c9005007
dd203e6c05ed58ae7fa42e45e701a73cde6adf3c 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Update package names to work with the proto3 compiler
am: 318e0507b4

Change-Id: Icd694a0c89ceba10685a17737ef541d5fae9ba1f
c9724688cf21f10ca9118f21524f70618e3e4f1e 12-Jul-2016 Honggang <honggang.x.luo@sonymobile.com> Get carrier config value by subId

It uses api "getConfig@CarrierConfigManager" to check whether the
emergency call is allowed in call log or not. But this api just
returns the carrier config of default sub. So the carrier config
may be incorrect if the sub is not the default sub on DS device.

Use "getConfigForSubId@CarrierConfigManager" for different sub.

Test: manual - make an emergency call and check the call log
Bug: 34336505

Change-Id: I1d869ea3e567a51dc766173d9bb7c7391de092ed
rc/com/android/server/telecom/CallLogManager.java
e662ea59e6bd677074b4b799b21934ebf222b245 13-Jan-2017 Tyler Gunn <tgunn@google.com> Merge "Enhance logging for vibration during ringing." into nyc-mr2-dev-plus-aosp
am: e0131f0cf4 -s ours

Change-Id: I290e4df26505c67bb9022cd8bed047bf9b89d4c6
89841e9b64ced8daee25153c4cdff314ce95feb7 13-Jan-2017 Tyler Gunn <tgunn@google.com> Enhance logging for vibration during ringing.
am: 68d2f86e06 -s ours

Change-Id: I9b7d9da84bdb4e4fb2a1fd19eb37aa67c646cba6
e0131f0cf4e5f7f74a07f766974188ac12323f87 13-Jan-2017 Tyler Gunn <tgunn@google.com> Merge "Enhance logging for vibration during ringing." into nyc-mr2-dev-plus-aosp
e1cdacdab868925cf42214ac70c7c814f25efb66 13-Jan-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Strip separators while sending CLCC response" into nyc-mr2-dev am: 08a1123574
am: 9fe6644549

Change-Id: I175669944eb5a6bc6c2b9825bd7fb333c222e09d
07bbf73f5f167889149fb644d641f70c89624afc 13-Jan-2017 Satish Kodishala <skodisha@codeaurora.org> Strip separators while sending CLCC response am: b1c219725e
am: a70bfa2ccc

Change-Id: I34c5e9c30903d1c84b6e96cfb48d2362433f9bda
9fe66445496befc4397b574647a7532b889c9ea1 13-Jan-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Strip separators while sending CLCC response" into nyc-mr2-dev
am: 08a1123574

Change-Id: Idd3bcaee3175e94e812d5e43f6ebbd3cb57a8a7e
a70bfa2ccc4d0b6b7cba35e1de03069422ef453d 13-Jan-2017 Satish Kodishala <skodisha@codeaurora.org> Strip separators while sending CLCC response
am: b1c219725e

Change-Id: Id71d50bbc12159c3bb1f70ea7933ca4f7095a522
a4ae7509ef40502b7ad5f63c882a616dbcc4625a 13-Jan-2017 Hall Liu <hallliu@google.com> Don't acquire audio focus if no ringtone will play

When the system default ringtone is set to "None", don't acquire audio
focus so as to not interrupt music.

Change-Id: I758df49c954281c91fdeb4f6952b9ccebd0fe1ff
Fix: 33449128
Test: manual testing
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/RingtoneFactory.java
08a11235747d414cd196e7a2f8bffa0d73b41964 13-Jan-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Strip separators while sending CLCC response" into nyc-mr2-dev
be9d0679cda3b3cc3d7fa7a6212da0824284680a 13-Jan-2017 Tyler Gunn <tgunn@google.com> Merge "Fix issue where the dnd mode remains on after a call terminates." into nyc-mr2-dev am: cf281db9db
am: bf87cb1e24

Change-Id: I80e68be3997735fd531bf6a801062407a3d4670c
cb71a58ce78e9491d0f92f3947d6bb23b5f93abe 13-Jan-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 49056668f to nyc-mr2-dev-plus-aosp
am: f68cfd92ba

Change-Id: Icc740f605e4fdbd1f292e707e782230da178a2be
bf87cb1e24a9afc0410ab17bbff1adf79f9d9364 13-Jan-2017 Tyler Gunn <tgunn@google.com> Merge "Fix issue where the dnd mode remains on after a call terminates." into nyc-mr2-dev
am: cf281db9db

Change-Id: I23f317a29207c7aefe02c4e3fa60fa21d0825d4d
f68cfd92bafb49f848f36c92ba9c8b65390e4620 13-Jan-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 49056668f to nyc-mr2-dev-plus-aosp

Merged-In: I42b78fd27fe9814c4f8e29afc8937c3b41f51e50
Test: Build
Change-Id: I9132a85010117f1742778bcccb2d2ccde7b0785e
cf281db9db6ebf7c2db4019f2f045e0368fe8d5c 13-Jan-2017 Tyler Gunn <tgunn@google.com> Merge "Fix issue where the dnd mode remains on after a call terminates." into nyc-mr2-dev
68d2f86e06ab356c675ba05af6ecddc4059ada6e 11-Jan-2017 Tyler Gunn <tgunn@google.com> Enhance logging for vibration during ringing.

Adding call events for vibration which occurs during ringing. When
vibration is suppressed, logging reason for skipping vibration. This
will help diagnose issues where the phone does not vibrate when ringing.

Test: manual test
Merged-In: I58713b270decb207d50b058131723bebfd8c4c59
Bug: 33376887
Change-Id: I58713b270decb207d50b058131723bebfd8c4c59
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/Ringer.java
b5c62d3c960ba87402111bc3a2eba00b7093f622 13-Jan-2017 Tyler Gunn <tgunn@google.com> Enhance logging for vibration during ringing. am: fb8f300a86 -s ours
am: 84a50e41cf -s ours

Change-Id: I5ec6de8fed5c10588ba7010885bff5951c1c02d2
84a50e41cfaa44e98abb886d65db317da868bfa2 13-Jan-2017 Tyler Gunn <tgunn@google.com> Enhance logging for vibration during ringing.
am: fb8f300a86 -s ours

Change-Id: I22980b90b5370bc02f02027e7ff94dd8ca069c23
4270de54bbe7e38f506231c9f572973c4130ca00 13-Jan-2017 Tyler Gunn <tgunn@google.com> Merge "Fix issue where the dnd mode remains on after a call terminates."
71bf5445a66084af2f9856605de4b7a127263a13 13-Jan-2017 Tyler Gunn <tgunn@google.com> Merge "Enhance logging for vibration during ringing."
ae51d3c8411b7c2e59113992ec65093a80f17495 11-Jan-2017 Tyler Gunn <tgunn@google.com> Fix issue where the dnd mode remains on after a call terminates.

There is a potential race condition when handling the
ACTION_INTERRUPTION_FILTER_CHANGED broadcast. Since we're setting the
interruption mode ourselves, we also get this broadcast. Most of the time
the broadcast is processed first and everything works. However, it looks
like there are cases where the broadcast receiver processes AFTER we have
updated mAreNotificationSuppressed to true. Thus, when we try to turn
off DND later on we assume that the user had initiated the request to turn
off DND and don't bother to do so.

The fix is to check who initiated the manual DND rule. If its telecom,
we can ignore the broadcast.

Test: Manual
Bug: 33340277
Change-Id: I42b78fd27fe9814c4f8e29afc8937c3b41f51e50
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/InterruptionFilterProxy.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
fb8f300a86373486fe77d13aa417f73beb05fb7a 11-Jan-2017 Tyler Gunn <tgunn@google.com> Enhance logging for vibration during ringing.

Adding call events for vibration which occurs during ringing. When
vibration is suppressed, logging reason for skipping vibration. This
will help diagnose issues where the phone does not vibrate when ringing.

Merged-In: I58713b270decb207d50b058131723bebfd8c4c59
Bug: 33376887
Change-Id: I58713b270decb207d50b058131723bebfd8c4c59
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/Ringer.java
72f0522569319d362f2fe05f46f4e32ab121b8b3 11-Jan-2017 Tyler Gunn <tgunn@google.com> Enhance logging for vibration during ringing.

Adding call events for vibration which occurs during ringing. When
vibration is suppressed, logging reason for skipping vibration. This
will help diagnose issues where the phone does not vibrate when ringing.

Test: manual test
Bug: 33376887
Change-Id: I58713b270decb207d50b058131723bebfd8c4c59
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/Ringer.java
b1c219725e29b7dd67b3b0bd705a409e5cb1e41d 17-Nov-2016 Satish Kodishala <skodisha@codeaurora.org> Strip separators while sending CLCC response

Usecase:
1. Pair and connect with Plantronics Voyager Legend headset.
2. Make MO call to a contact with "(" or ")" in the name.
3. End the call.
4. Redial from headset.

Failure:
Headset sends ATD with number it got as part of CLCC response
for first call. Since number contains "(" and ")" characters,
error is returned from BT stack to the headset.

Rootcause:
During the first call, headset sends AT+CLCC. We send number returned
by Telephony as is which have "(" and ")" to headset in CLCC response.
Headset uses ATD with this number for redial. We return error from stack
when we see "(" or ")" so redial fails.

Fix:
Remove special characters like "(", ")", "-", " " from phone number
before sending it in CLCC response. Issue is see with Plantronics
Voyager Legend, Plantronics backbeat pro headsets.

Bug:33000152
Change-Id: I589b64ebd56892dec33abe430cdf6d2eacdc9b99
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
49056668fa783371610d5d5295a5049dc5cba2db 11-Jan-2017 Tyler Gunn <tgunn@google.com> Fix issue where the dnd mode remains on after a call terminates.

There is a potential race condition when handling the
ACTION_INTERRUPTION_FILTER_CHANGED broadcast. Since we're setting the
interruption mode ourselves, we also get this broadcast. Most of the time
the broadcast is processed first and everything works. However, it looks
like there are cases where the broadcast receiver processes AFTER we have
updated mAreNotificationSuppressed to true. Thus, when we try to turn
off DND later on we assume that the user had initiated the request to turn
off DND and don't bother to do so.

The fix is to check who initiated the manual DND rule. If its telecom,
we can ignore the broadcast.

Bug: 33340277
Change-Id: I42b78fd27fe9814c4f8e29afc8937c3b41f51e50
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/InterruptionFilterProxy.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
4836990ac022ee0ef55eaa803a93e8d1cf770d29 11-Jan-2017 Roozbeh Pournader <roozbeh@google.com> Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: I4e39aae2d25b97c2e970fd6522a203187be9bdea
es/values-az-rAZ/strings.xml
es/values-az/strings.xml
es/values-be-rBY/strings.xml
es/values-be/strings.xml
es/values-bn-rBD/strings.xml
es/values-bn/strings.xml
es/values-bs-rBA/strings.xml
es/values-bs/strings.xml
es/values-et-rEE/strings.xml
es/values-et/strings.xml
es/values-eu-rES/strings.xml
es/values-eu/strings.xml
es/values-gl-rES/strings.xml
es/values-gl/strings.xml
es/values-gu-rIN/strings.xml
es/values-gu/strings.xml
es/values-hy-rAM/strings.xml
es/values-hy/strings.xml
es/values-is-rIS/strings.xml
es/values-is/strings.xml
es/values-ka-rGE/strings.xml
es/values-ka/strings.xml
es/values-kk-rKZ/strings.xml
es/values-kk/strings.xml
es/values-km-rKH/strings.xml
es/values-km/strings.xml
es/values-kn-rIN/strings.xml
es/values-kn/strings.xml
es/values-ky-rKG/strings.xml
es/values-ky/strings.xml
es/values-lo-rLA/strings.xml
es/values-lo/strings.xml
es/values-mk-rMK/strings.xml
es/values-mk/strings.xml
es/values-ml-rIN/strings.xml
es/values-ml/strings.xml
es/values-mn-rMN/strings.xml
es/values-mn/strings.xml
es/values-mr-rIN/strings.xml
es/values-mr/strings.xml
es/values-ms-rMY/strings.xml
es/values-ms/strings.xml
es/values-my-rMM/strings.xml
es/values-my/strings.xml
es/values-ne-rNP/strings.xml
es/values-ne/strings.xml
es/values-pa-rIN/strings.xml
es/values-pa/strings.xml
es/values-si-rLK/strings.xml
es/values-si/strings.xml
es/values-sq-rAL/strings.xml
es/values-sq/strings.xml
es/values-ta-rIN/strings.xml
es/values-ta/strings.xml
es/values-te-rIN/strings.xml
es/values-te/strings.xml
es/values-ur-rPK/strings.xml
es/values-ur/strings.xml
es/values-uz-rUZ/strings.xml
es/values-uz/strings.xml
66f26d1745238d6c29b3e0b18fb80cdd57b84676 19-Dec-2016 mike dooley <mdooley@google.com> Add last emergency call time to ConnectionRequest and Call

This can be used to determine if a call is a potential emergency callback.
This cl also renames the EmergencyLocationHelper class to EmergencyCallHelper
since its not just used for location anymore.

This change greatly simplifies the emergency callback handling in the DialerConnectionService
since it will not be able to directly listen for emergency call broadcasts in O.

This cl is dependent on ag/30952524

Bug: 30952524
Test: Added unit test to BasicCallTests and manual testing with real device
Change-Id: I43513c56b92f978f0a70be878a9430aec74ea77f
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/EmergencyCallHelper.java
rc/com/android/server/telecom/EmergencyLocationHelper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/TelecomSystem.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
892391b2a0c2973536251aae5683370990a307b4 09-Jan-2017 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I0774037c74e25bc7b19fcd4aa7d7f62bf1d270f7
Auto-generated-cl: translation import
es/values-eu-rES/strings.xml
318e0507b41d4ba2985ca058b8b7f6c98e0b8be9 22-Sep-2016 Tamas Berghammer <tberghammer@google.com> Update package names to work with the proto3 compiler

Bug: b/28974522
Change-Id: I2bcb72e0c4688bdc8c690c05ed05f9ff7a649d13
(cherry picked from commit 83e882836bea5ae11f21dd619dd9ae3a2e0c12e3)
rc/com/android/server/telecom/Analytics.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
8a4bc655a0aac124250028e8eb6f557ff13c87d5 07-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics am: 492c8180d5 am: 32782c9be2
am: 635437f034

Change-Id: I714fbc4ba95b07fbcf9bbe696dfa902181cba568
d67f71d00ee7876e8eb2b2cac3ddb7f341e589f1 07-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics am: 492c8180d5 am: 3c80500208
am: ba32c06ec0

Change-Id: Ib3f565acdce63b3b9a972cac867addd614ca9b99
635437f034006bc23671429b5da22e7cc40cdeb2 07-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics am: 492c8180d5
am: 32782c9be2

Change-Id: I6e94cb0f4f2ceca66f36d71df0508699f9330aed
ba32c06ec0a059ded386b027490a1457227696fa 07-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics am: 492c8180d5
am: 3c80500208

Change-Id: I8a7fae294d83b3c8f93efae631bdd86b51ce0989
3c80500208fb14f121720120e5ec8f3b7572fb19 07-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics
am: 492c8180d5

Change-Id: Ifb1fdbdc3bfbc4ecc7b4a61ed320eaa2931970c2
32782c9be25c5c29e85f9dda87aa36d2b03fd738 07-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics
am: 492c8180d5

Change-Id: I7338294511825abe3e92ff4ea6472cac483b9df5
492c8180d52d03c96926d8e41ca0a746a6ac2770 06-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics

Cap the number of calls stored in analytics in order to avoid chewing up
excessive memory on devices that are used to make >100 calls per day.

Test: unit test added + manual testing
Bug: 33965537
Change-Id: Ibb5508b4e79f5dde03caa44abe1da02116ae81fc
rc/com/android/server/telecom/Analytics.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
79ae87aae960d9a7a416caeac2bf6cc91c02c752 06-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix issue that music popped up from speaker during ringing call" am: de6924cdbc am: e17943ed4b am: bb40326872
am: dab3192b7d

Change-Id: I052806a1bce7f56cf0df076b7e13fa2f7e11d8da
ec89a665f43a6764bd170d0cf65bafd6ed5bb00e 06-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics am: d93b9ececc am: 27a76bca29 am: 2fbb880aff
am: 09bc48df10

Change-Id: I63b804e4b49ce01afc457d02982857786ac9aa03
dab3192b7d4407f4279d89470d38b7d1c60119e8 06-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix issue that music popped up from speaker during ringing call" am: de6924cdbc am: e17943ed4b
am: bb40326872

Change-Id: I57b823530d26d2463838a8680c1419f8f04ce531
09bc48df10f82157c90b8b7a4953869ca5464144 06-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics am: d93b9ececc am: 27a76bca29
am: 2fbb880aff

Change-Id: I27b66f2a44bb95facbabb7a261b260f080a42f17
bb40326872fa978a1eb0adf082a68aadd6da219b 06-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix issue that music popped up from speaker during ringing call" am: de6924cdbc
am: e17943ed4b

Change-Id: Ie00c034a0c25920385511e93b2999e48173b1ad3
2fbb880affca37978de00e878aed90b05a9e896d 06-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics am: d93b9ececc
am: 27a76bca29

Change-Id: I1b1ee393475c4c0b814360db6d366e1eece41906
e17943ed4b887ccf739b19f216f88cf83bf95544 06-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix issue that music popped up from speaker during ringing call"
am: de6924cdbc

Change-Id: Ifc0d97ef6a65e8f3a3a6713848d116e68697b92e
27a76bca29f5a8d8ac0df2297e577bcb05dd05c2 06-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics
am: d93b9ececc

Change-Id: Ia69cd319f2cb1e04ab625f2f126f2cb971fdf1af
de6924cdbced0d6f5d423ca78c9a0a46c8347da3 06-Jan-2017 Hall Liu <hallliu@google.com> Merge "Fix issue that music popped up from speaker during ringing call"
d93b9ececca0fb8a2cc63858ce59012eb6fc17e9 06-Jan-2017 Hall Liu <hallliu@google.com> Add cap on number of calls stored in analytics

Cap the number of calls stored in analytics in order to avoid chewing up
excessive memory on devices that are used to make >100 calls per day.

Test: unit test added + manual testing
Bug: 33965537
Change-Id: Ibb5508b4e79f5dde03caa44abe1da02116ae81fc
rc/com/android/server/telecom/Analytics.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
14e947bd6aacd8b7abd438a66a76841a33cb5cf7 05-Jan-2017 Hall Liu <hallliu@google.com> Replace BluetoothManager (multi-hfp part 3) am: 486cb197d4 am: d1b47792e1 am: ac935c47e1
am: b794cfc1f6

Change-Id: Ic9f9110f752a9ca240a94757220647b6762003ee
b794cfc1f6a787000767b84b359e02391f0cf5f2 05-Jan-2017 Hall Liu <hallliu@google.com> Replace BluetoothManager (multi-hfp part 3) am: 486cb197d4 am: d1b47792e1
am: ac935c47e1

Change-Id: Icf4e8edb690a5dcee607891166d57f40eeb833c3
ac935c47e1be3757af32bbe900cb5886a1ae51bc 05-Jan-2017 Hall Liu <hallliu@google.com> Replace BluetoothManager (multi-hfp part 3) am: 486cb197d4
am: d1b47792e1

Change-Id: I6fda12d25190b09969e8d83140ad88668a19558a
d1b47792e1b6dd4e6cd9f3d274b5d5f48e7b2616 05-Jan-2017 Hall Liu <hallliu@google.com> Replace BluetoothManager (multi-hfp part 3)
am: 486cb197d4

Change-Id: I99663a74d0e17f443018b02f52d8b6ddfd9b70f7
73b51ee26538a6ee34bc07e37644eda5fac7dfc3 02-Dec-2016 Yong Shi <yong.xa.shi@sonymobile.com> Fix issue that music popped up from speaker during ringing call

Pre-condition: Music is played through speaker.
When there is a ringing call, if user presses volume key, music gets
played through speaker. This is caused by NO_MORE_RINGING_CALLS message
is sent to CallAudioModeStateMachine resulting in loss of audio focus.
Fix issue by not sending the message if there is an existing call.

Bug: 31231586
Change-Id: I8317781c8db02baafbd10321b19783cff646ec51
rc/com/android/server/telecom/CallAudioManager.java
486cb197d4426a0f740b1c73ba3acdc76b3d67d3 22-Oct-2016 Hall Liu <hallliu@google.com> Replace BluetoothManager (multi-hfp part 3)

Replace BluetoothManager in the rest of Telecom with the functionality
of BluetoothRouteManager. Currently, the Bluetooth stack still
supports only one connected HFP device, so the new multi-device handling
has not yet been tested/verified except through unit tests.

Test: Manual testing
Change-Id: I19f3ab36386a67f797790394a5b5297786af8e77
rc/com/android/server/telecom/CallAudioRoutePeripheralAdapter.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomSystem.java
ests/src/com/android/server/telecom/tests/CallAudioModeStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
77d91dae512ed33607f3a75643fff8d839ded856 21-Dec-2016 yifan.bai <yifan.bai@spreadtrum.com> Fix headset media button long press cannot reject call. am: fbafd9034a am: 6de5288f63 am: 14da17ff51
am: ad75c4358c -s ours

Change-Id: Ie37347492c66dc796c30b625eea724d1a68bb513
ad75c4358c48ccce05d90a66bfe357adbf75bdc4 21-Dec-2016 yifan.bai <yifan.bai@spreadtrum.com> Fix headset media button long press cannot reject call. am: fbafd9034a am: 6de5288f63
am: 14da17ff51

Change-Id: I33b2cfbeb35ff0f932b46df33a1fb3f97434a92d
14da17ff513c05e45c7f6c73b75a961014bd863b 21-Dec-2016 yifan.bai <yifan.bai@spreadtrum.com> Fix headset media button long press cannot reject call. am: fbafd9034a
am: 6de5288f63

Change-Id: If76eae8c3e9b9e8449e464e5b77b61ff6b8749f4
6de5288f6379199cdd1d43d34487076131fd53d8 21-Dec-2016 yifan.bai <yifan.bai@spreadtrum.com> Fix headset media button long press cannot reject call.
am: fbafd9034a

Change-Id: I1c68b5c449cb3f50986ff65361cbef78fca5a2a8
fbafd9034a635e95d2bec94681e062a851e37a42 21-Apr-2016 yifan.bai <yifan.bai@spreadtrum.com> Fix headset media button long press cannot reject call.

When making phone call with headset, another call incoming, long press
headset media button to reject new incoming call, call cannot be
rejected and first call will be muted. This is because SHORT_PRESS
should not be judged by ACTION_UP event's repeatCount which will be
always 0. Actually, ACTION_DOWN event's repeatCount only increases when
LONG_PRESS is performed.

Also, swapping SHORT and LONG press actions between MUTE and HANGUP to
match more of the existing devices.

Test: manual
Change-Id: I7a1270925f7148dac81fa5e58b232a886c57236a
Merged-In: I6ec28a2676a86cfa06819e297136ff413c14f169
Fix: 30012668
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/HeadsetMediaButton.java
1f44d0261418af332cc1122754d5957e82e56ba3 20-Dec-2016 Hall Liu <hallliu@google.com> Use DefaultDialerCache in Telecom (part 2) am: 2b33df76a3 am: 13730254f6 -s ours am: 2caeca6a30
am: e18e90d84c -s ours

Change-Id: I468e33c99899c7fb9a7bcb43a430ff1d92eaa083
e18e90d84c1e28fa883ef3d1823cd48684c83182 20-Dec-2016 Hall Liu <hallliu@google.com> Use DefaultDialerCache in Telecom (part 2) am: 2b33df76a3 am: 13730254f6 -s ours
am: 2caeca6a30

Change-Id: I0ff761d93c4a34bacdf6cde417a27c7c975b8622
2caeca6a30e583f250cdb2fcc72462f54eb290bd 20-Dec-2016 Hall Liu <hallliu@google.com> Use DefaultDialerCache in Telecom (part 2) am: 2b33df76a3
am: 13730254f6 -s ours

Change-Id: I22ec6cdc82eeeba302213c0fcbdcd33e98a76513
13730254f65234011b9497aac68922c05fe6e778 20-Dec-2016 Hall Liu <hallliu@google.com> Use DefaultDialerCache in Telecom (part 2)
am: 2b33df76a3

Change-Id: Ic8d3efcae2e96a3ba0d96d202290d40e022d29d0
f3c89c6593812e1e6cafccce3632b777960a868a 20-Dec-2016 Hall Liu <hallliu@google.com> Use DefaultDialerCache in Telecom (part 2) am: b4b1907049
am: e1decffcb0 -s ours

Change-Id: I18d49862b3f7d2f6d8381b0df07a9878f1ed23df
e1decffcb0b5dc4889349b041b8ae4e62457e5e2 20-Dec-2016 Hall Liu <hallliu@google.com> Use DefaultDialerCache in Telecom (part 2)
am: b4b1907049

Change-Id: I2b678524350daecdb4e054617225f1c302afb121
21fb1afe2e6ba030581ae8c94e377adf7c62877d 05-Dec-2016 mike dooley <mdooley@google.com> Grant temporary location permission to default dialer during emergency calls
(if it doesn't already have it). And revoke the permission after the call ends
(if it was granted).

Test: manual testing with real device
Change-Id: I578e4408f29cad67d560da730f06da0f5522c763
BugId: 30952524
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/EmergencyLocationHelper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/Timeouts.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
bebb503c3b5b06ba4533cffb7670b80d317115a1 16-Dec-2016 Hall Liu <hallliu@google.com> Cache default dialer in Telecom (part 1) am: eacd67b9bc am: 1cb4a32226 am: d4d3c3162f
am: a670a25f42 -s ours

Change-Id: I8457e2556977429452bc7c7131e80a78a5ff48f7
b4b190704925898789467a94f041723976558c9b 07-Dec-2016 Hall Liu <hallliu@google.com> Use DefaultDialerCache in Telecom (part 2)

Use the DefaultDialerCache throughout Telecom whereever the value of the
default dialer for a particular user is accessed or modified. Also moves
the DefaultDialerManagerAdapter to DefaultDialerCache since
TelecomServiceImpl no longer directly uses it.

Test: Unit tests and manual tests as specified in design
Change-Id: I61ee37f382f4b29266ce254a0e1f7db183e7a0bb
Merged-In: I5d8f46b4a236e570528425b4010976ac837644ac
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/DefaultDialerCache.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/CallScreeningServiceFilterTest.java
ests/src/com/android/server/telecom/tests/DefaultDialerCacheTest.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
a670a25f42bf7052a35206b5e33881e2da9e52d4 16-Dec-2016 Hall Liu <hallliu@google.com> Cache default dialer in Telecom (part 1) am: eacd67b9bc am: 1cb4a32226
am: d4d3c3162f

Change-Id: I60adab9846815daabc02732e26fff8a3fd9e7936
d4d3c3162fa22bec007bdaa78ffd566bd3361df2 16-Dec-2016 Hall Liu <hallliu@google.com> Cache default dialer in Telecom (part 1) am: eacd67b9bc
am: 1cb4a32226

Change-Id: Ied1cc3c4707064229d4e9acf5f56300d54560f4b
2b33df76a3b7b43ae9fde36f73da11cb22954656 07-Dec-2016 Hall Liu <hallliu@google.com> Use DefaultDialerCache in Telecom (part 2)

Use the DefaultDialerCache throughout Telecom whereever the value of the
default dialer for a particular user is accessed or modified. Also moves
the DefaultDialerManagerAdapter to DefaultDialerCache since
TelecomServiceImpl no longer directly uses it.

Test: Unit tests and manual tests as specified in design
Change-Id: I61ee37f382f4b29266ce254a0e1f7db183e7a0bb
Merged-In: I5d8f46b4a236e570528425b4010976ac837644ac
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/DefaultDialerCache.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/CallScreeningServiceFilterTest.java
ests/src/com/android/server/telecom/tests/DefaultDialerCacheTest.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
1cb4a3222669ea87f6ac77ac228b0d05cd7f25e5 15-Dec-2016 Hall Liu <hallliu@google.com> Cache default dialer in Telecom (part 1)
am: eacd67b9bc

Change-Id: I0bf87ff52d92703f8a5b61b7f9ccc989f26e8146
eacd67b9bc4d6152fdeddc69a8fc823d2dc0fffc 02-Dec-2016 Hall Liu <hallliu@google.com> Cache default dialer in Telecom (part 1)

In order to avoid a flurry of recursive calls into Telecom on every
Telecom API call, cache the default dialer in the Telecom process and
only update it when either the relevant setting changes or when the
current default dialer has been uninstalled/disabled.

Part 1 of change. Adds the default dialer cache class, but does not
integrate it into the rest of Telecom.

Test: added unit tests
Change-Id: I22225ed1f1b516dc98e80fa4f82c5b72ed289ba0
Merged-In: Ie81e8a052b2463bef5df4c60c443c73db880780b
rc/com/android/server/telecom/DefaultDialerCache.java
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/DefaultDialerCacheTest.java
24bf2d5b2f044ff7e2ce3416a8d6ef6a68924234 15-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine am: cc2932570e am: 3fc5febdc3 am: c5f6ebf5b5
am: 239bbd4a2d

Change-Id: I2bba565da7453c08eefb231939c3cc36c89e4992
15b30ee6d712428766963a5ed11926de2cc58e21 15-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls am: ffe558c570 am: 1ebd19ad10 -s ours am: 7bbda1a9dc
am: 631d657039

Change-Id: I233393347de248d69d05facfec0b11e77345bb9d
239bbd4a2d2bad25dff89fa8426005c127e1a42d 15-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine am: cc2932570e am: 3fc5febdc3
am: c5f6ebf5b5

Change-Id: I12ab43af2f3f6f6c1b3a330e65f68e19fc8ad051
631d657039d42a52352ac2f87572bdd4aeb66483 15-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls am: ffe558c570 am: 1ebd19ad10 -s ours
am: 7bbda1a9dc

Change-Id: I2fb3c6c34259f1e4f8c37fece5526911d4513485
c5f6ebf5b5d46b283bd8abae2be179c1f0e7302c 15-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine am: cc2932570e
am: 3fc5febdc3

Change-Id: I74cf91cb5421970ca3f4d57291713db9d6997518
7bbda1a9dccbd8e350a546a2de955b07e27d99d7 15-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls am: ffe558c570
am: 1ebd19ad10 -s ours

Change-Id: I6d11e9686fa14080654007201b230467f4909bd9
3fc5febdc380148f092b8577ea0626e72b2c91f7 15-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine
am: cc2932570e

Change-Id: Ifb79d547c7fb850a8d5dab42aebd5fbd865ebe22
cc2932570e3a9d3272ab8d9a87fb27f1cf59d55e 07-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine

Fix tests that were broken, add some more for untested new
functionality.

Test: unit tests
Change-Id: I688592bf68187b2dda7bc1f02009e3fb360ea0ab
Fix: 33252757
(cherry picked from commit cff959e60f914754961fde4bcca1a97cd363d1ad)
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
1ebd19ad1042a54a4775b85ce3042f52ddbb6da9 14-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls
am: ffe558c570

Change-Id: I10e403e33623d204a3cce3b7a5f5a060b03343c1
ffe558c570ae5736d47fded2caccc7da145e7d92 01-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls

When a call restricts audio routes, it will move the audio route to a
supported route if available. The supported routes are determined initially
and re-evaluated when the call becomes the foreground call.

This is a cherry-pick of abandoned ag/1520954

Bug: 32958838
Change-Id: Ie30847c995839516507df0c70178a591c39f6cdd
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/ParcelableCallUtils.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
d160cc7c8d70321e85a8f2af4dfb3043e80580a1 13-Dec-2016 Brad Ebinger <breadley@google.com> Adds EventManager and SessionManager callbacks for Analytics am: 2eebf1d780 am: 26c471999d am: 7a50406981
am: 47a17224df

Change-Id: I23e1362a663587ba15f1dc60c3d4e61c2e1d183b
47a17224dfc73ac19a91952bfbeab74b1ca438b1 13-Dec-2016 Brad Ebinger <breadley@google.com> Adds EventManager and SessionManager callbacks for Analytics am: 2eebf1d780 am: 26c471999d
am: 7a50406981

Change-Id: I6bb386aa1fb418be44d9087e2efd00bf725d177b
7a504069817de9dc6da57480cd0c992ef1d9cac9 13-Dec-2016 Brad Ebinger <breadley@google.com> Adds EventManager and SessionManager callbacks for Analytics am: 2eebf1d780
am: 26c471999d

Change-Id: I495336f61742819257844485aabf7ff2f546d8ff
26c471999dd53427206c259df2e706418b75df11 13-Dec-2016 Brad Ebinger <breadley@google.com> Adds EventManager and SessionManager callbacks for Analytics
am: 2eebf1d780

Change-Id: I3aa9a9b0c4940cbdad7e25684de335f27e82851b
2eebf1d7808a0bf31473d39bbc9a5e3ae2ec3549 18-Oct-2016 Brad Ebinger <breadley@google.com> Adds EventManager and SessionManager callbacks for Analytics

Implements the callbacks in EventManager and SessionManager to pipe the
completion time of call operations into Analytics.

Test: Manual Testing and running existing Telecom Unit Tests
Bug: 26571395
Change-Id: I14712b45ca4cf0c51e44da7eb5b4758b4eb68aaa
rc/com/android/server/telecom/LogUtils.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
37585d6e3ec68b9f83e565888d53ef586a0867f3 09-Dec-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use updated IContentProvider interface."
be53de158d975ba33b5897600a867aad06b3187a 09-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine am: d5d98841d7 am: ed633e3c2f
am: fae50079da

Change-Id: I88e392d0574a2bbd57d17bf86e471277c532c735
ee247b379cf8f251e8632962d27a9dd9ae0083b1 09-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine am: d5d98841d7 am: c1a1746f46
am: a0176b4c22

Change-Id: Ie348f2ee58de7de121d02e8379c7ec1788562ca6
fae50079dadfb3af83097edd5743b598be87068b 09-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine am: d5d98841d7
am: ed633e3c2f

Change-Id: Iaf26a9820a35da8d416e9ccba724c2cf8ad58064
a0176b4c22e23ac7141942a99d2d99edf9b1793e 09-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine am: d5d98841d7
am: c1a1746f46

Change-Id: If0dd5311c5bcca2ca5f73d9da8acd4d47a87c52c
ed633e3c2fc0ecacc12ff3c68cfeda294272aefd 09-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine
am: d5d98841d7

Change-Id: I737d757f3b215988475d4bcf46879587117c5ee8
c1a1746f46bb57b76f251c82b4e0fae1b685ff5f 09-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine
am: d5d98841d7

Change-Id: I47c077604645199934ae198497e4bece4dec9c33
745b0c10341cfcdb97694dc4ae6b4428d8976a5e 09-Dec-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I10ce2cc9906080f69d5d7c214267778ab9ea807d
Auto-generated-cl: translation import
es/values-hy-rAM/strings.xml
27a43afd2a863d8da71afbce090c6de2de406ee4 08-Dec-2016 Hall Liu <hallliu@google.com> Merge "Use DefaultDialerCache in Telecom (part 2)"
7c9283261ad4fdbc5ebbb74257671388f9c758c7 07-Dec-2016 Hall Liu <hallliu@google.com> Use DefaultDialerCache in Telecom (part 2)

Use the DefaultDialerCache throughout Telecom whereever the value of the
default dialer for a particular user is accessed or modified. Also moves
the DefaultDialerManagerAdapter to DefaultDialerCache since
TelecomServiceImpl no longer directly uses it.

Test: Unit tests and manual tests as specified in design
Change-Id: I5d8f46b4a236e570528425b4010976ac837644ac
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/DefaultDialerCache.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/CallScreeningServiceFilterTest.java
ests/src/com/android/server/telecom/tests/DefaultDialerCacheTest.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
079a50399eaacee17d269ac51472e35c52181c03 05-Dec-2016 Steve McKay <smckay@google.com> Use updated IContentProvider interface.

Test: compiles and passes when run locally.

Bug: 30927484
Change-Id: I8f5fcc62d8eafe3d1089d02dfe47ba9c94090dbe
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
f1a3321026348adb373dd8f760f5608ec3bc5762 08-Dec-2016 Hall Liu <hallliu@google.com> Merge "Cache default dialer in Telecom (part 1)"
d5d98841d71dc33255503b04504e805b4f55b1e7 07-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine

Fix tests that were broken, add some more for untested new
functionality.

Test: unit tests
Change-Id: I688592bf68187b2dda7bc1f02009e3fb360ea0ab
Fix: 33252757
(cherry picked from commit cff959e60f914754961fde4bcca1a97cd363d1ad)
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
cff959e60f914754961fde4bcca1a97cd363d1ad 07-Dec-2016 Hall Liu <hallliu@google.com> Fix tests for CallAudioRouteStateMachine

Fix tests that were broken, add some more for untested new
functionality.

Test: unit tests
Change-Id: I688592bf68187b2dda7bc1f02009e3fb360ea0ab
Fix: 33252757
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
9156bae91bb0a5c0af9c5ae8f848f1f009e5ba0c 02-Dec-2016 Hall Liu <hallliu@google.com> Cache default dialer in Telecom (part 1)

In order to avoid a flurry of recursive calls into Telecom on every
Telecom API call, cache the default dialer in the Telecom process and
only update it when either the relevant setting changes or when the
current default dialer has been uninstalled/disabled.

Part 1 of change. Adds the default dialer cache class, but does not
integrate it into the rest of Telecom.

Test: added unit tests
Change-Id: Ie81e8a052b2463bef5df4c60c443c73db880780b
rc/com/android/server/telecom/DefaultDialerCache.java
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/DefaultDialerCacheTest.java
221ce3da73fc69ceb23a04c8b10bbbc71587f4b2 06-Dec-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I619c91a25d8268644633f61899378318c4342167
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-km-rKH/strings.xml
es/values-ne-rNP/strings.xml
es/values-pa-rIN/strings.xml
es/values-sk/strings.xml
e1d300c40e9213d3c0c3bf1ed650fc4b03f93dcb 02-Dec-2016 Tyler Gunn <tgunn@google.com> Merge "When setting camera, ensure calling user is the same as logged in user."
2e5ef3b51c31e601a09fa6359493266e318f5da3 02-Dec-2016 Christine Hallstrom <hallstrom@google.com> Merge "Handle audio route restrictions set on calls am: 96a0be6761 am: 3547b73b64" into nyc-mr2-dev-plus-aosp
am: 80c4f4b256

Change-Id: I37b4e8a4d8b1b73cc00a76aa6c07f8d5883886c9
b6dd7421adbdb6854e3cf1a5bf8a77bc8e9c139a 02-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls am: 96a0be6761 am: 3547b73b64
am: 932797455a

Change-Id: I92edacce6f3097feaeb9fa6b39fe28ca833a1ba4
2e8d18d455b73976f3b584b88348b2f70960be53 02-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls am: 96a0be6761 am: dabb50d928
am: e311f36bd5

Change-Id: Ie3c2ac2c4dc08bc0f2d975772039d03ebd455d9e
80c4f4b25650c5c827907f5235507ca8025183b3 02-Dec-2016 Android Build Merger (Role) <android-build-merger@google.com> Merge "Handle audio route restrictions set on calls am: 96a0be6761 am: 3547b73b64" into nyc-mr2-dev-plus-aosp
e311f36bd5e8bfb6435729fd88e2a76022f118c7 02-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls am: 96a0be6761
am: dabb50d928

Change-Id: I2c91892eb3cab6876bb96793e469932505883fb9
932797455a5b6d248b71542eeb8a5f33950424b6 02-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls am: 96a0be6761
am: 3547b73b64

Change-Id: Ie9ac5d55e9e41baed8032e34737ca940cf2ac2b0
3547b73b647676db16a0ee0a65e8b3e325edd594 02-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls
am: 96a0be6761

Change-Id: Iad3a61cca0ed1acd4b72c22dcf42f47fae39721e
dabb50d9286b191f7e666e88c3411532fc4a76ab 02-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls
am: 96a0be6761

Change-Id: I4fbf529c540da928c9902b97fd0c16642884bc4a
e2ae2d7e1fc56dd9095aaa34749f7f5ae3d89347 01-Dec-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I41c9987469f781410a1b3c1ccae7bd4f6800859f
Auto-generated-cl: translation import
es/values-bs-rBA/strings.xml
96a0be67619944378d95cdedc64b004aadb341e2 01-Dec-2016 Christine Hallstrom <hallstrom@google.com> Handle audio route restrictions set on calls

When a call restricts audio routes, it will move the audio route to a
supported route if available. The supported routes are determined initially
and re-evaluated when the call becomes the foreground call.

This is a cherry-pick of abandoned ag/1520954

Bug: 32958838
Change-Id: Ie30847c995839516507df0c70178a591c39f6cdd
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/ParcelableCallUtils.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
1bf0e6be00af0ca5731a52f0727c6d9a2f8b6944 01-Dec-2016 Tyler Gunn <tgunn@google.com> When setting camera, ensure calling user is the same as logged in user.

When the VideoProvider API is used to change the camera, in addition to
performing permission checks on the caller, adding logic to ensure that
the calling UserHandle is the currently logged in User (this is to ensure
that a background app can't access the camera).

Test: Unit, manual
Bug: 32747443
Change-Id: I0856f991c520dd1f5fa0146919941c052cba8a01
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CurrentUserProxy.java
rc/com/android/server/telecom/VideoProviderProxy.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
72f052cfc6d27c47efc366d38d31915c6f644d4f 30-Nov-2016 Wei Liu <luciferleo@google.com> Merge "Remove the custom missed call notification component config." into cw-f-dev am: d1d23ce4ff am: 20bc3ca171
am: 8c749bafa9

Change-Id: I5ca6bb8f1c78fc7e0a80dcf324591d5e47bbe3ef
3f898bb7b1cb2d497c28997434c559792ceea1a4 30-Nov-2016 Wei Liu <luciferleo@google.com> Remove the custom missed call notification component config. am: f1255e0fc4 am: 21f2e70f70
am: 97126dfe13

Change-Id: I8f1533afaa160f497682eb9c2c10cf84ac1c0e4a
a57161b1ff1283f143d0edabf51dcf8d768822ad 30-Nov-2016 Wei Liu <luciferleo@google.com> resolve merge conflicts of 6191486 to nyc-mr1-dev-plus-aosp am: 551aef4cb8
am: 1ca6f03f1c

Change-Id: Ie22b1f9e3fb7c4500f2d65e60889cd25c800dab7
8c749bafa9118c4dd688f935e60cd8b65ae448aa 30-Nov-2016 Wei Liu <luciferleo@google.com> Merge "Remove the custom missed call notification component config." into cw-f-dev am: d1d23ce4ff
am: 20bc3ca171

Change-Id: If1cd2cb4cdaf6bcbb54c1e802db22f59d49a111d
97126dfe134f756878a83ada6f2cb200da617fd6 30-Nov-2016 Wei Liu <luciferleo@google.com> Remove the custom missed call notification component config. am: f1255e0fc4
am: 21f2e70f70

Change-Id: I6cc51df8d76c6846bab8eafb15bd38200cc225ce
1ca6f03f1c9cec59bd3635aa8caa8ae517af3e84 30-Nov-2016 Wei Liu <luciferleo@google.com> resolve merge conflicts of 6191486 to nyc-mr1-dev-plus-aosp
am: 551aef4cb8

Change-Id: Ia1b171b20d4ddd5d079f00781dbf26f5ee85e22a
20bc3ca171d258bb574e8ea02fbf6a880e7e1c73 30-Nov-2016 Wei Liu <luciferleo@google.com> Merge "Remove the custom missed call notification component config." into cw-f-dev
am: d1d23ce4ff

Change-Id: Ibc86daea5eea0abad5d3055650761266b988bb8c
21f2e70f7043efbcdf47265294ef204314dac19b 30-Nov-2016 Wei Liu <luciferleo@google.com> Remove the custom missed call notification component config.
am: f1255e0fc4

Change-Id: I80b72f91c14f3cbb926fc2bafef381c5de5ff83f
551aef4cb88eda9b18fc0033febce461f52c7747 30-Nov-2016 Wei Liu <luciferleo@google.com> resolve merge conflicts of 6191486 to nyc-mr1-dev-plus-aosp

Change-Id: Iebbf4e6b44102a50763f93f22a6bdec9c1e40c8c
f4f76758aa6db587b2d137105116817490be721e 29-Nov-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
fc025369e6578df12b0bbb86efa76d27f659300e 29-Nov-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: If9389bf9c30f6c8d3dc13d5412f6dc9ca69293c2
Auto-generated-cl: translation import
es/values-si-rLK/strings.xml
a7e74c70baaf148731c916abbdcad770842d487d 28-Nov-2016 Hall Liu <hallliu@google.com> Add BluetoothRouteManager (multi-hfp part 2) am: ea8d15df3c am: fd9ae118b4 am: d7f389a1af
am: b3502377ad

Change-Id: Ied2530933a289a8c54539091268c50ff872f42e2
b3502377ad0d18b4712f5023c2663e2884488b47 28-Nov-2016 Hall Liu <hallliu@google.com> Add BluetoothRouteManager (multi-hfp part 2) am: ea8d15df3c am: fd9ae118b4
am: d7f389a1af

Change-Id: I83c9728f42f26dbd3180961207b76d9da0dcead5
d7f389a1af9a3bdf32d4d4f11d6a1ef58491924b 28-Nov-2016 Hall Liu <hallliu@google.com> Add BluetoothRouteManager (multi-hfp part 2) am: ea8d15df3c
am: fd9ae118b4

Change-Id: I1bcb9702e3dde4a1d696e750cec302c024785193
fd9ae118b46e181df3d8cc02b623b216c04895c6 28-Nov-2016 Hall Liu <hallliu@google.com> Add BluetoothRouteManager (multi-hfp part 2)
am: ea8d15df3c

Change-Id: I5d322c7c773c1b410ed880e65d51d8f6ae6333ff
ea8d15df3c4d563274a7f7755e8c55d42bc9e805 31-Oct-2016 Hall Liu <hallliu@google.com> Add BluetoothRouteManager (multi-hfp part 2)

This adds BluetoothRouteManager, a state machine class that manages
which HFP device is/should be active during a call. It handles:
* requests from the rest of Telecom to turn Bluetooth on/off
* connecting/disconnecting from individual HFP devices
* fallback in the case of disconnections or connection failures
* informing Telecom of Bluetooth device connections and disconnections.
See design document for details.

Test: added unit tests
Change-Id: I4deea4376e735ef3975544efaadef1c3045030ca
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
ests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java
7e4da45012263fa48b022eb73b1beaf745263f7e 23-Nov-2016 Hall Liu <hallliu@google.com> Merge "Add bluetooth related timeouts adapter methods" am: f9e416e515 -s ours am: b78a09c659 -s ours am: 7fc090b6db -s ours
am: 533a203caf -s ours

Change-Id: Ia7eb2708a2144f2a7581b9274b2204f746ce1a1c
533a203cafb3a1b1bab6d5030a9b5719afa04999 23-Nov-2016 Hall Liu <hallliu@google.com> Merge "Add bluetooth related timeouts adapter methods" am: f9e416e515 -s ours am: b78a09c659 -s ours
am: 7fc090b6db -s ours

Change-Id: I240c9dd1d30557bfaa59ed07fea1ff60bffec1dd
7fc090b6db01b597873990c03e8a8aecf01ad924 23-Nov-2016 Hall Liu <hallliu@google.com> Merge "Add bluetooth related timeouts adapter methods" am: f9e416e515 -s ours
am: b78a09c659 -s ours

Change-Id: I35d15cc08923dd067162e09dcffde6853d2b55fd
b78a09c659f84ddc73b238555523171858065d4f 23-Nov-2016 Hall Liu <hallliu@google.com> Merge "Add bluetooth related timeouts adapter methods"
am: f9e416e515 -s ours

Change-Id: I39324b958f82a8e60cd243a61b859024351cf496
f9e416e5155810f7b1955d01fd605b697cfd597c 23-Nov-2016 Hall Liu <hallliu@google.com> Merge "Add bluetooth related timeouts adapter methods"
4df458e890803a991db8c7c47214840754f864be 23-Nov-2016 Hall Liu <hallliu@google.com> Add bluetooth related timeouts adapter methods am: 20019b6a09 am: 6afd577dfa
am: 759b2cf35f

Change-Id: I77394236df598c6e1273de5fa83696daabc3cc95
759b2cf35f7960ea0fbb5d14fbf05817112ac8d9 23-Nov-2016 Hall Liu <hallliu@google.com> Add bluetooth related timeouts adapter methods am: 20019b6a09
am: 6afd577dfa

Change-Id: I7b6187e9d4d25c05e49fd460cf512a8981bf3189
6afd577dfa819a7f060d3df2c13ad8fbeb5e9209 23-Nov-2016 Hall Liu <hallliu@google.com> Add bluetooth related timeouts adapter methods
am: 20019b6a09

Change-Id: Ie7f11550c0c9f0384b8393c5a891ffbf3c4dc26c
db5dc6e4b2db49f55d0535ae5afad2c7391b9c7f 22-Nov-2016 Hall Liu <hallliu@google.com> Add bluetooth related timeouts adapter methods

In preparation for a multi-hfp change (and to resolve some merge
conflicts), add timeouts adapter methods in a separate file

Test: it builds
Change-Id: I3d0d99aad369e68ac29c54201cdb96e3a2cd4d22
Merged-In: I3d0d99aad369e68ac29c54201cdb96e3a2cd4d22
rc/com/android/server/telecom/Timeouts.java
20019b6a091cab9a5d5caae8f56f3aa7f26a8178 22-Nov-2016 Hall Liu <hallliu@google.com> Add bluetooth related timeouts adapter methods

In preparation for a multi-hfp change (and to resolve some merge
conflicts), add timeouts adapter methods in a separate file

Test: it builds
Change-Id: I3d0d99aad369e68ac29c54201cdb96e3a2cd4d22
rc/com/android/server/telecom/Timeouts.java
376412a958f40ddab25bee408b92c8d3f219f7e0 22-Nov-2016 Sudheer Shanka <sudheersai@google.com> Merge "Update usage of ActivityManagerNative."
e156ab696e20f83e2f9a0eddf8a71bbe64140206 22-Nov-2016 Honggang Luo <honggang.x.luo@sonymobile.com> Fixed that Call back function didn't work am: e8b11f8edc am: 06ca3828fb am: 7816c8742f
am: 7d3bb7f282

Change-Id: I34a904a538a9c70b2b7050ba7828d2748061ba8e
7d3bb7f2826b538bf378bd1a2ba153a14b72d815 22-Nov-2016 Honggang Luo <honggang.x.luo@sonymobile.com> Fixed that Call back function didn't work am: e8b11f8edc am: 06ca3828fb
am: 7816c8742f

Change-Id: I3364044b1acb382464b53f29e33b8abc0185c71b
7816c8742f0473ef354040c93b13717952cc6373 22-Nov-2016 Honggang Luo <honggang.x.luo@sonymobile.com> Fixed that Call back function didn't work am: e8b11f8edc
am: 06ca3828fb

Change-Id: I348450d737524cdcb6d9980aa39ea5b1d17034d2
06ca3828fb79b7ade5e6bdf731b34f126ad0f1cd 22-Nov-2016 Honggang Luo <honggang.x.luo@sonymobile.com> Fixed that Call back function didn't work
am: e8b11f8edc

Change-Id: I1a2c181ca183c6b056c903135e57b03bfe976f54
3fe2e3cb7c3f5f7cb591b896154f25b8d65ac0e5 21-Nov-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 476d5f3e9a -s ours am: cff12b55db -s ours
am: 95e1d78762 -s ours

Change-Id: I9d6204dd9fde7bfb08ef3fa7e3f7f4c91347102c
95e1d7876291251aafc1f1898f0776a773533c6a 21-Nov-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 476d5f3e9a -s ours
am: cff12b55db -s ours

Change-Id: I29348a668a7d14ff194284d5a107363bdb39f157
cff12b55db1a98423107da5a310d2545dad5b97d 21-Nov-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 476d5f3e9a -s ours

Change-Id: I74559041f194c715bac337b32d68fbd7bf367b9e
476d5f3e9a90407bfdd392339bcb7b3b284ab4d6 21-Nov-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ieba2b25f42ef0a0c040bdfd336c88285b230700d
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
e8b11f8edc4a684cab2d11426cfe465e66bdf18a 10-Oct-2016 Honggang Luo <honggang.x.luo@sonymobile.com> Fixed that Call back function didn't work

Call back function on missed call notification didn't work after
switching user from gust to owner. Because UserHandle was saved in
extra when creating the pending intent and it was previous one after
switching user to owner. Fixed to use FLAG_CANCEL_CURRENT.

Test: manual
Bug: 32231072
Change-Id: Id960a963278b304d91c8f236e33ca697fee2fcb9
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ad8846e2560f79cce8f757c08f053ce33be0b8b9 17-Nov-2016 Brad Ebinger <breadley@google.com> Use Runnables in android/Telecom correctly am: d608fcc41c am: 9a91e933d9 am: 8542fbea2a
am: 6e1befab01

Change-Id: I0a6f044ba5474b8bdaad237eff6d9fd5b4ef9bf4
6e1befab01d85dc250595b3c41b9f6c3941f78a8 17-Nov-2016 Brad Ebinger <breadley@google.com> Use Runnables in android/Telecom correctly am: d608fcc41c am: 9a91e933d9
am: 8542fbea2a

Change-Id: I1647c4e36786185f162011577c9ed03abc2143aa
8542fbea2a4e3887ece59cfdc5a6a099d370b177 17-Nov-2016 Brad Ebinger <breadley@google.com> Use Runnables in android/Telecom correctly am: d608fcc41c
am: 9a91e933d9

Change-Id: I6f1c61da80d27c61bd7c97d39700280fdc53307f
9a91e933d9618e7f65f3d85214eea0553a8c708f 17-Nov-2016 Brad Ebinger <breadley@google.com> Use Runnables in android/Telecom correctly
am: d608fcc41c

Change-Id: I0cfb4caa3fe9540c47440ab1416f2359a59acea9
d608fcc41c5075903b560c1b2f50d1bfed287e18 16-Nov-2016 Brad Ebinger <breadley@google.com> Use Runnables in android/Telecom correctly

Updates Telecom to use the new android.telecom.Runnable changes in
frameworks/base.

Bug: 26571395
Test: All affected tests pass
Change-Id: I401e5d0a53e7aa13b8190960898797386717e2ac
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/CallerInfoLookupHelper.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/callfiltering/IncomingCallFilter.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
836d53ea75d49dcd6cb7087cce92f6a3e0256521 16-Nov-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I1b956e8d7e1eb6b52acfc2108b23ed38b9bcf6a7
Auto-generated-cl: translation import
es/values-ru/strings.xml
d35c649090b964bba37425cbd91d45d7232b3ab8 14-Nov-2016 Tyler Gunn <tgunn@google.com> Auto un-mute incoming call when answered. am: 8e154db7e4
am: 7366faf2cc

Change-Id: I1ecd429e2c094c810377a3747e66c5d47d614bb6
7366faf2cc09042fbdb4166b6c788174dd8cf883 14-Nov-2016 Tyler Gunn <tgunn@google.com> Auto un-mute incoming call when answered.
am: 8e154db7e4

Change-Id: I806ad2f88340fa6c741229f267505dd4f1c5ddde
873dc73dc4d995f2c6bd335733c754be25b6321d 11-Nov-2016 Sudheer Shanka <sudheersai@google.com> Update usage of ActivityManagerNative.

Bug: 30977067
Test: N/A
Change-Id: Iea93afd5069eb1c014a473fe7f6b838ff099449b
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
aaebe966a388622d3ac286b1399b8c78997a0338 11-Nov-2016 Hall Liu <hallliu@google.com> Add _UNSPECIFIED fields to enumss

Conform to best practices for protos and makes it possible to add new
fields in the future.

Test: No functionality changes
Change-Id: I698c7228d8622cd8c8b4628f603383ca181b0506
roto/telecom.proto
80c98eb5fed6febe69a51d719c798c8bbcf47b67 11-Nov-2016 Tyler Gunn <tgunn@google.com> Merge "Perform camera permission and app ops check when setting camera for VT."
8e154db7e4afde41612e486a7efcf2be82ea2167 10-Nov-2016 Tyler Gunn <tgunn@google.com> Auto un-mute incoming call when answered.

When a new incoming call is added to the CallAudioManager, automatically
unmute the audio. This was a regression from pre-N behavior.

Bug: 32265571
Change-Id: I26bb3e4cf1f2030265c29bf31e482bec18e9c27b
rc/com/android/server/telecom/CallAudioManager.java
ests/src/com/android/server/telecom/tests/CallAudioManagerTest.java
a0a43d51041c9efbe04f7c65236c9e90c3e79346 09-Nov-2016 Tyler Gunn <tgunn@google.com> Perform camera permission and app ops check when setting camera for VT.

When a calling InCallService attempts to use the setCamera API on the
VideoCall, Telecom will perform a permission check to ensure that the
caller has the correct camera permission and passes the app-ops camera
check. A failure to set the camera will result in a callback via the
call session event API.

This got a little messy as the app ops package name needs to come from the
InCallService, and handler usage in the VideoProvider API means we had to
pass around the uid/pid of the caller, obtained before we trampoline onto
the handler.

Test: Unit tests added, plus manual tests.
Bug: 32747443
Change-Id: Ib96114502fe459b0429a87c5d13640b68ae6a2f7
rc/com/android/server/telecom/VideoProviderProxy.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/MockVideoProvider.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
83e882836bea5ae11f21dd619dd9ae3a2e0c12e3 22-Sep-2016 Tamas Berghammer <tberghammer@google.com> Update package names to work with the proto3 compiler

Bug: b/28974522
Change-Id: I2bcb72e0c4688bdc8c690c05ed05f9ff7a649d13
rc/com/android/server/telecom/Analytics.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
c0745a637101f59cfa850d29956cf884218725c0 07-Nov-2016 Hall Liu <hallliu@google.com> Merge "Add BluetoothDeviceManager (multi-hfp part 1)" am: fbe4cadff4 am: da57c4a699 am: e92b69f76a
am: 4dcb8b7d10

Change-Id: I272e5c5fb671346d9a1690cecf1b022752b47b93
4dcb8b7d1013cd488a9040cf49296764d8a667e0 07-Nov-2016 Hall Liu <hallliu@google.com> Merge "Add BluetoothDeviceManager (multi-hfp part 1)" am: fbe4cadff4 am: da57c4a699
am: e92b69f76a

Change-Id: I780a2ab35cc64504549d2e7952c48a3546c72a2d
e92b69f76a2348972750f86dff6df61d8d1e0060 07-Nov-2016 Hall Liu <hallliu@google.com> Merge "Add BluetoothDeviceManager (multi-hfp part 1)" am: fbe4cadff4
am: da57c4a699

Change-Id: I80119367b2981be1946a966883837a11cdda9dc8
da57c4a699f4faa1c6f3d9736e7086aaca04ddcb 07-Nov-2016 Hall Liu <hallliu@google.com> Merge "Add BluetoothDeviceManager (multi-hfp part 1)"
am: fbe4cadff4

Change-Id: Ia0ba17d93b2678c236a9efdd8c3635d2d66884b5
fbe4cadff4a0b7fac9fc173517f78d55b6b0069a 07-Nov-2016 Hall Liu <hallliu@google.com> Merge "Add BluetoothDeviceManager (multi-hfp part 1)"
00bd826e712f56b13780944bf67d17f660279ad7 07-Nov-2016 Wei Liu <luciferleo@google.com> Merge "Remove the custom missed call notification component config." into cw-f-dev am: d1d23ce4ff am: 0a5511d5bc
am: 166001330f

Change-Id: I8b83327545042521a8598b6cd931bb76c42bf9c6
003bee7c0876988f82ec1a7d53bd2ba1c9e94394 07-Nov-2016 Wei Liu <luciferleo@google.com> Remove the custom missed call notification component config. am: f1255e0fc4 am: e04c2aeb31
am: 31cd59d099

Change-Id: I6f388d5e5ba31a36991dc0aa8bc2be4e88fe554f
166001330f5afa162ac451a61369182145f3ac01 07-Nov-2016 Wei Liu <luciferleo@google.com> Merge "Remove the custom missed call notification component config." into cw-f-dev am: d1d23ce4ff
am: 0a5511d5bc

Change-Id: I9816896bfcf0674d946102aea0bb5bcb2e0b1eec
31cd59d09917d53625babd0672e886d26f248bae 07-Nov-2016 Wei Liu <luciferleo@google.com> Remove the custom missed call notification component config. am: f1255e0fc4
am: e04c2aeb31

Change-Id: Ic18de7c2e8dcec0e828414b6adcc438a131dbf36
0a5511d5bce31357fba3fc9c33a7d07bc770a884 07-Nov-2016 Wei Liu <luciferleo@google.com> Merge "Remove the custom missed call notification component config." into cw-f-dev
am: d1d23ce4ff

Change-Id: Ie1a67322b1f521c2718c731d7cd6537de2089db9
e04c2aeb31547c1a72f1bed564cf9186342ce3f4 07-Nov-2016 Wei Liu <luciferleo@google.com> Remove the custom missed call notification component config.
am: f1255e0fc4

Change-Id: Ic6810c291fc28efeb67ba447725de04a86f22838
d1d23ce4ff11c554c45514d655664e2c1ef7f55c 07-Nov-2016 Wei Liu <luciferleo@google.com> Merge "Remove the custom missed call notification component config." into cw-f-dev
ed9a48e60d016647608903b00aa1a967b56a65fe 05-Nov-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 55083df1db -s ours
am: 66eaa29e81 -s ours

Change-Id: I7d0cff6700aeaa64d1980319a15d25be85a893fa
66eaa29e810567ee99004afc3f86f96c00d88f82 05-Nov-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 55083df1db -s ours

Change-Id: Ibf2e284cc3c60c9cdeaca4a4fb17f88ae0a0953e
041260e05b9d808d858a56a0b6e1855c807595f6 04-Nov-2016 Wei Liu <luciferleo@google.com> Move the wear dialer off the custom component and use the default dialer hook. (Fix the build on branch nyc-mr2-dev-plus-aosp)
am: 3d59c4bdd4

Change-Id: I4a70a38ec62bd0366d6422050d68301dcd332940
3d59c4bdd4f1c8c7a260280d1adfca0504b35841 02-Nov-2016 Wei Liu <luciferleo@google.com> Move the wear dialer off the custom component and use the default dialer hook.
(Fix the build on branch nyc-mr2-dev-plus-aosp)

b/30832184

Change-Id: If7fe13997e51df68aa8641048db489c4b00b6c42
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
55083df1db7326bd85effc21d33bd2220740bf5f 04-Nov-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I79bc4c73dc212c005a54b28716508db719516384
Auto-generated-cl: translation import
es/values-kn-rIN/strings.xml
es/values-zh-rCN/strings.xml
861a51b54ec4f7ccbe772d11198776a6cae78fd0 04-Nov-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Provide an API to make USSD calls and read the responses."
5e89b120e16c65946e8280d485f4f5e3c895782e 04-Nov-2016 Josh Gao <jmgao@google.com> Revert "resolve merge conflicts of ec59898 to nyc-mr2-dev-plus-aosp"
am: 46f7245a85

Change-Id: Ibbf803820796dd1d8bf2f0f6910cc0a2d43a7592
46f7245a85f9de8fcd9b3d952c250ca0ffb62661 04-Nov-2016 Josh Gao <jmgao@google.com> Revert "resolve merge conflicts of ec59898 to nyc-mr2-dev-plus-aosp"

This reverts commit a1d4787294ff4fbfc875683f16b7ce5710477bd8, reversing
changes made to 991686f99841ccffa04cd0d413440d3dcb3a3cb0.
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
b5a1eb4f3e52bb6b8bd9665143a0642138346cc3 04-Nov-2016 Josh Gao <jmgao@google.com> Revert "Fix the build breakage caused by a bad merge resolution."

This reverts commit 5dd6699c3d6d65b300593dff9d16275a8f4933ae.
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
5dd6699c3d6d65b300593dff9d16275a8f4933ae 04-Nov-2016 Wei Liu <luciferleo@google.com> Fix the build breakage caused by a bad merge resolution.

Change-Id: I2977d9f73d04298738d9c0aa08458278dddc5e31
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
8502d6e3ceed32869d753d86193c4a0b2ebdbb25 31-Oct-2016 Hall Liu <hallliu@google.com> Add BluetoothDeviceManager (multi-hfp part 1)

Adds BluetoothDeviceManager, a class to manage connected HFP devices for
Telecom. This class separates out part of the current functionality of
BluetoothManager and generalizes it to support multiple connected HFP
devices. See design doc for details.

Test: added unit tests
Change-Id: I03ca6e3827aa80b18e64a9c736097ca8dd4e01b8
rc/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
rc/com/android/server/telecom/bluetooth/BluetoothRouteManager.java
ests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
dc4c14d7a4c75c009c04496c7bc2bf1b1942ead8 31-Oct-2016 pkanwar <pkanwar@google.com> Provide an API to make USSD calls and read the responses.

Test: will be added in a subsequent CL.
Bug: 30973910
Change-Id: Ie92441b6435775d9b6d74f9a0777064d9839d6dc
estapps/AndroidManifest.xml
estapps/res/layout/testussd_main.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/TestUssdActivity.java
a8aa8b84cc5fe5e5f71f28f1dcce468f26c7a4e7 03-Nov-2016 Wei Liu <luciferleo@google.com> resolve merge conflicts of ec59898 to nyc-mr2-dev-plus-aosp
am: a1d4787294

Change-Id: I855a49a4740b5c95eda457d2d44bf797661d00a9
f1255e0fc4eacaa38ad272ab9dbd5a24073d37a5 03-Nov-2016 Wei Liu <luciferleo@google.com> Remove the custom missed call notification component config.

Change-Id: I9ec899fd8abe6a0dfe8123c60b43d2cfa7cb682c
es/values/config.xml
a1d4787294ff4fbfc875683f16b7ce5710477bd8 03-Nov-2016 Wei Liu <luciferleo@google.com> resolve merge conflicts of ec59898 to nyc-mr2-dev-plus-aosp

Change-Id: I1de442255c20aae00adbb67199f12c8ff56c0968
ec598988c481a36b791a6a97a26b1cbb19659515 03-Nov-2016 Wei Liu <luciferleo@google.com> Move the wear dialer off the custom component and use the default dialer hook.
am: 6191486fa8

Change-Id: Ia516047e48a21e788211fdf79697b07834d6d89a
472a589c4233e47cec82b05726af4a3e514e3dc8 02-Nov-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
bb848a41245f1a440879b66ad15c9378c582c130 02-Nov-2016 Brad Ebinger <breadley@google.com> Merge "Modify ConnectionServiceAdapter to include Session" am: 6acdeda101 -s ours am: 0d61bbb380 am: c29854a3e8
am: 991686f998

Change-Id: I636f0e01e1caec9e276b081601d6bb8613e14e9f
991686f99841ccffa04cd0d413440d3dcb3a3cb0 02-Nov-2016 Brad Ebinger <breadley@google.com> Merge "Modify ConnectionServiceAdapter to include Session" am: 6acdeda101 -s ours am: 0d61bbb380
am: c29854a3e8

Change-Id: Ie83b91cf4b1ee883d92721b195e323b2e35a2a68
c29854a3e84ea5511061b793299b20ef80b7d878 02-Nov-2016 Brad Ebinger <breadley@google.com> Merge "Modify ConnectionServiceAdapter to include Session" am: 6acdeda101 -s ours
am: 0d61bbb380

Change-Id: I77dd1ae685a744b0a10e767075631ef880b96c35
0d61bbb3808c91be7fdb387d555984bda633bc24 02-Nov-2016 Brad Ebinger <breadley@google.com> Merge "Modify ConnectionServiceAdapter to include Session"
am: 6acdeda101 -s ours

Change-Id: Icb5c1d05b1b17b9c9ba986f40d200bd5d1ec1b87
6acdeda101f7d5ced52c233498b01e45b8bcf7cf 02-Nov-2016 Brad Ebinger <breadley@google.com> Merge "Modify ConnectionServiceAdapter to include Session"
6191486fa892a0daf1ca182628cf208b07d710c2 02-Nov-2016 Wei Liu <luciferleo@google.com> Move the wear dialer off the custom component and use the default dialer hook.

b/30832184

Change-Id: If7fe13997e51df68aa8641048db489c4b00b6c42
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
a9a6e54e682689716f7e5f2916362c1fe378ba47 02-Nov-2016 Brad Ebinger <breadley@google.com> Modify ConnectionServiceAdapter to include Session am: 65912759cd am: ff79c137ec
am: c804b2f25e

Change-Id: I45a9a7c15f250763e3e640e7a3827f755c0df18a
c804b2f25eaaa382c3a4df6f614721fad2924abe 02-Nov-2016 Brad Ebinger <breadley@google.com> Modify ConnectionServiceAdapter to include Session am: 65912759cd
am: ff79c137ec

Change-Id: Ib739112d70d21d39001a259a702d5134ab73b746
ff79c137ec0b6f148622c26e850ef56fff3caef1 02-Nov-2016 Brad Ebinger <breadley@google.com> Modify ConnectionServiceAdapter to include Session
am: 65912759cd

Change-Id: I1956397f99100db85fad28be107d3900a98baee2
65912759cdf64aa5a38f5498f22c8b5ba8a97ebe 28-Oct-2016 Brad Ebinger <breadley@google.com> Modify ConnectionServiceAdapter to include Session

Starts external sessions from the ConnectionServices so that external
Sessions can be started in Telecom from Telephony.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: Ic024d123acdd52b7592636db410a459e03548d0c
rc/com/android/server/telecom/ConnectionServiceWrapper.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
164f9781996eda09fc3cf8c850f8170b2b9776e9 02-Nov-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: If9c924b8c29570dd3e0885cc28939c94fbbbb6ab
Auto-generated-cl: translation import
es/values-kn-rIN/strings.xml
32832aba73523bf6d277836b63e484f94022169e 01-Nov-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
fa915d826dc1457802d162a72f3f11c03aa59d7f 31-Oct-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of f4cf7f3 to stage-aosp-master am: 2cc2743c2f am: effb996c06
am: 7fb29abcbf

Change-Id: Ie15528c5af649ab379d51bb6c3241b444a0160ff
7fb29abcbf16ac3f4c8ae5ff27008155aefaf768 31-Oct-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of f4cf7f3 to stage-aosp-master am: 2cc2743c2f
am: effb996c06

Change-Id: I419476d4e5ba6870518b3708dbfb9f0120909311
effb996c069bd0713f8b380c62ba9b0d399772fc 31-Oct-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of f4cf7f3 to stage-aosp-master
am: 2cc2743c2f

Change-Id: Ia26d0d66e746dd5bef6ec4af5fcbc6f2be9425be
2cc2743c2fb00c0cd8c5aded5737c8dc8643fffd 31-Oct-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of f4cf7f3 to stage-aosp-master

Change-Id: I8a412bc3998512bc9f0db1d148f186311006e3c4
cb06310d5331aaa92e2c45d9c7b2d58982f7dfcc 31-Oct-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ia46940aeba98276de993ca5762358bcc1d096d36
Auto-generated-cl: translation import
es/values-kn-rIN/strings.xml
f4cf7f3d6bc27e576c4e1a008732e92d5552ef9d 31-Oct-2016 Hall Liu <hallliu@google.com> Merge "Add ringing state for bluetooth audio route"
2c3af71359ca3fd9b04d6dbe4e058be3d7945734 31-Oct-2016 Brad Ebinger <breadley@google.com> Modify AIDLs to include Session.Info am: d7b70ca78c am: c82e30bff1 am: 2ecd0a7a8e
am: 75db2e9d13

Change-Id: I00b300ae6d2314b0647678bf04ab04d552814b06
75db2e9d13ae96b31572393f3039e3bd1011a2a1 31-Oct-2016 Brad Ebinger <breadley@google.com> Modify AIDLs to include Session.Info am: d7b70ca78c am: c82e30bff1
am: 2ecd0a7a8e

Change-Id: I506faca632382afc2bf0746c47df6ab291fcd6dd
2ecd0a7a8ebefa1cdebcf1111b871d480854a0fd 31-Oct-2016 Brad Ebinger <breadley@google.com> Modify AIDLs to include Session.Info am: d7b70ca78c
am: c82e30bff1

Change-Id: I682274e90d18f03a50bd62d58bfee06aa8c1f2b2
c82e30bff12dca4da09be45adf6c21217f389143 31-Oct-2016 Brad Ebinger <breadley@google.com> Modify AIDLs to include Session.Info
am: d7b70ca78c

Change-Id: I2b101d3be239c6802ad27ca2f760b75537d9b5b0
9151b078722245ba0b852c806cfbfd02afb523f8 16-Aug-2016 Hall Liu <hallliu@google.com> Add ringing state for bluetooth audio route

Previously, Telecom was setting up SCO audio at the same time as the
RING command was being sent to the BT headset. This turns out to have
been a violation of the HFP spec, and ag/1199401 started enforcing it,
which caused calls routed over bluetooth to mishandle audio routing.

This change adds a ringing state to the Bluetooth route in CARSM so that
we can be in a bluetooth route with audio focus but without having set
up SCO audio.

Change-Id: I8aabb983ddd4b546d52b10f78929773b823bfbd0
Fix: 30800730
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
81ecd6980b5a688f86171c99f57439ef29927e65 28-Oct-2016 Brad Ebinger <breadley@google.com> Modify AIDLs to include Session.Info am: b78b0234c6 am: ad4de70ceb
am: 9e23ee108a

Change-Id: I3d820d2d2adb6d6c8c43cb56d00925bee5655723
9e23ee108a7906eff160e9d77d2d0b0e6715503d 28-Oct-2016 Brad Ebinger <breadley@google.com> Modify AIDLs to include Session.Info am: b78b0234c6
am: ad4de70ceb

Change-Id: I49756d3630a6e2509cd4c123b2a1300a4c4b6f23
ad4de70ceb255d1346ee7ef12856be95e286902f 28-Oct-2016 Brad Ebinger <breadley@google.com> Modify AIDLs to include Session.Info
am: b78b0234c6

Change-Id: Idf2876db516a69c9e8ff24f5e63fe9e039867f17
270b8ff493abdf628c7f704a2bcc93c39e0c6458 28-Oct-2016 Brad Ebinger <breadley@google.com> Modify ConnectionServiceAdapter to include Session

Starts external sessions from the ConnectionServices so that external
Sessions can be started in Telecom from Telephony.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: Ic024d123acdd52b7592636db410a459e03548d0c
rc/com/android/server/telecom/ConnectionServiceWrapper.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
b78b0234c6e9a937fc00fec6d16e534535b6fab9 25-Oct-2016 Brad Ebinger <breadley@google.com> Modify AIDLs to include Session.Info

Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: I587c5218da86585d23650d056f32197d7afaecce
rc/com/android/server/telecom/ConnectionServiceWrapper.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
d7b70ca78c1ba41d5c0a931a6d55f60c19301394 25-Oct-2016 Brad Ebinger <breadley@google.com> Modify AIDLs to include Session.Info

Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: I587c5218da86585d23650d056f32197d7afaecce
rc/com/android/server/telecom/ConnectionServiceWrapper.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
b800a711380e5c779e1492b4c968b6211ee417e1 28-Oct-2016 Tyler Gunn <tgunn@google.com> Log calls which were rejected in call log appropriately. am: e013781e66 am: a9b17070ec am: 500a948223
am: f119da189b

Change-Id: I4a5e889e676aff057e98985e1002d6746dcd5a5b
f119da189b40b855395acb19eacd2348e26ae7d0 28-Oct-2016 Tyler Gunn <tgunn@google.com> Log calls which were rejected in call log appropriately. am: e013781e66 am: a9b17070ec
am: 500a948223

Change-Id: I3679ea2aeec006c94370aeb546b6ab85e62ca72a
500a9482232830120b488aa0eb3dd1613a28ba0e 27-Oct-2016 Tyler Gunn <tgunn@google.com> Log calls which were rejected in call log appropriately. am: e013781e66
am: a9b17070ec

Change-Id: I854162a384f8c1d5fc42bc4474261c16dc631294
a04db92d34ca1e8136fecd37dcdfde3e5d299f65 27-Oct-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of d1b3669 to stage-aosp-master am: 5b2880ad91 am: a4faeeef90
am: d0ad1052e9

Change-Id: Ib1c96d12a5d5139f9bad804f48bb9742e28da234
a9b17070ecfc28475f3804778049cd4f6b53eba6 27-Oct-2016 Tyler Gunn <tgunn@google.com> Log calls which were rejected in call log appropriately.
am: e013781e66

Change-Id: I6d0c876228eba759a97b391255a6edfbddf24cd2
d0ad1052e9ecb32276b07f7042ad3bc9ebb240f5 27-Oct-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of d1b3669 to stage-aosp-master am: 5b2880ad91
am: a4faeeef90

Change-Id: Iade8f73c6aad07ef886956ba49af2fb6b5a47db5
a4faeeef90e446557a5da7d92b2be02f2c7922e5 27-Oct-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of d1b3669 to stage-aosp-master
am: 5b2880ad91

Change-Id: Iecc3c633200d327608706a114d37d5a8ff8545ef
5b2880ad91162feb778f3b7c96b5e1c76f382086 27-Oct-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of d1b3669 to stage-aosp-master

Change-Id: I5c771d7edf789ef8c70c9c0eb86243d8bc4a7549
e013781e66c1740dd5a8dcf998a7c89a7c133391 28-Jul-2016 Tyler Gunn <tgunn@google.com> Log calls which were rejected in call log appropriately.

The case for DisconnectCause.REJECTED was not being handled in the call
logging code. This is important when logging calls locally disconnected
(multiendpoint), and also for calls rejected locally.

Dialer already shows these appropriately in the call log as
"declined call".

Test: All Telecom unit tests run with the "lite_test_telecom" command
Bug: 30474601
Bug: 28813047
Change-Id: Ieb68eed5806658ee975d90c7388e454ae86a0431
rc/com/android/server/telecom/CallLogManager.java
d1b36695f77189f008e2de82b4391e5e49048c18 20-Jun-2016 Brad Ebinger <breadley@google.com> Rename Telecom Call Ids to include attempt

Telecom Call Ids will now append an attempt id (in the form of an
integer) that will be used by the CreateConnetionProcessor to name the
Telecom Call Ids that are used during the creation of a Connection to
the ConnectionService. This allows us to better identify which
Connection is calling back to Telecom to update status, disconnect,
etc. Previously, all of the attempted Connections in
CreateConnectionProcessor would be given the same name, which could lead
to multiple Connections trying to manage the same Call object in
Telecom.

Also, a supporting tests were added and a few Unit Tests were fixed.

Test: Telecom Unit Tests Run
Bug: 28799824
Change-Id: I7e23497ab671712bc8d3cc9542537ae1c4829afc
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallIdMapper.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneNumberUtilsAdapter.java
rc/com/android/server/telecom/PhoneNumberUtilsAdapterImpl.java
rc/com/android/server/telecom/ServiceBinder.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
de5e34bfad636fe8c748cd881ee0859cd0c02d14 26-Oct-2016 Brad Ebinger <breadley@google.com> Extend SessionManager tests to include External Sessions am: ba049ae754 am: 6b270d41ca am: 01583c1b3f
am: 519484c856

Change-Id: I986085aaab6c84814b325b9f4654d29346de66fd
519484c8569c0b304d35787ec671b5d5fe79cb37 26-Oct-2016 Brad Ebinger <breadley@google.com> Extend SessionManager tests to include External Sessions am: ba049ae754 am: 6b270d41ca
am: 01583c1b3f

Change-Id: Ib5bf796e6174e06bd0cf29347b30e1432f0622ef
01583c1b3f7a4e6426976ca2eced9c0b1b060bfa 26-Oct-2016 Brad Ebinger <breadley@google.com> Extend SessionManager tests to include External Sessions am: ba049ae754
am: 6b270d41ca

Change-Id: I50ddaa6a5d849f7a32a9d7b921cf41c566101426
6b270d41caf79ba0feaac7b5f1b56fde51af1639 26-Oct-2016 Brad Ebinger <breadley@google.com> Extend SessionManager tests to include External Sessions
am: ba049ae754

Change-Id: I0d1181f95971445b375fc32c9e91797468e47b38
e7fc89de11e4f4df2f9aa79a63bb741f4dc6dbf9 25-Oct-2016 Garik Badalyan <garikb@codeaurora.org> IMS: Handle USER_* messages in Quiescent* states. am: 98095c09f3 am: 01d6f73086 am: e818d349eb
am: 979766a76c

Change-Id: Iefdfd944de2a1f45acdbd202689017895410e1cb
80de421b0ebc10e93dce7f3975ab5b0451c93ea8 25-Oct-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of 0d5cae0 to stage-aosp-master am: 822fe2a1af am: d47ee81711
am: 9ce32cd3c9

Change-Id: I4c2bedff6ebf0452a3613dbec9ba20abe1b319a4
979766a76cf31fc52bc4f5a2115abd3e2952d366 25-Oct-2016 Garik Badalyan <garikb@codeaurora.org> IMS: Handle USER_* messages in Quiescent* states. am: 98095c09f3 am: 01d6f73086
am: e818d349eb

Change-Id: I4b9d164da8b9067159a77fa7eab6c4e170beb30e
9ce32cd3c97e02016860bd078f67b56fdbd56488 25-Oct-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of 0d5cae0 to stage-aosp-master am: 822fe2a1af
am: d47ee81711

Change-Id: I39a3954b3baa4b8bc39cd86cfea40e81aa29654f
e818d349eb872bacbde97b3dff3705c7b6caa0c3 25-Oct-2016 Garik Badalyan <garikb@codeaurora.org> IMS: Handle USER_* messages in Quiescent* states. am: 98095c09f3
am: 01d6f73086

Change-Id: I64d1116ce6e6d82964decb914d0da70ac9af90c8
d47ee81711303394f4b6668c9ee80ba4f390a68e 25-Oct-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of 0d5cae0 to stage-aosp-master
am: 822fe2a1af

Change-Id: I61c82f0834c9b75d08c1d0a2a03a43d4ed92d048
01d6f73086a8df15c284389675c2cb4f2809fb15 25-Oct-2016 Garik Badalyan <garikb@codeaurora.org> IMS: Handle USER_* messages in Quiescent* states.
am: 98095c09f3

Change-Id: Ib1b764d87b3f89c75b9a3c1e8909eee01da243a9
822fe2a1afd0ee83ff48a21ae093bafcc77b1d2f 25-Oct-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of 0d5cae0 to stage-aosp-master

Change-Id: I4787475841dac6a1c9ea841b48b664378d65a146
ba049ae75486276fe6c8dd609ffb4ad58674148d 22-Oct-2016 Brad Ebinger <breadley@google.com> Extend SessionManager tests to include External Sessions

Test: Telecom Unit Tests and new Tests
Bug: 26571395
Change-Id: I1a3a5d67213e53f15bf2455a24060817da6ee3fd
ests/src/com/android/server/telecom/tests/SessionManagerTest.java
98095c09f3f99b8b273c259ae8a78fe47aeb816a 06-May-2016 Garik Badalyan <garikb@codeaurora.org> IMS: Handle USER_* messages in Quiescent* states.

Currently USER_* requests are only handled in Active*
states of CallAudioRouteStateMachine which in some
cases results in ignoring user requests. This change
modifies Quiescent* states to handle USER_* messages
similiar to corresponding none-user initiated messages.

BUG=28602331
Change-Id: I1ec932b8961ed74956c81a2ccd448b7b9fbb6dca
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
0d5cae00ebfff7cf043a19ce8f833dde1d7e1282 01-Sep-2016 Hall Liu <hallliu@google.com> Fix broken and flaky unit tests

Fix unit tests to make them pass consistently in order to enable
presubmit testing.

Test: unit test fixes
Bug: 31041734
Change-Id: I1eba7302ae740cb2a0284003d999fd3274941e38
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/VideoCallTests.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
4fa106b9f2e0bbcca969087822dc7f8bb9af9273 21-Oct-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of 953e1af to stage-aosp-master am: 8f98f10d53
am: 09620827b8 -s ours

Change-Id: Ic7232f02b10ae3544bcb035cc9cfc5147b80da63
09620827b85239d8ffbf9b245b6d1ba0e10a0414 21-Oct-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of 953e1af to stage-aosp-master
am: 8f98f10d53

Change-Id: I154dddb3fb418f8921c015370863fe593e979e5b
8f98f10d53f4f7aa1605a37313a6186f90dc6c0e 21-Oct-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of 953e1af to stage-aosp-master

Test: Manual Testing
Change-Id: I3c8cac2c8b3634db7a20cceda434e6db6cdb05ca
aea58d361f334529bc45834c7c03fb4fad915961 20-Oct-2016 Brad Ebinger <breadley@google.com> Merge changes from topics 'logging_analytics_hooks', 'logging_switch'

* changes:
Adds EventManager and SessionManager callbacks for Analytics
Switch to using android.telecom.Log in Telecom
c37ddf1546a8270c8293bbd520b3fc225cd72181 18-Oct-2016 Brad Ebinger <breadley@google.com> Adds EventManager and SessionManager callbacks for Analytics

Implements the callbacks in EventManager and SessionManager to pipe the
completion time of call operations into Analytics.

Test: Manual Testing and running existing Telecom Unit Tests
Bug: 26571395
Change-Id: I14712b45ca4cf0c51e44da7eb5b4758b4eb68aaa
rc/com/android/server/telecom/LogUtils.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
3081d0a303d890892bc9bdb21c149c39ba6fe4f1 20-Oct-2016 Tyler Gunn <tgunn@google.com> Fixes for IMS Conferences via the RemoteConnectionService API. am: 9b618b8bd0 am: 7997cba917
am: e6d1762bad

Change-Id: Iaacd3691e0d7256bccf0e945ed4719ee3462c195
e6d1762bad2fff92870094a8dc4cd01269661215 20-Oct-2016 Tyler Gunn <tgunn@google.com> Fixes for IMS Conferences via the RemoteConnectionService API. am: 9b618b8bd0
am: 7997cba917

Change-Id: I495d2447799626c7881a7da2b5c33478cc17e034
7997cba9178669fef8131b231d31dbc87681f564 20-Oct-2016 Tyler Gunn <tgunn@google.com> Fixes for IMS Conferences via the RemoteConnectionService API.
am: 9b618b8bd0

Change-Id: I4dac3565bef465eb4cad3f59cefa5eb487a7f528
953e1af643b66df6f931d76c23bcc54147668cd4 06-Oct-2016 Brad Ebinger <breadley@google.com> Switch to using android.telecom.Log in Telecom

Sorry.

Test: All affected unit tests still pass.
Bug: 26571395
Change-Id: I890d68d935cd554ba89042e99c155757697e1a37
roguard.flags
rc/com/android/server/telecom/Analytics.java
rc/com/android/server/telecom/AsyncRingtonePlayer.java
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallerInfoLookupHelper.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/ContactsAsyncHelper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/DialerCodeReceiver.java
rc/com/android/server/telecom/DockManager.java
rc/com/android/server/telecom/DtmfLocalTonePlayer.java
rc/com/android/server/telecom/HeadsetMediaButton.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/InCallWakeLockController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/PhoneStateBroadcaster.java
rc/com/android/server/telecom/ProximitySensorManager.java
rc/com/android/server/telecom/QuickResponseUtils.java
rc/com/android/server/telecom/RespondViaSmsManager.java
rc/com/android/server/telecom/RespondViaSmsSettings.java
rc/com/android/server/telecom/RingbackPlayer.java
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/RingtoneFactory.java
rc/com/android/server/telecom/Runnable.java
rc/com/android/server/telecom/ServiceBinder.java
rc/com/android/server/telecom/Session.java
rc/com/android/server/telecom/StatusBarNotifier.java
rc/com/android/server/telecom/SystemStateProvider.java
rc/com/android/server/telecom/TelecomBroadcastIntentProcessor.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/TelecomWakeLock.java
rc/com/android/server/telecom/ThreadUtil.java
rc/com/android/server/telecom/Timeouts.java
rc/com/android/server/telecom/TtyManager.java
rc/com/android/server/telecom/VideoProviderProxy.java
rc/com/android/server/telecom/WiredHeadsetManager.java
rc/com/android/server/telecom/callfiltering/AsyncBlockCheckFilter.java
rc/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
rc/com/android/server/telecom/callfiltering/DirectToVoicemailCallFilter.java
rc/com/android/server/telecom/callfiltering/IncomingCallFilter.java
rc/com/android/server/telecom/components/ErrorDialogActivity.java
rc/com/android/server/telecom/components/PrimaryCallReceiver.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/components/UserCallActivity.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/CallerInfoAsyncQueryFactoryFixture.java
ests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/LogTest.java
ests/src/com/android/server/telecom/tests/MockitoHelper.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
a3eccfee788c3ac3c831a443b085b141b39bb63d 06-Oct-2016 Brad Ebinger <breadley@google.com> Switch to using android.telecom.Log in Telecom

Sorry.
CP from: https://android-review.googlesource.com/#/c/287332/

Test: Added unit tests for Log Sessions and Events. All other affected
unit tests still pass.
Bug: 26571395
Change-Id: I890d68d935cd554ba89042e99c155757697e1a37
roguard.flags
rc/com/android/server/telecom/Analytics.java
rc/com/android/server/telecom/AsyncRingtonePlayer.java
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallerInfoLookupHelper.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/ContactsAsyncHelper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/DialerCodeReceiver.java
rc/com/android/server/telecom/DockManager.java
rc/com/android/server/telecom/DtmfLocalTonePlayer.java
rc/com/android/server/telecom/HeadsetMediaButton.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/InCallWakeLockController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/LogUtils.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/PhoneStateBroadcaster.java
rc/com/android/server/telecom/ProximitySensorManager.java
rc/com/android/server/telecom/QuickResponseUtils.java
rc/com/android/server/telecom/RespondViaSmsManager.java
rc/com/android/server/telecom/RespondViaSmsSettings.java
rc/com/android/server/telecom/RingbackPlayer.java
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/RingtoneFactory.java
rc/com/android/server/telecom/Runnable.java
rc/com/android/server/telecom/ServiceBinder.java
rc/com/android/server/telecom/Session.java
rc/com/android/server/telecom/StatusBarNotifier.java
rc/com/android/server/telecom/SystemStateProvider.java
rc/com/android/server/telecom/TelecomBroadcastIntentProcessor.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/TelecomWakeLock.java
rc/com/android/server/telecom/ThreadUtil.java
rc/com/android/server/telecom/Timeouts.java
rc/com/android/server/telecom/TtyManager.java
rc/com/android/server/telecom/VideoProviderProxy.java
rc/com/android/server/telecom/WiredHeadsetManager.java
rc/com/android/server/telecom/callfiltering/AsyncBlockCheckFilter.java
rc/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
rc/com/android/server/telecom/callfiltering/DirectToVoicemailCallFilter.java
rc/com/android/server/telecom/callfiltering/IncomingCallFilter.java
rc/com/android/server/telecom/components/ErrorDialogActivity.java
rc/com/android/server/telecom/components/PrimaryCallReceiver.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/components/UserCallActivity.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/CallerInfoAsyncQueryFactoryFixture.java
ests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/LogTest.java
ests/src/com/android/server/telecom/tests/MockitoHelper.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
ests/src/com/android/server/telecom/tests/VideoCallTests.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
8811409bea3f4efdac9009365124b7cde38a4b88 19-Oct-2016 Hall Liu <hallliu@google.com> Merge "Change telecom test script to be zsh compatible" am: b23b8c9a27 am: a8bfe8fb38
am: 895766cbdc

Change-Id: Ie85e2307a9f3facfcb786a1c2172f049238aaab9
895766cbdc0946860c383dae42fc3eb92ccea728 19-Oct-2016 Hall Liu <hallliu@google.com> Merge "Change telecom test script to be zsh compatible" am: b23b8c9a27
am: a8bfe8fb38

Change-Id: I27679185c352ca9075fe93b21aadf780f337b0cd
a8bfe8fb38825e41d415284f810a150de76926a7 19-Oct-2016 Hall Liu <hallliu@google.com> Merge "Change telecom test script to be zsh compatible"
am: b23b8c9a27

Change-Id: I511e4fb838b06a695b7b9070a5ae8593b230798d
b23b8c9a278e1edc94af9e93bf95987b6cee2dfe 19-Oct-2016 Hall Liu <hallliu@google.com> Merge "Change telecom test script to be zsh compatible"
1e6f94f9dea07c7a5c303f30bfba8256548d0464 18-Oct-2016 Brad Ebinger <breadley@google.com> Adds tests for SessionManager and EventManager am: 0d2c1e61fc am: df69bcad27
am: a22965ab71

Change-Id: I462f07fc515423a8f8c7cfeb9a4e1525ef09469b
a22965ab7104223bf38275837a33890bfec80300 18-Oct-2016 Brad Ebinger <breadley@google.com> Adds tests for SessionManager and EventManager am: 0d2c1e61fc
am: df69bcad27

Change-Id: Ie895fd1c5b89f5b316b7645316e8248c66743229
df69bcad2792b1fd4d04b45919c880e320e44157 18-Oct-2016 Brad Ebinger <breadley@google.com> Adds tests for SessionManager and EventManager
am: 0d2c1e61fc

Change-Id: Ic351aa5859e059c4628d8543b7d8c4071e68c86d
0d2c1e61fcc77e4a46586e329b683946b8048400 14-Oct-2016 Brad Ebinger <breadley@google.com> Adds tests for SessionManager and EventManager

Test: Unit tests are added.
Bug: 26571395
Change-Id: Ifd17d2c286ac4a907a64ad03653420252886a8d6
rc/com/android/server/telecom/Log.java
ests/src/com/android/server/telecom/tests/EventManagerTest.java
ests/src/com/android/server/telecom/tests/LogTest.java
ests/src/com/android/server/telecom/tests/SessionManagerTest.java
9b618b8bd0e3e216ee9d9df96bec0e1f8841aa14 18-Oct-2016 Tyler Gunn <tgunn@google.com> Fixes for IMS Conferences via the RemoteConnectionService API.

IMS Conferences are problematic to Telecom when a connection manager is
used. Both addExistingConnection and addConference will result in the
addition of duplicate conference participants and conferences to Telecom.
This is because Telecom does not have a means of de-duping the two, which
have new IDs created for them when they're added via a ConnectionService.

To fix this, added a workaround which packages the original existing
connection or conference id into the connection/conference extras which
are sent to the connection manager. This way, the connection mgr can use
the same connection/conference ID was was used by the original
ConnectionService, and also perform some de-duping.

Its not optimal, and this should be fixed better in the future.

Bug: 31464792
Change-Id: I7b63f145c741c29e1735f50a473585f26ef70fc7
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/ServiceBinder.java
0c4f435ddd8a18cb4318a8890528a7e31919c994 14-Oct-2016 Hall Liu <hallliu@google.com> Change telecom test script to be zsh compatible

Adds local annotation on variables to prevent leakage and allows for the
aosp_* targets to work.

Test: developer tooling, no testing.
Change-Id: Id869dda7d5c5fd8b253d44e2815311522e674dbc
cripts/telecom_testing.sh
f4cf57384ad9c4f9bc60ae2e7450b7ba1502bd48 14-Oct-2016 Wei Liu <luciferleo@google.com> Allow (silence rather than reject) the incoming call if it has a different source (connection service) from the existing ringing call when reaching maximum ringing calls. am: 13791b9280
am: 44590f4615

Change-Id: Ia77de584fa9823ae153b6a406cdb4d0b1274214f
44590f4615554a50762cd48aaa3f744f9cf94fe9 14-Oct-2016 Wei Liu <luciferleo@google.com> Allow (silence rather than reject) the incoming call if it has a different source (connection service) from the existing ringing call when reaching maximum ringing calls.
am: 13791b9280

Change-Id: I40c72473937af3d9f6121a6bfe4be0bd70c0253d
8335ce3f06c5817f93d02e1e107107d5e38d5b72 14-Oct-2016 Brad Ebinger <breadley@google.com> Merge "Transplant Logging to android.telecom" am: 6817ba9be2 am: e0a9727add am: e7d6572db8
am: 2747da6432

Change-Id: I14e56e784a8af3bd933d5b587ab93970bd2b9150
13791b9280deb7ea80c699f4b5e45faf661f66c5 05-Oct-2016 Wei Liu <luciferleo@google.com> Allow (silence rather than reject) the incoming call if it has a
different source (connection service) from the existing ringing call
when reaching maximum ringing calls.

b/31911886

Change-Id: If01a31763c16d8835583c70cb9f297c0c189a80e
es/values/config.xml
rc/com/android/server/telecom/CallsManager.java
2747da6432a2838f4bfbb71374233d713cad9bea 14-Oct-2016 Brad Ebinger <breadley@google.com> Merge "Transplant Logging to android.telecom" am: 6817ba9be2 am: e0a9727add
am: e7d6572db8

Change-Id: I35ba6f1e78f8f23a147d9af54c837d478ed05505
e7d6572db8ccb68bb7cff486b16f3efbdd614f5a 13-Oct-2016 Brad Ebinger <breadley@google.com> Merge "Transplant Logging to android.telecom" am: 6817ba9be2
am: e0a9727add

Change-Id: I29d41bc5ae4f6739301d0966c791830a35fc6f60
e0a9727addc0c09c5b3232f12194ce96096a0356 12-Oct-2016 Brad Ebinger <breadley@google.com> Merge "Transplant Logging to android.telecom"
am: 6817ba9be2

Change-Id: I321babfb2c4022eb3eeee6e4fc3db3e4e0cb7a66
6817ba9be2589565072e8327fae39a1fb222b8be 12-Oct-2016 Brad Ebinger <breadley@google.com> Merge "Transplant Logging to android.telecom"
e4a3d9865ee9a0555e06cf2496f509f168746607 11-Oct-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of 253b129 to nyc-mr1-dev-plus-aosp
am: 14295772c3 -s ours

Change-Id: Ifab7935bd76cdebc1fe3704e7045f45200dbdb67
14295772c3c055e4b9b25b8b8e9c39a2b78f9a18 11-Oct-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of 253b129 to nyc-mr1-dev-plus-aosp

Change-Id: I9d37a418982377eb1b94596998e22467d6c86402
253b12905cd4253837aa8e769df93201697adf14 11-Oct-2016 Hall Liu <hallliu@google.com> Refactor and fix MissedCallNotifier am: 8755e29fd5
am: c1d462ebdb

Change-Id: I66226466f9a154bad2e72a7d1118759eddd81d78
c1d462ebdba9f4278455ee5815ced000aab742f5 10-Oct-2016 Hall Liu <hallliu@google.com> Refactor and fix MissedCallNotifier
am: 8755e29fd5

Change-Id: I33f0a21fe9cbeb0523a6f2c2b27c848e3598f91d
9add6d9e26f7f73a52324df60812f1450b382483 08-Oct-2016 Hall Liu <hallliu@google.com> Add extra logging to CallerInfoLookupHelper am: 36b4ee2a5e am: db47c5dbc8
am: 84545eeaf5

Change-Id: Iaa2eea9e60de37aa63db4317c225e5240d77c0fe
8755e29fd54403b404b4940d3dccebf83a8acbcf 22-Sep-2016 Hall Liu <hallliu@google.com> Refactor and fix MissedCallNotifier

This change affects the behavior of the MissedCallNotifier on system
startup. Previously, MissedCallNotifierImpl created a new Call object
and used it to pull in contacts-related data. This created excessive
dependencies for MissedCallNotifierImpl, so it has been changed to use
CallerInfoLookupHelper.

Additionally, the at-boot notification has been broken for some time,
and this was due to the calls/contacts db not being ready when
TelecomSystem was initialized. This change also deferrs the missed call
lookup to when we receive ACTION_BOOT_COMPLETE.

Test: Added unit tests, tested manually on device
Change-Id: I10fe1c78e24484ece6b87fa986e725b00c753d39
Merged-In: Ibf8ec41d8d18b5ed7943a9520242f15bf546bda7
Fix: 30796667
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/MissedCallNotifier.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/ContactsAsyncHelperTest.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
cbd125d9aef42f6c76b595018dc0158b03ed05ca 07-Oct-2016 Hall Liu <hallliu@google.com> Merge "Refactor and fix MissedCallNotifier"
84545eeaf5734fcb7e3867f6aea20c730b38c4a7 07-Oct-2016 Hall Liu <hallliu@google.com> Add extra logging to CallerInfoLookupHelper am: 36b4ee2a5e
am: db47c5dbc8

Change-Id: I40d3ca2e879fe7ef95422c8fe933a5d619277add
db47c5dbc8c523caf867c54704a6d6d0953b557b 06-Oct-2016 Hall Liu <hallliu@google.com> Add extra logging to CallerInfoLookupHelper
am: 36b4ee2a5e

Change-Id: I235eb10cd4103b1488c0962af564fea25b29d026
3037ac6f171b6a3627494bb10042ab7adb34366a 22-Sep-2016 Hall Liu <hallliu@google.com> Refactor and fix MissedCallNotifier

This change affects the behavior of the MissedCallNotifier on system
startup. Previously, MissedCallNotifierImpl created a new Call object
and used it to pull in contacts-related data. This created excessive
dependencies for MissedCallNotifierImpl, so it has been changed to use
CallerInfoLookupHelper.

Additionally, the at-boot notification has been broken for some time,
and this was due to the calls/contacts db not being ready when
TelecomSystem was initialized. This change also deferrs the missed call
lookup to when we receive ACTION_BOOT_COMPLETE.

Test: Added unit tests, tested manually on device
Change-Id: Ibf8ec41d8d18b5ed7943a9520242f15bf546bda7
Fix: 30796667
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/MissedCallNotifier.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/ContactsAsyncHelperTest.java
ests/src/com/android/server/telecom/tests/LogTest.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
36b4ee2a5ee416b359f167604900c35ffe100ba2 06-Oct-2016 Hall Liu <hallliu@google.com> Add extra logging to CallerInfoLookupHelper

Add extra logging to help diagnose timeout errors

Bug: 31755827
Change-Id: I7eee9b0f946b03df059531b7e57757b5dc4c452f
rc/com/android/server/telecom/CallerInfoLookupHelper.java
9089238976b618a5d0eddeb58f48ff93f05749d7 23-Sep-2016 Brad Ebinger <breadley@google.com> Transplant Logging to android.telecom

The initial commit of moving all of the logic into
android.telecom. Currently no functional changes, we are only adding a
temporary LogUtils class to ease the transition to this system over.

Test: Refactoring CL. All affected tests still pass.
Bug: 26571395
Change-Id: Iffdf7435ee70c7fce0e8ea85b576764b4c9d6eff
rc/com/android/server/telecom/LogUtils.java
b21aa926cd27426c99d34ac02ab6202e352096dc 30-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Assume video calls supported until user chooses phone account."
ee7b29e05d509459ecebb721c83d45208c4be559 28-Sep-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Idb4aaccf832888a07529f2739c74557ab47c9ca3
Auto-generated-cl: translation import
es/values-kn-rIN/strings.xml
ddec5892dbb532e79fd839f34db43243739f92e8 28-Sep-2016 Tyler Gunn <tgunn@google.com> Assume video calls supported until user chooses phone account.

When an outgoing Call has no target phone account, initially assume video
calling is supported by the call. Once a target phone account is set,
ensure the video state of the outgoing call is updated based on whether
video calling is supported by the target phone account.

Bug: 31094340
Change-Id: Iee1bc542b63d9be6d2f76206fdc9b87674db271c
rc/com/android/server/telecom/Call.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
a028e0dd9a5324f83c7b7444c2597550be66a00d 23-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fixed an issue in VoicemailCallFilter process timeouts." into nyc-mr1-dev am: 7bece85af5 am: 68562d652d
am: 6cb8bb82c0

Change-Id: I3bc512d6e5569d570e87874cae5f41c75d7ef24d
eda1f80aa43c98bced37d2951aecab9e3ea785a0 23-Sep-2016 Shigeru Murai <sharp_android_SA@list.sharp.co.jp> Fixed an issue in VoicemailCallFilter process timeouts. am: f2373e177b am: 8feedd6a67
am: cdf5abe0ae

Change-Id: I96371a9f4b466b4e83ff49809ca082189b55dd0e
6cb8bb82c087b9bb1f4f4df0c98074264d5bdee5 23-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fixed an issue in VoicemailCallFilter process timeouts." into nyc-mr1-dev am: 7bece85af5
am: 68562d652d

Change-Id: I8310145312d304d2e9316904e6cf46eda3feacf3
cdf5abe0ae7c787ee1ecc04523a9dd8b18c3399b 23-Sep-2016 Shigeru Murai <sharp_android_SA@list.sharp.co.jp> Fixed an issue in VoicemailCallFilter process timeouts. am: f2373e177b
am: 8feedd6a67

Change-Id: I291e6166a78662e47adc51941ae1b6c9d2bec19c
68562d652d868efcbeb30eb6b0f83596c83048db 23-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fixed an issue in VoicemailCallFilter process timeouts." into nyc-mr1-dev
am: 7bece85af5

Change-Id: I56fc89a11d8e21e7cadd38297506feb08c9eeca1
8feedd6a67c36761e963a9124ce566049ac0802b 23-Sep-2016 Shigeru Murai <sharp_android_SA@list.sharp.co.jp> Fixed an issue in VoicemailCallFilter process timeouts.
am: f2373e177b

Change-Id: Idbb9607607a334b8ddd86d1be0a30f776a15ed35
7bece85af5d4d12c488c1ed88b5c6ba72c63368b 23-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fixed an issue in VoicemailCallFilter process timeouts." into nyc-mr1-dev
562225bc2ba744e2bc46be69be2b4458e1eeb4d5 21-Sep-2016 Tyler Gunn <tgunn@google.com> Fix issue where incoming calls go into DND mode while ringing. am: 00667fc03d am: 10bbf44c8c
am: 622b646c1c

Change-Id: Ia3d943553e632ba1910cfea42aebbe5400913965
622b646c1c366db7584f4b539816bd41207af492 21-Sep-2016 Tyler Gunn <tgunn@google.com> Fix issue where incoming calls go into DND mode while ringing. am: 00667fc03d
am: 10bbf44c8c

Change-Id: If2d6369155e0852b7e4ade30fe41a8e5afa23192
10bbf44c8c3f5f642db976137e9a9d59d013f446 20-Sep-2016 Tyler Gunn <tgunn@google.com> Fix issue where incoming calls go into DND mode while ringing.
am: 00667fc03d

Change-Id: Ie836868d6c26c41bcc18625dabc0199ebd258faf
00667fc03d7b78f12eb43dedd151bdaf4941eedf 20-Sep-2016 Tyler Gunn <tgunn@google.com> Fix issue where incoming calls go into DND mode while ringing.

The previous logic for setting auto-DND mode needed a tweak. We should
only suppress notifications when the earpiece has ACTIVE focus (ie
not during ringing).

Bug: 31614063
Change-Id: I9944e8a181421f78f7e691154f571b4348fd212c
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
f2373e177b6e122b84dd1a22320629d0280de1c6 12-Sep-2016 Shigeru Murai <sharp_android_SA@list.sharp.co.jp> Fixed an issue in VoicemailCallFilter process timeouts.

Fixed an issue in VoicemailCallFilter process always timeouts
when a call incoming from anonymous number.
Test: Added two unit tests and did manual testing
Bug: 31353454
Bug: 29415740

Change-Id: I159745c25371996bb22108568b3b42ec37d358c9
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallerInfoLookupHelper.java
rc/com/android/server/telecom/callfiltering/DirectToVoicemailCallFilter.java
ests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java
ests/src/com/android/server/telecom/tests/DirectToVoicemailCallFilterTest.java
81328484d5d9ec8837f4041266eda21de1c3069c 19-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Prevent re-adding call disconnected before block check completes." into nyc-mr1-dev am: 66cd16e92f am: fa16f6201e
am: e2c5f94bcc

Change-Id: Ia13ce090bb9dec76b193e2cd394f8a375a2bd166
2c2cc31144121128beb4442ec830fe8c5a7a39e4 19-Sep-2016 Tyler Gunn <tgunn@google.com> Prevent re-adding call disconnected before block check completes. am: 2ecfd88012 am: 881730b679
am: be5604b2f1

Change-Id: Ie0dbf80c2444f5cce6589d28cd2d5e3afb74b329
e2c5f94bcc112aa4631acfece8fc429373d30206 19-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Prevent re-adding call disconnected before block check completes." into nyc-mr1-dev am: 66cd16e92f
am: fa16f6201e

Change-Id: I38ee745373de7e8948abf5b01a5a41131b1f5bef
be5604b2f1fc9a0c19186ff43572d4a9aee03b3b 19-Sep-2016 Tyler Gunn <tgunn@google.com> Prevent re-adding call disconnected before block check completes. am: 2ecfd88012
am: 881730b679

Change-Id: I09de36bac0c73da02f3f216a2b3c6ee0b2f8323d
fa16f6201e97a41f16d2f71d7397b95257661470 19-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Prevent re-adding call disconnected before block check completes." into nyc-mr1-dev
am: 66cd16e92f

Change-Id: I3ef9b10752dc0e2f1f31bc3b2bc65e1886438c42
881730b67998cba466672906c456c92172bc6220 19-Sep-2016 Tyler Gunn <tgunn@google.com> Prevent re-adding call disconnected before block check completes.
am: 2ecfd88012

Change-Id: Ib2fea25d6a1f6a0496a88817c964230fce12ea6a
6061b79e4e4262f3cebf3fb9bf841ea34d05fb75 19-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Prevent notification vibration when the user is on the earpiece." into nyc-mr1-dev am: ae07c43779 am: f44f40860f
am: e9e06b4910

Change-Id: I2587e1a431ddf0cd80f6467904212d6376f93256
efc56d998ee6b106a28eb679df92f97566f245c6 19-Sep-2016 Tyler Gunn <tgunn@google.com> Prevent notification vibration when the user is on the earpiece. am: eaaf074d6b am: d610bb315d
am: d35c95ac54

Change-Id: I87cacf45ef0877b639f64e7c4c042155f84ab3d4
66cd16e92f1268c4e7446c2bab76afd0a461d8ea 19-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Prevent re-adding call disconnected before block check completes." into nyc-mr1-dev
e9e06b491094c2168528b56c91a2f1a31edd161a 19-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Prevent notification vibration when the user is on the earpiece." into nyc-mr1-dev am: ae07c43779
am: f44f40860f

Change-Id: I88f2fd252d3b57a2e976cced9b7e84930488d040
d35c95ac54f560949a0204748ce845c447828e38 19-Sep-2016 Tyler Gunn <tgunn@google.com> Prevent notification vibration when the user is on the earpiece. am: eaaf074d6b
am: d610bb315d

Change-Id: I72cb6da8d3bb6f3c49b7446f85a99ffb0b372b49
f44f40860fd3c49ff04f0da42e28246bb4ad67d3 19-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Prevent notification vibration when the user is on the earpiece." into nyc-mr1-dev
am: ae07c43779

Change-Id: I4bbe2e00766deb8954cb46bc8b03efd54480f938
d610bb315dbb2cebde2a7bcc63b05732c9df1c26 19-Sep-2016 Tyler Gunn <tgunn@google.com> Prevent notification vibration when the user is on the earpiece.
am: eaaf074d6b

Change-Id: I5c2e60268ecdf717782fac271163207dc0c670ce
ae07c43779a82f7ebf9a02933dc959be96286d3b 19-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Prevent notification vibration when the user is on the earpiece." into nyc-mr1-dev
9e40d31ea30e2cd8a4317ba7ec97a5122f7a5572 17-Sep-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: ebf1ae8b3e -s ours am: 7d824e3ad8 -s ours am: efe9907f54 -s ours
am: bd6780e104 -s ours

Change-Id: Ia7f5d8dc2fdfd384d4165fdd3417bca6dc7f0abf
bd6780e1040945ef6aaacde619d7e9e7636f25a6 17-Sep-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: ebf1ae8b3e -s ours am: 7d824e3ad8 -s ours
am: efe9907f54 -s ours

Change-Id: I90a010226d47b840890e1e6a55b51c45b13c979b
efe9907f54d31b6e02ff8408c806f17298a99096 17-Sep-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: ebf1ae8b3e -s ours
am: 7d824e3ad8 -s ours

Change-Id: Iff2f748c6813b81a7e64517111c30b0c0e046d01
7d824e3ad8f9862bae7f6a949604936c75046890 17-Sep-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: ebf1ae8b3e -s ours

Change-Id: I53dbfbe21c978ddc30f6ca7a28451260135b4e4f
ebf1ae8b3e306084cdfbb1be41e9d35763d962d8 17-Sep-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 31516661
Change-Id: I92e75efce41bf7fbdf71e3dd252f510efc7d5d6b
es/values-kn-rIN/strings.xml
2ecfd88012c0ddb79dabff7fcbbb87e7a3dbdd0f 17-Sep-2016 Tyler Gunn <tgunn@google.com> Prevent re-adding call disconnected before block check completes.

If call filtering completes AFTER a call is disconnected, it is possible
for the call to be re-added to telecom, which is not correct.

Bug: 31083479
Change-Id: I2053d1c7ea17fa634028bf3e118139f3ca342815
rc/com/android/server/telecom/CallsManager.java
eaaf074d6b8b0b16fb922d8d511d6e8b979bfe0d 16-Sep-2016 Tyler Gunn <tgunn@google.com> Prevent notification vibration when the user is on the earpiece.

When the earpiece route is activated, if the user has not already enabled
a notification interruption filter, we will set it to alarms-only. This
ensures that notifications don't cause the phone to vibrate while in
earpiece mode.

If the user changes the interruption filter during the call we will keep
their new chosen filter when the earpiece route is disabled.

This notification filtering only takes place for the earpiece route.

Bug: 29962221
Change-Id: Ia332a988f10427a2a0f8315af9f31d854836db9f
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InterruptionFilterProxy.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
6f8b25836dc3394c636ec17f38798f56c0736926 14-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Update Telecom settings theme colors to match new Dialer colors." into nyc-mr1-dev am: 9b1b4ff740 am: a082ec295c
am: 048a5f7086

Change-Id: I814c1e1f66676f03af4ab0e4b947c28ea01c74df
cc7edaede93d416c331f36fec921c428d24790cc 14-Sep-2016 Tyler Gunn <tgunn@google.com> Update Telecom settings theme colors to match new Dialer colors. am: 91d3895c86 am: 2463cdf536
am: adc27f5f75

Change-Id: Ib725855db72e37a41e37f1844c30cc4140d29e2c
bfd8413ccfa3e53131695564484a04247ba78e50 14-Sep-2016 Hall Liu <hallliu@google.com> Merge "Don't acquire audio focus if ringtone will not play" into nyc-mr1-dev am: 1a80eccb92 am: 700b4e111a
am: feccf7810f

Change-Id: I475e8e97b761180bc95c79513c9402c75ba8fa10
aa34fec85ca9cbdd5527407727a8f4b09a0ed6e9 14-Sep-2016 Hall Liu <hallliu@google.com> Don't acquire audio focus if ringtone will not play am: 6a5995e113 am: 05e990a35c
am: ed22a3736b

Change-Id: I5434c466801478c315c83ea210697c8759e6e4fa
048a5f7086e120895909b4d8192462fb5c86e9a2 14-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Update Telecom settings theme colors to match new Dialer colors." into nyc-mr1-dev am: 9b1b4ff740
am: a082ec295c

Change-Id: Iebf9ae8f3b6550658f2e0a67ce6ae7989e5cc9cf
adc27f5f75b6d5149ee60d54042fb2bd1b0bf596 14-Sep-2016 Tyler Gunn <tgunn@google.com> Update Telecom settings theme colors to match new Dialer colors. am: 91d3895c86
am: 2463cdf536

Change-Id: I6926c8b42335fef9f62a2d504ffec190662bd599
a082ec295ca10400345b738d396b5701339f3907 14-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Update Telecom settings theme colors to match new Dialer colors." into nyc-mr1-dev
am: 9b1b4ff740

Change-Id: I7d1025bfa76bc4ea73d7d039d53c776a0cf2d1dd
2463cdf536877993c9daf2f215b7b59f076b463e 14-Sep-2016 Tyler Gunn <tgunn@google.com> Update Telecom settings theme colors to match new Dialer colors.
am: 91d3895c86

Change-Id: I26f17c35c34c704e919e18a1cd17521b7ccc4a39
9b1b4ff74084937d58cc3557ff0c60196a1a9e93 14-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update Telecom settings theme colors to match new Dialer colors." into nyc-mr1-dev
feccf7810fbcd80f49aaa10aa573924518ecfd4c 14-Sep-2016 Hall Liu <hallliu@google.com> Merge "Don't acquire audio focus if ringtone will not play" into nyc-mr1-dev am: 1a80eccb92
am: 700b4e111a

Change-Id: Ia0b1dbb199033513041b1a605e91cf3a4260e24d
ed22a3736bac08aab17547f787976c7bfe84b70a 14-Sep-2016 Hall Liu <hallliu@google.com> Don't acquire audio focus if ringtone will not play am: 6a5995e113
am: 05e990a35c

Change-Id: I8586aab37d9239d14764b1b3566220bd4343b0a9
700b4e111ac0dac3f3cae23b7d2a5c7cc0ce5c04 14-Sep-2016 Hall Liu <hallliu@google.com> Merge "Don't acquire audio focus if ringtone will not play" into nyc-mr1-dev
am: 1a80eccb92

Change-Id: Ieac02bbc4e13a3dba198dad4db8c3afdca0781e1
05e990a35c57a61c9dc86b48c5a74a1b6408cc3b 14-Sep-2016 Hall Liu <hallliu@google.com> Don't acquire audio focus if ringtone will not play
am: 6a5995e113

Change-Id: Ib1ea5e6e674bcc2d0ae6011a15383a847bbfa5b5
3ed41db2b0aaa0d3878196d716715aeacf113aff 14-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure null ConnectionService references don't crash phone." into nyc-mr1-dev am: f036c0ba85 am: 8f2592c5c8
am: e72482d9dd

Change-Id: I81bb42febd9830386e569b8e07f7a1340b128674
785785e4f85816188c19bc835047921e7abed616 14-Sep-2016 Tyler Gunn <tgunn@google.com> Ensure null ConnectionService references don't crash phone. am: 165ee7501f am: c8bb2bc553
am: 40253fcaa0

Change-Id: I0fe0f7ad9c2d584dce9d7ea79e5ffebf2bf24311
1a80eccb928f724e2b40f7593e7b7f5e45016e6c 14-Sep-2016 Hall Liu <hallliu@google.com> Merge "Don't acquire audio focus if ringtone will not play" into nyc-mr1-dev
e72482d9ddadbe3bb5b4a70ee245bc7577162a36 13-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure null ConnectionService references don't crash phone." into nyc-mr1-dev am: f036c0ba85
am: 8f2592c5c8

Change-Id: I0f7e11ddd3a3ed2d0558b1b3edac28d2366caa98
40253fcaa0edb8c0629cf6fc019ab40b9318ac04 13-Sep-2016 Tyler Gunn <tgunn@google.com> Ensure null ConnectionService references don't crash phone. am: 165ee7501f
am: c8bb2bc553

Change-Id: Ie94cf35162972df88a6337b0ce7a9761c58dadf4
91d3895c8673d4ebc4cbaefbd91b16f141d0f1cf 10-Sep-2016 Tyler Gunn <tgunn@google.com> Update Telecom settings theme colors to match new Dialer colors.

Bug: 31401043
Change-Id: Ia887a988080d0fdc10b54071973573ec73eb1ba1
es/values/colors.xml
8f2592c5c81532f65b9a05cabc2fcee011e847f1 13-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure null ConnectionService references don't crash phone." into nyc-mr1-dev
am: f036c0ba85

Change-Id: I22792e86d9070b4950f485cb45c115d615782065
c8bb2bc553d192e3f90039e3c600ce498ee1b27d 13-Sep-2016 Tyler Gunn <tgunn@google.com> Ensure null ConnectionService references don't crash phone.
am: 165ee7501f

Change-Id: I703ad6c95baa0ac0d3920e8ea8f61dc35ec950e7
f036c0ba85c7933b7ccae74b3ef008a3b18d9176 13-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure null ConnectionService references don't crash phone." into nyc-mr1-dev
e60eec9811c49cc9a0606cd9628bca8dd903e6ba 12-Sep-2016 Hall Liu <hallliu@google.com> Add connection properties to analytics am: d7fe686253 am: 39140245a2
am: e105d2f692

Change-Id: I301513f5b6d8d0a691894661d115fdd2087969e1
e105d2f6920e1814277d4d8f5dc3647c3498b983 12-Sep-2016 Hall Liu <hallliu@google.com> Add connection properties to analytics am: d7fe686253
am: 39140245a2

Change-Id: Ib8a483c0a34c8297899a3b2e0c73a4330a19c837
39140245a21485ae755dac1452736debbc03734d 12-Sep-2016 Hall Liu <hallliu@google.com> Add connection properties to analytics
am: d7fe686253

Change-Id: Ifdc2bf1350eb1aea9a139a87393d0f3643db3181
d7fe686253f2135a948cafc776aa25db645ec27e 10-Sep-2016 Hall Liu <hallliu@google.com> Add connection properties to analytics

Adds a record of which android.telecom.Connection properties were set on
a call during its lifetime. Also adds a test to verify that this behaves
correctly.

Change-Id: I1a5bc61228cbd676b8de218d503b30e8a76bfce2
Fix: 31395995
roto/telecom.proto
rc/com/android/server/telecom/Analytics.java
rc/com/android/server/telecom/Call.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
6a5995e1132bc9e3026673b93de42c46069a2d15 09-Sep-2016 Hall Liu <hallliu@google.com> Don't acquire audio focus if ringtone will not play

When the system volume is at some level that prevents an audible
ringtone from playing, don't grab audio focus so as to not interrupt
music that is playing.

Fix: 31319655

Change-Id: Ia2e4bc4b2ca8fe88e893cfd307d33e94de2b33ba
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/Ringer.java
ests/src/com/android/server/telecom/tests/CallAudioModeStateMachineTest.java
1ace8f8c6438287d0551958cc28bc91a7c8356c0 08-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fix more broken tests" into nyc-mr1-dev am: e32d0275d6 am: cb393259e6
am: afb95e55df

Change-Id: I3c2b44feee85aa701c5baf22111aad905083249f
6f348a9979f76bb0d7a37a4c4c455a518af70c67 08-Sep-2016 Hall Liu <hallliu@google.com> Fix more broken tests am: 3f54d49723 am: 5994e3bba9
am: 0830622068

Change-Id: Idafa2a7012b4925b80eb8bff540bcfcd83d4c2b0
afb95e55dfc096d3a3cc24ded6e8bc3ed020ac4e 08-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fix more broken tests" into nyc-mr1-dev am: e32d0275d6
am: cb393259e6

Change-Id: Ib559c1fc4e2303b4ca819c505d83c9c0bf2637f6
0830622068b108558bc26836a0a7240b0dfbdb48 08-Sep-2016 Hall Liu <hallliu@google.com> Fix more broken tests am: 3f54d49723
am: 5994e3bba9

Change-Id: I26ac83828f6ff740c755dae4d3597bc449e473da
cb393259e6d308b5cfe9f3caf11537d4410423ed 08-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fix more broken tests" into nyc-mr1-dev
am: e32d0275d6

Change-Id: I41243388e80f643ac67e0614efdd1cd8265fee3a
5994e3bba950b8d5d8daf0c54b26a7880b0af472 08-Sep-2016 Hall Liu <hallliu@google.com> Fix more broken tests
am: 3f54d49723

Change-Id: I22a79305e8b88264203b93b5deb015d497932a60
e32d0275d64d6799762dea643be3077495e04d20 08-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fix more broken tests" into nyc-mr1-dev
c55c0807a664c30783cc14cb45e55270e0048549 07-Sep-2016 Brad Ebinger <breadley@google.com> Merge "Remove PII from CallerInfoLookupHandle" into nyc-mr1-dev am: bab4b21e63 am: 4f5a24bc35
am: 4b849a35f0

Change-Id: I6854a661ef99afb47977c1136c61e761a36f27f3
0a6b52e8dc98789899b42826696e28bc44da880e 07-Sep-2016 Brad Ebinger <breadley@google.com> Remove PII from CallerInfoLookupHandle am: 13a96cec06 am: d725231c72
am: b4bd978670

Change-Id: I4c58012b20a92e91e96e740f33ef30b6f90e1b2d
4b849a35f00a8b190bde27cbb537b0762845f85a 07-Sep-2016 Brad Ebinger <breadley@google.com> Merge "Remove PII from CallerInfoLookupHandle" into nyc-mr1-dev am: bab4b21e63
am: 4f5a24bc35

Change-Id: I81fe6e7e5d266a2d4ce14eeeabd3400e4650f948
b4bd978670b9d88dafdcc525065aaa552af0bd83 07-Sep-2016 Brad Ebinger <breadley@google.com> Remove PII from CallerInfoLookupHandle am: 13a96cec06
am: d725231c72

Change-Id: I9bac67e2ddf4f3eca6c6c50544bd92f022a74c3b
4f5a24bc359b040166c4296e6f735adfd0c29147 07-Sep-2016 Brad Ebinger <breadley@google.com> Merge "Remove PII from CallerInfoLookupHandle" into nyc-mr1-dev
am: bab4b21e63

Change-Id: I6b9a7de9e2f495fe98ce8d4b8ba62ab56f457855
d725231c729bca67cf886d9dc0edeb5631fdea43 07-Sep-2016 Brad Ebinger <breadley@google.com> Remove PII from CallerInfoLookupHandle
am: 13a96cec06

Change-Id: Ic3546eb914a23204a5b7189f492fb549c7a3aa73
bab4b21e6343b455a2752c266d01607d603aa83c 07-Sep-2016 Brad Ebinger <breadley@google.com> Merge "Remove PII from CallerInfoLookupHandle" into nyc-mr1-dev
3f54d497235aebd98d5b8e8e0e52da92f838d657 07-Sep-2016 Hall Liu <hallliu@google.com> Fix more broken tests

Fix Analytics null pointer issue that was introduced by the
InCallService analytics change.

Mark flaky tests from CallLogManager so that they don't get run in
presubmit

Bug: 31041734
Change-Id: I974eaffaa938e37cf183bb551756b7bd2a9e7af1
ests/Android.mk
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
1b4a132e8098f3f2a74df0455eb0fa21664e243f 07-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Increase log level for VideoProviderProxy, add connection event logging." into nyc-mr1-dev am: 4d9054582d am: dcff6f424e
am: 89257f2e7c

Change-Id: Ida976230f2e9d1a145106f7d924f2cb1780f7222
59c58b75dfa966b48ff4c6f9f337c633bb2968be 07-Sep-2016 Tyler Gunn <tgunn@google.com> Increase log level for VideoProviderProxy, add connection event logging. am: 33e453811b am: 75211539da
am: bf86ac7ce3

Change-Id: I70320c5a43edbf28b03ce384b4d0a8eb1ad72931
89257f2e7c019ff578f6304b59d803a7dbcf7b11 07-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Increase log level for VideoProviderProxy, add connection event logging." into nyc-mr1-dev am: 4d9054582d
am: dcff6f424e

Change-Id: I42144507835568b76e1a89aa02f05b402d042912
bf86ac7ce3c4b0b8201a7946d9532341511438e4 07-Sep-2016 Tyler Gunn <tgunn@google.com> Increase log level for VideoProviderProxy, add connection event logging. am: 33e453811b
am: 75211539da

Change-Id: Id3be3b0a9c3506ee0c25db60b50ff0402f0f1125
dcff6f424ed95b929017216c4725814d63535919 07-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Increase log level for VideoProviderProxy, add connection event logging." into nyc-mr1-dev
am: 4d9054582d

Change-Id: I4fa7ed589cb9cfcff652378ab1d521ae61dc8d0b
75211539da9f7c9ee28db94f732a995f6278a6d0 07-Sep-2016 Tyler Gunn <tgunn@google.com> Increase log level for VideoProviderProxy, add connection event logging.
am: 33e453811b

Change-Id: I600ef59282883eece04a3061d248abf648a1b865
4d9054582d9fd87503833fbc2375bc2f6eaffa9c 07-Sep-2016 Tyler Gunn <tgunn@google.com> Merge "Increase log level for VideoProviderProxy, add connection event logging." into nyc-mr1-dev
13a96cec066e0275cc07c7f8cafc57585c735833 07-Sep-2016 Brad Ebinger <breadley@google.com> Remove PII from CallerInfoLookupHandle

Removes PII from certain CallerInfoLookupHandle log messages.

Change-Id: I0a6ecb0bbd5c77fb2b265d78f9cfa3974637f706
Fixes: 31296057
rc/com/android/server/telecom/CallerInfoLookupHelper.java
68e0d8d728907e5996ca986168c7535d19caff34 06-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix broken System.getStringForUser"
165ee7501fb1a13b5dcde1a9986426cfa0c93f4d 06-Sep-2016 Tyler Gunn <tgunn@google.com> Ensure null ConnectionService references don't crash phone.

- Modified Call logic to remove precondition asserts for mConnectionService
in favor of null check and error logging.
- Modify rejectCallAndLog to skip calling reject on the incoming call if it
is already destroyed. This is due to a call which was ended before the
call filtering completes.

Bug: 31236443
Change-Id: I0f93c65697a1b8e697a49118d642ecffe3dea130
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
46fdd985e8ab7e9fe31dfd8c2870f7c70ba8babc 06-Sep-2016 Robin Lee <rgl@google.com> Fix broken System.getStringForUser

This makes work ringtones work as intended when the personal side has
'none' set as a ringtone.

That was failing because this code used to quietly return the answer
for the primary profile no matter what the arguments were, because
the default 3rd argument is UserHandle.myUserId().

We should add a warning against this, or alternatively we should fix
the default argument in the next release after thorough testing.

Bug: 30658854
Change-Id: I7ce702021e45978add17d26244c4f90f8ecdcefc
rc/com/android/server/telecom/RingtoneFactory.java
970aa401a0f099c30a2ced11fef79a2696f5600b 02-Sep-2016 Hall Liu <hallliu@google.com> Merge "Add In-call services to Analytics" into nyc-mr1-dev am: 808558a035 am: 08d6cefa4f
am: acdbe650ff

Change-Id: I52043fe5f807306c6555e882f5f4ec21a6d8d277
6f0977a053c749d2ac1677668ba73bdefcaa0d96 02-Sep-2016 Hall Liu <hallliu@google.com> Add In-call services to Analytics am: 9d15ca4316 am: 84bef21d3c
am: 965872acfe

Change-Id: I0709da682e6529d79df18d6b6e762660b74dba2b
acdbe650ff64ad55b1a7478f3bd14dd4919a8168 02-Sep-2016 Hall Liu <hallliu@google.com> Merge "Add In-call services to Analytics" into nyc-mr1-dev am: 808558a035
am: 08d6cefa4f

Change-Id: Iaaf50106940e757e884cb257736320114f4066b9
965872acfe390c8a6849c6c999e677f2b4b880ea 02-Sep-2016 Hall Liu <hallliu@google.com> Add In-call services to Analytics am: 9d15ca4316
am: 84bef21d3c

Change-Id: I59e7800082afef38f49041a8e2fefefa99a75ac7
08d6cefa4f0e9f77ff060665cc0e67b751733a73 02-Sep-2016 Hall Liu <hallliu@google.com> Merge "Add In-call services to Analytics" into nyc-mr1-dev
am: 808558a035

Change-Id: I5b62582e5b955408dcf0872251fd3b2d8b310863
84bef21d3c4298079b630829e4398da1c29f5098 02-Sep-2016 Hall Liu <hallliu@google.com> Add In-call services to Analytics
am: 9d15ca4316

Change-Id: I52b6e05c227fe770eea9d544d78f1896bd58a55c
808558a035fdc4a05430df37baa27842c1f8fed5 02-Sep-2016 Hall Liu <hallliu@google.com> Merge "Add In-call services to Analytics" into nyc-mr1-dev
6bd17a7e278750c137f0cf69702a2494751f3e8e 02-Sep-2016 Hall Liu <hallliu@google.com> Merge "Remove unused AsyncResultCallback class"
33e453811b7dc0af47301d1aa22384de3d464da4 02-Sep-2016 Tyler Gunn <tgunn@google.com> Increase log level for VideoProviderProxy, add connection event logging.

Increased log level for VideoPRoviderProxy to info (this is not a very
chatty API) to aid test team; this is primarily to expose the sesssion
events -- I didn't see a value of putting these in the regular telecom
event logs.
Added Connection Event logging in the telecom event logging.

Bug: 31199425
Change-Id: I33ac8a67ae6c4a16c26a6c3d0ccf696735e730bb
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/VideoProviderProxy.java
9e0e4d1d1ce3deddb36e57e1f5322d72062c4b02 02-Sep-2016 Brad Ebinger <breadley@google.com> Use the Telecom lock in Telecom.Runnable am: a68f0af525 am: ea48bbba4a am: c651b5388e
am: 0a7870ab1b

Change-Id: I32ccb844634a96a705d157549fc8623af7f5edb0
0a7870ab1b3fac145554c94558cf974828171f87 02-Sep-2016 Brad Ebinger <breadley@google.com> Use the Telecom lock in Telecom.Runnable am: a68f0af525 am: ea48bbba4a
am: c651b5388e

Change-Id: I4db5fb254c2c03921002db16b010bcd80b27d651
c651b5388ec4be13f3c5e8acf1150d225065ddd6 02-Sep-2016 Brad Ebinger <breadley@google.com> Use the Telecom lock in Telecom.Runnable am: a68f0af525
am: ea48bbba4a

Change-Id: Ief3b20bb327bb4844810d0ad1c895c750e3674aa
ea48bbba4a27f25e3259bf8d54d0ad7cf8505a61 02-Sep-2016 Brad Ebinger <breadley@google.com> Use the Telecom lock in Telecom.Runnable
am: a68f0af525

Change-Id: Id557134901be5ac16e0ed5bf0482b51f036bb51c
c354ea0fe1f344f24707d9af42a2161c5045f84e 02-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fix broken and flaky unit tests" into nyc-mr1-dev am: 005710d242 am: 30c72903ff
am: ea8a616ab6

Change-Id: I71c7df509f238647a6e84e9511384b6f2c11deba
5625a728d9476159cdcac26415386f4eec2b2ee4 02-Sep-2016 Hall Liu <hallliu@google.com> Fix broken and flaky unit tests am: 609992b6d2 am: 0635373274
am: 43a2bb1d44

Change-Id: I39b5c4ccd5744a548b900cc4bc3f893f14eb89ea
ea8a616ab69e051d56757d519c72a4b6579470d0 02-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fix broken and flaky unit tests" into nyc-mr1-dev am: 005710d242
am: 30c72903ff

Change-Id: I735703d90c9b92772da0d323d2517c211f5817fd
43a2bb1d44df467e5762a32f0e5acb4bcd30d418 02-Sep-2016 Hall Liu <hallliu@google.com> Fix broken and flaky unit tests am: 609992b6d2
am: 0635373274

Change-Id: I6fb76ffa4387fca89d2e17cd1e2c55a4db282cf3
30c72903ff50ed5166e9550514293055a38e6237 02-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fix broken and flaky unit tests" into nyc-mr1-dev
am: 005710d242

Change-Id: Ie6ef0976314c5f3820a20767bbe1c10ade3c6052
063537327432647774e02bbebe7b9593d9c6eaeb 02-Sep-2016 Hall Liu <hallliu@google.com> Fix broken and flaky unit tests
am: 609992b6d2

Change-Id: Ide38269e39e32d3cd3995ff5945cddfdb40a43f8
005710d24232dcb84fd39ba711774fa27c488339 02-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fix broken and flaky unit tests" into nyc-mr1-dev
609992b6d222e54a74cc7e6af06173090103a28a 01-Sep-2016 Hall Liu <hallliu@google.com> Fix broken and flaky unit tests

Fix unit tests to make them pass consistently in order to enable
presubmit testing.

Bug: 31041734
Change-Id: I1eba7302ae740cb2a0284003d999fd3274941e38
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/VideoCallTests.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
734f838bef85bb301310cda5f4b1f566d73f69bc 01-Sep-2016 Hall Liu <hallliu@google.com> Merge "Skip call filtering when in ECB mode" into nyc-mr1-dev am: cb3a48d083 am: 3a41ccd466
am: 814d0a400e

Change-Id: I0bf32f61604ad360c33008a05058e345ffd3bb4f
7983626aedfdbaa4f6c085210ba8ebf7f58ba5cc 01-Sep-2016 Hall Liu <hallliu@google.com> Skip call filtering when in ECB mode am: ddf3f9c445 am: b8d5a347ea
am: 9ab86fb1a2

Change-Id: Ibe6378eacff0388984581762560245a2ba3943db
a68f0af5258e78b3eea19f5f3885d698a65d4442 26-Aug-2016 Brad Ebinger <breadley@google.com> Use the Telecom lock in Telecom.Runnable

To prevent deadlocks in Telecom when using Session Runnables, we will
now lock on the main Telecom Lock instead of an independent lock inside
of Telecom.

Bug: 31076766
Change-Id: I993d7f2e8b077f89daef72ce1ca7b7fad2ad8823
(cherry picked from commit f5e066609d0acc7ff53752bd6b9e3f2634bd0746)
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/CallerInfoLookupHelper.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/Runnable.java
rc/com/android/server/telecom/callfiltering/IncomingCallFilter.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
814d0a400ec14d700268de846bc0dd93e5249668 31-Aug-2016 Hall Liu <hallliu@google.com> Merge "Skip call filtering when in ECB mode" into nyc-mr1-dev am: cb3a48d083
am: 3a41ccd466

Change-Id: Ia195aa41acfd9be195cca4f0921b02aa6f86c122
9ab86fb1a2f994d12e3595a39e6edb12a9e2042a 31-Aug-2016 Hall Liu <hallliu@google.com> Skip call filtering when in ECB mode am: ddf3f9c445
am: b8d5a347ea

Change-Id: I83ed4912bf3483d083d18e28e39b4aa0fe6633a3
3a41ccd466a21aca4e354f56bc815ff4625ba7d7 31-Aug-2016 Hall Liu <hallliu@google.com> Merge "Skip call filtering when in ECB mode" into nyc-mr1-dev
am: cb3a48d083

Change-Id: Ief9ac7c74b6147e5df1ef0981dc37d67354ad5f1
b8d5a347ea1390c972d3ef1fc43cc119a27fa1e6 31-Aug-2016 Hall Liu <hallliu@google.com> Skip call filtering when in ECB mode
am: ddf3f9c445

Change-Id: Ifffed50873f9fae183092a0d4d02c1c7447cd3a3
cb3a48d08340ab92586635f5db9326c62bf3c7d2 31-Aug-2016 Hall Liu <hallliu@google.com> Merge "Skip call filtering when in ECB mode" into nyc-mr1-dev
9d15ca4316bb3a89bba11b62d2e17e2fb80fdc74 31-Aug-2016 Hall Liu <hallliu@google.com> Add In-call services to Analytics

Add a repeated field to the analytics proto containing the name of the
in-call service and the type, and adds code to populate the field from
InCallController.

Fix: 29228080
Change-Id: Ic57cd220e7f5ce1409516e520380f635c54d3013
roto/telecom.proto
rc/com/android/server/telecom/Analytics.java
rc/com/android/server/telecom/InCallController.java
de04141e6b875df0067ed7b7332c12d42a47b6af 31-Aug-2016 Hall Liu <hallliu@google.com> Merge "Fix headset media button long press cannot reject call."
ddf3f9c445699db2034da580db02dcaaddcdd322 30-Aug-2016 Hall Liu <hallliu@google.com> Skip call filtering when in ECB mode

When an incoming call is received in emergency callback mode, do not
perform any call filtering and just let the call through.

Change-Id: Ib459d9c88fe4b7fcb3fe7ab5b1bd968f0f513d7e
Fix: 30005987
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ParcelableCallUtils.java
f025228fa680d902734ed321aff03ea2bb7603c8 30-Aug-2016 Brad Ebinger <breadley@google.com> Don't remove elements while using foreach am: e680e66295 am: 65a9e93c17 am: 09e8922a9e
am: b07a16b675

Change-Id: I33180c762b7a7ce7e70ffdadc852e7780d12df4d
c73ca8dc745b567af6b0101af8c92dd2ec3a38b1 21-Apr-2016 yifan.bai <yifan.bai@spreadtrum.com> Fix headset media button long press cannot reject call.

When making phone call with headset, another call incoming, long press
headset media button to reject new incoming call, call cannot be
rejected and first call will be muted. This is because SHORT_PRESS
should not be judged by ACTION_UP event's repeatCount which will be
always 0. Actually, ACTION_DOWN event's repeatCount only increases when
LONG_PRESS is performed.

Also, swapping SHORT and LONG press actions between MUTE and HANGUP to
match more of the existing devices.

Fix: 30012668

Change-Id: I6ec28a2676a86cfa06819e297136ff413c14f169
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/HeadsetMediaButton.java
b07a16b675e91cbe6ccfe466639ad316c80627d9 30-Aug-2016 Brad Ebinger <breadley@google.com> Don't remove elements while using foreach am: e680e66295 am: 65a9e93c17
am: 09e8922a9e

Change-Id: I9e02fdb1c114e64e2c7ef12a4e868687c77814b4
09e8922a9e97c2a7a2bbde8888c15826cd69c341 30-Aug-2016 Brad Ebinger <breadley@google.com> Don't remove elements while using foreach am: e680e66295
am: 65a9e93c17

Change-Id: Id64870c943482fdd1d773e3ad9f72dc39207abdc
65a9e93c17767934e455c3cde0265f2ca0cad07c 30-Aug-2016 Brad Ebinger <breadley@google.com> Don't remove elements while using foreach
am: e680e66295

Change-Id: I55da207c92542a2860098bd3f955d64c1c84f4eb
096bcbe36503696c733aadd91e2758dff114d44a 30-Aug-2016 Hall Liu <hallliu@google.com> Remove unused AsyncResultCallback class

Change-Id: Ifdb6faff45fa113c784e87587a7eb595ef4b8b73
rc/com/android/server/telecom/AsyncResultCallback.java
9360ff97565fd902a88e18ced355a62577385d67 29-Aug-2016 Brad Ebinger <breadley@google.com> Merge "Use the Telecom lock in Telecom.Runnable" into nyc-mr1-dev am: d532ef0fdc am: 6d598db1c1
am: 8ad4b2d5f7

Change-Id: Ie08ce9688f29aa4b663cc664ff29b7678ce46019
8efc7a4aa6c484c87cff6e9a0c988fd4e90507c3 29-Aug-2016 Brad Ebinger <breadley@google.com> Use the Telecom lock in Telecom.Runnable am: f5e066609d am: 7a0afc825d
am: c6f6e4a142

Change-Id: Ia5c708c7a82a71654bed0fa73ce2d2de7af4f908
676fe0df26f9346e70a3e8baffbc7e3d78040245 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Add ringing state for bluetooth audio route" into nyc-mr1-dev am: 7f11cdd18c am: 098a656650
am: 532caea5c9

Change-Id: Ideaeccbe3823699f34986e9908e66a38caa61695
09c17aa26ef0e83e628da345a100237d1217bfdc 29-Aug-2016 Hall Liu <hallliu@google.com> Add ringing state for bluetooth audio route am: e271f2268d am: 63192dc1e7
am: 246ca7bc13

Change-Id: I8835e0344e1f798472207234ce7b602164021ccc
55ad73b70012637db52c6e23d082250d05dc3679 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Only play end-of-call tone for certain call terminations" into nyc-mr1-dev am: c928e2e49b am: 4eed9ff67a
am: 5f5afa3894

Change-Id: I56532ce4a944d31c84ffd108b7b63cde0ddb7efd
4ddba7afe1c496b497cf7bc062a0c2b5f27e7292 29-Aug-2016 Hall Liu <hallliu@google.com> Only play end-of-call tone for certain call terminations am: 9029d1c33e am: 3db341769c
am: b29757546a

Change-Id: I5ee5eedfe35617a314764c8b4c67e893c869bf42
2dea1fac14bc5800e0c6f0472b4eb81b87608755 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Fix broken test and in-call controller bug" into nyc-mr1-dev am: b7be9e20d3 am: d9442ff972
am: 282b13adb8

Change-Id: Ia57e5710f36b3375c2b01491c396796391fce4e3
627dcfcb7b0e28e85f66f4e24a57a77b8e9c9ccf 29-Aug-2016 Hall Liu <hallliu@google.com> Fix broken test and in-call controller bug am: 28b82f0fe9 am: 98a0a8d5e7
am: 276d92b3f5

Change-Id: Ib5081693e3593c04e28b0a776e47f4759aef03ec
8ad4b2d5f7aacb469471d9e0f97f3eb2de4dc9fa 29-Aug-2016 Brad Ebinger <breadley@google.com> Merge "Use the Telecom lock in Telecom.Runnable" into nyc-mr1-dev am: d532ef0fdc
am: 6d598db1c1

Change-Id: I10fba58d5ab3fa1f0119c2d696f2c0a0aa2c3c2e
c6f6e4a1424c9de53e4c69d696fa2dbd29bcdeea 29-Aug-2016 Brad Ebinger <breadley@google.com> Use the Telecom lock in Telecom.Runnable am: f5e066609d
am: 7a0afc825d

Change-Id: I2e5483de210ef6b58a3cd8260cae715f0b82a3c1
532caea5c952ec8b030d202ca1cb6119e7ed6542 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Add ringing state for bluetooth audio route" into nyc-mr1-dev am: 7f11cdd18c
am: 098a656650

Change-Id: I00e3bf4ad232e9df9df50e31d3271b2a3c4b4975
246ca7bc1387213409fe6857e2e5b79ee33e95a4 29-Aug-2016 Hall Liu <hallliu@google.com> Add ringing state for bluetooth audio route am: e271f2268d
am: 63192dc1e7

Change-Id: I994a94d7225c3e7ce4cac88558849ba178646b84
6d598db1c17ab82d2bcf263578c6e68a78eaef7b 29-Aug-2016 Brad Ebinger <breadley@google.com> Merge "Use the Telecom lock in Telecom.Runnable" into nyc-mr1-dev
am: d532ef0fdc

Change-Id: Idc5e3c7941cc1b52495b901d3c0fba61c77a4aa8
7a0afc825dfced7aef753deb597f2c755f66ae03 29-Aug-2016 Brad Ebinger <breadley@google.com> Use the Telecom lock in Telecom.Runnable
am: f5e066609d

Change-Id: Ifa5aa24dc30a155516efcf86cb048509558d0a50
098a6566503e9ba067eac1df74ff3372423938bc 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Add ringing state for bluetooth audio route" into nyc-mr1-dev
am: 7f11cdd18c

Change-Id: I5bf43e85637367c2657f086505f37787ac7748ca
63192dc1e72e296c88aebf6b50fc774d3603154a 29-Aug-2016 Hall Liu <hallliu@google.com> Add ringing state for bluetooth audio route
am: e271f2268d

Change-Id: Icc47e93a9ad75a28f661d3fc5653c88a3897dbff
d532ef0fdce6a54fde316c5adce10510c8954cb4 29-Aug-2016 Brad Ebinger <breadley@google.com> Merge "Use the Telecom lock in Telecom.Runnable" into nyc-mr1-dev
7f11cdd18c94a047b6743690858594ac52be59d1 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Add ringing state for bluetooth audio route" into nyc-mr1-dev
5f5afa3894de04241bfe94b0e11fe226455038d0 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Only play end-of-call tone for certain call terminations" into nyc-mr1-dev am: c928e2e49b
am: 4eed9ff67a

Change-Id: I8fe6a7792e6c01b951889035a852293762d23b7b
b29757546a603475f13e09ba4051714250144095 29-Aug-2016 Hall Liu <hallliu@google.com> Only play end-of-call tone for certain call terminations am: 9029d1c33e
am: 3db341769c

Change-Id: Icb9cb6588032ff79a6aa3a815473f753ff6d0584
282b13adb8992074e82001ea640f3544c1c5f65b 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Fix broken test and in-call controller bug" into nyc-mr1-dev am: b7be9e20d3
am: d9442ff972

Change-Id: I7795702dd8be38364eb5e5057feac7f66da0c281
276d92b3f5bf20a4f94f908e9efe4e534f6a58fc 29-Aug-2016 Hall Liu <hallliu@google.com> Fix broken test and in-call controller bug am: 28b82f0fe9
am: 98a0a8d5e7

Change-Id: Iebfe7255be490d58bedd03b9392eb69e3a183e6b
4eed9ff67a290cd4215695bf7638dcbda4d0f6bb 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Only play end-of-call tone for certain call terminations" into nyc-mr1-dev
am: c928e2e49b

Change-Id: I2a71e485a019b48978d4ff9fbd17ea5e7b518620
3db341769cdcaa6a4349d9788012e4e08af6728c 29-Aug-2016 Hall Liu <hallliu@google.com> Only play end-of-call tone for certain call terminations
am: 9029d1c33e

Change-Id: I3422b71f5cade7ee6cfda51785e74fad1d1cfdd0
d9442ff972f77ae134a26391a429bfb4b003931f 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Fix broken test and in-call controller bug" into nyc-mr1-dev
am: b7be9e20d3

Change-Id: I1144b5e15583938f4ff247ccee4d87e218a44c16
98a0a8d5e77076d98ae82323b3983a73fb83b5ef 29-Aug-2016 Hall Liu <hallliu@google.com> Fix broken test and in-call controller bug
am: 28b82f0fe9

Change-Id: Id3eb39c2883b2d10ce5ed67a2d3fc5eb42baef97
c928e2e49b413918feb309c8c4d1c70b7576841c 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Only play end-of-call tone for certain call terminations" into nyc-mr1-dev
b7be9e20d3607600a6a599a9293371c76c19684b 29-Aug-2016 Hall Liu <hallliu@google.com> Merge "Fix broken test and in-call controller bug" into nyc-mr1-dev
e680e66295e03bc0ae8b419c4fad4af460298748 26-Aug-2016 Brad Ebinger <breadley@google.com> Don't remove elements while using foreach

We were using a foreach in reuseOutgoingCall and removing an element if
it meets a certain criteria. This is incorrect in Java. Switching to an
iterator.

Bug: 31102577
Change-Id: I086a53a732ee5ab8f6ccea60fec9745ce6821f24
rc/com/android/server/telecom/CallsManager.java
f5e066609d0acc7ff53752bd6b9e3f2634bd0746 26-Aug-2016 Brad Ebinger <breadley@google.com> Use the Telecom lock in Telecom.Runnable

To prevent deadlocks in Telecom when using Session Runnables, we will
now lock on the main Telecom Lock instead of an independent lock inside
of Telecom.

Bug: 31076766
Change-Id: I993d7f2e8b077f89daef72ce1ca7b7fad2ad8823
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/CallerInfoLookupHelper.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/Runnable.java
rc/com/android/server/telecom/callfiltering/IncomingCallFilter.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
3f751cc3c76b8ba85f34b6c5ac13142f1a570503 26-Aug-2016 Hall Liu <hallliu@google.com> Merge "Add dumpsys to Telecom analytics output" into nyc-mr1-dev am: 24d7474ab4 am: 7ae63cc50e
am: 6bfd3f5a4a

Change-Id: Ibc66efdb1fea7b675cbf29d07de3d249f6cd5edb
fa8fa2284d72adabaec055f34e74b9a935422927 26-Aug-2016 Hall Liu <hallliu@google.com> Add dumpsys to Telecom analytics output am: 2f4f0a038d am: 02a3e36e29
am: 6b3ecbfa81

Change-Id: I2b368384c2d21acdc801dc91f852ff98ba233cb4
6bfd3f5a4a7fe40d9819f7c37685f278179bd28d 26-Aug-2016 Hall Liu <hallliu@google.com> Merge "Add dumpsys to Telecom analytics output" into nyc-mr1-dev am: 24d7474ab4
am: 7ae63cc50e

Change-Id: Ibfd4b4b3631fa2d6977d42930f56acfda49c1450
6b3ecbfa812480598c3e064f6a3e42b544fa39df 26-Aug-2016 Hall Liu <hallliu@google.com> Add dumpsys to Telecom analytics output am: 2f4f0a038d
am: 02a3e36e29

Change-Id: I391e6648d383a81d006f2afbcaa4b275327f1f89
7ae63cc50e09cee415dc4180e047bb70b7dbed78 26-Aug-2016 Hall Liu <hallliu@google.com> Merge "Add dumpsys to Telecom analytics output" into nyc-mr1-dev
am: 24d7474ab4

Change-Id: Ie27b19f4b39e5518ebe4b9d34ab02fac09381511
02a3e36e2959db9a93042df546f6c02d42de1a51 26-Aug-2016 Hall Liu <hallliu@google.com> Add dumpsys to Telecom analytics output
am: 2f4f0a038d

Change-Id: I3fc8779f455b85da4f26d4f50b24e77a94cf6641
24d7474ab444aba0462f5ad02079d50dce242c78 26-Aug-2016 Hall Liu <hallliu@google.com> Merge "Add dumpsys to Telecom analytics output" into nyc-mr1-dev
38f27a887cdf5828aabcf9591a640d7c3440b6a8 26-Aug-2016 Allen Hair <allenhair@google.com> Merge "Configure code coverage filter." into nyc-mr1-dev am: 4413f7c3bc am: f055b30f36
am: 482e882b67

Change-Id: Iba1c2efb3ed14caa8576a210ff0c2aca3381c655
5ab371a27f2dab43a330dfad4f8f9a7e46a972c5 26-Aug-2016 Allen Hair <allenhair@google.com> Configure code coverage filter. am: 533962925e am: 3a2135d7fb
am: ad79adeb78

Change-Id: Ifc562515d7ed2a4b1d630049830a096a25567d2b
482e882b6718d23740efd86880bc132038fa6c6f 26-Aug-2016 Allen Hair <allenhair@google.com> Merge "Configure code coverage filter." into nyc-mr1-dev am: 4413f7c3bc
am: f055b30f36

Change-Id: I37eda408da9724e2493318e1d310a0c39fe3c3cd
ad79adeb78dbafa39dc6bb0e910be7cca5d44298 26-Aug-2016 Allen Hair <allenhair@google.com> Configure code coverage filter. am: 533962925e
am: 3a2135d7fb

Change-Id: I96e70e835e17b483fb5df68df0b46b2f53519c0e
f055b30f36a74b6b921e74e3924fc3731f178ffd 26-Aug-2016 Allen Hair <allenhair@google.com> Merge "Configure code coverage filter." into nyc-mr1-dev
am: 4413f7c3bc

Change-Id: Idd3b49a0b13a2acd69812aa7cd3f75c06009a341
3a2135d7fbc96c45f5b31551b4633871c2521160 26-Aug-2016 Allen Hair <allenhair@google.com> Configure code coverage filter.
am: 533962925e

Change-Id: Ib4039c844da4d95059c5b13f8d2e089543e2dfd5
4413f7c3bc148d3b7c347ad2f9ce44c6d1461618 26-Aug-2016 Allen Hair <allenhair@google.com> Merge "Configure code coverage filter." into nyc-mr1-dev
533962925e064361b04ed48d99486c8c711caf65 26-Aug-2016 Allen Hair <allenhair@google.com> Configure code coverage filter.

Bug: 28269038
Change-Id: I658a05d526d4bd2fda5573d57287968edba1ae0e
ests/Android.mk
cdc1dedf83e7ebce4a267823dc557824637cd35f 22-Aug-2016 Hall Liu <hallliu@google.com> Merge "Extend timeout for reusing a call disconnected via NOCIB" into nyc-mr1-dev am: 370b17ac2c am: 838bf93a87
am: f7bc5d4389

Change-Id: Idcc875053a1e7ddd715b63b41890672674a1f20d
a509ce444d634f1963332f00f956b3e14f26c861 22-Aug-2016 Hall Liu <hallliu@google.com> Extend timeout for reusing a call disconnected via NOCIB am: 3d2cd5f563 am: 3621c3de7d
am: 738b28da3d

Change-Id: I4f61add05a8ddd4eb49596ea8b830e659efe60de
f7bc5d43893d0788fd8a2d5b16154ee8ca7abfe9 22-Aug-2016 Hall Liu <hallliu@google.com> Merge "Extend timeout for reusing a call disconnected via NOCIB" into nyc-mr1-dev am: 370b17ac2c
am: 838bf93a87

Change-Id: Id12deed95224920921838caed2ae73bdece2134b
738b28da3dd878aefd64c63331e440fa6f0181ac 22-Aug-2016 Hall Liu <hallliu@google.com> Extend timeout for reusing a call disconnected via NOCIB am: 3d2cd5f563
am: 3621c3de7d

Change-Id: Ia2f6a521050cc3e9d7fd4fa19918781bde496c5a
838bf93a8744956aae4cfb3e71a10afa54425e91 22-Aug-2016 Hall Liu <hallliu@google.com> Merge "Extend timeout for reusing a call disconnected via NOCIB" into nyc-mr1-dev
am: 370b17ac2c

Change-Id: I454925bb39af374585e758d2fcfa0072ac652ded
3621c3de7df529250adb77765df68bcbf77416d7 22-Aug-2016 Hall Liu <hallliu@google.com> Extend timeout for reusing a call disconnected via NOCIB
am: 3d2cd5f563

Change-Id: Ia745347f3b6a260819382bd337750aab7fc5db90
370b17ac2c137bd93c6fb7b0543cc3ae58eef390 22-Aug-2016 Hall Liu <hallliu@google.com> Merge "Extend timeout for reusing a call disconnected via NOCIB" into nyc-mr1-dev
8444906310fec6a3651b765a5a25ad3efcdeb2c8 16-Aug-2016 Hall Liu <hallliu@google.com> Add ringing state for bluetooth audio route

Previously, Telecom was setting up SCO audio at the same time as the
RING command was being sent to the BT headset. This turns out to have
been a violation of the HFP spec, and ag/1199401 started enforcing it,
which caused calls routed over bluetooth to mishandle audio routing.

This change adds a ringing state to the Bluetooth route in CARSM so that
we can be in a bluetooth route with audio focus but without having set
up SCO audio.

Change-Id: I8aabb983ddd4b546d52b10f78929773b823bfbd0
Fix: 30800730
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
e271f2268db782a2c72e115bf67044be3baa1416 16-Aug-2016 Hall Liu <hallliu@google.com> Add ringing state for bluetooth audio route

Previously, Telecom was setting up SCO audio at the same time as the
RING command was being sent to the BT headset. This turns out to have
been a violation of the HFP spec, and ag/1199401 started enforcing it,
which caused calls routed over bluetooth to mishandle audio routing.

This change adds a ringing state to the Bluetooth route in CARSM so that
we can be in a bluetooth route with audio focus but without having set
up SCO audio.

Change-Id: I8aabb983ddd4b546d52b10f78929773b823bfbd0
Fix: 30800730
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
e3e283b192ece842690d7aa41b68280b9323b849 12-Aug-2016 Hall Liu <hallliu@google.com> Merge "Add dumpsys to Telecom analytics output"
fabe2ea3d7749a59c641d0cd442c7bdf7464a808 10-Aug-2016 Hall Liu <hallliu@google.com> Merge "Extend timeout for reusing a call disconnected via NOCIB"
5bbbcf772ceb961d8252c003dfbed240ded98cb9 09-Aug-2016 Hall Liu <hallliu@google.com> Add dumpsys to Telecom analytics output

Output a Base64-encoded proto when Telecom's dumpsys is called with the
"analytics" argument, with an option to clear analytics at the same
time. This is in preparation for moving Connectivity Metrics to GmsCore.

Also fixed a bug in video call analytics and adds a test for it.

Bug: 30600318

Change-Id: I567d769123d78b7e5e2b9e8865fccf36f4f30fae
ndroid.mk
roto/telecom.proto
rc/com/android/server/telecom/Analytics.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/VideoProviderProxy.java
ests/Android.mk
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
2f4f0a038dbf9f6372ac8c9b1535f8cc8d0f8256 09-Aug-2016 Hall Liu <hallliu@google.com> Add dumpsys to Telecom analytics output

Output a Base64-encoded proto when Telecom's dumpsys is called with the
"analytics" argument, with an option to clear analytics at the same
time. This is in preparation for moving Connectivity Metrics to GmsCore.

Also fixed a bug in video call analytics and adds a test for it.

Bug: 30600318

Change-Id: I567d769123d78b7e5e2b9e8865fccf36f4f30fae
ndroid.mk
roto/telecom.proto
rc/com/android/server/telecom/Analytics.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/VideoProviderProxy.java
ests/Android.mk
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
c10a426d52155b83a019e46a50e8dc05b9a4962f 09-Aug-2016 Hall Liu <hallliu@google.com> Extend timeout for reusing a call disconnected via NOCIB

Changing from 400ms to 100000ms. GV may take an arbitrary amount of time
to respond, and there is no harm in reusing the call since there is a
check to make sure the handles are the same.

Bug: 20820155
Bug: 30627464
Change-Id: I518b529d28cb3edf40a72ddb38530d92ec5e973f
rc/com/android/server/telecom/Timeouts.java
3d2cd5f5633f2adb30f9ec145c4a73e9d5932740 09-Aug-2016 Hall Liu <hallliu@google.com> Extend timeout for reusing a call disconnected via NOCIB

Changing from 400ms to 100000ms. GV may take an arbitrary amount of time
to respond, and there is no harm in reusing the call since there is a
check to make sure the handles are the same.

Bug: 20820155
Bug: 30627464
Change-Id: I518b529d28cb3edf40a72ddb38530d92ec5e973f
rc/com/android/server/telecom/Timeouts.java
9ae0bfde2a427eb9aafc9bd5598355a1d8e9a24e 27-Jul-2016 Hall Liu <hallliu@google.com> Fix broken test and in-call controller bug

1. testBindToService_DefaultDialer_FallBackToSystem was broken because
InCallController#onConnected returned false due to an empty list of
calls in the mock CallsManager. Added a return stub to prevent this.

2. If an incoming call disconnects remotely before onServiceConnected is
called, no services will be bound to InCallController, but
InCallController will also not attempt to bind to an InCallService for
future calls. This is because the failure case in
InCallServiceBindingConnection#onConnected calls disconnect() directly,
not setting mInCallServiceConnection to null. This means that
isBoundToServices will continue to return true, so bindToServices will
never be called again until something else calls unbindFromServices.
Fix was to not disconnect if no calls are found when onServiceConnected
is called.

3. A test was added to test the fix in #2.

Change-Id: I95caba2e3169be33d89424269a09b3ad292be3de
Fix: 28743971
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/ParcelableCallUtils.java
rc/com/android/server/telecom/Timeouts.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
fef4b33934481563e92cd4836c49bb2fbadcaf09 08-Aug-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 6cfd6208cd -s ours am: 410513e3fb -s ours
am: 93245a3035 -s ours

Change-Id: Ie0b94f16ae0e1ed0fc317f216f1ae5b677a79ab9
93245a303575b53f23beba4bb298270fe7e35c4d 08-Aug-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 6cfd6208cd -s ours
am: 410513e3fb -s ours

Change-Id: I74847009d1eaf810d36004136a0215add7305613
410513e3fbab8858adb5900eb8b25de5e35cd253 08-Aug-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 6cfd6208cd -s ours

Change-Id: Ie90e02cc54513e8675e59706ec567b4cbea2a98d
6cfd6208cdbbf7a6ce4ea12b3d38ecd70827cb8c 08-Aug-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: If1ffcddabab9cc5c8f25bb18f5c6633925ddf5a3
Auto-generated-cl: translation import
es/values-zh-rCN/strings.xml
47a3bfdd5bc6fd8e1fbdb3987c53e774b33edb1e 08-Aug-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Idaf9fc0863ba90801e7ea20a305b8762ee22de86
Auto-generated-cl: translation import
es/values-zh-rCN/strings.xml
43578b877d2bb4b7c54e2b247d0c8222597de9e1 05-Aug-2016 Tyler Gunn <tgunn@google.com> Merge "Auto reject video requests for secondary user." into nyc-mr1-dev am: ea5178fef9 am: b38a8e1b9e
am: ca28d5162d

Change-Id: I827d4cfdbcd9f2a66853c32ea8c80ec2b0144260
0d91a81f2362d4f3d9f22ed78a8afb27903919d7 05-Aug-2016 Tyler Gunn <tgunn@google.com> Auto reject video requests for secondary user. am: 13e8a6938e am: 2c69946fad
am: dbda32ea85

Change-Id: I46b1cb1caafa47d8f934033f0ea7ff08eda21923
ca28d5162d319c2adb2354b735fb3793cdc62cd1 05-Aug-2016 Tyler Gunn <tgunn@google.com> Merge "Auto reject video requests for secondary user." into nyc-mr1-dev am: ea5178fef9
am: b38a8e1b9e

Change-Id: I364cb4a5b73c80ec9e23e95f595f80411bdd9c2a
dbda32ea8510f4335dfebb4f3e776849713f9905 05-Aug-2016 Tyler Gunn <tgunn@google.com> Auto reject video requests for secondary user. am: 13e8a6938e
am: 2c69946fad

Change-Id: I3fbae77a57c28a19d3176ba7d584060efb1a81de
b38a8e1b9e04d1cfd8affb4d04cc992d74f53b31 05-Aug-2016 Tyler Gunn <tgunn@google.com> Merge "Auto reject video requests for secondary user." into nyc-mr1-dev
am: ea5178fef9

Change-Id: I36fea6a70ab162d75e4ed5b13a4b9219bb62aaee
2c69946fad2f498ed5750140072befcbf271c843 05-Aug-2016 Tyler Gunn <tgunn@google.com> Auto reject video requests for secondary user.
am: 13e8a6938e

Change-Id: I57f8396426f88adde8d1b8bd9df4dc1e79a1ee6a
ea5178fef94688b8cbe539df95147b49231d899b 05-Aug-2016 Tyler Gunn <tgunn@google.com> Merge "Auto reject video requests for secondary user." into nyc-mr1-dev
d9375e60085d4037a4e70cd1ae7a0d16fedc3e65 04-Aug-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 72f08516ba -s ours am: c7237c795c -s ours
am: 152f38be31 -s ours

Change-Id: I110061d34ee49d01800328e2053add31978324f5
152f38be31160ec2c2f12083d92fd25fe28134c6 04-Aug-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 72f08516ba -s ours
am: c7237c795c -s ours

Change-Id: I084160c0a592206d176ebb721eb368e30ccaab11
c7237c795c1d31f81b253d813aa129e8170277d3 04-Aug-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 72f08516ba -s ours

Change-Id: I002d42057ec52997de82c8f32bfb19cba827a165
72f08516ba1ae3f6e8df536d6db6d86b3bdf1ae5 04-Aug-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ia6887293efccfb3c8331ce22fd0babc3cd273417
Auto-generated-cl: translation import
es/values-kn-rIN/strings.xml
787a6b011444c5ca6fc44867c1965b0033a3333a 04-Aug-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Iee9ab11631c072e9229d6cdf38aba538f7874ee2
Auto-generated-cl: translation import
es/values-kn-rIN/strings.xml
13e8a6938eb5db779ea41f82f00916363ad09aa6 04-Aug-2016 Tyler Gunn <tgunn@google.com> Auto reject video requests for secondary user.

- In Telecom, when the ConnectionService sends informs us of an upgrade
to video request, if the phone account for the call does not support video
calling, then we will automatically send a response back saying the user
wants to stick with audio-only.
- Also, it turns out the Call object already knew whether it supports video
or not, so I was able to clean up the change I made previously to prevent
video calling on the secondary user.

Bug: 30600205
Change-Id: I64a29933d9da3f443dbad5fbd058f4b5735cfc51
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/VideoProviderProxy.java
0ae0953680c37e590d5f5bc18b0ffa3c74c064c4 29-Jul-2016 Hall Liu <hallliu@google.com> Only play end-of-call tone for certain call terminations

Only play tone when call was previously active, dialing, or on hold.

Change-Id: I30a6ea26e0cdab00fb3dc56a294d046d9ad51c9e
Fix: 30118025
rc/com/android/server/telecom/CallAudioManager.java
9029d1c33e9e115504e208bcd10be45f1f977248 29-Jul-2016 Hall Liu <hallliu@google.com> Only play end-of-call tone for certain call terminations

Only play tone when call was previously active, dialing, or on hold.

Change-Id: I30a6ea26e0cdab00fb3dc56a294d046d9ad51c9e
Fix: 30118025
rc/com/android/server/telecom/CallAudioManager.java
d5bab2647812b58ce7684cf87557a8b25d8edd1f 28-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\\"Log calls which were rejected in call log appropriately.\\\" into nyc-mr1-dev am: e154ff3846 am: fdf42ed6aa
am: 4a7574526d

Change-Id: Iad200b1791d4b190ed43377858e73c6e6453da1c
3f66ac7a48ca500dcb7af1708963638784370acd 28-Jul-2016 Tyler Gunn <tgunn@google.com> Log calls which were rejected in call log appropriately. am: 21991a7e64 am: 6c181c2fb2
am: 43b50e1f1f

Change-Id: I5f26e2a6fd137d0c90b96862cbe94dd8cb6431a1
4a7574526dce617ce63a2ef3908b6f5ff2367d13 28-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"Log calls which were rejected in call log appropriately.\\" into nyc-mr1-dev am: e154ff3846
am: fdf42ed6aa

Change-Id: I47898ed53ed5e9fd262283648901fa6e61c6c3bb
43b50e1f1f1d9fc8c1a0d15947c70ba5b610762a 28-Jul-2016 Tyler Gunn <tgunn@google.com> Log calls which were rejected in call log appropriately. am: 21991a7e64
am: 6c181c2fb2

Change-Id: I732fc14563b309d21fa215306df33dbaf395da5a
fdf42ed6aafaac3d308202d36194e17aac5e347a 28-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Log calls which were rejected in call log appropriately.\" into nyc-mr1-dev
am: e154ff3846

Change-Id: I79be2a6a68a1b5082bab7008e81acb7eeb6d8740
6c181c2fb222ae311e2531d976eab5c180aaab13 28-Jul-2016 Tyler Gunn <tgunn@google.com> Log calls which were rejected in call log appropriately.
am: 21991a7e64

Change-Id: I7fea04f8d098bd83b8e8ddef41ecaeb70b62f32b
e154ff38467b53314df5e2bc91fd4c358f7d0515 28-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Log calls which were rejected in call log appropriately." into nyc-mr1-dev
21991a7e6452a15e4f02a645b8333d5376d0a8e9 28-Jul-2016 Tyler Gunn <tgunn@google.com> Log calls which were rejected in call log appropriately.

The case for DisconnectCause.REJECTED was not being handled in the call
logging code. This is important when logging calls locally disconnected
(multiendpoint), and also for calls rejected locally.

Dialer already shows these appropriately in the call log as
"declined call".

Bug: 30474601
Bug: 28813047
Change-Id: Ieb68eed5806658ee975d90c7388e454ae86a0431
rc/com/android/server/telecom/CallLogManager.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
4e806c75863a1e79a9aee32b531c526ff636037a 28-Jul-2016 Bryce Lee <brycelee@google.com> Merge \\\"Reference the correct capability type for reply capability.\\\" into nyc-mr1-dev am: 616808231e am: 83f3ba35c6
am: 9be44d59c0

Change-Id: I1fe969b2fc10dca1805add70d0b91ac36900d05c
dda5f5500bd0d294793b758679aa3d90ada02105 28-Jul-2016 Bryce Lee <brycelee@google.com> Reference the correct capability type for reply capability. am: 45e8eb40e0 am: df7541b30e
am: c2391f8e2f

Change-Id: I72d758a0a7d01ff53180402743b5cc05a08b0c01
9be44d59c0d76cb88da64f5b2f721cc2210797e2 28-Jul-2016 Bryce Lee <brycelee@google.com> Merge \\"Reference the correct capability type for reply capability.\\" into nyc-mr1-dev am: 616808231e
am: 83f3ba35c6

Change-Id: I7d345adb032a1b1bb1c880f1769b379ed878c688
c2391f8e2f1380ec47a768e2c28cf2a570e6dece 28-Jul-2016 Bryce Lee <brycelee@google.com> Reference the correct capability type for reply capability. am: 45e8eb40e0
am: df7541b30e

Change-Id: I1732a250963b12f011da57c51efbb782f9cf41d4
83f3ba35c68e228f293ffef1585c3f4a1fb72a59 28-Jul-2016 Bryce Lee <brycelee@google.com> Merge \"Reference the correct capability type for reply capability.\" into nyc-mr1-dev
am: 616808231e

Change-Id: Id719084d9badf5ae0d44cf6974c1ae39e0e62a4b
df7541b30eade2e9f957909d46f610284fc5a323 28-Jul-2016 Bryce Lee <brycelee@google.com> Reference the correct capability type for reply capability.
am: 45e8eb40e0

Change-Id: I4f4cf3766bdfe8a81acdeb595fa96aafa20cafdd
616808231e231bb08886d79ec55ed9402854990d 28-Jul-2016 Bryce Lee <brycelee@google.com> Merge "Reference the correct capability type for reply capability." into nyc-mr1-dev
9ab05de4d3f22ccde092c0f4d75aeb185a0fbd1d 28-Jul-2016 Santos Cordon <santoscordon@google.com> Merge \\\"Add more logging to Telecom for NYC-DR.\\\" into nyc-mr1-dev am: 225cc68665 am: d1d0f02876
am: 40a0ca08e6

Change-Id: I7257a010272e08ad741d4e3ca30d1ba40e2acbc7
99e21eaa676ad2a19358ef3145e5e598b984b641 28-Jul-2016 Santos Cordon <santoscordon@google.com> Add more logging to Telecom for NYC-DR. am: 0d7a00a804 am: 05de0b2bab
am: 16199296d1

Change-Id: I6d1d05878599a8f133971305d51068fd4b9522ab
45e8eb40e035d00e8c5363759d5776edbab04d99 28-Jul-2016 Bryce Lee <brycelee@google.com> Reference the correct capability type for reply capability.

In this class, we reference the Call capability. However, the can method
actually checks against the Connection capabilities.

Bug: 29905086
Change-Id: I5f713afb2ccbea711343196019b82e6db59017c0
rc/com/android/server/telecom/RespondViaSmsManager.java
40a0ca08e6ddf01b87ca9e1ce540f2a3d47009d9 28-Jul-2016 Santos Cordon <santoscordon@google.com> Merge \\"Add more logging to Telecom for NYC-DR.\\" into nyc-mr1-dev am: 225cc68665
am: d1d0f02876

Change-Id: Iaa29ee928e8861ef05d2fda97b1d404aebdd6822
16199296d16b64b4c2f94292d251a9606910378d 28-Jul-2016 Santos Cordon <santoscordon@google.com> Add more logging to Telecom for NYC-DR. am: 0d7a00a804
am: 05de0b2bab

Change-Id: I62bf4a8108c0ad2dc86895ef30e0c06be7926ab2
d1d0f02876ee829627d1fc330f9d0e24ce60173f 28-Jul-2016 Santos Cordon <santoscordon@google.com> Merge \"Add more logging to Telecom for NYC-DR.\" into nyc-mr1-dev
am: 225cc68665

Change-Id: I2afe49ea30bccff2d69fa446cfa9aabdd1b0e433
05de0b2bab976abc3ceba183f9642937ebd8fe8e 28-Jul-2016 Santos Cordon <santoscordon@google.com> Add more logging to Telecom for NYC-DR.
am: 0d7a00a804

Change-Id: I1080072bb0ed15e1c2c8c3b61aa585ac07ab436d
28b82f0fe9b55b3bd826ba3a4204329988447c57 27-Jul-2016 Hall Liu <hallliu@google.com> Fix broken test and in-call controller bug

1. testBindToService_DefaultDialer_FallBackToSystem was broken because
InCallController#onConnected returned false due to an empty list of
calls in the mock CallsManager. Added a return stub to prevent this.

2. If an incoming call disconnects remotely before onServiceConnected is
called, no services will be bound to InCallController, but
InCallController will also not attempt to bind to an InCallService for
future calls. This is because the failure case in
InCallServiceBindingConnection#onConnected calls disconnect() directly,
not setting mInCallServiceConnection to null. This means that
isBoundToServices will continue to return true, so bindToServices will
never be called again until something else calls unbindFromServices.
Fix was to not disconnect if no calls are found when onServiceConnected
is called.

3. A test was added to test the fix in #2.

Change-Id: I95caba2e3169be33d89424269a09b3ad292be3de
Fix: 28743971
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/ParcelableCallUtils.java
rc/com/android/server/telecom/Timeouts.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
225cc686653a9d53a15c9212ca0386505a9fea3d 27-Jul-2016 Santos Cordon <santoscordon@google.com> Merge "Add more logging to Telecom for NYC-DR." into nyc-mr1-dev
6ea9c04b9d5d2eda49e8cbfa6c54add4c7d3b390 27-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"Auto downgrade video calls when phone account doesn\\'t support video.\\" into nyc-mr1-dev am: 6152c97acd
am: bf0100b445

Change-Id: I88ca48f34546cc38e050b1d5dd9a19b24a6c260d
71d43151b417b210cee754eb769bd3557c0e4010 27-Jul-2016 Tyler Gunn <tgunn@google.com> Auto downgrade video calls when phone account doesn\\'t support video. am: 10274f7f86
am: 5ad54440f0

Change-Id: Iaef5654f5c9b8297cbd8287cf74a52878a283fe6
bf0100b445701fc9be7f756ead88501c59f2d91f 27-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Auto downgrade video calls when phone account doesn\'t support video.\" into nyc-mr1-dev
am: 6152c97acd

Change-Id: I71eca9ba7fdf0bd2730086ec5647421e53e9b686
5ad54440f0b288b0adbec782fb1bbcc168baffda 27-Jul-2016 Tyler Gunn <tgunn@google.com> Auto downgrade video calls when phone account doesn\'t support video.
am: 10274f7f86

Change-Id: Ib01b78fbbc1c3d11c248c532c2891fdf959a7dd9
0d7a00a8040771e1c361af5f0cb402c35efd3868 27-Jul-2016 Santos Cordon <santoscordon@google.com> Add more logging to Telecom for NYC-DR.

Bug: 30411195
Change-Id: I074dcfc41f96ae056153b951cd272896fc116a86
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/Log.java
6152c97acd232f8fde1f2a1c1177db2e19104ebc 27-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Auto downgrade video calls when phone account doesn't support video." into nyc-mr1-dev
10274f7f86f15ea6643b861c0d21ebcb73e8d407 27-Jul-2016 Tyler Gunn <tgunn@google.com> Auto downgrade video calls when phone account doesn't support video.

When adding calls to Telecom, ensure that incoming and outgoing video
calls are auto-downgraded to audio-only when the phone account does not
support video.

Bug: 27616192
Change-Id: I7fd15718af414903ab312f9aa9f20f8102a38f11
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
ad5335261054618b6bcae1b5984bc13bbce50db5 27-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Answer video calls as audio-only through wired headset\\" into nyc-mr1-dev am: 6832bc65af
am: 181b875710

Change-Id: Ic9465b4b173c43e8acab7456b22618df2d48b94d
2cfe4af600979a332d73e731b9f56ae734431849 27-Jul-2016 Hall Liu <hallliu@google.com> Answer video calls as audio-only through wired headset am: 3777a7e39a
am: 9e99b91bdc

Change-Id: Ib68cecea8e5a85878bd00a1baeb4370b8c0abedf
2d71920e22f98707bc53a6cd28d1b4b7d0c276e8 27-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"When bg call does not support hold, auto-unhold on disconnect of fg call.\\" into nyc-mr1-dev am: e9c331b81b
am: f903c8309e

Change-Id: I5462dfbb5bcc733bb671b1e1486397e1635aa491
f0ba1c3a30b1d39ccce26fc54b57a2c7c82af97f 27-Jul-2016 Tyler Gunn <tgunn@google.com> When bg call does not support hold, auto-unhold on disconnect of fg call. am: 7d58ba53c0
am: 2f2c8e1539

Change-Id: I53d2e40e7c54ddf8e7da5bd9964bb308a59036c6
181b875710710247df3af091b74b1faed8dec3a5 27-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Answer video calls as audio-only through wired headset\" into nyc-mr1-dev
am: 6832bc65af

Change-Id: I4bece3e89892f1505ea2fb907c0ed36c099e56e2
9e99b91bdc36c8fbc0f7485170084aabaca5b7f4 27-Jul-2016 Hall Liu <hallliu@google.com> Answer video calls as audio-only through wired headset
am: 3777a7e39a

Change-Id: Ibdb1dc73127cdd6f88076a2ee686bce2b9860702
f903c8309ef90a1b08b022683bb6a688df161cb6 27-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"When bg call does not support hold, auto-unhold on disconnect of fg call.\" into nyc-mr1-dev
am: e9c331b81b

Change-Id: I4e76065f60ba564c8cd4a18342067d4cd0f289e8
2f2c8e1539a7a33a00110f870a29df912a4dd483 27-Jul-2016 Tyler Gunn <tgunn@google.com> When bg call does not support hold, auto-unhold on disconnect of fg call.
am: 7d58ba53c0

Change-Id: I869382bff2da5825d9787a9db862ae71110499fc
6832bc65aff0c7974f4a6bb7cb576887d9138d17 26-Jul-2016 Hall Liu <hallliu@google.com> Merge "Answer video calls as audio-only through wired headset" into nyc-mr1-dev
e9c331b81bdfa9769379f0815d367cfbf2c4da6d 26-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "When bg call does not support hold, auto-unhold on disconnect of fg call." into nyc-mr1-dev
7d58ba53c05e0449992a28ddcb0cba11de96361a 26-Jul-2016 Tyler Gunn <tgunn@google.com> When bg call does not support hold, auto-unhold on disconnect of fg call.

When disconnecting a call and the new foreground call is a held call
that does not support hold, auto-unhold that call. This handles the
scenario where a carrier (for example) does not support hold, and a call
disconnect causes a background call to be on hold. Since the carrier does
not support hold/unhold, the UX will provide no means to unhold the call.

Bug: 28813047
Change-Id: I4fe7410e5ef49297bdfb968d2e03a1594fa0d897
rc/com/android/server/telecom/CallsManager.java
3777a7e39aaa4d89c3ed0a28b23f8b596cb765ec 25-Jul-2016 Hall Liu <hallliu@google.com> Answer video calls as audio-only through wired headset

Change-Id: I1602a422763bd825f3a1e34d910bf8c238a982df
Fix: 30371265
rc/com/android/server/telecom/CallsManager.java
1077f0aad9d5b7dcc90e98410a61bd96adb3792e 25-Jul-2016 Brad Ebinger <breadley@google.com> Merge \\"Allow for Reconnect from Connection Manager\\" into nyc-mr1-dev am: 54f0f937b0
am: 1ed0b0ee75

Change-Id: Icdc8d0b23b41775637e79e1b5b7b49a530efe1eb
7f7ec063412da54d0e0c27fe3a1d7d196ae0c76f 25-Jul-2016 Brad Ebinger <breadley@google.com> Allow for Reconnect from Connection Manager am: a6d8e8b73b
am: 075935c9be

Change-Id: Ica0dc73d2239fd60f8da7757989260b473606acc
1ed0b0ee759c58acde03dbf7e7f9168b0821a328 25-Jul-2016 Brad Ebinger <breadley@google.com> Merge \"Allow for Reconnect from Connection Manager\" into nyc-mr1-dev
am: 54f0f937b0

Change-Id: Ic2fa11e63a8d69acb108729f3f27e4e285004d63
075935c9be4862a6841012eb223937a1401a0ab1 25-Jul-2016 Brad Ebinger <breadley@google.com> Allow for Reconnect from Connection Manager
am: a6d8e8b73b

Change-Id: I724686620b4c964245276e23d71ddf20e45bd35a
54f0f937b0667464628eb3609c54d9a020e39819 25-Jul-2016 Brad Ebinger <breadley@google.com> Merge "Allow for Reconnect from Connection Manager" into nyc-mr1-dev
82db7f711b8c8640238f5533ffa4fdd0fe0f73f9 25-Jul-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I792af667c4de67815f67435d2f7e6a7b4c4d2f58
Auto-generated-cl: translation import
es/values-fr-rCA/strings.xml
es/values-kk-rKZ/strings.xml
es/values-ky-rKG/strings.xml
es/values-nb/strings.xml
8a21b7c69f605fbfb6bf6569f9379630e99cf43a 22-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"Add telecom log to report when call changes external state.\\" into nyc-mr1-dev am: 6df997ac88
am: e82091d5a8

Change-Id: If95dff38c123a349e942627775e097695566e780
eefcb71510c9e2f3bfb046fb2066d3161ebe1420 22-Jul-2016 Tyler Gunn <tgunn@google.com> Add telecom log to report when call changes external state. am: 54ca13a219
am: a3e1edf601

Change-Id: I5729ad63d4668ecd4580e3260c3cfc0c2b7d22a8
e82091d5a8d5da46cdbceadeb9a1da937103aced 22-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Add telecom log to report when call changes external state.\" into nyc-mr1-dev
am: 6df997ac88

Change-Id: Ibd3e097f824a0392651e57a1e91a0052b61b0a47
a3e1edf601b46bcae1e5aaa92d7c6b951a55e10a 22-Jul-2016 Tyler Gunn <tgunn@google.com> Add telecom log to report when call changes external state.
am: 54ca13a219

Change-Id: I9ce6a083ab7bc4c2a48fbe52237ddd9279ae9d0f
6df997ac889c08d584518ae60bea9dd6c5a183a0 22-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Add telecom log to report when call changes external state." into nyc-mr1-dev
d569a9be30db51ba2699e98910b2125dacd5f3d5 21-Jul-2016 Bill Yi <byi@google.com> Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 78031a0834 -s ours
am: 0ebeed7599 -s ours

Change-Id: I155988d4d2cefe86f58be97dec633838e3bf3770
0ebeed7599817b68afd79983e01813912df426ae 21-Jul-2016 Bill Yi <byi@google.com> Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 78031a0834 -s ours

Change-Id: I47922536b7992bfde82c80d631efc9202112380d
78031a083408f1f81c091b8603ad9ec36ebd8054 21-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
5e547df48ded5c452002f7a5157afb336e534c23 21-Jul-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of 479872d to nyc-mr1-dev-plus-aosp
am: 6e64c966e2

Change-Id: I05d7610ba73621d1ea0100f1f77ee6df32a47774
3aa3b99c5463aa6b46fc645c764ceef376c57fb3 21-Jul-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I180609f818704f8780e47ce1a95c116d555854ae
Auto-generated-cl: translation import
es/values-b+sr+Latn/strings.xml
es/values-be-rBY/strings.xml
es/values-bs-rBA/strings.xml
es/values-fr-rCA/strings.xml
es/values-kk-rKZ/strings.xml
es/values-ky-rKG/strings.xml
es/values-nb/strings.xml
6e64c966e28d4cb9f990fffd773da40fb1b4e346 21-Jul-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of 479872d to nyc-mr1-dev-plus-aosp

Change-Id: Ib640e675d21807378e251091a99333264f3b67a2
479872dff7e00ccfe57f7f153b223243ba4b7df1 21-Jul-2016 Hall Liu <hallliu@google.com> Merge "Answer video calls as audio through BT" into nyc-mr1-dev
54ca13a21940379065becf4f564329b275c6c7ce 20-Jul-2016 Tyler Gunn <tgunn@google.com> Add telecom log to report when call changes external state.

Bug: 29906222
Change-Id: Id3c6e70d7922d83b84c533e60cd665c0f6d3d1d3
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/Log.java
accfd892837a75583b846f20235c5d9ea382fce6 20-Jul-2016 Brad Ebinger <breadley@google.com> Merge \\"Fix ComponentName NPE when binding to InCallService\\" into nyc-mr1-dev am: b66d9fc305
am: 8e31218966

Change-Id: I0f8b8ecf920cc134ecef1c30638526496f309483
8e31218966e859dac6d258198fb03bf74f54b057 20-Jul-2016 Brad Ebinger <breadley@google.com> Merge \"Fix ComponentName NPE when binding to InCallService\" into nyc-mr1-dev
am: b66d9fc305

Change-Id: I73645532be8cb7bb2ac44ecf2fe24c5c0de6e0d6
b66d9fc30569013b27a2e0e1cd00c00b95436b6e 20-Jul-2016 Brad Ebinger <breadley@google.com> Merge "Fix ComponentName NPE when binding to InCallService" into nyc-mr1-dev
3cab92aa08063db6f63e3bc032332c377eac1de5 19-Jul-2016 Hall Liu <hallliu@google.com> Answer video calls as audio through BT

Bug: 30207310
Change-Id: I9d5bd714920f48e4554385d9ba2df4962be29840
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
14d64f4bbfb672f684aea290dfb9a181f09162b4 19-Jul-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 1f526d5537 -s ours
am: cc4cd2463f -s ours

Change-Id: Ie89158072ec810ff6f9a60f77ebbfb11adf3d1d1
cc4cd2463fca08703c91e61f89ab9c60334e0b83 19-Jul-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 1f526d5537 -s ours

Change-Id: I5e92aac8dacb02fcd3a28061c75ce1baab4fec25
1f526d55379ee1cbe461d10c3f71af902c37a3d4 19-Jul-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I03fccd64d05027d0315d16d4c1aa7873022f2975
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
88f8e26347d4f69e6dc3b060818d7947e0a2cff1 19-Jul-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I04f8186495432e1beac5842ef6a9fbf16baea694
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
a3617696e44e54121509557a33dff4f11dc6ecbd 18-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Check for PROPERTY_IS_DOWNGRADED_CONFERENCE in addExistingConnection\\" into nyc-mr1-dev am: eb2d0aad5d
am: 288727205a

Change-Id: I6b3df02c34a60fe4e1c3b245356381e3037f6221
e469444480c90b8368d8b2472ca63e8ff5e20144 18-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Fix analytics dumping to not throw an exception\\" into nyc-mr1-dev am: 006c299b71
am: 305a2e34d1

Change-Id: I2ff8d1fd63b485c373909947fbdf27a3f2eafb81
8f011c9d5c217c93986723ea556cb7b134106da3 18-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Fix flaky tests that use startAndMakeActiveOutgoingCall\\" into nyc-mr1-dev am: 5b7e64dfb8
am: 25e27359da

Change-Id: I0f7b5905ff9966f76118b30560760ba2a399a581
288727205a65e31a9b40cd0e8145a30e72e6261b 18-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Check for PROPERTY_IS_DOWNGRADED_CONFERENCE in addExistingConnection\" into nyc-mr1-dev
am: eb2d0aad5d

Change-Id: I438c3b4e7267af1b4e8c29c5c1f1d3fde4f838be
305a2e34d1aebcfbc21a7e4058f7db5205832fec 18-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Fix analytics dumping to not throw an exception\" into nyc-mr1-dev
am: 006c299b71

Change-Id: I45e288c923b1e65e60c590638589a9e76fdf660a
25e27359da94399c24d2d9852e8b4782749d3f29 18-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Fix flaky tests that use startAndMakeActiveOutgoingCall\" into nyc-mr1-dev
am: 5b7e64dfb8

Change-Id: Ie4d8221068f8caefb4e574d36858f4c3ea66f446
eb2d0aad5d36ae139036f344be230d57d5ae7ab8 18-Jul-2016 Hall Liu <hallliu@google.com> Merge "Check for PROPERTY_IS_DOWNGRADED_CONFERENCE in addExistingConnection" into nyc-mr1-dev
006c299b71047aaec0a26b33b80bd86ac8dedf68 18-Jul-2016 Hall Liu <hallliu@google.com> Merge "Fix analytics dumping to not throw an exception" into nyc-mr1-dev
5b7e64dfb819b640fbe3bd38509a823e8345fdc0 18-Jul-2016 Hall Liu <hallliu@google.com> Merge "Fix flaky tests that use startAndMakeActiveOutgoingCall" into nyc-mr1-dev
c2d6d37dad3f6ea03f87ab38f7b851b484bbc70a 18-Jul-2016 Brad Ebinger <breadley@google.com> Merge \\"Fix NPE in Call.setHandle\\" into nyc-mr1-dev am: 8aa4c972b1
am: 090f29d6bf

Change-Id: Iac0a2c1e5aa5a6ade601844ed88e9ef91c092061
090f29d6bfa35fd9b9cff413f0fa768d8a779ae2 18-Jul-2016 Brad Ebinger <breadley@google.com> Merge \"Fix NPE in Call.setHandle\" into nyc-mr1-dev
am: 8aa4c972b1

Change-Id: I4b37caac7a33c9dcf4be99baca24fc469bb8c319
8aa4c972b13e6ba6f2975d07368aded4fc07c16a 18-Jul-2016 Brad Ebinger <breadley@google.com> Merge "Fix NPE in Call.setHandle" into nyc-mr1-dev
cc897b9bf7739d324e7c4176d1716a7935b2eac8 18-Jul-2016 Pankaj Kanwar <pkanwar@google.com> Merge \\"Fix NPE that was stopping VT updates to Dialer\\" into nyc-mr1-dev am: 30b8e1778e
am: fa46aa9824

Change-Id: I957c67c7a6d73f620b8e18cfea687d6ff3f5db4e
fa46aa98244d905812be6700d6dc850c919df304 18-Jul-2016 Brad Ebinger <breadley@google.com> Merge \"Fix NPE that was stopping VT updates to Dialer\" into nyc-mr1-dev
am: 30b8e1778e

Change-Id: I56d1795bbda48139908d6321590b6eea3c96c519
30b8e1778e29d06c58fca01b0bda0bc69b48d490 18-Jul-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Fix NPE that was stopping VT updates to Dialer" into nyc-mr1-dev
6ab66c31dbd8373d777b0c680e47e5ef451d9d9c 16-Jul-2016 Brad Ebinger <breadley@google.com> Fix NPE in Call.setHandle

Fix a NPE in Call.setHandle that was occuring in MissedCallNotifierImpl,
when switching to second user.

Change-Id: I9d3fc394683f3000711fa05c09ea737e2f6c4553
Fix: 30170188
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
abe06d37a41d5380fb07f7fb11ef2a26eee957f6 15-Jul-2016 Brad Ebinger <breadley@google.com> Fix ComponentName NPE when binding to InCallService

Currently, if the PackageManager can not find the component that is
set to be bound, it returns null. This creates a null InCallServiceInfo,
which creates a NPE when getComponentName is called during bind. We now
never return null and instead try to bind to the ComponentName anyway if
the PackageManager returns null.

Bug: 30150689
Change-Id: I463332b1707a76d8b018aaaacbca542c91948dbf
rc/com/android/server/telecom/InCallController.java
d7e370d9a0b5fa4b99e8a832ba0b690f0f8fb4be 15-Jul-2016 Hall Liu <hallliu@google.com> Fix analytics dumping to not throw an exception

Sorting calls during analytics dump did not take conf calls into
account. Modify the sort fn to place all non-standard-name calls at the
end and put a big try-catch around the call to Collections.sort so that
it doesn't screw up the rest of the dumpsys.

Change-Id: I443c8e022e3847359971ea4033797b8309bc011c
Fix: 30145377
rc/com/android/server/telecom/Analytics.java
a6d8e8b73b03a34db4b012b1ca53ebae168f8daf 15-Jul-2016 Brad Ebinger <breadley@google.com> Allow for Reconnect from Connection Manager

There are currently two situations where Telecom will redial on another
ConnectionService's PhoneAccount: 1) An Emergency Call has been placed,
Telecom connects successfully to a ConnectionService, and the
ConnectionService returns an ERROR message; and 2) A ConnectionManager
is being used to place a call and the ConnectionManager rejects the
Call with a onCreateConnectionFailure callback.

In case 1), we disconnect to the ConnectionService connect to another
emergency call capable PhoneAccount to place the call.
In case 2), we try to place the call directly on the ConnectionService
that the PhoneAccount is registered to.

This change reverts part of a previous change that broke case 2).

Bug: 29877938
Change-Id: I58badca94bb893f8ec797fc16ecb66f8ca9acabd
rc/com/android/server/telecom/CreateConnectionProcessor.java
4b9e5566861568cf032db663b487c627d9a53772 15-Jul-2016 Hall Liu <hallliu@google.com> Check for PROPERTY_IS_DOWNGRADED_CONFERENCE in addExistingConnection

If the property is set, create the new Call object as a conference.

Change-Id: I1e28fea1801a7ef6f3b7445f2f3ae4bb08c54c98
Fix: 29806833
rc/com/android/server/telecom/CallsManager.java
bf752e53ecd150b21ef84d083d0953fbef543b37 14-Jul-2016 Brad Ebinger <breadley@google.com> Adds a warning to the Default Phone App Dialog am: 8103efb16d
am: 651695b88b

Change-Id: I2343267b92547d379ebbfd84d004cc6104aa9397
651695b88b4109d771b89541bce84cd75f564f4b 14-Jul-2016 Brad Ebinger <breadley@google.com> Adds a warning to the Default Phone App Dialog
am: 8103efb16d

Change-Id: I0076bce3ccd2eb35c0fd032b26ae2b02d74cf84a
b3ce510a9392230d003e2b740affab476c78f74f 14-Jul-2016 Hall Liu <hallliu@google.com> Fix flaky tests that use startAndMakeActiveOutgoingCall

When startActiveOutgoingCall runs, it calls into Telecom to begin the
call setup process, which posts two messages to the handler in
android.telecom.ConnectionService on the main thread:
MSG_ADD_CONNECTION_SERVICE_ADAPTER and MSG_CREATE_CONNECTION, in that
order.

On the first run through, mAreAccountsInitialized in ConnectionService
will be set to false, so instead of calling straight into
handleCreateConnectionComplete in Telecom, the execution of
MSG_CREATE_CONNECTION will instead put it in a list of pending tasks.

This list of pending tasks eventually gets run by a runnable that is
posted to the handler during the execution of
MSG_ADD_CONNECTION_SERVICE_ADAPTER.

Meanwhile, the test continues to run, and executes waitForHandlerAction
in outgoingCallCreateConnectionComplete. If waitForHandlerAction posts
its latch to the looper before MSG_ADD_CONNECITON_SERVICE_ADAPTER
executes, the test will continue before the runnable that the execution
of MSG_ADD_CONNECTION_SERVICE_ADAPTER posts to the handler runs.

This is an undesirable outcome, as we may observe the call being set to
active from startAndMakeActiveOutgoingCall first, then being set back to
dialing from CSW.hCCC. This was causing the flakiness observed.

To fix this, another waitForHandlerAction was added immediately after
the first one. We know that MSG_ADD_CONNECTION_SERVICE_ADAPTER has
already executed after the first waitForHandlerAction returns, which
means that the runnable that it posted is already in the queue, so if we
post another latch, we can be sure that the runnable which calls
CSW.hCCC has run by the time the second waitForHandlerAction completes.

Change-Id: Iedd3c60b39a8bb185f1f2b0d0e064059f888312d
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
8103efb16de2437f174d2a2662d4fb3aa0733638 11-Jul-2016 Brad Ebinger <breadley@google.com> Adds a warning to the Default Phone App Dialog

This change adds a warning label to the Dialog that is displayed to the
user when an Intent is sent to Telecom to change the default Phone app.

Bug: 29278652
Change-Id: I5ff207bd2721822c400019cee73e1809ec15f5fe
es/values/strings.xml
rc/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
10f8cd2c3f51b2fb3dc1d70ceac6bd6127f860d5 14-Jul-2016 Brad Ebinger <breadley@google.com> Fix NPE that was stopping VT updates to Dialer

The InCall Ui was not receiving updates when the video call
upgrade screen timeed out from the network due to a NPE that was
occuring.

Bug: 29009251
Change-Id: Iec5d826475d5a9fa7ba9b344201cd52292066bb9
rc/com/android/server/telecom/VideoProviderProxy.java
0d6e2c3550f58637451499b2f8096a7bd1cc623f 13-Jul-2016 Brad Ebinger <breadley@google.com> Only Redial calls in the case of Emergency Calling am: 3ff5eddd28
am: 0608d25988

Change-Id: I854a3ef473e5ec91fd963e52d105804a0ebcf13a
0608d259888bdfd78b14d0dd3aa0c910a35c0ab5 13-Jul-2016 Brad Ebinger <breadley@google.com> Only Redial calls in the case of Emergency Calling
am: 3ff5eddd28

Change-Id: I92d6d43227417c637ecbe89a321ac951bf839474
3ff5eddd28eeec2fed1c833a493ba7469bfa951f 12-Jul-2016 Brad Ebinger <breadley@google.com> Only Redial calls in the case of Emergency Calling

Currently, if there are multiple Calling Accounts and a call fails, we
redial the call on another Calling Account. We should only redial if it
is an emergency call being placed and it has failed from Telephony with
an Error.

Bug: 29877938
Change-Id: I2efa9f7f06e9eed03799c1514a027cf73ea5b3ee
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
57355d5497ff95d014efe7af22558c115bf502ef 12-Jul-2016 Brad Ebinger <breadley@google.com> Merge \\"Add Group Id tracking in PhoneAccountRegistrar\\" into nyc-mr1-dev am: b577670111
am: 6553000dd2

Change-Id: Ib8b262a68ae4442be09a9ea4b98c2cb7a99b5fe3
6553000dd26dbeb1bb2608b74447bc1d6724b42c 12-Jul-2016 Brad Ebinger <breadley@google.com> Merge \"Add Group Id tracking in PhoneAccountRegistrar\" into nyc-mr1-dev
am: b577670111

Change-Id: Ibef33500ff5a324b447ccef3e186ca35769175a8
b5776701117dad69e3db903af38bf3e8553dc31f 12-Jul-2016 Brad Ebinger <breadley@google.com> Merge "Add Group Id tracking in PhoneAccountRegistrar" into nyc-mr1-dev
f017bd96b04398c37955d9a203f86ea1d447905f 12-Jul-2016 Tyler Gunn <tgunn@google.com> Auto-enable speaker phone when pulling a video call. am: fe6d79e089
am: 40a1b8d261

Change-Id: If2a50a2a60cab61400807444cc59d543ce03aa29
c7df3c53db2cb795580e644ac725d3a84122d1f6 12-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"Finalize multiendpoint functionality.\\" into nyc-mr1-dev am: b489d6c2a1
am: d6f8b2f6bd

Change-Id: I6e223c95176fb00b762b8cd904710354134bc7a4
40a1b8d2614282b7783d136d6e450a091a3e542c 12-Jul-2016 Tyler Gunn <tgunn@google.com> Auto-enable speaker phone when pulling a video call.
am: fe6d79e089

Change-Id: If953c39024c67901c48126deaa9cc2bb023eaac0
fe6d79e0894c210af4f3ab058c7a07c3a9bb3c8f 12-Jul-2016 Tyler Gunn <tgunn@google.com> Auto-enable speaker phone when pulling a video call.

When pulling a video call, auto-enable the speakerphone.
Do this in the onExternalCallChanged listener in CallAudioManager, since
the video state will have not changed (the external call would have video
state).

Bug: 29942171
Change-Id: Ifbd66af897ada0da5c88aa498839da0b0bf3c917
rc/com/android/server/telecom/CallAudioManager.java
d6f8b2f6bdc79a02bb592a851cf0fb0ac17d4fad 12-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Finalize multiendpoint functionality.\" into nyc-mr1-dev
am: b489d6c2a1

Change-Id: Iaf8e0b5957036a7c62a10d77bed86814ea8a67a8
b489d6c2a1aa80f19394bd61b6bbfad78624d2ca 11-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Finalize multiendpoint functionality." into nyc-mr1-dev
6873c65c046c600de5ec2dcc1d427e0b36f77e27 11-Jul-2016 Brad Ebinger <breadley@google.com> Merge \\"Rename Telecom Call Ids to include attempt\\" into nyc-mr1-dev am: d1e6d8e643
am: cadfe21f5f

Change-Id: I4248cb861090adbef0e22b6215d9fd63ca80066f
cd641aa5b415536f4bbd28e5e6fb1623c4f61b8f 11-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Switch to speakerphone when upgrading to video\\" into nyc-mr1-dev am: 11cbb8ac50
am: 4fbbdf914d

Change-Id: Ia05809213d192840d99b17aec5fb6710a407a9b2
7c42cea88f9226c4b811f5d7cdbb8d0ba15d21ac 11-Jul-2016 Brad Ebinger <breadley@google.com> Merge \\"Add PhoneAccount check to addExistingConnection\\" into nyc-mr1-dev am: 04b6db29f4
am: 55e051fe0d

Change-Id: I8d03a36dc923eb552345413c8efe4ca26e1387a4
276de829ddd7e6f83103269acf2869cb80205d76 11-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Check for the disable add call extra in canAddCall\\" into nyc-mr1-dev am: 8c961ac845
am: 0438e68a67

Change-Id: I0071b176cb00e44aaab44a39ebf0545f729226ab
cadfe21f5fb89dcce91706a8d063fc9dd27cd57e 11-Jul-2016 Brad Ebinger <breadley@google.com> Merge \"Rename Telecom Call Ids to include attempt\" into nyc-mr1-dev
am: d1e6d8e643

Change-Id: Ic534a00362b1262f87b09046de5322082830101c
d1e6d8e643da472f8920781fd0ab285bb8ea970b 11-Jul-2016 Brad Ebinger <breadley@google.com> Merge "Rename Telecom Call Ids to include attempt" into nyc-mr1-dev
4fbbdf914d95e1d1e7aee02e9175401333a1fb45 11-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Switch to speakerphone when upgrading to video\" into nyc-mr1-dev
am: 11cbb8ac50

Change-Id: I6a8c0dcdccaed140e678a2727143ca3ffe4d2dc4
1e37be5dd86a51b90e461f09dc8a89effe4aee21 11-Jul-2016 Tyler Gunn <tgunn@google.com> Finalize multiendpoint functionality.

1) Handle the PULLING state throughout telecom.
2) When parcelling calls to send to InCallServices, remap PULLING state
to DIALING if an InCallService doesn't support external calls. This
ensures compatibility for things like Android Wear/Auto.
3) Ensure add call isn't disabled because of external calls.
4) Modify InCallController to handle changes to whether a call is external
or not. For IncallServices that do not support external calls, we will
add the call when an external call becomes a regular call, and we will
remove it when a regular call becomes external.

Change-Id: I1bf6c1f7e182834c3ab1ed34cd119467a4698993
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallState.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/ParcelableCallUtils.java
rc/com/android/server/telecom/PhoneStateBroadcaster.java
rc/com/android/server/telecom/TelecomServiceImpl.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
11cbb8ac504de60ed5faf0399325809d7558348c 11-Jul-2016 Hall Liu <hallliu@google.com> Merge "Switch to speakerphone when upgrading to video" into nyc-mr1-dev
55e051fe0de4b2c80044f0f4d1c5ac561d9bf41d 11-Jul-2016 Brad Ebinger <breadley@google.com> Merge \"Add PhoneAccount check to addExistingConnection\" into nyc-mr1-dev
am: 04b6db29f4

Change-Id: Ib11a5676b4830324e8e5a9308ada4e94f37bf147
04b6db29f494e73e28e059ede39c7c5789ef2077 11-Jul-2016 Brad Ebinger <breadley@google.com> Merge "Add PhoneAccount check to addExistingConnection" into nyc-mr1-dev
0c87b3c31f4ce9e47a07e40012cf669a763a1575 11-Jun-2016 Brad Ebinger <breadley@google.com> Add Group Id tracking in PhoneAccountRegistrar

Adds Group Ids to the DefaultPhoneAccountHandle in Telecom in order to
keep track of the group that the currently registered PhoneAccounts
belong to. If registerPhoneAccount is called with a new PhoneAccount
that has the same group Id as a currently registered PhoneAccount, then
remove the registered PhoneAccount and register the new PhoneAccount
with the old PhoneAccount's defaults and enabled status. This allows us
to transparently change PhoneAccounts and keep the calling account
defaults the same.

Bug: 28173788
Change-Id: Ida44e348903d2ba6b8b8f8cc64a5b13cff68c1c2
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
0438e68a677fcaa00a0cefbf8f7edead48100cf9 09-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Check for the disable add call extra in canAddCall\" into nyc-mr1-dev
am: 8c961ac845

Change-Id: I6e8c0003735e4fab91c7011f52f378c24e1e049b
8c961ac8459fdb74d790834d86f348d09e742e99 09-Jul-2016 Hall Liu <hallliu@google.com> Merge "Check for the disable add call extra in canAddCall" into nyc-mr1-dev
6e8f3d70ac7397afb4cb5ab276d1cd385c92dd21 20-Jun-2016 Brad Ebinger <breadley@google.com> Rename Telecom Call Ids to include attempt

Telecom Call Ids will now append an attempt id (in the form of an
integer) that will be used by the CreateConnetionProcessor to name the
Telecom Call Ids that are used during the creation of a Connection to
the ConnectionService. This allows us to better identify which
Connection is calling back to Telecom to update status, disconnect,
etc. Previously, all of the attempted Connections in
CreateConnectionProcessor would be given the same name, which could lead
to multiple Connections trying to manage the same Call object in
Telecom.

Also, a supporting tests were added and a few Unit Tests were fixed.

Bug: 28799824
Change-Id: I7e23497ab671712bc8d3cc9542537ae1c4829afc
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallIdMapper.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneNumberUtilsAdapter.java
rc/com/android/server/telecom/PhoneNumberUtilsAdapterImpl.java
rc/com/android/server/telecom/ServiceBinder.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
52ec9652b03173f7de4b7030b3b8a74d9e56f03f 07-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Record video call events in analytics\\" into nyc-mr1-dev am: 4c9140c887
am: 62c408dd6a

Change-Id: I8b9d36745a6f9e39bbb1bd8b218b9bbed6c5af1a
913509566d7b4057c8e88f0d94792b0d6aeda5e1 30-Jun-2016 Brad Ebinger <breadley@google.com> Add PhoneAccount check to addExistingConnection

Add a check to verify the PhoneAccountHandle of the connection being
added to Telecom via
ConnectionServiceWrapper.addExistingConnection. This allows us to be
sure that the existing connections being added are from a registered
PhoneAccount and that the Package and User match what is expected in the
PhoneAccount.

Change-Id: I12c5f1b046a4ca919303ace205a9ddd6c7092650
Fix: 28800963
rc/com/android/server/telecom/ConnectionServiceWrapper.java
62c408dd6a2ddd2829517719117f93397761a4e9 07-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Record video call events in analytics\" into nyc-mr1-dev
am: 4c9140c887

Change-Id: Ice13cb214e5cfcaec24e04c4d445d7fa5023b603
4c9140c887a61646e5a024fddfc5d205d09c7e1f 07-Jul-2016 Hall Liu <hallliu@google.com> Merge "Record video call events in analytics" into nyc-mr1-dev
4a8133c39b2c394c36d40d679a03047ca744ff92 07-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Notify status bar of mute and speakerphone state\\" into nyc-mr1-dev am: 9452dbb757
am: 82b2f44561

Change-Id: I2312aa1f97f1ac52bb5bdd839cd2f7a6823130e6
82b2f44561b3b49a4e362d81d43bee144e243949 07-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Notify status bar of mute and speakerphone state\" into nyc-mr1-dev
am: 9452dbb757

Change-Id: I4cb480dad46c632a00466445173248dfbb8e870d
9452dbb757d504a97005ed0e59e101eba2d051a7 07-Jul-2016 Hall Liu <hallliu@google.com> Merge "Notify status bar of mute and speakerphone state" into nyc-mr1-dev
9696c2187bb8c2fc77e72377df79e080578605b3 25-Jun-2016 Hall Liu <hallliu@google.com> Switch to speakerphone when upgrading to video

When an audio-only call gets upgraded to a video call, switch to
speakerphone if the call would have been started in speakerphone had it
been a video call from the beginning (i.e. if there's no headset or
bluetooth connected and config options support it)

Change-Id: I4b8eb1c0f21753a8878f72d9279335a946c9f5a9
Fixes: 29563103
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/InCallController.java
4640c4fc55ca4118351330d68684ca9989661ccd 23-Jun-2016 Hall Liu <hallliu@google.com> Record video call events in analytics

Record whether the call was ever a video call and a list of video
session upgrade/downgrade requests in Analytics.

Bug: 29239768
Change-Id: I50c7a3044f7ad4c13638bb7b493e97f3c1325a18
rc/com/android/server/telecom/Analytics.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/VideoProviderProxy.java
140c8403b3d2a6ea30dc76898c3173cdd24d0e58 07-Jul-2016 Hall Liu <hallliu@google.com> Check for the disable add call extra in canAddCall

Instead of looking for the disable add call during video call extra and
checking to see if the call is a video call, just look for an extra from
Telephony that says whether to disable adding calls.

Bug: 29047863
Change-Id: Id6e85c0779ab7bfa4accd05e8cf264b3d0983cc9
rc/com/android/server/telecom/CallsManager.java
df408ecfc91611da96d0232127d560b37a5d022c 06-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Add lock to NewOutgoingCallBroadcastIntentReceiver\\" into nyc-mr1-dev am: eeeb2a10b4
am: 2838465d4f

Change-Id: I28e195780aa0bbb10ce9a4547ed056ac1bfd9f65
e9b225c7df6ad6b7c362a6ab7dbcff775cac9a24 06-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Do not route audio to speaker if Bluetooth audio is connected\\" into nyc-mr1-dev am: a02d2fb1a4
am: 2ff4dfd7d9

Change-Id: Icd9ce0a5a0507dfcec0d0ae35db8d0dc298cf0f9
2838465d4ff4ccdd8d740ec37cd2d894c1f847a5 06-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Add lock to NewOutgoingCallBroadcastIntentReceiver\" into nyc-mr1-dev
am: eeeb2a10b4

Change-Id: Iac232ce45afb84e017fe64dc261db3e51bd2070a
2ff4dfd7d99b8ad672c52b3a07f5d139587015a1 06-Jul-2016 John Eckerdal <john.eckerdal@sonymobile.com> Merge \"Do not route audio to speaker if Bluetooth audio is connected\" into nyc-mr1-dev
am: a02d2fb1a4

Change-Id: I6370ee4783c4e5e8ab96d4c8cd685edc5cc92536
eeeb2a10b4fde7d3cdee8ad9f0f5d7ca5e957b7e 06-Jul-2016 Hall Liu <hallliu@google.com> Merge "Add lock to NewOutgoingCallBroadcastIntentReceiver" into nyc-mr1-dev
a02d2fb1a4b50b47b295ec766853755336803a36 06-Jul-2016 Hall Liu <hallliu@google.com> Merge "Do not route audio to speaker if Bluetooth audio is connected" into nyc-mr1-dev
fb66199a08a521d1b9ff6dd6d21eae54f69c6040 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"Add video events to Telecom logs.\\" into nyc-mr1-dev am: c953f543a6
am: f2a756e02d

Change-Id: I26a33a7de87302b06519578280621691bc5ba695
81d48567215683e0e321b33f0f621441f8f613da 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"Handle multi-endpoint call logging requirements.\\" into nyc-mr1-dev am: 068be58546
am: 7544c26acf

Change-Id: I4c344f942c7a4f4fc907fd758fe5b7effd73a5ef
f2a756e02dd9122b84f9a18dd5163baf362f85b4 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Add video events to Telecom logs.\" into nyc-mr1-dev
am: c953f543a6

Change-Id: Ib19f74e48e9e1522b9ad63bb6d71eee89b0bdd00
7544c26acfc372b05c3e5ff546e6a4de18432f68 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Handle multi-endpoint call logging requirements.\" into nyc-mr1-dev
am: 068be58546

Change-Id: Id0ef8793be314b9fa5a57c91f3715a50fc7e3054
c953f543a6b34c79cf31c53f5b82856ef959623d 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Add video events to Telecom logs." into nyc-mr1-dev
068be5854650deb167f75390ee204a4d820c9c59 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Handle multi-endpoint call logging requirements." into nyc-mr1-dev
1d025d0976d19940c350d5fa0a48ff74d2463957 24-Jun-2016 Hall Liu <hallliu@google.com> Notify status bar of mute and speakerphone state

Change-Id: I4674b18bb865beee85906194379506d7b41c8d81
Fixes: 28914247
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
56da9bd5b639d0cf39e7f7f73e6db440f9c0e320 01-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Fix corruption in InCallTonePlayer\\" into nyc-mr1-dev am: 36b9c5608f
am: c3f5ec9441

Change-Id: I0cbb3402f18920b57a131afa7e3046ca9bff9e7a
c3f5ec9441306d96bdf2177d67330ed40966e07f 01-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Fix corruption in InCallTonePlayer\" into nyc-mr1-dev
am: 36b9c5608f

Change-Id: I98a013efd3df17923fbc7b1b39a1832aeb805d23
36b9c5608f94dc4f70a1355d956825a097976ed4 01-Jul-2016 Hall Liu <hallliu@google.com> Merge "Fix corruption in InCallTonePlayer" into nyc-mr1-dev
b2b18388129ed25ce83c65dcd619015c58fb1ee9 30-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: afbe4e883e -s ours am: cdca1940e0 -s ours
am: 84e7f103de -s ours

Change-Id: I144a9899a59dbd05b6d9e53e2d2c1ad050132ee3
84e7f103de11c7d0e4394bcf032e6de5b10644a0 30-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: afbe4e883e -s ours
am: cdca1940e0 -s ours

Change-Id: I1622c3b46dfaca34c8fd37fa25180d1f9b0f8a5f
cdca1940e068154ce85a901faf387433035f2887 30-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: afbe4e883e -s ours

Change-Id: I6d7922fef9b0583a2922bd434f882648669a26e9
afbe4e883e01682011dedbca38dfdd247b70ee86 30-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I1c233103e53a147fd6179b4c95920e22c513cd55
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
c9cf54407720d32fdb1b69e0254657a6061b9f56 29-Jun-2016 Hall Liu <hallliu@google.com> Add lock to NewOutgoingCallBroadcastIntentReceiver

Synchronize on main Telecom lock when processing the returning ordered
broadcast.

Change-Id: Ic63efc9fb6d2e17bf1ca40c118594531054db985
Fixes: 29424036
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
634860041acec3497038ed93273024d18a499433 20-Nov-2015 John Eckerdal <john.eckerdal@sonymobile.com> Do not route audio to speaker if Bluetooth audio is connected

In some devices a magnetic charging port doubles as a dock connector
and if user is charging phone and the charge port is identified as a
dock the voice audio will be routed through the phone speaker even if
Bluetooth audio is connected.

Priorities Bluetooth over dock and route audio to Bluetooth if
connected.

Bug: 28914501
Author: Mathias Jeppsson <mathias.jeppsson@sonymobile.com>
Change-Id: Ib09fa96f8d78a8a8f202fca69c92ee88cb181f7a
rc/com/android/server/telecom/CallsManager.java
c17d88e6625ef029aa6460447dce573dcfde018d 28-Jun-2016 Hall Liu <hallliu@google.com> Disable adding a call during video call am: fc130b274e
am: 6c84e6469c

Change-Id: I5c43f7ede302de94ff6e057859a0baf2072fed4e
6c84e6469cf3e32677d29cf0948a17032ec03209 28-Jun-2016 Hall Liu <hallliu@google.com> Disable adding a call during video call
am: fc130b274e

Change-Id: Idc8afe673e7484aae9ad2ff024aed030d906e090
fc130b274e49a658bdb3026fec2e89f86957a6ae 16-Jun-2016 Hall Liu <hallliu@google.com> Disable adding a call during video call

Disable adding call during video call if the proper extra is set.

Bug: 29047863

Change-Id: Idf15bfd3d2ef3ec9c8e4d22b476ae1315437b08d
rc/com/android/server/telecom/CallsManager.java
b626c02daaae6757299cdb2b8228ef0635b6b5dd 23-Jun-2016 Hall Liu <hallliu@google.com> Fix corruption in InCallTonePlayer

InCallTonePlayer uses a static variable to keep track of the number of
tones playing, which is incremented in startTone and decremented in
cleanUpTonePlayer. If something calls the start() method directly,
sTonesPlaying will not be correctly incremented.

This change removes the instance where start() was called directly and
changes start() on InCallTonePlayer to be a no-op with a warning
message.

Change-Id: I03a20f89fb4458e29f67ba327a31a8f82ff87423
Fixes: 29581234
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/InCallTonePlayer.java
70d6f858f10a77277c63aafcaa1f113f647117a6 21-Jun-2016 Tyler Gunn <tgunn@google.com> Add video events to Telecom logs.

Adding some video state, request, and response tracking events to the
telecom event logs.

Change-Id: I0a76791826f706ba31496677e47fb2dc4f40215c
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/VideoProviderProxy.java
96bd6bd5af3da3fb822eac581f3e50ea569b0ff7 17-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 75c99e762c -s ours am: 795773accd -s ours
am: 939a2f5713 -s ours

Change-Id: Ia42f7aaab436e0fffc86e787f1f4c25641fec378
939a2f5713f1fdd859c30e74c5752e04646bc21d 17-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 75c99e762c -s ours
am: 795773accd -s ours

Change-Id: I0164d6baa8538bc4c6ca30dbb4581ad03397dbf9
795773accd6561bcdbaebb155f769230269e1285 17-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 75c99e762c -s ours

Change-Id: I3c1ebda2a9d24d30f532f12ed20637a908dcc918
75c99e762cd3309f34ff018a898456279da088fc 17-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I2b4215dbdcfb1637ed89d4fcf7ea533c186b97a0
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
4c88cc2196d603c2101082d6e52043a98211a13c 16-Jun-2016 Sanket Agarwal <sanketa@google.com> Synchronize onCallAdded with onCallRemoved. am: 23eb57a66a am: 976953851e
am: 85a4f9e7d9

Change-Id: I693bf95e43811575cf093d57726e38dcfde1278b
3a482c2e13523b35e6bb798767913874ec60923f 16-Jun-2016 Sanket Agarwal <sanketa@google.com> Synchronize onCallAdded with onCallRemoved. am: 23eb57a66a am: 5c779f4374
am: 1c6702a6b9

Change-Id: I7f14b28fc43643b997184dc4c320651e8f341097
85a4f9e7d9f87b5d5f38b7e7af0d78f688e290c5 16-Jun-2016 Sanket Agarwal <sanketa@google.com> Synchronize onCallAdded with onCallRemoved. am: 23eb57a66a
am: 976953851e

Change-Id: I43fd9251a0f192ad3395eb5327e3d5ed7c9d404e
63122caa0b7524d3024f16c3c7879dc9bccfbfa9 16-Jun-2016 Hall Liu <hallliu@google.com> Merge \\"Add call events to analytics\\" into nyc-mr1-dev am: 5ce8343b79
am: 9650a47f85

Change-Id: I9c1358b145d1658c10d9ed1167832ed65faddabb
976953851e1d011ab4f4a5236bd2f82e026b821d 16-Jun-2016 Sanket Agarwal <sanketa@google.com> Synchronize onCallAdded with onCallRemoved.
am: 23eb57a66a

Change-Id: Ie50f57a6214be1fdc232663ecec7520f4e313b58
1c6702a6b9113fa147eb9ad65897a3a8945bf3e5 16-Jun-2016 Sanket Agarwal <sanketa@google.com> Synchronize onCallAdded with onCallRemoved. am: 23eb57a66a
am: 5c779f4374

Change-Id: I5b4d6092dfb862939a9d7a7251223a13cc8a4ded
5c779f43744bf3c80af51fbf09710aae77b5f2bb 16-Jun-2016 Sanket Agarwal <sanketa@google.com> Synchronize onCallAdded with onCallRemoved.
am: 23eb57a66a

Change-Id: Iae770f6d71b3da37579ac15f15bb41c45d18eace
9650a47f8566602272aa5471240a01818cd0f15a 15-Jun-2016 Hall Liu <hallliu@google.com> Merge \"Add call events to analytics\" into nyc-mr1-dev
am: 5ce8343b79

Change-Id: I22cd32d226fd7d6003f00fc6cd08907aefe6558c
5ce8343b7920c4f5855da99a86a508121e667d14 15-Jun-2016 Hall Liu <hallliu@google.com> Merge "Add call events to analytics" into nyc-mr1-dev
23eb57a66a1842064348c5cdb858f8b2e2e261c5 15-Jun-2016 Sanket Agarwal <sanketa@google.com> Synchronize onCallAdded with onCallRemoved.

In cases of very quick call and hangup we can sometimes get call
disconnected (and onCallRemoved) status chagned before we get
onCallAdded. This is because onCallAdded currently does not hold the
lock.

Bug: b/28969591
Change-Id: Ic2f291dff9dd61c54b1ada3b21c61e24bca65ebc
rc/com/android/server/telecom/InCallController.java
874c0f8fa95a5da5a82e67c1fe39697883d753eb 30-Apr-2016 Hall Liu <hallliu@google.com> Add call events to analytics

Adds a record of events and timing information to analytics for each
call. Also add session timing information independent of calls.

Bug: 28623064
Change-Id: Iea6d4a7482365534a3a0c6c672a969dae8141932
rc/com/android/server/telecom/Analytics.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/AnalyticsTests.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/LogTest.java
1ee656b7e6b713485ea8222836777acc55405672 15-Jun-2016 Hall Liu <hallliu@google.com> Merge \\"Fix log traces for incoming calls\\" into nyc-mr1-dev am: a5f8e4ae37
am: f33630beb1

Change-Id: I4f91cc1ff4799e100493f95a8770b05fa0a7e9c0
f33630beb1faadf4526b24b75d9caf48a4e8ebb1 14-Jun-2016 Hall Liu <hallliu@google.com> Merge \"Fix log traces for incoming calls\" into nyc-mr1-dev
am: a5f8e4ae37

Change-Id: Ie226a67e237ef0a5f6b360afb110c60f4dc1ea7c
a5f8e4ae37bc836884fc6312795a19dd2132ce14 14-Jun-2016 Hall Liu <hallliu@google.com> Merge "Fix log traces for incoming calls" into nyc-mr1-dev
5adfca184867902ec9aaccdf8304c396b5e31c1e 14-Jun-2016 Tyler Gunn <tgunn@google.com> Merge \\"Filter external calls when InCallService doesn\\'t support them.\\" into nyc-mr1-dev am: 9eb7d9a76d
am: 34db8b05ec

Change-Id: Id552c933c05f4f422fe5e0f706c8df17f7e3b324
34db8b05ec4d74eeba97167a7603770ea920ddb6 14-Jun-2016 Tyler Gunn <tgunn@google.com> Merge \"Filter external calls when InCallService doesn\'t support them.\" into nyc-mr1-dev
am: 9eb7d9a76d

Change-Id: I84c0b6eb25046b29a493558545eb811a660eea7d
9eb7d9a76d5b00256262feeff127b85bac917c76 14-Jun-2016 Tyler Gunn <tgunn@google.com> Merge "Filter external calls when InCallService doesn't support them." into nyc-mr1-dev
b722dfcfacc2cea27fb88bfb5a1eb1eafc3298e6 13-Jun-2016 Brad Ebinger <breadley@google.com> Merge \\"Propogate EVENT_CALL_MERGE_FAILED Connection Event\\" into nyc-mr1-dev am: a773b8d754
am: 440f178ae4

Change-Id: I329fd0e89f3a166037c73f863795a6a63b93611e
440f178ae49c0f7537c5e024fd2b43b4046b0bcb 13-Jun-2016 Brad Ebinger <breadley@google.com> Merge \"Propogate EVENT_CALL_MERGE_FAILED Connection Event\" into nyc-mr1-dev
am: a773b8d754

Change-Id: Ic35943c5fbcc93e7b401b3cdfc6c2c818cf28e1f
a773b8d754aba8147f0b68d47ee459d58abd8f78 13-Jun-2016 Brad Ebinger <breadley@google.com> Merge "Propogate EVENT_CALL_MERGE_FAILED Connection Event" into nyc-mr1-dev
81c7afe28708141ff51abe88d8e8bf9195746613 09-Jun-2016 Tyler Gunn <tgunn@google.com> Handle multi-endpoint call logging requirements.

1. When call is ended due to being answered elsewhere, map this to
"answered externally"
2. When a call was pulled, set the "call pulled" feature on the call
log features column.

Bug: 29236416
Change-Id: I1ae53e6a74d80ee7e0db2dbcf2167f6c2cc1a655
rc/com/android/server/telecom/CallLogManager.java
af506d1261569442f2a4e213993c693e46c94d40 08-Jun-2016 Hall Liu <hallliu@google.com> Fix log traces for incoming calls

Add a Log.continueSubsession in AsyncBlockCheckFilter#onPostExecute

Change-Id: Iebbd29f0d6c01602af21a4fa6e715f1997f9f686
Fix: 29217742
rc/com/android/server/telecom/callfiltering/AsyncBlockCheckFilter.java
8d99d3d01eb1c7d371d8578d20566eec00e11faf 08-Jun-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE am: 62cc9e6afa -s ours am: 057c5cfbe0 -s ours
am: a27e5151d1 -s ours

Change-Id: If8d89a44541b1277e6822d07033c16f7c99539e8
4685ed84b695954126263c7e408558da70b617e7 08-Jun-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE am: 62cc9e6afa -s ours am: 2652103d8c -s ours
am: c5af2681b9 -s ours

Change-Id: Ia2905465766eb2db37e90599b269a59be42259cb
a27e5151d16f519e5726802b6bf94c2908bf4c86 08-Jun-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE am: 62cc9e6afa -s ours
am: 057c5cfbe0 -s ours

Change-Id: If3a07aaac06b8f77994c7c49b91e381126a83998
c5af2681b9985a24fe82d8470b7bcd30b26fc819 08-Jun-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE am: 62cc9e6afa -s ours
am: 2652103d8c -s ours

Change-Id: I7a812647e0bf1c297cb15b95c69b388340d7e635
2652103d8c4b860b030e5f001dca5a285037d82c 08-Jun-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE
am: 62cc9e6afa -s ours

Change-Id: I2785e80e57a3ab09565c354b9ee6b862840fa043
057c5cfbe04c2cb228948c5a2d23097120ca8ca3 08-Jun-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE
am: 62cc9e6afa -s ours

Change-Id: I9c17062de7eae2c7d2206cda049553ca84796302
62cc9e6afa305ec650e709fe72a687e26cf0b1c1 08-Jun-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: I2d37675293bb9ea0df76e9448628c4ba4c7a569c
es/values-pa-rIN/strings.xml
f15dc33f87f88e21ef745952a68af65c86e1bf1e 08-Jun-2016 Tyler Gunn <tgunn@google.com> Filter external calls when InCallService doesn't support them.

Use TelecomManager#METADATA_INCLUDE_EXTERNAL_CALLS metadata to check
whether an InCallService supports external calls. Will only send
external calls to an InCallService which has correct Metadata to indicate
that it wants to be informed of external calls.

This required some changes to how InCallController keeps track of the
incallservices. I have added an InCallServiceInfo class which tracks
the component name of an ICS as well as whether it supports external calls.

The change to CallsManager#getFirstCallWithState and getNumCallsWithSate
ensures that when TelecomServiceImpl checks to see if there are ongoing
calls it doesn't consider external calls when checking if there is an
ongoing call, and also when determining if room needs to be made for a
call.

Bug: 27458894
Change-Id: I69652877332be8527fb16a38c692b6f51a92e469
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/HeadsetMediaButton.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallWakeLockController.java
rc/com/android/server/telecom/PhoneStateBroadcaster.java
rc/com/android/server/telecom/ProximitySensorManager.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/VideoCallTests.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
d2fa5e93f592040d041239cce3eb6b03b1c51bac 08-Jun-2016 Brad Ebinger <breadley@google.com> Merge \\"Propogates the CDMA Voice Privacy Property to a Call\\" into nyc-mr1-dev am: 56d8c4709f
am: fcb7b7641c

Change-Id: Ic257ff9cbfbc8368ce1a415bca5830e7fa23823e
fcb7b7641cf223cdd8a4755621a9a6bbb010edc4 08-Jun-2016 Brad Ebinger <breadley@google.com> Merge \"Propogates the CDMA Voice Privacy Property to a Call\" into nyc-mr1-dev
am: 56d8c4709f

Change-Id: Iab25e55cb97d44908c9427fa6318e304f4d356dd
56d8c4709f47c172d6d2d40c6022c176724d5945 08-Jun-2016 Brad Ebinger <breadley@google.com> Merge "Propogates the CDMA Voice Privacy Property to a Call" into nyc-mr1-dev
999b37465f22327117bd5883a7d1bcecc31119f8 06-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I89c43e1eb84f025fb2c05bbc16265099847c11d1
Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-eu-rES/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-my-rMM/strings.xml
es/values-pa-rIN/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rHK/strings.xml
cbd8446852e9c96289c943019eb41558a7d43203 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 3b6f947ad8 -s ours am: 98c1498e7c -s ours
am: b8f507ed36 -s ours

* commit 'b8f507ed36cf8c86dbb67411aa7b99ffc9e9d7d2':

Change-Id: Ib5fe5657510ece0156d154dfb8eb68c9ce150774
ee3c2367d20758694da561bc6c027c02f06bf302 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 3b6f947ad8 -s ours am: 6904d8a438 -s ours
am: 4b85d8232c -s ours

* commit '4b85d8232cc36be0160409deff9a17183572b4ce':
Import translations. DO NOT MERGE

Change-Id: I1825fa565696c56b19b7661746add62c2203b6ec
6d8fadc556deecf344b126915cec744a13e3bb7e 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 69c09dcc95 -s ours
am: 5c573ce80e -s ours

* commit '5c573ce80e6f5d70abc26686456ce508a1ed3a6d':
Import translations. DO NOT MERGE

Change-Id: Ibc2fcbc604b55a362d5923d2f14139cb617df667
b8f507ed36cf8c86dbb67411aa7b99ffc9e9d7d2 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 3b6f947ad8 -s ours
am: 98c1498e7c -s ours

* commit '98c1498e7c41a5eee5dcb2e4ce807436f5b87907':

Change-Id: Icc9fe77495cd9c3f57b2722261118edca00d9a34
4b85d8232cc36be0160409deff9a17183572b4ce 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 3b6f947ad8 -s ours
am: 6904d8a438 -s ours

* commit '6904d8a43844322fea5d39b97b1238831290a64a':
Import translations. DO NOT MERGE

Change-Id: I6d67d07aa498c8d30c8908876366718a5deca142
5c573ce80e6f5d70abc26686456ce508a1ed3a6d 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 69c09dcc95 -s ours

* commit '69c09dcc95be42a47fa025f8a3b93647b872bf9a':
Import translations. DO NOT MERGE

Change-Id: If2020f86008148bbd64d9825f68dcd51b3e8231c
98c1498e7c41a5eee5dcb2e4ce807436f5b87907 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 3b6f947ad8 -s ours

* commit '3b6f947ad84f170cd90409e788eff7d65867f9ea':
Import translations. DO NOT MERGE

Change-Id: I32870f13410f73e864fb000a5dbd0c485098c62a
6904d8a43844322fea5d39b97b1238831290a64a 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 3b6f947ad8 -s ours

* commit '3b6f947ad84f170cd90409e788eff7d65867f9ea':
Import translations. DO NOT MERGE

Change-Id: Ifa1eaa29b00adfe5a44e7f62abe26dc0ea0f209f
69c09dcc95be42a47fa025f8a3b93647b872bf9a 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ia28b2455e8cdcf9dc969e3e486c4df26d07758cb
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-gu-rIN/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ro/strings.xml
es/values-si-rLK/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-tl/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rHK/strings.xml
3b6f947ad84f170cd90409e788eff7d65867f9ea 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I49258e5bda84a2a2bf377e81333066bb2e3dfc1e
Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-hy-rAM/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-my-rMM/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rHK/strings.xml
0d40255032680d3cce56a07f7eba8baefc5512cd 28-May-2016 Brad Ebinger <breadley@google.com> Propogate EVENT_CALL_MERGE_FAILED Connection Event

Propogate the EVENT_CALL_MERGE_FAILED Connection Event to the InCall UI
when setConferenceMergeFailed has been received from the Connection.

Also, a test was created to verify the Connection Event propogates to
the InCallService

Bug: 28847375
Change-Id: Id0bd9ca68528d442a658dfb4df8da20c1344e8da
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
f1e4dd74bec96f71e552fef6559c3201539a7423 01-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I08a78e9967fdb93b4e8d4890b3b2cf7a7197957c
Auto-generated-cl: translation import
es/values-hy-rAM/strings.xml
657bebb816cd50970885a10d4f587dd252a11c16 01-Jun-2016 Sanket Agarwal <sanketa@google.com> Merge "Do not process call intent if call already disconnected am: e6143f5785 am: b73897e5c3" into nyc-mr1-dev-plus-aosp
am: 1c7c477a99

* commit '1c7c477a997836ca41e796d48b8e20ef7a73c003':

Change-Id: Ica035a9cf15dd2b266f8497a6d39f5f926d41cad
d025ef6a8697da2fb55a52d067625f0a333560c1 01-Jun-2016 Sanket Agarwal <sanketa@google.com> Do not process call intent if call already disconnected am: e6143f5785 am: 29e2ea674c
am: 1ffae6c8e9

* commit '1ffae6c8e95c60ef4056c93b353293fa02af7b04':
Do not process call intent if call already disconnected

Change-Id: I81e49fb8da4e3d414bbbfa7b5f582c79492b7df0
1c7c477a997836ca41e796d48b8e20ef7a73c003 31-May-2016 Android Build Merger (Role) <android-build-merger@google.com> Merge "Do not process call intent if call already disconnected am: e6143f5785 am: b73897e5c3" into nyc-mr1-dev-plus-aosp
1ffae6c8e95c60ef4056c93b353293fa02af7b04 31-May-2016 Sanket Agarwal <sanketa@google.com> Do not process call intent if call already disconnected am: e6143f5785
am: 29e2ea674c

* commit '29e2ea674c882bb75d2fe52cfd032684765d9810':
Do not process call intent if call already disconnected

Change-Id: I266bfe4d760b40f5368e7639981f2bcfc23fb02b
5b57478368782a390c5b1602e476703c754b630f 31-May-2016 Sanket Agarwal <sanketa@google.com> Do not process call intent if call already disconnected am: e6143f5785
am: b73897e5c3

* commit 'b73897e5c3ecad11adc0908acab72e63cf7f1d83':
Do not process call intent if call already disconnected

Change-Id: I9490ede57a2b21f45015e2b0375e97f6f8a42902
29e2ea674c882bb75d2fe52cfd032684765d9810 31-May-2016 Sanket Agarwal <sanketa@google.com> Do not process call intent if call already disconnected
am: e6143f5785

* commit 'e6143f57856972ba21b5c6fb711c93ac2e477cc7':
Do not process call intent if call already disconnected

Change-Id: I3254022672a7ae4b498cb245675cb69c0075ebfe
b73897e5c3ecad11adc0908acab72e63cf7f1d83 31-May-2016 Sanket Agarwal <sanketa@google.com> Do not process call intent if call already disconnected
am: e6143f5785

* commit 'e6143f57856972ba21b5c6fb711c93ac2e477cc7':
Do not process call intent if call already disconnected

Change-Id: I67deb115d50677af30c0d0becbace5c739875cd9
bf4b7df7b65ff30b1b18678a2b42bf0fe17380c8 31-May-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I7778dd16c2016c10a9222df05cc7e4d2583e0c05
Auto-generated-cl: translation import
es/values-fa/strings.xml
e6143f57856972ba21b5c6fb711c93ac2e477cc7 26-May-2016 Sanket Agarwal <sanketa@google.com> Do not process call intent if call already disconnected

In cases of very quick call and hangup (delay of 0.1 sec using
automation) the call itself will go from NEW -> CONNECTING ->
DISCONNECTED but the CallIntentProcessor will still make the outgoing
call since it does not check the current call state for it has been
disconnected.

Bug: b/28969591
Change-Id: I1de45ff342db3e2552824c17f9f73f9c3a2579d9
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
f6039f0f11f9df2c7197ec8a9687935124e95853 26-May-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure external calls are not logged." into nyc-mr1-dev am: 76912d085a
am: adceb83157

* commit 'adceb8315732e81cdad596e7fd79250cecb07e02':
Ensure external calls are not logged.

Change-Id: I97c23b980d60fc9b4399bac112c724eb91e35063
adceb8315732e81cdad596e7fd79250cecb07e02 26-May-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure external calls are not logged." into nyc-mr1-dev
am: 76912d085a

* commit '76912d085aeb5966e8318f87998c065b1007fff9':
Ensure external calls are not logged.

Change-Id: If9f9a8b3259407c83c2eb5cb3b6d0a8acc61eadd
76912d085aeb5966e8318f87998c065b1007fff9 26-May-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure external calls are not logged." into nyc-mr1-dev
d1660282032b8145a9d24f6ce80ab60ac29a9217 25-May-2016 Tyler Gunn <tgunn@google.com> Ensure external calls are not logged.

We never want to log external calls.

Bug: 27458894
Change-Id: Iea4c95342712b881244303934fc07969b1578f24
rc/com/android/server/telecom/CallLogManager.java
991231032aa70e0ceebd09a1168194b58d8fec30 24-May-2016 Brad Ebinger <breadley@google.com> Add check for "Silent" Uri.EMPTY Ringtone Uri am: ad54e7f053 am: e59c017483
am: fd87784d73

* commit 'fd87784d73a582ae1fcfd7762543a5b66494ed1e':

Change-Id: Ic832bce61ba9255b44fb1b7d5b8cb4a2c409c97f
4508d2bd0c8d5c2ce6758df78b52db678f2e32f7 24-May-2016 Brad Ebinger <breadley@google.com> Add check for "Silent" Uri.EMPTY Ringtone Uri am: ad54e7f053 am: 30517ac45a
am: a964a5b189

* commit 'a964a5b189e2de9be6bc966e7d5e7c02984af7f4':
Add check for "Silent" Uri.EMPTY Ringtone Uri

Change-Id: I1e63ceb2696cf34ab2539c19bd1e1bc5d039a733
fd87784d73a582ae1fcfd7762543a5b66494ed1e 24-May-2016 Brad Ebinger <breadley@google.com> Add check for "Silent" Uri.EMPTY Ringtone Uri am: ad54e7f053
am: e59c017483

* commit 'e59c0174830e1e4cc09525802ccdab09b34a825e':

Change-Id: I4292ad1a5c4638528eb5142e1fba46310cb07a9e
a964a5b189e2de9be6bc966e7d5e7c02984af7f4 24-May-2016 Brad Ebinger <breadley@google.com> Add check for "Silent" Uri.EMPTY Ringtone Uri am: ad54e7f053
am: 30517ac45a

* commit '30517ac45ab28d44ae35ee4c14cc36707af6ab06':
Add check for "Silent" Uri.EMPTY Ringtone Uri

Change-Id: I3b5852c9d476f839811921c8e8169f6a1a1e8f96
e59c0174830e1e4cc09525802ccdab09b34a825e 24-May-2016 Brad Ebinger <breadley@google.com> Add check for "Silent" Uri.EMPTY Ringtone Uri
am: ad54e7f053

* commit 'ad54e7f053f00d6c77fe18c11cc5e7c5a7b8fb60':
Add check for "Silent" Uri.EMPTY Ringtone Uri

Change-Id: I2d2f18a38e80a1f36645276b7b0331a4f06667ec
30517ac45ab28d44ae35ee4c14cc36707af6ab06 24-May-2016 Brad Ebinger <breadley@google.com> Add check for "Silent" Uri.EMPTY Ringtone Uri
am: ad54e7f053

* commit 'ad54e7f053f00d6c77fe18c11cc5e7c5a7b8fb60':
Add check for "Silent" Uri.EMPTY Ringtone Uri

Change-Id: I74143ae1faae397e75cd4de7dbe2302ab2fe629a
84771f8f87f5f582bf848b621eed8c6cd99d41b0 19-May-2016 Brad Ebinger <breadley@google.com> Propogates the CDMA Voice Privacy Property to a Call

Allows the CDMA enhanced voice privacy connection property to be
propogated up as a Call Property.

Bug: 26931679
Change-Id: I2206d1e8091c39c8ceddb820f1c70671ed46a008
rc/com/android/server/telecom/ParcelableCallUtils.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ad54e7f053f00d6c77fe18c11cc5e7c5a7b8fb60 23-May-2016 Brad Ebinger <breadley@google.com> Add check for "Silent" Uri.EMPTY Ringtone Uri

Currently we do not check for the ringtone Uri Uri.Empty, which is
the "Silent" ringtone. Since we did not check for this case, we would
play a "Dinging" sound instead of nothing when we queried for the
Ringtone associated with the Uri.

This change checks to see if the Ringtone Uri is Uri.EMPTY before
playing it.

Change-Id: Iab51d43184f29caf58f5333a7c893c26cd9bca0a
Fix: 28912183
rc/com/android/server/telecom/AsyncRingtonePlayer.java
7d47131b6a4b77d61d44a8dc3928d83d5caa09bc 23-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Import translations. DO NOT MERGE"
96a3b2aba7c8cd353680da992b5339437e622987 23-May-2016 Tony Mak <tonymak@google.com> Merge "Merge "Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review" into nyc-dev am: dcdff03d39 am: 42ba6e90b9" into nyc-mr1-dev-plus-aosp
am: 3b6fe39fb0

* commit '3b6fe39fb0007fe6e84ca524622c873afd5db45d':

Change-Id: I8e85b0ac347f5375104be807a639246824203697
e3e48b7143f431a2b0d1f7fb63e8548ecf3d453b 23-May-2016 Tony Mak <tonymak@google.com> Merge "Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review" into nyc-dev am: dcdff03d39 am: af5bcf698d
am: 5febdd73ec

* commit '5febdd73ec52e97b9f13cb8e855fd9ecf1250f0d':
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I927e733f4c45166899ea0a753746f902bad41373
3b6fe39fb0007fe6e84ca524622c873afd5db45d 23-May-2016 Android Build Merger (Role) <android-build-merger@google.com> Merge "Merge "Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review" into nyc-dev am: dcdff03d39 am: 42ba6e90b9" into nyc-mr1-dev-plus-aosp
5febdd73ec52e97b9f13cb8e855fd9ecf1250f0d 23-May-2016 Tony Mak <tonymak@google.com> Merge "Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review" into nyc-dev am: dcdff03d39
am: af5bcf698d

* commit 'af5bcf698d52103a79adad2bfdae174cb3e1ee24':
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I89531d653e52a8e3ce115a233e83a6230df7062e
2e1a84dcf91ed29d0480ea5d1a33534f6ecf33c4 23-May-2016 Tony Mak <tonymak@google.com> Merge "Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review" into nyc-dev am: dcdff03d39
am: 42ba6e90b9

* commit '42ba6e90b9bfe72729495571f1f467ec0d7a663f':
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I79bd65ebcc62d58150c1c1ab106084b737060559
42ba6e90b9bfe72729495571f1f467ec0d7a663f 23-May-2016 Tony Mak <tonymak@google.com> Merge "Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review" into nyc-dev
am: dcdff03d39

* commit 'dcdff03d394d94c888b621175f720fd48f983ada':
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I5e7278e6d05fba07e2b61de438559ae738de37e4
af5bcf698d52103a79adad2bfdae174cb3e1ee24 23-May-2016 Tony Mak <tonymak@google.com> Merge "Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review" into nyc-dev
am: dcdff03d39

* commit 'dcdff03d394d94c888b621175f720fd48f983ada':
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I6d115676f113583b6402371fb15dc974e642a950
dcdff03d394d94c888b621175f720fd48f983ada 23-May-2016 Tony Mak <tonymak@google.com> Merge "Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review" into nyc-dev
714a9327c2b5599ec69c604f22cb6241d4455876 23-May-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I125263887f079cfc37fe699b7cda155872412d7a
Auto-generated-cl: translation import
es/values-eu-rES/strings.xml
es/values-in/strings.xml
es/values-ky-rKG/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-si-rLK/strings.xml
es/values-sq-rAL/strings.xml
es/values-ta-rIN/strings.xml
ba022d6033d9720c27247f749743549b5c598523 23-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE am: 4b46280d02 -s ours am: 845c7924ee -s ours
am: a0bd59e0ae -s ours

* commit 'a0bd59e0ae3dc25cf24cdfdd345a0855c52744af':

Change-Id: Idbdaac4a65ebeb42ea833fe5aec5d8221707430b
d2e4f7490734f5cb3f18cfbd6588acc596cdc8c3 23-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE am: 4b46280d02 -s ours am: 57f5bef1c5 -s ours
am: 60f8998244 -s ours

* commit '60f8998244ee7c0a46c96ccef5612ab5d7945d61':
Import translations. DO NOT MERGE

Change-Id: I0f626658d816399dd1c29b8934389dfc7578bbca
a0bd59e0ae3dc25cf24cdfdd345a0855c52744af 23-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE am: 4b46280d02 -s ours
am: 845c7924ee -s ours

* commit '845c7924ee4fd397170d4a44b5704543d4343609':

Change-Id: I5674fd57446d71c3d4101f169f90b9f42c56fb7e
60f8998244ee7c0a46c96ccef5612ab5d7945d61 23-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE am: 4b46280d02 -s ours
am: 57f5bef1c5 -s ours

* commit '57f5bef1c555f901ec4c1b84fc6a1f0cf503fbb4':
Import translations. DO NOT MERGE

Change-Id: I69a43db43871bcd01389923bff39ae55db1dfcda
57f5bef1c555f901ec4c1b84fc6a1f0cf503fbb4 23-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE
am: 4b46280d02 -s ours

* commit '4b46280d02e2bbfb293b13c3b99fe6ecad42722f':
Import translations. DO NOT MERGE

Change-Id: I9ef3e82be9ad7cb14a2974ed222e80211d8e47a6
845c7924ee4fd397170d4a44b5704543d4343609 23-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE
am: 4b46280d02 -s ours

* commit '4b46280d02e2bbfb293b13c3b99fe6ecad42722f':
Import translations. DO NOT MERGE

Change-Id: I09fa0e00f617c2b27781931cee4c070331342ab7
4b46280d02e2bbfb293b13c3b99fe6ecad42722f 21-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 28857042
Change-Id: I683bbbd63dcce417aa46d5f0c8b1d510100cc68b
es/values-af/strings.xml
es/values-be-rBY/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-gu-rIN/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-ky-rKG/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ro/strings.xml
es/values-si-rLK/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-tl/strings.xml
es/values-ur-rPK/strings.xml
es/values-zh-rHK/strings.xml
d9ec0ea4e4821b0ba4287df7c44c42ae77ca8a89 20-May-2016 Tony Mak <tonymak@google.com> Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Bug: 28842878
Change-Id: I52684f898137d7b07c4b9a7ac34081b3d5ec79da
rc/com/android/server/telecom/ParcelableCallUtils.java
6ab1ce8c1b0001e0890be388f2b20bdeaf0a7759 19-May-2016 Satish Kodishala <skodisha@codeaurora.org> Handle AT+CHLD=1 when there is no active call am: f5bdfb5aa2 am: 46c1a0b53d am: c3127632ce
am: 38f643f508

* commit '38f643f508598a8f317558d4276e9af72f27be4b':
Handle AT+CHLD=1 when there is no active call

Change-Id: Ied993b38fd1337ae161016831c17aa7d9d935a87
38f643f508598a8f317558d4276e9af72f27be4b 19-May-2016 Satish Kodishala <skodisha@codeaurora.org> Handle AT+CHLD=1 when there is no active call am: f5bdfb5aa2 am: 46c1a0b53d
am: c3127632ce

* commit 'c3127632cec010f4180e6a89a9bdf40ea3ee2547':
Handle AT+CHLD=1 when there is no active call

Change-Id: I2c4ea2781f9a9286904cc1dadf90892215de74b4
c3127632cec010f4180e6a89a9bdf40ea3ee2547 19-May-2016 Satish Kodishala <skodisha@codeaurora.org> Handle AT+CHLD=1 when there is no active call am: f5bdfb5aa2
am: 46c1a0b53d

* commit '46c1a0b53d465e3b7638bb15b4be17514566fe51':
Handle AT+CHLD=1 when there is no active call

Change-Id: Idc5456d7e8f529e867d8275d9ad5a57453c72e69
46c1a0b53d465e3b7638bb15b4be17514566fe51 19-May-2016 Satish Kodishala <skodisha@codeaurora.org> Handle AT+CHLD=1 when there is no active call
am: f5bdfb5aa2

* commit 'f5bdfb5aa24df7b9d6be01d10fe58342cc5bcc59':
Handle AT+CHLD=1 when there is no active call

Change-Id: Ibb671ff34527a77f524a7dae06fa7b2b1eaad703
e6117a3e4aa588ff0157de635fdc36deb3167249 17-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ia678abe8ee32a31af94a6dcfeb7215ebe9cca7ba
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-be-rBY/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-gu-rIN/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-pl/strings.xml
es/values-ro/strings.xml
es/values-sl/strings.xml
es/values-sw/strings.xml
es/values-tl/strings.xml
es/values-ur-rPK/strings.xml
es/values-zh-rHK/strings.xml
eff5a6492b8cedcc4c52aaf5831aa73c6692ab5a 13-May-2016 Brad Ebinger <breadley@google.com> Merge "Account for User\'s Voice SIM preference for E911" into nyc-mr1-dev am: e5dbef8e52
am: 14287da1cd

* commit '14287da1cdcbcea4ca8ba2518791047b04cce167':
Account for User's Voice SIM preference for E911

Change-Id: I0c0160ef3a873d2cd45ca9a52aed242ddc89aae9
14287da1cdcbcea4ca8ba2518791047b04cce167 13-May-2016 Brad Ebinger <breadley@google.com> Merge "Account for User\'s Voice SIM preference for E911" into nyc-mr1-dev
am: e5dbef8e52

* commit 'e5dbef8e525f95c6ec620856264169bd3f22db01':
Account for User's Voice SIM preference for E911

Change-Id: Ibb07ccf1f57784c482f99209d23dc105e87056f1
e5dbef8e525f95c6ec620856264169bd3f22db01 13-May-2016 Brad Ebinger <breadley@google.com> Merge "Account for User's Voice SIM preference for E911" into nyc-mr1-dev
e6c481acfcad381e3973e3250a366e1893259b84 12-May-2016 Brad Ebinger <breadley@google.com> Account for User's Voice SIM preference for E911

Currently, we do not take into account a user's Voice SIM preference
when making an emergency call. The CreateConnectionProcessor now first
trys to use the Voice SIM preference of the user and backs up to other
SIM accounts if that account fails.

Bug: 27059146
Change-Id: Ic64ecdd23fe081f9660820e5659d314f2c9b9902
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/TelephonyUtil.java
714a985ee6f330af1e1068aac00af6d0481ca110 11-May-2016 Hall Liu <hallliu@google.com> Merge "IMS: Handle USER_* messages in Quiescent* states." into nyc-mr1-dev am: a3efa36cfb
am: e671a7caff

* commit 'e671a7caff93f01bef58da9204c6fe06af0f93a0':
IMS: Handle USER_* messages in Quiescent* states.

Change-Id: Ic4314b41a01b6a7deb6927c8e1fee2b396b7b6bd
e671a7caff93f01bef58da9204c6fe06af0f93a0 11-May-2016 Garik Badalyan <garikb@codeaurora.org> Merge "IMS: Handle USER_* messages in Quiescent* states." into nyc-mr1-dev
am: a3efa36cfb

* commit 'a3efa36cfbf2962ed295cc0165294baeb844ad7a':
IMS: Handle USER_* messages in Quiescent* states.

Change-Id: Icaa768289f5aefab534d2404316affcf6503964e
a3efa36cfbf2962ed295cc0165294baeb844ad7a 11-May-2016 Hall Liu <hallliu@google.com> Merge "IMS: Handle USER_* messages in Quiescent* states." into nyc-mr1-dev
4ef9b21e9303047abd08da3ca7db7f93e3212bfc 10-May-2016 Hall Liu <hallliu@google.com> Merge "Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev am: 209175a2ab am: 88a3bd9265" into nyc-mr1-dev-plus-aosp
am: f00d890c13

* commit 'f00d890c13aee6955c2939d7f7d3cea79caeb6a8':

Change-Id: I8f116f22a51bc44889c2c9bb48f90042ca366a3c
addba04a70cd7da20f08b5efa9115adf483bf2d3 10-May-2016 Hall Liu <hallliu@google.com> Merge "Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev am: 209175a2ab am: 8c7a0071a6" into nyc-mr1-dev-plus-aosp
am: dceed6e726

* commit 'dceed6e7263a0043d8f4bdc9c710b1da721780e7':
Turn off mWasOnSpeaker if user explicitly leaves speakerphone

Change-Id: If363a398174969d181cdde00b93ddd0bd8d58b00
b9569b4da34e9e13542b966810de25ca66e90f32 10-May-2016 Hall Liu <hallliu@google.com> Merge "Merge "Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route" into nyc-dev am: dd6586ced4 am: cf9c9e9ad6" into nyc-mr1-dev-plus-aosp
am: 93b8c7388c

* commit '93b8c7388c2a39a03413097408f087bda5df670f':

Change-Id: I7455b063ee763fed70a488c82a8c2b1edf4e9e64
248c59d93a97f71d70751526d2ac1a280201ba73 10-May-2016 Hall Liu <hallliu@google.com> Merge "Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route" into nyc-dev am: dd6586ced4 am: 17da6d4461
am: 92041ba05a

* commit '92041ba05a45b5c8c6c2ecef3eca0167ef9a105e':
Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route

Change-Id: I40a4b7a0f9036a554b073a3354873b2cb1e4ae53
f00d890c13aee6955c2939d7f7d3cea79caeb6a8 10-May-2016 Android Build Merger (Role) <android-build-merger@google.com> Merge "Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev am: 209175a2ab am: 88a3bd9265" into nyc-mr1-dev-plus-aosp
dceed6e7263a0043d8f4bdc9c710b1da721780e7 10-May-2016 Android Build Merger (Role) <android-build-merger@google.com> Merge "Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev am: 209175a2ab am: 8c7a0071a6" into nyc-mr1-dev-plus-aosp
93b8c7388c2a39a03413097408f087bda5df670f 10-May-2016 Android Build Merger (Role) <android-build-merger@google.com> Merge "Merge "Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route" into nyc-dev am: dd6586ced4 am: cf9c9e9ad6" into nyc-mr1-dev-plus-aosp
dd5795bc8c80b6aaa1ab0039773e5a83c90a4894 10-May-2016 Hall Liu <hallliu@google.com> Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev am: 209175a2ab
am: 88a3bd9265

* commit '88a3bd9265e1850dd63c2566edde1442c332a738':
Turn off mWasOnSpeaker if user explicitly leaves speakerphone

Change-Id: I1e7ea56e3b8b940d12b5a8061c91a9eb0ee128f5
86037c1dfec8e9388cb9c4a37b67363b31e77907 10-May-2016 Hall Liu <hallliu@google.com> Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev am: 209175a2ab
am: 8c7a0071a6

* commit '8c7a0071a6f3938da4af50de1df27f77b9ab23b3':
Turn off mWasOnSpeaker if user explicitly leaves speakerphone

Change-Id: Id76d631358fb923d704a4fec0d4d4c6a55a957ea
92041ba05a45b5c8c6c2ecef3eca0167ef9a105e 10-May-2016 Hall Liu <hallliu@google.com> Merge "Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route" into nyc-dev am: dd6586ced4
am: 17da6d4461

* commit '17da6d4461c5d10b1769d289cf4f363062cbfc96':
Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route

Change-Id: If99201d378650ebd18845eab8a49dd6f973e82ed
788c2cff9ce140c1befded0633113d39a79045bf 10-May-2016 Hall Liu <hallliu@google.com> Merge "Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route" into nyc-dev am: dd6586ced4
am: cf9c9e9ad6

* commit 'cf9c9e9ad68ca8d9dec1c661cbe4a485f3564308':
Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route

Change-Id: I255f2719a3768b122ab71537c05f6d257253a9ee
88a3bd9265e1850dd63c2566edde1442c332a738 10-May-2016 Hall Liu <hallliu@google.com> Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev
am: 209175a2ab

* commit '209175a2ab0d6d8c27aed4fe4458c5f611004e3f':
Turn off mWasOnSpeaker if user explicitly leaves speakerphone

Change-Id: Idf86bda02f82b6be033d3753249811e81baa08e5
8c7a0071a6f3938da4af50de1df27f77b9ab23b3 10-May-2016 Hall Liu <hallliu@google.com> Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev
am: 209175a2ab

* commit '209175a2ab0d6d8c27aed4fe4458c5f611004e3f':
Turn off mWasOnSpeaker if user explicitly leaves speakerphone

Change-Id: I502f0d40980f73a0180c60d3c1300506c00d60db
17da6d4461c5d10b1769d289cf4f363062cbfc96 10-May-2016 Hall Liu <hallliu@google.com> Merge "Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route" into nyc-dev
am: dd6586ced4

* commit 'dd6586ced49eb1df5a264d49c313177976e4d95c':
Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route

Change-Id: I9037a1699b5e2a486a5d3b6171c153529b2a3e27
cf9c9e9ad68ca8d9dec1c661cbe4a485f3564308 10-May-2016 Hall Liu <hallliu@google.com> Merge "Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route" into nyc-dev
am: dd6586ced4

* commit 'dd6586ced49eb1df5a264d49c313177976e4d95c':
Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route

Change-Id: I974179d5467afe35a58175c2ccf9f51c61aa9060
209175a2ab0d6d8c27aed4fe4458c5f611004e3f 10-May-2016 Hall Liu <hallliu@google.com> Merge "Turn off mWasOnSpeaker if user explicitly leaves speakerphone" into nyc-dev
dd6586ced49eb1df5a264d49c313177976e4d95c 10-May-2016 Hall Liu <hallliu@google.com> Merge "Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route" into nyc-dev
b68c47f26c5c2266a669d70020e31e0cfd13afe7 09-May-2016 Hall Liu <hallliu@google.com> Merge "Reset last known audio state upon losing audio focus" into nyc-mr1-dev am: 2e3c9513e6
am: cc9b341d63

* commit 'cc9b341d6304a97c776a3b6bfc4fae4a3901de99':
Reset last known audio state upon losing audio focus

Change-Id: I5c0a5708f063cd845586695b10aba85cc6af0f9b
cc9b341d6304a97c776a3b6bfc4fae4a3901de99 09-May-2016 Garik Badalyan <garikb@codeaurora.org> Merge "Reset last known audio state upon losing audio focus" into nyc-mr1-dev
am: 2e3c9513e6

* commit '2e3c9513e685ed4743e9ee17a05d6231ef1a19a8':
Reset last known audio state upon losing audio focus

Change-Id: I76cc6e693af74e1139d7a82c9d33c925b16f7620
2e3c9513e685ed4743e9ee17a05d6231ef1a19a8 09-May-2016 Hall Liu <hallliu@google.com> Merge "Reset last known audio state upon losing audio focus" into nyc-mr1-dev
b3cbeb036d3fedc80e955ee67f85d6b6910fa0c2 07-May-2016 Garik Badalyan <garikb@codeaurora.org> Reset last known audio state upon losing audio focus

mLastKnownCallAudioState is checked before triggering
notification to the rest of the framework. Not resetting
this variable upon losing the audio focus results in
not sending notification to the framework later.
This commit resets mLastKnownCallAudioState during
re-initialization of the state machine.

BUG=28642858

Change-Id: I8740c4c55a523cedf1e9aba1bf1c55fdda94dd1b
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
967bdfee46f0259926dc84e00242a6ad8fcd0f24 06-May-2016 Garik Badalyan <garikb@codeaurora.org> IMS: Handle USER_* messages in Quiescent* states.

Currently USER_* requests are only handled in Active*
states of CallAudioRouteStateMachine which in some
cases results in ignoring user requests. This change
modifies Quiescent* states to handle USER_* messages
similiar to corresponding none-user initiated messages.

BUG=28602331
Change-Id: I1ec932b8961ed74956c81a2ccd448b7b9fbb6dca
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
dccd78d7efb25f40a041493e85f46f8347d4d598 04-May-2016 Abhijith Shastry <ashastry@google.com> Do not permit users to block invalid phone numbers. am: 998c270276 am: b2ffeb6484
am: f8487737d1

* commit 'f8487737d1fab1a16544602dce9978ce2e2dcecd':

Change-Id: I2b216aab74de7c2404c932b482df07055f861a2f
f8487737d1fab1a16544602dce9978ce2e2dcecd 04-May-2016 Abhijith Shastry <ashastry@google.com> Do not permit users to block invalid phone numbers. am: 998c270276
am: b2ffeb6484

* commit 'b2ffeb6484117ff0bd3ee84cb6d02a15115ae01f':

Change-Id: I2933551acd362e9cf23b3eb34b241bb4251f37ad
df165e1abde69354fde1d3eb1d296674965510c9 04-May-2016 Abhijith Shastry <ashastry@google.com> Do not permit users to block invalid phone numbers. am: 998c270276 am: a9bd8b9ea0
am: 664fb39187

* commit '664fb3918748aa3550a89bfb7a587a6202104168':
Do not permit users to block invalid phone numbers.

Change-Id: I638c9d05bc9621497ede71ca83f282ecce624fd7
664fb3918748aa3550a89bfb7a587a6202104168 04-May-2016 Abhijith Shastry <ashastry@google.com> Do not permit users to block invalid phone numbers. am: 998c270276
am: a9bd8b9ea0

* commit 'a9bd8b9ea0e9dd30ffc7843cf18ec4dd6506f511':
Do not permit users to block invalid phone numbers.

Change-Id: Iaaced56f2b737a23daf3c6835c5229ae2a26a732
a9bd8b9ea0e9dd30ffc7843cf18ec4dd6506f511 04-May-2016 Abhijith Shastry <ashastry@google.com> Do not permit users to block invalid phone numbers.
am: 998c270276

* commit '998c270276f1a54924800cdb6a7c9083b54187d4':
Do not permit users to block invalid phone numbers.

Change-Id: I7fe7bb9df144873771d9cc8e184e0e69789f9758
b2ffeb6484117ff0bd3ee84cb6d02a15115ae01f 04-May-2016 Abhijith Shastry <ashastry@google.com> Do not permit users to block invalid phone numbers.
am: 998c270276

* commit '998c270276f1a54924800cdb6a7c9083b54187d4':
Do not permit users to block invalid phone numbers.

Change-Id: Idccf761b3e10e177cea00f932079ced5d1e6c804
998c270276f1a54924800cdb6a7c9083b54187d4 04-May-2016 Abhijith Shastry <ashastry@google.com> Do not permit users to block invalid phone numbers.

BUG: 28376693
Change-Id: I851d47deb8fe41b25b3b3e678ad7c190718ea638
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
04209a31d133a1c0eda0fd550fdeb7c798a168f5 02-May-2016 Hall Liu <hallliu@google.com> Turn off mWasOnSpeaker if user explicitly leaves speakerphone

Bug: 28300938
Change-Id: Iab8663b97d236946183270c4d33e63d6de1c224a
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
1a24e92c13be1b946982f341f7062bdb8ed28160 02-May-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure connection video capabilities can only be set if video supported." into nyc-dev am: b71c70b5c7 am: 2857a841aa
am: 659c6376bb

* commit '659c6376bbcafb66525096462ae62579d5a41cf8':

Change-Id: Ic71f7e146303aa70f743cb7f7ccf4951940fc510
99a75774749858a4145e91eeb56df94c6ad076b3 02-May-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure connection video capabilities can only be set if video supported." into nyc-dev am: b71c70b5c7 am: 9490e2beb2
am: f9e1744042

* commit 'f9e1744042f49ff9fc4f6f247009d69111f951fe':
Ensure connection video capabilities can only be set if video supported.

Change-Id: I5220c710b164f9bba1f05126252e8e25085c0dc9
659c6376bbcafb66525096462ae62579d5a41cf8 02-May-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure connection video capabilities can only be set if video supported." into nyc-dev am: b71c70b5c7
am: 2857a841aa

* commit '2857a841aa76910339ca6f8b9ce7a670dc6f2200':

Change-Id: Id5563bfa2c9f73c55fcd758b05ce98f1c66e4309
f9e1744042f49ff9fc4f6f247009d69111f951fe 02-May-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure connection video capabilities can only be set if video supported." into nyc-dev am: b71c70b5c7
am: 9490e2beb2

* commit '9490e2beb2b474e848423f480dbbcec9fe434298':
Ensure connection video capabilities can only be set if video supported.

Change-Id: Iec0ea418482f8d4be955aecb7e46f1f9862d10e9
9490e2beb2b474e848423f480dbbcec9fe434298 02-May-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure connection video capabilities can only be set if video supported." into nyc-dev
am: b71c70b5c7

* commit 'b71c70b5c7ff858ac4f358b240efa09f8b8d3958':
Ensure connection video capabilities can only be set if video supported.

Change-Id: I86d3f49730660527025dda3d56603e1ee0c7b61e
2857a841aa76910339ca6f8b9ce7a670dc6f2200 02-May-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure connection video capabilities can only be set if video supported." into nyc-dev
am: b71c70b5c7

* commit 'b71c70b5c7ff858ac4f358b240efa09f8b8d3958':
Ensure connection video capabilities can only be set if video supported.

Change-Id: I9c0ac5aa74b1ba4d4d46bfc1e671f306de378014
b71c70b5c7ff858ac4f358b240efa09f8b8d3958 02-May-2016 Tyler Gunn <tgunn@google.com> Merge "Ensure connection video capabilities can only be set if video supported." into nyc-dev
c9e9c8c11b857b58c85da0bece2c2df112b13b23 28-Apr-2016 Alain Vongsouvanh <alainv@google.com> DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported. am: d54e292 -s ours am: 9f410a7753 -s ours am: 8395ba396d -s ours am: 3af05af9a3 -s ours
am: caf790e0fc -s ours

* commit 'caf790e0fc4e7d571b1556c67c379481df3d5de3':

Change-Id: If30abf827ce4bd091f8892f643f2e92229cab4d5
eea59ef45d2b4cbbfc0f6f1806123289bfb16033 28-Apr-2016 Alain Vongsouvanh <alainv@google.com> DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported. am: d54e292 -s ours am: 9f410a7753 -s ours am: 8395ba396d -s ours am: 7b87b41939 -s ours
am: 0e0da76887 -s ours

* commit '0e0da768871e9477279e84cafdaa0a131afc7d9a':
DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported.

Change-Id: I431e172678cb3cf166c5b617de3791e0a005bc6b
caf790e0fc4e7d571b1556c67c379481df3d5de3 28-Apr-2016 Alain Vongsouvanh <alainv@google.com> DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported. am: d54e292 -s ours am: 9f410a7753 -s ours am: 8395ba396d -s ours
am: 3af05af9a3 -s ours

* commit '3af05af9a3df6f7b09bc41afc4086fcafde47834':

Change-Id: I0fc924079a800a26312cfed4e759bac8d9c44ab4
0e0da768871e9477279e84cafdaa0a131afc7d9a 28-Apr-2016 Alain Vongsouvanh <alainv@google.com> DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported. am: d54e292 -s ours am: 9f410a7753 -s ours am: 8395ba396d -s ours
am: 7b87b41939 -s ours

* commit '7b87b41939e9a086f03a7c482f95de871c3868a5':
DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported.

Change-Id: Ifab7d7c6b717e1e585eda2e2b9d992aa646675a5
7b87b41939e9a086f03a7c482f95de871c3868a5 28-Apr-2016 Alain Vongsouvanh <alainv@google.com> DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported. am: d54e292 -s ours am: 9f410a7753 -s ours
am: 8395ba396d -s ours

* commit '8395ba396dbea895dad4f434c91930cec02d9be0':
DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported.

Change-Id: I5b9a6a26ab2a87714baee91ff5706c7f35773b88
3af05af9a3df6f7b09bc41afc4086fcafde47834 28-Apr-2016 Alain Vongsouvanh <alainv@google.com> DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported. am: d54e292 -s ours am: 9f410a7753 -s ours
am: 8395ba396d -s ours

* commit '8395ba396dbea895dad4f434c91930cec02d9be0':
DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported.

Change-Id: I69a6830151f55ea0b24a758a11afeeb7d7b7a928
8395ba396dbea895dad4f434c91930cec02d9be0 28-Apr-2016 Alain Vongsouvanh <alainv@google.com> DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported. am: d54e292 -s ours
am: 9f410a7753 -s ours

* commit '9f410a7753b4a2e6c5606297703ca3334c40c39d':
DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported.

Change-Id: Ibd2a20727a1d841ccdded1021ee9306885fd562f
594de90df8fe8b7c15275e4bdeed128fd9135616 28-Apr-2016 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 79de301 -s ours
am: dcf620f -s ours

* commit 'dcf620fe3676f829331aa471558ceaf08579c168':
Import translations. DO NOT MERGE

Change-Id: I276e8fb09cde147c007b28a9fb2133be26ca32d4
28587763d6ff9416f5645b1360510e8f58c39847 28-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 908d4c5 -s ours
am: f04cadb -s ours

* commit 'f04cadb9f7d18ae9514f1d4eb13ded5a3a1b90cf':
Import translations. DO NOT MERGE

Change-Id: Ide77e67c0bf59d0807bf6afa4f64aeab1c72cef9
9f410a7753b4a2e6c5606297703ca3334c40c39d 28-Apr-2016 Alain Vongsouvanh <alainv@google.com> DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported.
am: d54e292 -s ours

* commit 'd54e292d09f2ed043725cbfa06068c6c5e129e86':
DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported.

Change-Id: I76ef8de729cb568981dfb83e763210d3a1823236
d54e292d09f2ed043725cbfa06068c6c5e129e86 27-Apr-2016 Alain Vongsouvanh <alainv@google.com> DO NOT MERGE ANYWHERE Set audio route to 0 when none are supported.

CallAudioManager does not need to default to EARPIECE nor SPEAKER if no
audio routes are supported, e.g the device does not have audio output
features. This CL prevents the CallAudioManager from trying to turn some
audio routes on since the route and supportedRoutes are set to 0.

BUG: 28129653
Change-Id: I8c4b41ce8dd64abe9d0e94124ee178a9f2e438ae
rc/com/android/server/telecom/CallAudioManager.java
dcf620fe3676f829331aa471558ceaf08579c168 27-Apr-2016 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 79de301 -s ours

* commit '79de301c60ea5aa186bd70cf8f75661e0210c937':
Import translations. DO NOT MERGE

Change-Id: I8c77f1a35ced493132defc8af0980fb53f50a83a
79de301c60ea5aa186bd70cf8f75661e0210c937 27-Apr-2016 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
f04cadb9f7d18ae9514f1d4eb13ded5a3a1b90cf 27-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 908d4c5 -s ours

* commit '908d4c5f490c407647c4ea2be5a2f01e811d6b48':
Import translations. DO NOT MERGE

Change-Id: Iab2427567f4f8877f96cd31da884eda13bff96bd
908d4c5f490c407647c4ea2be5a2f01e811d6b48 27-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ie43d048d8f17c51ed1d56a6b92bf24dbe682a38c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
119a24daa4b2517e03a5eea81bec82b2f6b89e75 27-Apr-2016 Hall Liu <hallliu@google.com> Merge "Modify CallAudioManager\'s audio speedup functionality" into nyc-dev am: 0125eab am: 8cb94fe
am: b102789

* commit 'b10278959c7d28074030644e645f6ea71d33c8e1':

Change-Id: Id25194c94828527a09906af83201337f5a9565fa
944927f98d35739c9e561d6be8a696ec184336d4 27-Apr-2016 Hall Liu <hallliu@google.com> Merge "Modify CallAudioManager\'s audio speedup functionality" into nyc-dev am: 0125eab am: fa71e0b
am: 9217ac9

* commit '9217ac9b403f37031ca0573c1b9a5cb938d919d3':
Modify CallAudioManager's audio speedup functionality

Change-Id: I20fa6b3b9f0b4ce84a30abb6dfba7104ecc1e30e
b10278959c7d28074030644e645f6ea71d33c8e1 27-Apr-2016 Hall Liu <hallliu@google.com> Merge "Modify CallAudioManager\'s audio speedup functionality" into nyc-dev am: 0125eab
am: 8cb94fe

* commit '8cb94feee17490172a17ca6d95fcaa961362adcc':

Change-Id: I4b973820415190c8c0b425e13bd9f6201548c624
8cb94feee17490172a17ca6d95fcaa961362adcc 27-Apr-2016 Hall Liu <hallliu@google.com> Merge "Modify CallAudioManager\'s audio speedup functionality" into nyc-dev
am: 0125eab

* commit '0125eab617f07007c327811cf3b55e16419739f2':
Modify CallAudioManager's audio speedup functionality

Change-Id: I4acb16d0a5b4e8f7ab0bc3d151ed7172fc8d079e
9217ac9b403f37031ca0573c1b9a5cb938d919d3 27-Apr-2016 Hall Liu <hallliu@google.com> Merge "Modify CallAudioManager\'s audio speedup functionality" into nyc-dev am: 0125eab
am: fa71e0b

* commit 'fa71e0b70f9b941f76d565197c8a15f85a4cce0e':
Modify CallAudioManager's audio speedup functionality

Change-Id: I3c0987c9df20f5ab95cf258c23b3ab0286418b4f
fa71e0b70f9b941f76d565197c8a15f85a4cce0e 27-Apr-2016 Hall Liu <hallliu@google.com> Merge "Modify CallAudioManager\'s audio speedup functionality" into nyc-dev
am: 0125eab

* commit '0125eab617f07007c327811cf3b55e16419739f2':
Modify CallAudioManager's audio speedup functionality

Change-Id: I8cccbe5ec32220e150dad4fc6333254b43d26b82
0125eab617f07007c327811cf3b55e16419739f2 27-Apr-2016 Hall Liu <hallliu@google.com> Merge "Modify CallAudioManager's audio speedup functionality" into nyc-dev
a4c0a38ca9857579404c025feeb9ab5865ecb4f2 26-Apr-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I255867dfd114fa614b4904491b1892ef757354d2
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
fa1e97e57f1024f9f85e5e3d54f9af44b27ce213 26-Apr-2016 Tyler Gunn <tgunn@google.com> Ensure connection video capabilities can only be set if video supported.

Add check in setConnectionCapabilities to ensure that video capabilities
are not added to a Call if the underlying PhoneAccount does not
support video. This is to protect against errors originating from lower
layers.

Bug: 28233279
Change-Id: I822445d1bb4459f3fa4a582bd9f9996d8b736ca3
rc/com/android/server/telecom/Call.java
05f5e65020edd9a9bebd1458194a2492da30be13 26-Apr-2016 Hall Liu <hallliu@google.com> Merge "Incorporate parallel call blocking checks am: 6d4b66d am: 46b69db" into nyc-mr1-dev-plus-aosp
am: 2b3e2a9

* commit '2b3e2a9f12931da5fd5b3c286cc0385dd7e53992':

Change-Id: I03533505882cb6e64962b8c2d8003f58d2e5edcc
94584a2f57dede7cf97f73a9daebbbf885cdd57c 26-Apr-2016 Hall Liu <hallliu@google.com> Incorporate parallel call blocking checks am: 6d4b66d am: 9c8cf1f
am: 5a0b826

* commit '5a0b826c2357486bd3dc714dafc0e69ad1e1be0e':
Incorporate parallel call blocking checks

Change-Id: I218b42a1856350b7001775a6d0cb69b298164206
2b3e2a9f12931da5fd5b3c286cc0385dd7e53992 26-Apr-2016 Android Build Merger (Role) <android-build-merger@google.com> Merge "Incorporate parallel call blocking checks am: 6d4b66d am: 46b69db" into nyc-mr1-dev-plus-aosp
5a0b826c2357486bd3dc714dafc0e69ad1e1be0e 26-Apr-2016 Hall Liu <hallliu@google.com> Incorporate parallel call blocking checks am: 6d4b66d
am: 9c8cf1f

* commit '9c8cf1f42231c59fd7457d49b2dd2fef3504a185':
Incorporate parallel call blocking checks

Change-Id: Ic06a87bc7ca21ead1b2fa0898b7bba2201f3ad71
84b4ba5c80eb25e3a076132d72f28982b322902e 26-Apr-2016 Hall Liu <hallliu@google.com> Incorporate parallel call blocking checks am: 6d4b66d
am: 46b69db

* commit '46b69db3961a67eb41232acd06ad0ecdb6839ab4':
Incorporate parallel call blocking checks

Change-Id: Ic65d2137c97970bb2781c4c5b964712f719f379a
46b69db3961a67eb41232acd06ad0ecdb6839ab4 26-Apr-2016 Hall Liu <hallliu@google.com> Incorporate parallel call blocking checks
am: 6d4b66d

* commit '6d4b66df3d918e3f17263ff40ca3ba0ec5a46719':
Incorporate parallel call blocking checks

Change-Id: I4a0873003b16603c580ba3aef0c3a6b4772f5908
9c8cf1f42231c59fd7457d49b2dd2fef3504a185 26-Apr-2016 Hall Liu <hallliu@google.com> Incorporate parallel call blocking checks
am: 6d4b66d

* commit '6d4b66df3d918e3f17263ff40ca3ba0ec5a46719':
Incorporate parallel call blocking checks

Change-Id: I2908aac2850c8900fbdd696cbd7b6aa62b60f8f6
e792b33c2aa95d97db74e4c0b1e7ea6896cf99ee 19-Apr-2016 Hall Liu <hallliu@google.com> Modify CallAudioManager's audio speedup functionality

For certain calls, CallAudioManager will put the audio stream into the
in-call state before the connection service has acknowledged the call as
active. This was previously done by hardcoding a state transition in
CallAudioModeStateMachine. However, this had the potential to leave a
call stuck in CallAudioManager if the connection service subsequently
disconnected the call without setting to active after the user has
requested to answer the call.

This change solves this problem by changing the call state transition
code to go through all of its internal call tracking lists and remove the
call instead of only looking at the one corresponding to the state that
call was in.

Change-Id: Ica4a182fdd210a17ca58402062c8358d193d90c8
Fix: 28114043
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/DtmfLocalTonePlayer.java
rc/com/android/server/telecom/RingbackPlayer.java
rc/com/android/server/telecom/Ringer.java
ests/src/com/android/server/telecom/tests/CallAudioManagerTest.java
147cc5fecde5e54916f915f35d8a3161cf753301 25-Apr-2016 Hall Liu <hallliu@google.com> Ignore BT_AUDIO_DISCONNECTED when in the quiescent BT route

Change-Id: I631244b8defe007df8e11b484c1e43264ef6d69d
Fix: 28264011
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
6d4b66df3d918e3f17263ff40ca3ba0ec5a46719 02-Apr-2016 Hall Liu <hallliu@google.com> Incorporate parallel call blocking checks

Modify CallsManager to use the IncomingCallFilter class introduced in a
previous CL.
Modifies AsyncBlockCheckTask and CallScreening to implement CallFilter
and removes the logic in those classes that used to execute the filters
in series.
Added tests for block-check and call screening.
Added logging events to track how long each of the call filters take.

Change-Id: Iecd60463fe9ac6dbbd85d57ef6ae2bfccb94d967
Fix: 26883888
rc/com/android/server/telecom/AsyncBlockCheckTask.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallScreening.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/ParcelableCallUtils.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/Timeouts.java
rc/com/android/server/telecom/callfiltering/AsyncBlockCheckFilter.java
rc/com/android/server/telecom/callfiltering/BlockCheckerAdapter.java
rc/com/android/server/telecom/callfiltering/CallFilteringResult.java
rc/com/android/server/telecom/callfiltering/CallScreeningServiceFilter.java
rc/com/android/server/telecom/callfiltering/DirectToVoicemailCallFilter.java
rc/com/android/server/telecom/callfiltering/IncomingCallFilter.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/AsyncBlockCheckFilterTest.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/CallScreeningServiceFilterTest.java
ests/src/com/android/server/telecom/tests/IncomingCallFilterTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
f9129223cfa1d925ee98732c9bb0d1ea1fe5ab31 25-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: b890fd6 -s ours am: 455656b -s ours
am: 4b88c87 -s ours

* commit '4b88c871c9ffaa8ce5d2f5eec16a1ef47ac61eaa':

Change-Id: Icdc5d78051d7a4b904e5af2acb7040fe76ead507
4b88c871c9ffaa8ce5d2f5eec16a1ef47ac61eaa 25-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: b890fd6 -s ours
am: 455656b -s ours

* commit '455656bcc3a0d8ad362adba152411fab14b46182':

Change-Id: I6b85549b910dd46b3de07df9b9f6a48b5ddb2561
0b60419255623f92b7f6d06d89ab50c12a9c41c2 25-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: b890fd6 -s ours am: e92b04b -s ours
am: 1700006 -s ours

* commit '1700006ce5bcf68e375d0e0d994d460a058791c0':
Import translations. DO NOT MERGE

Change-Id: I1d5cd005f6870305e9b3066be45b4db04f097b48
1700006ce5bcf68e375d0e0d994d460a058791c0 25-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: b890fd6 -s ours
am: e92b04b -s ours

* commit 'e92b04b9b3eb9b6dc6b7adaa0d96119ee151af9d':
Import translations. DO NOT MERGE

Change-Id: Ib3f8ad625f44d94cb69c1628f18a18db72a09fb2
455656bcc3a0d8ad362adba152411fab14b46182 25-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: b890fd6 -s ours

* commit 'b890fd6d4a046ccd176575dec787ca2325d2e40e':
Import translations. DO NOT MERGE

Change-Id: I8d45620b0b9bbca1039b4c1ea175bd9679ed4e17
e92b04b9b3eb9b6dc6b7adaa0d96119ee151af9d 25-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: b890fd6 -s ours

* commit 'b890fd6d4a046ccd176575dec787ca2325d2e40e':
Import translations. DO NOT MERGE

Change-Id: Iefb4ff66a1152f32718f00d016b74b3e48518ab3
b890fd6d4a046ccd176575dec787ca2325d2e40e 25-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I9a344e99128e2921ccc974b4323bd11bab46d0d7
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
0e87ecf3eb73926464a8996d2e69e719fb9d2f2d 25-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Idf6ce730460e1515550bcffd5e1330ea6791fb37
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
1bd7e181d1d74f17c31b9f203977dfd4c8602c15 22-Apr-2016 Hall Liu <hallliu@google.com> Merge "Send call audio state to connection service on change am: fd33fefe38 am: f6bc1d8653" into nyc-mr1-dev-plus-aosp
am: 560e14901b

* commit '560e14901b74596c51c8f37c93e686271f19c5b7':

Change-Id: I28d0c4792e197c275174d16474064d785c16db2c
635e81dafcf48851230a47c02b8d74c17e9c7f4c 22-Apr-2016 Hall Liu <hallliu@google.com> Send call audio state to connection service on change am: fd33fefe38 am: 47d26b93d8
am: 05de271224

* commit '05de2712245ce65a9e6ad83e746adf2400853e2d':
Send call audio state to connection service on change

Change-Id: Iff1a98b1a59ca7dad4349008d78276958a762eb0
560e14901b74596c51c8f37c93e686271f19c5b7 21-Apr-2016 Android Build Merger (Role) <android-build-merger@google.com> Merge "Send call audio state to connection service on change am: fd33fefe38 am: f6bc1d8653" into nyc-mr1-dev-plus-aosp
05de2712245ce65a9e6ad83e746adf2400853e2d 21-Apr-2016 Hall Liu <hallliu@google.com> Send call audio state to connection service on change am: fd33fefe38
am: 47d26b93d8

* commit '47d26b93d81894e32bc935ebce1cf2a618ee4afb':
Send call audio state to connection service on change

Change-Id: I6c8cf85c15de94964b8ca748cc0f788ebfc8c37f
7545620907ae62a708401e84a2d02a4b26c92b3f 21-Apr-2016 Hall Liu <hallliu@google.com> Send call audio state to connection service on change am: fd33fefe38
am: f6bc1d8653

* commit 'f6bc1d8653f6660935144337554ca6b2ed56582f':
Send call audio state to connection service on change

Change-Id: I12b249c57d691491e0100faaa27a0300f78f7ec5
f6bc1d8653f6660935144337554ca6b2ed56582f 21-Apr-2016 Hall Liu <hallliu@google.com> Send call audio state to connection service on change
am: fd33fefe38

* commit 'fd33fefe387d18fc9af21bf4b77f2a74c8a50a41':
Send call audio state to connection service on change

Change-Id: I4f8e3677d004ce55b3c6559953470cf718aa8955
47d26b93d81894e32bc935ebce1cf2a618ee4afb 21-Apr-2016 Hall Liu <hallliu@google.com> Send call audio state to connection service on change
am: fd33fefe38

* commit 'fd33fefe387d18fc9af21bf4b77f2a74c8a50a41':
Send call audio state to connection service on change

Change-Id: Iafbff772ebfeeca0cd3d7b08d5d7575547927625
fd33fefe387d18fc9af21bf4b77f2a74c8a50a41 19-Apr-2016 Hall Liu <hallliu@google.com> Send call audio state to connection service on change

Change-Id: I986b8091feaa17585605774cc5055c9b91b15846
Fix: 28114043
rc/com/android/server/telecom/CallAudioManager.java
f3487b5310676e689e2414833a526c48faf1f97d 19-Apr-2016 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into nyc-dev am: 8ee4d55 -s ours am: 54b0403 -s ours
am: 8f28558 -s ours

* commit '8f285588d9125745db2ddad1d2a84683c2240b47':

Change-Id: I6069ab27270f7cfcf149e42b35296d5abd593f82
8f285588d9125745db2ddad1d2a84683c2240b47 19-Apr-2016 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into nyc-dev am: 8ee4d55 -s ours
am: 54b0403 -s ours

* commit '54b0403298f8c31d1285c2af972a07116c026d16':

Change-Id: Iad585bd440537808eb156d3f7e21bde9b79a4f8e
b221c1fca4d18812287285923792f6bfa55959e5 19-Apr-2016 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into nyc-dev am: 8ee4d55 -s ours am: 7a818af -s ours
am: d1e2b43 -s ours

* commit 'd1e2b43a38a6250ed3084771d5098d3f76844c9b':
Import translations. DO NOT MERGE

Change-Id: I6f2996e7cbff2f86e9fc0a33124fcba81b93ad59
d1e2b43a38a6250ed3084771d5098d3f76844c9b 19-Apr-2016 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into nyc-dev am: 8ee4d55 -s ours
am: 7a818af -s ours

* commit '7a818afc87092e7ad580a0b8011fe283077376d4':
Import translations. DO NOT MERGE

Change-Id: I1f5830267c3c5c7fa0a9302dc4b3b0b8d292f02c
7a818afc87092e7ad580a0b8011fe283077376d4 19-Apr-2016 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 8ee4d55 -s ours

* commit '8ee4d558436de3e268d4e29cc3562bccfa7b5167':
Import translations. DO NOT MERGE

Change-Id: Idad130635f14e1e287a774b3a7501debe97926d0
54b0403298f8c31d1285c2af972a07116c026d16 19-Apr-2016 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 8ee4d55 -s ours

* commit '8ee4d558436de3e268d4e29cc3562bccfa7b5167':
Import translations. DO NOT MERGE

Change-Id: Id107e9b2fc4eb6762057be617edf92fb6ffcdc77
8ee4d558436de3e268d4e29cc3562bccfa7b5167 19-Apr-2016 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into nyc-dev
ef017474a72da7cbdd126710401f350c87986a5f 19-Apr-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I5041e665d7fa30e6a21d83d3ef560faf7d8f7129
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
8c57ed89a990f6fb20a0d1bb8137d47c6e897a90 19-Apr-2016 Sailesh Nepal <sail@google.com> Merge "Merge "[Call Timing] Set telecom routing times" into nyc-dev am: 8179a7b am: 0aba10b" into nyc-mr1-dev-plus-aosp
am: c52240e

* commit 'c52240eaf1d620ff7c84215b847fd35c956fdc41':

Change-Id: I263ccbd524169796bb44c02ad476c4aa0a5c61a4
bf646fb0619d43ecf7f80505d9041b5c05e6be8b 19-Apr-2016 Sailesh Nepal <sail@google.com> Merge "[Call Timing] Set telecom routing times" into nyc-dev am: 8179a7b am: 6e6816c
am: 6550d8c

* commit '6550d8cc47cffc4a2e045111c2c7e59c87e7bb0a':
[Call Timing] Set telecom routing times

Change-Id: I5ba75d256e808ebbd65cdc52d4dbbc209a339e0c
c52240eaf1d620ff7c84215b847fd35c956fdc41 19-Apr-2016 Android Build Merger (Role) <android-build-merger@google.com> Merge "Merge "[Call Timing] Set telecom routing times" into nyc-dev am: 8179a7b am: 0aba10b" into nyc-mr1-dev-plus-aosp
6550d8cc47cffc4a2e045111c2c7e59c87e7bb0a 19-Apr-2016 Sailesh Nepal <sail@google.com> Merge "[Call Timing] Set telecom routing times" into nyc-dev am: 8179a7b
am: 6e6816c

* commit '6e6816c29bfb213246d554d45cc9682be83e5987':
[Call Timing] Set telecom routing times

Change-Id: I2e3410928b54393ea9bb04ff30df69afe8b80825
98c448488f8a864cd0168a226d4b4b3587ba4d60 19-Apr-2016 Sailesh Nepal <sail@google.com> Merge "[Call Timing] Set telecom routing times" into nyc-dev am: 8179a7b
am: 0aba10b

* commit '0aba10ba74521911cd4448dfbd18f027adcf2a79':
[Call Timing] Set telecom routing times

Change-Id: Ib3f95dcfb461ed20377c1a7cbc7e344797ba2272
0aba10ba74521911cd4448dfbd18f027adcf2a79 19-Apr-2016 Sailesh Nepal <sail@google.com> Merge "[Call Timing] Set telecom routing times" into nyc-dev
am: 8179a7b

* commit '8179a7b06f01dc676db49dd187079d89311c92d2':
[Call Timing] Set telecom routing times

Change-Id: Iebdf9a3a790175b51bbd4871c201160fd54e6e66
6e6816c29bfb213246d554d45cc9682be83e5987 19-Apr-2016 Sailesh Nepal <sail@google.com> Merge "[Call Timing] Set telecom routing times" into nyc-dev
am: 8179a7b

* commit '8179a7b06f01dc676db49dd187079d89311c92d2':
[Call Timing] Set telecom routing times

Change-Id: I1683a5c73afc313bfbf9e9f9c2abe06a7228224a
8179a7b06f01dc676db49dd187079d89311c92d2 19-Apr-2016 Sailesh Nepal <sail@google.com> Merge "[Call Timing] Set telecom routing times" into nyc-dev
d34650f4f91a6aa8586716a46e777c4cd9d001d8 18-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Merge "Rename Telecom to "Call Management"" into nyc-dev am: fc8d2bb am: 880b9b4" into nyc-mr1-dev-plus-aosp
am: 72bdb24

* commit '72bdb2420dea83e1900774ff07c3bdb3a290600c':

Change-Id: I60ca4fbd9dbbcd3322d504290cdb5294fff27f0f
b60e8cc1df0f64d22c9258df3a79c6de13d90fc0 18-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Rename Telecom to "Call Management"" into nyc-dev am: fc8d2bb am: 1cd8fbb
am: 812cbb2

* commit '812cbb28af50614cca6c0e5ce34c44e5601b416b':
Rename Telecom to "Call Management"

Change-Id: I637e09537e1266e6bf952129244a10e1fff0a20e
72bdb2420dea83e1900774ff07c3bdb3a290600c 18-Apr-2016 Android Build Merger (Role) <android-build-merger@google.com> Merge "Merge "Rename Telecom to "Call Management"" into nyc-dev am: fc8d2bb am: 880b9b4" into nyc-mr1-dev-plus-aosp
812cbb28af50614cca6c0e5ce34c44e5601b416b 18-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Rename Telecom to "Call Management"" into nyc-dev am: fc8d2bb
am: 1cd8fbb

* commit '1cd8fbb528ead508ef1a6c4eebd1e4b3535c160d':
Rename Telecom to "Call Management"

Change-Id: I82b9245e254a92cc16848081260f29c4c80ed114
de6fca862c7235ee64c100c744f8861bd46dbc63 18-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Rename Telecom to "Call Management"" into nyc-dev am: fc8d2bb
am: 880b9b4

* commit '880b9b44f07f89ef75efe9b779c63cef8e77bcff':
Rename Telecom to "Call Management"

Change-Id: I3f98b3a970725e49f5d06c1490325fb1c81a7eca
880b9b44f07f89ef75efe9b779c63cef8e77bcff 18-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Rename Telecom to "Call Management"" into nyc-dev
am: fc8d2bb

* commit 'fc8d2bbc3347f707de2c544e561d8ded049a76a7':
Rename Telecom to "Call Management"

Change-Id: Ib86f0d9f247ab1cbadaf8067bf962de01a7dc3f2
1cd8fbb528ead508ef1a6c4eebd1e4b3535c160d 18-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Rename Telecom to "Call Management"" into nyc-dev
am: fc8d2bb

* commit 'fc8d2bbc3347f707de2c544e561d8ded049a76a7':
Rename Telecom to "Call Management"

Change-Id: Ie647af7e3c1c6601beebca5b978e58c5973447d6
fc8d2bbc3347f707de2c544e561d8ded049a76a7 18-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Rename Telecom to "Call Management"" into nyc-dev
703a1af8ffaca0cc73c5a73b37e546122171fefe 15-Apr-2016 Sailesh Nepal <sail@google.com> [Call Timing] Set telecom routing times

This CL sets the following times in the call's intent extras:
- the time that telecom started processing the call
- the time that telecom finished processing things like call blocking
and was ready to connect to the UI

The time values are sent to the dialer using call's intent extras.

Bug: 28202119
Change-Id: Ic7f43c2d6defca38ff0491b5b470b2684ab868af
rc/com/android/server/telecom/CallsManager.java
78c24791768574fbfb4762ce2eeabaf00646e038 15-Apr-2016 Hall Liu <hallliu@google.com> Merge "Fix unit tests" into nyc-dev am: 09c900e
am: ef9d3f4

* commit 'ef9d3f45b0c146f7b0dc6ffaa9910a76f9c8c1d2':
Fix unit tests

Change-Id: Id924d821b130873cd311f4318d6a460899d7a69c
ef9d3f45b0c146f7b0dc6ffaa9910a76f9c8c1d2 15-Apr-2016 Hall Liu <hallliu@google.com> Merge "Fix unit tests" into nyc-dev
am: 09c900e

* commit '09c900ef10510038772e172f5c3e553a3f0d9366':
Fix unit tests

Change-Id: Ic63da1b33c6b3c3f1068f4a854fff6eacd5bb465
09c900ef10510038772e172f5c3e553a3f0d9366 15-Apr-2016 Hall Liu <hallliu@google.com> Merge "Fix unit tests" into nyc-dev
9ecbb1cbae4dbb62a892c1347d8cb8691550ad1b 14-Apr-2016 Hall Liu <hallliu@google.com> Fix unit tests

Unit tests were failing because:

1. The fake context's bindServiceAsUser asynchronously calls
onServiceConnected, but the InCallController assumes that its connect()
method would finish before onServiceConnected gets called.

2. Video call tests depended on counting the number of audio state
transitions. This number is not a guaranteed (or even consistent) value,
so the mechanism for determining the final audio state has been replaced
by a latch posted to the CARSM handler.

3. IncomingCallFilter tests were experiencing a strange problem where
setting the timeouts value only worked when the tests were run in
isolation. This was fixed by putting in an adapter for the static
Timeouts class.

Fix: 28200736
Change-Id: If5fbd60e1a3c5d478d4555d8794a49855997f1d3
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/Timeouts.java
rc/com/android/server/telecom/callfiltering/IncomingCallFilter.java
ests/src/com/android/server/telecom/tests/IncomingCallFilterTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
ests/src/com/android/server/telecom/tests/VideoCallTests.java
9004b40c3700e811bc4a5c955e1f233f3e7d71fa 15-Apr-2016 Ta-wei Yen <twyen@google.com> Merge "Persist missed call to call log before sending missed call notification" into nyc-dev am: bca0f0c
am: 99b69d6

* commit '99b69d6c67c6e3c63e38578dd6b1fea121c57d49':
Persist missed call to call log before sending missed call notification

Change-Id: I1c43f23ca33f4a876db06a87854471a61e8b94bc
99b69d6c67c6e3c63e38578dd6b1fea121c57d49 15-Apr-2016 Ta-wei Yen <twyen@google.com> Merge "Persist missed call to call log before sending missed call notification" into nyc-dev
am: bca0f0c

* commit 'bca0f0c64248fb1c686624a3cd93b865a29528e8':
Persist missed call to call log before sending missed call notification

Change-Id: Ia4212227917f295a61fa88a29e16fe9564d769d7
bca0f0c64248fb1c686624a3cd93b865a29528e8 15-Apr-2016 Ta-wei Yen <twyen@google.com> Merge "Persist missed call to call log before sending missed call notification" into nyc-dev
9d24e36c8e7a39c31e0778b262ee228cf6ba99c9 14-Apr-2016 Santos Cordon <santoscordon@google.com> Merge "Do not crash if label is null." into nyc-dev am: 6916a88
am: c52fab9

* commit 'c52fab90a09f7aff6133da1d7f1d4bb47d0739b1':
Do not crash if label is null.

Change-Id: I38baf3f0b13244f41fe1af6832b9d99374e6ce3b
c52fab90a09f7aff6133da1d7f1d4bb47d0739b1 14-Apr-2016 Santos Cordon <santoscordon@google.com> Merge "Do not crash if label is null." into nyc-dev
am: 6916a88

* commit '6916a88d04b40bc934bfd6059f3f3e701d7f7242':
Do not crash if label is null.

Change-Id: I7dfdc878bfc0037fc881641cef50839633e91c31
b4e675af709a36e772e95e9ccdf6e8bc30d8468d 14-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Improvements to external call handling." into nyc-dev am: 9cbbd94
am: d3bae58

* commit 'd3bae58dcc0431d6eafde0a1d37a52576ad9d601':
Improvements to external call handling.

Change-Id: I217007b931b99de4a58ade36eb3709c37e41e277
d3bae58dcc0431d6eafde0a1d37a52576ad9d601 14-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Improvements to external call handling." into nyc-dev
am: 9cbbd94

* commit '9cbbd9468d7bbc575992479eb6964c782cdd99c8':
Improvements to external call handling.

Change-Id: I700355ed1b25ac027d81ce70e295189ddfd4bbc4
6916a88d04b40bc934bfd6059f3f3e701d7f7242 14-Apr-2016 Santos Cordon <santoscordon@google.com> Merge "Do not crash if label is null." into nyc-dev
9cbbd9468d7bbc575992479eb6964c782cdd99c8 14-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Improvements to external call handling." into nyc-dev
1a40c4f4daf2cdfba3f67383c726f93b85a98b00 14-Apr-2016 Tyler Gunn <tgunn@google.com> Improvements to external call handling.

Add onExternalCallChanged listener in Call to report when a call switches
between being external and not.
In CallAudioManager, BluetoothPhoneServiceImpl, HeadsetMediaButton, and
PhoneStateBroadcaster, listen to changes in the external call state.

This ensures that when a call becomes external or a call becomes
non-external that the various modules updates themselves appropriately.

Bug: 28179159
Change-Id: I44bc0b94f185c66aeddb68549223533249bb0b62
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/HeadsetMediaButton.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneStateBroadcaster.java
3083c4bac6046f7d066fb2a1fbb4bf77f843d34e 14-Apr-2016 Chenjie Luo <cjluo@google.com> DO NOT MERGE ANYWHERE Unmute the call after all calls are disconnected am: 062abb7 -s ours am: 80cf225 -s ours am: c94cfdd -s ours
am: 79b1aba -s ours

* commit '79b1abaa9ee0fb69c439916c27733794ead030c1':
DO NOT MERGE ANYWHERE Unmute the call after all calls are disconnected

Change-Id: I84bf9318fec7b7b071650db3bee29f475ccac59c
79b1abaa9ee0fb69c439916c27733794ead030c1 14-Apr-2016 Chenjie Luo <cjluo@google.com> DO NOT MERGE ANYWHERE Unmute the call after all calls are disconnected am: 062abb7 -s ours am: 80cf225 -s ours
am: c94cfdd -s ours

* commit 'c94cfdd784e366561542e436a6f06178e8f1b253':
DO NOT MERGE ANYWHERE Unmute the call after all calls are disconnected

Change-Id: Ib5f7584ef97e51c0c3d468fe24e6f0ec4a43582e
c94cfdd784e366561542e436a6f06178e8f1b253 14-Apr-2016 Chenjie Luo <cjluo@google.com> DO NOT MERGE ANYWHERE Unmute the call after all calls are disconnected am: 062abb7 -s ours
am: 80cf225 -s ours

* commit '80cf225e964ad0cb457e7cff3a36b460bbc51e4f':
DO NOT MERGE ANYWHERE Unmute the call after all calls are disconnected

Change-Id: I9bf8886e31ec5a9d37ad635306f96c0542e267eb
80cf225e964ad0cb457e7cff3a36b460bbc51e4f 14-Apr-2016 Chenjie Luo <cjluo@google.com> DO NOT MERGE ANYWHERE Unmute the call after all calls are disconnected
am: 062abb7 -s ours

* commit '062abb7b217d68b1c8b63f545b5823c69d3f5c89':
DO NOT MERGE ANYWHERE Unmute the call after all calls are disconnected

Change-Id: I9b22176ae8a918ea9360f2d6e9b1d7224b78e965
982c0bd962bc7ed208d0e73380e90b0fdcdf01dc 14-Apr-2016 Ta-wei Yen <twyen@google.com> Persist missed call to call log before sending missed call notification

For dialer to show detailed information the call should exist in the call
log when the intent is received.

+ CallLogManager#logCall() now take a callback to be executed after the
log is written. The default callback for a missed call is to show
the missed call notification.
- MissedCallNotifierImpl no longer listen to onCallStateChanged().

Change-Id: I94080a4a95f214a10d8e479b40ca7c407d06e0f2
Fixes:27276201
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
a9d0cb9b518039178e4fbcbbb06ab5aa5c9cfb6f 14-Apr-2016 Hall Liu <hallliu@google.com> Merge "Send audio state when foreground call is updated" into nyc-dev am: cc8a14d
am: 077069d

* commit '077069d04b94d87b6cdc45b21db70cdf0d1fa863':
Send audio state when foreground call is updated

Change-Id: I91e8c31c35a055a305a6be5e9b14a8851f617f72
077069d04b94d87b6cdc45b21db70cdf0d1fa863 14-Apr-2016 Hall Liu <hallliu@google.com> Merge "Send audio state when foreground call is updated" into nyc-dev
am: cc8a14d

* commit 'cc8a14d5b69b505352e68246af9c6a833c138be8':
Send audio state when foreground call is updated

Change-Id: Ieb108f982613e219e174d27a49e387593669f116
cc8a14d5b69b505352e68246af9c6a833c138be8 14-Apr-2016 Hall Liu <hallliu@google.com> Merge "Send audio state when foreground call is updated" into nyc-dev
8c7e2569e4d5f9a3392d3cbf0ac7020be6c96d66 14-Apr-2016 Hall Liu <hallliu@google.com> Send audio state when foreground call is updated

Whenever the foreground call changes, send the audio state to both the
in-call service and the call's connection service.

Change-Id: I7048aec0f50590da0f94f8bc5cb19043a5f70f76
Fix: 28114043
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
062abb7b217d68b1c8b63f545b5823c69d3f5c89 13-Apr-2016 Chenjie Luo <cjluo@google.com> DO NOT MERGE ANYWHERE Unmute the call after all calls are disconnected

Bug: 28075427
Change-Id: I14409b20e662d77c344b70252b2d40e172e0f222
rc/com/android/server/telecom/CallAudioManager.java
22403a76d81aa26fa7407a4070765e92a69d6cd0 13-Apr-2016 Santos Cordon <santoscordon@google.com> Do not crash if label is null.

Bug: 27814178
Change-Id: Ic7adff34fbaeab80cc616b0f0a408ff8722bb6c1
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
6a46db2022bbc3ba315cffdc2b4b0d728d9e2505 13-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Format the via_number before writing it to the calllog." into nyc-dev am: a153e66
am: 79b01e7

* commit '79b01e70d59a266e19b7f0d92c616eeec27880f7':
Format the via_number before writing it to the calllog.

Change-Id: Ic233861bf2f27fc7058c050d4cb39b718a91c3c0
79b01e70d59a266e19b7f0d92c616eeec27880f7 13-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Format the via_number before writing it to the calllog." into nyc-dev
am: a153e66

* commit 'a153e6660396636ee715b173164a0e1e6333a3ec':
Format the via_number before writing it to the calllog.

Change-Id: I542d7f32df1b21ed9705bad4b00f819527a365e7
a153e6660396636ee715b173164a0e1e6333a3ec 13-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Format the via_number before writing it to the calllog." into nyc-dev
16444b83344e8c7937b21cde367ce5d3866630b7 12-Apr-2016 Hall Liu <hallliu@google.com> Merge "Add classes/tests for parallel call-filtering lookup" into nyc-dev am: b5f3fb3
am: e7d13e4

* commit 'e7d13e44ba3261899502a8df4dbcb2cece13f870':
Add classes/tests for parallel call-filtering lookup

Change-Id: Ibbfe0bcc12e9b17f320f8458acb04530202e10dc
e7d13e44ba3261899502a8df4dbcb2cece13f870 12-Apr-2016 Hall Liu <hallliu@google.com> Merge "Add classes/tests for parallel call-filtering lookup" into nyc-dev
am: b5f3fb3

* commit 'b5f3fb3e5cff313e78e8d1e8ee52b29c6d3eb079':
Add classes/tests for parallel call-filtering lookup

Change-Id: I9b55abd6c882e1a69f1abf789b691605c7061b7a
b5f3fb3e5cff313e78e8d1e8ee52b29c6d3eb079 12-Apr-2016 Hall Liu <hallliu@google.com> Merge "Add classes/tests for parallel call-filtering lookup" into nyc-dev
1c8614bc1e140019afd15354bf38bf1c84459f46 12-Apr-2016 Hall Liu <hallliu@google.com> Merge "Add null check in CallLogManager" into nyc-dev am: 1eaf70a
am: b0488cf

* commit 'b0488cf7f9d68bfb0b253555759bb343ac30588c':
Add null check in CallLogManager

Change-Id: I4c975c5f18ba3672fc602fb8c0a6bda013241e3a
b0488cf7f9d68bfb0b253555759bb343ac30588c 12-Apr-2016 Hall Liu <hallliu@google.com> Merge "Add null check in CallLogManager" into nyc-dev
am: 1eaf70a

* commit '1eaf70a8513b94c852a121f56b28495b3e7474b5':
Add null check in CallLogManager

Change-Id: I60169499ffccf9388b56242053cc2cfc0ac2a21d
1eaf70a8513b94c852a121f56b28495b3e7474b5 12-Apr-2016 Hall Liu <hallliu@google.com> Merge "Add null check in CallLogManager" into nyc-dev
aada052111cfa8541dc2803c1035f383f71b7090 12-Apr-2016 Brad Ebinger <breadley@google.com> Rename Telecom to "Call Management"

"Phone Call Management" is too long of a name and some translations
cause text overflow in Apps list.

Change-Id: I9a6e608d80dca4ddb5484e6d57045f4bf2ca28cc
Fix: 25906963
es/values/strings.xml
c6ab2cca08ff427174b790a0ed34ebb19b1ce9cd 08-Apr-2016 Brad Ebinger <breadley@google.com> Format the via_number before writing it to the calllog.

Format the via_number before writing it to the call log so that the
Dialer doesn't have to format the number every time it wants to use the
via number.

Change-Id: I103b9639a321bbd73e74f4dfda3e2e6814af8fcf
Fix: 28052897
rc/com/android/server/telecom/CallLogManager.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
71280ff9e02e476fe4a86170ffe6c769e0e6c27c 12-Apr-2016 Hall Liu <hallliu@google.com> Add null check in CallLogManager

Bug: 27636029
Change-Id: I7acbd8cecac50001bb5f741e58d4007134370973
rc/com/android/server/telecom/CallLogManager.java
26b2625341f04b2d7b5dec16b1638ddab8822a68 12-Apr-2016 Brad Ebinger <breadley@google.com> Modify outgoing Call logic to support multiple PhoneAccounts am: 3da5764
am: e22d131

* commit 'e22d131e12579fb51f2351f557fc53da2c95ba86':
Modify outgoing Call logic to support multiple PhoneAccounts

Change-Id: I1df279891575ed663c4f5e3a748b0cd9b5dc0f9b
e22d131e12579fb51f2351f557fc53da2c95ba86 12-Apr-2016 Brad Ebinger <breadley@google.com> Modify outgoing Call logic to support multiple PhoneAccounts
am: 3da5764

* commit '3da57646c4f2803eb482fcea46c76203717d5715':
Modify outgoing Call logic to support multiple PhoneAccounts

Change-Id: I688c5fc554829c0c30d335515a9e2858c26ff821
67d34fa0524d10d5de190592c1f5f88c4dc31743 03-Mar-2016 Hall Liu <hallliu@google.com> Add classes/tests for parallel call-filtering lookup

Adds the IncomingCallFilter class, which serves as a controller for the
call-filtering operations. Also adds DirectToVoicemailCallFilter, which
is an implementation of the CallFilter interface defined in
IncomingCallFilter.

No changes are made to existing functionality. Those will be coming in
a future CL.

Bug: 26883888
Change-Id: Idf6662a9e71de60a87d1fc6b6b148fe9a2b12a8e
rc/com/android/server/telecom/callfiltering/CallFilterResultCallback.java
rc/com/android/server/telecom/callfiltering/CallFilteringResult.java
rc/com/android/server/telecom/callfiltering/DirectToVoicemailCallFilter.java
rc/com/android/server/telecom/callfiltering/IncomingCallFilter.java
ests/src/com/android/server/telecom/tests/DirectToVoicemailCallFilterTest.java
ests/src/com/android/server/telecom/tests/IncomingCallFilterTest.java
3da57646c4f2803eb482fcea46c76203717d5715 05-Apr-2016 Brad Ebinger <breadley@google.com> Modify outgoing Call logic to support multiple PhoneAccounts

When a Phone call is active, Telecom will use the same
PhoneAccount for any subsequent outgoing call made during the life of
the active foreground call. This change constructs a list of possible
PhoneAccounts that a user may want, depending on if any of the active
calls are on a SIM PhoneAccount and uses that list to determine if the
chosen PhoneAccount is available.

Change-Id: Ib8a2c90c6c6631524200dda040515f7f5b4e7f0f
Fix: 18836240
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
ee045ea1fa672f7783604d473023a8dd4facca5c 07-Apr-2016 Hall Liu <hallliu@google.com> Merge "Use AudioManager#getDevices in WiredHeadsetManager" into nyc-dev am: c4492b7
am: a6b5469

* commit 'a6b54692850716b5e2e7fbcdc4b0ef708c3f49ea':
Use AudioManager#getDevices in WiredHeadsetManager

Change-Id: Ic523ed59e14f88a3dd676913e25eb2e037b44b44
a6b54692850716b5e2e7fbcdc4b0ef708c3f49ea 07-Apr-2016 Hall Liu <hallliu@google.com> Merge "Use AudioManager#getDevices in WiredHeadsetManager" into nyc-dev
am: c4492b7

* commit 'c4492b7ee7e00d26d6ce21ad4a71d3d00cae7c5f':
Use AudioManager#getDevices in WiredHeadsetManager

Change-Id: I7b3b57be6df27374edb6e906c17397425b5548fd
c4492b7ee7e00d26d6ce21ad4a71d3d00cae7c5f 07-Apr-2016 Hall Liu <hallliu@google.com> Merge "Use AudioManager#getDevices in WiredHeadsetManager" into nyc-dev
f9b511cb9d9ed529875d11370395a475e7c11918 07-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Modify AsyncBlockCheckTask to include invisible Logging session" into nyc-dev am: 159b02c
am: 1a0cac2

* commit '1a0cac2ef57149bd108cf11662177d2ed1c5ec2b':
Modify AsyncBlockCheckTask to include invisible Logging session

Change-Id: I6a08da4daaa606ddb14c2effab3a9b405edcba41
0545bc10b8527594a9407531d8bb48c8a3a93965 07-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Mock out AsyncRingtonePlayer during Testing" into nyc-dev am: 92b576a
am: 8777b4b

* commit '8777b4b1d76ad811d0d4b03460e829b4178413de':
Mock out AsyncRingtonePlayer during Testing

Change-Id: Id126272b966f3fd7d1b97a862f2490354378ddfc
1a0cac2ef57149bd108cf11662177d2ed1c5ec2b 07-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Modify AsyncBlockCheckTask to include invisible Logging session" into nyc-dev
am: 159b02c

* commit '159b02c65f70db1108cfab0cacf51697d02535f8':
Modify AsyncBlockCheckTask to include invisible Logging session

Change-Id: I26b10ba30cf524d6416be86836069f049b7aeb3b
8777b4b1d76ad811d0d4b03460e829b4178413de 07-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Mock out AsyncRingtonePlayer during Testing" into nyc-dev
am: 92b576a

* commit '92b576ac4677107fc50fb2a11eac0dc93b47fe8e':
Mock out AsyncRingtonePlayer during Testing

Change-Id: I522b7f3156701888b255a266949fbd0b16dc8040
159b02c65f70db1108cfab0cacf51697d02535f8 07-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Modify AsyncBlockCheckTask to include invisible Logging session" into nyc-dev
92b576ac4677107fc50fb2a11eac0dc93b47fe8e 07-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Mock out AsyncRingtonePlayer during Testing" into nyc-dev
334590fdcb6cff95b373d3de8de93f2dc7420d5f 07-Apr-2016 Mohamed Abdalkader <abdalkader@google.com> Merge "Fix RTL for blocked number layout" into nyc-dev am: 11541f7
am: 99e4e04

* commit '99e4e04d519188e75733a60af79d28e3196c03c8':
Fix RTL for blocked number layout

Change-Id: If4c71e7dd8fa23bc0a880ab2438a45bb7cdd6026
99e4e04d519188e75733a60af79d28e3196c03c8 07-Apr-2016 Mohamed <abdalkader@google.com> Merge "Fix RTL for blocked number layout" into nyc-dev
am: 11541f7

* commit '11541f72256f2d7e7f740013b8dd4b2d1d049e96':
Fix RTL for blocked number layout

Change-Id: I26068be538e5af6b69067010f4dee0d2c3570c93
11541f72256f2d7e7f740013b8dd4b2d1d049e96 07-Apr-2016 Mohamed Abdalkader <abdalkader@google.com> Merge "Fix RTL for blocked number layout" into nyc-dev
9e8ebd1212f9fda00be7509e54cb3096f8606789 02-Apr-2016 Mohamed <abdalkader@google.com> Fix RTL for blocked number layout

BUG: 27898846
BUG: 27945562
Change-Id: Ia029c76691ac3ff6b85a46593e357ec0ff92fba6
es/xml/layout_blocked_number.xml
7ade5e2c3f7a849e41de3b81051c12a8fcd6ea83 06-Apr-2016 Brad Ebinger <breadley@google.com> Mock out AsyncRingtonePlayer during Testing

AsyncRingtonePlayer wasn't being correctly Mocked in the
TelecomSystemTests. Since the Async threads to continue to
run after the tests were completed, The AsyncRingtonePlayer log messages
were interfering with LogTest's Log capturing.

Fix: 28044674
Change-Id: Ic58a0091a969f8eb36b777b859ba08202810221a
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
f5bdfb5aa24df7b9d6be01d10fe58342cc5bcc59 30-Dec-2015 Satish Kodishala <skodisha@codeaurora.org> Handle AT+CHLD=1 when there is no active call

Use case:
1. Connect to headset/carkit with 3-way calling support.
2. Make an incoming call or put active call on hold.
3. Send AT+CHLD=1 command from remote headset.

Failure:
AG responds with error for AT+CHLD=1 from remote since there is
no active call. Incoming ringing call is not accepted. If there
is a call on hold, it remains on hold.

Root cause:
Since there is no active call, we are returning error instead of
checking for presence of incoming or held call to make it active.

Fix:
When AT+CHLD=1 is received, end the active call if any and accept
the incoming call or make the held call to active if exists.

Change-Id: Idb81507623e26d9760c93b01c4e55ab04a746cef
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
31ed9becf01386eb721ffc5803d5a8a6c64cd4cf 06-Apr-2016 Hall Liu <hallliu@google.com> Use AudioManager#getDevices in WiredHeadsetManager

AudioManager#getDevicesForStream returns only speakerphone when a call
is in progress and speakerphone is turned on. This prevents detection of
a wired headset being plugged in. Now uses AudioManager#getDevices
instead, which returns all connected devices.

Change-Id: I3bdaca6d77b2444b47971b72a3c7a8450eb50178
Fixes: 28025980
rc/com/android/server/telecom/WiredHeadsetManager.java
cd247ed3dbf8d20dfd9638590165f718376e832c 06-Apr-2016 Abhijith Shastry <ashastry@google.com> Merge "Remove deprecated launchManageBlockedNumbersActivity API implementation." into nyc-dev am: 7a7a344
am: b7b8c7d

* commit 'b7b8c7dacdbcc4ff182d21906644a6f0066710b8':
Remove deprecated launchManageBlockedNumbersActivity API implementation.

Change-Id: I13c09bde51f3d9b78e70f042a4cbd9daeb2c2f2f
8433e699313d7ed46bedb927ca6bae49b150bc60 06-Apr-2016 Hall Liu <hallliu@google.com> Merge "Use global telecom lock for CallerInfoLookupHelper" into nyc-dev am: 363c95b
am: e243ec0

* commit 'e243ec00f851acff9bc443024af91fb66f08a9a6':
Use global telecom lock for CallerInfoLookupHelper

Change-Id: Icca5534cfd7a0d29029a1878504ccc37f942b3a3
b7b8c7dacdbcc4ff182d21906644a6f0066710b8 06-Apr-2016 Abhijith Shastry <ashastry@google.com> Merge "Remove deprecated launchManageBlockedNumbersActivity API implementation." into nyc-dev
am: 7a7a344

* commit '7a7a344de1a1dbc6b8171975ef18835bd2fbd598':
Remove deprecated launchManageBlockedNumbersActivity API implementation.

Change-Id: I96c93481618d2ae6d4ef7f8a752432f5aeb69581
e243ec00f851acff9bc443024af91fb66f08a9a6 06-Apr-2016 Hall Liu <hallliu@google.com> Merge "Use global telecom lock for CallerInfoLookupHelper" into nyc-dev
am: 363c95b

* commit '363c95beebc40cdfaaf8497ad665fd370709892f':
Use global telecom lock for CallerInfoLookupHelper

Change-Id: I75ad61ca911629199e21dc1862af26c2853c261e
7a7a344de1a1dbc6b8171975ef18835bd2fbd598 06-Apr-2016 Abhijith Shastry <ashastry@google.com> Merge "Remove deprecated launchManageBlockedNumbersActivity API implementation." into nyc-dev
363c95beebc40cdfaaf8497ad665fd370709892f 06-Apr-2016 Hall Liu <hallliu@google.com> Merge "Use global telecom lock for CallerInfoLookupHelper" into nyc-dev
465982730ff480ff3037cbc22c9dcae005346971 05-Apr-2016 Hall Liu <hallliu@google.com> Use global telecom lock for CallerInfoLookupHelper

Previous implementation of a separate lock in CallerInfoLookupHelper
caused deadlocks because completed queries re-entering Telecom would
grab the CILH lock before the telecom lock, while outgoing queries would
grab the telecom lock before the CILH lock.

Change-Id: I50d94e7025d8b4b865edc5cbd73960c3703b2944
Fixes: 28007333
rc/com/android/server/telecom/CallerInfoLookupHelper.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java
b8dd93b414bb7725ab01c150afe5099ab17a885e 05-Apr-2016 Santos Cordon <santoscordon@google.com> Merge "fix voicemail: hang when selecting accounts." into nyc-dev am: 9ec3c37
am: 4231241

* commit '423124149b7110cec806489b49bc1d8aba3b5f80':
fix voicemail: hang when selecting accounts.

Change-Id: Iabfb3f5830da19feb39a5af8164db94becdef8f5
423124149b7110cec806489b49bc1d8aba3b5f80 05-Apr-2016 Santos Cordon <santoscordon@google.com> Merge "fix voicemail: hang when selecting accounts." into nyc-dev
am: 9ec3c37

* commit '9ec3c3753a81df0896743efb25164b2abbf3957e':
fix voicemail: hang when selecting accounts.

Change-Id: Ic256c53cad1cfb3fe250ca321a09a09533c85655
9ec3c3753a81df0896743efb25164b2abbf3957e 05-Apr-2016 Santos Cordon <santoscordon@google.com> Merge "fix voicemail: hang when selecting accounts." into nyc-dev
68c18673fb830da43414cfb848ab3fc891927d69 05-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Add year, month, day to telecom dumpsys." into nyc-dev am: 6b24553
am: 8817cfc

* commit '8817cfcbee938040b0067cf65c227d287fbbc7bb':
Add year, month, day to telecom dumpsys.

Change-Id: Id0d14943d1de0319d3746d72ce1186fbc67ac7ce
8817cfcbee938040b0067cf65c227d287fbbc7bb 05-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Add year, month, day to telecom dumpsys." into nyc-dev
am: 6b24553

* commit '6b24553a64ccc1b65117325158e8ea77db6b42af':
Add year, month, day to telecom dumpsys.

Change-Id: I491e99cbdfd16115d71f8068f1c83986c3586cf4
6b24553a64ccc1b65117325158e8ea77db6b42af 05-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Add year, month, day to telecom dumpsys." into nyc-dev
5f048fe6746f261498803629a21682999913532f 05-Apr-2016 Santos Cordon <santoscordon@google.com> fix voicemail: hang when selecting accounts.

Fix: 27125851
Change-Id: I90aac1c425fdcea3e32479ccb3347fae33d3bda3
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
c4ecfb8551c15f2f5b7f46325009811cc4a54b73 05-Apr-2016 Bill Yi <byi@google.com> Merge "Import translations. DO NOT MERGE" into nyc-dev am: aad1dfb -s ours
am: 7f2df16 -s ours

* commit '7f2df165fe27e84827781590894590e99f76de10':
Import translations. DO NOT MERGE

Change-Id: Icd2859d5e09b9635a50f67fea58de17dff1485b5
7f2df165fe27e84827781590894590e99f76de10 05-Apr-2016 Bill Yi <byi@google.com> Merge "Import translations. DO NOT MERGE" into nyc-dev
am: aad1dfb -s ours

* commit 'aad1dfb7f1a7d5ad54a3c9d92d26476a0e934cea':
Import translations. DO NOT MERGE

Change-Id: Ib2044dd7c126368d288ed816005be54baa77a893
aad1dfb7f1a7d5ad54a3c9d92d26476a0e934cea 05-Apr-2016 Bill Yi <byi@google.com> Merge "Import translations. DO NOT MERGE" into nyc-dev
9043b8228352505b7467c5739197cfb44f9e670f 05-Apr-2016 Bill Yi <byi@google.com> Merge "Import translations. DO NOT MERGE"
5234507e39eabb2223931656bdd687ba4e7c6eb8 05-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Id50a40ffb085a550ef59667f60925ba92fa40cc7
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
98c8171cb3a7e5eacd338e90730c026c3a7471a8 05-Apr-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I48cd2199e933c878966d15380681e6e579513576
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
05c8a72542ee27d9d6dff7604a273bf0996815c6 01-Apr-2016 Abhijith Shastry <ashastry@google.com> Remove deprecated launchManageBlockedNumbersActivity API implementation.

BUG: 27364137
Change-Id: I2cf108fa0647b368e09ea1946283ae336653380a
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
28f4c7764d8313dec72c4744f921cadca1a0f661 04-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Handle CAMSM initialization and Runnable cases in Logging" into nyc-dev am: f01acdc
am: a698411

* commit 'a698411044586ff18910a82789b05f9a80e65d5c':
Handle CAMSM initialization and Runnable cases in Logging

Change-Id: Ia9f07b333ae6a07c7bcfb7bf0009718368b49f87
a698411044586ff18910a82789b05f9a80e65d5c 04-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Handle CAMSM initialization and Runnable cases in Logging" into nyc-dev
am: f01acdc

* commit 'f01acdce2171f2a635aedca585c43d8ab3d59f1f':
Handle CAMSM initialization and Runnable cases in Logging

Change-Id: Id0e7617fbbd11896ced482bd1e9dab468bf87faf
f01acdce2171f2a635aedca585c43d8ab3d59f1f 04-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Handle CAMSM initialization and Runnable cases in Logging" into nyc-dev
83bc41189494799f48c50a5a0c47560d2859deda 02-Apr-2016 Brad Ebinger <breadley@google.com> Handle CAMSM initialization and Runnable cases in Logging

Add a session to TelecomSystem when it is initialized to track that
entry point as well as provide the CAMSM a session for its
initialization. Also only run Log.endSession on a Telecom Runnable if
the subsession that was created was not cancelled (and is now equal to null).

Change-Id: Iaa895afe44855a8862d9d7b0a61d465561bfacd0
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/Runnable.java
rc/com/android/server/telecom/TelecomSystem.java
5b305385062f4f0c28aae6cd47cdc2edb2b6f479 02-Apr-2016 Tyler Gunn <tgunn@google.com> Add year, month, day to telecom dumpsys.

The dumpsys for Telecom only shows the time of a call in the heading
for each call. This bit me in b/27729247, as there appears to have been
a call lingering around for a long time that was not disconnected.

Adding the year, month, day to the heading for each call will make it
easier to spot this type of anomaly quickly.

Bug: 27729247
Change-Id: Ia880864bcc6a91d2a758a7750247be9d0f04b3b4
rc/com/android/server/telecom/Log.java
a3134fc5d41648965713d9be72158ded85bf4cdf 01-Apr-2016 Brad Ebinger <breadley@google.com> Modify AsyncBlockCheckTask to include invisible Logging session

Currently, the Log session that governs
CallInfoLookupHelper#onQueryComplete completes before
AsyncBlockCheckTask#onPostExecute runs. An invisible subsession is now
created that tracks the Task until its completion.

Bug: 27766994
Change-Id: I301b414673a88b6b898391403373f8b18b99eaca
rc/com/android/server/telecom/AsyncBlockCheckTask.java
942399ba359dcc42483af14d4ab93798d70f8cf4 01-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Add Log.endSession to InCallTonePlayer" into nyc-dev am: bc198ff
am: 79bdad5

* commit '79bdad58d7e4489d52c1ef713cedb80c6a502135':
Add Log.endSession to InCallTonePlayer

Change-Id: Iba5c76b6cca689f00232fe9169af7e6400adeeb7
79bdad58d7e4489d52c1ef713cedb80c6a502135 01-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Add Log.endSession to InCallTonePlayer" into nyc-dev
am: bc198ff

* commit 'bc198ff39ee133cae2fc384fed2b1e1f3b43f316':
Add Log.endSession to InCallTonePlayer

Change-Id: Ic6a10bb6811b8e905f2a93fb74732a89cf82e84e
bc198ff39ee133cae2fc384fed2b1e1f3b43f316 01-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Add Log.endSession to InCallTonePlayer" into nyc-dev
2f3bd22ec513d7940861cd00c7cfa9c86b271d4f 01-Apr-2016 Tyler Gunn <tgunn@google.com> Add telecom support for multi-endpoint. am: 4fe861d
am: 3154172

* commit '3154172c341a1fbed6726f93416bc90ebd67b9d3':
Add telecom support for multi-endpoint.

Change-Id: Ia197701f76d3a266a276fa01e15336bd40c85254
3154172c341a1fbed6726f93416bc90ebd67b9d3 01-Apr-2016 Tyler Gunn <tgunn@google.com> Add telecom support for multi-endpoint.
am: 4fe861d

* commit '4fe861d770aaa749e2b6191e8121e5b831a95917':
Add telecom support for multi-endpoint.

Change-Id: I80e7bdf52080e9dd5a026b57a7d18ffd5561525c
efa8d2ad756e2ef5928bdf9171f52226096822ff 01-Apr-2016 Brad Ebinger <breadley@google.com> Add Log.endSession to InCallTonePlayer

Add missing Log.endSession to InCallTonePlayer.

Change-Id: Ied902f538f4d69cf83d178bd0a5606bf7550dc6b
rc/com/android/server/telecom/InCallTonePlayer.java
4fe861d770aaa749e2b6191e8121e5b831a95917 30-Mar-2016 Tyler Gunn <tgunn@google.com> Add telecom support for multi-endpoint.

- Add "isExternalCall" method to Call class.
- Ensure CallAudioManager ignores external calls.
- Prevent InCallController from passing extras to InCall UI which cause
it to start displaying the fullscreen outgoing call UI.

Bug: 27458894
Change-Id: I40160edd6191e71b409ff1f18ca2b8cc9662211f
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/InCallController.java
4d3d7c4cc428cff37d402d9d59814b4617df1243 01-Apr-2016 Hall Liu <hallliu@google.com> Merge "Move CallerInfo lookup into a utility class" into nyc-dev am: 1e0340b
am: d314d46

* commit 'd314d4697d141f8566094525f31cb3906b8984ab':
Move CallerInfo lookup into a utility class

Change-Id: I836ce6b8ff3e7265109eb217211cb1e40521d189
d314d4697d141f8566094525f31cb3906b8984ab 01-Apr-2016 Hall Liu <hallliu@google.com> Merge "Move CallerInfo lookup into a utility class" into nyc-dev
am: 1e0340b

* commit '1e0340bd2b11c735ca8e6db3e74b27c24ba1dfa8':
Move CallerInfo lookup into a utility class

Change-Id: Ie3ba5b2be051b53ee0c91b3a85cefdee54a8f392
1e0340bd2b11c735ca8e6db3e74b27c24ba1dfa8 01-Apr-2016 Hall Liu <hallliu@google.com> Merge "Move CallerInfo lookup into a utility class" into nyc-dev
596edda4e1a63ac4b1545ac322d49bcdbcde61f5 01-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Auto downgrade emergency video call to audio-only if not supported." into nyc-dev am: 17cc3d0
am: d771246

* commit 'd771246231fa48dcf752a5ff1f0b23f930358c52':
Auto downgrade emergency video call to audio-only if not supported.

Change-Id: I4f59ff4b97afbc57dc313d20f7772481eef87a0a
d771246231fa48dcf752a5ff1f0b23f930358c52 01-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Auto downgrade emergency video call to audio-only if not supported." into nyc-dev
am: 17cc3d0

* commit '17cc3d09c3fc849fbd80e853a5ef124fd5ffba69':
Auto downgrade emergency video call to audio-only if not supported.

Change-Id: Id6531620e7b604c78cac1410d03b5d39252e4150
17cc3d09c3fc849fbd80e853a5ef124fd5ffba69 01-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Auto downgrade emergency video call to audio-only if not supported." into nyc-dev
e9c733d7b3a43f7d915302fed57839fff3196088 01-Apr-2016 Hall Liu <hallliu@google.com> Merge "Change priority of call states in determining audio focus state." into nyc-dev am: b2ad4f9
am: 625bf47

* commit '625bf47e037e85e23308bee2631279680413bb8f':
Change priority of call states in determining audio focus state.

Change-Id: I2b5cc1623d7e7f55cf7f8efc3c9c7f3bf648b018
625bf47e037e85e23308bee2631279680413bb8f 01-Apr-2016 Hall Liu <hallliu@google.com> Merge "Change priority of call states in determining audio focus state." into nyc-dev
am: b2ad4f9

* commit 'b2ad4f95fe1a2698ae15a37a03c8387e89cc50eb':
Change priority of call states in determining audio focus state.

Change-Id: I2f596bf29a817d5a895f1fa7b074bd06eef15225
b2ad4f95fe1a2698ae15a37a03c8387e89cc50eb 01-Apr-2016 Hall Liu <hallliu@google.com> Merge "Change priority of call states in determining audio focus state." into nyc-dev
5b70c1c2ef08f06bacd4156b266e8ce5b3ccdc07 04-Mar-2016 Hall Liu <hallliu@google.com> Move CallerInfo lookup into a utility class

In preparation for parallelizing the three call-blocking lookup
operations, move the caller info/contact photo lookup out of the call
class.

Bug: 26883888

Change-Id: I9e00b21a3c5ce5c725fa91ec229f104e7c65c81e
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallerInfoLookupHelper.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ContactsAsyncHelper.java
ests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java
234c7a6e348892fd8f33749ac4ce240a2283ea16 31-Mar-2016 Santos Cordon <santoscordon@google.com> Merge "Dynamic InCallService switching." into nyc-dev am: 14fd8f3
am: c8dced9

* commit 'c8dced92ea4428b82997cb7f78060e25e7a60351':
Dynamic InCallService switching.

Change-Id: I94930a1c4fb44d12864d0477b2982b80b723cba7
d1ee0a38b3ec25e1850004a59b64f183c3eb024c 31-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Make tty_enabled to true by default." into nyc-dev am: fdafb79
am: 1f20370

* commit '1f2037069d00181ce253113ea0be84d565eb17ef':
Make tty_enabled to true by default.

Change-Id: I3e1cd3eeb183c9ff761a68d58b3dc9f217c7ad14
c8dced92ea4428b82997cb7f78060e25e7a60351 31-Mar-2016 Santos Cordon <santoscordon@google.com> Merge "Dynamic InCallService switching." into nyc-dev
am: 14fd8f3

* commit '14fd8f3d5a86b0b1d56f27d7a638d8d4b29e766d':
Dynamic InCallService switching.

Change-Id: I1b3bf1aa93711927b596ca9418ad626a5166acd1
14fd8f3d5a86b0b1d56f27d7a638d8d4b29e766d 31-Mar-2016 Santos Cordon <santoscordon@google.com> Merge "Dynamic InCallService switching." into nyc-dev
1f2037069d00181ce253113ea0be84d565eb17ef 31-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Make tty_enabled to true by default." into nyc-dev
am: fdafb79

* commit 'fdafb7953b50b6bb54152cd38bbe835ea788e051':
Make tty_enabled to true by default.

Change-Id: I5cc9df705d3998b359ec3b775f71a1088d43501b
fdafb7953b50b6bb54152cd38bbe835ea788e051 31-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Make tty_enabled to true by default." into nyc-dev
6a11ed71899f87970ea04f9a915524be68c9680e 31-Mar-2016 Hall Liu <hallliu@google.com> Change priority of call states in determining audio focus state.

In some cases, if an incoming call is answered over an already-active
call, the active call will go into the hold state before the incoming
call exits the ringing state. This causes the CAMSM to rapidly go in and
immediately out of the RINGING state, which ends up disabling call audio
for the newly answered incoming call. The fix is to disable
transitioning to a ringing state when there are holding calls.

There was a previous change made that prioritized ringing calls over
holding/tone-playing calls. This was so that if the active call were
remotely disconnected while an incoming call was on call-waiting, the
ringtone would start playing. This behavior is preserved by setting the
priority as follows:
holding calls > ringing calls > tone playing

Change-Id: I617e7733b47f244f8d668b9e86166143383a29b6
Fixes: 27804164
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/CallsManager.java
501b9b3775232bb3033afd9f1fd608dd07d0b91e 07-Mar-2016 Santos Cordon <santoscordon@google.com> Dynamic InCallService switching.

Be able to switch between in-call services UIs.

Created a tree data structure to handle switching between InCallServices
depending on the state of the system. Tree looks like this:

CarModeSwitchingConnection
| |
+------+ +-------+
| |
CarModeConnection EmergencyConnection
|
|
DefaultDialerConnection

Bug: 24571147
Change-Id: I0999fad4185321d5211172aed2f1d60fe8f5fe3a
rc/com/android/server/telecom/CallerInfoAsyncQueryFactory.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/TestCallList.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
60a00ce2819656d591443e46c646f4e20ee43543 31-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Make tty_enabled to true by default.

Bug: 27875275
Change-Id: I8fc85b95268e56df9b46e9c7ef2341b2ca7f2e24
es/values/config.xml
2ac905b495239b5d053823de5c520756cca36294 30-Mar-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: 0d84803 -s ours
am: f17905b -s ours

* commit 'f17905b97b5aea590f22f82c80d65bb69383585c':
Import translations. DO NOT MERGE

Change-Id: I99f9baf43291f30d22e37a7b06202505a97f7461
f17905b97b5aea590f22f82c80d65bb69383585c 30-Mar-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 0d84803 -s ours

* commit '0d84803a2150986f777830d5abe1c98862b0cb6d':
Import translations. DO NOT MERGE

Change-Id: I98053e4727885286b2ea2b6fd5795c94be0d5cea
0d84803a2150986f777830d5abe1c98862b0cb6d 30-Mar-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I8d608db60608a109f96df198203cf95c7fca639b
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
128bfe53c18b83d2ba5bc2b7120441070257bd36 30-Mar-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I89ffeef1c1eefefaf35f00d182eb808bbe9e2269
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
f815638bd401b5cd16ccd7c6f86f552d84814e29 30-Mar-2016 Tyler Gunn <tgunn@google.com> Auto downgrade emergency video call to audio-only if not supported.

Based on the new CAPABILITY_EMERGENCY_VIDEO_CALLING PhoneAccount
capability, auto-downgrade to audio if emergency video calling is
not supported. We do this early so that when the call is added to the
Incall UI, it does not waste time setting up video surfaces that will never
be used.

Bug: 27484017
Change-Id: I302070d885575e5ea0384803fdade39056f57c3a
rc/com/android/server/telecom/CallsManager.java
5f6486a32df6a293401a3d9e4eacc941052d8bb8 29-Mar-2016 Mohamed <abdalkader@google.com> Merge "More UI tweaks" into nyc-dev am: 8a9fbad
am: 8e07c22

* commit '8e07c223265d382da2039985c4959e9bb0f43fba':
More UI tweaks

Change-Id: I7e20ffba7a38d1f3a411d26b1262949eb27d4525
8e07c223265d382da2039985c4959e9bb0f43fba 29-Mar-2016 Mohamed <abdalkader@google.com> Merge "More UI tweaks" into nyc-dev
am: 8a9fbad

* commit '8a9fbadcca55058554e1cf8e7a465ffaf65c2373':
More UI tweaks

Change-Id: I9fa85cf4fbd5a8d54c8d44b328efa5d3e8fd87db
8a9fbadcca55058554e1cf8e7a465ffaf65c2373 29-Mar-2016 Mohamed Abdalkader <abdalkader@google.com> Merge "More UI tweaks" into nyc-dev
7caf5531de1aeeebc66a528f70ad3a97ad191279 29-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Record Call\'s Via Number in Call Extras to CallLog" into nyc-dev am: f36f514
am: 994ca8b

* commit '994ca8b09b21e7182b67e61d87a0a863cff2f259':
Record Call's Via Number in Call Extras to CallLog
994ca8b09b21e7182b67e61d87a0a863cff2f259 29-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Record Call\'s Via Number in Call Extras to CallLog" into nyc-dev
am: f36f514

* commit 'f36f5149b8de765b9ba1dfff3226d8e00f7272eb':
Record Call's Via Number in Call Extras to CallLog
f36f5149b8de765b9ba1dfff3226d8e00f7272eb 28-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Record Call's Via Number in Call Extras to CallLog" into nyc-dev
34346deb86bb67dc6df78cce59f83eddc0c48030 26-Mar-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE am: fa7f75b -s ours
am: 744df2b -s ours

* commit '744df2bc87a76d00451839f54ac4e6afef35beed':
Import translations. DO NOT MERGE
744df2bc87a76d00451839f54ac4e6afef35beed 26-Mar-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: fa7f75b -s ours

* commit 'fa7f75b7993c1f9b01126d0c1f63ad50958200a1':
Import translations. DO NOT MERGE
fa7f75b7993c1f9b01126d0c1f63ad50958200a1 26-Mar-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Id195772e9450ff230e3375c4c18e8882351b1d05
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
2f7203eaaf6e8ee2309242bafa9fe5be54137dc9 26-Mar-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: I037d21180d2e901365f8c2b7321885e1947031df
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
0089b1c34e019445efa73ef0dc57fd6feb5e3c04 25-Mar-2016 Mohamed <abdalkader@google.com> More UI tweaks

BUG:27829839
BUG:27831286
Change-Id: I25ce28cad8fa727ce8ca6ceebe9f0acca7f0dccd
es/values/dimens.xml
es/values/strings.xml
es/xml/activity_blocked_numbers.xml
es/xml/add_blocked_number_dialog.xml
es/xml/layout_blocked_number.xml
9bb2339bbaea09027d40e9b4cf057260c0ff4b51 25-Mar-2016 Tyler Gunn <tgunn@google.com> Add connection properties to Connections. am: 571d5e6
am: 0d3668c

* commit '0d3668c9c2a8fec18c4eec5f8cc1cb2bd5823ad3':
Add connection properties to Connections.
0d3668c9c2a8fec18c4eec5f8cc1cb2bd5823ad3 25-Mar-2016 Tyler Gunn <tgunn@google.com> Add connection properties to Connections.
am: 571d5e6

* commit '571d5e66b8cbee023702b4b0a2a1c28663c5a7f8':
Add connection properties to Connections.
571d5e66b8cbee023702b4b0a2a1c28663c5a7f8 15-Mar-2016 Tyler Gunn <tgunn@google.com> Add connection properties to Connections.

- Per suggestion of API council, moving properties of a Connection from
CAPABILITIES_* to PROPERTIES_*.

Bug: 27458894
Change-Id: I484783727c840a56882bca79c35280a4a338256d
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/ParcelableCallUtils.java
estapps/src/com/android/server/telecom/testapps/TestConnectionManager.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
baf52ba1520ef528b65329c813389b8183150f3d 22-Mar-2016 Brad Ebinger <breadley@google.com> Record Call's Via Number in Call Extras to CallLog

Add a column to the CallLog Backup that records the secondary line
number that an incoming call has been received on. More specifically, a
call is assumed to be considered a "VIA number" if the call's incoming
line number does not match the number registered with the SIM card.

BUG: 25594198

Change-Id: I1bdc949fcee836945eec905b6a0afeec52b4ca29
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
e8ad9daec6936342741a93dd84a0faeb10f40530 24-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Support for enhanced call/connection extras." into nyc-dev am: d9d8fb6
am: f25915b

* commit 'f25915b824949eab07161617d0873c1d9aebb102':
Support for enhanced call/connection extras.
f25915b824949eab07161617d0873c1d9aebb102 24-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Support for enhanced call/connection extras." into nyc-dev
am: d9d8fb6

* commit 'd9d8fb6508b58b55d480b1206d2e9e98a83ee019':
Support for enhanced call/connection extras.
d9d8fb6508b58b55d480b1206d2e9e98a83ee019 24-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Support for enhanced call/connection extras." into nyc-dev
d3ad4a7dcb3700acb4a2773c58d950b501ad79ad 24-Mar-2016 Hall Liu <hallliu@google.com> Merge "Make flaky test less flaky" into nyc-dev am: 529ddbe
am: 9e3aa67

* commit '9e3aa678464d80b43fdd76fdf807d5a971ab830e':
Make flaky test less flaky
9e3aa678464d80b43fdd76fdf807d5a971ab830e 24-Mar-2016 Hall Liu <hallliu@google.com> Merge "Make flaky test less flaky" into nyc-dev
am: 529ddbe

* commit '529ddbec3fc14e028b92e967adc01ecaad1c939a':
Make flaky test less flaky
529ddbec3fc14e028b92e967adc01ecaad1c939a 24-Mar-2016 Hall Liu <hallliu@google.com> Merge "Make flaky test less flaky" into nyc-dev
961694a9750626c067be960170bc95f10b5efcc2 22-Mar-2016 Tyler Gunn <tgunn@google.com> Support for enhanced call/connection extras.

Plumbing in support for InCall UIs to update the extras of a connection.
Adding in unit tests for connection and call extra set/get methods.

Bug: 27458894
Change-Id: I9ce526bf293c9f5dd03642391d459fcfa03c31ef
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/CallExtrasTest.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
7fc6e4f925401f028f6ae24bc8b0722109c575a6 23-Mar-2016 Sudheer Shanka <sudheersai@google.com> Merge "Show admin support dialog when DISALLOW_OUTGOING_CALLS is set." into nyc-dev am: 411e420
am: d3cca55

* commit 'd3cca55bc858677d662e020427e2e99834216376':
Show admin support dialog when DISALLOW_OUTGOING_CALLS is set.
d3cca55bc858677d662e020427e2e99834216376 23-Mar-2016 Sudheer Shanka <sudheersai@google.com> Merge "Show admin support dialog when DISALLOW_OUTGOING_CALLS is set." into nyc-dev
am: 411e420

* commit '411e420a1b10816a027fa090c8e6b0d4e2c032ac':
Show admin support dialog when DISALLOW_OUTGOING_CALLS is set.
411e420a1b10816a027fa090c8e6b0d4e2c032ac 23-Mar-2016 Sudheer Shanka <sudheersai@google.com> Merge "Show admin support dialog when DISALLOW_OUTGOING_CALLS is set." into nyc-dev
abf0655d80e99f660e3b8468ccc8fdc4354aca73 23-Mar-2016 xu.peng <xu.peng@spreadtrum.com> resolve merge conflicts of d26d26d to nyc-dev-plus-aosp
am: d307d6d

* commit 'd307d6d02a5b3d8fb63e2af0c9ab5ae3ca16b201':
Fix classCastException when Monkey test
d307d6d02a5b3d8fb63e2af0c9ab5ae3ca16b201 23-Mar-2016 Tyler Gunn <tgunn@google.com> resolve merge conflicts of d26d26d to nyc-dev-plus-aosp

Change-Id: Iad358e9f2339f62f3a597e8d0b52fe854a74b15d
00a983a092b455f71a98d62dbaf675df46894887 23-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: b026154 -s ours
am: 7240d67 -s ours

* commit '7240d67d092026da0a964ff4969bf0c8a4fba13f':
Import translations. DO NOT MERGE
7240d67d092026da0a964ff4969bf0c8a4fba13f 23-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: b026154 -s ours

* commit 'b026154613726e5dc0dd041c88317a535da3c214':
Import translations. DO NOT MERGE
b026154613726e5dc0dd041c88317a535da3c214 23-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I9ae3008773d74364a5a05c9420294373c232fcbd
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
1f1fae95d0f0796b16fde4c16e47d20991c82fcf 23-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ie653cf3bec3204769a2c3f82657d93e6f727c9d0
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-be-rBY/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
d26d26de6aa51c74aa52b807b7bc4533d5020739 23-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Fix classCastException when Monkey test"
cc63111261dca5284f843aa169eb921d12298d41 22-Mar-2016 Hall Liu <hallliu@google.com> Merge "Prevent zero startTimes from making call duration excessively long" into nyc-dev am: cc3046d
am: aac77db

* commit 'aac77db3cb66d0673daab5f4f7a13793b6355374':
Prevent zero startTimes from making call duration excessively long
aac77db3cb66d0673daab5f4f7a13793b6355374 22-Mar-2016 Hall Liu <hallliu@google.com> Merge "Prevent zero startTimes from making call duration excessively long" into nyc-dev
am: cc3046d

* commit 'cc3046df00c43cce85285876107e8cc8019e9a2e':
Prevent zero startTimes from making call duration excessively long
cc3046df00c43cce85285876107e8cc8019e9a2e 22-Mar-2016 Hall Liu <hallliu@google.com> Merge "Prevent zero startTimes from making call duration excessively long" into nyc-dev
0bd869ca557dc11950be3e967e7bcc3abf0ca729 22-Mar-2016 Hall Liu <hallliu@google.com> Prevent zero startTimes from making call duration excessively long

Change-Id: I2f31667537e1102c06b22d89fb66822b7d8e85e8
rc/com/android/server/telecom/Analytics.java
05d4ba5ee55c965db02ce275fd01c3971abba909 22-Mar-2016 Mohamed <abdalkader@google.com> Merge "Add toasts to blocked numbers." into nyc-dev am: 8a748d3
am: 5ba5dfb

* commit '5ba5dfbada9e09c5e1aa1de7f3b8edeb12bd14e3':
Add toasts to blocked numbers.
5ba5dfbada9e09c5e1aa1de7f3b8edeb12bd14e3 22-Mar-2016 Mohamed <abdalkader@google.com> Merge "Add toasts to blocked numbers." into nyc-dev
am: 8a748d3

* commit '8a748d33f814c8e394cb6c679a5e63b15c502fd2':
Add toasts to blocked numbers.
8a748d33f814c8e394cb6c679a5e63b15c502fd2 22-Mar-2016 Mohamed Abdalkader <abdalkader@google.com> Merge "Add toasts to blocked numbers." into nyc-dev
81d9acfa8e81501b73bc054c1992842037c6eae3 22-Mar-2016 Hall Liu <hallliu@google.com> Wrap phone number in TTS span am: ab914a9
am: 9281851

* commit '92818514a302998b53de0fcd5eb8ec2853d7cb74':
Wrap phone number in TTS span
92818514a302998b53de0fcd5eb8ec2853d7cb74 22-Mar-2016 Hall Liu <hallliu@google.com> Wrap phone number in TTS span
am: ab914a9

* commit 'ab914a91bcce2213531df11dfc5a4d19840a2191':
Wrap phone number in TTS span
ab914a91bcce2213531df11dfc5a4d19840a2191 21-Mar-2016 Hall Liu <hallliu@google.com> Wrap phone number in TTS span

Change-Id: I031f3a6446f78a114023eda30374977df4922652
Fixes: 24332305
rc/com/android/server/telecom/RespondViaSmsManager.java
49e260af3269053b18a9e98b15e172e9ecee2d9e 18-Mar-2016 Mohamed <abdalkader@google.com> Add toasts to blocked numbers.

- Add toasts on blocked/unblocked/911/duplicate.

- BlockedNumberContract.isBlocked() is a look up by number
which is indexed so should be fast, however, to be safe
we run in an async task. So I moved all work for adding
blocked number to the asynctask.

Bug: 27495710
Change-Id: Ia56de55f3161c5d413a55adb37668b720f634ef3
es/values/strings.xml
rc/com/android/server/telecom/settings/BlockNumberTaskFragment.java
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
rc/com/android/server/telecom/settings/BlockedNumbersAdapter.java
rc/com/android/server/telecom/settings/BlockedNumbersUtil.java
d3b06b720a761677ab3412a40d0f1fc6e328f249 10-Mar-2016 Sudheer Shanka <sudheersai@google.com> Show admin support dialog when DISALLOW_OUTGOING_CALLS is set.

Bug: 26762992
Change-Id: If30918918d0aff44717286ebc3fb683574969b34
ndroid.mk
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
ests/Android.mk
70dd0f68628367e40e66c5e8277c2561d746fbb0 21-Mar-2016 Mohamed <abdalkader@google.com> Merge "Blocked Numbers A11Y fixes & polish." into nyc-dev am: 45a1e43
am: 5d3ea05

* commit '5d3ea05fe7e2b0c6d26bbe0c7e504a019ade9cec':
Blocked Numbers A11Y fixes & polish.
5d3ea05fe7e2b0c6d26bbe0c7e504a019ade9cec 21-Mar-2016 Mohamed <abdalkader@google.com> Merge "Blocked Numbers A11Y fixes & polish." into nyc-dev
am: 45a1e43

* commit '45a1e438d246e5517fc83419227b7ea1b11a0fa4':
Blocked Numbers A11Y fixes & polish.
4aad8d7b3ec709d8e5e1c84a531ad0916f39a632 21-Mar-2016 Hall Liu <hallliu@google.com> Merge "Improved audio focus handling for CARSM" into nyc-dev am: aeb76b9
am: c4bdb74

* commit 'c4bdb74c4dd2ce6ce10d47cd4c0a4011ef29c551':
Improved audio focus handling for CARSM
c4bdb74c4dd2ce6ce10d47cd4c0a4011ef29c551 21-Mar-2016 Hall Liu <hallliu@google.com> Merge "Improved audio focus handling for CARSM" into nyc-dev
am: aeb76b9

* commit 'aeb76b98bb68ee08a022e3cd7120eecb6db7e0d2':
Improved audio focus handling for CARSM
45a1e438d246e5517fc83419227b7ea1b11a0fa4 21-Mar-2016 Mohamed Abdalkader <abdalkader@google.com> Merge "Blocked Numbers A11Y fixes & polish." into nyc-dev
aeb76b98bb68ee08a022e3cd7120eecb6db7e0d2 21-Mar-2016 Hall Liu <hallliu@google.com> Merge "Improved audio focus handling for CARSM" into nyc-dev
437fee152d44e239b41e3a8ef2774128e7270ba0 21-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Update the Ringer to ring based on User/profile" into nyc-dev am: e02f061
am: fafdeb1

* commit 'fafdeb1459f9a58e444210c327c058bd9b41e09b':
Update the Ringer to ring based on User/profile
fafdeb1459f9a58e444210c327c058bd9b41e09b 21-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Update the Ringer to ring based on User/profile" into nyc-dev
am: e02f061

* commit 'e02f061cb2e6968360e3c73c039530794b06bb09':
Update the Ringer to ring based on User/profile
e02f061cb2e6968360e3c73c039530794b06bb09 21-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Update the Ringer to ring based on User/profile" into nyc-dev
6257805599999ea0a7713c49962b83262150a0ee 21-Mar-2016 Mohamed <abdalkader@google.com> Merge "Fix bugs in blocked numbers for secondary users." into nyc-dev am: fb0872d
am: 029e853

* commit '029e853e70bfdd40f3e918198300d5bd6dfee0b2':
Fix bugs in blocked numbers for secondary users.
029e853e70bfdd40f3e918198300d5bd6dfee0b2 21-Mar-2016 Mohamed <abdalkader@google.com> Merge "Fix bugs in blocked numbers for secondary users." into nyc-dev
am: fb0872d

* commit 'fb0872d3b6547430b48c00beb1f3358b2138a52a':
Fix bugs in blocked numbers for secondary users.
fb0872d3b6547430b48c00beb1f3358b2138a52a 21-Mar-2016 Mohamed Abdalkader <abdalkader@google.com> Merge "Fix bugs in blocked numbers for secondary users." into nyc-dev
cb649f162285ebc0bd5bd84ee394fbef44993596 21-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 08de9a0 -s ours
am: f3f559f -s ours

* commit 'f3f559fc8bb29dcdabb9e6e5a09cebba73dcebf8':
Import translations. DO NOT MERGE
f3f559fc8bb29dcdabb9e6e5a09cebba73dcebf8 21-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 08de9a0 -s ours

* commit '08de9a0fee359fd369bdfe28871c5d730ed25dcd':
Import translations. DO NOT MERGE
08de9a0fee359fd369bdfe28871c5d730ed25dcd 21-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I4293af2b43eecd8cfc25662f04af55d0c08b6f04
Auto-generated-cl: translation import
es/values-sw/strings.xml
03d75e6a4c39b6daebfebbc4b423d01bc542ad63 21-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ie446b9485eaa2b3d0a05ec9144564964986e8810
Auto-generated-cl: translation import
es/values-sw/strings.xml
18b04db6c3fba9ebb6ab0261ce7f4a26ad41afa3 19-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 29151d7 -s ours
am: 5d1024b -s ours

* commit '5d1024bbd3d016b3871d7765fc89b1d22acbe15c':
Import translations. DO NOT MERGE
5d1024bbd3d016b3871d7765fc89b1d22acbe15c 19-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 29151d7 -s ours

* commit '29151d7bd3122e6ee1cb6f97a120ebf7c71672ca':
Import translations. DO NOT MERGE
29151d7bd3122e6ee1cb6f97a120ebf7c71672ca 19-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Icae444a8db0a0cb4471695a663371c7f3592b3f7
Auto-generated-cl: translation import
es/values-be-rBY/strings.xml
es/values-bs-rBA/strings.xml
c38fb9fb57acb2ddffe2d98b7233cc36c88c167d 19-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I75aa7e9a36cc768a5f6fedb3c4c8f840651fd30a
Auto-generated-cl: translation import
es/values-be-rBY/strings.xml
es/values-bs-rBA/strings.xml
d8ca5458f6ee1d47098a5934ddcef7e24cb074a9 10-Mar-2016 Hall Liu <hallliu@google.com> Improved audio focus handling for CARSM

Eliminates the REINITIALIZE message, which was originally written for
compatiblity with the old CallAudioManager. Resetting the audio route
back to the default state now occurs automatically whenever we lose
audio focus.

Also adds logging session support to InCallTonePlayer

Bug: 27555048
Change-Id: I4b7bb6c81aa2a38670fd3768dd65d4b3e24841eb
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/InCallTonePlayer.java
0405ae1bd6100de89ba8759973bfe9feeea8410a 18-Mar-2016 Jeff Sharkey <jsharkey@android.com> Merge "Mark more Bundles as being defusable." into nyc-dev am: c83db15
am: 22b9c06

* commit '22b9c06362155a836176895be70160b84ab9b635':
Mark more Bundles as being defusable.
22b9c06362155a836176895be70160b84ab9b635 18-Mar-2016 Jeff Sharkey <jsharkey@android.com> Merge "Mark more Bundles as being defusable." into nyc-dev
am: c83db15

* commit 'c83db1529313cadb6ba6459ac2ace5642f65e688':
Mark more Bundles as being defusable.
c83db1529313cadb6ba6459ac2ace5642f65e688 18-Mar-2016 Jeff Sharkey <jsharkey@google.com> Merge "Mark more Bundles as being defusable." into nyc-dev
e2e4cdff6dd167ea1ede3eb6ee53468b9a32f0af 18-Mar-2016 Jeff Sharkey <jsharkey@android.com> Mark more Bundles as being defusable.

They're destined for the system, so they're okay to look inside.

Bug: 27726127
Change-Id: I1376f7ac89dcc8ac0e9361ceb572c1a1d7ee7949
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/TelecomServiceImpl.java
1a098f4a983322f52f849d23d281464f53950925 18-Mar-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE Listen for ConnectionEvent and use the InCallToneMonitor to play the tone am: 85921ad -s ours am: 0d2667e
am: 47b4d88 -s ours

* commit '47b4d886f3e8dbcffe483cc8247e3018932875a0':
DO NOT MERGE Listen for ConnectionEvent and use the InCallToneMonitor to play the tone
47b4d886f3e8dbcffe483cc8247e3018932875a0 18-Mar-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE Listen for ConnectionEvent and use the InCallToneMonitor to play the tone am: 85921ad -s ours
am: 0d2667e

* commit '0d2667ed7c234ce7dac8e9d836f63b118100352d':
DO NOT MERGE Listen for ConnectionEvent and use the InCallToneMonitor to play the tone
0d2667ed7c234ce7dac8e9d836f63b118100352d 18-Mar-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE Listen for ConnectionEvent and use the InCallToneMonitor to play the tone
am: 85921ad -s ours

* commit '85921ad537b81e3276927062bb65cedcc247d30b':
DO NOT MERGE Listen for ConnectionEvent and use the InCallToneMonitor to play the tone
85921ad537b81e3276927062bb65cedcc247d30b 18-Mar-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE Listen for ConnectionEvent and use the InCallToneMonitor to play the tone

BUG=25357778

Change-Id: Iad4f36f9b01670a2f188e726895a8349aeeb1502
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallToneMonitor.java
61d38b4413440f3420beb32b1fe5421955e58b88 17-Mar-2016 Mohamed <abdalkader@google.com> Blocked Numbers A11Y fixes & polish.

- Increase touch target for x button.
- Make all phone numbers read as phone numbers.
- Format numbers as phone numbers as they are entered
then strip formatting before writing to provider.
- Change padding of add blocked number dialog.

- Depend on provider api isntead of directly checking if isPrimaryUser

Yet to add snackbars.

Bug: 27709645
Bug: 27495710
Change-Id: I217a3c0332c97e515407f4b4c07b614c59c2d9cf
es/values/dimens.xml
es/xml/add_blocked_number_dialog.xml
es/xml/layout_blocked_number.xml
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
rc/com/android/server/telecom/settings/BlockedNumbersAdapter.java
a2cc4481c9b981f63ed96b9ae982aac02cfd8ff6 17-Mar-2016 Jeff Sharkey <jsharkey@android.com> Merge "Follow framework refactoring." into nyc-dev am: 99053b6
am: 34f0870

* commit '34f0870128c6c50812449ad6cfdd3b3429d1c4f0':
Follow framework refactoring.
34f0870128c6c50812449ad6cfdd3b3429d1c4f0 17-Mar-2016 Jeff Sharkey <jsharkey@android.com> Merge "Follow framework refactoring." into nyc-dev
am: 99053b6

* commit '99053b6ad7fb036106627b37eded40d6ca3e3e9d':
Follow framework refactoring.
99053b6ad7fb036106627b37eded40d6ca3e3e9d 17-Mar-2016 Jeff Sharkey <jsharkey@google.com> Merge "Follow framework refactoring." into nyc-dev
315e99afce880d57e9af66e830b8b5d05cbea4bb 17-Mar-2016 Mohamed <abdalkader@google.com> Fix bugs in blocked numbers for secondary users.

Bug: 27715810
Change-Id: Ifbcff49777dec4ea89fb3266e475e2acf43b3ff5
es/xml/activity_blocked_numbers.xml
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
ddc183597149faccc386b7be5c82f1250c32c04f 17-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Add SELECT_PHONE_ACCOUNT test for outgoing calls" into nyc-dev am: d293a18
am: 21cc993

* commit '21cc9939cf49aa3b937c6159f8683122a5d1d3ff':
Add SELECT_PHONE_ACCOUNT test for outgoing calls
21cc9939cf49aa3b937c6159f8683122a5d1d3ff 17-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Add SELECT_PHONE_ACCOUNT test for outgoing calls" into nyc-dev
am: d293a18

* commit 'd293a182c92f0e7d90505093d23a7d0e2cfc8b9f':
Add SELECT_PHONE_ACCOUNT test for outgoing calls
805c45364858415de1d43802470c66c95c00ebaf 17-Mar-2016 Hall Liu <hallliu@google.com> Make flaky test less flaky

Check for correct actions on InCallServiceFixtureY before disconnecting
the call.

Change-Id: Idcdb3322d8335eb575a5cc6bba15b1c90828c846
ests/src/com/android/server/telecom/tests/BasicCallTests.java
d293a182c92f0e7d90505093d23a7d0e2cfc8b9f 17-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Add SELECT_PHONE_ACCOUNT test for outgoing calls" into nyc-dev
21b5e55a87aeeb0ca9b16c247e783962b60140ed 17-Mar-2016 Hall Liu <hallliu@google.com> Merge "Fix tests breaking when bluetooth is on" into nyc-dev am: 2678c62
am: 3ca8709

* commit '3ca87099bbf49cc190a2e8cb393bf6fe179b0cbb':
Fix tests breaking when bluetooth is on
9eadf47f4e2a9c9e4e76e64f72c945c0654d6318 17-Mar-2016 Hall Liu <hallliu@google.com> Add even more test annotations am: a3799ae
am: 7f14a89

* commit '7f14a8923293b29f32e07b7b865f1a7c595b4d86':
Add even more test annotations
3ca87099bbf49cc190a2e8cb393bf6fe179b0cbb 17-Mar-2016 Hall Liu <hallliu@google.com> Merge "Fix tests breaking when bluetooth is on" into nyc-dev
am: 2678c62

* commit '2678c621aef740e662114cf608388d0e4be4f2d7':
Fix tests breaking when bluetooth is on
7f14a8923293b29f32e07b7b865f1a7c595b4d86 17-Mar-2016 Hall Liu <hallliu@google.com> Add even more test annotations
am: a3799ae

* commit 'a3799ae6aafba8ccd6448a7c4337acd3460b49f2':
Add even more test annotations
c301b5128cf40a1fa5a9c0839d405afaa5747112 17-Mar-2016 Brad Ebinger <breadley@google.com> Add SELECT_PHONE_ACCOUNT test for outgoing calls

Verifies the outgoing call flow works when a PhoneAccount needs to be
selected.

Bug: 26928627
Change-Id: Idd751b00b64ce36d63f3d665676afcfb794d2820
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
a0a76f95b2f0b7d38d45f7e891e4261128b50783 17-Mar-2016 Jeff Sharkey <jsharkey@android.com> Follow framework refactoring.

Bug: 27531029
Change-Id: Ia938f4b2da76443c6f4467fd427b6cd7e9e60851
ndroidManifest.xml
2678c621aef740e662114cf608388d0e4be4f2d7 16-Mar-2016 Hall Liu <hallliu@google.com> Merge "Fix tests breaking when bluetooth is on" into nyc-dev
a3799ae6aafba8ccd6448a7c4337acd3460b49f2 16-Mar-2016 Hall Liu <hallliu@google.com> Add even more test annotations

Bug: 26853070
Change-Id: I8c6a6cdf2164afe88cc1cca1b5ea402c304994b3
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/BluetoothManagerTest.java
ests/src/com/android/server/telecom/tests/CallAudioModeStateMachineTest.java
ests/src/com/android/server/telecom/tests/CreateConnectionProcessorTest.java
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
ests/src/com/android/server/telecom/tests/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/tests/LogTest.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/ProximitySensorManagerTest.java
ests/src/com/android/server/telecom/tests/SystemStateProviderTest.java
e4841e6ede801b95b5d66e38d51e634b74d13c18 16-Mar-2016 Santos Cordon <santoscordon@google.com> Merge "More test annotations." into nyc-dev am: 0e76dab
am: 6d81824

* commit '6d81824f585148584c10ea4a1ec15b06d4a9015e':
More test annotations.
6d81824f585148584c10ea4a1ec15b06d4a9015e 16-Mar-2016 Santos Cordon <santoscordon@google.com> Merge "More test annotations." into nyc-dev
am: 0e76dab

* commit '0e76dab12fcf35de5926564c7c4d8ae7a7d98c14':
More test annotations.
0e76dab12fcf35de5926564c7c4d8ae7a7d98c14 16-Mar-2016 Santos Cordon <santoscordon@google.com> Merge "More test annotations." into nyc-dev
7948f5b5aeae8e508ee4310595669c484c786dd7 16-Mar-2016 Hall Liu <hallliu@google.com> Fix tests breaking when bluetooth is on

BluetoothPhoneServiceImpl now uses a BluetoothAdapterProxy so that it is
now isolated from system bluetooth.

Bug: 27686250
Change-Id: If27c9ba642b163ecde68ae8956bc76523a552d31
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
c9286f49d12769d775d8ad7a66f9117c49c71162 11-Mar-2016 Brad Ebinger <breadley@google.com> Update the Ringer to ring based on User/profile

The Telecom Ringer used to ignore the default ringer of secondary
users. We will now use the default ringer of the secondary users as well
as support custom contact ringtones for secondary users.

Bug: 18206079
Bug: 27568161
Change-Id: I31b8b226f852a84b11939ab77f6a8cb0e35e88b6
rc/com/android/server/telecom/AsyncRingtonePlayer.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/RingtoneFactory.java
b71ea31eb7d5509e20975c12b6ecda18cf4f3a6f 15-Mar-2016 Hall Liu <hallliu@google.com> Merge "Fix capability checking for reject" into nyc-dev am: ddad9e0dc5
am: 9803b23454

* commit '9803b234540af2463b1687674712ead834aa5552':
Fix capability checking for reject
0a87b44f886f2f77400a55d9cd71c07e57648b82 15-Mar-2016 Hall Liu <hallliu@google.com> Merge "Stop call waiting tone when call gets answered" into nyc-dev am: 8b11674d0d
am: 0f9324e8e6

* commit '0f9324e8e610dcb4c7fc867f3816dc18297701a9':
Stop call waiting tone when call gets answered
9803b234540af2463b1687674712ead834aa5552 15-Mar-2016 Hall Liu <hallliu@google.com> Merge "Fix capability checking for reject" into nyc-dev
am: ddad9e0dc5

* commit 'ddad9e0dc5671c51e0cb35151c84e0a26e5e092a':
Fix capability checking for reject
0f9324e8e610dcb4c7fc867f3816dc18297701a9 15-Mar-2016 Hall Liu <hallliu@google.com> Merge "Stop call waiting tone when call gets answered" into nyc-dev
am: 8b11674d0d

* commit '8b11674d0d82f68c5c3f07189dd747fc9f60aa48':
Stop call waiting tone when call gets answered
ddad9e0dc5671c51e0cb35151c84e0a26e5e092a 15-Mar-2016 Hall Liu <hallliu@google.com> Merge "Fix capability checking for reject" into nyc-dev
8b11674d0d82f68c5c3f07189dd747fc9f60aa48 15-Mar-2016 Hall Liu <hallliu@google.com> Merge "Stop call waiting tone when call gets answered" into nyc-dev
d66366eb7c9bf196465500e215d26695f3cb65d0 15-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Support for new multi-endpoint APIs." into nyc-dev am: 7776877a5c
am: e93ae222c9

* commit 'e93ae222c953b95a8f633a069ba6995444a2f653':
Support for new multi-endpoint APIs.
e93ae222c953b95a8f633a069ba6995444a2f653 15-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Support for new multi-endpoint APIs." into nyc-dev
am: 7776877a5c

* commit '7776877a5c8b44e4eef0c4429e6a89cdeb56a269':
Support for new multi-endpoint APIs.
7776877a5c8b44e4eef0c4429e6a89cdeb56a269 15-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Support for new multi-endpoint APIs." into nyc-dev
600b099036d2f0af106ddff98670408006071694 15-Mar-2016 Hall Liu <hallliu@google.com> Stop call waiting tone when call gets answered

If the call being answered is the only ringing call, stop the call
waiting tone even if it's still in the ringing state.

Bug: 27659457
Change-Id: I5afb3843fc1c27575947f933bb50e7b664c718dc
rc/com/android/server/telecom/CallAudioManager.java
4b1617a620039fd0d8321028b46c27b486b90763 15-Mar-2016 Hall Liu <hallliu@google.com> Fix capability checking for reject

Check against the Connection capability instead of the Call capability
in ConnectionServiceWrapper#reject

Bug: 27501686
Change-Id: Iccd2ab87eecd7b181793f5f8a39cc6fd7aa7e1af
rc/com/android/server/telecom/ConnectionServiceWrapper.java
a96dc8709cae342953d4c5942f590d9ac1ce8498 14-Mar-2016 Hall Liu <hallliu@google.com> Merge "Activate audio focus when a call enters CONNECTING" into nyc-dev am: 5cedc664d9
am: d217920b1d

* commit 'd217920b1d23f4efd1418fed2a086205f90ff124':
Activate audio focus when a call enters CONNECTING
f1c375e6b38dc7c0b47526f7168ba4d1ca5246c1 14-Mar-2016 Hall Liu <hallliu@google.com> Merge "Let WiredHeadsetManager recognize USB headsets." into nyc-dev am: 0cf1e89b70
am: c632ae4a57

* commit 'c632ae4a570b44c26c98ff0f0a86f69b010bfd8d':
Let WiredHeadsetManager recognize USB headsets.
d217920b1d23f4efd1418fed2a086205f90ff124 14-Mar-2016 Hall Liu <hallliu@google.com> Merge "Activate audio focus when a call enters CONNECTING" into nyc-dev
am: 5cedc664d9

* commit '5cedc664d90ceca99ffc93693bdf72e6c3a6527c':
Activate audio focus when a call enters CONNECTING
c632ae4a570b44c26c98ff0f0a86f69b010bfd8d 14-Mar-2016 Hall Liu <hallliu@google.com> Merge "Let WiredHeadsetManager recognize USB headsets." into nyc-dev
am: 0cf1e89b70

* commit '0cf1e89b706c389676dd8a373a601a1c0fcd399f':
Let WiredHeadsetManager recognize USB headsets.
5cedc664d90ceca99ffc93693bdf72e6c3a6527c 14-Mar-2016 Hall Liu <hallliu@google.com> Merge "Activate audio focus when a call enters CONNECTING" into nyc-dev
0cf1e89b706c389676dd8a373a601a1c0fcd399f 14-Mar-2016 Hall Liu <hallliu@google.com> Merge "Let WiredHeadsetManager recognize USB headsets." into nyc-dev
9166d8747b22a84929a7d5551b5100573f9e46c3 14-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 6c64dbb168 -s ours
am: 21be4d7ad2 -s ours

* commit '21be4d7ad2a3f6e61804b38b5d2a3bd422df8718':
Import translations. DO NOT MERGE
21be4d7ad2a3f6e61804b38b5d2a3bd422df8718 14-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 6c64dbb168 -s ours

* commit '6c64dbb16872f4be88abe648c9e3bd6a66f6c8a1':
Import translations. DO NOT MERGE
6c64dbb16872f4be88abe648c9e3bd6a66f6c8a1 14-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I850e787e9768cd8137089552ca7901398ba357df
Auto-generated-cl: translation import
es/values-bs-rBA/strings.xml
c98b392d5ec0464903492eb9cba00dd3c0871243 14-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I4931c9f5ed6391ce060f242baeb9b5ce23cb5d7b
Auto-generated-cl: translation import
es/values-bs-rBA/strings.xml
d45e6d973ea7460fb605a1eb7a66ba38c6f2467d 11-Mar-2016 Tyler Gunn <tgunn@google.com> Support for new multi-endpoint APIs.

- piping through "pullExternalCall" API from incall layer to connection
service.
- mapping of new capabilities/properties between connections/calls.
- basic unit tests for new pullExternalCall API (there will be some
follow-up work on these in the future).
- plumbing through of Connection and Call events.

Bug: 27458894
Change-Id: I421ebab28fada224bddca54ed4d3d9dff6f33bcf
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/ParcelableCallUtils.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
59c77e691e566373cbb6d06b3909c1126035d982 11-Mar-2016 Hall Liu <hallliu@google.com> Activate audio focus when a call enters CONNECTING

Takes audio focus when a call is connecting instead of dialing, and
allows connecting calls to be foreground. This fixes 27356933 by
returning a non-null value from CallsManager#getForegroundCall in
BluetoothPhoneServiceImpl#hangupCall.

Bug: 27356933
Change-Id: I4f7fcc3eae5408cc1beaa77a73419b6072666db6
rc/com/android/server/telecom/CallAudioManager.java
10d518616ad55b8e8d38e54c287300ec8f39b866 10-Mar-2016 xu.peng <xu.peng@spreadtrum.com> Fix classCastException when Monkey test

Activity#getIntent and ActivityThread#ActivitClientRecord#intent are the same instance.
Create a new instance of intent instead of modify from getIntent directly

Change-Id: Iff38c8d2c964fa364070d88eed7ea3c07ff62729
rc/com/android/server/telecom/components/UserCallActivity.java
1d7609fb34ecab7765c5dd8b92509d7f5e343de7 10-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Resolve possible deadlock in Logging" into nyc-dev am: 65bd3e5a38
am: cc1520c0a5

* commit 'cc1520c0a5f70a6a64a7aebbd1a97678b06f3db8':
Resolve possible deadlock in Logging
cc1520c0a5f70a6a64a7aebbd1a97678b06f3db8 10-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Resolve possible deadlock in Logging" into nyc-dev
am: 65bd3e5a38

* commit '65bd3e5a38193fae427f376110dde739823f7b85':
Resolve possible deadlock in Logging
65bd3e5a38193fae427f376110dde739823f7b85 10-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Resolve possible deadlock in Logging" into nyc-dev
a9c7a2132215482200bc73374e5ec8d4db63dbbb 09-Mar-2016 Hall Liu <hallliu@google.com> Merge "Set system mute state to false when all calls have terminated." into nyc-dev am: 8a7c548823
am: c426048a6e

* commit 'c426048a6eaee53cadf0593b39bc69aaae9159b8':
Set system mute state to false when all calls have terminated.
c426048a6eaee53cadf0593b39bc69aaae9159b8 09-Mar-2016 Hall Liu <hallliu@google.com> Merge "Set system mute state to false when all calls have terminated." into nyc-dev
am: 8a7c548823

* commit '8a7c54882312bc264a9e04520f81efcc498b7686':
Set system mute state to false when all calls have terminated.
8a7c54882312bc264a9e04520f81efcc498b7686 09-Mar-2016 Hall Liu <hallliu@google.com> Merge "Set system mute state to false when all calls have terminated." into nyc-dev
20dde4fd45f72e0280b7bbc6962c641066f7877f 09-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Revert "Correctly play the ringtone set by secondary users"" into nyc-dev am: af94c24e80
am: 6a2193eb28

* commit '6a2193eb28ba96e3c73123c9d8f6f4574431375f':
Revert "Correctly play the ringtone set by secondary users"
6a2193eb28ba96e3c73123c9d8f6f4574431375f 09-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Revert "Correctly play the ringtone set by secondary users"" into nyc-dev
am: af94c24e80

* commit 'af94c24e80a6ed82ad042ff03e89f5f17750b5bb':
Revert "Correctly play the ringtone set by secondary users"
af94c24e80a6ed82ad042ff03e89f5f17750b5bb 09-Mar-2016 Brad Ebinger <breadley@google.com> Merge "Revert "Correctly play the ringtone set by secondary users"" into nyc-dev
5e63953ba86bc852fc6a9be0f6e1006c6e1446b8 09-Mar-2016 Brad Ebinger <breadley@google.com> Revert "Correctly play the ringtone set by secondary users"

This reverts commit 39af15e6154255293b01784b305eeda9f3dad399.

Change-Id: I8b3d9356f9df3d840082736b85282bb903d6869f
rc/com/android/server/telecom/RingtoneFactory.java
12cb125b1a08aa61ccb63c78c22b5c118fddddf2 09-Mar-2016 Hall Liu <hallliu@google.com> Set system mute state to false when all calls have terminated.

Bug: 27486437
Change-Id: Ieddbe4595180d9e547478755025b0489ca22ed44
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
bb68a0698ca39a8259881d7ed71e2a87054775ec 09-Mar-2016 Brad Ebinger <breadley@google.com> Resolve possible deadlock in Logging

Currently, if the sCleanStaleSessions telecom.Runnable runs while
another thread has the Log lock, a deadlock can occur. Instead, a normal
android.Runnable will be used in order to prevent the deadlock from
occuring.

Bug: 27552152
Change-Id: Ie41aac6d77db243daa048a9a8b0e2217b9c3ac5c
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/Runnable.java
ca9988ba4e8aed7d04835eca57b62f397c1a08f4 09-Mar-2016 Hall Liu <hallliu@google.com> Let WiredHeadsetManager recognize USB headsets.

WiredHeadsetManager will now determine whether a headset is plugged in
by querying the list of audio devices and matching it against a list of
device types recognized as wired headsets, rather than calling
AudioManager#isWiredHeadsetOn which ignores USB headsets.

Detecting when the list of connected audio devices is now done through
an AudioManager callback instead of listening to an Intent.

Bug: 25110008
Change-Id: I27ac4b835be8a76529c3564df3f8d3d00540cc84
rc/com/android/server/telecom/WiredHeadsetManager.java
c1cd696c6cf0bd2aa2d551cede0e1462cb621200 09-Mar-2016 Hall Liu <hallliu@google.com> Merge "Retry connectAudio if it returns false." into nyc-dev am: 531324d787
am: 119ed14497

* commit '119ed14497c9c464047b8935bad9e3ecea99f20f':
Retry connectAudio if it returns false.
119ed14497c9c464047b8935bad9e3ecea99f20f 09-Mar-2016 Hall Liu <hallliu@google.com> Merge "Retry connectAudio if it returns false." into nyc-dev
am: 531324d787

* commit '531324d787b4b292309a134012bc79ee82cf4e64':
Retry connectAudio if it returns false.
531324d787b4b292309a134012bc79ee82cf4e64 09-Mar-2016 Hall Liu <hallliu@google.com> Merge "Retry connectAudio if it returns false." into nyc-dev
c4e71f87351641a1f02d6c0d966bead1d8f851c4 27-Feb-2016 Hall Liu <hallliu@google.com> Retry connectAudio if it returns false.

Sometimes, when BluetoothManager#connectBluetoothAudio is called
immediately after a bluetooth device connects, the HeadsetStateMachine
in the bluetooth stack is not yet ready to accept commands, and
therefore BluetoothHeadset#connectAudio returns false. This change adds
a retry with 500ms backoff.

Part of the fix for b/22507913

Bug: 22507913
Change-Id: I3084496c3af74687ea66c8558e20f1260420381c
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/Timeouts.java
543e81ad9e46b2b5927509f5c07158ce822e3965 07-Mar-2016 Hall Liu <hallliu@google.com> Merge "Remove stale session cleanups during tests" into nyc-dev am: 482e43fccd
am: e55936c1ab

* commit 'e55936c1ab10a71836e361102c8203c5f3e10615':
Remove stale session cleanups during tests
e55936c1ab10a71836e361102c8203c5f3e10615 07-Mar-2016 Hall Liu <hallliu@google.com> Merge "Remove stale session cleanups during tests" into nyc-dev
am: 482e43fccd

* commit '482e43fccde5618164b88331e35d2a206e8e3072':
Remove stale session cleanups during tests
482e43fccde5618164b88331e35d2a206e8e3072 07-Mar-2016 Hall Liu <hallliu@google.com> Merge "Remove stale session cleanups during tests" into nyc-dev
ebc369390963b4dbdabea01b9dadd268fd002ca3 05-Mar-2016 Abhijith Shastry <ashastry@google.com> Add unit tests for send to voicemail, and number blocking. am: c6e42ef046
am: ce8706a269

* commit 'ce8706a2699d10927b495a35b997b001269b4c71':
Add unit tests for send to voicemail, and number blocking.
ce8706a2699d10927b495a35b997b001269b4c71 05-Mar-2016 Abhijith Shastry <ashastry@google.com> Add unit tests for send to voicemail, and number blocking.
am: c6e42ef046

* commit 'c6e42ef0465fe01b35bb3aa94fbcbc081e3b45ed':
Add unit tests for send to voicemail, and number blocking.
c6e42ef0465fe01b35bb3aa94fbcbc081e3b45ed 20-Feb-2016 Abhijith Shastry <ashastry@google.com> Add unit tests for send to voicemail, and number blocking.

BUG: 26682702

Change-Id: Id5cd03d48ac5022e15039e420ea5daeb91f0c623
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/CallerInfoAsyncQueryFactoryFixture.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
d14ab699a3c618e735680f4f9c7f0b0556f04b8f 05-Mar-2016 Brad Ebinger <breadley@google.com> Correctly play the ringtone set by secondary users am: 39af15e615
am: 818115d2f0

* commit '818115d2f078346dcde83cb658c786a6b9ba840f':
Correctly play the ringtone set by secondary users
818115d2f078346dcde83cb658c786a6b9ba840f 05-Mar-2016 Brad Ebinger <breadley@google.com> Correctly play the ringtone set by secondary users
am: 39af15e615

* commit '39af15e6154255293b01784b305eeda9f3dad399':
Correctly play the ringtone set by secondary users
39af15e6154255293b01784b305eeda9f3dad399 04-Mar-2016 Brad Ebinger <breadley@google.com> Correctly play the ringtone set by secondary users

Correctly play the ringtone set by secondary users instead of always
playing the ringtone set by the primary user.

Bug: 18206079
Change-Id: If98701fc5e927d035d1bac5ee1b904f8964e80b5
rc/com/android/server/telecom/RingtoneFactory.java
df8ccad186afedd451ba726561103cba87e2e9bd 05-Mar-2016 Hall Liu <hallliu@google.com> Remove stale session cleanups during tests

Fixes spurious mockito WrongTypeOfReturnValue errors during unit tests.
The errors were most likely due to a stale instance of Context sticking
around in the static Log class across test cases. This change makes Log
no longer try to access its instance of Context during testing.

Bug: 27484228
Change-Id: I2985e7c29722b27d4e456fe58557deded68f9086
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
e3f9e8d50ca6897c3963c9607df2f94782d59fe1 04-Mar-2016 Abhijith Shastry <ashastry@google.com> Sort blocked numbers from most recent to least recent. am: adb4c33e9e
am: f56942ee1b

* commit 'f56942ee1be2f27ff2c8c5178a43bf8a04360dd3':
Sort blocked numbers from most recent to least recent.
f56942ee1be2f27ff2c8c5178a43bf8a04360dd3 04-Mar-2016 Abhijith Shastry <ashastry@google.com> Sort blocked numbers from most recent to least recent.
am: adb4c33e9e

* commit 'adb4c33e9ef1a8ba8347d32cb0f97c6531f77fbd':
Sort blocked numbers from most recent to least recent.
adb4c33e9ef1a8ba8347d32cb0f97c6531f77fbd 04-Mar-2016 Abhijith Shastry <ashastry@google.com> Sort blocked numbers from most recent to least recent.

The provider does not support updates, hence this can be achieved by sorting by id.

BUG: 27459988

Change-Id: I9d9e1efe16f351ac241bc9eccc3814b8763aa69a
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
1cca108f1ad0169af003ae3330a4f01ad4ac9771 04-Mar-2016 Omkar Kolangade <omkark@codeaurora.org> Merge commit \'005612a0af1fc475f422a1b0a4fb51fc5416ac90\' into tgunn-merge1 am: 228f95ee66
am: 6c9ff7d093

* commit '6c9ff7d0938bac7debcf8ca8d15a7c04d46e619a':
IMS-VT: Set VideoState in Call Connecting State
6c9ff7d0938bac7debcf8ca8d15a7c04d46e619a 04-Mar-2016 Omkar Kolangade <omkark@codeaurora.org> Merge commit \'005612a0af1fc475f422a1b0a4fb51fc5416ac90\' into tgunn-merge1
am: 228f95ee66

* commit '228f95ee66c1770dd92f4f957ea6a9133ece2dd6':
IMS-VT: Set VideoState in Call Connecting State
228f95ee66c1770dd92f4f957ea6a9133ece2dd6 04-Mar-2016 Tyler Gunn <tgunn@google.com> Merge commit '005612a0af1fc475f422a1b0a4fb51fc5416ac90' into tgunn-merge1

Change-Id: Ibf955c5361978fadda363af97e975672d8a5f197
005612a0af1fc475f422a1b0a4fb51fc5416ac90 25-Aug-2015 Omkar Kolangade <omkark@codeaurora.org> IMS-VT: Set VideoState in Call Connecting State

Set VideoState in Call Connecting State
This will ensure that proper video state is sent at InCallService
start i.e. when binding to InCallService itself thereby giving us
sufficient time for surface creation.

Bug: 27477792
Change-Id: Ia7b76b558c1226359dd24e6d07b8e9d1c692ab93
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallsManager.java
b2d37e042380109757d5e520508d2a7acf12dfa1 03-Mar-2016 Abhijith Shastry <ashastry@google.com> Merge "Notify blocked number provider after an emergency call." into nyc-dev am: 131e31f4d3
am: d6e6f0beab

* commit 'd6e6f0beab2f3b6d9cde5fb938828e7e71616562':
Notify blocked number provider after an emergency call.
c2221c7a4e063eff2b70ad130ad7404015eeb2f0 03-Mar-2016 Abhijith Shastry <ashastry@google.com> Merge "Implement createManageBlockedNumbersIntent API." into nyc-dev am: 7053251567
am: 9041c5e6c6

* commit '9041c5e6c65e63e60f0e0bc382ae0474f504b105':
Implement createManageBlockedNumbersIntent API.
d6e6f0beab2f3b6d9cde5fb938828e7e71616562 03-Mar-2016 Abhijith Shastry <ashastry@google.com> Merge "Notify blocked number provider after an emergency call." into nyc-dev
am: 131e31f4d3

* commit '131e31f4d3565f0fcf76f9cbe4c4701d53be147a':
Notify blocked number provider after an emergency call.
9041c5e6c65e63e60f0e0bc382ae0474f504b105 03-Mar-2016 Abhijith Shastry <ashastry@google.com> Merge "Implement createManageBlockedNumbersIntent API." into nyc-dev
am: 7053251567

* commit '70532515673cd7ac0c86eae4558bab8cf13fef8f':
Implement createManageBlockedNumbersIntent API.
131e31f4d3565f0fcf76f9cbe4c4701d53be147a 03-Mar-2016 Abhijith Shastry <ashastry@google.com> Merge "Notify blocked number provider after an emergency call." into nyc-dev
70532515673cd7ac0c86eae4558bab8cf13fef8f 03-Mar-2016 Abhijith Shastry <ashastry@google.com> Merge "Implement createManageBlockedNumbersIntent API." into nyc-dev
609b1bcf1e73248d3617f87283b47d42618e77bb 02-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 35e9564434 -s ours
am: 2788f0937f -s ours

* commit '2788f0937f9cbb15436ab6f314a301d73f5e26cc':
Import translations. DO NOT MERGE
2788f0937f9cbb15436ab6f314a301d73f5e26cc 02-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 35e9564434 -s ours

* commit '35e9564434c56377ba5d614a2210c50ce60f270e':
Import translations. DO NOT MERGE
35e9564434c56377ba5d614a2210c50ce60f270e 02-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I72c9aebcd5ba2d8dbab8ea6330920aab66946719
Auto-generated-cl: translation import
es/values-az-rAZ/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-eu-rES/strings.xml
es/values-gl-rES/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-kk-rKZ/strings.xml
es/values-ky-rKG/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-ta-rIN/strings.xml
es/values-zh-rCN/strings.xml
26da50711e45ce8f2ae19464ce74e31548ec5ee9 02-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ida1aefe2212521027429d8d400a5c6af8e46b1f4
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bn-rBD/strings.xml
es/values-bs-rBA/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-tl/strings.xml
es/values-ur-rPK/strings.xml
es/values-zh-rCN/strings.xml
43e1cd9a1b81065ba20092ef0da4170acf8da89c 02-Mar-2016 Bryce Lee <brycelee@google.com> Merge "DO NOT MERGE ANYWHERE Set audio route to min viable for all connected calls." into cw-e-dev am: d4ac741f0d -s ours am: 619a100c52 -s ours am: ead8e6b2e0 -s ours
am: 3eb6f7fa4a -s ours

* commit '3eb6f7fa4a3893ebdf488cbe9f55f1c32bc1e25c':
DO NOT MERGE ANYWHERE Set audio route to min viable for all connected calls.
fe5172f1dcca55020ba8c9f48bc0c3842d0f3be1 02-Mar-2016 Rakesh Iyer <rni@google.com> Merge "Fix bootloop in x86_full." into nyc-dev am: 5b4f325de4
am: 0a56ca5cd5

* commit '0a56ca5cd562164ea0f29303d0b58579a19a9b9d':
Fix bootloop in x86_full.
64cbc816316aee2c1698809098d0bb6f1e45c815 02-Mar-2016 Santos Cordon <santoscordon@google.com> Merge "Add *AsUser() calls where appropriate for multi-user support." into nyc-dev am: cf80e1fbec
am: c53a3f5f85

* commit 'c53a3f5f8560333628747fec99eb91de908d4e95':
Add *AsUser() calls where appropriate for multi-user support.
3eb6f7fa4a3893ebdf488cbe9f55f1c32bc1e25c 02-Mar-2016 Bryce Lee <brycelee@google.com> Merge "DO NOT MERGE ANYWHERE Set audio route to min viable for all connected calls." into cw-e-dev am: d4ac741f0d -s ours am: 619a100c52 -s ours
am: ead8e6b2e0 -s ours

* commit 'ead8e6b2e0c8624921f0f6059b2178d998de6f13':
DO NOT MERGE ANYWHERE Set audio route to min viable for all connected calls.
ead8e6b2e0c8624921f0f6059b2178d998de6f13 02-Mar-2016 Bryce Lee <brycelee@google.com> Merge "DO NOT MERGE ANYWHERE Set audio route to min viable for all connected calls." into cw-e-dev am: d4ac741f0d -s ours
am: 619a100c52 -s ours

* commit '619a100c526cfe08282daeac6a8b3e3e6cac4151':
DO NOT MERGE ANYWHERE Set audio route to min viable for all connected calls.
619a100c526cfe08282daeac6a8b3e3e6cac4151 02-Mar-2016 Bryce Lee <brycelee@google.com> Merge "DO NOT MERGE ANYWHERE Set audio route to min viable for all connected calls." into cw-e-dev
am: d4ac741f0d -s ours

* commit 'd4ac741f0d343a9db0ec4da2ee45f478a895b176':
DO NOT MERGE ANYWHERE Set audio route to min viable for all connected calls.
d4ac741f0d343a9db0ec4da2ee45f478a895b176 02-Mar-2016 Bryce Lee <brycelee@google.com> Merge "DO NOT MERGE ANYWHERE Set audio route to min viable for all connected calls." into cw-e-dev
cf27f68591c26b7420b27f620d9c927a321add39 02-Mar-2016 Abhijith Shastry <ashastry@google.com> Notify blocked number provider after an emergency call.

BUG: 26989170
Change-Id: I07d90d7994448e7a247e97d45b8dd1f1bc65e434
rc/com/android/server/telecom/CallsManager.java
0a56ca5cd562164ea0f29303d0b58579a19a9b9d 02-Mar-2016 Rakesh Iyer <rni@google.com> Merge "Fix bootloop in x86_full." into nyc-dev
am: 5b4f325de4

* commit '5b4f325de4c3285d7add9161d9f55003005e7348':
Fix bootloop in x86_full.
c53a3f5f8560333628747fec99eb91de908d4e95 02-Mar-2016 Santos Cordon <santoscordon@google.com> Merge "Add *AsUser() calls where appropriate for multi-user support." into nyc-dev
am: cf80e1fbec

* commit 'cf80e1fbec61a343b403827cb1d21e267ec9dda7':
Add *AsUser() calls where appropriate for multi-user support.
b1308ec228d8517caddaf0b09d57aacf67c8dcab 01-Mar-2016 Abhijith Shastry <ashastry@google.com> Implement createManageBlockedNumbersIntent API.

BUG: 27364137
Change-Id: Iaced9910db04df73cc3d7503e4ec6c4a3e4fb15a
ndroidManifest.xml
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
5b4f325de4c3285d7add9161d9f55003005e7348 02-Mar-2016 Rakesh Iyer <rni@google.com> Merge "Fix bootloop in x86_full." into nyc-dev
928e3ed4dc24d0440bfb83a995ba2846af4e8871 01-Mar-2016 Rakesh Iyer <rni@google.com> Fix bootloop in x86_full.

The emulator boot loops with a NullPointerException
when running x86_full. This patch adds in a null check
to fix this.

Change-Id: Ie9fc63d998b2d5fa985963d9793d4522bda686e5
rc/com/android/server/telecom/BluetoothAdapterProxy.java
cf80e1fbec61a343b403827cb1d21e267ec9dda7 01-Mar-2016 Santos Cordon <santoscordon@google.com> Merge "Add *AsUser() calls where appropriate for multi-user support." into nyc-dev
9df9592ddd476f3bd43ec6f39ae38bc0c8fe3f1b 01-Mar-2016 Hall Liu <hallliu@google.com> Merge "Move ringtone lookup to background" into nyc-dev am: cc21c7a4bb
am: 30e61551d9

* commit '30e61551d9f357090a691dca52828ffaf206e019':
Move ringtone lookup to background
4e67393626d99418cf90853248ef78ab544a014c 01-Mar-2016 Hall Liu <hallliu@google.com> Add way for external bluetooth audio changes to notify CARSM am: e74af084ac
am: a02259268c

* commit 'a02259268c464294cc9150493b731c94734464fc':
Add way for external bluetooth audio changes to notify CARSM
30e61551d9f357090a691dca52828ffaf206e019 01-Mar-2016 Hall Liu <hallliu@google.com> Merge "Move ringtone lookup to background" into nyc-dev
am: cc21c7a4bb

* commit 'cc21c7a4bbcdf66fb7d5f3f81d5bdf9b3845d729':
Move ringtone lookup to background
a02259268c464294cc9150493b731c94734464fc 01-Mar-2016 Hall Liu <hallliu@google.com> Add way for external bluetooth audio changes to notify CARSM
am: e74af084ac

* commit 'e74af084ac087f6af0f16ecbed5e74ce7183d254':
Add way for external bluetooth audio changes to notify CARSM
cc21c7a4bbcdf66fb7d5f3f81d5bdf9b3845d729 01-Mar-2016 Hall Liu <hallliu@google.com> Merge "Move ringtone lookup to background" into nyc-dev
e74af084ac087f6af0f16ecbed5e74ce7183d254 11-Feb-2016 Hall Liu <hallliu@google.com> Add way for external bluetooth audio changes to notify CARSM

update onBluetoothStateChange and BluetoothManager to be more aware of
bluetooth changes coming from external sources. Also add tests for
BluetoothManager.

Bug: 27133607
Change-Id: I10790a9cfad329574c8e9dd4144127020eea65e4
rc/com/android/server/telecom/BluetoothAdapterProxy.java
rc/com/android/server/telecom/BluetoothHeadsetProxy.java
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/CallAudioRoutePeripheralAdapter.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/TelecomSystem.java
ests/src/com/android/server/telecom/tests/BluetoothManagerTest.java
8c339b2b26a2bcbda8ac709e6683fb1b74f0564d 29-Feb-2016 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE Set audio route to min viable for all connected calls.

Change-Id: I14429eeb3b47633b21048dfd0deb874fcd953c8f
rc/com/android/server/telecom/CallAudioManager.java
f0f99f34fc993dc72c335133c6b04720c826c891 19-Feb-2016 Santos Cordon <santoscordon@google.com> Add *AsUser() calls where appropriate for multi-user support.

Although telecom always runs as system user, it binds to apps in the
user space and so needs to interact with apps with the current user
explicitly. This change fixes areas that neglected to do that.

Bug: 27161171
Change-Id: I55a4f612c9b38d4e448c346173845a79a926c695
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallScreening.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Ringer.java
estapps/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/InCallControllerTests.java
26bf65dc6f29621613be76760856465277e6fad5 29-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Stub implementation of createManageBlockedNumbersIntent." into nyc-dev am: f0237f21d6
am: d3cf7b7c99

* commit 'd3cf7b7c998145d82df68ce19107b5db0d3cf041':
Stub implementation of createManageBlockedNumbersIntent.
d3cf7b7c998145d82df68ce19107b5db0d3cf041 29-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Stub implementation of createManageBlockedNumbersIntent." into nyc-dev
am: f0237f21d6

* commit 'f0237f21d6ea04398b8f609879364b0ea4c47474':
Stub implementation of createManageBlockedNumbersIntent.
f0237f21d6ea04398b8f609879364b0ea4c47474 29-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Stub implementation of createManageBlockedNumbersIntent." into nyc-dev
ebe7bbeb63816c69189c7e0b6c5f42139b2f1544 29-Feb-2016 Abhijith Shastry <ashastry@google.com> Stub implementation of createManageBlockedNumbersIntent.

BUG: 27364137
Change-Id: Idb0f56fcbb6b85def7beeff206af732195ea3f47
rc/com/android/server/telecom/TelecomServiceImpl.java
b983f13821376e8da4e56c443ed83d86f05b35a5 29-Feb-2016 Chenjie Luo <cjluo@google.com> DO NOT MERGE ANYWHERE Add support for earpiece-less devices in audio routing am: d68832a726 -s ours am: 50f875cbe5 -s ours am: 9de2f5b521 -s ours
am: 47ed092269 -s ours

* commit '47ed0922695b3fccb230c5bb515f5e32a83f8312':
DO NOT MERGE ANYWHERE Add support for earpiece-less devices in audio routing
47ed0922695b3fccb230c5bb515f5e32a83f8312 29-Feb-2016 Chenjie Luo <cjluo@google.com> DO NOT MERGE ANYWHERE Add support for earpiece-less devices in audio routing am: d68832a726 -s ours am: 50f875cbe5 -s ours
am: 9de2f5b521 -s ours

* commit '9de2f5b521cbc1560c5c72307c9cb027ef4bf8aa':
DO NOT MERGE ANYWHERE Add support for earpiece-less devices in audio routing
9de2f5b521cbc1560c5c72307c9cb027ef4bf8aa 29-Feb-2016 Chenjie Luo <cjluo@google.com> DO NOT MERGE ANYWHERE Add support for earpiece-less devices in audio routing am: d68832a726 -s ours
am: 50f875cbe5 -s ours

* commit '50f875cbe5fe3a39673219ffb0f6170c16c26f9f':
DO NOT MERGE ANYWHERE Add support for earpiece-less devices in audio routing
50f875cbe5fe3a39673219ffb0f6170c16c26f9f 29-Feb-2016 Chenjie Luo <cjluo@google.com> DO NOT MERGE ANYWHERE Add support for earpiece-less devices in audio routing
am: d68832a726 -s ours

* commit 'd68832a72667d1f1d7557d6003e9a3fe4705cece':
DO NOT MERGE ANYWHERE Add support for earpiece-less devices in audio routing
d68832a72667d1f1d7557d6003e9a3fe4705cece 26-Feb-2016 Chenjie Luo <cjluo@google.com> DO NOT MERGE ANYWHERE Add support for earpiece-less devices in audio routing

Allow devices without earpieces (Wear devices) to route call audio
correctly by falling back to speakerphone. This is a backport of
ag/834751.

Bug: 26195788
Change-Id: Idb3f5007b5fab5c200a7487802ee26cffaf66dcc
rc/com/android/server/telecom/CallAudioManager.java
a5746d0a7ef835bbe7fb2fbec55ac08dcf610994 29-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 3f18eb53fb -s ours
am: 46188044fa -s ours

* commit '46188044fa68c48440f34225cb69baa524a30de0':
Import translations. DO NOT MERGE
46188044fa68c48440f34225cb69baa524a30de0 29-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 3f18eb53fb -s ours

* commit '3f18eb53fbd257267e102410c46c48609ef414d0':
Import translations. DO NOT MERGE
3f18eb53fbd257267e102410c46c48609ef414d0 29-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ie3cd11dc85aa36f2902f6d7484989ec7e3ae8b91
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
5f23c4862636c695561517782f05c2ee57903902 29-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I834dedb456a7684c83c8a90d51d1700115e3c004
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
850b615e73747faf24eb6f5f38847d67f84f6738 26-Feb-2016 Mohamed <abdalkader@google.com> Merge "Add butter bar when blocking is suppressed." into nyc-dev am: 2629bad3f3
am: 3dd0a320cf

* commit '3dd0a320cf10e4936e62783045b9c47731df8c2c':
Add butter bar when blocking is suppressed.
3dd0a320cf10e4936e62783045b9c47731df8c2c 26-Feb-2016 Mohamed <abdalkader@google.com> Merge "Add butter bar when blocking is suppressed." into nyc-dev
am: 2629bad3f3

* commit '2629bad3f36215c7a608388642781faa760e3090':
Add butter bar when blocking is suppressed.
2629bad3f36215c7a608388642781faa760e3090 26-Feb-2016 Mohamed Abdalkader <abdalkader@google.com> Merge "Add butter bar when blocking is suppressed." into nyc-dev
b931b9bb340658e13b1d52a1cd59bd4ca1703f6a 26-Feb-2016 Hall Liu <hallliu@google.com> Merge "Prevent BT reconnection from switching route" into nyc-dev am: fda4f50637
am: 57f7455f81

* commit '57f7455f816688d5fbcc67f7625803863f73d7f2':
Prevent BT reconnection from switching route
57f7455f816688d5fbcc67f7625803863f73d7f2 26-Feb-2016 Hall Liu <hallliu@google.com> Merge "Prevent BT reconnection from switching route" into nyc-dev
am: fda4f50637

* commit 'fda4f50637acc432b1591cf0548b72b25533b9c0':
Prevent BT reconnection from switching route
fda4f50637acc432b1591cf0548b72b25533b9c0 26-Feb-2016 Hall Liu <hallliu@google.com> Merge "Prevent BT reconnection from switching route" into nyc-dev
8c89b20bc84c06294bff803b3a6043992b613e76 25-Feb-2016 Hall Liu <hallliu@google.com> Move ringtone lookup to background

Obtaining a Ringtone object from an Uri can sometimes involve a disk
read. This change moves the lookup to the same thread that plays the
ringtone.

Bug: 27327098
Change-Id: I8091d73000414add97fe163f702cc4ed2ac612f8
rc/com/android/server/telecom/AsyncRingtonePlayer.java
rc/com/android/server/telecom/Ringer.java
012ce84146055967c30c237e716cc0d9c73fde33 26-Feb-2016 Mohamed <abdalkader@google.com> Merge "UI polish/tweaks for blocked numbers UI." into nyc-dev am: 01635b05ce
am: 895348c13f

* commit '895348c13fa4dcbcf20d1ecafdba1b2983601370':
UI polish/tweaks for blocked numbers UI.
4f296ba3f42713fd138dbe86b97500f43f5d2d27 18-Feb-2016 Hall Liu <hallliu@google.com> Prevent BT reconnection from switching route

After a user has switched away from bluetooth explicitly, don't go back
to bluetooth if a device is disconnected then reconnected.

Bug: 22507913
Change-Id: I26f407255f8106bb216a397091a08d7c4f08ff26
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
895348c13fa4dcbcf20d1ecafdba1b2983601370 26-Feb-2016 Mohamed <abdalkader@google.com> Merge "UI polish/tweaks for blocked numbers UI." into nyc-dev
am: 01635b05ce

* commit '01635b05cef2bdc945320780c2e5cf475392789a':
UI polish/tweaks for blocked numbers UI.
01635b05cef2bdc945320780c2e5cf475392789a 26-Feb-2016 Mohamed Abdalkader <abdalkader@google.com> Merge "UI polish/tweaks for blocked numbers UI." into nyc-dev
97610cbec4ccf87318ebdca3797f18a84cf87ca5 25-Feb-2016 Mohamed <abdalkader@google.com> Add butter bar when blocking is suppressed.

Screenshots:
https://drive.google.com/a/google.com/file/d/0ByV4lfyID02GTVJkei1GMWpSYXpHRlJPNG1yVHpoLUltWTNZ/view?usp=sharing
https://drive.google.com/a/google.com/file/d/0ByV4lfyID02GZGsyRm91anJoT1pHdjFreHhISnR6UXhUcHBV/view?usp=sharing

Bug: 26917087
Change-Id: I83ae16b7d869f342056403e0da41d23b4fc23448
es/drawable-hdpi/ic_status_blocked_orange_40dp.png
es/drawable-mdpi/ic_status_blocked_orange_40dp.png
es/drawable-xhdpi/ic_status_blocked_orange_40dp.png
es/drawable-xxhdpi/ic_status_blocked_orange_40dp.png
es/drawable-xxxhdpi/ic_status_blocked_orange_40dp.png
es/values/colors.xml
es/values/dimens.xml
es/values/strings.xml
es/values/styles.xml
es/xml/activity_blocked_numbers.xml
es/xml/blocking_suppressed_butterbar.xml
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
13e674dca2d4bd01732f9a553659703c8eb460b2 25-Feb-2016 Brad Ebinger <breadley@google.com> Merge "Fix SecurityException in Tests" into nyc-dev am: 3ebdc296de
am: 56b3dc6fb4

* commit '56b3dc6fb476e36245b18a7e372688d6dfc9324b':
Fix SecurityException in Tests
56b3dc6fb476e36245b18a7e372688d6dfc9324b 25-Feb-2016 Brad Ebinger <breadley@google.com> Merge "Fix SecurityException in Tests" into nyc-dev
am: 3ebdc296de

* commit '3ebdc296de52131ab141fc1ef8570d5ef2347c2d':
Fix SecurityException in Tests
3ebdc296de52131ab141fc1ef8570d5ef2347c2d 25-Feb-2016 Brad Ebinger <breadley@google.com> Merge "Fix SecurityException in Tests" into nyc-dev
4f4f1e42cac7e8c17136e9661e8eef1391f86941 25-Feb-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE am: 51c2fbfdf6 -s ours
am: 484de1fe38 -s ours

* commit '484de1fe383c9f69619791e566c1944b014ba4dc':
Import translations. DO NOT MERGE
484de1fe383c9f69619791e566c1944b014ba4dc 25-Feb-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE
am: 51c2fbfdf6 -s ours

* commit '51c2fbfdf624d762a7ed4bc67f09d8363f5d1a04':
Import translations. DO NOT MERGE
53aab5cd84ec43bc0e8c2e39bfac472ee845811e 25-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "Add call should always be present in CDMA calls." into nyc-dev am: f9313da97e
am: e78d296ce9

* commit 'e78d296ce9b05af294af3110ac698c7fbae21dbd':
Add call should always be present in CDMA calls.
e78d296ce9b05af294af3110ac698c7fbae21dbd 25-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "Add call should always be present in CDMA calls." into nyc-dev
am: f9313da97e

* commit 'f9313da97e6f17bb8e8c62146a483ac528b9d44c':
Add call should always be present in CDMA calls.
f9313da97e6f17bb8e8c62146a483ac528b9d44c 25-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "Add call should always be present in CDMA calls." into nyc-dev
1dff1b4f9dded70ba76bf70b4e109e785e1e6d8d 25-Feb-2016 Tony Mak <tonymak@google.com> Skip DISALLOW_OUTGOING_CALLS checking in managed profile. am: 24b10bebff
am: 752d00794b

* commit '752d00794b157b02911866e514ed31bec0ee91b1':
Skip DISALLOW_OUTGOING_CALLS checking in managed profile.
752d00794b157b02911866e514ed31bec0ee91b1 25-Feb-2016 Tony Mak <tonymak@google.com> Skip DISALLOW_OUTGOING_CALLS checking in managed profile.
am: 24b10bebff

* commit '24b10bebff4939daeabef78e906ee447212b0c5a':
Skip DISALLOW_OUTGOING_CALLS checking in managed profile.
53e954ef92fcda140388c0ab71bd533f1218baf2 24-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: f7380b9aed -s ours
am: a4d1d6dbf4 -s ours

* commit 'a4d1d6dbf49b1d8308779f5ba861aa007ee1d73c':
Import translations. DO NOT MERGE
a4d1d6dbf49b1d8308779f5ba861aa007ee1d73c 24-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: f7380b9aed -s ours

* commit 'f7380b9aede3be39627e8fafdc578bb9a5d16348':
Import translations. DO NOT MERGE
24b10bebff4939daeabef78e906ee447212b0c5a 22-Feb-2016 Tony Mak <tonymak@google.com> Skip DISALLOW_OUTGOING_CALLS checking in managed profile.

In pre-N, DISALLOW_OUTGOING_CALLS is not checked in managed profile as
ACTION_CALL is always forwarded to personal side.

In N, ACTION_CALL is now handled in managed profile and hence
we do check DISALLOW_OUTGOING_CALLS. It does not align with the javadoc in
http://developer.android.com/intl/ja/reference/android/os/UserManager.html#DISALLOW_OUTGOING_CALLS.

After offline discussion, we decide to keep the pre-N behavior,
because user can always copy and paste the phone number from work side
to personal side anyway.

Bug: 27165111
Change-Id: Id696c0ce1f3bb3fff56addc8646e997a3dfb5a42
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
f7380b9aede3be39627e8fafdc578bb9a5d16348 24-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ieae5efc630c0d9503f802339cb3c7ab43234e829
Auto-generated-cl: translation import
es/values-ne-rNP/strings.xml
es/values-sk/strings.xml
es/values-zh-rCN/strings.xml
a8199b5364b02d7b798a1e5de00d8be313eac8b1 24-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia13d1d7af407aac25d3b80b7f2860c59c8d9a804
Auto-generated-cl: translation import
es/values-ne-rNP/strings.xml
es/values-sk/strings.xml
es/values-zh-rCN/strings.xml
c539cf2fc53d0f3033cbc083bcf9610d8ee0de87 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 0044d82fde am: b4b8bf90dc -s ours am: daaa056f33 am: 04b643394e am: aef3fca707 -s ours am: 4826b959b7 am: ab77750fb7 am: 344722dfb5 am: 192ea74d68 -s ours am: d127645da0
am: a9092ca4f6 -s ours

* commit 'a9092ca4f6207743b7d6e747e77c1b47a6862d42':
DO NOT MERGE - Restrict ability to add call based on device provision status
a9092ca4f6207743b7d6e747e77c1b47a6862d42 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 0044d82fde am: b4b8bf90dc -s ours am: daaa056f33 am: 04b643394e am: aef3fca707 -s ours am: 4826b959b7 am: ab77750fb7 am: 344722dfb5 am: 192ea74d68 -s ours
am: d127645da0

* commit 'd127645da01c4e7f443f1775d8a192e5f68d9bd7':
DO NOT MERGE - Restrict ability to add call based on device provision status
d127645da01c4e7f443f1775d8a192e5f68d9bd7 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 0044d82fde am: b4b8bf90dc -s ours am: daaa056f33 am: 04b643394e am: aef3fca707 -s ours am: 4826b959b7 am: ab77750fb7 am: 344722dfb5
am: 192ea74d68 -s ours

* commit '192ea74d6818b7081cf4750b3ed1232e034f932e':
DO NOT MERGE - Restrict ability to add call based on device provision status
5a002ca9c4906554102dfea650b57d530328a232 24-Feb-2016 Mohamed <abdalkader@google.com> UI polish/tweaks for blocked numbers UI.

- Update the strings as in the mocks
- Change the theme on the dialogue to match (mock)
- Change the hint text to "Phone number"
- Change the keyboard to the phone keyboard
- Upon user clicking "Add a number," put focus on the text field and have keyboard popped up

Bug: 26917087
Change-Id: I84320095050ddf808ae89c9800f94d1dc05089b5
es/values/strings.xml
es/values/styles.xml
es/xml/add_blocked_number_dialog.xml
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
192ea74d6818b7081cf4750b3ed1232e034f932e 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 0044d82fde am: b4b8bf90dc -s ours am: daaa056f33 am: 04b643394e am: aef3fca707 -s ours am: 4826b959b7 am: ab77750fb7
am: 344722dfb5

* commit '344722dfb5dca1ac034e151c82e440de0e8dfa57':
DO NOT MERGE - Restrict ability to add call based on device provision status
344722dfb5dca1ac034e151c82e440de0e8dfa57 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 0044d82fde am: b4b8bf90dc -s ours am: daaa056f33 am: 04b643394e am: aef3fca707 -s ours am: 4826b959b7
am: ab77750fb7

* commit 'ab77750fb78f3ba9a557ff1f497ecf072456290a':
DO NOT MERGE - Restrict ability to add call based on device provision status
ab77750fb78f3ba9a557ff1f497ecf072456290a 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 0044d82fde am: b4b8bf90dc -s ours am: daaa056f33 am: 04b643394e am: aef3fca707 -s ours
am: 4826b959b7

* commit '4826b959b7aeb508949a595d56b26c1ed8ad9ce4':
DO NOT MERGE - Restrict ability to add call based on device provision status
4826b959b7aeb508949a595d56b26c1ed8ad9ce4 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 0044d82fde am: b4b8bf90dc -s ours am: daaa056f33 am: 04b643394e
am: aef3fca707 -s ours

* commit 'aef3fca707ec0960b5039b69645351e070de8789':
DO NOT MERGE - Restrict ability to add call based on device provision status
c34d474f16c40a0a5595cefbe455e4fd34d535d8 24-Feb-2016 Brad Ebinger <breadley@google.com> Fix SecurityException in Tests

Update tests to register a PhoneAccount with the PhoneAccountRegistrar
before trying to add a new incoming/unknown call.

Bug: 27301311
Change-Id: Ib4214603d9aa892988b8adecc36ee747e2d0853c
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
aef3fca707ec0960b5039b69645351e070de8789 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 0044d82fde am: b4b8bf90dc -s ours am: daaa056f33
am: 04b643394e

* commit '04b643394eda9128aadd8fa1208533be3a06ae75':
DO NOT MERGE - Restrict ability to add call based on device provision status
04b643394eda9128aadd8fa1208533be3a06ae75 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 0044d82fde am: b4b8bf90dc -s ours
am: daaa056f33

* commit 'daaa056f33e312630a9843abf13ea2555e21edac':
DO NOT MERGE - Restrict ability to add call based on device provision status
daaa056f33e312630a9843abf13ea2555e21edac 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 0044d82fde
am: b4b8bf90dc -s ours

* commit 'b4b8bf90dc7cf5a1ea3330dae71463379e7bdce5':
DO NOT MERGE - Restrict ability to add call based on device provision status
b4b8bf90dc7cf5a1ea3330dae71463379e7bdce5 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status
am: 0044d82fde

* commit '0044d82fdec45fbc69fd1a47bcd1b5b0b0bb4461':
DO NOT MERGE - Restrict ability to add call based on device provision status
6c1ea9c7cd0215d31473fb0b3157327e12faaf65 24-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Listen for ConnectionEvent and use the InCallToneMonitor to play the tone" into nyc-dev am: 16fea3f6be
am: dad6a5d891

* commit 'dad6a5d8912aaba78893e05b5053d4f8e012ef04':
Listen for ConnectionEvent and use the InCallToneMonitor to play the tone
dad6a5d8912aaba78893e05b5053d4f8e012ef04 24-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Listen for ConnectionEvent and use the InCallToneMonitor to play the tone" into nyc-dev
am: 16fea3f6be

* commit '16fea3f6bedac2b4397f44553868c303fda59170':
Listen for ConnectionEvent and use the InCallToneMonitor to play the tone
16fea3f6bedac2b4397f44553868c303fda59170 24-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Listen for ConnectionEvent and use the InCallToneMonitor to play the tone" into nyc-dev
87826762df0568de1cfa8c29022d256359313c38 24-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "DO NOT MERGE - Restrict ability to add call based on device provision status" into lmp-mr1-dev am: b204dee494 am: bb2dbba478 am: b34b14a3f8 -s ours am: c5798bda68 am: ae8b18228d am: 3d3776741c am: 9105852571 -s ours am: 1dce142add
am: bbf5095aa0 -s ours

* commit 'bbf5095aa0c1050e81dd76d8a2a1c8695bfea3dc':
DO NOT MERGE - Restrict ability to add call based on device provision status
1727e6bbe35defb4766f4ca41e473d165adfaac7 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 7180580725 am: a7747ae1dc am: 92d7345457 am: dff32f2ec0 -s ours am: 9052bb2e24
am: 50cfcfa92a -s ours

* commit '50cfcfa92aad51219d89462ca54613aea14c9b2c':
DO NOT MERGE - Restrict ability to add call based on device provision status
bbf5095aa0c1050e81dd76d8a2a1c8695bfea3dc 24-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "DO NOT MERGE - Restrict ability to add call based on device provision status" into lmp-mr1-dev am: b204dee494 am: bb2dbba478 am: b34b14a3f8 -s ours am: c5798bda68 am: ae8b18228d am: 3d3776741c am: 9105852571 -s ours
am: 1dce142add

* commit '1dce142addb0f794afc9cc42302bac95ac98cf09':
DO NOT MERGE - Restrict ability to add call based on device provision status
cb0ae974539ad3705cd76f4f004a401484b51514 24-Feb-2016 Hall Liu <hallliu@google.com> Merge "Unhold other call after local disconnect of active call" into nyc-dev am: c38393d6fc
am: 9b412494c4

* commit '9b412494c42e874019daa7e502865d84502fd2f3':
Unhold other call after local disconnect of active call
50cfcfa92aad51219d89462ca54613aea14c9b2c 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 7180580725 am: a7747ae1dc am: 92d7345457 am: dff32f2ec0 -s ours
am: 9052bb2e24

* commit '9052bb2e24b3bf1c794ec79f78716284f7763a13':
DO NOT MERGE - Restrict ability to add call based on device provision status
1dce142addb0f794afc9cc42302bac95ac98cf09 24-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "DO NOT MERGE - Restrict ability to add call based on device provision status" into lmp-mr1-dev am: b204dee494 am: bb2dbba478 am: b34b14a3f8 -s ours am: c5798bda68 am: ae8b18228d am: 3d3776741c
am: 9105852571 -s ours

* commit '91058525712022fed9a9387b2867681eb1e04ea0':
DO NOT MERGE - Restrict ability to add call based on device provision status
9052bb2e24b3bf1c794ec79f78716284f7763a13 24-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 7180580725 am: a7747ae1dc am: 92d7345457
am: dff32f2ec0 -s ours

* commit 'dff32f2ec0d74432ecd61ec4e5f2cf5f1c24cb7b':
DO NOT MERGE - Restrict ability to add call based on device provision status
91058525712022fed9a9387b2867681eb1e04ea0 24-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "DO NOT MERGE - Restrict ability to add call based on device provision status" into lmp-mr1-dev am: b204dee494 am: bb2dbba478 am: b34b14a3f8 -s ours am: c5798bda68 am: ae8b18228d
am: 3d3776741c

* commit '3d3776741c9ebf7996eb2916107816983ab53e35':
DO NOT MERGE - Restrict ability to add call based on device provision status
9b412494c42e874019daa7e502865d84502fd2f3 24-Feb-2016 Hall Liu <hallliu@google.com> Merge "Unhold other call after local disconnect of active call" into nyc-dev
am: c38393d6fc

* commit 'c38393d6fcaaa3591557e4a1ea3e2583d0027dfd':
Unhold other call after local disconnect of active call
51c2fbfdf624d762a7ed4bc67f09d8363f5d1a04 24-Feb-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 27293916
Change-Id: I90525602f533f9c2e6f7a8d89e860280b8646e1e
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
3d3776741c9ebf7996eb2916107816983ab53e35 24-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "DO NOT MERGE - Restrict ability to add call based on device provision status" into lmp-mr1-dev am: b204dee494 am: bb2dbba478 am: b34b14a3f8 -s ours am: c5798bda68
am: ae8b18228d

* commit 'ae8b18228dea2765fe35c350a6b4bb15b4edcc8d':
DO NOT MERGE - Restrict ability to add call based on device provision status
ae8b18228dea2765fe35c350a6b4bb15b4edcc8d 24-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "DO NOT MERGE - Restrict ability to add call based on device provision status" into lmp-mr1-dev am: b204dee494 am: bb2dbba478 am: b34b14a3f8 -s ours
am: c5798bda68

* commit 'c5798bda686b5273ce83ef024dc15d07419162e3':
DO NOT MERGE - Restrict ability to add call based on device provision status
0044d82fdec45fbc69fd1a47bcd1b5b0b0bb4461 27-Jan-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status

Always return false for canAddCall if device is not yet provisioned.

Bug: 26303187
Change-Id: I9c4ebc8b954a79562b2ec83d59314a3fb621ddfb
rc/com/android/server/telecom/CallsManager.java
dff32f2ec0d74432ecd61ec4e5f2cf5f1c24cb7b 23-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 7180580725 am: a7747ae1dc
am: 92d7345457

* commit '92d7345457b8d82f9a07144e0192215649cb3564':
DO NOT MERGE - Restrict ability to add call based on device provision status
c5798bda686b5273ce83ef024dc15d07419162e3 23-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "DO NOT MERGE - Restrict ability to add call based on device provision status" into lmp-mr1-dev am: b204dee494 am: bb2dbba478
am: b34b14a3f8 -s ours

* commit 'b34b14a3f8ddd8ec9076407f71594892a3dac976':
DO NOT MERGE - Restrict ability to add call based on device provision status
92d7345457b8d82f9a07144e0192215649cb3564 23-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status am: 7180580725
am: a7747ae1dc

* commit 'a7747ae1dc675a080688e64359f5f1c77c289654':
DO NOT MERGE - Restrict ability to add call based on device provision status
b34b14a3f8ddd8ec9076407f71594892a3dac976 23-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "DO NOT MERGE - Restrict ability to add call based on device provision status" into lmp-mr1-dev am: b204dee494
am: bb2dbba478

* commit 'bb2dbba47890fcf02978bc88ed4d3e99552e04be':
DO NOT MERGE - Restrict ability to add call based on device provision status
c38393d6fcaaa3591557e4a1ea3e2583d0027dfd 23-Feb-2016 Hall Liu <hallliu@google.com> Merge "Unhold other call after local disconnect of active call" into nyc-dev
a7747ae1dc675a080688e64359f5f1c77c289654 23-Feb-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status
am: 7180580725

* commit '7180580725144750b5a635f9e53cf5833d7464df':
DO NOT MERGE - Restrict ability to add call based on device provision status
bb2dbba47890fcf02978bc88ed4d3e99552e04be 23-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "DO NOT MERGE - Restrict ability to add call based on device provision status" into lmp-mr1-dev
am: b204dee494

* commit 'b204dee494ff6c62c24fac12a0ec511d6f01f333':
DO NOT MERGE - Restrict ability to add call based on device provision status
b204dee494ff6c62c24fac12a0ec511d6f01f333 23-Feb-2016 Santos Cordon <santoscordon@google.com> Merge "DO NOT MERGE - Restrict ability to add call based on device provision status" into lmp-mr1-dev
c841da988386e4d5231de359aecad873c841e005 23-Feb-2016 Tony Mak <tonymak@google.com> Should check against calling user instead of current user am: 5851fa014a
am: f16358eaa5

* commit 'f16358eaa584fd935fc7b362ce7b5dda15f4af16':
Should check against calling user instead of current user
f16358eaa584fd935fc7b362ce7b5dda15f4af16 23-Feb-2016 Tony Mak <tonymak@google.com> Should check against calling user instead of current user
am: 5851fa014a

* commit '5851fa014a0c6a245f8da96083674622bfce0d9c':
Should check against calling user instead of current user
5851fa014a0c6a245f8da96083674622bfce0d9c 23-Feb-2016 Tony Mak <tonymak@google.com> Should check against calling user instead of current user

The bug is introduced in ag/862293.
We should check calling user instead of current user to support work
profile.

BUG: 27313818
Change-Id: I248ed87a71363d9b624013e938391c4fd79977fa
rc/com/android/server/telecom/TelecomServiceImpl.java
2a3455b9ff2a308722b8f0ee21c64a62a06e9bda 23-Feb-2016 Hall Liu <hallliu@google.com> Unhold other call after local disconnect of active call

Bug: 26646508
Change-Id: Ic78c54f0aba935c4d42ce952bfb34d7333ca0c4c
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
7180580725144750b5a635f9e53cf5833d7464df 27-Jan-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status

Always return false for canAddCall if device is not yet provisioned.

Bug: 26303187
Change-Id: I9c4ebc8b954a79562b2ec83d59314a3fb621ddfb
rc/com/android/server/telecom/CallsManager.java
e686427e910406f3f87875dd9aba296385563977 27-Jan-2016 Hall Liu <hallliu@google.com> DO NOT MERGE - Restrict ability to add call based on device provision status

Always return false for canAddCall if device is not yet provisioned.

Bug: 26303187
Change-Id: I9c4ebc8b954a79562b2ec83d59314a3fb621ddfb
rc/com/android/server/telecom/CallsManager.java
dbca0b6bd65cc5112a35efec3112c2bb24df05ff 22-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 8e13157767 -s ours
am: ef8edac544 -s ours

* commit 'ef8edac544f44caad3e6e113bdae0a038e31278f':
Import translations. DO NOT MERGE
ef8edac544f44caad3e6e113bdae0a038e31278f 22-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 8e13157767 -s ours

* commit '8e13157767dafcc5adcb5b785c64900aa7ae2248':
Import translations. DO NOT MERGE
8e13157767dafcc5adcb5b785c64900aa7ae2248 22-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ica12954ed948c9a161650ac69b9f3500ea66b18a
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
893fb1e7b0ca466e03bbd9e4b90c5709e68065cd 22-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I9380b560732e7378f6bd0727acc0bbbf8ac4a777
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
0f6059c91261f7ae8452d4bb8d1fa2919968896c 20-Feb-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of f7622446f1 to lmp-mr1-dev am: 75d30fab5c am: ecd22f1974 am: d993e3586d -s ours am: 942f038366 am: 9444718221 am: 95cae1ccbc am: 3cd83508c8 am: 0167260d17
am: 287333adae

* commit '287333adae75bb7c339de8f11b2012c1e6447994':
DO NOT MERGE addNewIncomingCall now checks PAH
287333adae75bb7c339de8f11b2012c1e6447994 20-Feb-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of f7622446f1 to lmp-mr1-dev am: 75d30fab5c am: ecd22f1974 am: d993e3586d -s ours am: 942f038366 am: 9444718221 am: 95cae1ccbc am: 3cd83508c8
am: 0167260d17

* commit '0167260d17b01f4d57e74b2bc0920281796a076d':
DO NOT MERGE addNewIncomingCall now checks PAH
0167260d17b01f4d57e74b2bc0920281796a076d 20-Feb-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of f7622446f1 to lmp-mr1-dev am: 75d30fab5c am: ecd22f1974 am: d993e3586d -s ours am: 942f038366 am: 9444718221 am: 95cae1ccbc
am: 3cd83508c8

* commit '3cd83508c891730a8703e25ac50ac1c63b9f42b9':
DO NOT MERGE addNewIncomingCall now checks PAH
3cd83508c891730a8703e25ac50ac1c63b9f42b9 20-Feb-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of f7622446f1 to lmp-mr1-dev am: 75d30fab5c am: ecd22f1974 am: d993e3586d -s ours am: 942f038366 am: 9444718221
am: 95cae1ccbc

* commit '95cae1ccbc784d8b29b9d7af2be38bcc852de396':
DO NOT MERGE addNewIncomingCall now checks PAH
95cae1ccbc784d8b29b9d7af2be38bcc852de396 20-Feb-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of f7622446f1 to lmp-mr1-dev am: 75d30fab5c am: ecd22f1974 am: d993e3586d -s ours am: 942f038366
am: 9444718221

* commit '944471822140345bb1726320c12b1bca5354cfb2':
DO NOT MERGE addNewIncomingCall now checks PAH
944471822140345bb1726320c12b1bca5354cfb2 20-Feb-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of f7622446f1 to lmp-mr1-dev am: 75d30fab5c am: ecd22f1974 am: d993e3586d -s ours
am: 942f038366

* commit '942f0383660b006b8649be61576403088675bdb2':
DO NOT MERGE addNewIncomingCall now checks PAH
942f0383660b006b8649be61576403088675bdb2 20-Feb-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of f7622446f1 to lmp-mr1-dev am: 75d30fab5c am: ecd22f1974
am: d993e3586d -s ours

* commit 'd993e3586dc60588a599b43b78f471e16ba7db17':
DO NOT MERGE addNewIncomingCall now checks PAH
d993e3586dc60588a599b43b78f471e16ba7db17 20-Feb-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of f7622446f1 to lmp-mr1-dev am: 75d30fab5c
am: ecd22f1974

* commit 'ecd22f1974f19c98b8430340b866e537fa657605':
DO NOT MERGE addNewIncomingCall now checks PAH
ecd22f1974f19c98b8430340b866e537fa657605 19-Feb-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of f7622446f1 to lmp-mr1-dev
am: 75d30fab5c

* commit '75d30fab5c13fea88e204a9a743b2dd427fd41b3':
DO NOT MERGE addNewIncomingCall now checks PAH
75d30fab5c13fea88e204a9a743b2dd427fd41b3 19-Feb-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of f7622446f1 to lmp-mr1-dev

Change-Id: I281b45b18262c32394ae75a9e17a6eaea25fe627
f7622446f1be3059e5de99d1416babcb122204af 19-Feb-2016 Brad Ebinger <breadley@google.com> resolve merge conflicts of 453749fa2a to lmp-sprout-dev

Change-Id: I1f768e539f0c425befdeef44f70f59c94654b248
2a2f36ae0eaaeb0fd2a73bc8bde07515768a8248 19-Feb-2016 Brad Ebinger <breadley@google.com> DO NOT MERGE Check PAH in addNewIncomingCall am: 403f52fa0d am: 70b80ee8ee am: 388c674e15 am: 00f75f1eb5 -s ours am: 4aa0f93efb
am: 87bbea4655 -s ours

* commit '87bbea4655ad6b7b1a496f8152b1bddc8fed815a':
DO NOT MERGE Check PAH in addNewIncomingCall
87bbea4655ad6b7b1a496f8152b1bddc8fed815a 19-Feb-2016 Brad Ebinger <breadley@google.com> DO NOT MERGE Check PAH in addNewIncomingCall am: 403f52fa0d am: 70b80ee8ee am: 388c674e15 am: 00f75f1eb5 -s ours
am: 4aa0f93efb

* commit '4aa0f93efb88cf43a74296f715743932849dfb32':
DO NOT MERGE Check PAH in addNewIncomingCall
4aa0f93efb88cf43a74296f715743932849dfb32 19-Feb-2016 Brad Ebinger <breadley@google.com> DO NOT MERGE Check PAH in addNewIncomingCall am: 403f52fa0d am: 70b80ee8ee am: 388c674e15
am: 00f75f1eb5 -s ours

* commit '00f75f1eb515871f198a20881b6c6ef282ceec92':
DO NOT MERGE Check PAH in addNewIncomingCall
6590d46c4a4083e9291f55029b6c728fbe7be9f8 19-Feb-2016 Brad Ebinger <breadley@google.com> Merge "Any ConnectionService can now not create a new incoming call" into nyc-dev am: 9d88e14aad
am: 448874e242

* commit '448874e2424342e28b3cf0be6d52541f7fa1dac0':
Any ConnectionService can now not create a new incoming call
00f75f1eb515871f198a20881b6c6ef282ceec92 19-Feb-2016 Brad Ebinger <breadley@google.com> DO NOT MERGE Check PAH in addNewIncomingCall am: 403f52fa0d am: 70b80ee8ee
am: 388c674e15

* commit '388c674e15131e23d89e0ef15c4e9638add08747':
DO NOT MERGE Check PAH in addNewIncomingCall
448874e2424342e28b3cf0be6d52541f7fa1dac0 19-Feb-2016 Brad Ebinger <breadley@google.com> Merge "Any ConnectionService can now not create a new incoming call" into nyc-dev
am: 9d88e14aad

* commit '9d88e14aad7a0b0ace83f8159bd06141c95e2195':
Any ConnectionService can now not create a new incoming call
388c674e15131e23d89e0ef15c4e9638add08747 19-Feb-2016 Brad Ebinger <breadley@google.com> DO NOT MERGE Check PAH in addNewIncomingCall am: 403f52fa0d
am: 70b80ee8ee

* commit '70b80ee8eed91d74397b2e2a6bc232e43b879a70':
DO NOT MERGE Check PAH in addNewIncomingCall
70b80ee8eed91d74397b2e2a6bc232e43b879a70 19-Feb-2016 Brad Ebinger <breadley@google.com> DO NOT MERGE Check PAH in addNewIncomingCall
am: 403f52fa0d

* commit '403f52fa0d22ba6ad77f7e884a65ac778ea3947e':
DO NOT MERGE Check PAH in addNewIncomingCall
9d88e14aad7a0b0ace83f8159bd06141c95e2195 19-Feb-2016 Brad Ebinger <breadley@google.com> Merge "Any ConnectionService can now not create a new incoming call" into nyc-dev
9a2bb4aab2e2582623728c9312f8bb00807c9223 19-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "DO NOT MERGE Fix for no response when send USSD during airplane mode." into nyc-dev am: 1e98a6704a
am: 9080f8afcf -s ours

* commit '9080f8afcfc43e534b0f305a5949615393af0cdf':
DO NOT MERGE Fix for no response when send USSD during airplane mode.
9080f8afcfc43e534b0f305a5949615393af0cdf 19-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "DO NOT MERGE Fix for no response when send USSD during airplane mode." into nyc-dev
am: 1e98a6704a

* commit '1e98a6704ad3c6aca4b17ad7d247a5f92deb6b1c':
DO NOT MERGE Fix for no response when send USSD during airplane mode.
1e98a6704ad3c6aca4b17ad7d247a5f92deb6b1c 19-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "DO NOT MERGE Fix for no response when send USSD during airplane mode." into nyc-dev
d7f6741cbafa68b08e7c0e84145de4b56dec98c9 19-Feb-2016 Tyler Gunn <tgunn@google.com> resolve merge conflicts of ee479fe69d to nyc-dev-plus-aosp
am: f88f0aebc3

* commit 'f88f0aebc37b9588d76b4f03c21cd4c7fdcbf5a3':
Fix for no response when send USSD during airplane mode.
c0e8e9d48ea04f406a6f586dacc407f5ba0c31a4 06-Mar-2015 Xueren Zhang <xueren.x.zhang@sonymobile.com> DO NOT MERGE Fix for no response when send USSD during airplane mode.

When Airplane mode is on and call is placed, create
connection will fail. "To place a call, first
turn off Airplane mode" will be shown by InCallUI.
However, when it's a USSD number, the call won't
be added to InCallService. InCallUI won't track
this kind of call. So when creating connection
fails, InCallUI won't be notified, and won't pop
the error dialog up.

Change-Id: I8be7e709fd88f3bc9262077262ffd27f4f1a7a75
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/components/ErrorDialogActivity.java
f88f0aebc37b9588d76b4f03c21cd4c7fdcbf5a3 19-Feb-2016 Tyler Gunn <tgunn@google.com> resolve merge conflicts of ee479fe69d to nyc-dev-plus-aosp

Change-Id: I59bfca8f027d465f742762ad7119eb974e70abfd
4a38063cc6fe47c4184a5759c6ccc3ded406de57 18-Feb-2016 Brad Ebinger <breadley@google.com> Merge "Change GC method in LogTest" into nyc-dev am: 257e27bd6f
am: 64f639321a

* commit '64f639321ab4fdbc219bdd2110b3965423c23368':
Change GC method in LogTest
64f639321ab4fdbc219bdd2110b3965423c23368 18-Feb-2016 Brad Ebinger <breadley@google.com> Merge "Change GC method in LogTest" into nyc-dev
am: 257e27bd6f

* commit '257e27bd6fb695a6230bc0e690f43e65043d5fc5':
Change GC method in LogTest
257e27bd6fb695a6230bc0e690f43e65043d5fc5 18-Feb-2016 Brad Ebinger <breadley@google.com> Merge "Change GC method in LogTest" into nyc-dev
ee479fe69d74f4cd5ce0c8cb31e10da1bd203b02 18-Feb-2016 Xueren Zhang <xueren.x.zhang@sonymobile.com> Fix for no response when send USSD during airplane mode.
am: 06c198cdfb

* commit '06c198cdfba8f3d1474025f920af33f0c601d1a2':
Fix for no response when send USSD during airplane mode.
06c198cdfba8f3d1474025f920af33f0c601d1a2 06-Mar-2015 Xueren Zhang <xueren.x.zhang@sonymobile.com> Fix for no response when send USSD during airplane mode.

When Airplane mode is on and call is placed, create
connection will fail. "To place a call, first
turn off Airplane mode" will be shown by InCallUI.
However, when it's a USSD number, the call won't
be added to InCallService. InCallUI won't track
this kind of call. So when creating connection
fails, InCallUI won't be notified, and won't pop
the error dialog up.

Change-Id: I8be7e709fd88f3bc9262077262ffd27f4f1a7a75
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/components/ErrorDialogActivity.java
54ef1a4fd7a283dfdc1f2851dde12b8597a830e4 18-Feb-2016 Brad Ebinger <breadley@google.com> Change GC method in LogTest

A recent change in the System.gc() method made the GC test in LogTest
fail because Sessions were not being cleaned up correctly. The internal
Runtime.getRuntime().gc() method is now used to ensure the trigger of GC
for the purposes of the test.

Bug: 27230915
Change-Id: I2ff23c82343ebd65412c8a7e97a9866d2ee67a82
ests/src/com/android/server/telecom/tests/LogTest.java
b88059c5653df18a3c6a0ae7a107e0fbb62ce2d3 18-Feb-2016 Hall Liu <hallliu@google.com> Merge "Update telecom testing script to use Jacoco" into nyc-dev am: e964abdce6
am: e1336be685

* commit 'e1336be685002772998fa8bf12a1bdff9bfcb2c4':
Update telecom testing script to use Jacoco
e1336be685002772998fa8bf12a1bdff9bfcb2c4 18-Feb-2016 Hall Liu <hallliu@google.com> Merge "Update telecom testing script to use Jacoco" into nyc-dev
am: e964abdce6

* commit 'e964abdce6e24b6f794c2ccc84972390be776f23':
Update telecom testing script to use Jacoco
e964abdce6e24b6f794c2ccc84972390be776f23 18-Feb-2016 Hall Liu <hallliu@google.com> Merge "Update telecom testing script to use Jacoco" into nyc-dev
f9e03d4725007d4673432162a87baa903629dd6b 18-Feb-2016 Tony Mak <tonymak@google.com> Merge "Show toast to warn user when the call is treated as personal call" into nyc-dev am: 78c8018bdc
am: a8e1e3008d

* commit 'a8e1e3008db323f33a62c7099efcb36221d77927':
Show toast to warn user when the call is treated as personal call
a8e1e3008db323f33a62c7099efcb36221d77927 18-Feb-2016 Tony Mak <tonymak@google.com> Merge "Show toast to warn user when the call is treated as personal call" into nyc-dev
am: 78c8018bdc

* commit '78c8018bdc3b5de56ae6925df4b1051dedbed79f':
Show toast to warn user when the call is treated as personal call
78c8018bdc3b5de56ae6925df4b1051dedbed79f 18-Feb-2016 Tony Mak <tonymak@google.com> Merge "Show toast to warn user when the call is treated as personal call" into nyc-dev
298bc1230e68b0a53ce922f6a8e621c615f97573 18-Feb-2016 Sebastien Hertz <shertz@google.com> Merge "Re-enable Jack for tests" into nyc-dev am: 9d05b0630f
am: 7686e40c3d

* commit '7686e40c3d5da40aaae82e0721590e9f071e41a0':
Re-enable Jack for tests
7686e40c3d5da40aaae82e0721590e9f071e41a0 18-Feb-2016 Sebastien Hertz <shertz@google.com> Merge "Re-enable Jack for tests" into nyc-dev
am: 9d05b0630f

* commit '9d05b0630f9705a201629c022b8f3deea644489e':
Re-enable Jack for tests
9d05b0630f9705a201629c022b8f3deea644489e 18-Feb-2016 Sebastien Hertz <shertz@google.com> Merge "Re-enable Jack for tests" into nyc-dev
ccd7841d7318c8bccd2de766cfdfa32ecb92bb99 18-Feb-2016 Hall Liu <hallliu@google.com> Update telecom testing script to use Jacoco

Bug: 27216235
Change-Id: Ib32a82fe922ca9ce9a2f3452c2276c31021cbdfa
cripts/telecom_testing.sh
712d3087607a358fdff2ece48866dc7e9881696b 18-Feb-2016 Hall Liu <hallliu@google.com> Merge "Stub out getInitiatingUser for mCall" into nyc-dev am: 8410de6a54
am: b1ba0b2bd3

* commit 'b1ba0b2bd3ee5210ed501464b2ecc804e1c7a499':
Stub out getInitiatingUser for mCall
b1ba0b2bd3ee5210ed501464b2ecc804e1c7a499 18-Feb-2016 Hall Liu <hallliu@google.com> Merge "Stub out getInitiatingUser for mCall" into nyc-dev
am: 8410de6a54

* commit '8410de6a5416acd174575e116fb5fe3d343c3f0d':
Stub out getInitiatingUser for mCall
8410de6a5416acd174575e116fb5fe3d343c3f0d 18-Feb-2016 Hall Liu <hallliu@google.com> Merge "Stub out getInitiatingUser for mCall" into nyc-dev
508b280a3e2090fcc49fe5953047d4122ce9ecbe 18-Feb-2016 Hall Liu <hallliu@google.com> Stub out getInitiatingUser for mCall

Bug: 27229587
Change-Id: Ie40c693d996b9bc76607226b62ae03b7827905b5
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
3cea310426df94df79a3d114d84b4e4a4e978d77 18-Feb-2016 Shishir Agrawal <shishir@google.com> resolve merge conflicts of a416e07f85 to nyc-dev am: af304dc4c7
am: 09818fe277

* commit '09818fe277f1ecf1cf5418a6413820bb3f94e989':
Migrate allow_emergency_numbers_in_call_log to CarrierConfig.
09818fe277f1ecf1cf5418a6413820bb3f94e989 18-Feb-2016 Shishir Agrawal <shishir@google.com> resolve merge conflicts of a416e07f85 to nyc-dev
am: af304dc4c7

* commit 'af304dc4c7c07b6cbc2a75dd66f27b5a0292a644':
Migrate allow_emergency_numbers_in_call_log to CarrierConfig.
af304dc4c7c07b6cbc2a75dd66f27b5a0292a644 18-Feb-2016 Shishir Agrawal <shishir@google.com> resolve merge conflicts of a416e07f85 to nyc-dev

Change-Id: Ie436f259698d0e65eb88ba8010d361fd4c376053
8ff99f3751fcdd662932317ca45f886f6883e196 13-Feb-2016 Santos Cordon <santoscordon@google.com> Add call should always be present in CDMA calls.

This is reverting Change I2e4b396f5665b5517275766daa722866cf92d68c

Initially, the idea was that CDMA could not place additional calls while
a conference was happening. This is not always the case. CDMA
conferences exist in two states: merged and unmerged. Also, a call can
disconnect from the conference and the conference will continue as a 1:1
call.

In the case where the conference is "merged" or a party has
disconnected, the "add-call" option will function fine. This is why we
are adding the add-call back.

Bug: 22850789

Change-Id: Ib6bafed528cb84d46b46b11313db902d9aba4292
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
a416e07f853958eb78cd4574c7236f0b76c68040 17-Feb-2016 Shishir Agrawal <shishir@google.com> Migrate allow_emergency_numbers_in_call_log to CarrierConfig.

Needs to use the CarrierConfig variable rather than the overlay.

Bug: 26084877
Change-Id: I4b56bd875a1c89c377ee21a74295d1c39bbc6e1c
rc/com/android/server/telecom/CallLogManager.java
d7aaa1c2c71dd08422fd13fe2e2be183a7dd8b0d 17-Feb-2016 Tony Mak <tonymak@google.com> Show toast to warn user when the call is treated as personal call

BUG:26579183
Change-Id: Ic6b681335f1868a9ce95b0cfa61e5471be048a14
es/values/strings.xml
rc/com/android/server/telecom/CallIntentProcessor.java
da9184dd21e41016b6902dd1f30954593e259b76 17-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: b61df75bab -s ours
am: ca1d4c5449 -s ours

* commit 'ca1d4c54490530fb08aad24a8af2f61844aac878':
Import translations. DO NOT MERGE
ca1d4c54490530fb08aad24a8af2f61844aac878 17-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: b61df75bab -s ours

* commit 'b61df75bab6b67c132b44e6fafc69e5ccdb13ad6':
Import translations. DO NOT MERGE
f27f710c1beac51bc9220960c5fe1900c474d23c 17-Feb-2016 Sebastien Hertz <shertz@google.com> Re-enable Jack for tests

Bug: 27216235
Change-Id: I055ce64d699d5a2a1d8e094e6d5130491292b219
ests/Android.mk
b61df75bab6b67c132b44e6fafc69e5ccdb13ad6 17-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia051d760d8134843d959b2ac9b0127058c066a98
Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-ne-rNP/strings.xml
es/values-ta-rIN/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rCN/strings.xml
926a23c6290a525310be81ea0a35c8bf84474f5b 17-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I8212ace672d23c64d7d5e1d95932563ddf9be604
Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-ne-rNP/strings.xml
es/values-ta-rIN/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rCN/strings.xml
453749fa2a7c462666d54d1aa10a2a58b7834378 12-Feb-2016 Brad Ebinger <breadley@google.com> DO NOT MERGE addNewIncomingCall now checks PAH

TelecomManager.addNewIncomingCall now verifies the PhoneAccountHandle
belongs to a registered PhoneAccount before adding the incoming call.
Otherwise, it throws a SecurityException.

Bug: 26864502
Change-Id: Ib40713f122a1ec256eaeeda958d9ec28f2b3b795
rc/com/android/server/telecom/TelecomServiceImpl.java
db82191d1ef7dd4155478071815a56947b31fc11 16-Feb-2016 Tyler Gunn <tgunn@google.com> Listen for ConnectionEvent and use the InCallToneMonitor to play the tone

BUG=25357778

Change-Id: Iad4f36f9b01670a2f188e726895a8349aeeb1502
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/Log.java
4b483ad06f7e1fe702a222a43823df25f92e14b9 15-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: ac7542b515 -s ours
am: 7eb2b090e2 -s ours

* commit '7eb2b090e287df55137619f391a14fc95f0cf7be':
Import translations. DO NOT MERGE
7eb2b090e287df55137619f391a14fc95f0cf7be 15-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: ac7542b515 -s ours

* commit 'ac7542b5152e1a2aeda833e4bc6de007b6bee955':
Import translations. DO NOT MERGE
ac7542b5152e1a2aeda833e4bc6de007b6bee955 15-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I0e7aaceba80dde0a05d60eeedc1bcfd022ded571
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
cb96a0320accc59e64c9b41f2af5d5c11fafc2f5 15-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ic3091a676361989ba1037d46cbfe4365118eed0c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
403f52fa0d22ba6ad77f7e884a65ac778ea3947e 13-Feb-2016 Brad Ebinger <breadley@google.com> DO NOT MERGE Check PAH in addNewIncomingCall

Check to be sure that the PhoneAccountHandle in addNewIncomingCall
corresponds to an existing registered PhoneAccount in Telecom and that
the PhoneAccount is enabled. Otherwise, throw a SecurityException.

Bug: 26864502
Change-Id: I6bbd8a1ece821b62bee2c94decde87a41afbf8b0
rc/com/android/server/telecom/TelecomServiceImpl.java
a35090657297f5f0f20c2bb31cdf1eb7d6da6419 12-Feb-2016 Santos Cordon <santoscordon@google.com> More test annotations.

Change-Id: I00c6c3853b675920f10439599d7ccab1bcde5f46
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
8efe9ed0348da0eeec6c25c3fb9d04106c46960c 12-Feb-2016 Hall Liu <hallliu@google.com> Merge "DO NOT MERGE Perform disk operations in background thread" into cw-e-dev am: ead5ace8cb am: 4770478724 -s ours
am: 9462f5ee0e -s ours

* commit '9462f5ee0eb8a82558e71d25ea7d003421004035':
DO NOT MERGE Perform disk operations in background thread
9462f5ee0eb8a82558e71d25ea7d003421004035 12-Feb-2016 Hall Liu <hallliu@google.com> Merge "DO NOT MERGE Perform disk operations in background thread" into cw-e-dev am: ead5ace8cb
am: 4770478724 -s ours

* commit '47704787245808963ec401c318057d9b99b75c6b':
DO NOT MERGE Perform disk operations in background thread
6fb5b8ff2ad221960981bd94d2060fa754d5a464 12-Feb-2016 Abhijith Shastry <ashastry@google.com> Fix primary user check to display blocked numbers.
am: 698aa946ef

* commit '698aa946ef8990ad5e043b43d6c8c92467e32bf8':
Fix primary user check to display blocked numbers.
698aa946ef8990ad5e043b43d6c8c92467e32bf8 12-Feb-2016 Abhijith Shastry <ashastry@google.com> Fix primary user check to display blocked numbers.

BUG: 26917087
Change-Id: I7008722134eccbe1b6088bf424a73c36f72b1af7
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
62da8e1505f887838dcd4895ebdb23a40b409515 29-Jan-2016 Brad Ebinger <breadley@google.com> Any ConnectionService can now not create a new incoming call

Previously, the PhoneAccountHandle was not checked in
TelecomServiceImpl.addNewIncomingCall, which meant that any unregistered
ConnectionService can add incoming calls to Telecom. A check has been
added that throws a SecurityException if a PhoneAccountHandle is passed
in that is not both Registered and Enabled.

Bug: 26864502
Change-Id: I6f05841423aa1d8e0d3595246f59115286aabfac
rc/com/android/server/telecom/TelecomServiceImpl.java
47704787245808963ec401c318057d9b99b75c6b 11-Feb-2016 Hall Liu <hallliu@google.com> Merge "DO NOT MERGE Perform disk operations in background thread" into cw-e-dev
am: ead5ace8cb

* commit 'ead5ace8cb839ec0bb48f059212768c7199dba74':
DO NOT MERGE Perform disk operations in background thread
ead5ace8cb839ec0bb48f059212768c7199dba74 11-Feb-2016 Hall Liu <hallliu@google.com> Merge "DO NOT MERGE Perform disk operations in background thread" into cw-e-dev
edc4e3ae399345b8cea1d8fd1967b883d893ddbb 10-Feb-2016 Mohamed <abdalkader@google.com> Add UI to manage blocked numbers.
am: c926185584

* commit 'c926185584d458323465431c296c51fe52f87945':
Add UI to manage blocked numbers.
c926185584d458323465431c296c51fe52f87945 05-Feb-2016 Mohamed <abdalkader@google.com> Add UI to manage blocked numbers.

TESTING/Functionality=
- Adding empty not allowed.
- Rotation: dialogs/general UI.
- Adding same number ignored.
- Non-primary users not allowed to manage blocked numbers.
- Material ripple for delete button.
- Action bar back button exit activity.
- Prevent EditText from stealing focus so talk-back starts
from the beginning.
- Talk back allow user to read row by row in list view.

There are two things left that I will do in a follow-up:
- Alert Dialog Theme.
- Add some validation for the user input

Screenshots: https://drive.google.com/a/google.com/folderview?id=0ByV4lfyID02GTGV1QWRTOGlKWTQ&usp=sharing
Bug: 26917087
Change-Id: If390d863f40162e12b0bd5d06b8bfccaa7fad5b2
ndroidManifest.xml
es/drawable-hdpi/ic_close_grey_24dp.png
es/drawable-mdpi/ic_close_grey_24dp.png
es/drawable-xhdpi/ic_close_grey_24dp.png
es/drawable-xxhdpi/ic_close_grey_24dp.png
es/drawable-xxxhdpi/ic_close_grey_24dp.png
es/values/dimens.xml
es/values/strings.xml
es/values/styles.xml
es/xml/activity_blocked_numbers.xml
es/xml/add_blocked_number_dialog.xml
es/xml/layout_blocked_number.xml
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/settings/BlockedNumbersActivity.java
rc/com/android/server/telecom/settings/BlockedNumbersAdapter.java
2fd6523b3676c90dce10711fad5ff5e455452ce6 10-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Add Read, and Write blocked numbers permissions to Telecom." into nyc-dev
am: bd15969ada

* commit 'bd15969ada78c2223ffc2184f96ffee95aa086db':
Add Read, and Write blocked numbers permissions to Telecom.
bd15969ada78c2223ffc2184f96ffee95aa086db 10-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Add Read, and Write blocked numbers permissions to Telecom." into nyc-dev
a05443ca0258788d0a13c345f28a7e285e56c182 10-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Remove code which prevents making a video call when one is in progress." into mm-wireless-dev am: f21d66d3d8
am: c8f5b88b54

* commit 'c8f5b88b5471058dff066c2b999d50091af0a2d8':
Remove code which prevents making a video call when one is in progress.
c8f5b88b5471058dff066c2b999d50091af0a2d8 09-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Remove code which prevents making a video call when one is in progress." into mm-wireless-dev
am: f21d66d3d8

* commit 'f21d66d3d8d57440e0e3110a581f04f8ba3d7f4e':
Remove code which prevents making a video call when one is in progress.
f21d66d3d8d57440e0e3110a581f04f8ba3d7f4e 09-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Remove code which prevents making a video call when one is in progress." into mm-wireless-dev
cdfad1fa3dfcf1204ac06a807d377402702b76aa 09-Feb-2016 Tyler Gunn <tgunn@google.com> Remove code which prevents making a video call when one is in progress.

This restriction doesn't match how VT works; it is reasonable to make
multiple VT calls at the same time.

Bug: 27073894
Change-Id: Ief68b8cae7cdb2352e33cbac761fad2d75dbd063
rc/com/android/server/telecom/CallIntentProcessor.java
fe7ecfe6ed7701aeb6707eb5e290ecacabd69931 09-Feb-2016 Abhijith Shastry <ashastry@google.com> Add Read, and Write blocked numbers permissions to Telecom.

Read permission is needed to check if an incoming call needs to be blocked.
Write permission is needed to display the UI to manage blocked numbers.

BUG: 26682702
Change-Id: Iada6cef5563450aedd1bc8017c6d0c6be54c0ecf
ndroidManifest.xml
99561a72f3720fb61350f97c20d3158323461385 09-Feb-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE Track and store call data usage in call log. am: 749856ef15 -s ours
am: bf29ff36c4 -s ours

* commit 'bf29ff36c4385297d3b3e4603db32dfe3c729157':
DO NOT MERGE Track and store call data usage in call log.
bf29ff36c4385297d3b3e4603db32dfe3c729157 09-Feb-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE Track and store call data usage in call log.
am: 749856ef15 -s ours

* commit '749856ef15b7305a41bbf778ab35781d96a9fb49':
DO NOT MERGE Track and store call data usage in call log.
749856ef15b7305a41bbf778ab35781d96a9fb49 04-Dec-2015 Tyler Gunn <tgunn@google.com> DO NOT MERGE Track and store call data usage in call log.

Respond to VideoProvider changeCallDataUsage callbacks and track the
most current call data usage in the Call. Use this when saving a new call
log entry.

Bug: 25668261
Change-Id: I1477b10dd9553ff3194e50f27d223d5eb24725bf
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/VideoProviderProxy.java
8a11c6e94b8ea2d7cfd19d97c7dd6509634c6a9f 08-Feb-2016 Hall Liu <hallliu@google.com> Merge "Add test annotations for APCT" into nyc-dev
84b6c878ba75be8d4fee99af8da31a55ab50b99c 03-Feb-2016 Hall Liu <hallliu@google.com> Add test annotations for APCT

Change-Id: Ieadeb236eee778cce2b1da55274ec7e5a1969ea3
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/ContactsAsyncHelperTest.java
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
e62e9e83a17824b8e2057be35c2adcca20af9e35 02-Feb-2016 Brad Ebinger <breadley@google.com> Introduce LoggingRunnable for Session logging

Introduces a Session.LoggingRunnable class to reduce code duplication
when implementing Runnables in Telecom.

Bug: 26807413
Change-Id: I40c709fd09260c6a40b63fd2c401e5a582035a5c
rc/com/android/server/telecom/AsyncBlockCheckTask.java
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallScreening.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/Runnable.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/LogTest.java
6852c8662b7838fece316b0975f7b5e3e7daa5f8 08-Feb-2016 Tony Mak <tonymak@google.com> Merge "Send ACTION_NEW_OUTGOING_CALL broadcast to the user initiates the call" into nyc-dev
d29d93778fe288d87aef03e0a934099995b550bf 08-Feb-2016 Tony Mak <tonymak@google.com> Cleanup isWorkCall logic

Instead of laze initialization, configure the value of isWorkCall in
setTargetPhoneAccount.

Change-Id: Ibeec80cbdf0f41eb2d5d5082626bf3a872530856
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ParcelableCallUtils.java
d3bacb784f59ef75f4b17fe218d08eb28ad338fd 03-Feb-2016 Tony Mak <tonymak@google.com> Send ACTION_NEW_OUTGOING_CALL broadcast to the user initiates the call

Instead of always sending broadcast to CURRENT_USER, send the broadcast
to user who initiates the call.

BUG:18335659
Change-Id: Ie1a9832d256f47d8da023e0d21eba17adab93938
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
df8203cdb58858f90cea2cd6744a5b5a9e9eda81 04-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Fix Telecom unit tests for incoming calls."
b7853c0b716f9cc9ae174d1ca4efaa118ef1740e 03-Feb-2016 Abhijith Shastry <ashastry@google.com> Fix Telecom unit tests for incoming calls.

1. Respond to CallerInfo lookups instead of always waiting for it to timeout (which adds 500ms to every test)
After this change, telecom unit tests take ~10s less to complete from around ~84s.

2. Do not explictly set handleCreateConnectionSuccess: ConnectionService already does this.
Explicitly setting results in multiple caller info lookups and unexpected behavior.

Change-Id: Ic0abaff6cd8751911733bbc764ac89530b3eb55b
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
4b1759dcf2b8fe89fa0dc407152e5a8fcb829dbb 03-Feb-2016 Hall Liu <hallliu@google.com> Remove race condition between NOCIB and account selection

Place an outgoing call once both account-selection and the new outgoing
call broadcast are done instead of assuming that account selection will
take longer than the broadcast.

Bug: 26110078

Change-Id: I6b035e929e9dc01a7330c8756f8afd2d3c69ba7c
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
b201d915a22094b1084ef697c15eddfff166bf87 03-Feb-2016 Hall Liu <hallliu@google.com> Merge "Add null check in ringer"
fc39700b788335545b3bc8a7ed36b2ad301e57fe 03-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Id1960462992e95a2f0a29707e2d96d0219c0da95
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
5648f3614e391ecf58b0d98c71d814db665e1ace 03-Feb-2016 Hall Liu <hallliu@google.com> Add null check in ringer

Occasionally in the course of CTS tests, the ringer will sometimes be
called with a null call, which throws an NPE. This adds a null check and
a warning log.

Bug: 26937223
Change-Id: I19e2e0284638a3627f45a79c67b428b71680c138
rc/com/android/server/telecom/Ringer.java
4c6267712ea02d44cc8ed77417587849350e14e1 02-Feb-2016 Hall Liu <hallliu@google.com> Merge "Predictable ordering for sending calls to InCallService"
2cb6c3b0caa9b9c6e461c77144c4729652701caf 02-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Stub implementation for managing blocked numbers."
0040d3f19b9ab78949949623b257d0b5656d17b2 02-Feb-2016 Tyler Gunn <tgunn@google.com> Remove call preventing video calls when TTY enabled.
am: 5abd468129

* commit '5abd468129d77e9187d95450b57b2f2e3da861e2':
Remove call preventing video calls when TTY enabled.
f5a32e4708729276b49226b2fdb819a46b7d2ce5 02-Feb-2016 Tony Mak <tonymak@google.com> Fix call is disconnected immediately after selecting a phone account

The problem is introduced after the getForegroundCall logic is moved
to CallAudioManager. Previously a call is
foreground call if it is not in NEW, DISCONNECTED, and ABORTED state.
However, now a call is a foreground call only if it is in active,
dialing, ringing and holding state.

Here is how does the bug happen:
0. Have multiple phone accounts
1. Place an outgoing call
2. Select the phone account (and so the call is in SELECT_PHONE_ACCOUNT
state).
3. CallsManager.phoneAccountSelected -> makeRoomForOutgoingCall return
there is no room for the call. It is wrong as the foreground call
should be the same as the call that just selected phone account!

So there are two solutions:
1. Do we intend to have the new definition of a foreground call? I believe
there are more things are broken if we have a new definition. I will
fix it as well once I confirm about it.
2. What's this CL fixed is removing the callToSkip argument in
getFirstCallWithState. As we are trying to find whether the call is
foreground call, I think it is unnecessary to skip finding the call.

BUG=26907829

BUG=26907829

Change-Id: Idda92b7685c12ec4c7440f775f1aebb834566de8
rc/com/android/server/telecom/CallsManager.java
e0081bd8fb304bc7d12c898ba2064d0bf97a4bfa 02-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 3af297782c -s ours am: 7492000cbe -s ours
am: e0458f5fc1 -s ours

* commit 'e0458f5fc1d41ed90f08fb8b8a7d6f3e6d99082d':
Import translations. DO NOT MERGE
55da5808f77e056b8e2e6b96afa0a59aefde5648 02-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 291bd720a9 -s ours
am: 7c10be71ab -s ours

* commit '7c10be71ab192fd0ea4b96f30e16af2b5f4d2c79':
Import translations. DO NOT MERGE
e0458f5fc1d41ed90f08fb8b8a7d6f3e6d99082d 02-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 3af297782c -s ours
am: 7492000cbe -s ours

* commit '7492000cbe9910cb292ccbf70f2d2ad2e7cc350a':
Import translations. DO NOT MERGE
7c10be71ab192fd0ea4b96f30e16af2b5f4d2c79 02-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 291bd720a9 -s ours

* commit '291bd720a9bd7538c9679904c3c6cd00faa1857c':
Import translations. DO NOT MERGE
7492000cbe9910cb292ccbf70f2d2ad2e7cc350a 02-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 3af297782c -s ours

* commit '3af297782cd6a4e6981f17cf623a867526824c85':
Import translations. DO NOT MERGE
291bd720a9bd7538c9679904c3c6cd00faa1857c 02-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Idf6d872e31ccc1c91ff5fb230fa91372210290c8
Auto-generated-cl: translation import
es/values-de/strings.xml
3af297782cd6a4e6981f17cf623a867526824c85 02-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I05726ecc5ac3c779668318f6d33bb42e9e8bb4ad
Auto-generated-cl: translation import
es/values-de/strings.xml
7a846f5378046320799238dd974606daccfbcbbb 02-Feb-2016 Abhijith Shastry <ashastry@google.com> Stub implementation for managing blocked numbers.

BUG: 26917087
Change-Id: I994426991438a2a604d563ecc8a00863315227f0
rc/com/android/server/telecom/TelecomServiceImpl.java
fbed016fbd4cdc744f306b13fb3a2d9042d6bd5a 15-Jan-2016 Hall Liu <hallliu@google.com> Add tests for CallAudioModeStateMachine

Adds tests and fixes a few bugs that were discovered in the course of
testing. Also add annotations for call audio tests.

Change-Id: I512afcd84fac54afd8fdddabbf732aebdf62df02
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallAudioModeStateMachineTest.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/StateMachineTestBase.java
bd7d3791552312e605c073bf1adb6548a6371eb9 30-Jan-2016 Hall Liu <hallliu@google.com> Predictable ordering for sending calls to InCallService

Always order calls sent to an InCallService such that children are sent
before parents when there is a conference call going on.

Bug: 26818778
Change-Id: If42c10963c2d0c7f43498ef40d647781a0179dc2
rc/com/android/server/telecom/InCallController.java
547a65a502544048a8394270a14ff0b8a4b05ac3 30-Jan-2016 Abhijith Shastry <ashastry@google.com> Merge "Block calls from numbers blocked by the user."
8cb83ea9b12793863638a1834278d4957e51bedd 28-Jan-2016 Abhijith Shastry <ashastry@google.com> Block calls from numbers blocked by the user.

Block check is performed after send to voicemail, and before CallScreening.

BUG:26682702
Change-Id: Ifa63a88d5815e4efb7b4fc9a18f38bc667e1ffa3
rc/com/android/server/telecom/AsyncBlockCheckTask.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/Timeouts.java
b77e5999d5f7eb22012e717c7c0e8794ff553236 29-Jan-2016 Hall Liu <hallliu@google.com> Merge "Restrict ability to add call based on device provision status"
5abd468129d77e9187d95450b57b2f2e3da861e2 29-Jan-2016 Tyler Gunn <tgunn@google.com> Remove call preventing video calls when TTY enabled.

This code was originally put in Telecom, and it really doesn't belong
there. There is no reason why we should impose a telephony restriction
in Telecom.
Further, the code which generates a Toast in this scenario actually causes
Telecom to crash.
Moving this check to Telephony instead.

Bug: 20090652
Change-Id: I777c0a8bfad59f9aea9abc6680f46284548912c4
es/values/strings.xml
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
2ce9f71e8541b6ce7b89bbf7318881b6ea29a573 28-Jan-2016 Santos Cordon <santoscordon@google.com> Annotate tests in telecom.

Bug: 26853070
Change-Id: I3bb942a668767e1886a2611494c8a57ea1ff1a28
ests/src/com/android/server/telecom/tests/BasicCallTests.java
840928552a07a649dd5ded64e8beaaf1107b1f1d 28-Jan-2016 Hall Liu <hallliu@google.com> Merge "Fix audio routing issue and flaky test"
bc90fe61b827f61ee6544956fade390d8f27010f 28-Jan-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE Propagate CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO capability.
am: 57db698855 -s ours

* commit '57db69885543834eccfb384d1dc57b4ece9add96':
DO NOT MERGE Propagate CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO capability.
57db69885543834eccfb384d1dc57b4ece9add96 22-Jan-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE Propagate CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO capability.

Propagate the connection capability through to a call capability.

Bug: 22728624
Change-Id: I2de63ba09d91f87e6d3f3083be070ec841abac0b
rc/com/android/server/telecom/InCallController.java
d109afbb672ef3a1994cd3c32f10332f40f6af7f 26-Jan-2016 Hall Liu <hallliu@google.com> Fix audio routing issue and flaky test

There was a potential issue in CallAudioRouteManager where the
transition from a quiescent state to its corresponding active state
would not be communicated to the in-call service. This has been fixed.

This change also changes InCallController to not broadcast current state
to all bound in-call services when a new service is bound.
VideoCallTests was adjusted to take this into account.

Bug: 26827840
Change-Id: Ibda3e2c783b77d82a7337fa39f4675dac22ae071
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/InCallController.java
ests/src/com/android/server/telecom/tests/VideoCallTests.java
2d52bd06c6334e6256a3323939fcc60b6fe684df 27-Jan-2016 Sailesh Nepal <sail@google.com> Merge "Use CallScreningService to screen calls"
4475002ecdda92136db1b45d3c5ba0a30932199d 27-Jan-2016 Sailesh Nepal <sail@google.com> Merge "Allow dialer to play incoming call ringtone"
ae92595c2f0f88a5bef8d2601f026b9d3ae2d7dd 25-Jan-2016 Sailesh Nepal <sail@google.com> Use CallScreningService to screen calls

This CL uses the new CallScreeningService to allow or disallow calls.
Similar to InCallService, the call screening service holds a wake lock.

We also implement a timeout on the telecom side. The timeout is a very
large value (5 seconds). The logic is that a flaky in-call can mess up
calls in many ways so there's no point in trying to be strict here.

Currently the service is invoked after the send to voicemail logic. We
should consider depreciating the old logic and insisting that the dialer
handle all call screening.

BUG: 22857261
Change-Id: I52b97be8e20c0f404839790e69a5f33588093daa
rc/com/android/server/telecom/CallScreening.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/ParcelableCallUtils.java
rc/com/android/server/telecom/Timeouts.java
f1422e76239b1a86b9400f0ade388699982ee814 27-Jan-2016 Hall Liu <hallliu@google.com> Restrict ability to add call based on device provision status

Always return false for canAddCall if device is not yet provisioned.

Bug: 26303187
Change-Id: I9c4ebc8b954a79562b2ec83d59314a3fb621ddfb
rc/com/android/server/telecom/CallsManager.java
cf0c8e1169abdd9800996d6f79a79832c850415e 27-Jan-2016 Tony Mak <tonymak@google.com> Merge "Fix phone account is disabled everytime after reboot"
c07b8e190b04e8b3e504478fa808d646d8c88a52 24-Jan-2016 Sailesh Nepal <sail@google.com> Allow dialer to play incoming call ringtone

This CL allows the default dialer app to play the incoming call
ringtone. This is useful because:
- the sound will now be played at the same time the UI is shown.
Previously the sound could be played earlier
- it will be easier for the system to respect the user's do not
disturb setting on a per contact basis

The dialer app can opt into the new behavior by setting a meta-data
value of IN_CALL_SERVICE_RINGING to true.

This CL also notifies the InCallService if silenceRinger was called.

BUG: 22857261
Change-Id: If1d05a922dd9869bc5b58157c67e9144001ee1ad
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
f41779d25e81e11e15d635989db403f92520cb8f 27-Jan-2016 Shishir Agrawal <shishir@google.com> Merge "Unhiding MSIM APIs."
e6cb92541b88967bf701d37a4173181376e8804d 26-Jan-2016 Tyler Gunn <tgunn@google.com> Merge "Propagate CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO capability."
3fd97c86090ff8cd6733e8a70d344fbcf314c7bb 26-Jan-2016 Hall Liu <hallliu@google.com> Merge "Perform disk operations in background thread"
3f7f64d6042f32bfda99b13d053bd49997a08306 08-Jan-2016 Hall Liu <hallliu@google.com> Perform disk operations in background thread

Use a background thread to perform writes in PhoneAccountRegistrar in
order to avoid disk operations in an UI thread.

(cherry picked from commit d0fc618d74descbff09b783a150d9547148e5b47)

Bug: 26069217
Change-Id: I389ddaac3648696d8ce78620cf2734662891edf2
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomSystem.java
6b12afd3f3b7f8be2113f9ec6ea1cb329a84c02b 08-Jan-2016 Hall Liu <hallliu@google.com> DO NOT MERGE Perform disk operations in background thread

Use a background thread to perform writes in PhoneAccountRegistrar in
order to avoid disk operations in an UI thread.

(cherry picked from commit d0fc618d74descbff09b783a150d9547148e5b47)

Bug: 26069217
Change-Id: I389ddaac3648696d8ce78620cf2734662891edf2
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomSystem.java
ce68874475498dcb69a543559177d69ac6dae215 26-Jan-2016 Shishir Agrawal <shishir@google.com> Unhiding MSIM APIs.

1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I7a1826255370e9a8c7c62516eb49725dce377c8c
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
0cdf63546437cd2301e9e9f07324bf202606c40e 26-Jan-2016 Shishir Agrawal <shishir@google.com> DO NOT MERGE : Unhiding MSIM APIs.
am: 611efc5f42 -s ours

* commit '611efc5f4201aad6c5b24636f97aef308d853f6e':
DO NOT MERGE : Unhiding MSIM APIs.
611efc5f4201aad6c5b24636f97aef308d853f6e 26-Jan-2016 Shishir Agrawal <shishir@google.com> DO NOT MERGE : Unhiding MSIM APIs.

1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I7a1826255370e9a8c7c62516eb49725dce377c8c
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
54df728296ba42c46a9445271985ae1b74def5cc 26-Jan-2016 Tony Mak <tonymak@google.com> Fix phone account is disabled everytime after reboot

There is a bug in the code that deserializes phone account from xml,
all phone accounts without extra are disabled after reboot!

The tag next to "extra", which is "enabled", is swallowed in the
readBundle function and hence the value is ignored.

Also update test case to cover this case.

BUG=26792269

Change-Id: I2387c7aed93b79d636ede2c9da4256b3272e86b0
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
2d7a74d8b225b0bd8d62125ec5b120d53dda70d7 25-Jan-2016 Nancy Chen <nancychen@google.com> Merge "Remove "uses-sdk"."
a60d6982ed4b16ad15a5db3ff4597416fbffc153 25-Jan-2016 Sailesh Nepal <sail@google.com> Merge "Fix missed call notification tests"
dd4c040a0909cc25c2686d37ffcd759eef19d483 25-Jan-2016 Nancy Chen <nancychen@google.com> Remove "uses-sdk".

System apps don't need it.

Change-Id: I0fd8a902649d197dc65440b0c2a5c37bed8f31d0
ndroidManifest.xml
5600f0bd96227d685c13321619d07414585be620 25-Jan-2016 Hall Liu <hallliu@google.com> Merge "Fix CallLogManager tests"
fd35dc4638d26d6d97aabb4f94be6ff41fcda895 25-Jan-2016 Hall Liu <hallliu@google.com> Merge "CallAudioManager refactoring"
c9bb95616469ae02cc43a57ea827b45261d49e26 23-Jan-2016 Hall Liu <hallliu@google.com> Fix CallLogManager tests

Fix test failures resulting from the shadow call log change

Bug: 26746699
Change-Id: I934eb8827f26d514f4bab4417f01e418e2a5f51e
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
d055c68dac8727a8257095289e3ff7415ea60dcf 25-Jan-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I1cde866624740762ade6a72354a9eb5ae8c55e28
Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-ky-rKG/strings.xml
es/values-mn-rMN/strings.xml
4d34c5bc9ba32cb03c34fdb4186e084e85af79cf 23-Jan-2016 Sailesh Nepal <sail@google.com> Fix missed call notification tests

My changes to missed call notifications (ag/850080) caused tests to
fail due to TelecomManager not being found. This CL fixes those tests.

This CL also changes queryBroadcastReceivers to specify the given user
handle.

BUG: 22857261
Change-Id: I6f0a5a38b017b8fa32016fa5921d909c0fa61114
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
5874a1ee8a29367cef453acf8ec3fdeef0e9786e 23-Jan-2016 Sailesh Nepal <sail@google.com> Merge "Allow dialer to show missed call notification"
39245e75b0c5c9a4d9d95254e918ce7408df025e 22-Jan-2016 Sailesh Nepal <sail@google.com> Allow dialer to show missed call notification

This CL allows the default dialer app to show the missed call
notification. This is important because:
- the dialer app can show the same caller ID info that
it would normally show in the call log
- the dialer app can make sure the UI is consistent with the rest of
the app

With this change, telecom never modifies a call's NEW or IS_READ
property. Instead, the dialer app is responsible for clearing the NEW
field once the user dismisses the notification. Similarly, the IS_READ
field is set once the user actually views the call in the dialer
calllog.

Note, this behavior is only implemented for the primary / non-work
profiel user. I'll work on implementing this correctly for the
non-primary user in a follow up CL.

BUG: 22857261
Change-Id: Ifae82d3036a278e5619edc8c766a1d0781296e72
rc/com/android/server/telecom/UserUtil.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
8f82466c1eb1688d27a794d34b6689680d1edc7c 23-Jan-2016 Brad Ebinger <breadley@google.com> Merge "Fixes concurrency issue in Session's toString"
f12c8efcf3d9f2f0897146db1c58f657a18e1bbd 23-Jan-2016 Santos Cordon <santoscordon@google.com> Merge "Report phone-state when calls are added."
880b98372368b1d2be2ed34edaeb1e2f338d121a 22-Jan-2016 Santos Cordon <santoscordon@google.com> Report phone-state when calls are added.

PhoneStateBroadcaster was previously updating the phone state when calls
change their state. However, it was not sending updates when the calls
were added unless the call was a ringing call.

This change makes it so that any call changes (addCall, removeCall,
stateChange) cause the phone-state to recalculate and send an update.

Bug: 26693196

Change-Id: I04be5d0338e3be9b769c9366e6ac188075dadb19
rc/com/android/server/telecom/PhoneStateBroadcaster.java
e091ab90e37845cf4771051a6d2ce0ebadee4fe7 19-Dec-2015 Hall Liu <hallliu@google.com> CallAudioManager refactoring

Separates the handling of audio mode and audio focus into a state
machine and brings ringing, tone generation, and ringbacks under the
control of CallAudioManager.

(cherry picked from commit fc2270137059e855756769752899d613e27d12a8)

Change-Id: Idd765550c907150117b8b66f76e88868ae3785c2
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioModeStateMachine.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/DtmfLocalTonePlayer.java
rc/com/android/server/telecom/InCallToneMonitor.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/RingbackPlayer.java
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/RingerTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
b171bc2a87830b1863d3e3686cad94785af89499 22-Jan-2016 Brad Ebinger <breadley@google.com> Merge "Increase Logging Statements in Telecom"
05aef4e0992d1b81f05b56a57be684ea8790ea44 22-Jan-2016 Tyler Gunn <tgunn@google.com> Propagate CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO capability.

Propagate the connection capability through to a call capability.

Bug: 22728624
Change-Id: I2de63ba09d91f87e6d3f3083be070ec841abac0b
rc/com/android/server/telecom/InCallController.java
eae0bf02ad79af537f85c6060020b0e02b692e11 22-Jan-2016 Brad Ebinger <breadley@google.com> Fixes concurrency issue in Session's toString

Currently, there is the possibility of Log.endSession() running at the
same time as Session.toString() in a different thread (for example, when
Log.i(...) is called). This can rarely cause the parent of a subsession
to be set to null after getFullSessionId has checked to see if the
parent is null, leading to a NPE.

We now cache the parentSession locally in getFullSessionId to ensure
that another thread does not unlink the parent and the child during
cleanup while toString is running.

Bug: 26693271
Change-Id: Ife7bcd5bb4db295c9b46898306119932dd24a508
rc/com/android/server/telecom/Session.java
58f365891ab631d8c45ad69d7024519384e9b75a 21-Jan-2016 Brad Ebinger <breadley@google.com> Increase Logging Statements in Telecom

Increased session logging in Telecom to include previously unseen entry points.

Bug: 26722101
Change-Id: I7771c5d3ca880c4175408497bbae37381854d456
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/DockManager.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/TtyManager.java
rc/com/android/server/telecom/WiredHeadsetManager.java
f78a72f8a1054726aa6f85a21372d917576906dd 21-Jan-2016 Santos Cordon <santoscordon@google.com> Revert "Revert "Support car-mode UI in telecom.""

This reverts commit 88cda8452124d43c145d54a97477dc5cf8a32a58.

Change-Id: Icfd1ab3ed3af39f62bd828dceb5ff2d4d517cb91
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/SystemStateProvider.java
rc/com/android/server/telecom/TelecomSystem.java
estapps/AndroidManifest.xml
estapps/res/layout/call_list_item.xml
estapps/res/layout/incall_screen.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/CallListAdapter.java
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestInCallServiceImpl.java
estapps/src/com/android/server/telecom/testapps/TestInCallUI.java
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/SystemStateProviderTest.java
88cda8452124d43c145d54a97477dc5cf8a32a58 21-Jan-2016 Brad Ebinger <breadley@google.com> Revert "Support car-mode UI in telecom."

This reverts commit d3182912911d167e4a5a8d379cef11c619d18d36.

Change-Id: I48da1122846b18c03bec486ee2bf977f721723a2
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/SystemStateProvider.java
rc/com/android/server/telecom/TelecomSystem.java
estapps/AndroidManifest.xml
estapps/res/layout/call_list_item.xml
estapps/res/layout/incall_screen.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/CallListAdapter.java
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestInCallServiceImpl.java
estapps/src/com/android/server/telecom/testapps/TestInCallUI.java
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/SystemStateProviderTest.java
d3182912911d167e4a5a8d379cef11c619d18d36 11-Dec-2015 Santos Cordon <santoscordon@google.com> Support car-mode UI in telecom.

Add additional step to look for and bind to a car-mode UI if the device
is currently in car-mode. Add a system state component to listen for
car-mode changes.

Change-Id: I5124b46f43b47bda39cf3d0f882378cf69b0505b
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/SystemStateProvider.java
rc/com/android/server/telecom/TelecomSystem.java
estapps/AndroidManifest.xml
estapps/res/layout/call_list_item.xml
estapps/res/layout/incall_screen.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/CallListAdapter.java
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestInCallServiceImpl.java
estapps/src/com/android/server/telecom/testapps/TestInCallUI.java
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/SystemStateProviderTest.java
6d735dc3d6706011c1745b43be7ee70e19f7a9d7 20-Jan-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I0c79f163a5f51915f4bfd9e872929b40d0197b38
Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hr/strings.xml
es/values-hy-rAM/strings.xml
es/values-is-rIS/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
f9a377b96142364c4f09893a90ff6bc1d3cb206b 20-Jan-2016 Tony Mak <tonymak@google.com> Merge "Treat the call as personal call if no work dialer is installed"
ed4df78f18d1ef5dc753e2b051e0ebd71748fca7 20-Jan-2016 Tony Mak <tonymak@google.com> Merge "Remove the default phone account when it is being disabled"
2221405ca90746f585a7d345b615b6af5995f397 19-Jan-2016 Tony Mak <tonymak@google.com> Treat the call as personal call if no work dialer is installed

For ACTION_DIAL intent, we will fallback to personal side if there is no
work dialer installed.
But for ACTION_CALL intent, it is handled in work profile and we consider
it as a work call although there is no work dialer installed. We would
now like to make it consistent and consider it as a personl call in this
case. It avoids situation that we insert the call in work side but user has
no work dialer to take a look of the call log.

BUG=26634502

Change-Id: I65cd0b552736b436e60dcaf34d0b2cb055b581eb
rc/com/android/server/telecom/CallIntentProcessor.java
75e8496ff3caf137f198dfbb96bda34a60bb4d3e 18-Jan-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I542aaca8c1fb7605f9f3dfadfa7eb15929fa2d8c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
9d637c0c4f4357d74626c2706650cf92f1c57386 16-Jan-2016 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE am: 570bf7f2a9 -s ours am: 7a0b1e1fd9 -s ours am: 2a46bf18f6 -s ours
am: 6f8ec945b2 -s ours

* commit '6f8ec945b223cb2cf7d0fd71c729c8dadfda72b3':
DO NOT MERGE ANYWHERE
6f8ec945b223cb2cf7d0fd71c729c8dadfda72b3 16-Jan-2016 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE am: 570bf7f2a9 -s ours am: 7a0b1e1fd9 -s ours
am: 2a46bf18f6 -s ours

* commit '2a46bf18f66e8564c3c838f6b06dda5ae419558c':
DO NOT MERGE ANYWHERE
2a46bf18f66e8564c3c838f6b06dda5ae419558c 16-Jan-2016 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE am: 570bf7f2a9 -s ours
am: 7a0b1e1fd9 -s ours

* commit '7a0b1e1fd963a31ef02efc3f4877084817f4dd5f':
DO NOT MERGE ANYWHERE
7a0b1e1fd963a31ef02efc3f4877084817f4dd5f 16-Jan-2016 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE
am: 570bf7f2a9 -s ours

* commit '570bf7f2a99d041dcc45bb5551560bb7d8cebe2f':
DO NOT MERGE ANYWHERE
570bf7f2a99d041dcc45bb5551560bb7d8cebe2f 16-Jan-2016 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE

Set initial default supported audio routes for Call object.

CallAudioManager may reference the Call before a connection has been
selected. In these cases, the supported audio routes should reflect all
possible routes (default) possible. Currently, returning 0 is causing no
route to be possible, leading to a wtf log.

Bug: 26579826
Change-Id: I500a20ed8d9599f00a3f365a26e99b0fafd003c4
rc/com/android/server/telecom/Call.java
483671620a809b5fc00bde3b694bdffb0fb72437 15-Jan-2016 Tony Mak <tonymak@google.com> Remove the default phone account when it is being disabled

BUG=26557929

Change-Id: I977f6c08ddcaa127b08c0ff99acbfc3d416f9215
rc/com/android/server/telecom/PhoneAccountRegistrar.java
0f55f047d0c862e825a2f14e52bfc343eaf2d39a 15-Jan-2016 Hall Liu <hallliu@google.com> Merge "Add support for earpiece-less devices in audio routing"
72d04b26de0d5f3552be55ec6d0023c6aebaec77 15-Jan-2016 Hall Liu <hallliu@google.com> Merge "Add methods to dump analytics through TelecomManager."
ecd74a56dbce2d15ff46ad3e64a16dfe8b6c734f 13-Jan-2016 Hall Liu <hallliu@google.com> Add methods to dump analytics through TelecomManager.

Implements dumpCallAnalytics in TelecomServiceImpl to export the
contents of Analytics so that it can be uploaded.

Change-Id: Ic2355187967bf5192c803ff8584b1b4ed5cdf1da
rc/com/android/server/telecom/Analytics.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
141c4bf96b6091833d3d321a2503f6ab5aa80441 16-Dec-2015 Tyler Gunn <tgunn@google.com> Enhance TestConnectionService to support 1-way video calls.

- added support for receiving 1-way video calls; this is useful when
testing receiving calls from a different device that does support 1-way
video calls and we want to ensure our implementation handles it.
- also add "capability_video_calling_relies_on_presence"

Change-Id: I417cd439aa8d6bebb5c35ec18fe5f5592535551c
estapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
estapps/src/com/android/server/telecom/testapps/CallServiceNotifier.java
estapps/src/com/android/server/telecom/testapps/TestCallActivity.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
3cf8d22b74e8bbcf953223e8c1259af1bffbc7cb 15-Jan-2016 Tony Mak <tonymak@google.com> Fix NPE when clearing missed call

putIfAbsent return previous value which is null when the key is absent.
so putIfAbsent().set() throws NPE

Change-Id: I33f30848132479f28ff0720d986fa13d188835d3
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
a993094840386163e9c2aa65a05e14b49d122318 15-Jan-2016 Tony Mak <tonymak@google.com> Updated missed call notification behaviour

Change-Id: Id32110413fbb5fa4ae4c3478e70f54d211b78389

Missed call notification

1. If the phone account has multi user capability, the notification
is shown in current user.

2. If the phone account has no multi user capability, the notification
is shown in the user that owns the phone account of the call

3. Whenever user is switched, reload missed call from database and post
notifications if necessary.

Change-Id: Id32110413fbb5fa4ae4c3478e70f54d211b78389
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/MissedCallNotifier.java
rc/com/android/server/telecom/TelecomBroadcastIntentProcessor.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/UserUtil.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
c99e1d0dfb86ee1f26e7fbda343cecc579784010 15-Jan-2016 Victor Chang <vichang@google.com> Merge "Show work missed call notification for sim call from work contacts"
6c67ff1b9644aaf91be78b274d0926811a802408 14-Jan-2016 Brad Ebinger <breadley@google.com> Merge "Fixes LogTest Tests"
9ce24585b00bcdd960210aeb2b15255cdaec9cf5 13-Jan-2016 Brad Ebinger <breadley@google.com> Merge "A stale session that was occurring has been corrected"
c207586e68fc76ba092e9e100fafb92737ef9980 13-Jan-2016 Brad Ebinger <breadley@google.com> Fixes LogTest Tests

Fixes error occuring in LogTest tests after Session logging formatting
changed from the displaying at the beginning of the log message to the end.

Change-Id: If404d059615c990a287dc608d64047460cbee244
rc/com/android/server/telecom/Log.java
ests/src/com/android/server/telecom/tests/LogTest.java
ad44abce8c715752e5c24d3c026311997e1c311c 13-Jan-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I20601c04ecb40d30fd606048fddee7e846ef9698
Auto-generated-cl: translation import
es/values-de/strings.xml
27327e554f3c502681dbaaed8fb11560c25f7828 05-Jan-2016 Brad Ebinger <breadley@google.com> A stale session that was occurring has been corrected

When the ConnectionServiceWrapper calls the removeCall method,
an invisible session was not being created, however the Logging system
was still treating one of the subsessions as an invisible session. To
fix this problem, Log.endSession now checks the intended invisible
session flag instead of just checking if the thread ids are the same.

Also, LogTest now does not print messages during unit tests.

Change-Id: I22888f19263d8d0f7c235b2d50aa05ab5d130ae7
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/Session.java
ests/src/com/android/server/telecom/tests/LogTest.java
209e4135874ffc0164856c87d47fd904a06bf40e 18-Dec-2015 Brad Ebinger <breadley@google.com> Record ComponentName when using InCallAdapter

Records the Package Name of the component using an InCallAdapter
to be displayed in logging.

Also, Logging Start/End Sessions have been moved to a verbose
logging level for now.

Bug: 26236642
Change-Id: Ic76c9618f3acd98c8c761dbfab6a202ad30fd05f
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/Session.java
c11336037bb88d62626d8dc263ef7db43877c35e 12-Jan-2016 Brad Ebinger <breadley@google.com> Clean up messy bugfix

Clean up a messy bugfix that was previously committed at ag/843900.

Change-Id: I9e4df558c49561f98d2296ef17fb15f45172ad93
rc/com/android/server/telecom/Call.java
a270e4d00e16016aafc61c3a6a628fdde681f5a8 12-Jan-2016 Brad Ebinger <breadley@google.com> Update isWorkCall to work with multi-SIM devices

Updates InCallController.toParcelableCall(...) to only check if a call
is a Work call after the user has selected the Phone Account that will
be used to make the call. Before the user has selected the Phone Account
to use, the call will be set as not a Work call and will be updated to
the correct state after the Phone Account is chosen.

Bug: 26484778
Change-Id: I7162ab5ee2ac117a2ba02bc0dc00a0f71fd59e7b
rc/com/android/server/telecom/Call.java
6c6083a0c98d4dd0db55764d45691d14a19427be 11-Jan-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: dfe52e8ae6 -s ours

* commit 'dfe52e8ae681a95a1b5be352708bb38f400dc206':
Import translations. DO NOT MERGE
a3e9ddacab074828d8b1867db77e7c96b712ac0c 16-Dec-2015 Hall Liu <hallliu@google.com> Add support for earpiece-less devices in audio routing

Allow devices without earpieces (Wear devices) to route call audio
correctly by falling back to speakerphone. Added tests to verify correct
behavior in this instance.

Bug: 26195788
Change-Id: If73db0cc4c3fcb00b3068276a10d44417d2ddd5c
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
75dd989986554947c7a6a541343397c4a70dfaf6 08-Jan-2016 Tony Mak <tonymak@google.com> Merge "Add property PROPERTY_WORK_CALL to ParcelableCall"
9e7f98ac892c6b88905e8971dfd7228c604c2f52 04-Jan-2016 Victor Chang <vichang@google.com> Show work missed call notification for sim call from work contacts

BUG=26082618

Change-Id: I7a4c74aecbc62b0e9c93abe29e0d551bb30ff982
es/values/strings.xml
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
f21df52dfe1c2d03089aaa54d7c1370ea2b02e84 07-Jan-2016 Hall Liu <hallliu@google.com> Merge "Add logging of message code to CallAudioRouteStateMachine"
3ae2dc823fc5fb2de346685a558480ece1ffc074 07-Jan-2016 Tony Mak <tonymak@google.com> Add property PROPERTY_WORK_CALL to ParcelableCall

Bug: 26022174
Change-Id: I18c039c1026acd6439809a01e4e742c8127d207c
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/InCallController.java
e0629fb0119bd16403d0fa352a4e3d62796a10ff 06-Jan-2016 Tyler Gunn <tgunn@google.com> [DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.
am: 6c296d3b3e -s ours

* commit '6c296d3b3ee385fac422a21ab56d93eaf500246f':
[DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.
ef15aea6ef54e3a8b04d534b14266b7a9009f085 06-Jan-2016 Hall Liu <hallliu@google.com> Add logging of message code to CallAudioRouteStateMachine

Log human-readable version of msg.what in addition to the numerical
code.

Change-Id: I8524c9c3b903b835cea6d0399889416fa9a525e3
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
6c296d3b3ee385fac422a21ab56d93eaf500246f 25-Nov-2015 Tyler Gunn <tgunn@google.com> [DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.

- Added acceptRingingCall API which accepts a videostate to complement the
existing API.
- Added unit test for acceptRingingCall APIs.

Bug: 20159300
Change-Id: I4166a8b7c470632d0ffc0e75504b081ffeea733d
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
2ea778deaaa7c247b11c040a225b2491148a23b5 04-Jan-2016 Tyler Gunn <tgunn@google.com> Merge "Fix incorrect bit comparisons in InCallController."
4230503066836c8d9c76520623722a98712af6a8 26-Dec-2015 Bill Rassieur <rassb@google.com> Merge -s ours from branch mirror-partner-mm-wireless-dev.

BUG: 26154276
3e323f20c1dffdd41bd68f3f10f89b07b2e46a5d 24-Dec-2015 Tyler Gunn <tgunn@google.com> Remove vt emergency call barring code from Telecom.
am: 000b6355e1

* commit '000b6355e12b0cf1a5ed200ea66cc0a9264822b3':
Remove vt emergency call barring code from Telecom.
4614bc7a6f8d6f3a58fb3bcc890edfce6da05be7 21-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 818a79f375 -s ours am: b1ee7aadbc -s ours
am: 73f8f42cf2 -s ours

* commit '73f8f42cf2a70d63b471a2fb75e072a583041df9':
Import translations. DO NOT MERGE
73f8f42cf2a70d63b471a2fb75e072a583041df9 21-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 818a79f375 -s ours
am: b1ee7aadbc -s ours

* commit 'b1ee7aadbcdf2f13593f4f1c21555dfa66e96876':
Import translations. DO NOT MERGE
627b25bca811e974fe523b42eb91122eada56bfe 21-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: dfb968e67a -s ours
am: c9ccee463c -s ours

* commit 'c9ccee463c2722c829f4da1c62f6ab5f54a5b174':
Import translations. DO NOT MERGE
b1ee7aadbcdf2f13593f4f1c21555dfa66e96876 21-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 818a79f375 -s ours

* commit '818a79f375031dc57c3ba12a363da08c9a1d82f1':
Import translations. DO NOT MERGE
c9ccee463c2722c829f4da1c62f6ab5f54a5b174 21-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: dfb968e67a -s ours

* commit 'dfb968e67ad790489aa109844d735b62579fed80':
Import translations. DO NOT MERGE
dfb968e67ad790489aa109844d735b62579fed80 21-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I796c8379c8c108b165cab84754a4b799cf3aa3f4
Auto-generated-cl: translation import
es/values-ne-rNP/strings.xml
818a79f375031dc57c3ba12a363da08c9a1d82f1 21-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I8c9ee49fcdd8cac9b389dafd6ff367715eba3806
Auto-generated-cl: translation import
es/values-ne-rNP/strings.xml
dfe52e8ae681a95a1b5be352708bb38f400dc206 21-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia4d9c7eddffdc3680a42dabe6ac9887ca3316ab0
Auto-generated-cl: translation import
es/values-ne-rNP/strings.xml
545bcb5564d7c7b71fe3604f4cee7e2ebc7d4530 21-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I756fba3094a14afca70e4527415ad7f5dde96faf
Auto-generated-cl: translation import
es/values-ne-rNP/strings.xml
e0d23aae71db4aa8dced55debdb0f64301c9a538 19-Dec-2015 Brad Ebinger <breadley@google.com> Merge "Mock WakeLocks in Telecom for Unit Testing"
e33c6251d576ad6cd8f0d7464d169590ea86150b 19-Dec-2015 Brad Ebinger <breadley@google.com> Merge "No longer start visible subsessions in Logging"
67d76ce7042c33664df63cb57c91576fe61d8452 18-Dec-2015 Tyler Gunn <tgunn@google.com> Fix incorrect bit comparisons in InCallController.

See the other bug in this topic for info on why.

Bug: 26272951
Change-Id: Ief8153550d9fbaa17995517ce8e62cfb7184674b
rc/com/android/server/telecom/InCallController.java
b5cdcbf2612b114a71092ad8e75592c4e62f7b94 18-Dec-2015 Hall Liu <hallliu@google.com> DO NOT MERGE Add timer to make in-call ui reflect bluetooth state am: f1c1679123 am: f8ec8dfa0f
am: 045ea586b5 -s ours

* commit '045ea586b52c3b5ba1b256fc73de576101809c57':
DO NOT MERGE Add timer to make in-call ui reflect bluetooth state
045ea586b52c3b5ba1b256fc73de576101809c57 18-Dec-2015 Hall Liu <hallliu@google.com> DO NOT MERGE Add timer to make in-call ui reflect bluetooth state am: f1c1679123
am: f8ec8dfa0f

* commit 'f8ec8dfa0fb56bd35b590334e92b5a4d38f94393':
DO NOT MERGE Add timer to make in-call ui reflect bluetooth state
f8ec8dfa0fb56bd35b590334e92b5a4d38f94393 18-Dec-2015 Hall Liu <hallliu@google.com> DO NOT MERGE Add timer to make in-call ui reflect bluetooth state
am: f1c1679123

* commit 'f1c1679123395cdc4cfbfa00540490e11893e34a':
DO NOT MERGE Add timer to make in-call ui reflect bluetooth state
f1c1679123395cdc4cfbfa00540490e11893e34a 12-Nov-2015 Hall Liu <hallliu@google.com> DO NOT MERGE Add timer to make in-call ui reflect bluetooth state

Adds a timeout of 5 seconds to connectBluetooth. Within those 5 seconds,
it will be assumed that audio is being routed through bluetooth. An
additional check is done at the end of the 5 seconds to see if bluetooth
audio is connected. If not, the in-call ui is updated to reflect this
fact.

This differs from the previous behavior in that there was no additional
check done at the end of the 5 seconds previously.

Bug: 25378995
Change-Id: I958765ce3f6facfe93fb0c54e77b0130c7fde408
(cherry picked from commit 20ba29108f4003938c0594e4c3a82bcf7c62cc5f)
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/Timeouts.java
69fbbf2860e620224fb357299a06ef1ea65a48a2 16-Dec-2015 Brad Ebinger <breadley@google.com> No longer start visible subsessions in Logging

Currently, if Log.startSession() is called when a session is
already active, a new subsession will be created (along with
the corresponding Log messages in logcat). This can cause confusion
in the Logging messages because a subsession was not started
explicitly and also adds un-needed verbosity.

This change creates "invisible" subsessions instead that still
track the start/end of the invisible subsession, but do not
report themselves in the log messages.

Also, to help with verbosity in the logs, the log messages
for createSubsession() have moved down to verbose.

Change-Id: Ifc1638b0bb197f20b6baa70293df5bc389dd1fc2
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/Session.java
ests/src/com/android/server/telecom/tests/LogTest.java
9ec222c7ad86f19cedda49b712cea8ee1ac1d6d8 17-Dec-2015 Brad Ebinger <breadley@google.com> Merge "Increase Logging to debug Accept/Reject"
3165d50d3fc688d632faecfae9c2f987e537941f 16-Dec-2015 Brad Ebinger <breadley@google.com> Increase Logging to debug Accept/Reject

Currently, it can be difficult to identify where Telecom events
originate from. Logging messages have been added that better describe
the conditions that occured to cause these Telecom events to occur.

Bug: 25838961
Change-Id: I846a3125d000bef1d0e8796a7baadcfa8cd73d4f
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/VideoProviderProxy.java
63a89f28d6e86844eea242a0175db21df1624db1 09-Dec-2015 Brad Ebinger <breadley@google.com> Mock WakeLocks in Telecom for Unit Testing

Currently, the proximity and in-call wakelock controllers use
PowerManager and PowerManager.WakeLock, which are final and can
not be mocked. A container named TelecomWakeLock has been introduced,
which encapsulates WakeLock logic for Unit Testing.

Unit tests are added for the ProximitySensorManager and InCallWakeLockControllerTest.

Change-Id: I4a894d4cd8d9d8952144a41a4d0a4bf4dac4de46
rc/com/android/server/telecom/InCallWakeLockController.java
rc/com/android/server/telecom/ProximitySensorManager.java
rc/com/android/server/telecom/TelecomWakeLock.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/tests/ProximitySensorManagerTest.java
5b058dfa0d69bdbd457db974f302137b919a40bd 17-Dec-2015 Hall Liu <hallliu@google.com> Multithread mmma in testing script

Change-Id: Id659cc29a7af09f66dcef25d8306d09b97b19d5e
cripts/telecom_testing.sh
a5e650516df103a8234c91433d70b9d9c823ec80 17-Dec-2015 Hall Liu <hallliu@google.com> Merge "Add tests for ContactsHelperAsync"
96a68839b9cd5051a94db1def4d28b922bb87ee2 17-Dec-2015 Tyler Gunn <tgunn@google.com> Merge "Add Video API unit tests, fix auto speakerphone logic."
0a6dd30f0f7acab586db9933bd4836148cd91c89 17-Dec-2015 Hall Liu <hallliu@google.com> Add more tests for TelecomServiceImpl

Change-Id: Ieef40369762736c01a331fe4a3cc72bed8928103
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
408277aa6a9a1b41c3311b26f119590927dfd3d0 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 65f3b56cac -s ours am: 441549112d -s ours
am: 6b35cea9b5 -s ours

* commit '6b35cea9b5545de6871060c8f4e9acc7b3b83fa2':
Import translations. DO NOT MERGE
6b35cea9b5545de6871060c8f4e9acc7b3b83fa2 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 65f3b56cac -s ours
am: 441549112d -s ours

* commit '441549112d0095fdf98c9f37580bebb75eb7aa8a':
Import translations. DO NOT MERGE
73e1d8c42d8226adc0a1862fac29634f5e670660 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 205716ae05 -s ours
am: 3e5c214fac -s ours

* commit '3e5c214fac7616929dd7e4cc85b339ce1767ad0d':
Import translations. DO NOT MERGE
441549112d0095fdf98c9f37580bebb75eb7aa8a 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 65f3b56cac -s ours

* commit '65f3b56cac41c993b4dd78afd8e82bebabb6cb34':
Import translations. DO NOT MERGE
3e5c214fac7616929dd7e4cc85b339ce1767ad0d 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 205716ae05 -s ours

* commit '205716ae051f1f5ba6e8724d87dc67835781ebb6':
Import translations. DO NOT MERGE
205716ae051f1f5ba6e8724d87dc67835781ebb6 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Icdb057b0f08b96f3407160d21c5095ae38f1212b
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hr/strings.xml
es/values-hy-rAM/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
65f3b56cac41c993b4dd78afd8e82bebabb6cb34 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I24aecfaa92411efb34b21d0e64736ff923559afa
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hr/strings.xml
es/values-hy-rAM/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
88aa24cc371f77eed52b9ce495548b2557b764f0 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia1f9667a418905d0c8cf30cb4b91ebbd6bdf4d0a
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hr/strings.xml
es/values-hy-rAM/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
4a6e961365dc97f9798c794fa755a99554c3be8c 14-Dec-2015 Amit Mahajan <amitmahajan@google.com> Code cleanup including removing direct references to IMS classes.

Bug: 25793157
Change-Id: Ifb550cdd4aa6c7765a070e2725f2bbb7dcd3a69e
rc/com/android/server/telecom/CallsManager.java
f3209bb339815b3fc79117bd3fc896d551246683 16-Dec-2015 Amit Mahajan <amitmahajan@google.com> Merge "Code cleanup including removing direct references to IMS classes."
c4eb75cc27287cc8e84fe27ada3475d20046fe2e 16-Dec-2015 Brad Ebinger <breadley@google.com> Merge "Add building with dep and exit when make fails"
29855705f44029e8578b8c4df9b571748724a03a 12-Dec-2015 Hall Liu <hallliu@google.com> Improve test stability for CallAudioRouteStateMachine

Explicitly run verifications only after all state machine commands have
been completed, by attaching a Runnable to a message to be processed
after all other messages by the call audio route state machine.

Change-Id: I7678eea5148fd08d72aac26183273c8d0d66d295
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
9ccc43d63648800e92396c430228772f8d0738cd 15-Dec-2015 Hall Liu <hallliu@google.com> Add tests for ContactsHelperAsync

Change-Id: I6ce3c7523fab97d4dc4d4a23ded84af8ec882e5c
rc/com/android/server/telecom/ContactsAsyncHelper.java
rc/com/android/server/telecom/TelecomSystem.java
ests/res/drawable-xhdpi/contacts_sample_photo.png
ests/res/drawable-xhdpi/contacts_sample_photo_small.png
ests/res/values/dimens.xml
ests/src/com/android/server/telecom/tests/ContactsAsyncHelperTest.java
1c59a3b116bcd36a28e7894eff8ddb2bf039e4e6 15-Dec-2015 Brad Ebinger <breadley@google.com> Add building with dep and exit when make fails

A new "-a" option is added, which supports building with dependencies
(mmma). When a build fails with [-a | -i], the function returns
instead of continuing. "adb root" is also added as a command that is
executed when getting coverage info.

Change-Id: Id1442a56a1fbb1ca2b87f6bbe8280ae9ceeaf3f8
cripts/telecom_testing.sh
98a44dc75b48828dbc6a451bf0885605b6fe1157 15-Dec-2015 Brad Ebinger <breadley@google.com> Change getopts string to fix flags

Change-Id: I181fcd6d3dbbfcec37369ec0c847d8069960b9e2
cripts/telecom_testing.sh
343e3f4510498d02058ac3d4ecb1a543fc2ca85a 15-Dec-2015 Hall Liu <hallliu@google.com> Merge "Add script for semi-automating Telecom testing"
fdf90a2f04be1dd020b4a03bdbe0ea5188c2994e 15-Dec-2015 Hall Liu <hallliu@google.com> Merge "Add tests for NewOutgoingCallIntentBroadcaster"
b492f4c845e61fac17c0e523363607d2dd6ba987 15-Dec-2015 Tyler Gunn <tgunn@google.com> Add Video API unit tests, fix auto speakerphone logic.

- Move some of the single call Telecom system tests to a new BasicCallTests
class.
- Change visibility of some methods in TelecomSystemTest to faciliate the
creation of other system test classes.
- Added VideoProviderTest which exercises the Video APIs.
- Created Mock Video Provider.

Change-Id: Id314c18b77e8c635fbde0232a1ccfae851a3071c
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/BasicCallTests.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/MockVideoProvider.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/VideoCallTests.java
ests/src/com/android/server/telecom/tests/VideoProviderTest.java
2ccf2044442bdd7c1174c6889e165f550ce8f7d7 15-Dec-2015 Hall Liu <hallliu@google.com> Add script for semi-automating Telecom testing

Change-Id: I9af17b02b12cee7e6c5b9b1eb230e31b8a981357
cripts/telecom_testing.sh
2bc522472c205df8237e6e2891fa5a4952fb0adf 14-Dec-2015 Brad Ebinger <breadley@google.com> Merge "Fix Crashes on UserCallActivity.onCreate"
8c4e22ae46a0dae635438353402937bf5d496ea8 14-Dec-2015 Amit Mahajan <amitmahajan@google.com> Code cleanup including removing direct references to IMS classes.

Bug: 25793157
Change-Id: Ifb550cdd4aa6c7765a070e2725f2bbb7dcd3a69e
rc/com/android/server/telecom/CallsManager.java
220b419bb5d1b4d1df08415c8e52cb7f0decbf7c 11-Dec-2015 Hall Liu <hallliu@google.com> Add tests for NewOutgoingCallIntentBroadcaster

Change-Id: I5dd8ee49e0afc3ab714439ae1ca7f4ce54a26072
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/PhoneNumberUtilsAdapter.java
rc/com/android/server/telecom/PhoneNumberUtilsAdapterImpl.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/NewOutgoingCallIntentBroadcasterTest.java
a5c4b8ce1253d96ace236df0c068a1c14a20026f 14-Dec-2015 Brad Ebinger <breadley@google.com> Fix Crashes on UserCallActivity.onCreate

Currently, Telecom's Logging system uses the TelecomService context
for its ContentResolver, which is not available when other processes
execute UserCallActivity.onCreate(). In this case, the default state
session timeout value will be set to the default.

Bug: 26176790
Change-Id: I1806a4ba06995c11da29c197e10fc9654e0f4904
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/Timeouts.java
ests/src/com/android/server/telecom/tests/LogTest.java
ecda55454f4993003e71e09a63d20f94a216cc47 04-Dec-2015 Hall Liu <hallliu@google.com> Add unit tests for TelecomServiceImpl

Added unit tests for TelecomServiceImpl and added some refactoring to
avoid static dependencies in TelecomServiceImpl.

Change-Id: I22a54e1e36c3a44dc07f65f534c0b9b6d534abd9
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/UserCallIntentProcessorFactory.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
95d45e80295b1145ac06e141ef466b01bf6a7473 14-Dec-2015 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 01fd2ff631 -s ours
am: 43ef2dd855 -s ours

* commit '43ef2dd855976c621fb8e88e4c9c5483cffbb5f3':
Import translations. DO NOT MERGE
43ef2dd855976c621fb8e88e4c9c5483cffbb5f3 14-Dec-2015 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 01fd2ff631 -s ours

* commit '01fd2ff6314fac148b3043f4f53aeea3ba9e2bcc':
Import translations. DO NOT MERGE
01fd2ff6314fac148b3043f4f53aeea3ba9e2bcc 14-Dec-2015 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
84601d6ed565d70c2eab2024f1997ba9e83007a2 14-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 7f03f5e3b9 -s ours am: cddb9a9dd2 -s ours
am: b9b8b536ec -s ours

* commit 'b9b8b536eccb57c0a0d42cbe38623eb1214a889d':
Import translations. DO NOT MERGE
b9b8b536eccb57c0a0d42cbe38623eb1214a889d 14-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 7f03f5e3b9 -s ours
am: cddb9a9dd2 -s ours

* commit 'cddb9a9dd22dec3212b77f9a20edecbd641f936b':
Import translations. DO NOT MERGE
cddb9a9dd22dec3212b77f9a20edecbd641f936b 14-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 7f03f5e3b9 -s ours

* commit '7f03f5e3b95519dc67f1fbc05271639d3525dc84':
Import translations. DO NOT MERGE
0698858140e01dedf6147442c9bc76c09a6f49b2 14-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ida52e07eb2482f364e2018c0abc814b78cd2941b
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-hi/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-lt/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sk/strings.xml
es/values-sv/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rHK/strings.xml
7f03f5e3b95519dc67f1fbc05271639d3525dc84 14-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I1395a198a4865c0b556295c2a0726939b755d663
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-hi/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-lt/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sk/strings.xml
es/values-sv/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rHK/strings.xml
0ed2dfaeb834b5d9f792e52a3f33cdc858602062 14-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I79be975984f3a76cb82152a5b46ef19652970150
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
9d73ba1f74ca4ff647aa182e440e821cc2d2cb18 13-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: beb1b42fee -s ours am: 038b002f9a -s ours
am: be4e350b09 -s ours

* commit 'be4e350b09d822b3925aa265d44df0f428adf07f':
Import translations. DO NOT MERGE
ddfaa5eaaf0ea5170d23691905782e5bbb94be8e 13-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 6aad762039 -s ours
am: 2688e29689 -s ours

* commit '2688e2968933c0031c6d85fced2b0841b0667d32':
Import translations. DO NOT MERGE
be4e350b09d822b3925aa265d44df0f428adf07f 12-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: beb1b42fee -s ours
am: 038b002f9a -s ours

* commit '038b002f9ad3e44e0f4366e26c8ad9cb15c63239':
Import translations. DO NOT MERGE
2688e2968933c0031c6d85fced2b0841b0667d32 12-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 6aad762039 -s ours

* commit '6aad76203912f1d10f890bd93853791322e69490':
Import translations. DO NOT MERGE
038b002f9ad3e44e0f4366e26c8ad9cb15c63239 12-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: beb1b42fee -s ours

* commit 'beb1b42feef7c65de47027a115fd8f00aadccc9f':
Import translations. DO NOT MERGE
6aad76203912f1d10f890bd93853791322e69490 12-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Icdff5a45c19c419dbc63ae8cec3cea311b06bb11
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
beb1b42feef7c65de47027a115fd8f00aadccc9f 12-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia53802bcab77530fe78178ed5a5695a701e86997
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
bd5dfb487f28c90df51b50289d8416524e2a3c8f 12-Dec-2015 Brad Ebinger <breadley@google.com> Merge "Adds Telecom Logging to TelecomServiceImpl."
84f4ff64833c6f4af5337f061ae4927b81d0081c 12-Dec-2015 Brad Ebinger <breadley@google.com> Merge "Increase Unit Tests for BluetoothPhoneServiceImpl"
201711d9b1794f4226d09d186b189abe8bc4f4d8 12-Dec-2015 Brad Ebinger <breadley@google.com> Merge "Increases stability of Telecom Tests."
11623a354be47205bf3bc686ed8fdfc278958983 25-Nov-2015 Brad Ebinger <breadley@google.com> Adds Telecom Logging to TelecomServiceImpl.

Adds Telecom logging sessions to the major entry points in TelecomServiceImpl
and other modules in order to track the code paths of other processess.

Refactor CallAudioRouteStateMachine to use callbacks in StateMachine to
handle logging.

Change-Id: I48a70afaf2028ace73608be4f825c49af16c1622
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/ServiceBinder.java
rc/com/android/server/telecom/Session.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/Timeouts.java
ests/src/com/android/server/telecom/tests/LogTest.java
5702337672a74c7ab55f02f8b3d492581dc3c668 12-Dec-2015 Tyler Gunn <tgunn@google.com> Merge "Fix issue where CEP participants cannot be disconnected."
55f16374f43e84aeac31baf0623ee25330998b2f 12-Dec-2015 Tyler Gunn <tgunn@google.com> Revert string resource to previous version. am: 0a9cfab154 am: 3f769560a3
am: 3059facf7b

* commit '3059facf7b4859d80a210875a7372fbadfcd72b1':
Revert string resource to previous version.
3059facf7b4859d80a210875a7372fbadfcd72b1 12-Dec-2015 Tyler Gunn <tgunn@google.com> Revert string resource to previous version. am: 0a9cfab154
am: 3f769560a3

* commit '3f769560a3c6af60e48d5e76c4db6bf9a29f200d':
Revert string resource to previous version.
3f769560a3c6af60e48d5e76c4db6bf9a29f200d 12-Dec-2015 Tyler Gunn <tgunn@google.com> Revert string resource to previous version.
am: 0a9cfab154

* commit '0a9cfab154483a2f2b1ef8aae0078f4ea64c0790':
Revert string resource to previous version.
0a9cfab154483a2f2b1ef8aae0078f4ea64c0790 11-Dec-2015 Tyler Gunn <tgunn@google.com> Revert string resource to previous version.

Reverting outgoing_call_not_allowed_user_restriction as the newest
version doesn't make sense.

Bug: 25005066
Change-Id: I65760624fd1159758659d38ec8f64c1aeac574a5
es/values/strings.xml
f7a0897fa1fc5e759505500b690267ad14d860c0 11-Dec-2015 Brad Ebinger <breadley@google.com> Increases stability of Telecom Tests.

TelecomSystemTest will sometimes return null when accessing
CallerInfoAsyncQueryFactoryFixture.mRequests. This seems to be due to
multiple test threads accessing mRequests at the same time. I have
changed the list to a synchronizedList in order to solve this problem.

Change-Id: I673658a823839307a7f42495b9537f623ba6621c
ests/src/com/android/server/telecom/tests/CallerInfoAsyncQueryFactoryFixture.java
65123635b873ee422a33d3f0fb273129ac06c640 11-Dec-2015 Tyler Gunn <tgunn@google.com> Enable auto speakerphone for outgoing video calls.

Extended existing logic for auto-enabling speakerphone for incoming video
calls to also apply when making an outgoing call.

Bug: 20090407
Change-Id: I69d943f49d84aea7559a78b92bbadd858084da66
rc/com/android/server/telecom/CallsManager.java
000b6355e12b0cf1a5ed200ea66cc0a9264822b3 28-May-2015 Tyler Gunn <tgunn@google.com> Remove vt emergency call barring code from Telecom.

Removing code in Telecom to prevent dialing emergency calls as a video
call (this is moved to frameworks/opt/telephony).
Also ensured video emergency calls are not blocked when TTY is enabled;
filing follow-up bug 21474288 to ensure this gets reviewed again as I
think we want to ensure this is the correct behavior.

Bug: 20089489
Change-Id: I6a5f54cd6280f67b273dc0939c35fab353ad62b0
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
712860276af91b649f2787a9a793521b16f091be 10-Dec-2015 Brad Ebinger <breadley@google.com> Increase Unit Tests for BluetoothPhoneServiceImpl

Adds tests to BluetoothPhoneServiceImpl in code areas
that have been identified as important (76% -> 86%) as per:

go/telecom-code-yellow-coverage

Change-Id: I1294f5873ea0944c79878797e244db346b2ad9a4
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
f4745b6a7d110d6a9d23fe6c385dc1e3d7c6c2f4 09-Dec-2015 Brad Ebinger <breadley@google.com> Fixes Permission Error in TelecomSystemTest

Recent changes in TelecomSystemTest aim to test a new
KEY_INITIATING_USER Extra set in
new UserCallIntentProcessor(Context context,...).processIntent(...).
Previously, context was not getting set to the correct MockContext,
which was then improperly sending out an intent to the system.
This change uses the correct MockContext and verifies the mocked
sendBroadcastAsUser intent was called before continuing tests.

Change-Id: If09a5fe6cf09fe7bfb0ce8b7e4e0890465bc8aea
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
234d54219ba98eb3a38ee01252d725d61760b8b1 08-Dec-2015 Tyler Gunn <tgunn@google.com> Fix issue where CEP participants cannot be disconnected.

Existing connections are added in Telephony for the CEP participants.
In that connection service, a unique id generated using the package name
of the connection service and a sequential number. This is passed here
into callid. HOWEVER, I mistakenly did not use it when making the new
call in Telecom. Hence Telecom would be referring to a call by one ID
and the connection service by another.

Bug: 25779129
Change-Id: I72b3aea3d49f6852a2c4d7a66e2c22494f651d7a
rc/com/android/server/telecom/CallsManager.java
b2cadb6851ef78ab62c328bf23e327c14aeda536 08-Dec-2015 Hall Liu <hallliu@google.com> Merge "Add analytics recording to Telecom"
f19000764f6b93dfa15561342cbdd9c1aa1d3e22 13-Nov-2015 Brad Ebinger <breadley@google.com> Refactor CreateConnectionProcessor

Currently, if a ConnectionManager refuses a connection from a Call, this
code will set a flag and call process() again. This finds all of
possible PhoneAccounts again (without the addition of the
ConnectionManager). In order to avoid this redundancy, a queue is utilized to
have the CreateConnectionProcessor fall back to another account if the
connection fails.

This change only changes how a ConnectionManager is being found/used.

Also, tests have been added for CreateConnectionProcessor

Change-Id: Id7479e5337a812fdae83411fb2fbc248d8c1a7da
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallIdMapper.java
rc/com/android/server/telecom/ConnectionServiceRepository.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/CreateConnectionResponse.java
rc/com/android/server/telecom/ServiceBinder.java
ests/src/com/android/server/telecom/tests/CreateConnectionProcessorTest.java
3258720f5526f766aa26c19cf01b32ac20d19d1d 18-Nov-2015 Hall Liu <hallliu@google.com> Add analytics recording to Telecom

Adds a way to record interesting information about calls that can then
be uploaded for later analysis.

Change-Id: I029688cbb28ba75c00df64b7c1aa9eda382fde99
rc/com/android/server/telecom/Analytics.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
1b7b2584c8cde1a12abe7e168801219b01d598d6 07-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I4cb9f39fcb3e4af31872731f255d652268a6d4b3
Auto-generated-cl: translation import
es/values-da/strings.xml
23a1974afd37a2ce4210281c7d2921e69cc2747f 07-Dec-2015 Tony Mak <tonymak@google.com> Merge "Allow setting default phone account handle per user"
30cdf12de680cb9ec3cf932706f065a48feade40 07-Dec-2015 Tony Mak <tonymak@google.com> Merge "Methods in PhoneAccountRegistrar should ask for userhandle explicitly"
b360f0d6de2977a4aa097075ce106a4fd201b43c 01-Dec-2015 Tyler Gunn <tgunn@google.com> Enable auto speakerphone for outgoing video calls.

Extended existing logic for auto-enabling speakerphone for incoming video
calls to also apply when making an outgoing call.

Bug: 20090407
Change-Id: Ia3553dbe1d3966998b369724ce78a458f3ab8938
rc/com/android/server/telecom/CallsManager.java
0749f894446f71763b0e42f9af45f4031ff43601 28-May-2015 Tyler Gunn <tgunn@google.com> Remove vt emergency call barring code from Telecom.

Removing code in Telecom to prevent dialing emergency calls as a video
call (this is moved to frameworks/opt/telephony).
Also ensured video emergency calls are not blocked when TTY is enabled;
filing follow-up bug 21474288 to ensure this gets reviewed again as I
think we want to ensure this is the correct behavior.

Bug: 20089489
Change-Id: I6a5f54cd6280f67b273dc0939c35fab353ad62b0
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
b64bbfd21ed93bec77c6797be27293f4dc9b0a93 05-Dec-2015 Bryce Lee <brycelee@google.com> resolve merge conflicts of 63b075d113 to master.

Change-Id: I9570cca152dc3b9f07211d98b86d907abe91e6da
63b075d11371fcb3cf53f9c481d3a2836be1b747 05-Dec-2015 Bryce Lee <brycelee@google.com> Fix log type used for logging silence. am: 18ceebcb85 am: a7ca2561f9
am: 0a902fb3f8

* commit '0a902fb3f86739af731ffc3f3be97e5fa66e85de':
Fix log type used for logging silence.
0a902fb3f86739af731ffc3f3be97e5fa66e85de 04-Dec-2015 Bryce Lee <brycelee@google.com> Fix log type used for logging silence. am: 18ceebcb85
am: a7ca2561f9

* commit 'a7ca2561f99d7ea3154f3f08a65f6abeb9b9cfd8':
Fix log type used for logging silence.
a7ca2561f99d7ea3154f3f08a65f6abeb9b9cfd8 04-Dec-2015 Bryce Lee <brycelee@google.com> Fix log type used for logging silence.
am: 18ceebcb85

* commit '18ceebcb85640fbb167c33e50d323580a47a2961':
Fix log type used for logging silence.
4a3e2fd2b783c9f667a719237ef527ebe686fe32 04-Dec-2015 Tony Mak <tonymak@google.com> Allow setting default phone account handle per user

The problem we cannot have every users has their own user handle is becoz
we did not store user handle.
Store default phone account handle with user handle, so that every user
can has it owns default phone account handle.

Bug: 25941865

Change-Id: Iad8a920e9ceeb9caa8a7d8bc6a1d2f2dfc8dcd58
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
240656f19c078b4f703d0502ce29114de0d45a50 04-Dec-2015 Tony Mak <tonymak@google.com> Methods in PhoneAccountRegistrar should ask for userhandle explicitly

1. Get calling user handle before calling clearCallingIdentity
2. Methods in PhoneAccountRegistrar asked for the user handle explicitly
instead of trying both current user and calling user
3. Modify isVisibleForUser in PhoneAccountRegistrar,
- PA with CAPABILITY_MULTI_USER is visible to all users including
managed profile (We are still discussing this, but let's assume it
works in this way and change it later if necessary)
- For other PAs, they are only visible within the user they are
registered to.
- TelecomManager.getPhoneAccount is an exception case. The visibility
checking of getPhoneAccount allowing a PhoneAccountHandle from other
profiles in the same user.
Reason:
Telecom passes PhoneAccountHandle to incall UI and incall UI
retrieves PhoneAccount from the handle.
It is because we never bind to managed profile's incall UI, and bind
to its parent user provided one instead. So phone account handle in
managed profile is passed to it's parent user incall UI. And we need
to allow parent user incall UI to retrieve the PhoneAccount from
the handle.

4. Please notice that the default PA account related APIs does not really
support multi-users. The backend (xml storage) does not include user
as a key and it should be able to store one default only and is shared
among all users. This problem is not fixed in this commit.

Bug: 25936882

Change-Id: Ia371723d68247a208a0c1185f6d02f1b5897946a
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
7a1f8239f7d22faef49c1f89de522e908e2e43f8 04-Dec-2015 Tyler Gunn <tgunn@google.com> Track and store call data usage in call log.

Respond to VideoProvider changeCallDataUsage callbacks and track the
most current call data usage in the Call. Use this when saving a new call
log entry.

Bug: 25668261
Change-Id: I1477b10dd9553ff3194e50f27d223d5eb24725bf
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/VideoProviderProxy.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
18ceebcb85640fbb167c33e50d323580a47a2961 04-Dec-2015 Bryce Lee <brycelee@google.com> Fix log type used for logging silence.

Change-Id: I8d8c12e73fa0536ff5b88800bfb8b7bb699444c8
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/Log.java
abbb3af2c05c1e523308d67f556cd7dee13a8f6c 02-Dec-2015 Hall Liu <hallliu@google.com> Merge "End-to-end testing for conference calls"
c36d08edf04d773bfbd8740c0c9bac33bb5cc189 01-Dec-2015 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE am: 0da5fa4d6a -s ours am: 7d32c5d3b0 -s ours am: f1261b013a -s ours
am: 7e02547bde -s ours

* commit '7e02547bded8e025276a84cae504e339f75a02c0':
DO NOT MERGE ANYWHERE
7e02547bded8e025276a84cae504e339f75a02c0 01-Dec-2015 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE am: 0da5fa4d6a -s ours am: 7d32c5d3b0 -s ours
am: f1261b013a -s ours

* commit 'f1261b013a163aa34737e6c93e1be9cd515f90ea':
DO NOT MERGE ANYWHERE
f1261b013a163aa34737e6c93e1be9cd515f90ea 01-Dec-2015 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE am: 0da5fa4d6a -s ours
am: 7d32c5d3b0 -s ours

* commit '7d32c5d3b0a146be3e26147a79a68ee1d4d98426':
DO NOT MERGE ANYWHERE
7d32c5d3b0a146be3e26147a79a68ee1d4d98426 01-Dec-2015 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE
am: 0da5fa4d6a -s ours

* commit '0da5fa4d6a0942a0297af6d85582d3978a473664':
DO NOT MERGE ANYWHERE
ae694b10e9156cfe0c8c57d73989fed13c887f69 12-Nov-2015 Tyler Gunn <tgunn@google.com> Make TelecomSystemTest compatible with code coverage

Creates a few implementations of interfaces to spy on to avoid
mysterious exceptions resulting from interactions between Mockito and
Emma.

Change-Id: Ie32b1bb101811471722f6e48aa4c5a75f364575c
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallWakeLockController.java
rc/com/android/server/telecom/TelecomSystem.java
ests/Android.mk
ests/src/com/android/server/telecom/tests/MockitoHelper.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
fd3a71fb611005a95c2063bbf082b81dcdfffc3f 30-Nov-2015 Brad Ebinger <breadley@google.com> Merge "Introduce Session logging to CallAudioManager"
0da5fa4d6a0942a0297af6d85582d3978a473664 30-Nov-2015 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE

Handle audio route restrictions set on calls.

When a call restricts audio routes, it will move the audio route to a
supported route if available. The supported routes are determined initially
and re-evaluated when the call becomes the foreground call.

Bug: 25485578
Change-Id: I54b9bf17495eb2b0dc73b822ad16485a4673a779
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
72930a80679d461ad694b6555b0749d5fc4e31a8 23-Nov-2015 Brad Ebinger <breadley@google.com> Introduce Session logging to CallAudioManager

Introduces session logging into Telecom's CallAudioManager and
incoming call entry points.

Change-Id: I7419fd5372a363ac21dbec8d4aeb29b05591300d
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRoutePeripheralAdapter.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/components/PrimaryCallReceiver.java
rc/com/android/server/telecom/components/UserCallActivity.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
9222d5b6517bbdd197fa3a2eda3194ff68bd4e11 30-Nov-2015 Bryce Lee <brycelee@google.com> Notify connections when the ringer is silenced. am: 6d96252436 am: e664d97104
am: 293cb6c010

* commit '293cb6c0109deaff00a3953862448affd7203c13':
Notify connections when the ringer is silenced.
293cb6c0109deaff00a3953862448affd7203c13 30-Nov-2015 Bryce Lee <brycelee@google.com> Notify connections when the ringer is silenced. am: 6d96252436
am: e664d97104

* commit 'e664d97104abd2aad143eba438a7a1993ce9c8bf':
Notify connections when the ringer is silenced.
e664d97104abd2aad143eba438a7a1993ce9c8bf 30-Nov-2015 Bryce Lee <brycelee@google.com> Notify connections when the ringer is silenced.
am: 6d96252436

* commit '6d96252436c34cbc2407767f67f2f397f390ad95':
Notify connections when the ringer is silenced.
6d96252436c34cbc2407767f67f2f397f390ad95 30-Nov-2015 Bryce Lee <brycelee@google.com> Notify connections when the ringer is silenced.

This is necessary for connected experiences (such as headset clients) where
another device must be notified of the ringer state.

Bug: 25644529
Change-Id: I89a98a4ad8ed4d94d7bf5eed07b57f353824e338
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/Ringer.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
9ecf22f7ae4a58b6afb60f736dcd12e76fdb80d0 25-Nov-2015 Tony Mak <tonymak@google.com> Merge "Update calllog insertion logic"
98e6bdc795585b0d332a7eb86245926c8d80609a 25-Nov-2015 Tony Mak <tonymak@google.com> Update calllog insertion logic

Here are behaviors defined by Lilian, we may revisit the behavior later.

1. Calls using multi user PhoneAccount are inserted to all users
except managed profile.

2. Outgoing call placed through work dialer is inserted into managed profile
only.

3. Calls using non-multi user PhoneAccount should be only inserted to
that particular user.

Change-Id: I84f54afb3af38b931b71063608f38d265aa0417c
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/UserUtil.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
116b859400b6c69c70fd325c352ad503baa3a8cf 18-Nov-2015 Brad Ebinger <breadley@google.com> Introduces sessions into Telecom Logging

Sessions are introduced into the Telecom logging framework in order
to better trace code execution paths in the Telecom logs. Mostly,
this code keeps track of threads that are currently executing code in
Telecom and when a log or event is recorded, the unique session
information is appended to the log/event.

Change-Id: Ied3940fbb33e097636a99571e946dd40a154d64b
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/Session.java
rc/com/android/server/telecom/SystemLoggingContainer.java
ests/src/com/android/server/telecom/tests/LogTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
b0998818637b87adf9c7528a15030e4b65fcf0d7 25-Nov-2015 Tony Mak <tonymak@google.com> Merge "Add field to store who is initiating the call"
f7783fb45c262a36d813cb450062d0076490a530 24-Nov-2015 Hall Liu <hallliu@google.com> End-to-end testing for conference calls

Adds machinery in ConnectionServiceFixture to enable end-to-end testing
for conference calls. Also adds tests to TelecomSystemTests to test the
functionality of conference calls.

Change-Id: I8b8784728bd6077402056e5f88de4bbc2b813bdc
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
42ef808c284791f21be8675174acc7297418fa45 25-Nov-2015 Tyler Gunn <tgunn@google.com> Add "acceptRingingCall()" API which accepts a videoState.

- Added acceptRingingCall API which accepts a videostate to complement the
existing API.
- Added unit test for acceptRingingCall APIs.

Bug: 20159300
Change-Id: I4166a8b7c470632d0ffc0e75504b081ffeea733d
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
578a4e6661fc1be20d164458acb335356d742f72 23-Nov-2015 Tony Mak <tonymak@google.com> Add field to store who is initiating the call

Insert userhandle of user that initiate the call before forwarding
the intent to primary user.

Previous ACTION_CALL flow:
Fire ACTION_SEND (managed user) ->
UserCallActivity in Telecom (parent user) ->
PrimaryCallReceiver (parent user)

Current ACTION_CALL flow:
Fire ACTION_SEND (managed user) ->
UserCallActivity in Telecom (managed user) ->
PrimaryCallReceiver (parent user)

The field can be used for:
1. Filter phone accounts for outgoing call
2. Insert call log based on who initiates the call
3. Pass the field to in-call UI which may uses it to indicate it is a work
call.


Change-Id: I78611a4394f00ce0655c37d52b7b456f213ec802
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
8d4f01509dc6b2b318baecb29097ba86e020579b 21-Nov-2015 Amit Mahajan <amitmahajan@google.com> Merge "Phone refactor (merging Gsm and Cdma phones)"
755d6fb62aaf42b1e9c06a3ff04dfc78943a16a8 12-Nov-2015 Amit Mahajan <amitmahajan@google.com> Phone refactor (merging Gsm and Cdma phones)

Bug: 25793157
Change-Id: Idba85b49f91b1607ab83be16b9aff80d61f4149f
rc/com/android/server/telecom/CallsManager.java
bbebba34974df8179da14999273bf47bbf8b691f 18-Nov-2015 Jeff Sharkey <jsharkey@android.com> Mark this coreApp as being encryptionAware.

Historically, apps marked with "coreApp" were prepared to run in a
limited boot environment, and were critical to booting the device, so
in the new file-based encryption world we're marking these apps with
both "forceDeviceEncrypted" and "encryptionAware" attributes.

Bug: 22358539
Change-Id: Ia40e2ab95132bccaf3fdb6484fdab3239258b2d0
ndroidManifest.xml
6377b9423b6638ceed0e4461b302d8bf9db93de4 17-Nov-2015 Hall Liu <hallliu@google.com> Merge "Refactor CallAudioManager's audio routing"
f62630a57de0d52be2bdbc92a9bf8f305cc0892d 27-Oct-2015 Hall Liu <hallliu@google.com> Refactor CallAudioManager's audio routing

This change separates the audio routing functionality of
CallAudioManager into a separate component, implemented as a formal
state machine.

Change-Id: I4ca66abe72609d67dc8bde8ed8ff1538b7d0cf57
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallAudioRoutePeripheralAdapter.java
rc/com/android/server/telecom/CallAudioRouteStateMachine.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/DockManager.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/StatusBarNotifier.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/WiredHeadsetManager.java
ests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java
3dfd3e916f1f5f1bd8fe811ab134422b8763bfa7 17-Nov-2015 Brad Ebinger <breadley@google.com> Merge "Add BluetoothPhoneServiceImpl testing"
baffbb3687c19143fd5e469791c0c2a52bb2ca18 16-Nov-2015 Hall Liu <hallliu@google.com> Merge "Fix test breakage when phone bluetooth is on"
5385513ae43b4d5896245bf076a83b27dbf32a25 30-Oct-2015 Brad Ebinger <breadley@google.com> Add BluetoothPhoneServiceImpl testing

Adds unit tests for BluetoothPhoneServiceImpl.java, which manages
telecom's interfacing with a headset, including headset events
and connect/disconnect during a call.

Change-Id: Ia692b02f8e4d3fc52b0e266409a4c5ed1ca2e7b8
rc/com/android/server/telecom/BluetoothHeadsetProxy.java
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
3c752bf5396719aed6f19642554b4a8133abd806 16-Nov-2015 Brad Ebinger <breadley@google.com> Merge "If reusing call, don't check makeRoomForCall"
b3979ee8e636820cc5e68f26562bc02987e5d489 12-Nov-2015 Hall Liu <hallliu@google.com> Fix test breakage when phone bluetooth is on

When the phone's bluetooth is enabled, TelecomSystemTest will fail with
a permission error in BluetoothPhoneServiceImpl. This change introduces
a new factory to facilitate mocking of BluetoothPhoneServiceImpl.

Change-Id: I58e1d5532a7f55580d37158fee27209e3de24988
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
20ba29108f4003938c0594e4c3a82bcf7c62cc5f 12-Nov-2015 Hall Liu <hallliu@google.com> Add timer to make in-call ui reflect bluetooth state

Adds a timeout of 5 seconds to connectBluetooth. Within those 5 seconds,
it will be assumed that audio is being routed through bluetooth. An
additional check is done at the end of the 5 seconds to see if bluetooth
audio is connected. If not, the in-call ui is updated to reflect this
fact.

This differs from the previous behavior in that there was no additional
check done at the end of the 5 seconds previously.

Bug: 25378995
Change-Id: I958765ce3f6facfe93fb0c54e77b0130c7fde408
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/Timeouts.java
b1e3d751c156221cd9a42dc12d43fc5fbe4bf137 10-Nov-2015 Brad Ebinger <breadley@google.com> If reusing call, don't check makeRoomForCall

Currently, if a call is reused in startOutgoingCall (in GV, for example)
during the making of a conference call, makeRoomForCall will return false
mistakenly because the call has already transitioned from
NEW -> CONNECTING state.

During the making of the new Call, makeRoomForCall was already called
once to be sure that the new call is valid. We can safely avoid making
this call to makeRoomForCall again and returning an incorrect "false."

Bug: 22980265
Change-Id: Id6fbad299f75a92d6c5b1be06e38611f8113c822
rc/com/android/server/telecom/CallsManager.java
6c625447d9629be03f33db1fd2c5e1c745c77201 11-Nov-2015 Yorke Lee <yorkelee@google.com> Merge "Fix crash during boot."
cc8e65ee5f02241c15580c44479901fd9873c72c 11-Nov-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I41f5ee139572a1fc1ce9e4efa1061653aa324404
Auto-generated-cl: translation import
es/values-zh-rCN/strings.xml
abf3ab0dbbcfe5b5f46e1856b487e8476fde8b54 10-Nov-2015 Tyler Gunn <tgunn@google.com> Merge "Fix issue where incorrect call state disables "Home" button."
38cd86e5f63c75a82befd39445166a9bbcfb1aa2 09-Nov-2015 Bryce Lee <brycelee@google.com> Make rerouting audio to speaker when docked configurable. am: 88f900a518 am: 5395e29c1d
am: ff8faeefa2

* commit 'ff8faeefa23bd10fc8d66f46dbbd8b7af9584e28':
Make rerouting audio to speaker when docked configurable.
ff8faeefa23bd10fc8d66f46dbbd8b7af9584e28 09-Nov-2015 Bryce Lee <brycelee@google.com> Make rerouting audio to speaker when docked configurable. am: 88f900a518
am: 5395e29c1d

* commit '5395e29c1d4e819448bb5fb8b610428ff82ad2ab':
Make rerouting audio to speaker when docked configurable.
5395e29c1d4e819448bb5fb8b610428ff82ad2ab 09-Nov-2015 Bryce Lee <brycelee@google.com> Make rerouting audio to speaker when docked configurable.
am: 88f900a518

* commit '88f900a518e2e5a21d39958793d2123962923172':
Make rerouting audio to speaker when docked configurable.
568f6115c2ef171a1c0189a9bb967ebc812afb6d 09-Nov-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ie25aee3500035e43bf1c5f6f2e6cffa5cbb57d91
Auto-generated-cl: translation import
es/values-ro/strings.xml
88f900a518e2e5a21d39958793d2123962923172 06-Nov-2015 Bryce Lee <brycelee@google.com> Make rerouting audio to speaker when docked configurable.

Bug: 25485578
Change-Id: Ie2a04e9d96b9c1e3d8167679a1137b65bdad3379
es/values/config.xml
rc/com/android/server/telecom/CallsManager.java
e9197414690c364239096f0b623213f580d50fef 05-Nov-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE am: dec87b3c92 -s ours
am: 8c1470e928 -s ours

* commit '8c1470e928b97a8f5bf6e40036f164fe9fa1115a':
Import translations. DO NOT MERGE
8c1470e928b97a8f5bf6e40036f164fe9fa1115a 05-Nov-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE
am: dec87b3c92 -s ours

* commit 'dec87b3c9255484150b51da7f0c07a5a55704f5e':
Import translations. DO NOT MERGE
dec87b3c9255484150b51da7f0c07a5a55704f5e 04-Nov-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I108f35672389e23883d50d3e24614fd97faffdbb
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
e6276e1d012ea3f93e4dc2a0c8567664dcfd31b3 23-Oct-2015 Tyler Gunn <tgunn@google.com> Fix issue where incorrect call state disables "Home" button.

There is a potential, due to multithreading, for a call to enter a
ringing state, become disconnected, and then finally be added to Telecom
where it will again be set to ringing. The PhoneWindowManager code
uses the TelecomManager API to check if there is a ringing call and to
determine if the home button should be disabled. The aforementioned
circumstances result in the PhoneStateBroadcaster not properly tracking
the current call state. It happens that the Telecom API isRinging method
simply checks the current state in the PhoneStateBroadcaster. In the
scenario for this but, the phone state is stuck in ringing, and as a
result the home button remains disabled.

This CL fixes this on 2 fronts:
1. Correct CallsManager onSuccessfulIncomingCall so that it will not
automatically set the state of a new incoming call to ringing if it has
already been disconnected (this will prevent PhoneStateBroadcaster from
getting the wrong state).
2. Change the Teleco isRinging API to check CallsManager#hasRingingCall(),
which will look at the list of currently tracked calls to determine whether
there is a ringing call (regardless if the PhoneStateBroadcaster has a
potentially inconsistent state).

Bug: 25146970
Change-Id: I6273c72bac5fc7d91e16a8ff8aa12a7081089824
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomServiceImpl.java
a8120c1a5c3a21f911ba36d623c815ed121696d4 29-Oct-2015 Bryce Lee <brycelee@google.com> Fix log message for phone-account unregistration. am: 7bab665150 am: 48fdc2c6dd
am: 091f3e2f34

* commit '091f3e2f345fcb19f7fb8348bd61f282aaf54c54':
Fix log message for phone-account unregistration.
7cecbffd92278108b27513a5baf95b5dabb1e34a 29-Oct-2015 Hall Liu <hallliu@google.com> Merge "Added tests for CallLogManager"
091f3e2f345fcb19f7fb8348bd61f282aaf54c54 29-Oct-2015 Bryce Lee <brycelee@google.com> Fix log message for phone-account unregistration. am: 7bab665150
am: 48fdc2c6dd

* commit '48fdc2c6dd65a8c43a2431c3033a49a2ddecb70b':
Fix log message for phone-account unregistration.
48fdc2c6dd65a8c43a2431c3033a49a2ddecb70b 29-Oct-2015 Bryce Lee <brycelee@google.com> Fix log message for phone-account unregistration.
am: 7bab665150

* commit '7bab6651504422cddb01921e2d3220b801924bb0':
Fix log message for phone-account unregistration.
7bab6651504422cddb01921e2d3220b801924bb0 29-Oct-2015 Bryce Lee <brycelee@google.com> Fix log message for phone-account unregistration.

Change-Id: Ib0fa08883e06057080976bc596b437e4bc6a31f8
rc/com/android/server/telecom/TelecomServiceImpl.java
bf5a5c68a417c81272b2f2b51a0640f78f06c648 29-Oct-2015 Santos Cordon <santoscordon@google.com> Show CONNECTING and SELECT_PHONE_ACCOUNT states as bluetooth-dialing. am: d9f9006eaf am: ba7c7d9ca8 am: 0b877839d7
am: d66a657af6

* commit 'd66a657af68357c22c6c4ceffb8e0fa11709f617':
Show CONNECTING and SELECT_PHONE_ACCOUNT states as bluetooth-dialing.
d66a657af68357c22c6c4ceffb8e0fa11709f617 29-Oct-2015 Santos Cordon <santoscordon@google.com> Show CONNECTING and SELECT_PHONE_ACCOUNT states as bluetooth-dialing. am: d9f9006eaf am: ba7c7d9ca8
am: 0b877839d7

* commit '0b877839d7e8836c76140771dc138049929c2fb3':
Show CONNECTING and SELECT_PHONE_ACCOUNT states as bluetooth-dialing.
0b877839d7e8836c76140771dc138049929c2fb3 29-Oct-2015 Santos Cordon <santoscordon@google.com> Show CONNECTING and SELECT_PHONE_ACCOUNT states as bluetooth-dialing. am: d9f9006eaf
am: ba7c7d9ca8

* commit 'ba7c7d9ca84eb65d3615af4ebbc9376799b891a8':
Show CONNECTING and SELECT_PHONE_ACCOUNT states as bluetooth-dialing.
ba7c7d9ca84eb65d3615af4ebbc9376799b891a8 29-Oct-2015 Santos Cordon <santoscordon@google.com> Show CONNECTING and SELECT_PHONE_ACCOUNT states as bluetooth-dialing.
am: d9f9006eaf

* commit 'd9f9006eafb1751f1b4ae1aa0954d445aa03fd3c':
Show CONNECTING and SELECT_PHONE_ACCOUNT states as bluetooth-dialing.
a079d9f3d800ff8cd54a2023bb082ace1ff680c4 29-Oct-2015 Bryce Lee <brycelee@google.com> Broadcast when a phone account is unregistered. am: 7d53dd296f am: b187fecfed
am: 96cd8b536a

* commit '96cd8b536a6ca1db6ea7696b741051c2c558aa69':
Broadcast when a phone account is unregistered.
96cd8b536a6ca1db6ea7696b741051c2c558aa69 29-Oct-2015 Bryce Lee <brycelee@google.com> Broadcast when a phone account is unregistered. am: 7d53dd296f
am: b187fecfed

* commit 'b187fecfed5a693197df729dfefde2d9d10fdb5c':
Broadcast when a phone account is unregistered.
b187fecfed5a693197df729dfefde2d9d10fdb5c 29-Oct-2015 Bryce Lee <brycelee@google.com> Broadcast when a phone account is unregistered.
am: 7d53dd296f

* commit '7d53dd296f876b95e53a8febe284edc90667765e':
Broadcast when a phone account is unregistered.
7d53dd296f876b95e53a8febe284edc90667765e 28-Oct-2015 Bryce Lee <brycelee@google.com> Broadcast when a phone account is unregistered.

The action was previously added but not wired up.

Bug: 25331205
Change-Id: If7b8910928a579c7f86a3bd42f725d4d16dec973
rc/com/android/server/telecom/TelecomServiceImpl.java
d9f9006eafb1751f1b4ae1aa0954d445aa03fd3c 28-Oct-2015 Santos Cordon <santoscordon@google.com> Show CONNECTING and SELECT_PHONE_ACCOUNT states as bluetooth-dialing.

When a bluetooth device asks us to make a call, we make a new Call
instance in the CONNECTING state and ask the ConnectionService to
place the call. Once the ConnectionService places the call the state
transitions to DIALING.

The bluetooth device expects there to be a call after it asks us to
place it, but we return zero calls if the device asks us prior to
transitioning to DIALING. This is because we treat CONNECTING as an
IDLE state for bluetooth devices.

The reason we treated CONNECTING as an IDLE state was to accommodate
aggressive end-call behavior from apps which rewrite a phone numbers
when making phone calls. We have since fixed that problem in
other ways and it is no longer necessary to treat CONNECTING or
SELECT_PHONE_ACCOUNT as IDLE states. This should fix problems we are
seeing where BT devices show zero calls if they query our system during
the CONNECTING state.

Bug: 24093455
Change-Id: I129711f6b9f6b7e32fc0bfa338b1e7fa5965e378
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
32a28c7d7724ff8563da81502aac3b027c9f700d 28-Oct-2015 Xiaohui Chen <xiaohuic@google.com> Merge "clean up USER_OWNER in Telecomm"
ada0301a8190568d90adba04bd1f555b7894a0e1 26-Oct-2015 Hall Liu <hallliu@google.com> Added tests for CallLogManager

Change-Id: I831599355fa3fa32365f8a7e011b41e37c72c9ec
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/TelephonyUtil.java
ests/src/com/android/server/telecom/tests/CallLogManagerTest.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
2c93c50e5be7d85b78c4af15aaa10e44f0bcdf3e 28-Oct-2015 Brad Ebinger <breadley@google.com> Revert "Move tests around to better organize Telecom"

This reverts commit f6655ee7f26e85aef274be7e8c95e317d9d4af7f.

Change-Id: Ia54fb6173de6425d5d9979b2498654764549ce19
ests/src/com/android/server/telecom/CallerInfoAsyncQueryFactoryFixture.java
ests/src/com/android/server/telecom/ComponentContextFixture.java
ests/src/com/android/server/telecom/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/InCallServiceFixture.java
ests/src/com/android/server/telecom/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/MockitoHelper.java
ests/src/com/android/server/telecom/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/RingerTest.java
ests/src/com/android/server/telecom/TODO
ests/src/com/android/server/telecom/TelecomSystemTest.java
ests/src/com/android/server/telecom/TelecomTestCase.java
ests/src/com/android/server/telecom/TestFixture.java
ests/src/com/android/server/telecom/tests/CallerInfoAsyncQueryFactoryFixture.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/MockitoHelper.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/RingerTest.java
ests/src/com/android/server/telecom/tests/TODO
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
ests/src/com/android/server/telecom/tests/TestFixture.java
f6655ee7f26e85aef274be7e8c95e317d9d4af7f 26-Oct-2015 Brad Ebinger <breadley@google.com> Move tests around to better organize Telecom

In order to better organize the Telecom system, the tests have been moved into the Telecom package instead of a separate .test package.

Change-Id: I762372acc47c9bc4e671d8c66227eb272e20d88a
ests/src/com/android/server/telecom/CallerInfoAsyncQueryFactoryFixture.java
ests/src/com/android/server/telecom/ComponentContextFixture.java
ests/src/com/android/server/telecom/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/InCallServiceFixture.java
ests/src/com/android/server/telecom/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/MockitoHelper.java
ests/src/com/android/server/telecom/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/RingerTest.java
ests/src/com/android/server/telecom/TODO
ests/src/com/android/server/telecom/TelecomSystemTest.java
ests/src/com/android/server/telecom/TelecomTestCase.java
ests/src/com/android/server/telecom/TestFixture.java
ests/src/com/android/server/telecom/tests/CallerInfoAsyncQueryFactoryFixture.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
ests/src/com/android/server/telecom/tests/MockitoHelper.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/RingerTest.java
ests/src/com/android/server/telecom/tests/TODO
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
ests/src/com/android/server/telecom/tests/TestFixture.java
6df5eb48cba587c6533cddff6cbc0825186f3e36 27-Oct-2015 Dianne Hackborn <hackbod@google.com> Fix crash during boot.

Change-Id: I9c030aa6a4d9df962ee16c79b30d7b68410aec4d
rc/com/android/server/telecom/Call.java
8f52ead844a54fa1b6a4e394289dd5805fbe707b 26-Oct-2015 Bryce Lee <brycelee@google.com> Account for scheme when checking if we can handle a call. am: 6afefa40e1 am: a4370801fb
am: 00e46655a0

* commit '00e46655a06a877f32e5d6224dccf6c3340267e1':
Account for scheme when checking if we can handle a call.
00e46655a06a877f32e5d6224dccf6c3340267e1 26-Oct-2015 Bryce Lee <brycelee@google.com> Account for scheme when checking if we can handle a call. am: 6afefa40e1
am: a4370801fb

* commit 'a4370801fb81039ced71bf9e2a31fe12f568ea93':
Account for scheme when checking if we can handle a call.
a4370801fb81039ced71bf9e2a31fe12f568ea93 26-Oct-2015 Bryce Lee <brycelee@google.com> Account for scheme when checking if we can handle a call.
am: 6afefa40e1

* commit '6afefa40e1e0e3310c4be0642ffdbb86347a74df':
Account for scheme when checking if we can handle a call.
6afefa40e1e0e3310c4be0642ffdbb86347a74df 26-Oct-2015 Bryce Lee <brycelee@google.com> Account for scheme when checking if we can handle a call.

Previously we were only accounting for if there was a call capable account.
This leaves the possibility that we have a call capable account for only
one scheme, but are asked to handle another.

Bug: 25202039
Change-Id: Iaf7173886faf8024f6a101e2e912cd1f77e18390
rc/com/android/server/telecom/CallsManager.java
9d07adf6a85aaf04b5e36dcbeae1b7ebcc2817e4 24-Oct-2015 Bryce Lee <brycelee@google.com> Disconnect calls when there is no call capable account available. am: de0ac37db0 am: d447830054
am: 416870d697

* commit '416870d697293135138e5665adb91bbc2460ffc1':
Disconnect calls when there is no call capable account available.
416870d697293135138e5665adb91bbc2460ffc1 24-Oct-2015 Bryce Lee <brycelee@google.com> Disconnect calls when there is no call capable account available. am: de0ac37db0
am: d447830054

* commit 'd447830054c9377ce57f7ad3da99f2acbf091ea5':
Disconnect calls when there is no call capable account available.
d447830054c9377ce57f7ad3da99f2acbf091ea5 24-Oct-2015 Bryce Lee <brycelee@google.com> Disconnect calls when there is no call capable account available.
am: de0ac37db0

* commit 'de0ac37db05aaa15edbbf98a83bc87a54bb56384':
Disconnect calls when there is no call capable account available.
de0ac37db05aaa15edbbf98a83bc87a54bb56384 24-Oct-2015 Bryce Lee <brycelee@google.com> Disconnect calls when there is no call capable account available.

Bug: 25194479
Change-Id: I9e9c7d6d63e91b2979a4ebdd5e50674aa55d4fc7
rc/com/android/server/telecom/CallsManager.java
d931a017a0abea32ad4485a91402b5f62b9ddb0e 21-Oct-2015 Brad Ebinger <breadley@google.com> Ringer unit tests added and minor refactoring to accommodate testing.

Change-Id: Ia176dff453e1876494e14d8403eb5a9ed3dd3865
rc/com/android/server/telecom/AsyncRingtonePlayer.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/RingtoneFactory.java
rc/com/android/server/telecom/SystemSettingsUtil.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/RingerTest.java
c165a519858a03c4381e8d0ecf8a6c5afa1ad531 24-Oct-2015 Hall Liu <hallliu@google.com> Fix duplicated registerReceiver method

Change-Id: Id4b7adad1b5251f28aa8643fa2054714abc10dca
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
877267255abf10ed14ccc88bf5201e48ab867f81 23-Oct-2015 Hall Liu <hallliu@google.com> Merge "Fix TelecomSystemTest#testAudioManagerOperations"
9f2417a04a1fffa8d649a589930d0d65567d401f 23-Oct-2015 Hall Liu <hallliu@google.com> Merge "Add support for post-dial digits to logs."
8fb1fb72b084a0497a3c3c3037ce5667bde14482 23-Oct-2015 Hall Liu <hallliu@google.com> Fix TelecomSystemTest#testAudioManagerOperations

testAudioManagerOperations was setting the microphone to mute
and attempting to verify that the setMicrophoneMute methond on
the AudioManager was invoked. However, CallAudioManager bypasses
AudioManager and calls AudioService directly.

This change modifies CallAudioManager so that a mock AudioService
can be injected. The test was modified so that it checks that the
appropriate mute method was called on the mock AudioService instead
of checking the mock AudioManager.

Bug: 25158760
Change-Id: I0d5946ae6b4cd31c9067e818f20dcc37a2e15c86
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
a33c44b34eaed1ec2dd5c87e00e2c0865971b7d1 20-Oct-2015 Hall Liu <hallliu@google.com> Add tests for MissedCallNotifierImpl

Refactored MissedCallNotifierImpl to be more test-friendly
and added unit tests for it.

Change-Id: I1020b7ca88b304309a8d3ee71b36154c84ef5821
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
b5e7d80c2c64e0d8643d9331a2bebda1939b0c78 21-Oct-2015 Tyler Gunn <tgunn@google.com> Add Dialer secret codes.

- Added *#*#823241#*#* (TCDBG1) to enable verbose logging (does not log
pii).
Logging enabled for 30 minutes and then it automatically reverts back to
regular log level.
- Added *#*#823240#*#* (TCDBG0) to disable verbose logging (when previously
set).
- Added *#*#826275#*#* (TCMARK) to add a "MARK" in the call log; this is
so that a user can immediately make a mark in the call log so that it is
easier for someone debugging a bug report to know when the problem
happened.

Bug: 20852653
Change-Id: I2cb6c944085efd78a05c4adf56a900ae0b05186f
rc/com/android/server/telecom/DialerCodeReceiver.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/TelecomSystem.java
b8ce19c04800b46e37385ea60795b21a7d14cded 15-Oct-2015 Hall Liu <hallliu@google.com> Add support for post-dial digits to logs.

Bug: 24955678
Change-Id: I9bc7ecc574dd50b2f389a147245aab7a65ae1e2c
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallLogManager.java
f734e619dfe24d1416c2752743e732c51ea2a50d 17-Oct-2015 Bryce Lee <brycelee@google.com> am 27b8c102: am 881a40b6: am 0f71e992: Merge "Handle emergency only phone accounts." into cw-e-dev

* commit '27b8c102e3eb1419c066d61bd1cf6b4e57edebcc':
Handle emergency only phone accounts.
27b8c102e3eb1419c066d61bd1cf6b4e57edebcc 17-Oct-2015 Bryce Lee <brycelee@google.com> am 881a40b6: am 0f71e992: Merge "Handle emergency only phone accounts." into cw-e-dev

* commit '881a40b6b26e133236701d7e076b39891b55539e':
Handle emergency only phone accounts.
881a40b6b26e133236701d7e076b39891b55539e 17-Oct-2015 Bryce Lee <brycelee@google.com> am 0f71e992: Merge "Handle emergency only phone accounts." into cw-e-dev

* commit '0f71e9923d645329c15f9473c6aeff418601f392':
Handle emergency only phone accounts.
0f71e9923d645329c15f9473c6aeff418601f392 17-Oct-2015 Bryce Lee <brycelee@google.com> Merge "Handle emergency only phone accounts." into cw-e-dev
a0bb705db62a254741629942e29c61da663449ff 16-Oct-2015 Bryce Lee <brycelee@google.com> Handle emergency only phone accounts.

Do not expose the emergency only phone account (only marked for wear)
unless we are explicitly querying for accounts that can place emergency
calls.

Bug: 24756957
Change-Id: I195bf25fdaced8ee0be411281d32e422a2987138
rc/com/android/server/telecom/PhoneAccountRegistrar.java
312320af2b0da1d9f5112ea7d3b25ca30fca7fc3 16-Oct-2015 Tyler Gunn <tgunn@google.com> am efcdd4b8: (-s ours) am 59ec2682: am d8ee2bfa: am b424457b: Merge "DO NOT MERGE Don\'t show "Respond via SMS" for missed SIP calls." into mnc-dr-dev

* commit 'efcdd4b895674be5357d9cf128d756fedadbcfe6':
DO NOT MERGE Don't show "Respond via SMS" for missed SIP calls.
efcdd4b895674be5357d9cf128d756fedadbcfe6 16-Oct-2015 Tyler Gunn <tgunn@google.com> am 59ec2682: am d8ee2bfa: am b424457b: Merge "DO NOT MERGE Don\'t show "Respond via SMS" for missed SIP calls." into mnc-dr-dev

* commit '59ec26821eaebf86531dcb6778b5e34f88d2d7f9':
DO NOT MERGE Don't show "Respond via SMS" for missed SIP calls.
59ec26821eaebf86531dcb6778b5e34f88d2d7f9 16-Oct-2015 Tyler Gunn <tgunn@google.com> am d8ee2bfa: am b424457b: Merge "DO NOT MERGE Don\'t show "Respond via SMS" for missed SIP calls." into mnc-dr-dev

* commit 'd8ee2bfa063e4a9c89f31f4db681335d529bc6f0':
DO NOT MERGE Don't show "Respond via SMS" for missed SIP calls.
d8ee2bfa063e4a9c89f31f4db681335d529bc6f0 16-Oct-2015 Tyler Gunn <tgunn@google.com> am b424457b: Merge "DO NOT MERGE Don\'t show "Respond via SMS" for missed SIP calls." into mnc-dr-dev

* commit 'b424457b13a061d51a61182406d6dbfea51c46d0':
DO NOT MERGE Don't show "Respond via SMS" for missed SIP calls.
b424457b13a061d51a61182406d6dbfea51c46d0 16-Oct-2015 Tyler Gunn <tgunn@google.com> Merge "DO NOT MERGE Don't show "Respond via SMS" for missed SIP calls." into mnc-dr-dev
50950a4d79212eb7725d8689bd057a13b9831da6 16-Oct-2015 Tyler Gunn <tgunn@google.com> DO NOT MERGE Don't show "Respond via SMS" for missed SIP calls.

Bug: 12878584
Change-Id: I77bb311424799dce38897baff8f82714c28c6494
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
388eaa7b9f3e5f3d4eb212187ad3e801f4e8e8ed 16-Oct-2015 Tyler Gunn <tgunn@google.com> am 626e6aac: (-s ours) am 29b2deef: am bcb0ba60: am 370a7a37: DO NOT MERGE Fix getAllPhoneAccounts() api method

* commit '626e6aace76b1d60c283182cedbd1a99a027226b':
DO NOT MERGE Fix getAllPhoneAccounts() api method
626e6aace76b1d60c283182cedbd1a99a027226b 16-Oct-2015 Tyler Gunn <tgunn@google.com> am 29b2deef: am bcb0ba60: am 370a7a37: DO NOT MERGE Fix getAllPhoneAccounts() api method

* commit '29b2deefaeccabec7dbb6d63b160f8dc4a25d291':
DO NOT MERGE Fix getAllPhoneAccounts() api method
29b2deefaeccabec7dbb6d63b160f8dc4a25d291 16-Oct-2015 Tyler Gunn <tgunn@google.com> am bcb0ba60: am 370a7a37: DO NOT MERGE Fix getAllPhoneAccounts() api method

* commit 'bcb0ba6004a8ae1cdd28c4ca1bd49fe22e9ddab8':
DO NOT MERGE Fix getAllPhoneAccounts() api method
bcb0ba6004a8ae1cdd28c4ca1bd49fe22e9ddab8 16-Oct-2015 Tyler Gunn <tgunn@google.com> am 370a7a37: DO NOT MERGE Fix getAllPhoneAccounts() api method

* commit '370a7a37ef41020fe6d1017927aaf114be331b87':
DO NOT MERGE Fix getAllPhoneAccounts() api method
370a7a37ef41020fe6d1017927aaf114be331b87 16-Oct-2015 Tyler Gunn <tgunn@google.com> DO NOT MERGE Fix getAllPhoneAccounts() api method

The getAllPhoneAccounts() API method was returning an empty list because
it was it was not being filled with actual accounts from the telecom
registry.

Bug: 23023110
Change-Id: Ia9dc0067dc481c401c5af88011450469580d5682
rc/com/android/server/telecom/TelecomServiceImpl.java
64196864859c3b46502002edacc235fc83f4aa32 13-Oct-2015 Xiaohui Chen <xiaohuic@google.com> clean up USER_OWNER in Telecomm

Bug: 22956426
Change-Id: I7a046d8c05e4e9d3958742a23493979055d39b42
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
001ce61d12f8ff80b9b5df6530364eaed6160d59 13-Oct-2015 Santos Cordon <santoscordon@google.com> am 5c4c1954: am 87084d64: am cfdc16f2: am 643c0277: Merge "Specify user when setting MUTE for a call." into mnc-dr-dev

* commit '5c4c1954d591198667de5f1c583e03b0216ef612':
Specify user when setting MUTE for a call.
5c4c1954d591198667de5f1c583e03b0216ef612 13-Oct-2015 Santos Cordon <santoscordon@google.com> am 87084d64: am cfdc16f2: am 643c0277: Merge "Specify user when setting MUTE for a call." into mnc-dr-dev

* commit '87084d64cf340757a050ffc22969c2dfe27cc898':
Specify user when setting MUTE for a call.
87084d64cf340757a050ffc22969c2dfe27cc898 12-Oct-2015 Santos Cordon <santoscordon@google.com> am cfdc16f2: am 643c0277: Merge "Specify user when setting MUTE for a call." into mnc-dr-dev

* commit 'cfdc16f2cf5ea9948f907da4d2afaf30a3ba3f33':
Specify user when setting MUTE for a call.
cfdc16f2cf5ea9948f907da4d2afaf30a3ba3f33 12-Oct-2015 Santos Cordon <santoscordon@google.com> am 643c0277: Merge "Specify user when setting MUTE for a call." into mnc-dr-dev

* commit '643c02773f76ee12c76e9ef514013e958ad0c3f0':
Specify user when setting MUTE for a call.
643c02773f76ee12c76e9ef514013e958ad0c3f0 12-Oct-2015 Santos Cordon <santoscordon@google.com> Merge "Specify user when setting MUTE for a call." into mnc-dr-dev
1d903ddbf915a4aef4925a0e90042e76151c97a9 10-Oct-2015 Hall Liu <hallliu@google.com> Fix test harness by mocking TelecomManager

Bug: 24618535
Change-Id: I28537b2a64cb401df41d7de892cf21125ce8f851
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
369c8740adecbb47a17171f861322a76588a6319 08-Oct-2015 Tyler Gunn <tgunn@google.com> Add store/retrieve of PhoneAccount extras to PhoneAccountRegistry.

- Add write/read to parser.
- Add Unit test case for XML parsing.
- Add test extra data test ConnectionService phone accounts.

Bug: 22806380
Change-Id: Ib01843ee859616eb6674f070a674b792d52b8869
rc/com/android/server/telecom/PhoneAccountRegistrar.java
estapps/src/com/android/server/telecom/testapps/CallServiceNotifier.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
cba7ee49beb2d7cf912a8280b2ff06ebf360d1de 06-Oct-2015 Tyler Gunn <tgunn@google.com> am 7e2ffc5a: am 6bd8a5cf: am 5d9e2936: am 8fd6d31d: Add "public" missed call notification.

* commit '7e2ffc5a59606c3068708feb4f7b1aac36dc20c8':
Add "public" missed call notification.
7e2ffc5a59606c3068708feb4f7b1aac36dc20c8 06-Oct-2015 Tyler Gunn <tgunn@google.com> am 6bd8a5cf: am 5d9e2936: am 8fd6d31d: Add "public" missed call notification.

* commit '6bd8a5cf2836dcb8b13eb76dc158019564052066':
Add "public" missed call notification.
6bd8a5cf2836dcb8b13eb76dc158019564052066 06-Oct-2015 Tyler Gunn <tgunn@google.com> am 5d9e2936: am 8fd6d31d: Add "public" missed call notification.

* commit '5d9e2936316fcba728b48b51e6aac244f86c69fb':
Add "public" missed call notification.
5d9e2936316fcba728b48b51e6aac244f86c69fb 06-Oct-2015 Tyler Gunn <tgunn@google.com> am 8fd6d31d: Add "public" missed call notification.

* commit '8fd6d31d9faf4e5b0fd2397442cee1c505939f91':
Add "public" missed call notification.
8fd6d31d9faf4e5b0fd2397442cee1c505939f91 06-Oct-2015 Tyler Gunn <tgunn@google.com> Add "public" missed call notification.

Used when the user has chosen to hide sensitive notification information
on the lock screen. The notification has a title "Phone" and details
"Missed call". We do not show the details of the missed caller info in
this notification.

Bug: 24638319
Change-Id: Idedfc55ae252d43f96ef1e395c03976af19fc65c
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
7686cd140cd98cf2ee06ab3065af137ca503d4bb 06-Oct-2015 Santos Cordon <santoscordon@google.com> Specify user when setting MUTE for a call.

Bug: 24448841
Change-Id: Ic71fe287efc37c5a7b560fafe8cb4c33273ad6b8
rc/com/android/server/telecom/CallAudioManager.java
35cfa249671ccefd0c8ab566b40796c7b29fdc1c 30-Sep-2015 Santos Cordon <santoscordon@google.com> am ee5d6784: am df02a586: am 9caac8bb: am f82589c7: Merge "Read headset state from audio manager instead of calculating ourselves." into mnc-dr-dev

* commit 'ee5d6784aff2c64f5c784dda6631fde3086b483e':
Read headset state from audio manager instead of calculating ourselves.
ee5d6784aff2c64f5c784dda6631fde3086b483e 30-Sep-2015 Santos Cordon <santoscordon@google.com> am df02a586: am 9caac8bb: am f82589c7: Merge "Read headset state from audio manager instead of calculating ourselves." into mnc-dr-dev

* commit 'df02a5861f9263d2137b58c783b2d3f3a29252fa':
Read headset state from audio manager instead of calculating ourselves.
df02a5861f9263d2137b58c783b2d3f3a29252fa 30-Sep-2015 Santos Cordon <santoscordon@google.com> am 9caac8bb: am f82589c7: Merge "Read headset state from audio manager instead of calculating ourselves." into mnc-dr-dev

* commit '9caac8bbf15f11a1bc15a37437e975079fde4cdb':
Read headset state from audio manager instead of calculating ourselves.
9caac8bbf15f11a1bc15a37437e975079fde4cdb 30-Sep-2015 Santos Cordon <santoscordon@google.com> am f82589c7: Merge "Read headset state from audio manager instead of calculating ourselves." into mnc-dr-dev

* commit 'f82589c73519bbe2d2b2a9c415af3cfbb22214b8':
Read headset state from audio manager instead of calculating ourselves.
f82589c73519bbe2d2b2a9c415af3cfbb22214b8 30-Sep-2015 Santos Cordon <santoscordon@google.com> Merge "Read headset state from audio manager instead of calculating ourselves." into mnc-dr-dev
6cd6451d8e027ef2d73c4d02978137f7dad251ab 29-Sep-2015 Baligh Uddin <baligh@google.com> am 6c1f7728: (-s ours) am 8bccdfad: (-s ours) Import translations. DO NOT MERGE

* commit '6c1f7728dfa362efb1d94c700f85215752a4eb6b':
Import translations. DO NOT MERGE
6c1f7728dfa362efb1d94c700f85215752a4eb6b 29-Sep-2015 Baligh Uddin <baligh@google.com> am 8bccdfad: (-s ours) Import translations. DO NOT MERGE

* commit '8bccdfadb615bee8d74e9852f6073642c2d27fd7':
Import translations. DO NOT MERGE
8bccdfadb615bee8d74e9852f6073642c2d27fd7 29-Sep-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I98fc670e017bf55951b4ddc45f338c664a910b9b
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
64211d12f5b39b602803091381f1775a75b6f11b 29-Sep-2015 Wei Liu <luciferleo@google.com> am 16db7f33: am 4bfe02a9: am e8e7b7b5: Merge "Do not ring in theater mode." into cw-e-dev

* commit '16db7f336a3d83378748068f18a277ec646cec04':
Do not ring in theater mode.
16db7f336a3d83378748068f18a277ec646cec04 29-Sep-2015 Wei Liu <luciferleo@google.com> am 4bfe02a9: am e8e7b7b5: Merge "Do not ring in theater mode." into cw-e-dev

* commit '4bfe02a90df7a4a87921be4d7c09775f9af827f4':
Do not ring in theater mode.
4bfe02a90df7a4a87921be4d7c09775f9af827f4 29-Sep-2015 Wei Liu <luciferleo@google.com> am e8e7b7b5: Merge "Do not ring in theater mode." into cw-e-dev

* commit 'e8e7b7b5e244d0b6b5670b04b880bd727ab1e73b':
Do not ring in theater mode.
e8e7b7b5e244d0b6b5670b04b880bd727ab1e73b 29-Sep-2015 Wei Liu <luciferleo@google.com> Merge "Do not ring in theater mode." into cw-e-dev
5a6441d2b0df19cff568a3151e87843e9e45a848 29-Sep-2015 Wei Liu <luciferleo@google.com> Do not ring in theater mode.

b/23979622

Change-Id: Ie08f04f12df144e68acac1972857037b14e57921
rc/com/android/server/telecom/Ringer.java
bd8de1001443918dab4ef2762a8ab20e88fdef86 28-Sep-2015 Yorke Lee <yorkelee@google.com> am e989d9b3: am b14f9106: am b2c480d0: am 01796e4f: am 650f1db9: Make InCall wakelock non-reference counted

* commit 'e989d9b3f7feb852647a4e4a947fc51a7ec6637f':
Make InCall wakelock non-reference counted
e989d9b3f7feb852647a4e4a947fc51a7ec6637f 28-Sep-2015 Yorke Lee <yorkelee@google.com> am b14f9106: am b2c480d0: am 01796e4f: am 650f1db9: Make InCall wakelock non-reference counted

* commit 'b14f91064b2402c975056ade15a28f4bda355fb0':
Make InCall wakelock non-reference counted
b14f91064b2402c975056ade15a28f4bda355fb0 28-Sep-2015 Yorke Lee <yorkelee@google.com> am b2c480d0: am 01796e4f: am 650f1db9: Make InCall wakelock non-reference counted

* commit 'b2c480d0b3bc10360d7c9c66515f902c6486bc29':
Make InCall wakelock non-reference counted
b2c480d0b3bc10360d7c9c66515f902c6486bc29 28-Sep-2015 Yorke Lee <yorkelee@google.com> am 01796e4f: am 650f1db9: Make InCall wakelock non-reference counted

* commit '01796e4f2e7f37729fd587db3f1b80aa76c5b1ff':
Make InCall wakelock non-reference counted
01796e4f2e7f37729fd587db3f1b80aa76c5b1ff 28-Sep-2015 Yorke Lee <yorkelee@google.com> am 650f1db9: Make InCall wakelock non-reference counted

* commit '650f1db91142aecf4ece29472baba194e9632d65':
Make InCall wakelock non-reference counted
650f1db91142aecf4ece29472baba194e9632d65 18-Sep-2015 Yorke Lee <yorkelee@google.com> Make InCall wakelock non-reference counted

Certain orders of call state changes can lead to a non-symmetric
number of acquire and release calls. Make the wakelock non-reference
counted to ensure that wakelock is held deterministically based on
whether or not there is a ringing call present.

Bug: 24073449
Change-Id: Ie6807fa983016e3c70e2e047e2756000835ad5ec
(cherry picked from commit 42e0781fd5f8864e4e96c93952e66897d93095c4)
rc/com/android/server/telecom/InCallWakeLockController.java
c395e49e7b9aef59e5b4092945a8648f5adba3a0 25-Sep-2015 Santos Cordon <santoscordon@google.com> Read headset state from audio manager instead of calculating ourselves.

Bug: 24067587
Change-Id: I94ff59bdf8a8440ead52cda29b378b3fccfca619
rc/com/android/server/telecom/WiredHeadsetManager.java
9a3a65bd1b61e14d6b9249582ae8ea159ee7bab1 23-Sep-2015 Santos Cordon <santoscordon@google.com> Merge "Don't show "Respond via SMS" for missed SIP calls."
0b1d78e5569c8fa1c9ef0667b6905b842151403e 23-Sep-2015 Santos Cordon <santoscordon@google.com> am 4527c49e: am 734d5ccf: am f62ecf02: resolved conflicts for c8e528b8 to cw-e-dev

* commit '4527c49e668b72756f3a6e537207737b5e08a1bb':
Format missed number in missed call notification.
4527c49e668b72756f3a6e537207737b5e08a1bb 23-Sep-2015 Santos Cordon <santoscordon@google.com> am 734d5ccf: am f62ecf02: resolved conflicts for c8e528b8 to cw-e-dev

* commit '734d5ccfe7aec6aca7617aeb0486269d144356aa':
Format missed number in missed call notification.
734d5ccfe7aec6aca7617aeb0486269d144356aa 23-Sep-2015 Santos Cordon <santoscordon@google.com> am f62ecf02: resolved conflicts for c8e528b8 to cw-e-dev

* commit 'f62ecf021912e86c0bdd4bb36c0c771929e323a1':
Format missed number in missed call notification.
f62ecf021912e86c0bdd4bb36c0c771929e323a1 23-Sep-2015 Santos Cordon <santoscordon@google.com> resolved conflicts for c8e528b8 to cw-e-dev

Change-Id: I80f7ceb91fca9187c550ac130aad62abda8ed941
c8e528b8d5d630f65c841e37c2a23c7458386ad3 21-Sep-2015 Tyler Gunn <tgunn@google.com> Format missed number in missed call notification.

This fixes an issue where missed calls in Korea are still showing the +82
prefix. This is due to the fact that the numbers were not being formatted
in the missed call notification.

Bug: 24189507
Change-Id: I9e3041a983f2abb950ec64a2f447c18a5228bc5e
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
5fcc5dcb7b20bacf6003421e418beca060f820f1 21-Sep-2015 Yorke Lee <yorkelee@google.com> Merge "Make InCall wakelock non-reference counted"
b328e480573ec6db6be55e23236994d61109d943 19-Sep-2015 Baligh Uddin <baligh@google.com> am d3002673: (-s ours) am 5d8cf322: (-s ours) am 9ca8ef45: (-s ours) am 5fce2ceb: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'd3002673abe9f61f678dd7b580038e68c475418c':
Import translations. DO NOT MERGE
f6640191256b01043c6494e2d5433f21777bcacb 19-Sep-2015 Sailesh Nepal <sail@google.com> Merge commit '3759b9fd888a064b551ecce17e0831cd5a27795f' into manualmerge

Change-Id: I386c42507f3c7910ca4c790e473c7e5616077ac1
d3002673abe9f61f678dd7b580038e68c475418c 19-Sep-2015 Baligh Uddin <baligh@google.com> am 5d8cf322: (-s ours) am 9ca8ef45: (-s ours) am 5fce2ceb: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '5d8cf322cb1572e1b6e785c0123d6c4c42d2c3c6':
Import translations. DO NOT MERGE
5d8cf322cb1572e1b6e785c0123d6c4c42d2c3c6 19-Sep-2015 Baligh Uddin <baligh@google.com> am 9ca8ef45: (-s ours) am 5fce2ceb: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '9ca8ef451603746777ffd52b0ea41e5156051839':
Import translations. DO NOT MERGE
9ca8ef451603746777ffd52b0ea41e5156051839 19-Sep-2015 Baligh Uddin <baligh@google.com> am 5fce2ceb: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '5fce2ceb1ff2910669c2cc715e6c9f40a03fb3f5':
Import translations. DO NOT MERGE
5fce2ceb1ff2910669c2cc715e6c9f40a03fb3f5 19-Sep-2015 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
3759b9fd888a064b551ecce17e0831cd5a27795f 19-Sep-2015 Sailesh Nepal <sail@google.com> am ad425e8e: am a8020a65: am 8ed7eeb6: Change requirements for emergency call timeout

* commit 'ad425e8e2a883ce2e4b7bbe64a74c9b901ea2451':
Change requirements for emergency call timeout
ad425e8e2a883ce2e4b7bbe64a74c9b901ea2451 19-Sep-2015 Sailesh Nepal <sail@google.com> am a8020a65: am 8ed7eeb6: Change requirements for emergency call timeout

* commit 'a8020a65843a8f0df37c9456ed7759372bb8387f':
Change requirements for emergency call timeout
a8020a65843a8f0df37c9456ed7759372bb8387f 19-Sep-2015 Sailesh Nepal <sail@google.com> am 8ed7eeb6: Change requirements for emergency call timeout

* commit '8ed7eeb62df48943eae3caac3005beaefa53330c':
Change requirements for emergency call timeout
0181fe6bbc9de9c264b66ef30ad3ead956a34da8 19-Sep-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I6ab906672a2ead5485b489e28eb9974f47d69d0d
Auto-generated-cl: translation import
es/values-nl/strings.xml
42e0781fd5f8864e4e96c93952e66897d93095c4 18-Sep-2015 Yorke Lee <yorkelee@google.com> Make InCall wakelock non-reference counted

Certain orders of call state changes can lead to a non-symmetric
number of acquire and release calls. Make the wakelock non-reference
counted to ensure that wakelock is held deterministically based on
whether or not there is a ringing call present.

Bug: 24073449
Change-Id: Ie6807fa983016e3c70e2e047e2756000835ad5ec
rc/com/android/server/telecom/InCallWakeLockController.java
d15d693be6b7cad7ef8b0a7dd2665b8904eb0697 18-Sep-2015 Roshan Pius <rpius@google.com> Log "Direct to Voicemail" calls in Calllog.

Merging call reject/missed call notification handling in
processDirectToVoicemail calls, so that all calls are logged in
call log.

BUG: 24174927
Change-Id: Icb8804e7c72880c56a190ca077e8f17833fb9b0c
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
8ed7eeb62df48943eae3caac3005beaefa53330c 08-Sep-2015 Sailesh Nepal <sail@google.com> Change requirements for emergency call timeout

Previously if a SIM call manager was set we allowed
emergency calls to timeout if:
- the device was not in service
- and the device was connected to Wi-Fi
- and a connection manager with a emergency capability
was registered

Unfortunately this prevented scenarios like making an
e911 call over LTE. This CL changes the requirements to
the following:
- a connection manager with a emergency capability
is registered
- and the connection manager was set by the carrier

Bug: 19199181
Bug: 23900801

Change-Id: I8fd05e88e3c02b90170b5809366b71627b2cfbd5
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
772d378b5d5ae92909bbaa48daa3144e47794347 17-Sep-2015 Wenyi Wang <wenyiw@google.com> Merge "Modify play method to handle silent ringtone"
8a048bf8150ac2335c3d511f4583e839d5235619 17-Sep-2015 Tyler Gunn <tgunn@google.com> Merge "Modify Telecom to have "one call ID to rule them all"."
8452be0e1e82e0d12cfb884bbf683ec5f95c9781 17-Sep-2015 Tyler Gunn <tgunn@google.com> Modify Telecom to have "one call ID to rule them all".

- Add call ID to the Telecom call class.
- Modify CallIdMapper to use Telecom call ID instead of a new sequentially
generated one.
- Remove isValidCallId and isValidConferenceId from CallIdMapper as they
are no longer required.
- Modify event logger to use telecom call ID instead of a sequential ID.

Bug: 23357902
Change-Id: I485f751d1668e96b7787c4be97aa76c1e5ec0798
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallIdMapper.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
35ed79788af4173ff1c86e16623c1bdf777b0f31 17-Sep-2015 Santos Cordon <santoscordon@google.com> Don't show "Respond via SMS" for missed SIP calls.

Bug: 12878584
Change-Id: I77bb311424799dce38897baff8f82714c28c6494
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
f43ff474988d4b35c77e0834506d0e15111a4cf1 16-Sep-2015 Wenyi Wang <wenyiw@google.com> Modify play method to handle silent ringtone

Bug: 12800232
Change-Id: I4ab30c04e0c38c58c9bd04222cea730b4aaaecec
rc/com/android/server/telecom/AsyncRingtonePlayer.java
04eba18dbfd48b25c5b8db86ec08eb6c7e4407c2 16-Sep-2015 Sailesh Nepal <sail@google.com> Merge "Remove Wi-Fi requirement for e911"
a7805a32c3e202421f186bf612b35fd47cfad1fb 11-Sep-2015 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
60bc0852947b477fe8dafc64c61476e43dcf3cbd 11-Sep-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic9d8c5686564fd4bbb829ed67ab9b32662b4b1a4
Auto-generated-cl: translation import
es/values-nl/strings.xml
834ca26d753e2e1466f6f0ecacc7d98c0895950b 10-Sep-2015 Roshan Pius <rpius@google.com> Update CallsManager state before invoking callback

We should update CallsManager internal state before informing the Calls
Manager event listeners for any call addition/removal/state-change. This
will ensure that we have the correct state when one of the listeners
query CallsManager after being informed about an event.
This will ensure for example that the background call is brought to
foreground when a call is disconnected and so call audio manager will
not relinquish the audio focus when an IMS conference is created
(b/23759265).

BUG: 23786790
Change-Id: Iccb74ac61166f1218f36b7b98df5d35a015e0c43
rc/com/android/server/telecom/CallsManager.java
54163a1df10c390ef07d95df2656ae4581ce5704 08-Sep-2015 Sailesh Nepal <sail@google.com> Remove Wi-Fi requirement for e911

Previously we required Wi-Fi connectivity before allowing
fallback to sim call managers for emergency calls.

This prevented scenarios like making e911 calls over LTE.
This CL removes the Wi-Fi connectivity requirement.

Bug: 19199181
Change-Id: I8fd05e88e3c02b90170b5809366b71627b2cfbd5
rc/com/android/server/telecom/CreateConnectionTimeout.java
5d28bc0ec066e0c526cf3db16bc1f34cbe7e4401 04-Sep-2015 Roshan Pius <rpius@google.com> am 45184280: am cf897fe3: am ef51640d: am 669f90b7: Abandon audioFocus only when all the calls are disconnected.

* commit '4518428065eb3e22ce424acbb25597e9db828179':
Abandon audioFocus only when all the calls are disconnected.
4518428065eb3e22ce424acbb25597e9db828179 04-Sep-2015 Roshan Pius <rpius@google.com> am cf897fe3: am ef51640d: am 669f90b7: Abandon audioFocus only when all the calls are disconnected.

* commit 'cf897fe30ef74ea9ec2240217b9157d2b9ed0a44':
Abandon audioFocus only when all the calls are disconnected.
cf897fe30ef74ea9ec2240217b9157d2b9ed0a44 04-Sep-2015 Roshan Pius <rpius@google.com> am ef51640d: am 669f90b7: Abandon audioFocus only when all the calls are disconnected.

* commit 'ef51640d6f3d0bf7ffc9408b3a0addee15a528b7':
Abandon audioFocus only when all the calls are disconnected.
ef51640d6f3d0bf7ffc9408b3a0addee15a528b7 04-Sep-2015 Roshan Pius <rpius@google.com> am 669f90b7: Abandon audioFocus only when all the calls are disconnected.

* commit '669f90b7544d0f8ec42336ea6757e133b499c145':
Abandon audioFocus only when all the calls are disconnected.
669f90b7544d0f8ec42336ea6757e133b499c145 03-Sep-2015 Roshan Pius <rpius@google.com> Abandon audioFocus only when all the calls are disconnected.

Due to the change in ag/757925 to abandonAudioFocus when the foreground
call is in disconnected state, we end up prematurely abandoning audio
focus for IMS conference scenarios. When IMS conference is created
first, we disconnect the foreground call before creating the new IMS
conference call. This results in us abandoning audio focus and
reinitializing it when the conference call is created. In this scenario,
there should be a background call which is not in DISCONNECTED state.
So, redo the if check to see if there is any non-DISCONNECTED call in
CallsManager before we abandon audio focus.

BUG: 23759265
Change-Id: I97dc614c6b805a0dff19b063806d8d036f3d894f
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
747bf6a969d327d9b359f93cfbf53f0c3aa6036d 01-Sep-2015 Yorke Lee <yorkelee@google.com> Merge "Add uses-sdk to Telecom test APK manifests"
e39fe67019511aea6b965d9283a95a776bd21fdd 01-Sep-2015 Yorke Lee <yorkelee@google.com> am ab5b39a7: am f8f73f5f: am defd629b: am aad82da8: am 607a099d: Merge "Enforce CALL_PHONE permission for default/system dialer for non emergency calls" into mnc-dev

* commit 'ab5b39a7d1c2f8c96b2497c3241410e5a4170d0f':
Enforce CALL_PHONE permission for default/system dialer for non emergency calls
9f8f9b9dff986dc030e18a54677d782eb890821f 01-Sep-2015 Bryce Lee <brycelee@google.com> am d7fe4b0c: am a5c048b0: am 2d6ceda2: Merge "Properly route rejection reply when capability is set." into cw-e-dev

* commit 'd7fe4b0cb48c9bb3d1267be77c9fa8101e6e97ea':
Properly route rejection reply when capability is set.
1cbe702680391d9700188c4d80d3027e80d2e9ef 01-Sep-2015 Yorke Lee <yorkelee@google.com> Add uses-sdk to Telecom test APK manifests

Allow them to be installed on master via adb install

Change-Id: I8c8df36eb04e2a904a5146e50cbb885c10145776
estapps/AndroidManifest.xml
ests/AndroidManifest.xml
ab5b39a7d1c2f8c96b2497c3241410e5a4170d0f 31-Aug-2015 Yorke Lee <yorkelee@google.com> am f8f73f5f: am defd629b: am aad82da8: am 607a099d: Merge "Enforce CALL_PHONE permission for default/system dialer for non emergency calls" into mnc-dev

* commit 'f8f73f5f83da17733c9a94d18488e1e2f99325db':
Enforce CALL_PHONE permission for default/system dialer for non emergency calls
f8f73f5f83da17733c9a94d18488e1e2f99325db 31-Aug-2015 Yorke Lee <yorkelee@google.com> am defd629b: am aad82da8: am 607a099d: Merge "Enforce CALL_PHONE permission for default/system dialer for non emergency calls" into mnc-dev

* commit 'defd629b5468aea779ff43a6781a056035577b15':
Enforce CALL_PHONE permission for default/system dialer for non emergency calls
defd629b5468aea779ff43a6781a056035577b15 31-Aug-2015 Yorke Lee <yorkelee@google.com> am aad82da8: am 607a099d: Merge "Enforce CALL_PHONE permission for default/system dialer for non emergency calls" into mnc-dev

* commit 'aad82da8dd8428d49e7a54027e2c8ad9f28f0a45':
Enforce CALL_PHONE permission for default/system dialer for non emergency calls
aad82da8dd8428d49e7a54027e2c8ad9f28f0a45 31-Aug-2015 Yorke Lee <yorkelee@google.com> am 607a099d: Merge "Enforce CALL_PHONE permission for default/system dialer for non emergency calls" into mnc-dev

* commit '607a099dd820aecd1c17988514b565f5921a3d29':
Enforce CALL_PHONE permission for default/system dialer for non emergency calls
607a099dd820aecd1c17988514b565f5921a3d29 31-Aug-2015 Yorke Lee <yorkelee@google.com> Merge "Enforce CALL_PHONE permission for default/system dialer for non emergency calls" into mnc-dev
d7fe4b0cb48c9bb3d1267be77c9fa8101e6e97ea 31-Aug-2015 Bryce Lee <brycelee@google.com> am a5c048b0: am 2d6ceda2: Merge "Properly route rejection reply when capability is set." into cw-e-dev

* commit 'a5c048b05ae0676ec10225a88103a05b3d5e5e84':
Properly route rejection reply when capability is set.
a5c048b05ae0676ec10225a88103a05b3d5e5e84 31-Aug-2015 Bryce Lee <brycelee@google.com> am 2d6ceda2: Merge "Properly route rejection reply when capability is set." into cw-e-dev

* commit '2d6ceda21a0fe46025f1294a040265b243487245':
Properly route rejection reply when capability is set.
2d6ceda21a0fe46025f1294a040265b243487245 31-Aug-2015 Bryce Lee <brycelee@google.com> Merge "Properly route rejection reply when capability is set." into cw-e-dev
cf497c9f72d3f7bac609ca6d5a64ddf2e28f6dbe 29-Aug-2015 Yorke Lee <yorkelee@google.com> Enforce CALL_PHONE permission for default/system dialer for non emergency calls

This CL fixes a bug where a default/system dialer targeting SDK 23 would
be allowed to place phone calls without the CALL_PHONE permission. This is
because for the default/system dialer, the Telecom system was only enforcing
the CALL_PHONE app_op.

In order to enforce runtime permissions for both SDK 23 and pre SDK 23 apps,
both OP_CALL_PHONE and CALL_PHONE permission must be checked.

Bug: 23607431
Change-Id: I57b6388349e0637df02799c14a2850c2c6e5a300
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
7b2e2f4d53aa3d28b96cac7fe2e83b3fd9b4f5a4 29-Aug-2015 Roshan Pius <rpius@google.com> am d989b8ac: am 5847d282: am c23d020a: am 1631929b: am 7d7cf27d: Ensure BT headset state updation before connect.

* commit 'd989b8ac63e13a8d7d7f2d7666cbb162a2fba64c':
Ensure BT headset state updation before connect.
d989b8ac63e13a8d7d7f2d7666cbb162a2fba64c 29-Aug-2015 Roshan Pius <rpius@google.com> am 5847d282: am c23d020a: am 1631929b: am 7d7cf27d: Ensure BT headset state updation before connect.

* commit '5847d2825b52040f240eb7b2db3c0af85b8c8679':
Ensure BT headset state updation before connect.
5847d2825b52040f240eb7b2db3c0af85b8c8679 29-Aug-2015 Roshan Pius <rpius@google.com> am c23d020a: am 1631929b: am 7d7cf27d: Ensure BT headset state updation before connect.

* commit 'c23d020a471ef4aa6c705c429fcdafee8cb212d6':
Ensure BT headset state updation before connect.
c23d020a471ef4aa6c705c429fcdafee8cb212d6 29-Aug-2015 Roshan Pius <rpius@google.com> am 1631929b: am 7d7cf27d: Ensure BT headset state updation before connect.

* commit '1631929bc33861c941b674a7e5fe91509dee0471':
Ensure BT headset state updation before connect.
1631929bc33861c941b674a7e5fe91509dee0471 29-Aug-2015 Roshan Pius <rpius@google.com> am 7d7cf27d: Ensure BT headset state updation before connect.

* commit '7d7cf27dd519c8910d98e942adc5a95675eba0c8':
Ensure BT headset state updation before connect.
ddd966e7f6b947e345163c442f4c2f9c3d146024 29-Aug-2015 Bryce Lee <brycelee@google.com> Properly route rejection reply when capability is set.

The telephony stack can be present on devices that do not have a cellular
radio. For example, connections can be established over wifi. In these
scenarios, having the replies handled by the default sms app is not
sufficient.

This CL works in conjunction with a framework change to allow connections
to mark themselves as capable of handling reply messages. In this case,
the call should route the reply back to the connection rather than have it
handled through sms.

Change-Id: I26a13496e3cff596ba950bf9abed35c36b917721
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/RespondViaSmsManager.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
7d7cf27dd519c8910d98e942adc5a95675eba0c8 28-Aug-2015 Roshan Pius <rpius@google.com> Ensure BT headset state updation before connect.

Two BT fixes here:
1. Correct the force updation of BT headset.
Looks like one of the partner CL: ag/703545 inadvertently overrode the
|force| flag that was added in ag/565413 to update the BT headset with
correct phone state on query. Correcting the logic to update the BT
headset with phone state to honor the |force| flag regardless of the
other flags.
2. For outgoing calls, update the BT headset that there is an outgoing
call being placed even before the call reaches the DIALING state.
This helps in ensuring that the connect_audio invoked reaches after
BT headset knows that there is an outgoing call being placed.

BUG: 23324160
Bug: 22996930
Bug: 23595828
Change-Id: Ib19712fbf357b8355de2132be643585e24d9a59c
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/CallsManager.java
f29275e2a8c7b3b09a17bd404604e1c4d1992d3f 28-Aug-2015 Roshan Pius <rpius@google.com> am d0f356b6: am 51c3462c: am c0f2dd07: am 32466b77: Merge "Don\'t request audio focus on call rejection." into mnc-dr-dev

* commit 'd0f356b6792c5d439a856d4835d905932822f64a':
Don't request audio focus on call rejection.
d0f356b6792c5d439a856d4835d905932822f64a 28-Aug-2015 Roshan Pius <rpius@google.com> am 51c3462c: am c0f2dd07: am 32466b77: Merge "Don\'t request audio focus on call rejection." into mnc-dr-dev

* commit '51c3462caf2522b239952d54fe570680b4fa4d91':
Don't request audio focus on call rejection.
51c3462caf2522b239952d54fe570680b4fa4d91 28-Aug-2015 Roshan Pius <rpius@google.com> am c0f2dd07: am 32466b77: Merge "Don\'t request audio focus on call rejection." into mnc-dr-dev

* commit 'c0f2dd0732e8eb5b0ab2682681901f727502aa3f':
Don't request audio focus on call rejection.
c0f2dd0732e8eb5b0ab2682681901f727502aa3f 28-Aug-2015 Roshan Pius <rpius@google.com> am 32466b77: Merge "Don\'t request audio focus on call rejection." into mnc-dr-dev

* commit '32466b777b1294367749904e49998bd15ee74b4d':
Don't request audio focus on call rejection.
32466b777b1294367749904e49998bd15ee74b4d 28-Aug-2015 Roshan Pius <rpius@google.com> Merge "Don't request audio focus on call rejection." into mnc-dr-dev
2cfeefef2c5a542ef95a38bcc827ee7af3520b7c 28-Aug-2015 Roshan Pius <rpius@google.com> am 44d7fae5: am 9608c400: am 9a017a3c: am af557380: Merge "Reject incoming calls when dialing a outgoing call" into mnc-dr-dev

* commit '44d7fae5c5b2733dd9a44bef6607795f36320682':
Reject incoming calls when dialing a outgoing call
3879a8879e5f0a9f5120a421d847cb178b4c469f 28-Aug-2015 Anthony Lee <anthonylee@google.com> am 63b88426: am 4da6be8e: (-s ours) am 7c64a4ee: Don\'t print PII

* commit '63b8842666a3393b02d513e5523958650794559e':
53a7cd23f6eebe790a74ba7732c7c205709be020 28-Aug-2015 Geoff Mendal <mendal@google.com> am 2e34cd7e: (-s ours) am 62283023: (-s ours) am 762b4fd8: (-s ours) Import translations. DO NOT MERGE

* commit '2e34cd7eead78535529064113beb01921953e397':
83416fc74685659d007080e09d4fa1c69a62f9e1 28-Aug-2015 Jay Shrauner <shrauner@google.com> am 279784f7: am 801f0bdc: (-s ours) am 606777af: Merge "Name user call activity "Phone"" into mnc-dev

* commit '279784f79bf1b687bf2d1f6df835a1a193764732':
66c8737b266769cd3b446731506455c4f456d723 28-Aug-2015 Tyler Gunn <tgunn@google.com> am 89acd1ab: am 3459089b: (-s ours) am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev

* commit '89acd1abe8dc3eec5aee678160097f8da2a79077':
fc761194cfdbb822e8cbe35e50620ced251b4049 28-Aug-2015 Roshan Pius <rpius@google.com> am eca59824: am b213354c: (-s ours) am 6f752c88: Migrate existing SIP PhoneAccount IDs to username.

* commit 'eca598248c2ea85aeade359b8573dd6f6001db71':
df522b1d7124821ad0c972bfc1f9cf473466ecd5 28-Aug-2015 Roshan Pius <rpius@google.com> am e5cd8619: am 417184b1: (-s ours) am 1a373830: Fetch phoneaccount from child for live conf calls.

* commit 'e5cd86195daf491d8e7974687cbb28e77d8c1a13':
398bd9b3bc1aa45dcf907a181436eb793e156235 28-Aug-2015 Roshan Pius <rpius@google.com> am ccf101a7: am d01e53b7: (-s ours) am ba9ac49f: Merge "Mark missed calls as read in calllog restore(3/3)" into mnc-dev

* commit 'ccf101a736430d7c0b7cb47df762ef4fd64e3e8f':
1be1bcd25eac2da83e6f530919ddca6f99f446e0 28-Aug-2015 Roshan Pius <rpius@google.com> am 58507977: am 7bd0308b: (-s ours) am d9544092: Disallow new call addition for live CDMA calls.

* commit '58507977797e741b13597d22b2e1242f3b89fcb6':
71581a428b0805463351d75350350eaa5f6c40db 28-Aug-2015 Amit Mahajan <amitmahajan@google.com> am d06a1cbb: am 9582abae: (-s ours) am 86b8e33e: Add OrSelf to privileged permission check.

* commit 'd06a1cbb30072064a2e075d05e3aad1e439513db':
b464ca20e8daf633f830229e8fe70cccfbf00238 28-Aug-2015 Sailesh Nepal <sail@google.com> am 7c008a15: am 91f3d6b8: (-s ours) am fc43ea86: Add user ID parameter for getSimCallMangaer

* commit '7c008a159b5b6e88f6349a9e3f07a0b5a13bc59d':
a30ed04bcf817489ac4e71e781b00bdc6c07c602 28-Aug-2015 Roshan Pius <rpius@google.com> am 149148e4: am 77f6abd9: (-s ours) am 03bb751b: Merge "Maintain call time across SRVCC (1/3)." into mnc-dev

* commit '149148e44685f23561d7afead98fae88c7bfff15':
95b151b4f2d766d853e54d2296a2b071436820ef 28-Aug-2015 Tyler Gunn <tgunn@google.com> am ebb844ef: am ede21c0b: (-s ours) am f8d97800: Pass current call into CallAudioManager#setIsRinging.

* commit 'ebb844ef221dc67aca96d960577d0766c206e6e5':
4bb54e5b6bad5e4802fc7e8dcc036d8e1b266cff 28-Aug-2015 Jay Shrauner <shrauner@google.com> am b38e508c: am cbe3f1a7: (-s ours) am 9c090d4d: Change Settings name to "Phone Call Management"

* commit 'b38e508ca7263e0125c575a35bb7d07047cde31c':
4cfcf698a3e88f6551b5872078ca4a7e947cbb9f 28-Aug-2015 Geoff Mendal <mendal@google.com> am 3302cc9a: (-s ours) am b91e187c: (-s ours) am d7a975a2: (-s ours) Import translations. DO NOT MERGE

* commit '3302cc9a653963e4cd9a54934a35f5408aab044f':
3b9c491270b52c232edd1cd957726a72fc75044d 28-Aug-2015 Amit Mahajan <amitmahajan@google.com> am 04acddb7: am 7881604a: (-s ours) am 7da7ea93: Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)

* commit '04acddb70a105cd770c82efb308d1da7a1462f9b':
8029d292012759136deaf2896c0d4f4f363db558 28-Aug-2015 Amit Mahajan <amitmahajan@google.com> am 01af870b: am 2ef2d46f: (-s ours) am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '01af870bc229bb6fc1494d1fb0e8779360e7a956':
56b543a14c45394387b284667b77da95501eb2ad 28-Aug-2015 Santos Cordon <santoscordon@google.com> am d39bce71: am ca2bb16c: (-s ours) am bcfbd682: Merge "Add logging in Telecom for conference call & audio tracking." into mnc-dev

* commit 'd39bce71eb57e1df80bc7083e653f170d2da6765':
09bf83e174ce43019468a8703c2d32011119ac96 28-Aug-2015 Santos Cordon <santoscordon@google.com> am 66c2d472: am 7aeb79c1: (-s ours) am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev

* commit '66c2d472c3536c3f9995873172770536cdff99cb':
93d2943a5133da518924d6026393c920520a46ae 28-Aug-2015 Nancy Chen <nancychen@google.com> am f7568de2: am 0f929907: (-s ours) am 4c0050a0: Merge "Fix runtime error when clicking "call back" from secondary user." into mnc-dev

* commit 'f7568de2c6ce2f92f930bb1dea6f78bce5f5e0d3':
6b681992f1782b68dba1129af49d9902958cf47c 28-Aug-2015 Geoff Mendal <mendal@google.com> am 50262550: (-s ours) am b788ac53: (-s ours) am 3279c8bb: (-s ours) Import translations. DO NOT MERGE

* commit '50262550141207ba55a396a012495b3c49daf805':
dd5d2eeaeb5befba9190c462e8de01ee6143c1aa 28-Aug-2015 Shriram Ganesh <sganesh@codeaurora.org> am e7601cc8: am 40d6c38c: (-s ours) am 0f39c557: Fix to handle IllegalArgumentException

* commit 'e7601cc8515af53d693a260161099e3ee394e484':
2a828bc42320b4b818291b5d47ae587496571345 28-Aug-2015 Geoff Mendal <mendal@google.com> am 9ba3448f: (-s ours) am b99732b9: (-s ours) am f9beee19: (-s ours) Import translations. DO NOT MERGE

* commit '9ba3448fad9d359fac4a9d36f6df160c13c9952d':
92714aa4339788a3510e3f238d212badcdf59dd3 27-Aug-2015 Roshan Pius <rpius@google.com> Don't request audio focus on call rejection.

We need to abandon audio focus instead of requesting it
when an incoming call is rejected. Hence checking if the
foreground call is in disconnected state before requesting for
audio focus.

BUG: 23523949

Change-Id: I08ce03dc178419b42239f9818afad249e2c584da
rc/com/android/server/telecom/CallAudioManager.java
44d7fae5c5b2733dd9a44bef6607795f36320682 27-Aug-2015 Roshan Pius <rpius@google.com> am 9608c400: am 9a017a3c: am af557380: Merge "Reject incoming calls when dialing a outgoing call" into mnc-dr-dev

* commit '9608c400594f2c904a33cadcd8d344fd2165681d':
Reject incoming calls when dialing a outgoing call
9608c400594f2c904a33cadcd8d344fd2165681d 27-Aug-2015 Roshan Pius <rpius@google.com> am 9a017a3c: am af557380: Merge "Reject incoming calls when dialing a outgoing call" into mnc-dr-dev

* commit '9a017a3c32ccc1eecef857f18c574917a93818a6':
Reject incoming calls when dialing a outgoing call
9a017a3c32ccc1eecef857f18c574917a93818a6 27-Aug-2015 Roshan Pius <rpius@google.com> am af557380: Merge "Reject incoming calls when dialing a outgoing call" into mnc-dr-dev

* commit 'af5573804edc80a73b66d711687218c84ab8b6ae':
Reject incoming calls when dialing a outgoing call
af5573804edc80a73b66d711687218c84ab8b6ae 27-Aug-2015 Roshan Pius <rpius@google.com> Merge "Reject incoming calls when dialing a outgoing call" into mnc-dr-dev
63b8842666a3393b02d513e5523958650794559e 27-Aug-2015 Anthony Lee <anthonylee@google.com> am 4da6be8e: (-s ours) am 7c64a4ee: Don\'t print PII

* commit '4da6be8ec1b35b05bb4f557a7ae0b89ff790f1c5':
2e34cd7eead78535529064113beb01921953e397 27-Aug-2015 Geoff Mendal <mendal@google.com> am 62283023: (-s ours) am 762b4fd8: (-s ours) Import translations. DO NOT MERGE

* commit '62283023d4307e18e3742e8995b51ee24c15e038':
279784f79bf1b687bf2d1f6df835a1a193764732 27-Aug-2015 Jay Shrauner <shrauner@google.com> am 801f0bdc: (-s ours) am 606777af: Merge "Name user call activity "Phone"" into mnc-dev

* commit '801f0bdc3e06ab5404595f47326c088e68fa9fc3':
89acd1abe8dc3eec5aee678160097f8da2a79077 27-Aug-2015 Tyler Gunn <tgunn@google.com> am 3459089b: (-s ours) am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev

* commit '3459089bf9f383b3ce7f1d811953b3c785eac0b8':
eca598248c2ea85aeade359b8573dd6f6001db71 27-Aug-2015 Roshan Pius <rpius@google.com> am b213354c: (-s ours) am 6f752c88: Migrate existing SIP PhoneAccount IDs to username.

* commit 'b213354c413f8610fe32c504cb3986d875259c19':
e5cd86195daf491d8e7974687cbb28e77d8c1a13 27-Aug-2015 Roshan Pius <rpius@google.com> am 417184b1: (-s ours) am 1a373830: Fetch phoneaccount from child for live conf calls.

* commit '417184b1a5483faaefa16a0ff1475a77ad838acb':
ccf101a736430d7c0b7cb47df762ef4fd64e3e8f 27-Aug-2015 Roshan Pius <rpius@google.com> am d01e53b7: (-s ours) am ba9ac49f: Merge "Mark missed calls as read in calllog restore(3/3)" into mnc-dev

* commit 'd01e53b7a980d651788e6b9879887aa59a915c5c':
58507977797e741b13597d22b2e1242f3b89fcb6 27-Aug-2015 Roshan Pius <rpius@google.com> am 7bd0308b: (-s ours) am d9544092: Disallow new call addition for live CDMA calls.

* commit '7bd0308b29e7df9c98b4ae5404f1bb417f5de08c':
d06a1cbb30072064a2e075d05e3aad1e439513db 27-Aug-2015 Amit Mahajan <amitmahajan@google.com> am 9582abae: (-s ours) am 86b8e33e: Add OrSelf to privileged permission check.

* commit '9582abae491865fbfc337eda3667550e705b33bd':
7c008a159b5b6e88f6349a9e3f07a0b5a13bc59d 27-Aug-2015 Sailesh Nepal <sail@google.com> am 91f3d6b8: (-s ours) am fc43ea86: Add user ID parameter for getSimCallMangaer

* commit '91f3d6b86ab14c2adb4ac4efbee8c3d41cb78191':
149148e44685f23561d7afead98fae88c7bfff15 27-Aug-2015 Roshan Pius <rpius@google.com> am 77f6abd9: (-s ours) am 03bb751b: Merge "Maintain call time across SRVCC (1/3)." into mnc-dev

* commit '77f6abd9b487fcb7f28ad07b76a43b85401ecf73':
ebb844ef221dc67aca96d960577d0766c206e6e5 27-Aug-2015 Tyler Gunn <tgunn@google.com> am ede21c0b: (-s ours) am f8d97800: Pass current call into CallAudioManager#setIsRinging.

* commit 'ede21c0b2946e1665b5243206f9bc600d5ed2f6e':
b38e508ca7263e0125c575a35bb7d07047cde31c 27-Aug-2015 Jay Shrauner <shrauner@google.com> am cbe3f1a7: (-s ours) am 9c090d4d: Change Settings name to "Phone Call Management"

* commit 'cbe3f1a715fe539fefe9f044ba18db8cc3ccbdfb':
3302cc9a653963e4cd9a54934a35f5408aab044f 27-Aug-2015 Geoff Mendal <mendal@google.com> am b91e187c: (-s ours) am d7a975a2: (-s ours) Import translations. DO NOT MERGE

* commit 'b91e187ccb1e1ab6c6edc495bc31095f452f22be':
04acddb70a105cd770c82efb308d1da7a1462f9b 27-Aug-2015 Amit Mahajan <amitmahajan@google.com> am 7881604a: (-s ours) am 7da7ea93: Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)

* commit '7881604a22dc092af0ccf3ebbbefedb16a5cc390':
01af870bc229bb6fc1494d1fb0e8779360e7a956 27-Aug-2015 Amit Mahajan <amitmahajan@google.com> am 2ef2d46f: (-s ours) am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '2ef2d46f5dbc29314a731e9211bd6cbd51528867':
d39bce71eb57e1df80bc7083e653f170d2da6765 27-Aug-2015 Santos Cordon <santoscordon@google.com> am ca2bb16c: (-s ours) am bcfbd682: Merge "Add logging in Telecom for conference call & audio tracking." into mnc-dev

* commit 'ca2bb16c1a57519e1b5d46095b53fd6cd6de32be':
66c2d472c3536c3f9995873172770536cdff99cb 27-Aug-2015 Santos Cordon <santoscordon@google.com> am 7aeb79c1: (-s ours) am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev

* commit '7aeb79c111da4c4b6c9653782170cbfab972b758':
f7568de2c6ce2f92f930bb1dea6f78bce5f5e0d3 27-Aug-2015 Nancy Chen <nancychen@google.com> am 0f929907: (-s ours) am 4c0050a0: Merge "Fix runtime error when clicking "call back" from secondary user." into mnc-dev

* commit '0f9299075d021c351189d15f8596574489263b1c':
50262550141207ba55a396a012495b3c49daf805 27-Aug-2015 Geoff Mendal <mendal@google.com> am b788ac53: (-s ours) am 3279c8bb: (-s ours) Import translations. DO NOT MERGE

* commit 'b788ac5367be4805461f025ab568eb44b74a9e5f':
e7601cc8515af53d693a260161099e3ee394e484 27-Aug-2015 Shriram Ganesh <sganesh@codeaurora.org> am 40d6c38c: (-s ours) am 0f39c557: Fix to handle IllegalArgumentException

* commit '40d6c38cb489d99e009aa4f5ced1461143143b11':
9ba3448fad9d359fac4a9d36f6df160c13c9952d 27-Aug-2015 Geoff Mendal <mendal@google.com> am b99732b9: (-s ours) am f9beee19: (-s ours) Import translations. DO NOT MERGE

* commit 'b99732b95e83c941e57a835b2465057ce55e9685':
b7566f06b23f13cf6396d17573553167a096c1de 25-Aug-2015 Anthony Lee <anthonylee@google.com> am 8349d95b: am 6fcab50c: am 61035efe: am 0ad80ae6: am 7c64a4ee: Don\'t print PII

* commit '8349d95b38a91f9f929667ccc7e39ee6316bcd83':
Don't print PII
8349d95b38a91f9f929667ccc7e39ee6316bcd83 25-Aug-2015 Anthony Lee <anthonylee@google.com> am 6fcab50c: am 61035efe: am 0ad80ae6: am 7c64a4ee: Don\'t print PII

* commit '6fcab50ce6284a5779c9dfb116926013af52c41b':
Don't print PII
6fcab50ce6284a5779c9dfb116926013af52c41b 25-Aug-2015 Anthony Lee <anthonylee@google.com> am 61035efe: am 0ad80ae6: am 7c64a4ee: Don\'t print PII

* commit '61035efeee61da94b9571e84d574dc14f6ce3d60':
Don't print PII
61035efeee61da94b9571e84d574dc14f6ce3d60 25-Aug-2015 Anthony Lee <anthonylee@google.com> am 0ad80ae6: am 7c64a4ee: Don\'t print PII

* commit '0ad80ae6db7846af2f763ab5bea8d92b01237614':
Don't print PII
0ad80ae6db7846af2f763ab5bea8d92b01237614 25-Aug-2015 Anthony Lee <anthonylee@google.com> am 7c64a4ee: Don\'t print PII

* commit '7c64a4ee56436c6e3d2492f6c1d1076e10c862ee':
Don't print PII
4da6be8ec1b35b05bb4f557a7ae0b89ff790f1c5 25-Aug-2015 Anthony Lee <anthonylee@google.com> am 7c64a4ee: Don\'t print PII

* commit '7c64a4ee56436c6e3d2492f6c1d1076e10c862ee':
Don't print PII
7c64a4ee56436c6e3d2492f6c1d1076e10c862ee 25-Aug-2015 Anthony Lee <anthonylee@google.com> Don't print PII

Bug: 22907228
Change-Id: I2e6cc9264a093d4864c4a59df62be84c34bc1c39
rc/com/android/server/telecom/PhoneAccountRegistrar.java
5324b90307e4f1a5556d10d44d05b06f8d788f44 25-Aug-2015 Bryce Lee <brycelee@google.com> am f023bbe3: am f32e8c7b: am 61340907: Only add callback into missed call notification with non-null handle.

* commit 'f023bbe35f3e059c7937eefee54d56e66fbac9b6':
Only add callback into missed call notification with non-null handle.
f023bbe35f3e059c7937eefee54d56e66fbac9b6 25-Aug-2015 Bryce Lee <brycelee@google.com> am f32e8c7b: am 61340907: Only add callback into missed call notification with non-null handle.

* commit 'f32e8c7b46d5c22b6e4f8c971b9ecdf07f1b947c':
Only add callback into missed call notification with non-null handle.
f32e8c7b46d5c22b6e4f8c971b9ecdf07f1b947c 25-Aug-2015 Bryce Lee <brycelee@google.com> am 61340907: Only add callback into missed call notification with non-null handle.

* commit '6134090794feafcbf3f09878a16b12f00d9b3215':
Only add callback into missed call notification with non-null handle.
6134090794feafcbf3f09878a16b12f00d9b3215 25-Aug-2015 Bryce Lee <brycelee@google.com> Only add callback into missed call notification with non-null handle.

Change-Id: I13fac3aa2c12b232c9caa0d19fa5ab544d8b907b
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
4de4a89b1d07646d51b1a7feda3c4329a09b5234 24-Aug-2015 Roshan Pius <rpius@google.com> Reject incoming calls when dialing a outgoing call

When an outgoing call is still being dialled, we cannot hold that call
if a new incoming call is received at the same moment. Hence reject any
incoming calls if we're still dialing an outgoing call. These incoming
calls will be logged as missed to the user in call logger.

BUG: 23428950
Change-Id: I97693afd443073ea9642d69aa67542ee1aa3eff7
rc/com/android/server/telecom/CallsManager.java
a0ac2b98707453aa4632e7f38d8e5dc770914ff5 19-Aug-2015 Geoff Mendal <mendal@google.com> am ca3bc1db: (-s ours) am 5314e71e: (-s ours) am 2e65dd91: (-s ours) am f5c3a700: (-s ours) Import translations. DO NOT MERGE

* commit 'ca3bc1db316bcb645ffc331fc2998739a8349801':
Import translations. DO NOT MERGE
ca3bc1db316bcb645ffc331fc2998739a8349801 19-Aug-2015 Geoff Mendal <mendal@google.com> am 5314e71e: (-s ours) am 2e65dd91: (-s ours) am f5c3a700: (-s ours) Import translations. DO NOT MERGE

* commit '5314e71eb2f22e16ec3b2e9cfbeba8a4ecb2fa2b':
Import translations. DO NOT MERGE
5314e71eb2f22e16ec3b2e9cfbeba8a4ecb2fa2b 19-Aug-2015 Geoff Mendal <mendal@google.com> am 2e65dd91: (-s ours) am f5c3a700: (-s ours) Import translations. DO NOT MERGE

* commit '2e65dd91aae6ac09b1759e8f9e28dd03115270f6':
Import translations. DO NOT MERGE
2e65dd91aae6ac09b1759e8f9e28dd03115270f6 19-Aug-2015 Geoff Mendal <mendal@google.com> am f5c3a700: (-s ours) Import translations. DO NOT MERGE

* commit 'f5c3a70042340c355f7533c14e4b4045cd3af685':
Import translations. DO NOT MERGE
f5c3a70042340c355f7533c14e4b4045cd3af685 19-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I30998eaa581d5852bb32678b0592b3e53edeea74
Auto-generated-cl: translation import
es/values-af/strings.xml
fe0a005f174975a08790a433e53e4b1567134fd8 19-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I4542360121c98887e3f905b86752ab0e8f1aa26e
Auto-generated-cl: translation import
es/values-af/strings.xml
650b94810a1b4eaa331bd02f33f4a01c17d87d6c 17-Aug-2015 Nancy Chen <nancychen@google.com> Fix getAllPhoneAccounts() api method, was returning nothing.

The getAllPhoneAccounts() API method was returning an empty list because
it was it was not being filled with actual accounts from the telecom
registry.

Bug: 23023110
Change-Id: Ia9dc0067dc481c401c5af88011450469580d5682
rc/com/android/server/telecom/TelecomServiceImpl.java
08ac2bcbea034ad9c5575f5886969a8786677fdc 17-Aug-2015 Geoff Mendal <mendal@google.com> am bbed3093: (-s ours) am ae17cde2: (-s ours) am d018c892: (-s ours) am f4807c6d: (-s ours) Import translations. DO NOT MERGE

* commit 'bbed30932260f602e0181d553e7fdc10c7a29a26':
Import translations. DO NOT MERGE
bbed30932260f602e0181d553e7fdc10c7a29a26 17-Aug-2015 Geoff Mendal <mendal@google.com> am ae17cde2: (-s ours) am d018c892: (-s ours) am f4807c6d: (-s ours) Import translations. DO NOT MERGE

* commit 'ae17cde203ffe19500febfc1d3d8dfe80b07e123':
Import translations. DO NOT MERGE
ae17cde203ffe19500febfc1d3d8dfe80b07e123 17-Aug-2015 Geoff Mendal <mendal@google.com> am d018c892: (-s ours) am f4807c6d: (-s ours) Import translations. DO NOT MERGE

* commit 'd018c892a6c8347dcce0cdb1140102c54141d314':
Import translations. DO NOT MERGE
d018c892a6c8347dcce0cdb1140102c54141d314 17-Aug-2015 Geoff Mendal <mendal@google.com> am f4807c6d: (-s ours) Import translations. DO NOT MERGE

* commit 'f4807c6d91e534b3a5884fbe295f1d4d67a17a21':
Import translations. DO NOT MERGE
f4807c6d91e534b3a5884fbe295f1d4d67a17a21 17-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I7322601b74e0f0bdedda279d953b82de00839c5d
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
59f8b6112386f74f71a68bfc568cef4ead9537dd 17-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I20da4577a7591959e3de973caa615759050b814b
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
4070ba048f9a05b642f989d6d9394b59bc073b08 14-Aug-2015 Geoff Mendal <mendal@google.com> am 05f11de6: (-s ours) am 1ed75a05: (-s ours) am ca74f32c: (-s ours) am 3fc785ce: (-s ours) am 762b4fd8: (-s ours) Import translations. DO NOT MERGE

* commit '05f11de602bca04ce366725e63f1b65e9a341a06':
Import translations. DO NOT MERGE
29c56cb2ee3d18da6b9aca09917644c5cbca26f4 14-Aug-2015 Roshan Pius <rpius@google.com> am d10bfee7: am 16b5df58: am fa3b7b6a: am 17010e55: Disallow resetting of emergency flag in telecom.

* commit 'd10bfee7280f2eb34348476884370d4dd06e1038':
Disallow resetting of emergency flag in telecom.
05f11de602bca04ce366725e63f1b65e9a341a06 14-Aug-2015 Geoff Mendal <mendal@google.com> am 1ed75a05: (-s ours) am ca74f32c: (-s ours) am 3fc785ce: (-s ours) am 762b4fd8: (-s ours) Import translations. DO NOT MERGE

* commit '1ed75a0569b8ece86fe96eb4340cffb181f6765b':
Import translations. DO NOT MERGE
d10bfee7280f2eb34348476884370d4dd06e1038 14-Aug-2015 Roshan Pius <rpius@google.com> am 16b5df58: am fa3b7b6a: am 17010e55: Disallow resetting of emergency flag in telecom.

* commit '16b5df58d6cbbf85d48b27d916750a7508a5d766':
Disallow resetting of emergency flag in telecom.
1ed75a0569b8ece86fe96eb4340cffb181f6765b 14-Aug-2015 Geoff Mendal <mendal@google.com> am ca74f32c: (-s ours) am 3fc785ce: (-s ours) am 762b4fd8: (-s ours) Import translations. DO NOT MERGE

* commit 'ca74f32c12bbbe401f0f266751fccd34148229dd':
Import translations. DO NOT MERGE
ca74f32c12bbbe401f0f266751fccd34148229dd 14-Aug-2015 Geoff Mendal <mendal@google.com> am 3fc785ce: (-s ours) am 762b4fd8: (-s ours) Import translations. DO NOT MERGE

* commit '3fc785cea4056dccd516d31bbace37d767ea4a72':
Import translations. DO NOT MERGE
62283023d4307e18e3742e8995b51ee24c15e038 14-Aug-2015 Geoff Mendal <mendal@google.com> am 762b4fd8: (-s ours) Import translations. DO NOT MERGE

* commit '762b4fd8457cfb501c16fecf28bb4c63e8d0262f':
Import translations. DO NOT MERGE
3fc785cea4056dccd516d31bbace37d767ea4a72 14-Aug-2015 Geoff Mendal <mendal@google.com> am 762b4fd8: (-s ours) Import translations. DO NOT MERGE

* commit '762b4fd8457cfb501c16fecf28bb4c63e8d0262f':
Import translations. DO NOT MERGE
762b4fd8457cfb501c16fecf28bb4c63e8d0262f 14-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 23090337
Change-Id: I9239eadedee782429e438d74d52c59317be0fb42
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
16b5df58d6cbbf85d48b27d916750a7508a5d766 13-Aug-2015 Roshan Pius <rpius@google.com> am fa3b7b6a: am 17010e55: Disallow resetting of emergency flag in telecom.

* commit 'fa3b7b6ac2e81a989850f0d5d5bc4fba6fd67fff':
Disallow resetting of emergency flag in telecom.
fa3b7b6ac2e81a989850f0d5d5bc4fba6fd67fff 13-Aug-2015 Roshan Pius <rpius@google.com> am 17010e55: Disallow resetting of emergency flag in telecom.

* commit '17010e559b99302cd64450a92e30c7817128035d':
Disallow resetting of emergency flag in telecom.
17010e559b99302cd64450a92e30c7817128035d 13-Aug-2015 Roshan Pius <rpius@google.com> Disallow resetting of emergency flag in telecom.

Once a call is marked as an emergency call in telecom, prevent
resetting the flag from lower layers.

BUG: 22851640
Change-Id: I3880871c33b691040984e631b0da8170ac9356b9
rc/com/android/server/telecom/Call.java
4b0a265171f9b1f4d4513224f0129737c0fd6552 13-Aug-2015 Nancy Chen <nancychen@google.com> Merge "Add SDK versions for Telecomm."
41fed9a147922ff4bce2b986b3614cd929d38f96 12-Aug-2015 Nancy Chen <nancychen@google.com> Add SDK versions for Telecomm.

This change is necessary to be able to install Telecomm using adb
install.

Bug: 23151337
Change-Id: I14b4343ee57c0b59dcab99c7b8f098d4f9b9bea8
ndroidManifest.xml
d941d35b9c4972bf606103795bc6612eef961418 12-Aug-2015 Jay Shrauner <shrauner@google.com> am 82aa4488: am f53e753d: am 6964cca8: am 1076675f: am 606777af: Merge "Name user call activity "Phone"" into mnc-dev

* commit '82aa44883900d2cf73e6a290886d78cd3d0df26c':
Name user call activity "Phone"
82aa44883900d2cf73e6a290886d78cd3d0df26c 12-Aug-2015 Jay Shrauner <shrauner@google.com> am f53e753d: am 6964cca8: am 1076675f: am 606777af: Merge "Name user call activity "Phone"" into mnc-dev

* commit 'f53e753d416496106f1d80c28acd3cd12502d031':
Name user call activity "Phone"
5d9d88d8234f24c325c83d2ececa84705c828a7a 12-Aug-2015 Tyler Gunn <tgunn@google.com> am 94caa35d: am 427855e5: am 46b42ef3: am 05f9e8d0: Merge "Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber." into mnc-dr-dev

* commit '94caa35d4ce999df18078e1112aaf403217c4c99':
Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber.
f53e753d416496106f1d80c28acd3cd12502d031 12-Aug-2015 Jay Shrauner <shrauner@google.com> am 6964cca8: am 1076675f: am 606777af: Merge "Name user call activity "Phone"" into mnc-dev

* commit '6964cca85d40a9d700fa9fd3630f3bb5359a5b02':
Name user call activity "Phone"
94caa35d4ce999df18078e1112aaf403217c4c99 12-Aug-2015 Tyler Gunn <tgunn@google.com> am 427855e5: am 46b42ef3: am 05f9e8d0: Merge "Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber." into mnc-dr-dev

* commit '427855e56a70179063dc370625f4216847c5454f':
Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber.
6964cca85d40a9d700fa9fd3630f3bb5359a5b02 12-Aug-2015 Jay Shrauner <shrauner@google.com> am 1076675f: am 606777af: Merge "Name user call activity "Phone"" into mnc-dev

* commit '1076675f0fecfe4293b92cab3afcb873b267dae4':
Name user call activity "Phone"
427855e56a70179063dc370625f4216847c5454f 12-Aug-2015 Tyler Gunn <tgunn@google.com> am 46b42ef3: am 05f9e8d0: Merge "Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber." into mnc-dr-dev

* commit '46b42ef307e1b334db7a6ff42e1a69349331851b':
Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber.
1076675f0fecfe4293b92cab3afcb873b267dae4 12-Aug-2015 Jay Shrauner <shrauner@google.com> am 606777af: Merge "Name user call activity "Phone"" into mnc-dev

* commit '606777afcb888f88be9ae1265f123703675130b0':
Name user call activity "Phone"
801f0bdc3e06ab5404595f47326c088e68fa9fc3 12-Aug-2015 Jay Shrauner <shrauner@google.com> am 606777af: Merge "Name user call activity "Phone"" into mnc-dev

* commit '606777afcb888f88be9ae1265f123703675130b0':
Name user call activity "Phone"
46b42ef307e1b334db7a6ff42e1a69349331851b 12-Aug-2015 Tyler Gunn <tgunn@google.com> am 05f9e8d0: Merge "Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber." into mnc-dr-dev

* commit '05f9e8d01064d63b08b5f888dc0cb4ee03c7f024':
Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber.
606777afcb888f88be9ae1265f123703675130b0 12-Aug-2015 Jay Shrauner <shrauner@google.com> Merge "Name user call activity "Phone"" into mnc-dev
05f9e8d01064d63b08b5f888dc0cb4ee03c7f024 12-Aug-2015 Tyler Gunn <tgunn@google.com> Merge "Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber." into mnc-dr-dev
6ffe531cc43849b5ca22a23647f5e729fae01c25 12-Aug-2015 Tyler Gunn <tgunn@google.com> Minimize the number of calls to PhoneNumberUtils.isLocalEmergencyNumber.

On a standard outgoing call, isLocalEmergencyNumber was being called
from 30-40 times. Each of these calls requires a system service
invocation.

The Telecom Call object already has an isEmergencyCall() property which
is set any time the handle on the call changes.
When ever possible in Telecom, I have used this already calculated value.

These changes reduce the number of calls to isLocalEmergencyNumber
by about 5-10.

Also removed a duplicate call to setHandle() in the Call constructor.

Bug: 22985202
Change-Id: Ic8662d4ab506486858caf4fbff61c32bae2b7c8c
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
4e594313d5430151658e8a723318f3c02ae6944b 12-Aug-2015 Tyler Gunn <tgunn@google.com> am 10b8e84b: am 803bf856: am db6ead53: am 3c326af8: am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev

* commit '10b8e84b8a231887ab3314bd0e0e61286dd94e55':
Fix issue where GSM conference is held in makeRoomForOutgoingCall.
43c0c11556c911a6066a138d38d2f535f4a4736b 12-Aug-2015 Roshan Pius <rpius@google.com> am 496ffeb4: am 89c640e3: am 36164a6e: am 5c881446: am 6f752c88: Migrate existing SIP PhoneAccount IDs to username.

* commit '496ffeb47f11f11d789b73172284f248e02a9806':
Migrate existing SIP PhoneAccount IDs to username.
10b8e84b8a231887ab3314bd0e0e61286dd94e55 12-Aug-2015 Tyler Gunn <tgunn@google.com> am 803bf856: am db6ead53: am 3c326af8: am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev

* commit '803bf8565ed3599183f83feea22d9e4cbb1c9070':
Fix issue where GSM conference is held in makeRoomForOutgoingCall.
496ffeb47f11f11d789b73172284f248e02a9806 12-Aug-2015 Roshan Pius <rpius@google.com> am 89c640e3: am 36164a6e: am 5c881446: am 6f752c88: Migrate existing SIP PhoneAccount IDs to username.

* commit '89c640e322a12c6dfbdb95ef2e8c1ec9bc57626c':
Migrate existing SIP PhoneAccount IDs to username.
803bf8565ed3599183f83feea22d9e4cbb1c9070 12-Aug-2015 Tyler Gunn <tgunn@google.com> am db6ead53: am 3c326af8: am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev

* commit 'db6ead532377b6d057a8861aef7b6bc0fb0f8f42':
Fix issue where GSM conference is held in makeRoomForOutgoingCall.
89c640e322a12c6dfbdb95ef2e8c1ec9bc57626c 12-Aug-2015 Roshan Pius <rpius@google.com> am 36164a6e: am 5c881446: am 6f752c88: Migrate existing SIP PhoneAccount IDs to username.

* commit '36164a6ea15aff5a6b9e17eb6246bdef1359c691':
Migrate existing SIP PhoneAccount IDs to username.
db6ead532377b6d057a8861aef7b6bc0fb0f8f42 12-Aug-2015 Tyler Gunn <tgunn@google.com> am 3c326af8: am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev

* commit '3c326af846f42391af9798e315dbbdc85aae3efd':
Fix issue where GSM conference is held in makeRoomForOutgoingCall.
36164a6ea15aff5a6b9e17eb6246bdef1359c691 12-Aug-2015 Roshan Pius <rpius@google.com> am 5c881446: am 6f752c88: Migrate existing SIP PhoneAccount IDs to username.

* commit '5c8814465106e99e1eabfe5ad7cdcc4b895a78b1':
Migrate existing SIP PhoneAccount IDs to username.
3459089bf9f383b3ce7f1d811953b3c785eac0b8 12-Aug-2015 Tyler Gunn <tgunn@google.com> am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev

* commit '595787d05bc84212c075c0c5f9a84af642880398':
Fix issue where GSM conference is held in makeRoomForOutgoingCall.
b213354c413f8610fe32c504cb3986d875259c19 12-Aug-2015 Roshan Pius <rpius@google.com> am 6f752c88: Migrate existing SIP PhoneAccount IDs to username.

* commit '6f752c88d583f3f8f149919aefdb667e3176fef8':
Migrate existing SIP PhoneAccount IDs to username.
3c326af846f42391af9798e315dbbdc85aae3efd 12-Aug-2015 Tyler Gunn <tgunn@google.com> am 595787d0: Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev

* commit '595787d05bc84212c075c0c5f9a84af642880398':
Fix issue where GSM conference is held in makeRoomForOutgoingCall.
5c8814465106e99e1eabfe5ad7cdcc4b895a78b1 12-Aug-2015 Roshan Pius <rpius@google.com> am 6f752c88: Migrate existing SIP PhoneAccount IDs to username.

* commit '6f752c88d583f3f8f149919aefdb667e3176fef8':
Migrate existing SIP PhoneAccount IDs to username.
595787d05bc84212c075c0c5f9a84af642880398 12-Aug-2015 Tyler Gunn <tgunn@google.com> Merge "Fix issue where GSM conference is held in makeRoomForOutgoingCall." into mnc-dev
e4cd9162be58042a99c6f5eadfa9b77d5686a8ea 12-Aug-2015 Tyler Gunn <tgunn@google.com> Fix issue where GSM conference is held in makeRoomForOutgoingCall.

- See code comments. The extra hold in makeRoomForOutgoingCall was being
caused by the fact conferences do not have a target phoneaccount set.
This is causing makeRoomForOutgoingCall to hold the conference, when
the connection service is already doing that.

Bug: 22609387
Change-Id: Ieb4817bd35204c48cc5b7bf24384062afd5b7075
rc/com/android/server/telecom/CallsManager.java
4d0b4198e8831c9eb89154d2176f679cb14cde49 11-Aug-2015 Jay Shrauner <shrauner@google.com> Name user call activity "Phone"

Name the main call activity differently from the app label so that
it's a simpler name in activity disambuation dialogues.

Bug:23090337
Change-Id: I2f4eb92022dcce2c29f08dc4cdd2ee4282af8842
ndroidManifest.xml
es/values/strings.xml
6f752c88d583f3f8f149919aefdb667e3176fef8 10-Aug-2015 Roshan Pius <rpius@google.com> Migrate existing SIP PhoneAccount IDs to username.

We've changed the SIP phone accounts to use the SIP username as
account handle ID in M (ag/685031). So, need to migrate all existing
SIP phone accounts when upgrading from L or lower releases to use the
new account handle ID.
Adding a new version of the phone-account-registrar-state.xml file to
detect the need to migrate and replace the SIP URI's on the accounts
with only the username.

BUG: 23028921
Change-Id: I8cc6f099ec9cafb71c5cf6d040245ddb6a3b00ea
rc/com/android/server/telecom/PhoneAccountRegistrar.java
052041d6b191bef0f703fb20f4862e1e6acd6a0e 10-Aug-2015 Roshan Pius <rpius@google.com> am 302254ea: am 99fa1e01: am 25f462c2: am 4483e65c: am 1a373830: Fetch phoneaccount from child for live conf calls.

* commit '302254ea6f98080a6a5a18a542adc1e2403d3a89':
Fetch phoneaccount from child for live conf calls.
302254ea6f98080a6a5a18a542adc1e2403d3a89 10-Aug-2015 Roshan Pius <rpius@google.com> am 99fa1e01: am 25f462c2: am 4483e65c: am 1a373830: Fetch phoneaccount from child for live conf calls.

* commit '99fa1e013fd582864d9fdb5a48957c341f67e2d5':
Fetch phoneaccount from child for live conf calls.
99fa1e013fd582864d9fdb5a48957c341f67e2d5 10-Aug-2015 Roshan Pius <rpius@google.com> am 25f462c2: am 4483e65c: am 1a373830: Fetch phoneaccount from child for live conf calls.

* commit '25f462c2ebc13d0b0ef42e889eacb5a07f71b5e2':
Fetch phoneaccount from child for live conf calls.
25f462c2ebc13d0b0ef42e889eacb5a07f71b5e2 10-Aug-2015 Roshan Pius <rpius@google.com> am 4483e65c: am 1a373830: Fetch phoneaccount from child for live conf calls.

* commit '4483e65cb66baee55059e785d27f73d094e8538d':
Fetch phoneaccount from child for live conf calls.
4483e65cb66baee55059e785d27f73d094e8538d 10-Aug-2015 Roshan Pius <rpius@google.com> am 1a373830: Fetch phoneaccount from child for live conf calls.

* commit '1a373830332493b610f98c3d00afe0713af7050a':
Fetch phoneaccount from child for live conf calls.
417184b1a5483faaefa16a0ff1475a77ad838acb 10-Aug-2015 Roshan Pius <rpius@google.com> am 1a373830: Fetch phoneaccount from child for live conf calls.

* commit '1a373830332493b610f98c3d00afe0713af7050a':
Fetch phoneaccount from child for live conf calls.
0217575be771535ab57dbcf8a989a06e6c3cf4ad 10-Aug-2015 Bryce Lee <brycelee@google.com> am 1785aa1b: am 38f5febb: am a181703c: Merge "Allow a custom component to receive notification of missed call." into cw-e-dev

* commit '1785aa1b8a09cbd3f201e81abe5faedbe299fd7a':
Allow a custom component to receive notification of missed call.
1785aa1b8a09cbd3f201e81abe5faedbe299fd7a 10-Aug-2015 Bryce Lee <brycelee@google.com> am 38f5febb: am a181703c: Merge "Allow a custom component to receive notification of missed call." into cw-e-dev

* commit '38f5febb6d07e41e7ffaf647d7f292546a4fc1e9':
Allow a custom component to receive notification of missed call.
38f5febb6d07e41e7ffaf647d7f292546a4fc1e9 10-Aug-2015 Bryce Lee <brycelee@google.com> am a181703c: Merge "Allow a custom component to receive notification of missed call." into cw-e-dev

* commit 'a181703cbd1281bcaa3ca73972b38d82d07b1b28':
Allow a custom component to receive notification of missed call.
a181703cbd1281bcaa3ca73972b38d82d07b1b28 10-Aug-2015 Bryce Lee <brycelee@google.com> Merge "Allow a custom component to receive notification of missed call." into cw-e-dev
1a373830332493b610f98c3d00afe0713af7050a 07-Aug-2015 Roshan Pius <rpius@google.com> Fetch phoneaccount from child for live conf calls.

Some conference calls don't seem to have a targetPhoneAccount set on
them. So, fetch the targetPhoneAccount from the child calls if it is not
set on the conference call for any new calls placed.

BUG: 22954116
Change-Id: Id97cf70954593b863bebce0903717cc806b0e3fe
rc/com/android/server/telecom/CallsManager.java
c5d7ae7ff1ee50d5c1d4117d665b23417f50f26a 05-Aug-2015 Tyler Gunn <tgunn@google.com> am 84636277: am e02c719b: am 08860052: am b110806e: Merge "Pass call subject from ACTION_CALL intent to Connections." into mnc-dr-dev

* commit '8463627780dd8a590a2e271ad7c1859a7d368d34':
Pass call subject from ACTION_CALL intent to Connections.
41045b499a47c00459986c96bbbb28ffee2cbefc 05-Aug-2015 Bryce Lee <brycelee@google.com> Allow a custom component to receive notification of missed call.

By setting the custom component, the system notification is suppressed.

Change-Id: Idfc0354aaa97776e19ad642e44a88978577559a9
ndroidManifest.xml
es/values/config.xml
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
8463627780dd8a590a2e271ad7c1859a7d368d34 05-Aug-2015 Tyler Gunn <tgunn@google.com> am e02c719b: am 08860052: am b110806e: Merge "Pass call subject from ACTION_CALL intent to Connections." into mnc-dr-dev

* commit 'e02c719b3e6f3b835ceba5d9b1004abbf3ea2513':
Pass call subject from ACTION_CALL intent to Connections.
e02c719b3e6f3b835ceba5d9b1004abbf3ea2513 05-Aug-2015 Tyler Gunn <tgunn@google.com> am 08860052: am b110806e: Merge "Pass call subject from ACTION_CALL intent to Connections." into mnc-dr-dev

* commit '088600520da0a2e5f9ef93d1f24f6f006a64ec59':
Pass call subject from ACTION_CALL intent to Connections.
088600520da0a2e5f9ef93d1f24f6f006a64ec59 05-Aug-2015 Tyler Gunn <tgunn@google.com> am b110806e: Merge "Pass call subject from ACTION_CALL intent to Connections." into mnc-dr-dev

* commit 'b110806e7555acc0baeea0f5383316e2503fc937':
Pass call subject from ACTION_CALL intent to Connections.
b110806e7555acc0baeea0f5383316e2503fc937 05-Aug-2015 Tyler Gunn <tgunn@google.com> Merge "Pass call subject from ACTION_CALL intent to Connections." into mnc-dr-dev
bcf022e1bbf646d97a8a81fd241c9b44c887dadb 05-Aug-2015 Roshan Pius <rpius@google.com> am 42fa7fa5: am 29ce481e: am ef99c1ab: am 1c3cc048: am ba9ac49f: Merge "Mark missed calls as read in calllog restore(3/3)" into mnc-dev

* commit '42fa7fa56fc11909fe8b4ab9bd26be683cd6a445':
Mark missed calls as read in calllog restore(3/3)
42fa7fa56fc11909fe8b4ab9bd26be683cd6a445 05-Aug-2015 Roshan Pius <rpius@google.com> am 29ce481e: am ef99c1ab: am 1c3cc048: am ba9ac49f: Merge "Mark missed calls as read in calllog restore(3/3)" into mnc-dev

* commit '29ce481e7d7d4c06dec90e1468198641d9e24a14':
Mark missed calls as read in calllog restore(3/3)
29ce481e7d7d4c06dec90e1468198641d9e24a14 05-Aug-2015 Roshan Pius <rpius@google.com> am ef99c1ab: am 1c3cc048: am ba9ac49f: Merge "Mark missed calls as read in calllog restore(3/3)" into mnc-dev

* commit 'ef99c1ab4a02f6537a8d692c78dd19f37a2293fd':
Mark missed calls as read in calllog restore(3/3)
ef99c1ab4a02f6537a8d692c78dd19f37a2293fd 05-Aug-2015 Roshan Pius <rpius@google.com> am 1c3cc048: am ba9ac49f: Merge "Mark missed calls as read in calllog restore(3/3)" into mnc-dev

* commit '1c3cc0481d5c396b2bbdaf97021828fb41eebfd3':
Mark missed calls as read in calllog restore(3/3)
d01e53b7a980d651788e6b9879887aa59a915c5c 05-Aug-2015 Roshan Pius <rpius@google.com> am ba9ac49f: Merge "Mark missed calls as read in calllog restore(3/3)" into mnc-dev

* commit 'ba9ac49f303506a03288a66d13719d4fd2352785':
Mark missed calls as read in calllog restore(3/3)
1c3cc0481d5c396b2bbdaf97021828fb41eebfd3 05-Aug-2015 Roshan Pius <rpius@google.com> am ba9ac49f: Merge "Mark missed calls as read in calllog restore(3/3)" into mnc-dev

* commit 'ba9ac49f303506a03288a66d13719d4fd2352785':
Mark missed calls as read in calllog restore(3/3)
ba9ac49f303506a03288a66d13719d4fd2352785 05-Aug-2015 Roshan Pius <rpius@google.com> Merge "Mark missed calls as read in calllog restore(3/3)" into mnc-dev
ec0a146fe7dd633ee88e8edeabc122a48a12f1c0 05-Aug-2015 Roshan Pius <rpius@google.com> Mark missed calls as read in calllog restore(3/3)

Query only for missed calls which are not already read when showing the
notifications for missed call at bootup.

BUG: 22908952
Change-Id: Ide09a6617b13808e3ffc7e9d8d4d2d880146dd25
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
24b6d7743ea4c896afe51830b2600527f97916c9 03-Aug-2015 Tyler Gunn <tgunn@google.com> Pass call subject from ACTION_CALL intent to Connections.

- Added code in test connection service to faciliate testing call subjects.

Bug: 22685114
Change-Id: I729a574107cc2913f8cff956b03876053e4c44de
rc/com/android/server/telecom/CallIntentProcessor.java
estapps/src/com/android/server/telecom/testapps/CallServiceNotifier.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
ef934e0fdf2dcc8f1139e449bbec1d2a49abe719 01-Aug-2015 Geoff Mendal <mendal@google.com> am c9878a2c: (-s ours) am d24fdbf5: (-s ours) am b152170f: (-s ours) am 44f524e2: (-s ours) Import translations. DO NOT MERGE

* commit 'c9878a2c3d4f5141801c5165fed165d30f6fafad':
Import translations. DO NOT MERGE
b3e56a58cdb7946130b67e5169411997229335fd 01-Aug-2015 Roshan Pius <rpius@google.com> am 48b74c5b: am 3ffa440f: am 8aac647e: am 9f8db94f: am d9544092: Disallow new call addition for live CDMA calls.

* commit '48b74c5bfa7d338beb481f5b88a26472224bbe0d':
Disallow new call addition for live CDMA calls.
c9878a2c3d4f5141801c5165fed165d30f6fafad 01-Aug-2015 Geoff Mendal <mendal@google.com> am d24fdbf5: (-s ours) am b152170f: (-s ours) am 44f524e2: (-s ours) Import translations. DO NOT MERGE

* commit 'd24fdbf54cd34547242da177f628401b2fe11bb3':
Import translations. DO NOT MERGE
48b74c5bfa7d338beb481f5b88a26472224bbe0d 01-Aug-2015 Roshan Pius <rpius@google.com> am 3ffa440f: am 8aac647e: am 9f8db94f: am d9544092: Disallow new call addition for live CDMA calls.

* commit '3ffa440fdfea9413946c1749e7a4544023de7316':
Disallow new call addition for live CDMA calls.
d24fdbf54cd34547242da177f628401b2fe11bb3 01-Aug-2015 Geoff Mendal <mendal@google.com> am b152170f: (-s ours) am 44f524e2: (-s ours) Import translations. DO NOT MERGE

* commit 'b152170f43d0b9e745ed1a3c1df5589a98a48e1f':
Import translations. DO NOT MERGE
3ffa440fdfea9413946c1749e7a4544023de7316 01-Aug-2015 Roshan Pius <rpius@google.com> am 8aac647e: am 9f8db94f: am d9544092: Disallow new call addition for live CDMA calls.

* commit '8aac647e169366f0b1542849431dd8323ab6e9a8':
Disallow new call addition for live CDMA calls.
b152170f43d0b9e745ed1a3c1df5589a98a48e1f 01-Aug-2015 Geoff Mendal <mendal@google.com> am 44f524e2: (-s ours) Import translations. DO NOT MERGE

* commit '44f524e2c92477c410eeec08d15031988b70900e':
Import translations. DO NOT MERGE
8aac647e169366f0b1542849431dd8323ab6e9a8 01-Aug-2015 Roshan Pius <rpius@google.com> am 9f8db94f: am d9544092: Disallow new call addition for live CDMA calls.

* commit '9f8db94f9aa88236d2d4379bd24b1efff713cbcb':
Disallow new call addition for live CDMA calls.
44f524e2c92477c410eeec08d15031988b70900e 01-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I54f34ef19b1c8fee61f13fcbaa5b4b8b16022169
Auto-generated-cl: translation import
es/values-ky-rKG/strings.xml
882b054c7e4dde85ff08b5529fe4ccde5074b7fd 01-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I6d4bee9e736d1a1b5d1cf4ed2b4a0f42c31f519c
Auto-generated-cl: translation import
es/values-ky-rKG/strings.xml
7bd0308b29e7df9c98b4ae5404f1bb417f5de08c 01-Aug-2015 Roshan Pius <rpius@google.com> am d9544092: Disallow new call addition for live CDMA calls.

* commit 'd9544092457d3a6f584a24bb0542ee42bf99878d':
Disallow new call addition for live CDMA calls.
9f8db94f9aa88236d2d4379bd24b1efff713cbcb 01-Aug-2015 Roshan Pius <rpius@google.com> am d9544092: Disallow new call addition for live CDMA calls.

* commit 'd9544092457d3a6f584a24bb0542ee42bf99878d':
Disallow new call addition for live CDMA calls.
d9544092457d3a6f584a24bb0542ee42bf99878d 31-Jul-2015 Roshan Pius <rpius@google.com> Disallow new call addition for live CDMA calls.

Disallow call addition when the foreground call does not support HOLD.
This is for CDMA calls which do not support HOLD capability and hence we
cannot place a simultaneous call.

BUG: 22850789
Change-Id: I2e4b396f5665b5517275766daa722866cf92d68c
rc/com/android/server/telecom/CallsManager.java
9d622868e6de0e58bbf578196e0d130417fe7752 31-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 3832202c: am 8e91f3c2: am 9f91c905: am 306c6bea: am 86b8e33e: Add OrSelf to privileged permission check.

* commit '3832202cbeadc7ea76d4a38326c2e7c5e223eb8c':
Add OrSelf to privileged permission check.
3832202cbeadc7ea76d4a38326c2e7c5e223eb8c 31-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 8e91f3c2: am 9f91c905: am 306c6bea: am 86b8e33e: Add OrSelf to privileged permission check.

* commit '8e91f3c256ac5999d8c8fd8730150ef48040bbe6':
Add OrSelf to privileged permission check.
8e91f3c256ac5999d8c8fd8730150ef48040bbe6 31-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 9f91c905: am 306c6bea: am 86b8e33e: Add OrSelf to privileged permission check.

* commit '9f91c905f995f8dd427c4d7eb5f0d9f7327c5dbf':
Add OrSelf to privileged permission check.
9f91c905f995f8dd427c4d7eb5f0d9f7327c5dbf 31-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 306c6bea: am 86b8e33e: Add OrSelf to privileged permission check.

* commit '306c6bea5bae52bc0c8e659e66b7591e72743c4f':
Add OrSelf to privileged permission check.
306c6bea5bae52bc0c8e659e66b7591e72743c4f 31-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 86b8e33e: Add OrSelf to privileged permission check.

* commit '86b8e33e74b859427b51651c76c8ec58f57b5f65':
Add OrSelf to privileged permission check.
9582abae491865fbfc337eda3667550e705b33bd 31-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 86b8e33e: Add OrSelf to privileged permission check.

* commit '86b8e33e74b859427b51651c76c8ec58f57b5f65':
Add OrSelf to privileged permission check.
86b8e33e74b859427b51651c76c8ec58f57b5f65 31-Jul-2015 Amit Mahajan <amitmahajan@google.com> Add OrSelf to privileged permission check.

Bug: 22857263
Change-Id: Ide7105dfd653e3c271330822fb8cee7cf620e35d
rc/com/android/server/telecom/TelecomServiceImpl.java
6073102b95d4c44b4f24dbfc130a59a87f864716 30-Jul-2015 Sailesh Nepal <sail@google.com> am 28aa7226: am 9ce0f3c5: am 3d597809: am 86f74eb4: am fc43ea86: Add user ID parameter for getSimCallMangaer

* commit '28aa7226bcb3f8aae7c98fdc16f6fb500e391cac':
Add user ID parameter for getSimCallMangaer
28aa7226bcb3f8aae7c98fdc16f6fb500e391cac 29-Jul-2015 Sailesh Nepal <sail@google.com> am 9ce0f3c5: am 3d597809: am 86f74eb4: am fc43ea86: Add user ID parameter for getSimCallMangaer

* commit '9ce0f3c5649e359fc98b6341aa273dd3cb80cf86':
Add user ID parameter for getSimCallMangaer
9ce0f3c5649e359fc98b6341aa273dd3cb80cf86 29-Jul-2015 Sailesh Nepal <sail@google.com> am 3d597809: am 86f74eb4: am fc43ea86: Add user ID parameter for getSimCallMangaer

* commit '3d5978099bfef1435a331cb51cc0398e006574a5':
Add user ID parameter for getSimCallMangaer
3d5978099bfef1435a331cb51cc0398e006574a5 29-Jul-2015 Sailesh Nepal <sail@google.com> am 86f74eb4: am fc43ea86: Add user ID parameter for getSimCallMangaer

* commit '86f74eb4cbcd9ce18e5f52a7f0f16d10f743386a':
Add user ID parameter for getSimCallMangaer
91f3d6b86ab14c2adb4ac4efbee8c3d41cb78191 29-Jul-2015 Sailesh Nepal <sail@google.com> am fc43ea86: Add user ID parameter for getSimCallMangaer

* commit 'fc43ea86697d3d052415cbb4feda7bd508563532':
Add user ID parameter for getSimCallMangaer
86f74eb4cbcd9ce18e5f52a7f0f16d10f743386a 29-Jul-2015 Sailesh Nepal <sail@google.com> am fc43ea86: Add user ID parameter for getSimCallMangaer

* commit 'fc43ea86697d3d052415cbb4feda7bd508563532':
Add user ID parameter for getSimCallMangaer
fc43ea86697d3d052415cbb4feda7bd508563532 29-Jul-2015 Sailesh Nepal <sail@google.com> Add user ID parameter for getSimCallMangaer

The sim call manager depends on the default dialer
which is a per user setting.

This CL adds a user ID to the getSimCallManager API.

BUG: 22790160
Change-Id: Icaf1db6c6943b3ddbd16a946a81d1bfb734d761f
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
77047005042ef397310a0630efea1e210bcac4b6 22-Jul-2015 Geoff Mendal <mendal@google.com> am e879925f: (-s ours) am b7f461aa: (-s ours) am 116c58c2: (-s ours) am 959d446a: (-s ours) Import translations. DO NOT MERGE

* commit 'e879925f7a7e0e2324f46de513e71048771fafc3':
Import translations. DO NOT MERGE
e879925f7a7e0e2324f46de513e71048771fafc3 22-Jul-2015 Geoff Mendal <mendal@google.com> am b7f461aa: (-s ours) am 116c58c2: (-s ours) am 959d446a: (-s ours) Import translations. DO NOT MERGE

* commit 'b7f461aacf59e1cc6ab659c4bf7efd1d9d3a0f19':
Import translations. DO NOT MERGE
b7f461aacf59e1cc6ab659c4bf7efd1d9d3a0f19 22-Jul-2015 Geoff Mendal <mendal@google.com> am 116c58c2: (-s ours) am 959d446a: (-s ours) Import translations. DO NOT MERGE

* commit '116c58c2db4cf2c69c05ac36c896b8034e12c4d4':
Import translations. DO NOT MERGE
116c58c2db4cf2c69c05ac36c896b8034e12c4d4 22-Jul-2015 Geoff Mendal <mendal@google.com> am 959d446a: (-s ours) Import translations. DO NOT MERGE

* commit '959d446ae8fffb034afe220679c20cbf217e6494':
Import translations. DO NOT MERGE
959d446ae8fffb034afe220679c20cbf217e6494 22-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Icad41241a57497c7fcc47a2f402772eb74dbf333
Auto-generated-cl: translation import
es/values-ky-rKG/strings.xml
es/values-uz-rUZ/strings.xml
8caa4ae490ce10b2e964784cbd97a9691eddde3a 22-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I69587dd072203cc58b02450873f401b52ad03702
Auto-generated-cl: translation import
es/values-ky-rKG/strings.xml
es/values-uz-rUZ/strings.xml
216dbe536156d06954966d0f2178fdb7c8024cf6 20-Jul-2015 Geoff Mendal <mendal@google.com> am aeaa53d4: (-s ours) am 9b3df927: (-s ours) am d5f9d358: (-s ours) am a27c997e: (-s ours) Import translations. DO NOT MERGE

* commit 'aeaa53d44608c68e332e59d6e202f1ef99a1a32a':
Import translations. DO NOT MERGE
aeaa53d44608c68e332e59d6e202f1ef99a1a32a 20-Jul-2015 Geoff Mendal <mendal@google.com> am 9b3df927: (-s ours) am d5f9d358: (-s ours) am a27c997e: (-s ours) Import translations. DO NOT MERGE

* commit '9b3df92711f91009487814e11fbdb44732d352b9':
Import translations. DO NOT MERGE
9b3df92711f91009487814e11fbdb44732d352b9 20-Jul-2015 Geoff Mendal <mendal@google.com> am d5f9d358: (-s ours) am a27c997e: (-s ours) Import translations. DO NOT MERGE

* commit 'd5f9d358eb89f014674049366bcbfcbd2387e6ee':
Import translations. DO NOT MERGE
d5f9d358eb89f014674049366bcbfcbd2387e6ee 20-Jul-2015 Geoff Mendal <mendal@google.com> am a27c997e: (-s ours) Import translations. DO NOT MERGE

* commit 'a27c997e57dc8511bbf92bf65aabb2904d659075':
Import translations. DO NOT MERGE
a27c997e57dc8511bbf92bf65aabb2904d659075 20-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I5f69b4718f168658b2f2501458f78553dbaca079
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
dff811ddf4f0ed0819cb834c385bb2c0728ca306 20-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I9538b8211841e7b6de2cd9a3b39412d2a63864bc
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
18f533964e5cf16a4ebcd40becd4014fbe2ef325 17-Jul-2015 Roshan Pius <rpius@google.com> am 2c6de414: am 5909d0f6: am 96d0fc69: am 0653d164: am 03bb751b: Merge "Maintain call time across SRVCC (1/3)." into mnc-dev

* commit '2c6de41470589e34a546bae902595020325fff2e':
Maintain call time across SRVCC (1/3).
e4889d5548a4304852e33df9f06da01b8cd0c558 17-Jul-2015 Tyler Gunn <tgunn@google.com> am a68f30a1: am b8060329: am 3310b732: am d969f3f4: am f8d97800: Pass current call into CallAudioManager#setIsRinging.

* commit 'a68f30a1c6fd901ae5d6da3258b20784e8e34153':
Pass current call into CallAudioManager#setIsRinging.
2c6de41470589e34a546bae902595020325fff2e 17-Jul-2015 Roshan Pius <rpius@google.com> am 5909d0f6: am 96d0fc69: am 0653d164: am 03bb751b: Merge "Maintain call time across SRVCC (1/3)." into mnc-dev

* commit '5909d0f6988ffd64dd318782209afd3ce6301eca':
Maintain call time across SRVCC (1/3).
a68f30a1c6fd901ae5d6da3258b20784e8e34153 17-Jul-2015 Tyler Gunn <tgunn@google.com> am b8060329: am 3310b732: am d969f3f4: am f8d97800: Pass current call into CallAudioManager#setIsRinging.

* commit 'b806032982575fd0c58d77132eecf7f207a49bc3':
Pass current call into CallAudioManager#setIsRinging.
5909d0f6988ffd64dd318782209afd3ce6301eca 17-Jul-2015 Roshan Pius <rpius@google.com> am 96d0fc69: am 0653d164: am 03bb751b: Merge "Maintain call time across SRVCC (1/3)." into mnc-dev

* commit '96d0fc6957c3a87aa05e1179cc529b718ff96ad2':
Maintain call time across SRVCC (1/3).
b806032982575fd0c58d77132eecf7f207a49bc3 17-Jul-2015 Tyler Gunn <tgunn@google.com> am 3310b732: am d969f3f4: am f8d97800: Pass current call into CallAudioManager#setIsRinging.

* commit '3310b732a7daa93055e69d6620fa7fb699686a9c':
Pass current call into CallAudioManager#setIsRinging.
96d0fc6957c3a87aa05e1179cc529b718ff96ad2 17-Jul-2015 Roshan Pius <rpius@google.com> am 0653d164: am 03bb751b: Merge "Maintain call time across SRVCC (1/3)." into mnc-dev

* commit '0653d1641ba8ae6fe5d924626b2b9061cfa38423':
Maintain call time across SRVCC (1/3).
3310b732a7daa93055e69d6620fa7fb699686a9c 17-Jul-2015 Tyler Gunn <tgunn@google.com> am d969f3f4: am f8d97800: Pass current call into CallAudioManager#setIsRinging.

* commit 'd969f3f41826a22652068690de9d15fb9ad411db':
Pass current call into CallAudioManager#setIsRinging.
0653d1641ba8ae6fe5d924626b2b9061cfa38423 17-Jul-2015 Roshan Pius <rpius@google.com> am 03bb751b: Merge "Maintain call time across SRVCC (1/3)." into mnc-dev

* commit '03bb751bf63860523d255f8ec35419d9ec780e75':
Maintain call time across SRVCC (1/3).
d969f3f41826a22652068690de9d15fb9ad411db 17-Jul-2015 Tyler Gunn <tgunn@google.com> am f8d97800: Pass current call into CallAudioManager#setIsRinging.

* commit 'f8d9780043253983435f6067ecb622df136e5dbc':
Pass current call into CallAudioManager#setIsRinging.
77f6abd9b487fcb7f28ad07b76a43b85401ecf73 17-Jul-2015 Roshan Pius <rpius@google.com> am 03bb751b: Merge "Maintain call time across SRVCC (1/3)." into mnc-dev

* commit '03bb751bf63860523d255f8ec35419d9ec780e75':
Maintain call time across SRVCC (1/3).
ede21c0b2946e1665b5243206f9bc600d5ed2f6e 17-Jul-2015 Tyler Gunn <tgunn@google.com> am f8d97800: Pass current call into CallAudioManager#setIsRinging.

* commit 'f8d9780043253983435f6067ecb622df136e5dbc':
Pass current call into CallAudioManager#setIsRinging.
03bb751bf63860523d255f8ec35419d9ec780e75 17-Jul-2015 Roshan Pius <rpius@google.com> Merge "Maintain call time across SRVCC (1/3)." into mnc-dev
f8d9780043253983435f6067ecb622df136e5dbc 17-Jul-2015 Tyler Gunn <tgunn@google.com> Pass current call into CallAudioManager#setIsRinging.

It is possible that when setIsRinging() is called on CallAudioManager
that the initial audio state will be set at that point. However,
setInitialAudioState requires the current call to determine the appropriate
audio route. It defaults to wired or earpiece if there is no call.

Fixed by ensuring setIsRinging takes a call as context so that the initial
audio state can be properly set.

Bug: 22515446
Change-Id: I9c01cf6cf27e916d7e4117aa13e603682a5059fb
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/Ringer.java
084ab0835ea9879185d3e6aa7f9be48ae4067bed 15-Jul-2015 Roshan Pius <rpius@google.com> Maintain call time across SRVCC (1/3).

When an IMS conference call encounters an SRVCC event requiring a
fallback to GSM/CDMA, we need to maintain the call time for the
conference host across this fallback. So, adding a connectTime attribute
in the underlying conference host's connection object which can be used
to account for the call time from the now inactive conference call into
the new call created.

BUG: 21918593
Change-Id: I2d31761bd4af4a3ec199b998a0ce511001dcf632
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
e85d4870ddb8756560ce8abe08706ec02af12dee 16-Jul-2015 Jay Shrauner <shrauner@google.com> am 638abf0b: am 78d04ed2: am ebbfa09b: am b71dce69: am 9c090d4d: Change Settings name to "Phone Call Management"

* commit '638abf0b9272ee9bb297711b72bc676c15757401':
Change Settings name to "Phone Call Management"
638abf0b9272ee9bb297711b72bc676c15757401 16-Jul-2015 Jay Shrauner <shrauner@google.com> am 78d04ed2: am ebbfa09b: am b71dce69: am 9c090d4d: Change Settings name to "Phone Call Management"

* commit '78d04ed2a1c6de59468837224e3c1682375c01b4':
Change Settings name to "Phone Call Management"
78d04ed2a1c6de59468837224e3c1682375c01b4 16-Jul-2015 Jay Shrauner <shrauner@google.com> am ebbfa09b: am b71dce69: am 9c090d4d: Change Settings name to "Phone Call Management"

* commit 'ebbfa09b5b80a10e57b8cb994347d1efe35e4155':
Change Settings name to "Phone Call Management"
ebbfa09b5b80a10e57b8cb994347d1efe35e4155 16-Jul-2015 Jay Shrauner <shrauner@google.com> am b71dce69: am 9c090d4d: Change Settings name to "Phone Call Management"

* commit 'b71dce698597a5275b997cfce14fbf24a440b03b':
Change Settings name to "Phone Call Management"
b71dce698597a5275b997cfce14fbf24a440b03b 16-Jul-2015 Jay Shrauner <shrauner@google.com> am 9c090d4d: Change Settings name to "Phone Call Management"

* commit '9c090d4d0489503a4a9857b47997ce07e397703c':
Change Settings name to "Phone Call Management"
cbe3f1a715fe539fefe9f044ba18db8cc3ccbdfb 16-Jul-2015 Jay Shrauner <shrauner@google.com> am 9c090d4d: Change Settings name to "Phone Call Management"

* commit '9c090d4d0489503a4a9857b47997ce07e397703c':
Change Settings name to "Phone Call Management"
9c090d4d0489503a4a9857b47997ce07e397703c 16-Jul-2015 Jay Shrauner <shrauner@google.com> Change Settings name to "Phone Call Management"

Drop hyphen in Settings name

Bug:22510177
Change-Id: Ifd713bf319be5f7b6457352997292fc78896a6b5
es/values/strings.xml
4e88c2e1750ec7495aa23b35f2db6e8ead9272e1 15-Jul-2015 Geoff Mendal <mendal@google.com> am b28ca16b: (-s ours) am 393366e1: (-s ours) am 04bced22: (-s ours) am d5f3f3df: (-s ours) am d7a975a2: (-s ours) Import translations. DO NOT MERGE

* commit 'b28ca16b684bb7b28e0d9a571eda29eb3a012acc':
Import translations. DO NOT MERGE
d7d831d434a813a40442d3f2107a416b8af7050b 15-Jul-2015 Geoff Mendal <mendal@google.com> am 2ba0ce63: (-s ours) am bd04a845: (-s ours) am 7f5ab43d: (-s ours) am 84e2c2f0: (-s ours) Import translations. DO NOT MERGE

* commit '2ba0ce630287b79dcb038a4f842066ffa21154f9':
Import translations. DO NOT MERGE
b28ca16b684bb7b28e0d9a571eda29eb3a012acc 15-Jul-2015 Geoff Mendal <mendal@google.com> am 393366e1: (-s ours) am 04bced22: (-s ours) am d5f3f3df: (-s ours) am d7a975a2: (-s ours) Import translations. DO NOT MERGE

* commit '393366e137ad99cf171c8c78ea0db25aece07bcb':
Import translations. DO NOT MERGE
2ba0ce630287b79dcb038a4f842066ffa21154f9 15-Jul-2015 Geoff Mendal <mendal@google.com> am bd04a845: (-s ours) am 7f5ab43d: (-s ours) am 84e2c2f0: (-s ours) Import translations. DO NOT MERGE

* commit 'bd04a84529206a9947a512eb21a2bb884a115732':
Import translations. DO NOT MERGE
393366e137ad99cf171c8c78ea0db25aece07bcb 15-Jul-2015 Geoff Mendal <mendal@google.com> am 04bced22: (-s ours) am d5f3f3df: (-s ours) am d7a975a2: (-s ours) Import translations. DO NOT MERGE

* commit '04bced2202027d36c31dc5ef19d8d12defb49757':
Import translations. DO NOT MERGE
bd04a84529206a9947a512eb21a2bb884a115732 15-Jul-2015 Geoff Mendal <mendal@google.com> am 7f5ab43d: (-s ours) am 84e2c2f0: (-s ours) Import translations. DO NOT MERGE

* commit '7f5ab43d359289eedac599786fd45f5d14d54264':
Import translations. DO NOT MERGE
04bced2202027d36c31dc5ef19d8d12defb49757 15-Jul-2015 Geoff Mendal <mendal@google.com> am d5f3f3df: (-s ours) am d7a975a2: (-s ours) Import translations. DO NOT MERGE

* commit 'd5f3f3dffd37c3f81d3b8a2cb38d4266e5156b83':
Import translations. DO NOT MERGE
7f5ab43d359289eedac599786fd45f5d14d54264 15-Jul-2015 Geoff Mendal <mendal@google.com> am 84e2c2f0: (-s ours) Import translations. DO NOT MERGE

* commit '84e2c2f0cd754195ac28787a6233bd7aa7d8844f':
Import translations. DO NOT MERGE
d5f3f3dffd37c3f81d3b8a2cb38d4266e5156b83 15-Jul-2015 Geoff Mendal <mendal@google.com> am d7a975a2: (-s ours) Import translations. DO NOT MERGE

* commit 'd7a975a2a4174f443d6898191d6f77d7076bca66':
Import translations. DO NOT MERGE
b91e187ccb1e1ab6c6edc495bc31095f452f22be 15-Jul-2015 Geoff Mendal <mendal@google.com> am d7a975a2: (-s ours) Import translations. DO NOT MERGE

* commit 'd7a975a2a4174f443d6898191d6f77d7076bca66':
Import translations. DO NOT MERGE
84e2c2f0cd754195ac28787a6233bd7aa7d8844f 15-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I7cfed3b9dd77794d61ad597cb6d8e404b864986c
Auto-generated-cl: translation import
es/values-ta-rIN/strings.xml
d7a975a2a4174f443d6898191d6f77d7076bca66 15-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I350020a349930c6b7b3051026408fb20b84105b9
Auto-generated-cl: translation import
es/values-ta-rIN/strings.xml
e87ab12eff771e7d381e9b28b36ab8dc7b936868 15-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I7199fb4b45bc013a7af6220743c7e3924bb98914
Auto-generated-cl: translation import
es/values-ta-rIN/strings.xml
0778caf383a0731ed38331c0366063c21c635fd9 15-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 0300c681: am 9910a051: am 12fbbdd4: am adb1626a: am 7da7ea93: Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)

* commit '0300c6812b409626e529e0290624dc056609027e':
Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)
0300c6812b409626e529e0290624dc056609027e 15-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 9910a051: am 12fbbdd4: am adb1626a: am 7da7ea93: Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)

* commit '9910a051c0fb169b97fab2905ecb6ed95f0b0d10':
Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)
9910a051c0fb169b97fab2905ecb6ed95f0b0d10 15-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 12fbbdd4: am adb1626a: am 7da7ea93: Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)

* commit '12fbbdd4363968469f827edd21517cb9c45257af':
Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)
12fbbdd4363968469f827edd21517cb9c45257af 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> am adb1626a: am 7da7ea93: Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)

* commit 'adb1626ae235edac3baeca8848a0175f30bc5871':
Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)
7881604a22dc092af0ccf3ebbbefedb16a5cc390 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 7da7ea93: Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)

* commit '7da7ea937434faa9acc877a521c072fa83f45932':
Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)
adb1626ae235edac3baeca8848a0175f30bc5871 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 7da7ea93: Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)

* commit '7da7ea937434faa9acc877a521c072fa83f45932':
Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)
7da7ea937434faa9acc877a521c072fa83f45932 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> Fixed typo (READ_PHONE_STATE to READ_PRIVILEGED_PHONE_STATE)

Bug: 22468536
Change-Id: Ifaff7e62f97ae14a0695c5de3bfe9394b6099505
rc/com/android/server/telecom/TelecomServiceImpl.java
13e77901d9b542100510de3eabf2b50ef0ac494e 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 6a405c56: am 218e3bd6: am f15e357c: am ab7c520e: am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '6a405c56c1b749354e5e8980c8a32f981767482f':
Add checks for READ_PRIVILEGED_PHONE_STATE.
6a405c56c1b749354e5e8980c8a32f981767482f 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 218e3bd6: am f15e357c: am ab7c520e: am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '218e3bd6b7d9a3b23dafe8500fe781f801d9cbfb':
Add checks for READ_PRIVILEGED_PHONE_STATE.
73a2f836c6bbc9f01fb0defe077fe9bce0890537 14-Jul-2015 Santos Cordon <santoscordon@google.com> am c2496157: am 231dee26: am 99d3ad76: am d248cc2a: am bcfbd682: Merge "Add logging in Telecom for conference call & audio tracking." into mnc-dev

* commit 'c24961577eeea9e47b5fad62886a6a8cb1844062':
Add logging in Telecom for conference call & audio tracking.
218e3bd6b7d9a3b23dafe8500fe781f801d9cbfb 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> am f15e357c: am ab7c520e: am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit 'f15e357c6017bf5fa4c9626238fd2937b93fa85a':
Add checks for READ_PRIVILEGED_PHONE_STATE.
f15e357c6017bf5fa4c9626238fd2937b93fa85a 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> am ab7c520e: am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit 'ab7c520ecd8a6509e5a9f97c93b731bdeb128a7c':
Add checks for READ_PRIVILEGED_PHONE_STATE.
2ef2d46f5dbc29314a731e9211bd6cbd51528867 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '0ff3d838b6d313963d6b69632a058d426b8b8132':
Add checks for READ_PRIVILEGED_PHONE_STATE.
ab7c520ecd8a6509e5a9f97c93b731bdeb128a7c 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 0ff3d838: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '0ff3d838b6d313963d6b69632a058d426b8b8132':
Add checks for READ_PRIVILEGED_PHONE_STATE.
c24961577eeea9e47b5fad62886a6a8cb1844062 14-Jul-2015 Santos Cordon <santoscordon@google.com> am 231dee26: am 99d3ad76: am d248cc2a: am bcfbd682: Merge "Add logging in Telecom for conference call & audio tracking." into mnc-dev

* commit '231dee2677b6151613c7a04d0d9f4b33c2748e62':
Add logging in Telecom for conference call & audio tracking.
0ff3d838b6d313963d6b69632a058d426b8b8132 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev
231dee2677b6151613c7a04d0d9f4b33c2748e62 14-Jul-2015 Santos Cordon <santoscordon@google.com> am 99d3ad76: am d248cc2a: am bcfbd682: Merge "Add logging in Telecom for conference call & audio tracking." into mnc-dev

* commit '99d3ad76e1500276756227f66ef69d4363cda069':
Add logging in Telecom for conference call & audio tracking.
3c2969304cf130119af613a37c50582bcfbf7921 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> Add checks for READ_PRIVILEGED_PHONE_STATE.

Callers will have either PRIVILEGED or regular READ_PHONE_STATE.

Bug: 22468536
Change-Id: I60251f61250a975f4147b027d2539824a728e3b5
rc/com/android/server/telecom/TelecomServiceImpl.java
99d3ad76e1500276756227f66ef69d4363cda069 14-Jul-2015 Santos Cordon <santoscordon@google.com> am d248cc2a: am bcfbd682: Merge "Add logging in Telecom for conference call & audio tracking." into mnc-dev

* commit 'd248cc2aa70371fb81f8025817b89ee515660b0c':
Add logging in Telecom for conference call & audio tracking.
ca2bb16c1a57519e1b5d46095b53fd6cd6de32be 14-Jul-2015 Santos Cordon <santoscordon@google.com> am bcfbd682: Merge "Add logging in Telecom for conference call & audio tracking." into mnc-dev

* commit 'bcfbd682d7467cc5e65ee7de3f584c25e7b53e61':
Add logging in Telecom for conference call & audio tracking.
d248cc2aa70371fb81f8025817b89ee515660b0c 14-Jul-2015 Santos Cordon <santoscordon@google.com> am bcfbd682: Merge "Add logging in Telecom for conference call & audio tracking." into mnc-dev

* commit 'bcfbd682d7467cc5e65ee7de3f584c25e7b53e61':
Add logging in Telecom for conference call & audio tracking.
bcfbd682d7467cc5e65ee7de3f584c25e7b53e61 14-Jul-2015 Santos Cordon <santoscordon@google.com> Merge "Add logging in Telecom for conference call & audio tracking." into mnc-dev
165c1ced107a1c3b9b359757d41438f9ca585e78 11-Jul-2015 Santos Cordon <santoscordon@google.com> Add logging in Telecom for conference call & audio tracking.

Bug: 22331056
Change-Id: Ib6147e55cd886d678d924c92bb86743c22ad6366
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/ServiceBinder.java
ddd26a7cd1b23e43ec0607503d544c3516a63daa 13-Jul-2015 Geoff Mendal <mendal@google.com> am 2f76b4c5: (-s ours) am e3ed63fa: (-s ours) am c8d40426: (-s ours) am d3045021: (-s ours) Import translations. DO NOT MERGE

* commit '2f76b4c5a1b163636ab156a8ad2fc5896da57cbf':
Import translations. DO NOT MERGE
2f76b4c5a1b163636ab156a8ad2fc5896da57cbf 13-Jul-2015 Geoff Mendal <mendal@google.com> am e3ed63fa: (-s ours) am c8d40426: (-s ours) am d3045021: (-s ours) Import translations. DO NOT MERGE

* commit 'e3ed63fae3e793d12cf30edae399225c354c5c72':
Import translations. DO NOT MERGE
e3ed63fae3e793d12cf30edae399225c354c5c72 13-Jul-2015 Geoff Mendal <mendal@google.com> am c8d40426: (-s ours) am d3045021: (-s ours) Import translations. DO NOT MERGE

* commit 'c8d404265a26840f1d192c79d93a457d21ef32e2':
Import translations. DO NOT MERGE
c8d404265a26840f1d192c79d93a457d21ef32e2 13-Jul-2015 Geoff Mendal <mendal@google.com> am d3045021: (-s ours) Import translations. DO NOT MERGE

* commit 'd3045021220c1d456afa9a72809df6bf1c0937a5':
Import translations. DO NOT MERGE
d3045021220c1d456afa9a72809df6bf1c0937a5 11-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I00598dd63a03a04a2ce37d2dcf38e4650e3eb749
Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-kn-rIN/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-te-rIN/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-uz-rUZ/strings.xml
67d251c07e028f82e1e547c7fe735c38b1e9d705 10-Jul-2015 Santos Cordon <santoscordon@google.com> am 94eb601d: am 062f2380: am 9492dc66: am 33c50fb8: am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev

* commit '94eb601d999815791ff943a1ab846b5d321d377e':
Dont use isPotentialEmergency for our emergency logic.
94eb601d999815791ff943a1ab846b5d321d377e 10-Jul-2015 Santos Cordon <santoscordon@google.com> am 062f2380: am 9492dc66: am 33c50fb8: am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev

* commit '062f23803dd5d35da697bae0ffaa624a73d422f1':
Dont use isPotentialEmergency for our emergency logic.
062f23803dd5d35da697bae0ffaa624a73d422f1 10-Jul-2015 Santos Cordon <santoscordon@google.com> am 9492dc66: am 33c50fb8: am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev

* commit '9492dc660ffc2f2e32817e92ff91448f91377efd':
Dont use isPotentialEmergency for our emergency logic.
9492dc660ffc2f2e32817e92ff91448f91377efd 10-Jul-2015 Santos Cordon <santoscordon@google.com> am 33c50fb8: am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev

* commit '33c50fb8c7135d3cc61ce8dc05de806e1f2bf3bf':
Dont use isPotentialEmergency for our emergency logic.
7aeb79c111da4c4b6c9653782170cbfab972b758 10-Jul-2015 Santos Cordon <santoscordon@google.com> am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev

* commit 'c03de65abdee1c35fe64fd4194ece8a14d0937fe':
Dont use isPotentialEmergency for our emergency logic.
33c50fb8c7135d3cc61ce8dc05de806e1f2bf3bf 10-Jul-2015 Santos Cordon <santoscordon@google.com> am c03de65a: Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev

* commit 'c03de65abdee1c35fe64fd4194ece8a14d0937fe':
Dont use isPotentialEmergency for our emergency logic.
c03de65abdee1c35fe64fd4194ece8a14d0937fe 10-Jul-2015 Santos Cordon <santoscordon@google.com> Merge "Dont use isPotentialEmergency for our emergency logic." into mnc-dev
971e3290d7416129ce5d1910fb77dd083436f3de 09-Jul-2015 Santos Cordon <santoscordon@google.com> Dont use isPotentialEmergency for our emergency logic.

isPotentialEmergency number is meant to prevent 3rd party apps from
circumventing our restriction on dialing emergency numbers (only default
dialer can do that). 3rd parties could potentially circumvent it
by dialing an emergency-prefixed number like 911234 since some carriers
will dial emergency services for those numbers as well.
isPotentialEmergency checks prefixes as well to prevent this.

A bug turned up where we were treating too many calls as emergency and
this is because we were too liberal with our use of
isPotentialEmergency(). We needed to only use in the case above but
we ended up using it all over telecom which caused our 'ask every time'
feature to be disabled 911234 even in markets where that is a valid
non-emergency number.

The fix is to replace our isPotentialEmergency check with isLocalEmergency
for the majority of telecom logic. This puts things at par with the
correct behavior from kitkat.

Bug: 21650423
Change-Id: I075ea9937b54e0b4bc4e158943652c30319e62fd
rc/com/android/server/telecom/TelephonyUtil.java
a542d212013fe6e9216a8e0e29bd55917fde3ad2 09-Jul-2015 Nancy Chen <nancychen@google.com> am 3d52ff3e: am ce224484: am f2e70d09: am 29107f09: am 4c0050a0: Merge "Fix runtime error when clicking "call back" from secondary user." into mnc-dev

* commit '3d52ff3ed8ce15708247e7add74fc814665c15a9':
Fix runtime error when clicking "call back" from secondary user.
3d52ff3ed8ce15708247e7add74fc814665c15a9 09-Jul-2015 Nancy Chen <nancychen@google.com> am ce224484: am f2e70d09: am 29107f09: am 4c0050a0: Merge "Fix runtime error when clicking "call back" from secondary user." into mnc-dev

* commit 'ce22448472f65156280cbd2b4ebdbd5fa0971f60':
Fix runtime error when clicking "call back" from secondary user.
ce22448472f65156280cbd2b4ebdbd5fa0971f60 09-Jul-2015 Nancy Chen <nancychen@google.com> am f2e70d09: am 29107f09: am 4c0050a0: Merge "Fix runtime error when clicking "call back" from secondary user." into mnc-dev

* commit 'f2e70d0966729d5d60cfd11c45a26f3f7727029b':
Fix runtime error when clicking "call back" from secondary user.
f2e70d0966729d5d60cfd11c45a26f3f7727029b 09-Jul-2015 Nancy Chen <nancychen@google.com> am 29107f09: am 4c0050a0: Merge "Fix runtime error when clicking "call back" from secondary user." into mnc-dev

* commit '29107f098f96e2521d731f4cbd5fb905f92d4ca1':
Fix runtime error when clicking "call back" from secondary user.
0f9299075d021c351189d15f8596574489263b1c 09-Jul-2015 Nancy Chen <nancychen@google.com> am 4c0050a0: Merge "Fix runtime error when clicking "call back" from secondary user." into mnc-dev

* commit '4c0050a0f3af248a17d7a66ebcacbe0ddaaa34fd':
Fix runtime error when clicking "call back" from secondary user.
29107f098f96e2521d731f4cbd5fb905f92d4ca1 09-Jul-2015 Nancy Chen <nancychen@google.com> am 4c0050a0: Merge "Fix runtime error when clicking "call back" from secondary user." into mnc-dev

* commit '4c0050a0f3af248a17d7a66ebcacbe0ddaaa34fd':
Fix runtime error when clicking "call back" from secondary user.
4c0050a0f3af248a17d7a66ebcacbe0ddaaa34fd 09-Jul-2015 Nancy Chen <nancychen@google.com> Merge "Fix runtime error when clicking "call back" from secondary user." into mnc-dev
d0361407fceb58b3b9b93cd462877de6e1d54045 07-Jul-2015 Nancy Chen <nancychen@google.com> Fix runtime error when clicking "call back" from secondary user.

Switch startActivity to startActivityAsUser for calling back
from missed call notification. Also add user for missed call dismissing
and starting the dialer recents tab.

Bug: 21500617
Change-Id: I162c0b2b34539a32facc3cd8f9c44348aefbd5f0
rc/com/android/server/telecom/TelecomBroadcastIntentProcessor.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
64757286ba05e30492e6dcd008727fde65f9f0a0 08-Jul-2015 Geoff Mendal <mendal@google.com> am 5b54fb8e: (-s ours) am 28f7d967: (-s ours) am 5f9bbbed: (-s ours) am d5e7e54c: (-s ours) am 3279c8bb: (-s ours) Import translations. DO NOT MERGE

* commit '5b54fb8ebb5c8ca48068fc92bb679ea895680fb2':
Import translations. DO NOT MERGE
5b54fb8ebb5c8ca48068fc92bb679ea895680fb2 08-Jul-2015 Geoff Mendal <mendal@google.com> am 28f7d967: (-s ours) am 5f9bbbed: (-s ours) am d5e7e54c: (-s ours) am 3279c8bb: (-s ours) Import translations. DO NOT MERGE

* commit '28f7d967969b37a920895a32ef4931f41d4f31bb':
Import translations. DO NOT MERGE
28f7d967969b37a920895a32ef4931f41d4f31bb 08-Jul-2015 Geoff Mendal <mendal@google.com> am 5f9bbbed: (-s ours) am d5e7e54c: (-s ours) am 3279c8bb: (-s ours) Import translations. DO NOT MERGE

* commit '5f9bbbedc376c326bb7b7c6752780d1b293afa69':
Import translations. DO NOT MERGE
5f9bbbedc376c326bb7b7c6752780d1b293afa69 08-Jul-2015 Geoff Mendal <mendal@google.com> am d5e7e54c: (-s ours) am 3279c8bb: (-s ours) Import translations. DO NOT MERGE

* commit 'd5e7e54c846688aae1abd62d30eefce88217474a':
Import translations. DO NOT MERGE
d5e7e54c846688aae1abd62d30eefce88217474a 08-Jul-2015 Geoff Mendal <mendal@google.com> am 3279c8bb: (-s ours) Import translations. DO NOT MERGE

* commit '3279c8bb8069aba5cc85af32296664ffb4652830':
Import translations. DO NOT MERGE
b788ac5367be4805461f025ab568eb44b74a9e5f 08-Jul-2015 Geoff Mendal <mendal@google.com> am 3279c8bb: (-s ours) Import translations. DO NOT MERGE

* commit '3279c8bb8069aba5cc85af32296664ffb4652830':
Import translations. DO NOT MERGE
3279c8bb8069aba5cc85af32296664ffb4652830 08-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I40652fc92fe755bc7aa46a8561cb87428437176b
Auto-generated-cl: translation import
es/values-fr/strings.xml
es/values-ms-rMY/strings.xml
es/values-tl/strings.xml
7c0e45286e75d7741f27e31e7d435757a66762af 08-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia432da84f1c8c5914b5055465853c2cc13f7a93b
Auto-generated-cl: translation import
es/values-fr/strings.xml
es/values-ms-rMY/strings.xml
es/values-tl/strings.xml
fce30d9bd14570b27211924f38efe7284fb2728e 07-Jul-2015 Shriram Ganesh <sganesh@codeaurora.org> am 00e74537: am 90ba58ce: am e7408848: am 3ff9dea7: am 0f39c557: Fix to handle IllegalArgumentException

* commit '00e74537214b3ddf15fd072eda4599d5fb20db28':
Fix to handle IllegalArgumentException
00e74537214b3ddf15fd072eda4599d5fb20db28 06-Jul-2015 Shriram Ganesh <sganesh@codeaurora.org> am 90ba58ce: am e7408848: am 3ff9dea7: am 0f39c557: Fix to handle IllegalArgumentException

* commit '90ba58ce09ba79cfb52028512aac1ab7c22f4625':
Fix to handle IllegalArgumentException
90ba58ce09ba79cfb52028512aac1ab7c22f4625 06-Jul-2015 Shriram Ganesh <sganesh@codeaurora.org> am e7408848: am 3ff9dea7: am 0f39c557: Fix to handle IllegalArgumentException

* commit 'e740884817c1b31abd12e9d18944a3a6c9c558f2':
Fix to handle IllegalArgumentException
e740884817c1b31abd12e9d18944a3a6c9c558f2 06-Jul-2015 Shriram Ganesh <sganesh@codeaurora.org> am 3ff9dea7: am 0f39c557: Fix to handle IllegalArgumentException

* commit '3ff9dea7537114559408a58eb1a96ad674054b54':
Fix to handle IllegalArgumentException
3ff9dea7537114559408a58eb1a96ad674054b54 06-Jul-2015 Shriram Ganesh <sganesh@codeaurora.org> am 0f39c557: Fix to handle IllegalArgumentException

* commit '0f39c5571184dbd941a40781e6204630ec4f89eb':
Fix to handle IllegalArgumentException
40d6c38cb489d99e009aa4f5ced1461143143b11 06-Jul-2015 Shriram Ganesh <sganesh@codeaurora.org> am 0f39c557: Fix to handle IllegalArgumentException

* commit '0f39c5571184dbd941a40781e6204630ec4f89eb':
Fix to handle IllegalArgumentException
f8562fc371186808f3cfd223b7bf5ae0122726b3 06-Jul-2015 Geoff Mendal <mendal@google.com> am 5ecd9c5b: (-s ours) am bc7b2af2: (-s ours) am 44a4a97c: (-s ours) am 1044a986: (-s ours) am f9beee19: (-s ours) Import translations. DO NOT MERGE

* commit '5ecd9c5b7534a53dd531a69e062f0931ff937c40':
Import translations. DO NOT MERGE
5ecd9c5b7534a53dd531a69e062f0931ff937c40 06-Jul-2015 Geoff Mendal <mendal@google.com> am bc7b2af2: (-s ours) am 44a4a97c: (-s ours) am 1044a986: (-s ours) am f9beee19: (-s ours) Import translations. DO NOT MERGE

* commit 'bc7b2af21ccb9ecc2e960f7361dae5f18a0a039a':
Import translations. DO NOT MERGE
bc7b2af21ccb9ecc2e960f7361dae5f18a0a039a 06-Jul-2015 Geoff Mendal <mendal@google.com> am 44a4a97c: (-s ours) am 1044a986: (-s ours) am f9beee19: (-s ours) Import translations. DO NOT MERGE

* commit '44a4a97c7d347e85b1c65c8c95398229617ba939':
Import translations. DO NOT MERGE
0f39c5571184dbd941a40781e6204630ec4f89eb 25-Jun-2015 Shriram Ganesh <sganesh@codeaurora.org> Fix to handle IllegalArgumentException

Exception handling mechanism is added to prevent crash in case
of missing contacts provider.

Bug: 22060548
Change-Id: I8c568c1cc53a33fe7a242be634e70aeafb163fb7
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
44a4a97c7d347e85b1c65c8c95398229617ba939 06-Jul-2015 Geoff Mendal <mendal@google.com> am 1044a986: (-s ours) am f9beee19: (-s ours) Import translations. DO NOT MERGE

* commit '1044a9862e37a451cd7e2ea4d32f9b389ae3ee5d':
Import translations. DO NOT MERGE
1044a9862e37a451cd7e2ea4d32f9b389ae3ee5d 06-Jul-2015 Geoff Mendal <mendal@google.com> am f9beee19: (-s ours) Import translations. DO NOT MERGE

* commit 'f9beee195bc52636eb5b01ebb97d767bb49662ca':
Import translations. DO NOT MERGE
b99732b95e83c941e57a835b2465057ce55e9685 06-Jul-2015 Geoff Mendal <mendal@google.com> am f9beee19: (-s ours) Import translations. DO NOT MERGE

* commit 'f9beee195bc52636eb5b01ebb97d767bb49662ca':
Import translations. DO NOT MERGE
f9beee195bc52636eb5b01ebb97d767bb49662ca 06-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I0817d2382641319d9ceb623999490066ea22f0f9
Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-fi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-kn-rIN/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-nb/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-te-rIN/strings.xml
es/values-uk/strings.xml
es/values-uz-rUZ/strings.xml
e60978ff3ebb048b1e0873578ec970ef4eaa2a63 06-Jul-2015 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE"
0b57c90c1888007b3cc96f9bf2e7c3e94bf20109 06-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I677daecc991414e2364512ce743eaa49bbcca6ec
Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-fi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-kn-rIN/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-nb/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-te-rIN/strings.xml
es/values-uk/strings.xml
es/values-uz-rUZ/strings.xml
11ab82095beed5b8898d472fba986c65d8d1b820 06-Jul-2015 Anthony Lee <anthonylee@google.com> am 97c5066f: am 044c27df: am 45c9fa94: Merge "Update BluetoothPhoneServiceImpl to handle childless conference calls." into mnc-dev

* commit '97c5066f99ac3c35551b5a71ff70740ce814629a':
Update BluetoothPhoneServiceImpl to handle childless conference calls.
97c5066f99ac3c35551b5a71ff70740ce814629a 02-Jul-2015 Anthony Lee <anthonylee@google.com> am 044c27df: am 45c9fa94: Merge "Update BluetoothPhoneServiceImpl to handle childless conference calls." into mnc-dev

* commit '044c27df76b49b9cef7c23d6c8641e0787b3ab07':
Update BluetoothPhoneServiceImpl to handle childless conference calls.
044c27df76b49b9cef7c23d6c8641e0787b3ab07 02-Jul-2015 Anthony Lee <anthonylee@google.com> am 45c9fa94: Merge "Update BluetoothPhoneServiceImpl to handle childless conference calls." into mnc-dev

* commit '45c9fa94b80dea42d95e12df0868738ba386098b':
Update BluetoothPhoneServiceImpl to handle childless conference calls.
45c9fa94b80dea42d95e12df0868738ba386098b 02-Jul-2015 Anthony Lee <anthonylee@google.com> Merge "Update BluetoothPhoneServiceImpl to handle childless conference calls." into mnc-dev
8e729e0e5bf7f82700a0ca77d77ed10b472b92f1 01-Jul-2015 Geoff Mendal <mendal@google.com> am 1c256387: (-s ours) am 76abb934: (-s ours) am c4ed0217: (-s ours) Import translations. DO NOT MERGE

* commit '1c256387c3f5e5c3202d0db2393d8f89b68c6494':
Import translations. DO NOT MERGE
1c256387c3f5e5c3202d0db2393d8f89b68c6494 01-Jul-2015 Geoff Mendal <mendal@google.com> am 76abb934: (-s ours) am c4ed0217: (-s ours) Import translations. DO NOT MERGE

* commit '76abb934155519e40cfb3b500fefe37b57376993':
Import translations. DO NOT MERGE
76abb934155519e40cfb3b500fefe37b57376993 01-Jul-2015 Geoff Mendal <mendal@google.com> am c4ed0217: (-s ours) Import translations. DO NOT MERGE

* commit 'c4ed02174bf21a1b39380af676a3ed7fb8eb8328':
Import translations. DO NOT MERGE
c4ed02174bf21a1b39380af676a3ed7fb8eb8328 01-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I6a76425c0fd6895830a2abb5cde5a358b2641187
Auto-generated-cl: translation import
es/values-da/strings.xml
es/values-eu-rES/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-tr/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
f3d690852ad24a6fcec69eb5953f1b26bba8f0e0 01-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Iefc5ac7c3b7182b42a23f2b7a0eff92442ff1f4f
Auto-generated-cl: translation import
es/values-da/strings.xml
es/values-eu-rES/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-tr/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
fd622ccf064cc51b1d8a7a0eb0001cb6759dd4eb 01-Jul-2015 Roshan Pius <rpius@google.com> am 1ec66834: am b66bee44: am 7a6df31b: Merge "Delay unbinding the incall services on call remove." into mnc-dev

* commit '1ec6683407528349a1f540edd3a6cb5cd6ed7339':
Delay unbinding the incall services on call remove.
1ec6683407528349a1f540edd3a6cb5cd6ed7339 01-Jul-2015 Roshan Pius <rpius@google.com> am b66bee44: am 7a6df31b: Merge "Delay unbinding the incall services on call remove." into mnc-dev

* commit 'b66bee4429f474bce3f49b55eca0e0d7ece53ae8':
Delay unbinding the incall services on call remove.
b66bee4429f474bce3f49b55eca0e0d7ece53ae8 01-Jul-2015 Roshan Pius <rpius@google.com> am 7a6df31b: Merge "Delay unbinding the incall services on call remove." into mnc-dev

* commit '7a6df31b30295e30553a6de9a0bcad9a5ec80726':
Delay unbinding the incall services on call remove.
7a6df31b30295e30553a6de9a0bcad9a5ec80726 01-Jul-2015 Roshan Pius <rpius@google.com> Merge "Delay unbinding the incall services on call remove." into mnc-dev
5f39d939daf66b8c8262dc00d98bfd1c99b66643 30-Jun-2015 Yorke Lee <yorkelee@google.com> am bff548e5: am bf3bc58e: am af7a8263: Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev

* commit 'bff548e5f20c4e0ecda2c21d782abb974441e933':
Fix TelecomManager.isVoicemailNumber
bff548e5f20c4e0ecda2c21d782abb974441e933 30-Jun-2015 Yorke Lee <yorkelee@google.com> am bf3bc58e: am af7a8263: Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev

* commit 'bf3bc58e573faa6d9cc7565b53cf7c8daa7c9d10':
Fix TelecomManager.isVoicemailNumber
bf3bc58e573faa6d9cc7565b53cf7c8daa7c9d10 30-Jun-2015 Yorke Lee <yorkelee@google.com> am af7a8263: Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev

* commit 'af7a8263f0f386622554944383665cb890763fc4':
Fix TelecomManager.isVoicemailNumber
af7a8263f0f386622554944383665cb890763fc4 30-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev
b195723690b08ec025690b40497813ecc1b459bf 30-Jun-2015 Yorke Lee <yorkelee@google.com> Fix TelecomManager.isVoicemailNumber

Bug: 22184528
Change-Id: I7ce3f060d5c7a8caf8a5980bbb9b22aecae89aa4
rc/com/android/server/telecom/PhoneAccountRegistrar.java
4995e781ab0842212ef7d78cffa94bf5dcedb47e 27-Jun-2015 Roshan Pius <rpius@google.com> Delay unbinding the incall services on call remove.

When Telecom tries to unbind the in-call services, there is a possible
race condition because in-call services may not have fully processed all
the pending messages posted to it by telecom. So, adding a 2 sec delay
in telecom to give sufficient time for the in-call services to finish
their processing before unbinding it.

BUG: 22045133
Change-Id: Iaf743e95fde80763e3a8c0efc726809605dce57d
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Timeouts.java
dc798ee5236f9fd630ae029292557a506145eca2 29-Jun-2015 Santos Cordon <santoscordon@google.com> am ee41b7ec: am dd5b4bdb: am 24b26910: Merge "Reconnect to In-Call if it dies." into mnc-dev

* commit 'ee41b7ecb53bf721529d58026ae1e1b9724c78a1':
Reconnect to In-Call if it dies.
ee41b7ecb53bf721529d58026ae1e1b9724c78a1 29-Jun-2015 Santos Cordon <santoscordon@google.com> am dd5b4bdb: am 24b26910: Merge "Reconnect to In-Call if it dies." into mnc-dev

* commit 'dd5b4bdb4731c3bd61aaa82a7fb3b736fed06b9d':
Reconnect to In-Call if it dies.
dd5b4bdb4731c3bd61aaa82a7fb3b736fed06b9d 29-Jun-2015 Santos Cordon <santoscordon@google.com> am 24b26910: Merge "Reconnect to In-Call if it dies." into mnc-dev

* commit '24b26910df9eb021f56c8f20d40d344ee66d6a99':
Reconnect to In-Call if it dies.
24b26910df9eb021f56c8f20d40d344ee66d6a99 29-Jun-2015 Santos Cordon <santoscordon@google.com> Merge "Reconnect to In-Call if it dies." into mnc-dev
c3c732de1815a9aac60a08013d5a8d0ef0884009 29-Jun-2015 Yorke Lee <yorkelee@google.com> am 0b325306: am ad79b3f3: am 6ec56856: Merge "Fix SecurityException when adding new incoming call" into mnc-dev

* commit '0b3253063f8a04ea3413d2a3e9460b9289165e2e':
Fix SecurityException when adding new incoming call
0b3253063f8a04ea3413d2a3e9460b9289165e2e 29-Jun-2015 Yorke Lee <yorkelee@google.com> am ad79b3f3: am 6ec56856: Merge "Fix SecurityException when adding new incoming call" into mnc-dev

* commit 'ad79b3f3bbcc1dbdf8fd06af3c36c4b51e83f836':
Fix SecurityException when adding new incoming call
ad79b3f3bbcc1dbdf8fd06af3c36c4b51e83f836 29-Jun-2015 Yorke Lee <yorkelee@google.com> am 6ec56856: Merge "Fix SecurityException when adding new incoming call" into mnc-dev

* commit '6ec568560f8f476bb96673bdc37d577e5b33d868':
Fix SecurityException when adding new incoming call
933027d332a8d5e1acdd34898f3b07595d7a8774 29-Jun-2015 Yorke Lee <yorkelee@google.com> am f4fabc72: am fd1c3878: am dfae848b: Merge "Fix for pending calls not being reused" into mnc-dev

* commit 'f4fabc72e5d38297a9f0860c2fdc3711161daf73':
Fix for pending calls not being reused
524cda1fda6be48339904b82f56eb60327c031e1 29-Jun-2015 Tyler Gunn <tgunn@google.com> am d81ed25c: am 3a4ce5ec: am 46002293: Merge "Fix to handle ConcurrentModificationException" into mnc-dev

* commit 'd81ed25c55b9a8496152d0bff4dd80204f4f6ac1':
Fix to handle ConcurrentModificationException
b1c62d23226cf70a2803eaf36c6c220ddd344b28 29-Jun-2015 Geoff Mendal <mendal@google.com> am 82512fb1: (-s ours) am b4b7b476: (-s ours) am 989e8d18: (-s ours) Import translations. DO NOT MERGE

* commit '82512fb146d354a38d4baf7c5810b5167d934b27':
Import translations. DO NOT MERGE
6ec568560f8f476bb96673bdc37d577e5b33d868 29-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Fix SecurityException when adding new incoming call" into mnc-dev
f4fabc72e5d38297a9f0860c2fdc3711161daf73 29-Jun-2015 Yorke Lee <yorkelee@google.com> am fd1c3878: am dfae848b: Merge "Fix for pending calls not being reused" into mnc-dev

* commit 'fd1c3878f234bcb621abb02dec30558fdb1262f4':
Fix for pending calls not being reused
fd1c3878f234bcb621abb02dec30558fdb1262f4 29-Jun-2015 Yorke Lee <yorkelee@google.com> am dfae848b: Merge "Fix for pending calls not being reused" into mnc-dev

* commit 'dfae848b61b390a4c261a809a5946cecc80df2ff':
Fix for pending calls not being reused
d81ed25c55b9a8496152d0bff4dd80204f4f6ac1 29-Jun-2015 Tyler Gunn <tgunn@google.com> am 3a4ce5ec: am 46002293: Merge "Fix to handle ConcurrentModificationException" into mnc-dev

* commit '3a4ce5ec231b5e38a659fc169df299084b8af878':
Fix to handle ConcurrentModificationException
dfae848b61b390a4c261a809a5946cecc80df2ff 29-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Fix for pending calls not being reused" into mnc-dev
3a4ce5ec231b5e38a659fc169df299084b8af878 29-Jun-2015 Tyler Gunn <tgunn@google.com> am 46002293: Merge "Fix to handle ConcurrentModificationException" into mnc-dev

* commit '46002293dbb08fdf21dddf0bf205638f674f5afa':
Fix to handle ConcurrentModificationException
46002293dbb08fdf21dddf0bf205638f674f5afa 29-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "Fix to handle ConcurrentModificationException" into mnc-dev
9365c274f5f3c0b1c289f54e855792bfb24096d6 29-Jun-2015 Tyler Gunn <tgunn@google.com> Update BluetoothPhoneServiceImpl to handle childless conference calls.

- Changed so conference calls with no children (or possibility of having any
children) are added to bluetooth device.

Bug: 21085329
Change-Id: Ife16a048c5549aa3033018d53cd100f6da697668
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
82512fb146d354a38d4baf7c5810b5167d934b27 29-Jun-2015 Geoff Mendal <mendal@google.com> am b4b7b476: (-s ours) am 989e8d18: (-s ours) Import translations. DO NOT MERGE

* commit 'b4b7b476d5310fcda2d43afe7c03676e9ccc8651':
Import translations. DO NOT MERGE
b4b7b476d5310fcda2d43afe7c03676e9ccc8651 29-Jun-2015 Geoff Mendal <mendal@google.com> am 989e8d18: (-s ours) Import translations. DO NOT MERGE

* commit '989e8d183b8f20e243ef82b76d7a45b455930e47':
Import translations. DO NOT MERGE
989e8d183b8f20e243ef82b76d7a45b455930e47 29-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I54596d1a0c687158ec392e51f98774302e59ef49
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
3454982048d9a65295992f48a4869d4f8b016782 29-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I6ee890617365d68b42c79cd171bfa9b6a5cbe0d2
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
9427c0fc29869b76116776b1643c208ef3a031c4 27-Jun-2015 Yorke Lee <yorkelee@google.com> Fix SecurityException when adding new incoming call

When checking to see if the caller is the SIM Manager (which now
checks for the default dialer package), make sure to run the
code in Telecom's UID.

Bug: 22047159
Change-Id: Ie460d4cf78308def706a2c8f658451cf649e19c4
rc/com/android/server/telecom/TelecomServiceImpl.java
b38cddc89a407c04275d2d807ce298f3226121b5 27-Jun-2015 Sailesh Nepal <sail@google.com> am 0e425a6f: am 30505c99: am b3ccd7e4: Fix getSimCallManager to return non-null value

* commit '0e425a6f503567c39d925cac5fbe9397866f5ae6':
Fix getSimCallManager to return non-null value
0e425a6f503567c39d925cac5fbe9397866f5ae6 27-Jun-2015 Sailesh Nepal <sail@google.com> am 30505c99: am b3ccd7e4: Fix getSimCallManager to return non-null value

* commit '30505c99d6271875974800d839145a9fe4c305fa':
Fix getSimCallManager to return non-null value
30505c99d6271875974800d839145a9fe4c305fa 27-Jun-2015 Sailesh Nepal <sail@google.com> am b3ccd7e4: Fix getSimCallManager to return non-null value

* commit 'b3ccd7e4ea41b733b46be5d15fb351faa3aa7645':
Fix getSimCallManager to return non-null value
b3ccd7e4ea41b733b46be5d15fb351faa3aa7645 27-Jun-2015 Sailesh Nepal <sail@google.com> Fix getSimCallManager to return non-null value

Getting the sim call manager always returned null.
This was a small typo. Fix was to return the actual handle.

BUG: 22127349
Change-Id: I6903b21b60ee51bcb85944035b3d861b97000aab
rc/com/android/server/telecom/PhoneAccountRegistrar.java
8f89f8d2a01385ca2972d2254b1b8c653e1bbe30 14-Apr-2015 Shriram Ganesh <sganesh@codeaurora.org> Fix to handle ConcurrentModificationException

Phone account list was being accessed by multiple threads
for add/remove/query at the same time.
Fix: Changed the Phone account list to CopyOnWriteArrayList
to make it thread safe.

Bug: 22060339
Change-Id: Ia213ea2465bd1fe306c2dfc8ff0d71ccab55d8a9
rc/com/android/server/telecom/PhoneAccountRegistrar.java
8d3f269fcc8853b2d5ce467cdce6ef27b0122bf8 08-May-2015 Yorke Lee <yorkelee@google.com> Fix for pending calls not being reused

The if check to potentially reuse a call based on its original number
would fail if the second number had been rewritten or formatted
differently.

Compare normalized versions of the two addresses to determine
equality instead.

Also increase the timeout slightly for reusing a
pending disconnect call.

Bug: 20820155

Change-Id: Ifc3ae0a1a1b66132a500665cd7f8bca75a4981b3
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/Timeouts.java
05fa23abfb15cd64c5efc82ffc30132e229c09fb 26-Jun-2015 Roshan Pius <rpius@google.com> am 2028f5ea: am f9cbfce4: am 781d0259: Fix NPE in startOutoingCall with no phoneAccount.

* commit '2028f5ea09e92276b924e957be0adc4ce68cf2f9':
Fix NPE in startOutoingCall with no phoneAccount.
2028f5ea09e92276b924e957be0adc4ce68cf2f9 26-Jun-2015 Roshan Pius <rpius@google.com> am f9cbfce4: am 781d0259: Fix NPE in startOutoingCall with no phoneAccount.

* commit 'f9cbfce415b950468708a6eb1b7dff1e4baeb0e0':
Fix NPE in startOutoingCall with no phoneAccount.
f9cbfce415b950468708a6eb1b7dff1e4baeb0e0 26-Jun-2015 Roshan Pius <rpius@google.com> am 781d0259: Fix NPE in startOutoingCall with no phoneAccount.

* commit '781d02590daf095aa1ca70f947d18a925bda4549':
Fix NPE in startOutoingCall with no phoneAccount.
781d02590daf095aa1ca70f947d18a925bda4549 25-Jun-2015 Roshan Pius <rpius@google.com> Fix NPE in startOutoingCall with no phoneAccount.

When a SIP account is added but not enabled, startOutgoingCall cannot
determine a valid phoneAccount to use for initiating the call. This
results in a NPE when trying to change the state of the call to
CONNECTING. So, sending a "no-handle" tag when phoneAccount is null when
invoking setState.

BUG: 21887733
Change-Id: I84b54b48c7e937e5766ae58e52489b708898025b
rc/com/android/server/telecom/CallsManager.java
c4fc9eeb9971fa3917318afad37f7cac937d1f5f 25-Jun-2015 Yorke Lee <yorkelee@google.com> am 4123cef5: am d8c33020: am e954371b: Fix for startActivity(ACTION_CALL)

* commit '4123cef5ee02b1fa13c22d53d2e5bda564389cee':
Fix for startActivity(ACTION_CALL)
4123cef5ee02b1fa13c22d53d2e5bda564389cee 25-Jun-2015 Yorke Lee <yorkelee@google.com> am d8c33020: am e954371b: Fix for startActivity(ACTION_CALL)

* commit 'd8c330205f38dfdfd7989c7ea8a20b0b2d31af33':
Fix for startActivity(ACTION_CALL)
d8c330205f38dfdfd7989c7ea8a20b0b2d31af33 25-Jun-2015 Yorke Lee <yorkelee@google.com> am e954371b: Fix for startActivity(ACTION_CALL)

* commit 'e954371bc0af81ae0f74387475d53d40d4f2672d':
Fix for startActivity(ACTION_CALL)
e954371bc0af81ae0f74387475d53d40d4f2672d 25-Jun-2015 Yorke Lee <yorkelee@google.com> Fix for startActivity(ACTION_CALL)

Apps that use startActivity(ACTION_CALL) will currently always
fail to have the CALL_PHONE permission when checked in Telecom
because the package name is always null at this point.

We already check for the permission before this so if the app
does not have the permission it will already be rejected with
a SecurityException.

Bug: 22071972
Change-Id: Ibebadd052a13652d8390c8a30f18441110485336
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
e3015e8a6842a248626ddd4e812cee43b962a869 24-Jun-2015 Santos Cordon <santoscordon@google.com> Reconnect to In-Call if it dies.

When an In-Call Service dies, we allow it to die and stop updating it
until the ongoing calls are finished. If the service which disconnected
was responsible for the UI, then we unbind to that service and bind to
the system-provided UI.

Bug: 21780600
Change-Id: Ibb8861aab666018ee2349e2bd0b5b96851aebf5f
rc/com/android/server/telecom/InCallController.java
53319d46f938f7bae05262ef996052b5b1b38d88 24-Jun-2015 Tyler Gunn <tgunn@google.com> am a8a7350b: am 78cc74a9: am 60370ca6: Merge "Correct initial audio state logic in CallAudioManager." into mnc-dev

* commit 'a8a7350b955f99904154b35f9b3d0d30e148a1d5':
Correct initial audio state logic in CallAudioManager.
a8a7350b955f99904154b35f9b3d0d30e148a1d5 24-Jun-2015 Tyler Gunn <tgunn@google.com> am 78cc74a9: am 60370ca6: Merge "Correct initial audio state logic in CallAudioManager." into mnc-dev

* commit '78cc74a9cf605305dfeca561d365b17c787adc0e':
Correct initial audio state logic in CallAudioManager.
78cc74a9cf605305dfeca561d365b17c787adc0e 24-Jun-2015 Tyler Gunn <tgunn@google.com> am 60370ca6: Merge "Correct initial audio state logic in CallAudioManager." into mnc-dev

* commit '60370ca672f2ee15e5e8ba84110a3ca9e3a35e80':
Correct initial audio state logic in CallAudioManager.
60370ca672f2ee15e5e8ba84110a3ca9e3a35e80 24-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "Correct initial audio state logic in CallAudioManager." into mnc-dev
48a5aaa7913432c782f3265a410bdf91ee244c9b 24-Jun-2015 Santos Cordon <santoscordon@google.com> am 9f309236: am ad367dbd: am 7640468f: Merge "InCallService meta-data [1/4]" into mnc-dev

* commit '9f309236a5f304170cf1e00776c7b6142c03b312':
InCallService meta-data [1/4]
9f309236a5f304170cf1e00776c7b6142c03b312 24-Jun-2015 Santos Cordon <santoscordon@google.com> am ad367dbd: am 7640468f: Merge "InCallService meta-data [1/4]" into mnc-dev

* commit 'ad367dbd7779ab8efae6d0d26872d769b1e5d5e9':
InCallService meta-data [1/4]
ad367dbd7779ab8efae6d0d26872d769b1e5d5e9 24-Jun-2015 Santos Cordon <santoscordon@google.com> am 7640468f: Merge "InCallService meta-data [1/4]" into mnc-dev

* commit '7640468f9a115421ebf6ae1e9bbd8eb8e4eb294b':
InCallService meta-data [1/4]
7640468f9a115421ebf6ae1e9bbd8eb8e4eb294b 24-Jun-2015 Santos Cordon <santoscordon@google.com> Merge "InCallService meta-data [1/4]" into mnc-dev
8c9ec002efffd3a3fb87c963b69be2a8f029b4b2 23-Jun-2015 Santos Cordon <santoscordon@google.com> InCallService meta-data [1/4]

Bug: 21816241
Change-Id: If8fe9e19495e8799be10223953c285216fa2228f
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Log.java
f54553abfc6f5b8512e57ac255abe300c34f8126 24-Jun-2015 Yorke Lee <yorkelee@google.com> am 31b4cb53: am d7a9be4e: am 61d82d58: Merge "Disallow non-emergency outgoing calls without CALL_PHONE permission" into mnc-dev

* commit '31b4cb5368928282c83e1cd10f6a855811414c04':
Disallow non-emergency outgoing calls without CALL_PHONE permission
bd0013a0a5c986c494c4a1c082fcb90213eb9b85 24-Jun-2015 Santos Cordon <santoscordon@google.com> am b1f53584: am 871cd358: am 504a7f92: Add dial extras to test app.

* commit 'b1f53584e30a00d23bb56206e3b3908f818c4885':
Add dial extras to test app.
31b4cb5368928282c83e1cd10f6a855811414c04 24-Jun-2015 Yorke Lee <yorkelee@google.com> am d7a9be4e: am 61d82d58: Merge "Disallow non-emergency outgoing calls without CALL_PHONE permission" into mnc-dev

* commit 'd7a9be4eb74bce6c0ba0de90bb56d674ad55e860':
Disallow non-emergency outgoing calls without CALL_PHONE permission
b1f53584e30a00d23bb56206e3b3908f818c4885 24-Jun-2015 Santos Cordon <santoscordon@google.com> am 871cd358: am 504a7f92: Add dial extras to test app.

* commit '871cd358b20093b4d568fc26ce955b72f202fbc1':
Add dial extras to test app.
d7a9be4eb74bce6c0ba0de90bb56d674ad55e860 24-Jun-2015 Yorke Lee <yorkelee@google.com> am 61d82d58: Merge "Disallow non-emergency outgoing calls without CALL_PHONE permission" into mnc-dev

* commit '61d82d58d0a1bd83324eee59cddfdffd86d08c54':
Disallow non-emergency outgoing calls without CALL_PHONE permission
871cd358b20093b4d568fc26ce955b72f202fbc1 24-Jun-2015 Santos Cordon <santoscordon@google.com> am 504a7f92: Add dial extras to test app.

* commit '504a7f92a570dc6e619811a868da7a86b7716624':
Add dial extras to test app.
61d82d58d0a1bd83324eee59cddfdffd86d08c54 24-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Disallow non-emergency outgoing calls without CALL_PHONE permission" into mnc-dev
5dc42ee62c21ee81d51a411a0cfb61653fdf2858 19-Jun-2015 Yorke Lee <yorkelee@google.com> Disallow non-emergency outgoing calls without CALL_PHONE permission

Bug: 21925398
Change-Id: I9cef6cd2c11f767740d03ebce99b8b54efd1f68a
es/values/strings.xml
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/components/UserCallActivity.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
967032677441b317571d3cb8770060cf56a2f368 23-Jun-2015 Tyler Gunn <tgunn@google.com> Correct initial audio state logic in CallAudioManager.

- Moved logic to trigger setInitialCallState from onCallUpdate to
updateAudioStreamAndMode. In the case of IMS calls, the transition in
audio stream was happening in the call to updateAudioSteamAndMode
triggered from setIsRinging. This meant we'd never call setInitialState.
Since updateAudioStreamAndMode is ultimately where the change is
happening, I figured it made sense to move the logic there.
- Added toString methods for stream and mode descriptions so I could more
easily discern what was happening in the logs.

Bug: 21555905
Change-Id: I0bccf0e7881abfb2f1a195fc0f87b3764107ed16
rc/com/android/server/telecom/CallAudioManager.java
504a7f92a570dc6e619811a868da7a86b7716624 19-Jun-2015 Santos Cordon <santoscordon@google.com> Add dial extras to test app.

Change-Id: Ibd15b0d9f75a22291c96cd4cc6192de17527fcb4
estapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
d9cd757fddfe4625148c3fca99de43e360410656 19-Jun-2015 Santos Cordon <santoscordon@google.com> am 1ae74660: am 2f0e25ec: am 59c21a74: Change Sim Call Managers to use default dialer app instead.

* commit '1ae74660438c974e02287a26ff1d061a3de4dac7':
Change Sim Call Managers to use default dialer app instead.
ee2b132983950d48813968ca204870e2a82347fe 19-Jun-2015 Sailesh Nepal <sail@google.com> am 433e56a0: am 42395a33: am ab59adf3: Remove OEM config for sim call manager [Telecom part]

* commit '433e56a0c1f1b697dbdfb3ef440c5efbe4f26790':
Remove OEM config for sim call manager [Telecom part]
1ae74660438c974e02287a26ff1d061a3de4dac7 19-Jun-2015 Santos Cordon <santoscordon@google.com> am 2f0e25ec: am 59c21a74: Change Sim Call Managers to use default dialer app instead.

* commit '2f0e25ec60a5f550cb570b8dbc4852b7797d295a':
Change Sim Call Managers to use default dialer app instead.
433e56a0c1f1b697dbdfb3ef440c5efbe4f26790 19-Jun-2015 Sailesh Nepal <sail@google.com> am 42395a33: am ab59adf3: Remove OEM config for sim call manager [Telecom part]

* commit '42395a33c17fed97949efe16037efc9031a32ea2':
Remove OEM config for sim call manager [Telecom part]
2f0e25ec60a5f550cb570b8dbc4852b7797d295a 19-Jun-2015 Santos Cordon <santoscordon@google.com> am 59c21a74: Change Sim Call Managers to use default dialer app instead.

* commit '59c21a747c31773a67a32675be29c4d0537a3513':
Change Sim Call Managers to use default dialer app instead.
59c21a747c31773a67a32675be29c4d0537a3513 11-Jun-2015 Santos Cordon <santoscordon@google.com> Change Sim Call Managers to use default dialer app instead.

Bug: 21499476
Change-Id: I60505ac1699f287656434b55d81aa61d4ae4ce14
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
42395a33c17fed97949efe16037efc9031a32ea2 19-Jun-2015 Sailesh Nepal <sail@google.com> am ab59adf3: Remove OEM config for sim call manager [Telecom part]

* commit 'ab59adf3d1eae4ad194e6c24c839ee686a32df23':
Remove OEM config for sim call manager [Telecom part]
16f8548dbe825ca3e257b5c9a96c54e613c0c18e 17-Jun-2015 Sailesh Nepal <sail@google.com> am f0133b8e: am 2375f114: am aecfa9be: Use a carrier config to get the sim call manager

* commit 'f0133b8ef399ced91a1932495109ae0e8b45dabd':
Use a carrier config to get the sim call manager
f0133b8ef399ced91a1932495109ae0e8b45dabd 17-Jun-2015 Sailesh Nepal <sail@google.com> am 2375f114: am aecfa9be: Use a carrier config to get the sim call manager

* commit '2375f114a0cf6bdaca979cb4cd1fa1a575c7dedc':
Use a carrier config to get the sim call manager
2375f114a0cf6bdaca979cb4cd1fa1a575c7dedc 17-Jun-2015 Sailesh Nepal <sail@google.com> am aecfa9be: Use a carrier config to get the sim call manager

* commit 'aecfa9be525bd91902f975d7f7011ef2dd2d950c':
Use a carrier config to get the sim call manager
ab59adf3d1eae4ad194e6c24c839ee686a32df23 17-Jun-2015 Sailesh Nepal <sail@google.com> Remove OEM config for sim call manager [Telecom part]

This is the telecom part of deleting the OEM config.
See ag/710820 for the overlay part.

We can now set the default sim call manager using the following carrier config:
CarrierConfigManager.KEY_DEFAULT_SIM_CALL_MANAGER_STRING

This CL removes the old OEM config value.

BUG: 21499566
Change-Id: Ib287fa6d2c80b950fa1cb65e98c470fd7290c95c
es/values/config.xml
rc/com/android/server/telecom/PhoneAccountRegistrar.java
aecfa9be525bd91902f975d7f7011ef2dd2d950c 16-Jun-2015 Sailesh Nepal <sail@google.com> Use a carrier config to get the sim call manager

Currently the default sim call manager is set using an OEM
config. We want to switch to using a carrier config.

With this CL, carriers can set the sim call manager using
the CarrierConfigManager.KEY_DEFAULT_SIM_CALL_MANAGER_STRING
config.

Once the carrier config is rolled out we can remove the OEM config.

BUG: 21499566

Change-Id: Ic0d33673b8a6424c6c20eb6686aa29dc35d4dfcd
rc/com/android/server/telecom/PhoneAccountRegistrar.java
9e588ccca57801957c380131a3df550503581f4c 16-Jun-2015 Yorke Lee <yorkelee@google.com> am 3f4dc36c: am 79cb6b1a: am 89b1481f: Merge "Send broadcast when default dialer changes" into mnc-dev

* commit '3f4dc36c8752d8282f04ee9e5ccfd864fd041866':
Send broadcast when default dialer changes
3f4dc36c8752d8282f04ee9e5ccfd864fd041866 15-Jun-2015 Yorke Lee <yorkelee@google.com> am 79cb6b1a: am 89b1481f: Merge "Send broadcast when default dialer changes" into mnc-dev

* commit '79cb6b1a01a33c986215e65c360af98b723c32df':
Send broadcast when default dialer changes
79cb6b1a01a33c986215e65c360af98b723c32df 15-Jun-2015 Yorke Lee <yorkelee@google.com> am 89b1481f: Merge "Send broadcast when default dialer changes" into mnc-dev

* commit '89b1481f240dba5f17b3b916aab7d20e6b3f92af':
Send broadcast when default dialer changes
89b1481f240dba5f17b3b916aab7d20e6b3f92af 15-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Send broadcast when default dialer changes" into mnc-dev
b3984309ff85330e0f99270d0bcd0e3d48055a6c 15-Jun-2015 Yorke Lee <yorkelee@google.com> Send broadcast when default dialer changes

Bug: 21846308
Change-Id: I9034051644c9351bc73946fe3f5aa64bf080f200
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
16833a576c86a344bbb3b87f57cfe31ce6219a5b 15-Jun-2015 Yorke Lee <yorkelee@google.com> am f636a625: am 9e5d4490: am c722ad9c: Merge "Don\'t crash if unbinding from InCallService fails" into mnc-dev

* commit 'f636a625a254638d7013253fc160a292fc6cf986':
Don't crash if unbinding from InCallService fails
f636a625a254638d7013253fc160a292fc6cf986 15-Jun-2015 Yorke Lee <yorkelee@google.com> am 9e5d4490: am c722ad9c: Merge "Don\'t crash if unbinding from InCallService fails" into mnc-dev

* commit '9e5d4490b15133eda88a414971bf9b21e80c2d42':
Don't crash if unbinding from InCallService fails
9e5d4490b15133eda88a414971bf9b21e80c2d42 15-Jun-2015 Yorke Lee <yorkelee@google.com> am c722ad9c: Merge "Don\'t crash if unbinding from InCallService fails" into mnc-dev

* commit 'c722ad9cf7f27ce544f4b80757c42e51f5e8071f':
Don't crash if unbinding from InCallService fails
c722ad9cf7f27ce544f4b80757c42e51f5e8071f 15-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Don't crash if unbinding from InCallService fails" into mnc-dev
b99852120d3dad09a0a0616841889677269ac57d 15-Jun-2015 Sailesh Nepal <sail@google.com> am 6552740e: am 38a08422: am 43e094ff: Merge "Remove some dead code in TelecomServiceImpl" into mnc-dev

* commit '6552740e10c33c10aec6e7970c26cf39852725f8':
Remove some dead code in TelecomServiceImpl
6552740e10c33c10aec6e7970c26cf39852725f8 15-Jun-2015 Sailesh Nepal <sail@google.com> am 38a08422: am 43e094ff: Merge "Remove some dead code in TelecomServiceImpl" into mnc-dev

* commit '38a08422f4de8f5d8af9ad7fef42961d7844d7a5':
Remove some dead code in TelecomServiceImpl
38a08422f4de8f5d8af9ad7fef42961d7844d7a5 15-Jun-2015 Sailesh Nepal <sail@google.com> am 43e094ff: Merge "Remove some dead code in TelecomServiceImpl" into mnc-dev

* commit '43e094ff6115770175578569077d33e3568f62c2':
Remove some dead code in TelecomServiceImpl
9b99bf5d951330b422fef324917e995a3e4d9f94 15-Jun-2015 Sailesh Nepal <sail@google.com> am 81f5a7d7: am 04793f99: am dbb0b03f: Merge "Allow PSTN phone account for incoming calls from connection manager" into mnc-dev

* commit '81f5a7d701caaaceca6ca23d572e47480a4cb374':
Allow PSTN phone account for incoming calls from connection manager
43e094ff6115770175578569077d33e3568f62c2 15-Jun-2015 Sailesh Nepal <sail@google.com> Merge "Remove some dead code in TelecomServiceImpl" into mnc-dev
81f5a7d701caaaceca6ca23d572e47480a4cb374 15-Jun-2015 Sailesh Nepal <sail@google.com> am 04793f99: am dbb0b03f: Merge "Allow PSTN phone account for incoming calls from connection manager" into mnc-dev

* commit '04793f99a16e1e807a3cd289205d2cc645cb5239':
Allow PSTN phone account for incoming calls from connection manager
04793f99a16e1e807a3cd289205d2cc645cb5239 15-Jun-2015 Sailesh Nepal <sail@google.com> am dbb0b03f: Merge "Allow PSTN phone account for incoming calls from connection manager" into mnc-dev

* commit 'dbb0b03faa660939f8b435c39c919e1b3ff86cd3':
Allow PSTN phone account for incoming calls from connection manager
dbb0b03faa660939f8b435c39c919e1b3ff86cd3 15-Jun-2015 Sailesh Nepal <sail@google.com> Merge "Allow PSTN phone account for incoming calls from connection manager" into mnc-dev
6e2709588b4571f9358d74f07d7db84633a7aa2c 15-Jun-2015 Geoff Mendal <mendal@google.com> am 1e61710f: (-s ours) am 5872eb5a: (-s ours) am 6dfff166: (-s ours) Import translations. DO NOT MERGE

* commit '1e61710fbf0bac6e2e21adcbabbbe9f5e73a92e6':
Import translations. DO NOT MERGE
1e61710fbf0bac6e2e21adcbabbbe9f5e73a92e6 15-Jun-2015 Geoff Mendal <mendal@google.com> am 5872eb5a: (-s ours) am 6dfff166: (-s ours) Import translations. DO NOT MERGE

* commit '5872eb5a00a6aeb2250d61a95ff42843ccd53b24':
Import translations. DO NOT MERGE
5872eb5a00a6aeb2250d61a95ff42843ccd53b24 15-Jun-2015 Geoff Mendal <mendal@google.com> am 6dfff166: (-s ours) Import translations. DO NOT MERGE

* commit '6dfff1665c76e83f6364ebe0dfce2439dee35163':
Import translations. DO NOT MERGE
6dfff1665c76e83f6364ebe0dfce2439dee35163 15-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I21916b194fbc01a79389b3227f75f1ae8153e1da
Auto-generated-cl: translation import
es/values-es-rUS/strings.xml
d21e48353a6d77590af98e4e5e881e00c07aedfd 15-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia243cb6bd1e08bd6d12494eaacbb8c543263487f
Auto-generated-cl: translation import
es/values-es-rUS/strings.xml
83b686411c2f4ef27f49ce65e862d8f3484d68e2 15-Jun-2015 Sailesh Nepal <sail@google.com> Allow PSTN phone account for incoming calls from connection manager

See ag/648273 for the original change. It looks like this was
partially reverted by the refactoring for.

BUG: 19591608
Change-Id: I1e95cbeff2f1813999501b1acbb2553c095638e2
rc/com/android/server/telecom/TelecomServiceImpl.java
fba9a8ce9664e422e63f4d1d279ffb45b061801d 15-Jun-2015 Sailesh Nepal <sail@google.com> Remove some dead code in TelecomServiceImpl

Change-Id: I151356d1ff68abb164b85de7f24d2145be17b7ed
rc/com/android/server/telecom/TelecomServiceImpl.java
d794fd2185858563a8849527b730495cc999176a 13-Jun-2015 Yorke Lee <yorkelee@google.com> Don't crash if unbinding from InCallService fails

If unbinding from an InCallService fails for any reason, don't
bring down the entire system process.

Bug: 21765111
Change-Id: I5651db361f5f0fdc7dd18a0799ead1ad20a0b9e3
rc/com/android/server/telecom/InCallController.java
a761b00696f9afc460986f828301f1ca5d696e17 13-Jun-2015 Tyler Gunn <tgunn@google.com> am d929d734: am 0dafd318: am 38c066e0: Merge "Play tone when video upgrade request is received." into mnc-dev

* commit 'd929d73454cb8c1d10e3cca15273cd1e796bc4e0':
Play tone when video upgrade request is received.
d929d73454cb8c1d10e3cca15273cd1e796bc4e0 13-Jun-2015 Tyler Gunn <tgunn@google.com> am 0dafd318: am 38c066e0: Merge "Play tone when video upgrade request is received." into mnc-dev

* commit '0dafd31875ba9ca85cd1cf5b56602ce52bb5cbb5':
Play tone when video upgrade request is received.
0dafd31875ba9ca85cd1cf5b56602ce52bb5cbb5 12-Jun-2015 Tyler Gunn <tgunn@google.com> am 38c066e0: Merge "Play tone when video upgrade request is received." into mnc-dev

* commit '38c066e0b475c7e36901203fc11b528a0a34610d':
Play tone when video upgrade request is received.
38c066e0b475c7e36901203fc11b528a0a34610d 12-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "Play tone when video upgrade request is received." into mnc-dev
86014fcf9ec86e198a1ebac7c46e0e5c630735d7 12-Jun-2015 Tyler Gunn <tgunn@google.com> Play tone when video upgrade request is received.

Added a VideoProviderProxy which intermediates between the VideoProvider
in the ConnectionService and the InCallService.

Changed CallsManager to listen for session modification requests via the
VideoProviderProxy and report these to its listeners via the
CallsManagerListeberBase.

Changed InCallToneMonitor to listen for session modification requests and
to play a tone when a request to upgrade is received.

Also, added an intent in the TestInCallService which I neglected to commit
in a previous CL.

Bug: 20232310
Change-Id: I1b105968f519ff6b166bbd02cb57b1cf68d2cea9
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/InCallToneMonitor.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/VideoProviderProxy.java
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestInCallServiceBroadcastReceiver.java
ddf4d2343fd5c9ca1e8a0db180d431c1f68ff598 12-Jun-2015 Roshan Pius <rpius@google.com> am 2c8efadd: am 273e6a52: am 77bcdc30: Merge "Fail PhoneAccount addition if device is not voice capable." into mnc-dev

* commit '2c8efaddaf50970f1a3ee7e31a0faf126d79d0f6':
Fail PhoneAccount addition if device is not voice capable.
2c8efaddaf50970f1a3ee7e31a0faf126d79d0f6 12-Jun-2015 Roshan Pius <rpius@google.com> am 273e6a52: am 77bcdc30: Merge "Fail PhoneAccount addition if device is not voice capable." into mnc-dev

* commit '273e6a52cce0ec9bc1e07fcd6e9195ddcbeec559':
Fail PhoneAccount addition if device is not voice capable.
273e6a52cce0ec9bc1e07fcd6e9195ddcbeec559 12-Jun-2015 Roshan Pius <rpius@google.com> am 77bcdc30: Merge "Fail PhoneAccount addition if device is not voice capable." into mnc-dev

* commit '77bcdc3017c7c388585d9075bb8eaf4d72426121':
Fail PhoneAccount addition if device is not voice capable.
77bcdc3017c7c388585d9075bb8eaf4d72426121 12-Jun-2015 Roshan Pius <rpius@google.com> Merge "Fail PhoneAccount addition if device is not voice capable." into mnc-dev
5bf79e804bd6cf2eae97a078702c85e0376c6404 12-Jun-2015 Yorke Lee <yorkelee@google.com> am dabeab4f: am f906a78d: am ae09b656: Fix Telecom build

* commit 'dabeab4f8a284b469ce78014577a741ad37de6b9':
Fix Telecom build
dabeab4f8a284b469ce78014577a741ad37de6b9 12-Jun-2015 Yorke Lee <yorkelee@google.com> am f906a78d: am ae09b656: Fix Telecom build

* commit 'f906a78da264747795d5e83a836341096df2aad2':
Fix Telecom build
f906a78da264747795d5e83a836341096df2aad2 12-Jun-2015 Yorke Lee <yorkelee@google.com> am ae09b656: Fix Telecom build

* commit 'ae09b656ad6a8635cb2c34ec6e516f66a4a12bd9':
Fix Telecom build
ae09b656ad6a8635cb2c34ec6e516f66a4a12bd9 12-Jun-2015 Yorke Lee <yorkelee@google.com> Fix Telecom build

Change-Id: If83c8527660f9c37b95060b73594101841b84bda
rc/com/android/server/telecom/Ringer.java
c9d8d8ccaf245426207d41d9233be58973d1e96a 12-Jun-2015 Santos Cordon <santoscordon@google.com> am 1b2ff4bd: am 6d70d0ee: am abb6cc62: Merge "Add more logging." into mnc-dev

* commit '1b2ff4bdd2806b768b6c0f787719baf28d267e1e':
Add more logging.
1b2ff4bdd2806b768b6c0f787719baf28d267e1e 12-Jun-2015 Santos Cordon <santoscordon@google.com> am 6d70d0ee: am abb6cc62: Merge "Add more logging." into mnc-dev

* commit '6d70d0ee21aedb1029fb1ca1ed9bd9f420485599':
Add more logging.
6d70d0ee21aedb1029fb1ca1ed9bd9f420485599 12-Jun-2015 Santos Cordon <santoscordon@google.com> am abb6cc62: Merge "Add more logging." into mnc-dev

* commit 'abb6cc62b9b3502278bcaea68d09fbf140605221':
Add more logging.
abb6cc62b9b3502278bcaea68d09fbf140605221 12-Jun-2015 Santos Cordon <santoscordon@google.com> Merge "Add more logging." into mnc-dev
f79b9865187c9a260725edcbd81006555e75b19d 12-Jun-2015 Andrew Lee <anwlee@google.com> am 84e2069c: am c4c4a515: am fb598636: Merge "Change respond-via-sms strings on locale switch." into mnc-dev

* commit '84e2069cca1deeb9dc939f26cf6c858ec4b3f2c0':
Change respond-via-sms strings on locale switch.
84e2069cca1deeb9dc939f26cf6c858ec4b3f2c0 12-Jun-2015 Andrew Lee <anwlee@google.com> am c4c4a515: am fb598636: Merge "Change respond-via-sms strings on locale switch." into mnc-dev

* commit 'c4c4a515b4b90aaddb2be6f955610c0753fba595':
Change respond-via-sms strings on locale switch.
c4c4a515b4b90aaddb2be6f955610c0753fba595 12-Jun-2015 Andrew Lee <anwlee@google.com> am fb598636: Merge "Change respond-via-sms strings on locale switch." into mnc-dev

* commit 'fb598636c5e8802f565e305b068b5e991aaeaeb1':
Change respond-via-sms strings on locale switch.
fb598636c5e8802f565e305b068b5e991aaeaeb1 12-Jun-2015 Andrew Lee <anwlee@google.com> Merge "Change respond-via-sms strings on locale switch." into mnc-dev
23fe00e1b6d55fef2c4bfaecf5c36c110b83c38c 12-Jun-2015 Santos Cordon <santoscordon@google.com> am d27ad9b2: am 1d97767b: am 74cbc996: Merge "Mark all SIM accounts as enabled." into mnc-dev

* commit 'd27ad9b2fe2d606543f2dfb27f43f5c8a5f0a269':
Mark all SIM accounts as enabled.
d27ad9b2fe2d606543f2dfb27f43f5c8a5f0a269 12-Jun-2015 Santos Cordon <santoscordon@google.com> am 1d97767b: am 74cbc996: Merge "Mark all SIM accounts as enabled." into mnc-dev

* commit '1d97767b60f04b4fcb2c3d4831e067aeb17eb39f':
Mark all SIM accounts as enabled.
1d97767b60f04b4fcb2c3d4831e067aeb17eb39f 11-Jun-2015 Santos Cordon <santoscordon@google.com> am 74cbc996: Merge "Mark all SIM accounts as enabled." into mnc-dev

* commit '74cbc99648cbe23988d7a77fcce7fc4ece4edcde':
Mark all SIM accounts as enabled.
74cbc99648cbe23988d7a77fcce7fc4ece4edcde 11-Jun-2015 Santos Cordon <santoscordon@google.com> Merge "Mark all SIM accounts as enabled." into mnc-dev
a9eebe4bd03a916655fd5b0d4f4fb9e8fdbc0ce8 11-Jun-2015 Santos Cordon <santoscordon@google.com> Mark all SIM accounts as enabled.

Since there is no way to disable a SIM account, make sure that on
upgrade from Lollipop, all SIM accounts are enabled.

Bug: 21674348
Change-Id: Ic649a6a748fcf768c7cfce5feb6e339d532e0e19
rc/com/android/server/telecom/PhoneAccountRegistrar.java
472aa6c4bf9107cf1ba8fd8316c2a56b2039d1ff 11-Jun-2015 Roshan Pius <rpius@google.com> Fail PhoneAccount addition if device is not voice capable.

BUG: 20305650
Change-Id: Id0702fc96e8e70be868fd8bb72252b81e7f1589e
rc/com/android/server/telecom/TelecomServiceImpl.java
477ac8cdc4a5fb877f6d6a79e60142831f6deb8a 11-Jun-2015 Andrew Lee <anwlee@google.com> Change respond-via-sms strings on locale switch.

- No longer automatically store default responses in shared
preferences when performing initial migration. Only store if
previous values are present.
- No longer persist the preferences for these responses.
+ Save preference values when changed in RespondViaSmsSettings.
If the user has changed the value, their value will appear.
Otherwise, the response will be the default for that locale.

Bug: 19501543
Change-Id: Ib0f673ff0ac97b98a9934d8f0a81090ce8e590ea
es/xml/respond_via_sms_settings.xml
rc/com/android/server/telecom/QuickResponseUtils.java
rc/com/android/server/telecom/RespondViaSmsSettings.java
ec946a0e1474f41ff84d933287d24d12896c3a57 11-Jun-2015 Santos Cordon <santoscordon@google.com> am f80386ba: am b968f0a1: am 841ba288: Merge "Fix silenceRinger implementation." into mnc-dev

* commit 'f80386ba3899c200f62b22c2edfd761f7f88ff1f':
Fix silenceRinger implementation.
f80386ba3899c200f62b22c2edfd761f7f88ff1f 11-Jun-2015 Santos Cordon <santoscordon@google.com> am b968f0a1: am 841ba288: Merge "Fix silenceRinger implementation." into mnc-dev

* commit 'b968f0a117b5f815522a2325b2a7d40dbd750f63':
Fix silenceRinger implementation.
b968f0a117b5f815522a2325b2a7d40dbd750f63 11-Jun-2015 Santos Cordon <santoscordon@google.com> am 841ba288: Merge "Fix silenceRinger implementation." into mnc-dev

* commit '841ba288c6bc9d06bd942ba20318f9af9d23ed71':
Fix silenceRinger implementation.
841ba288c6bc9d06bd942ba20318f9af9d23ed71 11-Jun-2015 Santos Cordon <santoscordon@google.com> Merge "Fix silenceRinger implementation." into mnc-dev
a1a3469d95c56fc7520f88531438468908a8c5d0 11-Jun-2015 Santos Cordon <santoscordon@google.com> Fix silenceRinger implementation.

re-add line that was accidentally removed.

Bug: 21595219
Change-Id: I8db039e0f26970240dd8f3d0a8a45dd18fcfd0c6
rc/com/android/server/telecom/Ringer.java
5fa4e4f1eb98f052cc0ee4b3ad0f6acb8e92c719 10-Jun-2015 Santos Cordon <santoscordon@google.com> Add more logging.

1) Call state logging was lost in a merge conflict, adding that back.
2) Adding better ringing state logging. Fixes problems:
- No more superfluous "STOP_RINGER" logging
- Adding call-waiting logging
- More accurate call attribution for start and stop ringing

Change-Id: Ie41340ab6790a6c5f87f5592836b29bf6799708d
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
7c7584a2a3f9d4d8c33a594acffce5a7515907e6 10-Jun-2015 Roshan Pius <rpius@google.com> am 46f57bf7: am 8df260ae: am ebc4d195: Merge "Create/Delete ToneGenerator object in a separate thread." into mnc-dev

* commit '46f57bf7beee747bf61eb1632e95b4078b5b3e5a':
Create/Delete ToneGenerator object in a separate thread.
46f57bf7beee747bf61eb1632e95b4078b5b3e5a 10-Jun-2015 Roshan Pius <rpius@google.com> am 8df260ae: am ebc4d195: Merge "Create/Delete ToneGenerator object in a separate thread." into mnc-dev

* commit '8df260aed894d1b665288acac5a1f20dc38e40b6':
Create/Delete ToneGenerator object in a separate thread.
8df260aed894d1b665288acac5a1f20dc38e40b6 10-Jun-2015 Roshan Pius <rpius@google.com> am ebc4d195: Merge "Create/Delete ToneGenerator object in a separate thread." into mnc-dev

* commit 'ebc4d195614b777b38d9c12159db957490400da4':
Create/Delete ToneGenerator object in a separate thread.
ebc4d195614b777b38d9c12159db957490400da4 10-Jun-2015 Roshan Pius <rpius@google.com> Merge "Create/Delete ToneGenerator object in a separate thread." into mnc-dev
9bb88e9ce53449aa6f612b98d36fbfa80a1624e4 09-Jun-2015 Roshan Pius <rpius@google.com> Create/Delete ToneGenerator object in a separate thread.

ToneGenerator object creation blocks the main activity thread for a long
time. Hence moving this lower priority work to a separate thread to
unblock the main thread.

Bug: 18349649
Change-Id: If4e3f1a10cf04559603a6c5fe0bf1916133900e1
rc/com/android/server/telecom/DtmfLocalTonePlayer.java
93a7f655620a090a75ee2390fdb3b064dfe575a4 10-Jun-2015 Yorke Lee <yorkelee@google.com> am 5621129a: am d55fa186: am 750b6dfc: Merge "Use Telecom constant for providing incoming call handle" into mnc-dev

* commit '5621129adda428723871e44a90531c3c63bdbcaa':
Use Telecom constant for providing incoming call handle
fadaafe6c4d4e9be33651402b5bd28a225a4ac0b 10-Jun-2015 Tyler Gunn <tgunn@google.com> am 3d1327d5: am b9b02f6c: am 2bfacfbc: Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev

* commit '3d1327d57acd29d26bc7698f5699330d25e2531f':
Remove use of STATE_AUDIO_ONLY in a comparison.
2e30d28dd88148a78dc4e2f03a0e7d4a9d355dce 10-Jun-2015 Roshan Pius <rpius@google.com> am 36c936bb: am 199910e1: am 3182239b: Reduce log level for "not visible for calling user" logs.

* commit '36c936bb0e7d5a34af674c00ebab30c59f52a341':
Reduce log level for "not visible for calling user" logs.
5621129adda428723871e44a90531c3c63bdbcaa 10-Jun-2015 Yorke Lee <yorkelee@google.com> am d55fa186: am 750b6dfc: Merge "Use Telecom constant for providing incoming call handle" into mnc-dev

* commit 'd55fa186923cacbbb51de2a5ebc076b1c6996580':
Use Telecom constant for providing incoming call handle
d55fa186923cacbbb51de2a5ebc076b1c6996580 10-Jun-2015 Yorke Lee <yorkelee@google.com> am 750b6dfc: Merge "Use Telecom constant for providing incoming call handle" into mnc-dev

* commit '750b6dfc46b73f03a2e261860878549deb6357ac':
Use Telecom constant for providing incoming call handle
3d1327d57acd29d26bc7698f5699330d25e2531f 10-Jun-2015 Tyler Gunn <tgunn@google.com> am b9b02f6c: am 2bfacfbc: Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev

* commit 'b9b02f6c349d3a481a73b49a37ceca3244678964':
Remove use of STATE_AUDIO_ONLY in a comparison.
750b6dfc46b73f03a2e261860878549deb6357ac 10-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Use Telecom constant for providing incoming call handle" into mnc-dev
36c936bb0e7d5a34af674c00ebab30c59f52a341 10-Jun-2015 Roshan Pius <rpius@google.com> am 199910e1: am 3182239b: Reduce log level for "not visible for calling user" logs.

* commit '199910e1d38f44fd34c43c7686d6e8cb2bb35681':
Reduce log level for "not visible for calling user" logs.
b9b02f6c349d3a481a73b49a37ceca3244678964 10-Jun-2015 Tyler Gunn <tgunn@google.com> am 2bfacfbc: Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev

* commit '2bfacfbcbb7c0c90febe68b26e04f6a89201e327':
Remove use of STATE_AUDIO_ONLY in a comparison.
2bfacfbcbb7c0c90febe68b26e04f6a89201e327 10-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev
199910e1d38f44fd34c43c7686d6e8cb2bb35681 10-Jun-2015 Roshan Pius <rpius@google.com> am 3182239b: Reduce log level for "not visible for calling user" logs.

* commit '3182239b89218ed4253f47490adb77c681715d44':
Reduce log level for "not visible for calling user" logs.
3182239b89218ed4253f47490adb77c681715d44 09-Jun-2015 Roshan Pius <rpius@google.com> Reduce log level for "not visible for calling user" logs.

Bug: 19589413
Change-Id: I2ddaa3fd8211e209d68567fa85f3656d21a08e47
rc/com/android/server/telecom/TelecomServiceImpl.java
467b64fb79f8720958bba6dff84d4827458d33e2 09-Jun-2015 Tyler Gunn <tgunn@google.com> Remove use of STATE_AUDIO_ONLY in a comparison.

- Use VideoProfile.isAudioOnly() instead of doing == comparison.

Bug: 21645094
Change-Id: Iee12001e2a56dfdf8239ad04f844593a21da896d
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
69fa89790a67c497f091c86a9b1ed5a00aace7ae 08-Jun-2015 Yorke Lee <yorkelee@google.com> Use Telecom constant for providing incoming call handle

Bug: 19696065
Change-Id: Idf5385d80c828f28f3078acae9670ace9daab61e
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
4a27c79b412893341120458864e20cb17c2f235d 08-Jun-2015 Geoff Mendal <mendal@google.com> am 6a309ccf: (-s ours) am b03a781e: (-s ours) am 8418e679: (-s ours) Import translations. DO NOT MERGE

* commit '6a309ccf9bf29e001b607b118017f99c8da9ae78':
Import translations. DO NOT MERGE
6a309ccf9bf29e001b607b118017f99c8da9ae78 08-Jun-2015 Geoff Mendal <mendal@google.com> am b03a781e: (-s ours) am 8418e679: (-s ours) Import translations. DO NOT MERGE

* commit 'b03a781eaf592fb91d23c2f29fb05ca069553657':
Import translations. DO NOT MERGE
b03a781eaf592fb91d23c2f29fb05ca069553657 08-Jun-2015 Geoff Mendal <mendal@google.com> am 8418e679: (-s ours) Import translations. DO NOT MERGE

* commit '8418e679c597f02c3863b9fcce6c847cf410b86d':
Import translations. DO NOT MERGE
8418e679c597f02c3863b9fcce6c847cf410b86d 08-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I280baa0a88f48e5f218a7058c4a75da7c9c00f34
Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-ml-rIN/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-te-rIN/strings.xml
es/values-uk/strings.xml
0b92ebb6382fbcd7e11ddb03361d1caafc478eb6 08-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I76a2dbcaee582d237cb4cd6cb709f036f30e27a4
Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-ml-rIN/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-te-rIN/strings.xml
es/values-uk/strings.xml
43e8b96574bca004b72395c4ceb109237c8f34d9 06-Jun-2015 Yorke Lee <yorkelee@google.com> am c366c4ab: am 90a654e8: am 8d505f15: Merge "Remove permission checks for registerPhoneAccount" into mnc-dev

* commit 'c366c4ab49af81d138d3bbc5fdb11d31e54d2762':
Remove permission checks for registerPhoneAccount
c366c4ab49af81d138d3bbc5fdb11d31e54d2762 06-Jun-2015 Yorke Lee <yorkelee@google.com> am 90a654e8: am 8d505f15: Merge "Remove permission checks for registerPhoneAccount" into mnc-dev

* commit '90a654e8e1d16b20df1e75e54c9e3803a1926ec4':
Remove permission checks for registerPhoneAccount
90a654e8e1d16b20df1e75e54c9e3803a1926ec4 06-Jun-2015 Yorke Lee <yorkelee@google.com> am 8d505f15: Merge "Remove permission checks for registerPhoneAccount" into mnc-dev

* commit '8d505f158a043b154dae7ebad5d0bcf42ca8c88f':
Remove permission checks for registerPhoneAccount
8d505f158a043b154dae7ebad5d0bcf42ca8c88f 06-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Remove permission checks for registerPhoneAccount" into mnc-dev
a3a662513216814226ee2addebb1dca480ab7e0c 05-Jun-2015 Andre Eisenbach <eisenbach@google.com> am c02b4d86: am 5220a38a: am 3109262f: Fix merge error in BluetoothPhoneServiceImpl

* commit 'c02b4d86dfc4732a8ca7f0060c6790fe8b56624f':
Fix merge error in BluetoothPhoneServiceImpl
c02b4d86dfc4732a8ca7f0060c6790fe8b56624f 05-Jun-2015 Andre Eisenbach <eisenbach@google.com> am 5220a38a: am 3109262f: Fix merge error in BluetoothPhoneServiceImpl

* commit '5220a38a3faeb04f022cfb15ce6a16f2a5612c20':
Fix merge error in BluetoothPhoneServiceImpl
a7f0e290e31287ba7b070cdbded77fc1aa50cfe8 05-Jun-2015 Mallikarjuna GB <gbmalli@codeaurora.org> am 52c09eeb: am fb3200af: am 49422b57: Bluetooth: Send default value for CNUM.

* commit '52c09eeb949ff3a3a9619d680b9ddf79431e075f':
Bluetooth: Send default value for CNUM.
5220a38a3faeb04f022cfb15ce6a16f2a5612c20 05-Jun-2015 Andre Eisenbach <eisenbach@google.com> am 3109262f: Fix merge error in BluetoothPhoneServiceImpl

* commit '3109262f814309b0c93464006ba29d6a53b3145b':
Fix merge error in BluetoothPhoneServiceImpl
52c09eeb949ff3a3a9619d680b9ddf79431e075f 05-Jun-2015 Mallikarjuna GB <gbmalli@codeaurora.org> am fb3200af: am 49422b57: Bluetooth: Send default value for CNUM.

* commit 'fb3200af797375442bc4e6275edd565f3fcf8a52':
Bluetooth: Send default value for CNUM.
e511709319579f0a132363c7e9b6a73277ab45c8 05-Jun-2015 Mallikarjuna GB <gbmalli@codeaurora.org> am cbda5d33: am 007de272: am 8729c185: BT: Don\'t answer video call as audio only call.

* commit 'cbda5d334377af91587358f3eec2127ed50dbda8':
BT: Don't answer video call as audio only call.
3109262f814309b0c93464006ba29d6a53b3145b 05-Jun-2015 Andre Eisenbach <eisenbach@google.com> Fix merge error in BluetoothPhoneServiceImpl

Change-Id: I0a7a721eb510642858b3037af63c3bf271d9c7c0
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
fb3200af797375442bc4e6275edd565f3fcf8a52 05-Jun-2015 Mallikarjuna GB <gbmalli@codeaurora.org> am 49422b57: Bluetooth: Send default value for CNUM.

* commit '49422b5771ff5bc45f032f40000697e6fd1bd3b5':
Bluetooth: Send default value for CNUM.
cbda5d334377af91587358f3eec2127ed50dbda8 05-Jun-2015 Mallikarjuna GB <gbmalli@codeaurora.org> am 007de272: am 8729c185: BT: Don\'t answer video call as audio only call.

* commit '007de2726e0c20730f03bfac0f3596d9c0d68851':
BT: Don't answer video call as audio only call.
007de2726e0c20730f03bfac0f3596d9c0d68851 05-Jun-2015 Mallikarjuna GB <gbmalli@codeaurora.org> am 8729c185: BT: Don\'t answer video call as audio only call.

* commit '8729c185e463f81639247e4a2c33ad723a60e353':
BT: Don't answer video call as audio only call.
49422b5771ff5bc45f032f40000697e6fd1bd3b5 01-Apr-2015 Mallikarjuna GB <gbmalli@codeaurora.org> Bluetooth: Send default value for CNUM.

Use case:
1. Connect BT headset.
2. Make MO call.
3. Check for AT+COPS response and SCO establishment.

Failure:
No response sent for AT+COPS.

Root cause:
Telephony is returning null as operator name.

Fix:
- When null value is returned for operator's
name and subscriber number from telephony
APIs, add default values for those.

Change-Id: I3d675e786bece1a18b651d5dba1207cf6603121d
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
8729c185e463f81639247e4a2c33ad723a60e353 04-Jun-2015 Mallikarjuna GB <gbmalli@codeaurora.org> BT: Don't answer video call as audio only call.

Use case:
1. Connect BT headset.
2. Receive MT video call.
3. Answer using BT headset.

Failure:
Video call gets answered as audio only call.

Root cause:
When answering call from BT headset, we are not checking
the if the call is video call and answering it as audio call.

Fix:
Check if the call is video call when answering with BT headset.

Change-Id: I9f29fee5685302046b2ac3f87e4b844150152a49
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
b2d1d4d53e6dca24413d7999ccf086f8461b1795 05-Jun-2015 Yorke Lee <yorkelee@google.com> Remove permission checks for registerPhoneAccount

Remove permissions required to register call provider
and connection manager.

Bug: 20303674
Change-Id: I14a16a2eadc4f74b41715dcf32e5b57aeb88e63a
rc/com/android/server/telecom/TelecomServiceImpl.java
15a197586b10091068ed6e7bbf8a65e3078dd27f 04-Jun-2015 Mallikarjuna GB <gbmalli@codeaurora.org> am 9ef92a02: am 61d43a9a: am 0ae2df88: BT: Send proper updates to headset for call swap

* commit '9ef92a02a9aa8a4f0a9f4fbc6b2e09b50321a5b4':
BT: Send proper updates to headset for call swap
9ef92a02a9aa8a4f0a9f4fbc6b2e09b50321a5b4 04-Jun-2015 Mallikarjuna GB <gbmalli@codeaurora.org> am 61d43a9a: am 0ae2df88: BT: Send proper updates to headset for call swap

* commit '61d43a9a8e604303771a059758104962f3a92364':
BT: Send proper updates to headset for call swap
61d43a9a8e604303771a059758104962f3a92364 04-Jun-2015 Mallikarjuna GB <gbmalli@codeaurora.org> am 0ae2df88: BT: Send proper updates to headset for call swap

* commit '0ae2df8877ab703fbdeb33c89bc7a694af5611ed':
BT: Send proper updates to headset for call swap
0ae2df8877ab703fbdeb33c89bc7a694af5611ed 04-Jun-2015 Mallikarjuna GB <gbmalli@codeaurora.org> BT: Send proper updates to headset for call swap

Use case:
1. Connect BT headset.
2. Make MO/MT call.
3. Make another MO/MT call.
4. When one call is active, another is on hold, swap calls from headset.
5. Check call held indicators sent to headset.

Failure:
1. Calls swapped and CIEV 7,2 and CIEV 7,1 is sent on GSM network.
2. For CDMA, calls swapped with in active CDMA conference but no held
call indicator is sent.

Root cause:
1. In gsm network, when active and held calls are swapped, firstly
active call is put to hold making held call count as 2 and
BluetoothPhoneService updates callheld indicator as no call active.
After this, next update comes to make original held call as active
and again callheld indicator as active and held is updated.

2. For CDMA, when calls are swapped, no call held indicator is sent
from Telephony.

Fix:
1. In gsm network, avoid unnecessary callheld indicator update as CIEV7,2
for call swapping.

2. In cdma network, send callheld indicator for call swap within
active conference.

Change-Id: I385e9b383c5c71cab2bf300669695d2fa66bd38c
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
cf118cbe5cc51ee014403f8541e5cb0a34d7e60a 04-Jun-2015 Santos Cordon <santoscordon@google.com> am 7ebd769a: am 72a9c2b1: am 2ebf0b73: Merge "Add ringer logging to telecom." into mnc-dev

* commit '7ebd769a347eb50bbe35cfb753c95edd62134137':
Add ringer logging to telecom.
7ebd769a347eb50bbe35cfb753c95edd62134137 04-Jun-2015 Santos Cordon <santoscordon@google.com> am 72a9c2b1: am 2ebf0b73: Merge "Add ringer logging to telecom." into mnc-dev

* commit '72a9c2b1c10e1345f756b7415dc35e6230e88deb':
Add ringer logging to telecom.
72a9c2b1c10e1345f756b7415dc35e6230e88deb 04-Jun-2015 Santos Cordon <santoscordon@google.com> am 2ebf0b73: Merge "Add ringer logging to telecom." into mnc-dev

* commit '2ebf0b733e737d3169058718f4fe7e97d698380a':
Add ringer logging to telecom.
1511f61d107e1cf8f0b97eec79fc77b9c249a64e 04-Jun-2015 Yorke Lee <yorkelee@google.com> am 6295ece8: am 5753e0c7: am 31c56fde: Merge "Disconnect SELECT_PHONE_ACCOUNT call to make room for outgoing call" into mnc-dev

* commit '6295ece8340119b16d286d6c546c0b4e454f1de6':
Disconnect SELECT_PHONE_ACCOUNT call to make room for outgoing call
2ebf0b733e737d3169058718f4fe7e97d698380a 04-Jun-2015 Santos Cordon <santoscordon@google.com> Merge "Add ringer logging to telecom." into mnc-dev
6295ece8340119b16d286d6c546c0b4e454f1de6 04-Jun-2015 Yorke Lee <yorkelee@google.com> am 5753e0c7: am 31c56fde: Merge "Disconnect SELECT_PHONE_ACCOUNT call to make room for outgoing call" into mnc-dev

* commit '5753e0c766a9c89b683c3f998883d4c2ddc52f7d':
Disconnect SELECT_PHONE_ACCOUNT call to make room for outgoing call
5753e0c766a9c89b683c3f998883d4c2ddc52f7d 04-Jun-2015 Yorke Lee <yorkelee@google.com> am 31c56fde: Merge "Disconnect SELECT_PHONE_ACCOUNT call to make room for outgoing call" into mnc-dev

* commit '31c56fdef34436ca7ab82af13a905be13497c746':
Disconnect SELECT_PHONE_ACCOUNT call to make room for outgoing call
31c56fdef34436ca7ab82af13a905be13497c746 04-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Disconnect SELECT_PHONE_ACCOUNT call to make room for outgoing call" into mnc-dev
7285220f35bfa7a5ace3e52165a64d31ff89df61 04-Jun-2015 Tyler Gunn <tgunn@google.com> am 5352d1b9: am b3c35721: am 20f7edfc: Merge "API Cleanup: Remove references to VideoState class." into mnc-dev

* commit '5352d1b95375ac9fc01226c2bc26cd9cbfcba644':
API Cleanup: Remove references to VideoState class.
361d86b37a648f2563eba85000e928d8a67b468f 04-Jun-2015 Yorke Lee <yorkelee@google.com> am 439df4d7: am 3ffb244e: am c4f4e7c7: Merge "Allow default dialer changes and phone account enable/disable via ADB" into mnc-dev

* commit '439df4d79253339ba50078e841c8920163b6b6c2':
Allow default dialer changes and phone account enable/disable via ADB
e57b4bd868edc92889a9a4f98f52d740c093deb4 04-Jun-2015 Geoff Mendal <mendal@google.com> am 1748bfcf: (-s ours) am 6ddfb62c: (-s ours) am 1d7d7d2e: (-s ours) Import translations. DO NOT MERGE

* commit '1748bfcf365e2a8b31679f94610a0a1e7ac9d018':
Import translations. DO NOT MERGE
867907d6b04e63c29fce74baad724ed96871221e 03-Jun-2015 Yorke Lee <yorkelee@google.com> Disconnect SELECT_PHONE_ACCOUNT call to make room for outgoing call

If there is a call still in the SELECT_PHONE_ACCOUNT state while
a new outgoing call is made, disconnect it to make room.

Also fix some logging in InCallController

Bug: 19187111
Change-Id: Ia161325480692ead7a1633f47604ced01604883f
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
a83f8a7012309177c75879c731132df0c8fc66f2 03-Jun-2015 Santos Cordon <santoscordon@google.com> Add ringer logging to telecom.

Bug: 21595219
Change-Id: I51ccaf4db1bd5d6238fa8f7e7091d092b75d0c1a
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/TelecomServiceImpl.java
5352d1b95375ac9fc01226c2bc26cd9cbfcba644 03-Jun-2015 Tyler Gunn <tgunn@google.com> am b3c35721: am 20f7edfc: Merge "API Cleanup: Remove references to VideoState class." into mnc-dev

* commit 'b3c35721f066b009760ee66b3519882854612c05':
API Cleanup: Remove references to VideoState class.
439df4d79253339ba50078e841c8920163b6b6c2 03-Jun-2015 Yorke Lee <yorkelee@google.com> am 3ffb244e: am c4f4e7c7: Merge "Allow default dialer changes and phone account enable/disable via ADB" into mnc-dev

* commit '3ffb244e9a3ba5bf05544ca75550269132bb261a':
Allow default dialer changes and phone account enable/disable via ADB
1748bfcf365e2a8b31679f94610a0a1e7ac9d018 03-Jun-2015 Geoff Mendal <mendal@google.com> am 6ddfb62c: (-s ours) am 1d7d7d2e: (-s ours) Import translations. DO NOT MERGE

* commit '6ddfb62c043233ecb7380ffb24d12bedc44d4a4a':
Import translations. DO NOT MERGE
b3c35721f066b009760ee66b3519882854612c05 03-Jun-2015 Tyler Gunn <tgunn@google.com> am 20f7edfc: Merge "API Cleanup: Remove references to VideoState class." into mnc-dev

* commit '20f7edfce6be91b3d5608cb75244093d72ee8739':
API Cleanup: Remove references to VideoState class.
3ffb244e9a3ba5bf05544ca75550269132bb261a 03-Jun-2015 Yorke Lee <yorkelee@google.com> am c4f4e7c7: Merge "Allow default dialer changes and phone account enable/disable via ADB" into mnc-dev

* commit 'c4f4e7c7d6ed8230df7e2bb0a5851dcd31fc67cb':
Allow default dialer changes and phone account enable/disable via ADB
6ddfb62c043233ecb7380ffb24d12bedc44d4a4a 03-Jun-2015 Geoff Mendal <mendal@google.com> am 1d7d7d2e: (-s ours) Import translations. DO NOT MERGE

* commit '1d7d7d2ec360c6f008590b37fc0590d6cdb55c23':
Import translations. DO NOT MERGE
695efbb76d4ef78fafe2cc3c1f63896ceed54a03 03-Jun-2015 Santos Cordon <santoscordon@google.com> am 9fb8b7e7: am a0246ee9: am 4508e1ea: Merge "Update BT state when BT devices are disconnected." into mnc-dev

* commit '9fb8b7e7ee2484e0358ed19af68bfab3cac56993':
Update BT state when BT devices are disconnected.
20f7edfce6be91b3d5608cb75244093d72ee8739 03-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "API Cleanup: Remove references to VideoState class." into mnc-dev
5b8824979e929250a46791c785b8459512236585 03-Jun-2015 Tyler Gunn <tgunn@google.com> API Cleanup: Remove references to VideoState class.

- Replace use of VideoState static methods with VideoProfile equivalent.
- Replace use of VideoState consts with VideoProfile equivalent.

Bug: 21573551
Change-Id: I567abaf4b6c0de51656869d1c7367a7ff3e51cd1
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
estapps/src/com/android/server/telecom/testapps/TestConnectionManager.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
c4f4e7c7d6ed8230df7e2bb0a5851dcd31fc67cb 03-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Allow default dialer changes and phone account enable/disable via ADB" into mnc-dev
1d7d7d2ec360c6f008590b37fc0590d6cdb55c23 03-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I5418e40205f707136fe745e14ff2144c28dfae1c
Auto-generated-cl: translation import
es/values-sq-rAL/strings.xml
es/values-uz-rUZ/strings.xml
3876aae094484579f70c98c5277a4befce7e82b5 03-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I305c4fd61c7490a50936fb89ead69f9edfa29794
Auto-generated-cl: translation import
es/values-sq-rAL/strings.xml
es/values-uz-rUZ/strings.xml
9fb8b7e7ee2484e0358ed19af68bfab3cac56993 03-Jun-2015 Santos Cordon <santoscordon@google.com> am a0246ee9: am 4508e1ea: Merge "Update BT state when BT devices are disconnected." into mnc-dev

* commit 'a0246ee9ed59f4ac942248ee4855494b63ca9293':
Update BT state when BT devices are disconnected.
a0246ee9ed59f4ac942248ee4855494b63ca9293 03-Jun-2015 Santos Cordon <santoscordon@google.com> am 4508e1ea: Merge "Update BT state when BT devices are disconnected." into mnc-dev

* commit '4508e1ea0e5816b24f554c9cb75457bc8739a9d9':
Update BT state when BT devices are disconnected.
4508e1ea0e5816b24f554c9cb75457bc8739a9d9 03-Jun-2015 Santos Cordon <santoscordon@google.com> Merge "Update BT state when BT devices are disconnected." into mnc-dev
17971f6577eea2a35d5bb8bc7d51432061ce5c96 03-Jun-2015 Santos Cordon <santoscordon@google.com> Update BT state when BT devices are disconnected.

Bug: 21168454
Change-Id: I9fc0e41661e30887fc31e8b30f8627427eefeab2
rc/com/android/server/telecom/BluetoothManager.java
80309b79e8a74277f8e35990fe428c35a8f2efc8 02-Jun-2015 Sharvil Nanavati <sharvil@google.com> am c3b8fb01: am 1975596c: am 76bcc370: PhoneAccountRegistrar#getSimCallManager should consider disabled PhoneAccounts.

* commit 'c3b8fb01b2ddb65ea4e07b0c443f212847929360':
PhoneAccountRegistrar#getSimCallManager should consider disabled PhoneAccounts.
71734c2db8a4e412d833b267777dd011e04cc942 02-Jun-2015 Yorke Lee <yorkelee@google.com> Allow default dialer changes and phone account enable/disable via ADB

Add commands accessible via adb shell that can be used for CTS tests
without the need for adb root
*set-phone-account-enabled
*set-phone-account-disabled
*set-default-dialer
*get-default-dialer

Modify enablePhoneAccount/setDefaultDialer to indicate success.

Remove now unused functionality in ProtectedEnableAccountPreferenceActivity
and ProtectedChangeDefaultDialerActivity.

Bug: 21583012
Change-Id: I542d145cc969334c004b8344fbbb01f278256f9d
ndroidManifest.xml
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
rc/com/android/server/telecom/settings/EnableAccountPreferenceActivity.java
c3b8fb01b2ddb65ea4e07b0c443f212847929360 02-Jun-2015 Sharvil Nanavati <sharvil@google.com> am 1975596c: am 76bcc370: PhoneAccountRegistrar#getSimCallManager should consider disabled PhoneAccounts.

* commit '1975596c4290d7e3237a4f81ec23d65eae21e165':
PhoneAccountRegistrar#getSimCallManager should consider disabled PhoneAccounts.
1975596c4290d7e3237a4f81ec23d65eae21e165 02-Jun-2015 Sharvil Nanavati <sharvil@google.com> am 76bcc370: PhoneAccountRegistrar#getSimCallManager should consider disabled PhoneAccounts.

* commit '76bcc370ae80c28ba1979d09a30b9fa0f88b73a6':
PhoneAccountRegistrar#getSimCallManager should consider disabled PhoneAccounts.
76bcc370ae80c28ba1979d09a30b9fa0f88b73a6 02-Jun-2015 Sharvil Nanavati <sharvil@google.com> PhoneAccountRegistrar#getSimCallManager should consider disabled PhoneAccounts.

The enabled property of a PhoneAccount doesn't apply to connection managers.
This change simply iterates over all phone accounts, even if they're disabled,
to find the active call manager.

Without this change, the default call manager would be set to "None" in the
Dialer UI. getSimCallManager would return null because the default call
manager's PhoneAccount is disabled.

Bug: 21520812
Change-Id: Ieae8f5c377c47111acf262ff4bc0cf07db6ef64d
rc/com/android/server/telecom/PhoneAccountRegistrar.java
67e3ce8216956977248474cd35f6a60dfff7a46a 02-Jun-2015 Yorke Lee <yorkelee@google.com> am c2561b11: am 72d4d068: am 59969540: Merge "Allow default dialer to be changed via adb without user confirmation" into mnc-dev

* commit 'c2561b1103ff7d0489417b4c20436a427db75593':
Allow default dialer to be changed via adb without user confirmation
c2561b1103ff7d0489417b4c20436a427db75593 02-Jun-2015 Yorke Lee <yorkelee@google.com> am 72d4d068: am 59969540: Merge "Allow default dialer to be changed via adb without user confirmation" into mnc-dev

* commit '72d4d06873bf34d3a046a449f95c5354869c07eb':
Allow default dialer to be changed via adb without user confirmation
72d4d06873bf34d3a046a449f95c5354869c07eb 01-Jun-2015 Yorke Lee <yorkelee@google.com> am 59969540: Merge "Allow default dialer to be changed via adb without user confirmation" into mnc-dev

* commit '5996954032bce378ebb3381f758c008beaca1fe4':
Allow default dialer to be changed via adb without user confirmation
5996954032bce378ebb3381f758c008beaca1fe4 01-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Allow default dialer to be changed via adb without user confirmation" into mnc-dev
5d2d8382079c2e89bfe1845415920f6a3e81f0ca 01-Jun-2015 Andrew Lee <anwlee@google.com> am f376140e: am 611e9798: am 8b8515ed: Merge "Use setIntentExtras instead of setExtras." into mnc-dev

* commit 'f376140e7401786ae798d62a4f22a035de736e94':
Use setIntentExtras instead of setExtras.
f376140e7401786ae798d62a4f22a035de736e94 01-Jun-2015 Andrew Lee <anwlee@google.com> am 611e9798: am 8b8515ed: Merge "Use setIntentExtras instead of setExtras." into mnc-dev

* commit '611e9798817a54d1da71f7c539d495d4f37b4f0e':
Use setIntentExtras instead of setExtras.
611e9798817a54d1da71f7c539d495d4f37b4f0e 01-Jun-2015 Andrew Lee <anwlee@google.com> am 8b8515ed: Merge "Use setIntentExtras instead of setExtras." into mnc-dev

* commit '8b8515ed49ecee838b5b4e1b4587dee9f40b0111':
Use setIntentExtras instead of setExtras.
8b8515ed49ecee838b5b4e1b4587dee9f40b0111 01-Jun-2015 Andrew Lee <anwlee@google.com> Merge "Use setIntentExtras instead of setExtras." into mnc-dev
657c7f79c9a142865ffba502433f73a14e8cb2b8 01-Jun-2015 Santos Cordon <santoscordon@google.com> am ac393e55: am 55c87913: am 07d48860: Merge "Add FOREGROUND_SERVICE flags to telecom bindings." into mnc-dev

* commit 'ac393e55b636183b76e7b0e78d5be66166cce8fb':
Add FOREGROUND_SERVICE flags to telecom bindings.
ac393e55b636183b76e7b0e78d5be66166cce8fb 01-Jun-2015 Santos Cordon <santoscordon@google.com> am 55c87913: am 07d48860: Merge "Add FOREGROUND_SERVICE flags to telecom bindings." into mnc-dev

* commit '55c87913541038b89bd5a1f3441ef4b2224adc19':
Add FOREGROUND_SERVICE flags to telecom bindings.
55c87913541038b89bd5a1f3441ef4b2224adc19 01-Jun-2015 Santos Cordon <santoscordon@google.com> am 07d48860: Merge "Add FOREGROUND_SERVICE flags to telecom bindings." into mnc-dev

* commit '07d4886088098cd91fbae81b81ae1e7eedefc060':
Add FOREGROUND_SERVICE flags to telecom bindings.
1b9066506b70c0c1a65ce676175f9a137facf846 01-Jun-2015 Andrew Lee <anwlee@google.com> Use setIntentExtras instead of setExtras.

There was a recent change to distinguish between extras provided by
Connections, and extras intended for use on Intents.

Bug: 21555553
Change-Id: I42c09427c4c36e7e441091807beac66b7e6f5f21
rc/com/android/server/telecom/CallsManager.java
07d4886088098cd91fbae81b81ae1e7eedefc060 01-Jun-2015 Santos Cordon <santoscordon@google.com> Merge "Add FOREGROUND_SERVICE flags to telecom bindings." into mnc-dev
7d94e80e11486349ff458263cdd9c6ae88a7fb9b 01-Jun-2015 Tyler Gunn <tgunn@google.com> am a0760902: am c8dc53a0: am c849155b: Fix build break.

* commit 'a0760902fed277a6278fe48c1a83b15d37850772':
Fix build break.
a0760902fed277a6278fe48c1a83b15d37850772 01-Jun-2015 Tyler Gunn <tgunn@google.com> am c8dc53a0: am c849155b: Fix build break.

* commit 'c8dc53a0c850e3912b71abbf7e27c8c9cbf627f5':
Fix build break.
e148643edaf797505d33d909315cc79d3f254091 01-Jun-2015 Geoff Mendal <mendal@google.com> am 85af17c7: (-s ours) am a5af6a18: (-s ours) am b90b0102: (-s ours) Import translations. DO NOT MERGE

* commit '85af17c72250204e6058bb6a4f079da7f7fc3565':
Import translations. DO NOT MERGE
85af17c72250204e6058bb6a4f079da7f7fc3565 01-Jun-2015 Geoff Mendal <mendal@google.com> am a5af6a18: (-s ours) am b90b0102: (-s ours) Import translations. DO NOT MERGE

* commit 'a5af6a18f8b87c34896515be4006338a328d1f91':
Import translations. DO NOT MERGE
ef5f0d57dc98f100bd1f889a30d393562438f5cb 30-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Idc04da6001e7724b1ec79692bd36327850985089
Auto-generated-cl: translation import
es/values-az-rAZ/strings.xml
7d3416debad83e519310320fd00c188d5eadf0ee 30-May-2015 Yorke Lee <yorkelee@google.com> Allow default dialer to be changed via adb without user confirmation

Required to automate CTS tests.

Change-Id: I696804ed6cdb65aed9f4914300fc228a0dcff6aa
ndroidManifest.xml
rc/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
c8dc53a0c850e3912b71abbf7e27c8c9cbf627f5 29-May-2015 Tyler Gunn <tgunn@google.com> am c849155b: Fix build break.

* commit 'c849155bb5edb5a89f1e055bb593ac65aa3be83e':
Fix build break.
c849155bb5edb5a89f1e055bb593ac65aa3be83e 29-May-2015 Tyler Gunn <tgunn@google.com> Fix build break.

- This was local and I forgot to repo upload it.

Bug: 21474356
Change-Id: I1ce4102a44abd031843ae9c1376dc02b3ebc0487
estapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
8e6edbf6eede9221ad4ef30ffb7d6ff26553a329 29-May-2015 Santos Cordon <santoscordon@google.com> Add FOREGROUND_SERVICE flags to telecom bindings.

This prevents the bound services (ConnectionService & InCallService)
from suffering power-saving measures of reduced network access or
outright killing of the process.

Bug: 21520647
Change-Id: I45640fbca4a669bf72b2aa03b1017eeeffa52375
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/ServiceBinder.java
a5af6a18f8b87c34896515be4006338a328d1f91 29-May-2015 Geoff Mendal <mendal@google.com> am b90b0102: (-s ours) Import translations. DO NOT MERGE

* commit 'b90b0102f3affa1104990ca9b152a1f0ac8907b8':
Import translations. DO NOT MERGE
b90b0102f3affa1104990ca9b152a1f0ac8907b8 29-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I6e1a16e93d1f71ef9feeb490f7f4a03f6e064dae
Auto-generated-cl: translation import
es/values-az-rAZ/strings.xml
8bf02cdf67413acef8734bc7a33b05065739f807 29-May-2015 Santos Cordon <santoscordon@google.com> am 6bfb1cdd: am 0373de13: am 0d5b6ee9: Merge "Add extras to Connections/Calls. (2/3)" into mnc-dev

* commit '6bfb1cdd1efc775479ba7d4f4cc5257ff03189ff':
Add extras to Connections/Calls. (2/3)
6bfb1cdd1efc775479ba7d4f4cc5257ff03189ff 29-May-2015 Santos Cordon <santoscordon@google.com> am 0373de13: am 0d5b6ee9: Merge "Add extras to Connections/Calls. (2/3)" into mnc-dev

* commit '0373de1303233242addcd3192f5e91bafcf5d0ec':
Add extras to Connections/Calls. (2/3)
0373de1303233242addcd3192f5e91bafcf5d0ec 29-May-2015 Santos Cordon <santoscordon@google.com> am 0d5b6ee9: Merge "Add extras to Connections/Calls. (2/3)" into mnc-dev

* commit '0d5b6ee93d90a70f9b8fd0fa5ce0c407ae84cc68':
Add extras to Connections/Calls. (2/3)
0d5b6ee93d90a70f9b8fd0fa5ce0c407ae84cc68 29-May-2015 Santos Cordon <santoscordon@google.com> Merge "Add extras to Connections/Calls. (2/3)" into mnc-dev
8d9b644a2574ac33a57bc2d0d84fc8328a4aac99 29-May-2015 Ihab Awad <ihab@google.com> am 2b365195: am 1fe78e6f: am 32dd7c33: Update tests to test "hold" state

* commit '2b365195f3d691f8e3e049ad440439c1f989903c':
Update tests to test "hold" state
b3907b3e79864a3a42d5e7105e5051f7e364fdba 28-May-2015 Santos Cordon <santoscordon@google.com> Add extras to Connections/Calls. (2/3)

Two major changes:
1) Add the notion of extras to a Connection. These extras will be
parceled through to InCallService as Call.getExtras()
2) The previously existing Call.getExtras() has been renamed to
getIntentExtras(). This name better describes the fact that these
particular extras are from the original CALL or INCOMING_CALL intents.

Change-Id: I4eed1e1bb47e83f8ba5c843cab7e7e492a297c71
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
2b365195f3d691f8e3e049ad440439c1f989903c 29-May-2015 Ihab Awad <ihab@google.com> am 1fe78e6f: am 32dd7c33: Update tests to test "hold" state

* commit '1fe78e6f99c1bb83a016187d1a3c02adf92d078c':
Update tests to test "hold" state
1fe78e6f99c1bb83a016187d1a3c02adf92d078c 28-May-2015 Ihab Awad <ihab@google.com> am 32dd7c33: Update tests to test "hold" state

* commit '32dd7c331c5b4dc475d96b113a052286973f78fc':
Update tests to test "hold" state
32dd7c331c5b4dc475d96b113a052286973f78fc 28-May-2015 Ihab Awad <ihab@google.com> Update tests to test "hold" state

Update the tests to add simple testing for the connection "hold"
state, and add a simple helper function for assertion with a timeout.

Change-Id: I3fbc947dccdc4c39a632ea96ea6d355a15930230
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
3106d8c8c1fc945edf46eabcd84f17d864052ae5 28-May-2015 Ihab Awad <ihab@google.com> am 84aa2204: am ba1d0376: am c3e7077c: Merge "Sync for AudioManager" into mnc-dev

* commit '84aa22044a337e9dfeca6b0c3c2916a0b2bdcfda':
Sync for AudioManager
84aa22044a337e9dfeca6b0c3c2916a0b2bdcfda 28-May-2015 Ihab Awad <ihab@google.com> am ba1d0376: am c3e7077c: Merge "Sync for AudioManager" into mnc-dev

* commit 'ba1d0376aa16dbe437a8612e858023ed2d67bf02':
Sync for AudioManager
ba1d0376aa16dbe437a8612e858023ed2d67bf02 28-May-2015 Ihab Awad <ihab@google.com> am c3e7077c: Merge "Sync for AudioManager" into mnc-dev

* commit 'c3e7077c73fdc80638601dbba1161120a6d98677':
Sync for AudioManager
c3e7077c73fdc80638601dbba1161120a6d98677 28-May-2015 Ihab Awad <ihab@google.com> Merge "Sync for AudioManager" into mnc-dev
e6ae0b40ab62ac87ae58cff98982c9fe4da15663 28-May-2015 Santos Cordon <santoscordon@google.com> am 79500755: am 4b8724ad: am b515ec27: Merge "Enable all older SIP-based accounts" into mnc-dev

* commit '7950075543c36c7dc16a4bc672a550840f5bbf46':
Enable all older SIP-based accounts
7950075543c36c7dc16a4bc672a550840f5bbf46 28-May-2015 Santos Cordon <santoscordon@google.com> am 4b8724ad: am b515ec27: Merge "Enable all older SIP-based accounts" into mnc-dev

* commit '4b8724adf21442aeea235d7ea85b2ddf2d65864e':
Enable all older SIP-based accounts
d39a3be3d0ad9155e53ec94979a6098b7e66c010 28-May-2015 Andrew Lee <anwlee@google.com> am 3db13b87: am e5339589: am 12c47529: Merge "Update missed call notification icons." into mnc-dev

* commit '3db13b872bd501a7f6fe434322eab059155b26c7':
Update missed call notification icons.
88a5344f3ff17e62f861d045c6808669f1108c2a 28-May-2015 Andrew Lee <anwlee@google.com> am 2a801dbd: am fbdd0c64: am fee17f6f: Lower character limits on notification actions.

* commit '2a801dbd193b66c67679931d790ae1a783baa72e':
Lower character limits on notification actions.
4b8724adf21442aeea235d7ea85b2ddf2d65864e 28-May-2015 Santos Cordon <santoscordon@google.com> am b515ec27: Merge "Enable all older SIP-based accounts" into mnc-dev

* commit 'b515ec27fbba2b38f2d79afa3f83b700c82abc59':
Enable all older SIP-based accounts
b515ec27fbba2b38f2d79afa3f83b700c82abc59 28-May-2015 Santos Cordon <santoscordon@google.com> Merge "Enable all older SIP-based accounts" into mnc-dev
3db13b872bd501a7f6fe434322eab059155b26c7 28-May-2015 Andrew Lee <anwlee@google.com> am e5339589: am 12c47529: Merge "Update missed call notification icons." into mnc-dev

* commit 'e5339589684801463dd9fa70618cf00375e3237a':
Update missed call notification icons.
2a801dbd193b66c67679931d790ae1a783baa72e 28-May-2015 Andrew Lee <anwlee@google.com> am fbdd0c64: am fee17f6f: Lower character limits on notification actions.

* commit 'fbdd0c64f158f2c353181dcab4f303a07762c9a1':
Lower character limits on notification actions.
e5339589684801463dd9fa70618cf00375e3237a 28-May-2015 Andrew Lee <anwlee@google.com> am 12c47529: Merge "Update missed call notification icons." into mnc-dev

* commit '12c47529c83d01de98283e606a91d19503b52c38':
Update missed call notification icons.
fbdd0c64f158f2c353181dcab4f303a07762c9a1 28-May-2015 Andrew Lee <anwlee@google.com> am fee17f6f: Lower character limits on notification actions.

* commit 'fee17f6f7e2b222699af5677a52c14354c5165e7':
Lower character limits on notification actions.
12c47529c83d01de98283e606a91d19503b52c38 28-May-2015 Andrew Lee <anwlee@google.com> Merge "Update missed call notification icons." into mnc-dev
b60f00673149da9a96d9369f4e1c4458e9a9cf53 27-May-2015 Ihab Awad <ihab@google.com> Sync for AudioManager

Fixes sync problems where the system calls back into Telecom while
Telecom is synchronously processing a message.

Bug: 21289255
Change-Id: I4ea319113be2e4651c82c6e9712eb4d97ea9e9bb
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
fee17f6f7e2b222699af5677a52c14354c5165e7 27-May-2015 Andrew Lee <anwlee@google.com> Lower character limits on notification actions.

Because we're constrained by the system UI on the length of text
strings which can be shown for the action buttons on a call
notification, the strings can't be that long.

Bug: 20987110
Change-Id: I6ffd1ea3ff1514c4dc4a6bfbdc7fb8681369a98b
es/values/strings.xml
bbdd44c57736b256ce118ce230ec95a1d42f30a7 27-May-2015 Andrew Lee <anwlee@google.com> Update missed call notification icons.

+ Replaced new message/phone icons, with automirroring.
- Remove unused icons.
+ Fix some naming.

Bug: 20832994
Change-Id: I6f755acd22ba029c5d3192061a82eab9305e6fb8
es/drawable-hdpi/ic_arrow_back_24dp.png
es/drawable-hdpi/ic_arrow_back_white_24dp.png
es/drawable-hdpi/ic_message_24dp.png
es/drawable-hdpi/ic_more_vert_24dp.png
es/drawable-hdpi/ic_more_vert_white_24dp.png
es/drawable-hdpi/ic_phone_24dp.png
es/drawable-hdpi/ic_text_holo_dark.png
es/drawable-hdpi/stat_sys_phone_call.png
es/drawable-ldrtl-hdpi/ic_text_holo_dark.png
es/drawable-ldrtl-hdpi/stat_sys_phone_call.png
es/drawable-ldrtl-mdpi/ic_text_holo_dark.png
es/drawable-ldrtl-mdpi/stat_sys_phone_call.png
es/drawable-ldrtl-xhdpi/ic_text_holo_dark.png
es/drawable-ldrtl-xhdpi/stat_sys_phone_call.png
es/drawable-mdpi/ic_arrow_back_24dp.png
es/drawable-mdpi/ic_arrow_back_white_24dp.png
es/drawable-mdpi/ic_message_24dp.png
es/drawable-mdpi/ic_more_vert_24dp.png
es/drawable-mdpi/ic_more_vert_white_24dp.png
es/drawable-mdpi/ic_phone_24dp.png
es/drawable-mdpi/ic_text_holo_dark.png
es/drawable-mdpi/stat_sys_phone_call.png
es/drawable-xhdpi/ic_arrow_back_24dp.png
es/drawable-xhdpi/ic_arrow_back_white_24dp.png
es/drawable-xhdpi/ic_message_24dp.png
es/drawable-xhdpi/ic_more_vert_24dp.png
es/drawable-xhdpi/ic_more_vert_white_24dp.png
es/drawable-xhdpi/ic_phone_24dp.png
es/drawable-xhdpi/ic_text_holo_dark.png
es/drawable-xhdpi/stat_sys_phone_call.png
es/drawable-xxhdpi/ic_arrow_back_24dp.png
es/drawable-xxhdpi/ic_arrow_back_white_24dp.png
es/drawable-xxhdpi/ic_message_24dp.png
es/drawable-xxhdpi/ic_more_vert_24dp.png
es/drawable-xxhdpi/ic_more_vert_white_24dp.png
es/drawable-xxhdpi/ic_phone_24dp.png
es/drawable-xxxhdpi/ic_arrow_back_24dp.png
es/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
es/drawable-xxxhdpi/ic_message_24dp.png
es/drawable-xxxhdpi/ic_more_vert_24dp.png
es/drawable-xxxhdpi/ic_more_vert_white_24dp.png
es/drawable-xxxhdpi/ic_phone_24dp.png
es/drawable/ic_back_arrow.xml
es/drawable/ic_message.xml
es/drawable/ic_phone.xml
es/values/styles.xml
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
a82aed819d3a86b748d9e403fb288967a10dcdf2 26-May-2015 Santos Cordon <santoscordon@google.com> Enable all older SIP-based accounts

Bug: 21436375
Change-Id: I1ba32804ba80fb32a961872c8fa0fcda7a49c831
rc/com/android/server/telecom/PhoneAccountRegistrar.java
6a274d5802155961293310825af51211e1064267 25-May-2015 Geoff Mendal <mendal@google.com> am 277a1570: (-s ours) am f6181353: (-s ours) am 58fdc421: (-s ours) Import translations. DO NOT MERGE

* commit '277a1570074780105947de3fbb2f9ea8f4bc463b':
Import translations. DO NOT MERGE
277a1570074780105947de3fbb2f9ea8f4bc463b 25-May-2015 Geoff Mendal <mendal@google.com> am f6181353: (-s ours) am 58fdc421: (-s ours) Import translations. DO NOT MERGE

* commit 'f618135334faf5b2e2d4c9f4f26cb21e0458da34':
Import translations. DO NOT MERGE
f618135334faf5b2e2d4c9f4f26cb21e0458da34 25-May-2015 Geoff Mendal <mendal@google.com> am 58fdc421: (-s ours) Import translations. DO NOT MERGE

* commit '58fdc421443168ace01f7b1e6487276680bafa49':
Import translations. DO NOT MERGE
58fdc421443168ace01f7b1e6487276680bafa49 25-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I52bdbb549a602ef014c0b7b714d04c6aad354fdc
Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-mk-rMK/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-pl/strings.xml
es/values-ru/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
b296fd941049260da4066f04e32e3a301a73660c 25-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I4674c9856d0794e18262e82da78e23e9d3d362d8
Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-mk-rMK/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-pl/strings.xml
es/values-ru/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
ddf09fb9386938404c599ffbc99b89c6c0bff424 23-May-2015 Santos Cordon <santoscordon@google.com> am e3aaf981: am 3107c699: am a6b20a1f: Merge "Protecting PII data." into mnc-dev

* commit 'e3aaf981df256c2409122cea4dbc0ae6848466e3':
Protecting PII data.
e3aaf981df256c2409122cea4dbc0ae6848466e3 23-May-2015 Santos Cordon <santoscordon@google.com> am 3107c699: am a6b20a1f: Merge "Protecting PII data." into mnc-dev

* commit '3107c699b4cf6ad9f1879886c8bef08fe983fb57':
Protecting PII data.
06560891015ebe529a0931d1d4841b9897aa6808 22-May-2015 Sharvil Nanavati <sharvil@google.com> am 2416d3cb: am e7ba03e7: am e8b0a217: Merge "Fix bug where selecting the "None" call assistant wouldn\'t work." into mnc-dev

* commit '2416d3cb889380c3adb89ea369c547196121ffde':
Fix bug where selecting the "None" call assistant wouldn't work.
3107c699b4cf6ad9f1879886c8bef08fe983fb57 22-May-2015 Santos Cordon <santoscordon@google.com> am a6b20a1f: Merge "Protecting PII data." into mnc-dev

* commit 'a6b20a1ff1cd967323ba72cd1b2c9382262dc6e6':
Protecting PII data.
a6b20a1ff1cd967323ba72cd1b2c9382262dc6e6 22-May-2015 Santos Cordon <santoscordon@google.com> Merge "Protecting PII data." into mnc-dev
3188b364c360f83631fe1c7623c0e4252088b3c6 22-May-2015 Santos Cordon <santoscordon@google.com> Protecting PII data.

Bug: 21204385
Change-Id: I95a82e6ae79b728ed75da25be3beedd0e66d5b41
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/components/TelecomService.java
2416d3cb889380c3adb89ea369c547196121ffde 22-May-2015 Sharvil Nanavati <sharvil@google.com> am e7ba03e7: am e8b0a217: Merge "Fix bug where selecting the "None" call assistant wouldn\'t work." into mnc-dev

* commit 'e7ba03e7038cff2398ff9e96331545a6d57bb7d6':
Fix bug where selecting the "None" call assistant wouldn't work.
e7ba03e7038cff2398ff9e96331545a6d57bb7d6 22-May-2015 Sharvil Nanavati <sharvil@google.com> am e8b0a217: Merge "Fix bug where selecting the "None" call assistant wouldn\'t work." into mnc-dev

* commit 'e8b0a21786a310c1d11f441d2f4694df507bb403':
Fix bug where selecting the "None" call assistant wouldn't work.
e8b0a21786a310c1d11f441d2f4694df507bb403 22-May-2015 Sharvil Nanavati <sharvil@google.com> Merge "Fix bug where selecting the "None" call assistant wouldn't work." into mnc-dev
a8d6a384981a48a734fafdfdf48fb93f79762e09 22-May-2015 Sharvil Nanavati <sharvil@google.com> Fix bug where selecting the "None" call assistant wouldn't work.

We'd always fall back to the default call assistant from the XML
config.

Bug: 21093114
Change-Id: I841ebe2ef6432cae36530794908f2000306fb69c
rc/com/android/server/telecom/PhoneAccountRegistrar.java
2a861fd8301a65d374516d57d605cd869cf67e8d 21-May-2015 Santos Cordon <santoscordon@google.com> am 4731d7c9: am 3bf58d4e: am 86f10a5d: Merge "Add intent for enabling phone account." into mnc-dev

* commit '4731d7c9c8c7a941503152ce1a1089d4813a584d':
Add intent for enabling phone account.
3fa11b3ae5d3f1c606e9e5c24e8fea86dc3662df 21-May-2015 Geoff Mendal <mendal@google.com> am a10ca00d: (-s ours) am 98a8d135: (-s ours) am a24b1433: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'a10ca00dff58fa9235f3e3e791581b54aa5bd164':
Import translations. DO NOT MERGE
108f4844d6f7063b13272cdbb554ca0b7b55382e 21-May-2015 Baligh Uddin <baligh@google.com> am aac273e3: (-s ours) am a78c74b6: (-s ours) am 3bf368d3: (-s ours) Import translations. DO NOT MERGE

* commit 'aac273e394e387fd5c59396f7fb9e04bc58a1352':
Import translations. DO NOT MERGE
4731d7c9c8c7a941503152ce1a1089d4813a584d 21-May-2015 Santos Cordon <santoscordon@google.com> am 3bf58d4e: am 86f10a5d: Merge "Add intent for enabling phone account." into mnc-dev

* commit '3bf58d4e55ba456312873a20a94459325d853348':
Add intent for enabling phone account.
a10ca00dff58fa9235f3e3e791581b54aa5bd164 21-May-2015 Geoff Mendal <mendal@google.com> am 98a8d135: (-s ours) am a24b1433: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '98a8d135679809f8d094e4f210ce883fb21a2c55':
Import translations. DO NOT MERGE
aac273e394e387fd5c59396f7fb9e04bc58a1352 21-May-2015 Baligh Uddin <baligh@google.com> am a78c74b6: (-s ours) am 3bf368d3: (-s ours) Import translations. DO NOT MERGE

* commit 'a78c74b61fe5becbca7ff184c62ec35db7226134':
Import translations. DO NOT MERGE
3bf58d4e55ba456312873a20a94459325d853348 21-May-2015 Santos Cordon <santoscordon@google.com> am 86f10a5d: Merge "Add intent for enabling phone account." into mnc-dev

* commit '86f10a5da153de37b1ca5a2a2bd3b2704cc2ede2':
Add intent for enabling phone account.
86f10a5da153de37b1ca5a2a2bd3b2704cc2ede2 21-May-2015 Santos Cordon <santoscordon@google.com> Merge "Add intent for enabling phone account." into mnc-dev
98a8d135679809f8d094e4f210ce883fb21a2c55 21-May-2015 Geoff Mendal <mendal@google.com> am a24b1433: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'a24b14334ace3ff25960ab3d0911eac13948e09d':
Import translations. DO NOT MERGE
a24b14334ace3ff25960ab3d0911eac13948e09d 21-May-2015 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into mnc-dev
a78c74b61fe5becbca7ff184c62ec35db7226134 21-May-2015 Baligh Uddin <baligh@google.com> am 3bf368d3: (-s ours) Import translations. DO NOT MERGE

* commit '3bf368d3ad191ce528d79ec89cf3ed062d741105':
Import translations. DO NOT MERGE
8b5fc758246cb300970e71c9172c256eb3bc63d9 21-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I065c8da5a75cb8373ea07a842c5cc31ffa3e15c7
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
2af578177e3eae63c418d1932cbb9aeeea95d1c4 21-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I81b449fe5a37d2d248aa85b5a633001d5e5fa3e0
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
3bf368d3ad191ce528d79ec89cf3ed062d741105 21-May-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I91c2d65c3508a6a71286b90d3ddf97788c046e81
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
638f05cb620a17ae7334486d2f53e223ac65eef5 20-May-2015 Santos Cordon <santoscordon@google.com> Add intent for enabling phone account.

Bug: 20303449
Change-Id: If6e717260df01160308fd395a6aac413aa5206d5
ndroidManifest.xml
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/settings/EnableAccountPreferenceActivity.java
a5834fe8d1250c289db9ec7966d04bd261acbc3f 21-May-2015 Ihab Awad <ihab@google.com> am ab0ef647: am 574f4d7e: am f8bdf691: Merge "Update tests" into mnc-dev

* commit 'ab0ef64788ce777ce30a341485417c9962fe9cbe':
Update tests
ab0ef64788ce777ce30a341485417c9962fe9cbe 21-May-2015 Ihab Awad <ihab@google.com> am 574f4d7e: am f8bdf691: Merge "Update tests" into mnc-dev

* commit '574f4d7ecec4c9004a9e22faef5a6bfbb6e76475':
Update tests
574f4d7ecec4c9004a9e22faef5a6bfbb6e76475 20-May-2015 Ihab Awad <ihab@google.com> am f8bdf691: Merge "Update tests" into mnc-dev

* commit 'f8bdf691f571d3aa186a9bebbd93c69bea929db7':
Update tests
f8bdf691f571d3aa186a9bebbd93c69bea929db7 20-May-2015 Ihab Awad <ihab@google.com> Merge "Update tests" into mnc-dev
1b5490ac8643a5969adaba6f68d872acd251d666 12-May-2015 Ihab Awad <ihab@google.com> Update tests

ConnectionServiceFixture now does not use Mockito when() allowing
reset() at any time. Added tests for incoming calls.

Change-Id: Ic5f5fc7b910a97d2838090713439f703d80748c6
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/TODO
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
bbd37698f31c9fc65efc82cbba44348cc91a12c5 20-May-2015 Alex Klyubin <klyubin@google.com> am a2e5960e: am 29757391: am 32f760ac: Merge "Telecomm service does not use cleartext network traffic." into mnc-dev

* commit 'a2e5960e96d5ad77aa496c6e913cc211132d9973':
Telecomm service does not use cleartext network traffic.
a2e5960e96d5ad77aa496c6e913cc211132d9973 20-May-2015 Alex Klyubin <klyubin@google.com> am 29757391: am 32f760ac: Merge "Telecomm service does not use cleartext network traffic." into mnc-dev

* commit '297573913bb00bf98b08e8afabbea66dc4a93b96':
Telecomm service does not use cleartext network traffic.
297573913bb00bf98b08e8afabbea66dc4a93b96 20-May-2015 Alex Klyubin <klyubin@google.com> am 32f760ac: Merge "Telecomm service does not use cleartext network traffic." into mnc-dev

* commit '32f760acc0c0400e1707125f9a255aaae95aae65':
Telecomm service does not use cleartext network traffic.
58b9af37c904e846ca54cd883bff67c75949a797 20-May-2015 Ihab Awad <ihab@google.com> am 611a7a71: am 54257695: am 0a4b95fc: Fix test bitrot breakages

* commit '611a7a71b86204fe31ecfe5a71b923a0aadb05ed':
Fix test bitrot breakages
32f760acc0c0400e1707125f9a255aaae95aae65 20-May-2015 Alex Klyubin <klyubin@google.com> Merge "Telecomm service does not use cleartext network traffic." into mnc-dev
611a7a71b86204fe31ecfe5a71b923a0aadb05ed 20-May-2015 Ihab Awad <ihab@google.com> am 54257695: am 0a4b95fc: Fix test bitrot breakages

* commit '542576956ba028dd138f666b0fad9f064ae81c9a':
Fix test bitrot breakages
542576956ba028dd138f666b0fad9f064ae81c9a 20-May-2015 Ihab Awad <ihab@google.com> am 0a4b95fc: Fix test bitrot breakages

* commit '0a4b95fc7731943fdd1a9b295daae45eb46b28d0':
Fix test bitrot breakages
ebe2fb311bcd0006eeba78c3d3c2fbe8a8fc64bb 20-May-2015 Alex Klyubin <klyubin@google.com> Telecomm service does not use cleartext network traffic.

This declares to the platform and tools that this service does not use
cleartext network traffic. The platform and tools will be blocking
(on best effort basis) attempts to use such traffic by this service.
For example, attempts to use HTTP (rather than HTTPS) will be blocked.

Bug: 19215516
Change-Id: I443fdc64e5e9bbfb51fd2649c7c6efd5fc000d9f
ndroidManifest.xml
0a4b95fc7731943fdd1a9b295daae45eb46b28d0 18-May-2015 Ihab Awad <ihab@google.com> Fix test bitrot breakages

Change-Id: I39cbcd078c07fd48ca9b00abce21871ef273b19d
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
e56c3d75065d7c2c9cff2a2d529e7a0c63f494e8 20-May-2015 Ihab Awad <ihab@google.com> am 73546be6: am 0c85336d: am afb408d7: Merge "Sync for HeadsetMediaButton" into mnc-dev

* commit '73546be693da51d37cebc5ea3d32397f3002bf69':
Sync for HeadsetMediaButton
12068d3a2822f321feb963620021e93640f9fc3c 20-May-2015 Santos Cordon <santoscordon@google.com> am a7ac1e07: am 7b94a95a: am 7db61857: Merge "Provide enable property on phone accounts." into mnc-dev

* commit 'a7ac1e07938a4f38d149f31fdbcc07c77bccd7d0':
Provide enable property on phone accounts.
30d82bd9b1367d88ae6ca06135eebd01437eb379 20-May-2015 Yorke Lee <yorkelee@google.com> am 7da7725e: am 3089f967: am 57138a69: Privileged dialers always have phone-related runtime permissions

* commit '7da7725ee41cf4059f522e76d7224d09db7ce27c':
Privileged dialers always have phone-related runtime permissions
73546be693da51d37cebc5ea3d32397f3002bf69 20-May-2015 Ihab Awad <ihab@google.com> am 0c85336d: am afb408d7: Merge "Sync for HeadsetMediaButton" into mnc-dev

* commit '0c85336d09aa4b00e330c6ee314ddd1028f611bd':
Sync for HeadsetMediaButton
a7ac1e07938a4f38d149f31fdbcc07c77bccd7d0 20-May-2015 Santos Cordon <santoscordon@google.com> am 7b94a95a: am 7db61857: Merge "Provide enable property on phone accounts." into mnc-dev

* commit '7b94a95a733661f60b3a5f77ca5055d7d9387354':
Provide enable property on phone accounts.
7da7725ee41cf4059f522e76d7224d09db7ce27c 20-May-2015 Yorke Lee <yorkelee@google.com> am 3089f967: am 57138a69: Privileged dialers always have phone-related runtime permissions

* commit '3089f967993414c76f5f249e995764e3330559bf':
Privileged dialers always have phone-related runtime permissions
0c85336d09aa4b00e330c6ee314ddd1028f611bd 19-May-2015 Ihab Awad <ihab@google.com> am afb408d7: Merge "Sync for HeadsetMediaButton" into mnc-dev

* commit 'afb408d738ec4583a02dc7ec6bb3c5a74479fb09':
Sync for HeadsetMediaButton
7b94a95a733661f60b3a5f77ca5055d7d9387354 19-May-2015 Santos Cordon <santoscordon@google.com> am 7db61857: Merge "Provide enable property on phone accounts." into mnc-dev

* commit '7db618571e0e887022344761d1b158e55b7a360d':
Provide enable property on phone accounts.
afb408d738ec4583a02dc7ec6bb3c5a74479fb09 19-May-2015 Ihab Awad <ihab@google.com> Merge "Sync for HeadsetMediaButton" into mnc-dev
7db618571e0e887022344761d1b158e55b7a360d 19-May-2015 Santos Cordon <santoscordon@google.com> Merge "Provide enable property on phone accounts." into mnc-dev
ea5cb93d81099f17654e0fdf9b8eda3bfa89f081 08-May-2015 Santos Cordon <santoscordon@google.com> Provide enable property on phone accounts.

Bug: 20303449
Change-Id: I4b9cb0e29377233ed4fc01757570351ee6e5856e
ndroidManifest.xml
es/values/strings.xml
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelephonyUtil.java
rc/com/android/server/telecom/settings/EnableAccountPreferenceActivity.java
rc/com/android/server/telecom/settings/EnableAccountPreferenceFragment.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
731369c3983628e700f161138fe2ea3230033a1a 19-May-2015 Ihab Awad <ihab@google.com> Sync for HeadsetMediaButton

Add synchronization and deferred execution to our interactions with
MediaSession, since MediaSession sometimes calls back via an RPC into
Telecom and can cause us to deadlock.

Bug: 21028885
Change-Id: I8fc0574269a81e817e1c139aa0fe56258c96bd64
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/HeadsetMediaButton.java
rc/com/android/server/telecom/HeadsetMediaButtonFactory.java
rc/com/android/server/telecom/components/TelecomService.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
3089f967993414c76f5f249e995764e3330559bf 19-May-2015 Yorke Lee <yorkelee@google.com> am 57138a69: Privileged dialers always have phone-related runtime permissions

* commit '57138a6916678747e585564c691144f781d173cd':
Privileged dialers always have phone-related runtime permissions
57138a6916678747e585564c691144f781d173cd 19-May-2015 Yorke Lee <yorkelee@google.com> Privileged dialers always have phone-related runtime permissions

Bug: 20266292
Change-Id: If4492d9cdc7806167b9b586764b11187235cfd3a
rc/com/android/server/telecom/TelecomServiceImpl.java
2ddb53f77a9645856e48766d4e35894144557c87 19-May-2015 Yorke Lee <yorkelee@google.com> am ee630f5f: am f8ce129c: am 053cecc7: Merge "TelecomServiceImpl permissions cleanup" into mnc-dev

* commit 'ee630f5f768341df1ebd507fe7ff6e75429794f0':
TelecomServiceImpl permissions cleanup
ee630f5f768341df1ebd507fe7ff6e75429794f0 19-May-2015 Yorke Lee <yorkelee@google.com> am f8ce129c: am 053cecc7: Merge "TelecomServiceImpl permissions cleanup" into mnc-dev

* commit 'f8ce129c9a6283eac9847873243bbb72f25b2125':
TelecomServiceImpl permissions cleanup
f8ce129c9a6283eac9847873243bbb72f25b2125 19-May-2015 Yorke Lee <yorkelee@google.com> am 053cecc7: Merge "TelecomServiceImpl permissions cleanup" into mnc-dev

* commit '053cecc72db4a0c3953106de0624d3aad89a3ffe':
TelecomServiceImpl permissions cleanup
053cecc72db4a0c3953106de0624d3aad89a3ffe 19-May-2015 Yorke Lee <yorkelee@google.com> Merge "TelecomServiceImpl permissions cleanup" into mnc-dev
cb0bd8a807c0b7d0c4db9fe9a48ea8cbf2efa97e 18-May-2015 Yorke Lee <yorkelee@google.com> TelecomServiceImpl permissions cleanup

Simplify some code that does permission checks
Allow default dialer to use placeCall API.

Bug: 20266292

Change-Id: Ib31ae5f7debb41df9daa5dce330a7a86ac58e81a
rc/com/android/server/telecom/TelecomServiceImpl.java
68c7a868cdfdea8366e44f50c7ed166686d2b71f 18-May-2015 Santos Cordon <santoscordon@google.com> am 4be92219: am 1af0bddd: am 55344342: Add a setting to enable/disable calling accounts.

* commit '4be922195f1bf713d4aba085ebb6caa5fe685539':
Add a setting to enable/disable calling accounts.
4be922195f1bf713d4aba085ebb6caa5fe685539 18-May-2015 Santos Cordon <santoscordon@google.com> am 1af0bddd: am 55344342: Add a setting to enable/disable calling accounts.

* commit '1af0bddde449dbbafa70ef0de87c3a42ac0d4a46':
Add a setting to enable/disable calling accounts.
1af0bddde449dbbafa70ef0de87c3a42ac0d4a46 18-May-2015 Santos Cordon <santoscordon@google.com> am 55344342: Add a setting to enable/disable calling accounts.

* commit '55344342de211db4c99d57ddfc550864d9113376':
Add a setting to enable/disable calling accounts.
55344342de211db4c99d57ddfc550864d9113376 04-May-2015 Santos Cordon <santoscordon@google.com> Add a setting to enable/disable calling accounts.

Bug: 20303449
Change-Id: I34f9e5a572fd449ad617861576937f9648ae4ee9
ndroidManifest.xml
es/values/strings.xml
es/xml/enable_account_preference.xml
rc/com/android/server/telecom/settings/EnableAccountPreferenceActivity.java
rc/com/android/server/telecom/settings/EnableAccountPreferenceFragment.java
162c91a9e8fa0562a77259e14319e1048bd4f264 15-May-2015 Santos Cordon <santoscordon@google.com> am 42648202: am 92eef53e: am ebf2d0f2: Add a slew of clearCallingIdentity() invocations to telecom.

* commit '42648202951f88f0a3cb4beb81ba52ab83250d83':
Add a slew of clearCallingIdentity() invocations to telecom.
42648202951f88f0a3cb4beb81ba52ab83250d83 15-May-2015 Santos Cordon <santoscordon@google.com> am 92eef53e: am ebf2d0f2: Add a slew of clearCallingIdentity() invocations to telecom.

* commit '92eef53e1235bc3d9b2d97312016cb72c0c34d03':
Add a slew of clearCallingIdentity() invocations to telecom.
92eef53e1235bc3d9b2d97312016cb72c0c34d03 15-May-2015 Santos Cordon <santoscordon@google.com> am ebf2d0f2: Add a slew of clearCallingIdentity() invocations to telecom.

* commit 'ebf2d0f2b4f17e958b0b23d94edc6b0d05334e43':
Add a slew of clearCallingIdentity() invocations to telecom.
ebf2d0f2b4f17e958b0b23d94edc6b0d05334e43 15-May-2015 Santos Cordon <santoscordon@google.com> Add a slew of clearCallingIdentity() invocations to telecom.

We used to use Handlers to move things onto the telecom main thread when
they came in through Binder calls. This also had the effect of
switching to telecom's calling identity.

Since we no longer do that, we need to manually reset the calling
identity to avoid the permissions failures that we've been seeing
lately. This change adds all the checks that are necessary today and
checks which would help down the road if any code changes.

Bug: 20830275
Change-Id: I73e3e2d310a505ac96abe3aed7f2118346c7be1f
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/TelecomServiceImpl.java
48596a2df71aa4fbd22a90ee2c8bfdfaf0122a04 14-May-2015 Sharvil Nanavati <sharvil@google.com> am e79f0665: am 987ea92d: am 6d3efb47: Fix crash caused by incorrect permission in TelecomServiceImpl.

* commit 'e79f0665df3b6c6c878b54c9d402cad585decfb4':
Fix crash caused by incorrect permission in TelecomServiceImpl.
e79f0665df3b6c6c878b54c9d402cad585decfb4 14-May-2015 Sharvil Nanavati <sharvil@google.com> am 987ea92d: am 6d3efb47: Fix crash caused by incorrect permission in TelecomServiceImpl.

* commit '987ea92d01280c0dfa96033ede687fefb6e7e8b5':
Fix crash caused by incorrect permission in TelecomServiceImpl.
987ea92d01280c0dfa96033ede687fefb6e7e8b5 14-May-2015 Sharvil Nanavati <sharvil@google.com> am 6d3efb47: Fix crash caused by incorrect permission in TelecomServiceImpl.

* commit '6d3efb475b495722b32976fe60c1ea5a9838ae53':
Fix crash caused by incorrect permission in TelecomServiceImpl.
6d3efb475b495722b32976fe60c1ea5a9838ae53 14-May-2015 Sharvil Nanavati <sharvil@google.com> Fix crash caused by incorrect permission in TelecomServiceImpl.

Without this change, the addNewIncomingCall and addNewUnknownCall
would use the caller's permissions instead of Telecom's permissions.
The caller may not have android.permission.BIND_CONNECTION_SERVICE
resulting in the process crashing.

Bug: 21057492
Change-Id: Ia67d1e32914c814cdff1af987eb72ed1aa759bdb
rc/com/android/server/telecom/TelecomServiceImpl.java
146190713cbeba305c108e7b39b653999dba0d57 14-May-2015 Geoff Mendal <mendal@google.com> am 5c9b1632: (-s ours) am 6bc4d2cf: (-s ours) am cd9e3e9f: (-s ours) Import translations. DO NOT MERGE

* commit '5c9b1632f538d3ba1202e4cd86be03fdb6509239':
Import translations. DO NOT MERGE
66436400fe2a5f7be460df357c1999f3df93d9f4 14-May-2015 Yorke Lee <yorkelee@google.com> am 29bf4939: am 04da67d2: am e10b8d17: Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev

* commit '29bf49396a64b59d9da41803623f4707067c28b2':
Add BIND_TELECOM_CONNECTION_SERVICE permission
27c996991831137d9bbb2552dc2d64111f2fd636 14-May-2015 Santos Cordon <santoscordon@google.com> am a865e9a3: am 27e9eeac: am a955f69f: Merge "[2/4] Use new Icon class in PhoneAccount." into mnc-dev

* commit 'a865e9a3d0c9b84089798c14e0afc76a3d2874a0':
[2/4] Use new Icon class in PhoneAccount.
5c9b1632f538d3ba1202e4cd86be03fdb6509239 14-May-2015 Geoff Mendal <mendal@google.com> am 6bc4d2cf: (-s ours) am cd9e3e9f: (-s ours) Import translations. DO NOT MERGE

* commit '6bc4d2cf5dbe9630481a2538e9a243853fed2724':
Import translations. DO NOT MERGE
29bf49396a64b59d9da41803623f4707067c28b2 14-May-2015 Yorke Lee <yorkelee@google.com> am 04da67d2: am e10b8d17: Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev

* commit '04da67d2eb9a571ce225c7fd345c6b16b72b9b95':
Add BIND_TELECOM_CONNECTION_SERVICE permission
a865e9a3d0c9b84089798c14e0afc76a3d2874a0 14-May-2015 Santos Cordon <santoscordon@google.com> am 27e9eeac: am a955f69f: Merge "[2/4] Use new Icon class in PhoneAccount." into mnc-dev

* commit '27e9eeac9046db920f6b4fe28d917e230cf885bf':
[2/4] Use new Icon class in PhoneAccount.
6bc4d2cf5dbe9630481a2538e9a243853fed2724 14-May-2015 Geoff Mendal <mendal@google.com> am cd9e3e9f: (-s ours) Import translations. DO NOT MERGE

* commit 'cd9e3e9fb3c30cffc525324c274c77f83f7c2c55':
Import translations. DO NOT MERGE
cd9e3e9fb3c30cffc525324c274c77f83f7c2c55 14-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ib96ff5d7e38385c33c096f4318f3921e609ce66f
Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-pa-rIN/strings.xml
es/values-sq-rAL/strings.xml
04da67d2eb9a571ce225c7fd345c6b16b72b9b95 14-May-2015 Yorke Lee <yorkelee@google.com> am e10b8d17: Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev

* commit 'e10b8d178b1db10dc217cad73f0124f9e4410d3c':
Add BIND_TELECOM_CONNECTION_SERVICE permission
27e9eeac9046db920f6b4fe28d917e230cf885bf 14-May-2015 Santos Cordon <santoscordon@google.com> am a955f69f: Merge "[2/4] Use new Icon class in PhoneAccount." into mnc-dev

* commit 'a955f69f199fad0faf2798ebf3ca136a9cf0bc8b':
[2/4] Use new Icon class in PhoneAccount.
e10b8d178b1db10dc217cad73f0124f9e4410d3c 14-May-2015 Yorke Lee <yorkelee@google.com> Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev
a955f69f199fad0faf2798ebf3ca136a9cf0bc8b 14-May-2015 Santos Cordon <santoscordon@google.com> Merge "[2/4] Use new Icon class in PhoneAccount." into mnc-dev
9fa1805266676c44fe149a9ee31a3e41c608a5f4 14-May-2015 Yorke Lee <yorkelee@google.com> am d3813cb8: am bb2c883c: am 2a66f7b9: Rename AudioState to CallAudioState

* commit 'd3813cb8d77cf35813d80485149c8b3bb42e6b09':
Rename AudioState to CallAudioState
9c30c280f0007eb32d3ae9a7cad8ceb68120ca41 14-May-2015 Santos Cordon <santoscordon@google.com> [2/4] Use new Icon class in PhoneAccount.

Bug: 21088522
Change-Id: If57c3cb2f1c6630b6bd66e55862bec564e817945
rc/com/android/server/telecom/PhoneAccountRegistrar.java
estapps/src/com/android/server/telecom/testapps/CallServiceNotifier.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
d3813cb8d77cf35813d80485149c8b3bb42e6b09 14-May-2015 Yorke Lee <yorkelee@google.com> am bb2c883c: am 2a66f7b9: Rename AudioState to CallAudioState

* commit 'bb2c883c105590b8154910ee7ba8576c413505c8':
Rename AudioState to CallAudioState
bb2c883c105590b8154910ee7ba8576c413505c8 14-May-2015 Yorke Lee <yorkelee@google.com> am 2a66f7b9: Rename AudioState to CallAudioState

* commit '2a66f7b906b225413ae33f72e70a75e4f9c883c0':
Rename AudioState to CallAudioState
2a66f7b906b225413ae33f72e70a75e4f9c883c0 13-May-2015 Yorke Lee <yorkelee@google.com> Rename AudioState to CallAudioState

Deprecate AudioState class and make methods @SystemApi where
necessary to minimize impact to SystemApi
Replace usages of AudioState inside Telecom sub-systems
Fire both onCallAudioStateChanged and onAudioStateChanged callbacks
for backward compatibility
Support both setAudioState and setCallAudioState for all classes

Bug: 21040387
Bug: 21088300
Change-Id: I3ec7b3afdaa344c6d639d1c421f1842d67f7d0f7
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
estapps/src/com/android/server/telecom/testapps/TestConnectionManager.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
7bb8ce9b4e7ffa5e603d8bd8780f55a1c2ced071 14-May-2015 Yorke Lee <yorkelee@google.com> Add BIND_TELECOM_CONNECTION_SERVICE permission

Bug: 21088342
Change-Id: I465307899d83c4a3ee5e88a28554c4b867c1f4ba
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
estapps/AndroidManifest.xml
3b72f22fac6e5b7ef327ce30cbb0ef6f278f5fa6 13-May-2015 Geoff Mendal <mendal@google.com> am 30e569ea: (-s ours) am d87c7633: (-s ours) am ed0c0cc3: (-s ours) Import translations. DO NOT MERGE

* commit '30e569ead9e2d3e38854ad3a3107b53bfed1a184':
Import translations. DO NOT MERGE
30e569ead9e2d3e38854ad3a3107b53bfed1a184 13-May-2015 Geoff Mendal <mendal@google.com> am d87c7633: (-s ours) am ed0c0cc3: (-s ours) Import translations. DO NOT MERGE

* commit 'd87c76333ebe4a78d4b8d19b94da4c798ba38edc':
Import translations. DO NOT MERGE
d87c76333ebe4a78d4b8d19b94da4c798ba38edc 13-May-2015 Geoff Mendal <mendal@google.com> am ed0c0cc3: (-s ours) Import translations. DO NOT MERGE

* commit 'ed0c0cc35ef0457910c0e93d10f10f8444c4fad2':
Import translations. DO NOT MERGE
ed0c0cc35ef0457910c0e93d10f10f8444c4fad2 13-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I16f5f925aaf31464e093003d6a81aa1353a7f006
Auto-generated-cl: translation import
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-mk-rMK/strings.xml
es/values-ne-rNP/strings.xml
es/values-sw/strings.xml
es/values-uz-rUZ/strings.xml
b3b53021bbfa89ba62d2409db924dcb2c39f7b76 13-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I0bcb645e4664447fbca7797be904672d0da66f98
Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-mk-rMK/strings.xml
es/values-ne-rNP/strings.xml
es/values-sq-rAL/strings.xml
es/values-sw/strings.xml
es/values-uz-rUZ/strings.xml
fef38b45dd38e6c609f43867100297b2e7e9cc9a 13-May-2015 Yorke Lee <yorkelee@google.com> am a07ed03c: am 0546d46f: am 36004e70: More video related API fixes

* commit 'a07ed03cfb7de15873eda46a750e79d40a39ad11':
More video related API fixes
a07ed03cfb7de15873eda46a750e79d40a39ad11 13-May-2015 Yorke Lee <yorkelee@google.com> am 0546d46f: am 36004e70: More video related API fixes

* commit '0546d46fe3c11896eaed5250ed19e3718fd39d5f':
More video related API fixes
0546d46fe3c11896eaed5250ed19e3718fd39d5f 13-May-2015 Yorke Lee <yorkelee@google.com> am 36004e70: More video related API fixes

* commit '36004e70d54d4f8063733cc8b85150b1931e1c03':
More video related API fixes
36004e70d54d4f8063733cc8b85150b1931e1c03 13-May-2015 Yorke Lee <yorkelee@google.com> More video related API fixes

android.telecom.Connection.VideoProvider
* onSetPauseImage takes Uri instead of String
* changeCallDataUsage -> setCallDataUsage
* add quality constants to changeVideoQuality() docs

android.telecom.InCallService.VideoCall
* setPauseImage takes Uri instea dof String

android.telecom.VideoProfile.VideoState
* Move constants to VideoProfile, prefix with STATE_

Bug: 21040387
Bug: 21066505
Change-Id: I764e72aced9d1e2d30d6d0cf0862100860d47c79
estapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
estapps/src/com/android/server/telecom/testapps/TestVideoProvider.java
d3f14de3f3194f68b9278b35066593816c2573f2 12-May-2015 Yorke Lee <yorkelee@google.com> am 85be13ad: am f661398c: am 0f215ce4: Fixes for APi review

* commit '85be13ade9ebda8b519b8805845adccc054ae887':
Fixes for APi review
85be13ade9ebda8b519b8805845adccc054ae887 12-May-2015 Yorke Lee <yorkelee@google.com> am f661398c: am 0f215ce4: Fixes for APi review

* commit 'f661398c0f43dafc9ef1247bdce73b9cf0265c98':
Fixes for APi review
f661398c0f43dafc9ef1247bdce73b9cf0265c98 12-May-2015 Yorke Lee <yorkelee@google.com> am 0f215ce4: Fixes for APi review

* commit '0f215ce43e23f8c72b8caeb710946ae40dac07d3':
Fixes for APi review
0f215ce43e23f8c72b8caeb710946ae40dac07d3 12-May-2015 Yorke Lee <yorkelee@google.com> Fixes for APi review

Move CameraCapabilities into VideoProfile
Make PhoneAccount and PhoneAccountHandle final

Bug: 21040387
Bug: 21066505
Change-Id: I5602031786a845eb8b7b62e64db511f32b4ac2ec
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
estapps/src/com/android/server/telecom/testapps/TestVideoProvider.java
46239e675c21e044233a944f58af7313b80c5139 11-May-2015 Santos Cordon <santoscordon@google.com> am 3ccdea1a: am 67eb053d: am 6a212647: Clean up PhoneAccountRegistrar.

* commit '3ccdea1af276e6f6274730f9fa7f9fce09290d32':
Clean up PhoneAccountRegistrar.
3ccdea1af276e6f6274730f9fa7f9fce09290d32 11-May-2015 Santos Cordon <santoscordon@google.com> am 67eb053d: am 6a212647: Clean up PhoneAccountRegistrar.

* commit '67eb053daf65b5340cc909194d757cb89983d41e':
Clean up PhoneAccountRegistrar.
67eb053daf65b5340cc909194d757cb89983d41e 11-May-2015 Santos Cordon <santoscordon@google.com> am 6a212647: Clean up PhoneAccountRegistrar.

* commit '6a2126477ce3f527ecaec807fe4f40cd13ff02b0':
Clean up PhoneAccountRegistrar.
6a2126477ce3f527ecaec807fe4f40cd13ff02b0 09-May-2015 Santos Cordon <santoscordon@google.com> Clean up PhoneAccountRegistrar.

Cleanup lots of duplicate code and consolidate all phone account
retrievals into a single method: getPhoneAccounts(...).

Consolidate checks for capabilities, package-name, uri, and
isVisibleForUser(...). This will be very helpful when
implementing enable/disable for phone accounts.

Bug: 20303449
Change-Id: I24d63cd313876f5d9390f2eb31c0ce79d7cb0ab2
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
0c96c94998997ec97a479c6845ad6d2c4e0c55dd 11-May-2015 Geoff Mendal <mendal@google.com> am f625c603: (-s ours) am 4829a008: (-s ours) am f8cdf5ff: (-s ours) Import translations. DO NOT MERGE

* commit 'f625c603af6613b062ead99d1f4b8682ed31057b':
Import translations. DO NOT MERGE
f625c603af6613b062ead99d1f4b8682ed31057b 11-May-2015 Geoff Mendal <mendal@google.com> am 4829a008: (-s ours) am f8cdf5ff: (-s ours) Import translations. DO NOT MERGE

* commit '4829a008c856da1c35efc5b53a2c36d466a8653b':
Import translations. DO NOT MERGE
4829a008c856da1c35efc5b53a2c36d466a8653b 11-May-2015 Geoff Mendal <mendal@google.com> am f8cdf5ff: (-s ours) Import translations. DO NOT MERGE

* commit 'f8cdf5ffd9f0b5d3b3d6bbd89216a9c2e6af9e88':
Import translations. DO NOT MERGE
f8cdf5ffd9f0b5d3b3d6bbd89216a9c2e6af9e88 11-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I2dd67e62d0b1dd419ca601b11a534ce50ccba003
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
8fb98488e405fa2e4f6327f700fd0e9a63aa4325 11-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I9266a5d566ce48e03a2dee2b6c1d67c175f8bae2
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
022feadb66a7acad5f40d2a4527ce4498fd28f32 09-May-2015 Yorke Lee <yorkelee@google.com> am 6f3ef152: am c11f4265: am 596c396f: Add CNAP name to TestConnectionService

* commit '6f3ef152480fe00cde4ec91bf632c2363c782f01':
Add CNAP name to TestConnectionService
6f3ef152480fe00cde4ec91bf632c2363c782f01 08-May-2015 Yorke Lee <yorkelee@google.com> am c11f4265: am 596c396f: Add CNAP name to TestConnectionService

* commit 'c11f426556410ca9ce83df6950a5ad8013740610':
Add CNAP name to TestConnectionService
c11f426556410ca9ce83df6950a5ad8013740610 08-May-2015 Yorke Lee <yorkelee@google.com> am 596c396f: Add CNAP name to TestConnectionService

* commit '596c396ff31cc66ec6cf0d3cbc7044e69c0c8cef':
Add CNAP name to TestConnectionService
596c396ff31cc66ec6cf0d3cbc7044e69c0c8cef 01-May-2015 Yorke Lee <yorkelee@google.com> Add CNAP name to TestConnectionService

Allows the ability to test CNAP functionality in the
Dialer without actually receiving a real call.

Bug: 10121624

Change-Id: Id02d2e873c61ef05db9d3e2bda5bdf4296db4070
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
21621e91e05f26358905dc609db610d93ede14c1 06-May-2015 Yorke Lee <yorkelee@google.com> am 781e0060: am b0a51182: am 65ff4485: Merge "Use current userhandle when querying for default dialer" into mnc-dev

* commit '781e00607acd64803c0aebcb35aeba65d108a33b':
Use current userhandle when querying for default dialer
1a28dae248542c1710d237e2cd53b530a4ed2143 06-May-2015 Tyler Gunn <tgunn@google.com> am 0066132f: am 1aadf402: am 0bd4de37: Change sendSessionModifyRequest VideoProvider API signature.

* commit '0066132f2a141f11a60b4a216271b5ed5e298837':
Change sendSessionModifyRequest VideoProvider API signature.
781e00607acd64803c0aebcb35aeba65d108a33b 06-May-2015 Yorke Lee <yorkelee@google.com> am b0a51182: am 65ff4485: Merge "Use current userhandle when querying for default dialer" into mnc-dev

* commit 'b0a51182d47c20b24cf3c377b67ecae5632f34a2':
Use current userhandle when querying for default dialer
b0a51182d47c20b24cf3c377b67ecae5632f34a2 06-May-2015 Yorke Lee <yorkelee@google.com> am 65ff4485: Merge "Use current userhandle when querying for default dialer" into mnc-dev

* commit '65ff448549b700e025894ea170d36043d45ecfa6':
Use current userhandle when querying for default dialer
65ff448549b700e025894ea170d36043d45ecfa6 06-May-2015 Yorke Lee <yorkelee@google.com> Merge "Use current userhandle when querying for default dialer" into mnc-dev
0066132f2a141f11a60b4a216271b5ed5e298837 06-May-2015 Tyler Gunn <tgunn@google.com> am 1aadf402: am 0bd4de37: Change sendSessionModifyRequest VideoProvider API signature.

* commit '1aadf402984fe8c70898807208e29c1870a5f7ce':
Change sendSessionModifyRequest VideoProvider API signature.
1aadf402984fe8c70898807208e29c1870a5f7ce 06-May-2015 Tyler Gunn <tgunn@google.com> am 0bd4de37: Change sendSessionModifyRequest VideoProvider API signature.

* commit '0bd4de37ac94b371a1f54891da0fe3df2da8fb6e':
Change sendSessionModifyRequest VideoProvider API signature.
1e9dbb477f2837945fdfda6510218f11f9b8b6ef 05-May-2015 Tyler Gunn <tgunn@google.com> DO NOT MERGE Add ability to specify video state through TestInCallService intent.

TestInCallService has an "ACTION_SEND_UPGRADE_REQUEST_FROM_TEST_INCALL_SERVICE"
intent.
Added support to specify an int videoState as part of the intent so that
the caller can test sending video requests that our InCall may not
support (e.g. incoming 1-way request when in audio-only).

Bug: 20090022
Change-Id: I283575cc296444bbdadcdec5c1caa1593c1eed3b
(cherry picked from commit ac30f08f0ef02e67d77a2f01c9d1018fe61a1605)
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestInCallServiceBroadcastReceiver.java
0bd4de37ac94b371a1f54891da0fe3df2da8fb6e 06-May-2015 Tyler Gunn <tgunn@google.com> Change sendSessionModifyRequest VideoProvider API signature.

- Update Test Video providers.

Bug: 20704229
Change-Id: I493d25cc68ecd18a6fac228f49d421ad8696793b
estapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
estapps/src/com/android/server/telecom/testapps/TestVideoProvider.java
4e4ed74f1c29ede44450f78354755bfabfb1fc4f 06-May-2015 Yorke Lee <yorkelee@google.com> Use current userhandle when querying for default dialer

Also update TestDialerActivity to use placeCall API.

Bug: 20696062
Change-Id: I65f9585f7659009e76456c4613de48f0558dd0b5
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
estapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
3ec7f581b2ffcfa2c73c13f601ebe60824b85f82 05-May-2015 Tyler Gunn <tgunn@google.com> am 8c6734f3: (-s ours) am a01e44bb: am ac30f08f: DO NOT MERGE Add ability to specify video state through TestInCallService intent.

* commit '8c6734f3764a0c182919d234e217057e9cdc7f7c':
DO NOT MERGE Add ability to specify video state through TestInCallService intent.
8c6734f3764a0c182919d234e217057e9cdc7f7c 05-May-2015 Tyler Gunn <tgunn@google.com> am a01e44bb: am ac30f08f: DO NOT MERGE Add ability to specify video state through TestInCallService intent.

* commit 'a01e44bba239e64b3d8a866ebb6132a79edb3d4c':
DO NOT MERGE Add ability to specify video state through TestInCallService intent.
a01e44bba239e64b3d8a866ebb6132a79edb3d4c 05-May-2015 Tyler Gunn <tgunn@google.com> am ac30f08f: DO NOT MERGE Add ability to specify video state through TestInCallService intent.

* commit 'ac30f08f0ef02e67d77a2f01c9d1018fe61a1605':
DO NOT MERGE Add ability to specify video state through TestInCallService intent.
c9d1d459cc8d46897bf4b529874bf66a474ea317 05-May-2015 Yorke Lee <yorkelee@google.com> am 956d62a4: am f8980adc: am 5d46c480: Merge "Add hidden methods to set/get default dialer across users" into mnc-dev

* commit '956d62a412291ff79d683935962741f903e45ef9':
Add hidden methods to set/get default dialer across users
c631607918929fbc96b8c8193f89542930285441 05-May-2015 Prerepa Viswanadham <dham@google.com> am 97de994f: am cfeaa2cf: am 4d2ec4a7: Merge changes from topic \'mwd-merge-050415\' into mnc-dev

* commit '97de994fdb50dfbd2cc39c94a7304bf58d27ad9b':
Fixing issue where some video calls are not logged as video calls.
Intent handling fixes for TestInCallService and TestCallActivity.
Add plumbing for merge failures and renable button. (2/4)
DO NOT MERGE Make TestCallActivity Theme.NoDisplay
956d62a412291ff79d683935962741f903e45ef9 05-May-2015 Yorke Lee <yorkelee@google.com> am f8980adc: am 5d46c480: Merge "Add hidden methods to set/get default dialer across users" into mnc-dev

* commit 'f8980adc732661c23b5534be56b0c2f768aedbfa':
Add hidden methods to set/get default dialer across users
97de994fdb50dfbd2cc39c94a7304bf58d27ad9b 05-May-2015 Prerepa Viswanadham <dham@google.com> am cfeaa2cf: am 4d2ec4a7: Merge changes from topic \'mwd-merge-050415\' into mnc-dev

* commit 'cfeaa2cf57faa8e6f7849289375a61e10b7a690a':
Fixing issue where some video calls are not logged as video calls.
Intent handling fixes for TestInCallService and TestCallActivity.
Add plumbing for merge failures and renable button. (2/4)
DO NOT MERGE Make TestCallActivity Theme.NoDisplay
f8980adc732661c23b5534be56b0c2f768aedbfa 05-May-2015 Yorke Lee <yorkelee@google.com> am 5d46c480: Merge "Add hidden methods to set/get default dialer across users" into mnc-dev

* commit '5d46c480810b4de682f63c5c5e7b9bcee9864602':
Add hidden methods to set/get default dialer across users
cfeaa2cf57faa8e6f7849289375a61e10b7a690a 05-May-2015 Prerepa Viswanadham <dham@google.com> am 4d2ec4a7: Merge changes from topic \'mwd-merge-050415\' into mnc-dev

* commit '4d2ec4a721e8ed8f2e064c914cd07378da168d08':
Fixing issue where some video calls are not logged as video calls.
Intent handling fixes for TestInCallService and TestCallActivity.
Add plumbing for merge failures and renable button. (2/4)
DO NOT MERGE Make TestCallActivity Theme.NoDisplay
ac30f08f0ef02e67d77a2f01c9d1018fe61a1605 05-May-2015 Tyler Gunn <tgunn@google.com> DO NOT MERGE Add ability to specify video state through TestInCallService intent.

TestInCallService has an "ACTION_SEND_UPGRADE_REQUEST_FROM_TEST_INCALL_SERVICE"
intent.
Added support to specify an int videoState as part of the intent so that
the caller can test sending video requests that our InCall may not
support (e.g. incoming 1-way request when in audio-only).

Bug: 20090022
Change-Id: I283575cc296444bbdadcdec5c1caa1593c1eed3b
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestInCallServiceBroadcastReceiver.java
5d46c480810b4de682f63c5c5e7b9bcee9864602 05-May-2015 Yorke Lee <yorkelee@google.com> Merge "Add hidden methods to set/get default dialer across users" into mnc-dev
4d2ec4a721e8ed8f2e064c914cd07378da168d08 05-May-2015 Prerepa Viswanadham <dham@google.com> Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
Merge commit '336b6a1' into merge_try2
Merge commit '51d0dfa' into merge_try2
29c003e7a3e439376120cbfac088010d3c099fec 05-May-2015 Yorke Lee <yorkelee@google.com> Add hidden methods to set/get default dialer across users

Bug: 20696062
Change-Id: Ib26197c670caed9f2eab3e252c8fbc6102e0d476
rc/com/android/server/telecom/TelecomServiceImpl.java
60be82845567ade7c4c2282ffd257d9ea4b9cc59 04-May-2015 Yorke Lee <yorkelee@google.com> am 68e007ff: am 44cdeb64: am e2aa7e79: Merge "Call restoreCallingIdentity in finally block" into mnc-dev

* commit '68e007ff8ec4d384980af6bc880ae507658b9011':
Call restoreCallingIdentity in finally block
68e007ff8ec4d384980af6bc880ae507658b9011 04-May-2015 Yorke Lee <yorkelee@google.com> am 44cdeb64: am e2aa7e79: Merge "Call restoreCallingIdentity in finally block" into mnc-dev

* commit '44cdeb641077d7e07c4bb70a5c14819bd36884d2':
Call restoreCallingIdentity in finally block
44cdeb641077d7e07c4bb70a5c14819bd36884d2 04-May-2015 Yorke Lee <yorkelee@google.com> am e2aa7e79: Merge "Call restoreCallingIdentity in finally block" into mnc-dev

* commit 'e2aa7e796e3139a3027661940170d03a97979f9f':
Call restoreCallingIdentity in finally block
e2aa7e796e3139a3027661940170d03a97979f9f 04-May-2015 Yorke Lee <yorkelee@google.com> Merge "Call restoreCallingIdentity in finally block" into mnc-dev
58061751ecd5d302f57436582fcff82689e2bb6c 04-May-2015 Yorke Lee <yorkelee@google.com> Call restoreCallingIdentity in finally block

Bug: 20822416
Change-Id: Ideadd8093408defe761288ecb9c728637555f351
rc/com/android/server/telecom/TelecomServiceImpl.java
7b3d56fca9764cb216a1521a5f1795bef377a23d 04-May-2015 Geoff Mendal <mendal@google.com> am 5389a0d5: (-s ours) am 993ac2aa: (-s ours) am dc78d24d: (-s ours) Import translations. DO NOT MERGE

* commit '5389a0d5cffd5213b91ea87d749232f698823a58':
Import translations. DO NOT MERGE
5389a0d5cffd5213b91ea87d749232f698823a58 04-May-2015 Geoff Mendal <mendal@google.com> am 993ac2aa: (-s ours) am dc78d24d: (-s ours) Import translations. DO NOT MERGE

* commit '993ac2aa4215effad822cd88b61fa0bceece8a4b':
Import translations. DO NOT MERGE
993ac2aa4215effad822cd88b61fa0bceece8a4b 04-May-2015 Geoff Mendal <mendal@google.com> am dc78d24d: (-s ours) Import translations. DO NOT MERGE

* commit 'dc78d24df67e1e611d4c5f96ce2dc98093380eb4':
Import translations. DO NOT MERGE
dc78d24df67e1e611d4c5f96ce2dc98093380eb4 04-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ic24144cb076cba768bc61b8a5e426a531595108a
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
d1bd5d2f916d10ae01189f8bbdb5f24cda66087e 04-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ib593378651443649e4e0985ec8248a26c542d75c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
736fe75ad682ac2663bd3e8613521144e2269cab 02-May-2015 Prerepa Viswanadham <dham@google.com> Merge commit '336b6a1' into merge_try2

Change-Id: I471327b21bb250640a17dac06251bd45227910e5
eed06cf1c7b556309dff8b8b60bec0637af3c048 02-May-2015 Prerepa Viswanadham <dham@google.com> Merge commit '51d0dfa' into merge_try2
3cc5d15c37af1a548a041dc5e58c1c11fa3badf9 01-May-2015 Andrew Lee <anwlee@google.com> Merge "Add Call.Detail.PROPERTY_* values." into mnc-dev
ebf5ec79c9643fb834172904d5c5e01171b1bda4 01-May-2015 Yorke Lee <yorkelee@google.com> Merge "Don't start ErrorDialogActivity without an error ID" into mnc-dev
8835a0854f42d1cd104975a8dfc4a6f21081275a 01-May-2015 Yorke Lee <yorkelee@google.com> Merge "Add activity to handle default dialer requests" into mnc-dev
b5c5d44062ff3d992e0985424382e4596d386085 28-Apr-2015 Yorke Lee <yorkelee@google.com> Add activity to handle default dialer requests

* ChangeDefaultDialerDialog provides the UI that can be used by
apps to request that the user select their package as the default
dialer.

* Add various manifest entries, strings etc for use in the UI

* Exercise TelecomManager.ACTION_CHANGE_DEFAULT_DIALER in
TestDialerActivity

Bug: 20304411

Change-Id: Ibc6678c44290f5c9aa00c294b55db74c2c6e09eb
ndroidManifest.xml
es/values/strings.xml
rc/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
estapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
1d01d894cd1a5ac006524fc2a11674632d6c6cb2 01-May-2015 Andrew Lee <anwlee@google.com> Merge "Change unregisterCallback to destroy." into mnc-dev
94c7ab24798bc56a41d2119cec0fe7eecc36546b 30-Apr-2015 Yorke Lee <yorkelee@google.com> Don't start ErrorDialogActivity without an error ID

It will just finish itself immediately anyway.

Change-Id: I14b8c5e8253eab688d7aca6ccde52f004e3941c9
rc/com/android/server/telecom/CallIntentProcessor.java
aea6351f157ce2a478fc354ed8087f5b3ccf48f0 30-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Fix issues with UserManager.DISALLOW_OUTGOING_CALL" into mnc-dev
a9f922acf5971d7dc2fa1d7ecc2702caacac331e 27-Apr-2015 Andrew Lee <anwlee@google.com> Change unregisterCallback to destroy.

Bug: 20160491
Change-Id: I482d2fb981c5c2537d7bd792cd807b5c4a58264a
estapps/src/com/android/server/telecom/testapps/TestCallList.java
581dbe94f1cab2d5fda91e2a4624431c50d09976 30-Apr-2015 Yorke Lee <yorkelee@google.com> Add RESPOND_VIA_TEXT capability to TestConnectionService

Change-Id: I7b85f7173abbedec84720f71fa2bc1487d8a9fe1
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
b3feab5a6ad30161726cf2decf4c0b06a78f5d41 30-Apr-2015 Yorke Lee <yorkelee@google.com> Fix issues with UserManager.DISALLOW_OUTGOING_CALL

* Make sure the correct user is checked when using the
TelecomManager.placeCall API.

* Since a toast cannot be shown without an activity context,
show the error using the ErrorDialogActivity instead.

Bug: 20665346
Change-Id: I353cb009e8f90572a52b560259582180898370d2
es/values/strings.xml
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/components/UserCallActivity.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
db26790fe0e2e4aa334fb6a83418d91bede1ebb9 29-Apr-2015 Andrew Lee <anwlee@google.com> Add Call.Detail.PROPERTY_* values.

Convert from Connection.CAPABILITY_* values to
Call.Detail.PROPERTY_* values as appropriate.

Bug: 20160395
Change-Id: Ic3ea5916285bc9c83ef0af1bb96b78034e47a4b2
rc/com/android/server/telecom/InCallController.java
17f35812297aafca37ba95b18cda63802b43c4fd 30-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev
336b6a19b74ad5d44650fae3becfc8c346dfbcfb 30-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to c81dc081900bf402e1f9292612162aa4fde30f14
96edfb2b5fecc73020f19f496a7440882e0b9b20 30-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
5310196deda80ace064a7d5bc672dbe1974906b9 30-Apr-2015 Yorke Lee <yorkelee@google.com> Add default dialer checks to Telecom/Telephony

Check for the default dialer or the modify phone state permission
for various TelecomManager/TelephonyManager methods.

Make sure to check the user-selected default rather than the
hardcoded package name.

Exercise this code in TestDialerActivity.

Bug: 20304458
Change-Id: Ic04cd8f2ba98e1d54c39549ae89d3e11cd5cdafb
rc/com/android/server/telecom/TelecomServiceImpl.java
estapps/res/layout/testdialer_main.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
973c4e1545581f7cb8a1bf8a7b3cdf5a8f38d01a 29-Apr-2015 Svetoslav <svetoslavganov@google.com> Add process outgoing calls app op - telecomm

Change-Id: I46a2171ce31530951dcf306f91a7e8a4bd0d7fa4
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
c81dc081900bf402e1f9292612162aa4fde30f14 29-Apr-2015 Tyler Gunn <tgunn@google.com> Merge "Fixing issue where some video calls are not logged as video calls." into m-wireless-dev
5fb78406444dc654dfe6f33a3cf4d079d30a8357 29-Apr-2015 Tyler Gunn <tgunn@google.com> Fixing issue where some video calls are not logged as video calls.

Some video calls are not properly logged as video calls in the call log.
This is due to the fact we only track video state history for the call
log when the call is active.
1. Incoming video call answered as video -- since the video state never
changed while the call is active, the fact its a video call is missed.
2. Rejected and missed calls -- calls never were active so are not tracked
as such.

Bug: 20689156
Change-Id: Ie1c155db968844a346493c78f63c055dde6b5195
rc/com/android/server/telecom/Call.java
8f6de5fee2045cf62430f9cce0e9ff00a384b323 29-Apr-2015 Tyler Gunn <tgunn@google.com> Merge "Intent handling fixes for TestInCallService and TestCallActivity." into m-wireless-dev
09560cf0733aaba0898f98a27253494a4e2624b2 29-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to ce75aa1cfa3572f208d02a058b7aaf025ad6856c
e59c55cb20a28001c2a27c6ddaad639cae843832 28-Apr-2015 Yorke Lee <yorkelee@google.com> Simplify DefaultDialerManager

The previous code worked with ComponentNames because it was
based off existing code for the default SMS application.
We only really need the package name however, so simplify the
code by storing and retrieving the package name directly.

Bug: 20304458
Change-Id: Icabd3a9f0f8166c105360494b601160d13767fad
rc/com/android/server/telecom/TelecomServiceImpl.java
33b6729930a10ddd784b7bb2e8c2e6509c54ef54 28-Apr-2015 Tyler Gunn <tgunn@google.com> Intent handling fixes for TestInCallService and TestCallActivity.

I had added the android:process to the TestCallActivity section in the
manifest. This made my test intent work, but broke the intents in the
TestCallActivity which communicated back to the TestConnectionService.

Correctected this by adding a new BroadcastReceiver which is used to handle
intents for the TestInCallService.

Change-Id: I665b381a5519b0a1ddac39f580ce6482615dcffa
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/TestCallActivity.java
estapps/src/com/android/server/telecom/testapps/TestInCallServiceBroadcastReceiver.java
ce75aa1cfa3572f208d02a058b7aaf025ad6856c 25-Apr-2015 Anthony Lee <anthonylee@google.com> Add plumbing for merge failures and renable button. (2/4)

The merge failure is not plumbed up through any layer that
can trap the callback and act on it. The first part of this
fix is to create that plumbing. Then we need to reenable the
merge button. At this point in time, we leverage the fact
that forcing the call to reassess its capabilities will poke
the InCallUI to reenable the merge button. In the future, we
should plumb the merge failure all the way to InCallUI and
not only handle the button but display UI to the user. The UI
is currently being displayed by CallNotifier which is the wrong
place. See b/20530631 for more details.

Bug: 20229905
Change-Id: Ica5b801f687823a4f819dda285a7355e8150042c
rc/com/android/server/telecom/ConnectionServiceWrapper.java
4a3011822fd31cc553866736346a83d2c5fd5a3c 28-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 51d0dfa37b075f0f5692784e7f8f5839ad5b7221
f3ef994289a1c3737308b5b760e69ccc84c6588c 28-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Exercise voicemail permissions in Test Dialer" into mnc-dev
f6589f600d14f9c27210440c8b953b1ab1672888 28-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Make TestCallActivity Theme.NoDisplay" into mnc-dev
17fa0d639cd561e204fcaa8d3ead0280d11999f4 27-Apr-2015 Yorke Lee <yorkelee@google.com> Make TestCallActivity Theme.NoDisplay

This prevents the activity from bringing up the UI at all,
which makes the initiation of a test call more realistic from the
ActivityManager's perspective since calls are usually
generated from the background.

Change-Id: Ie8893d38593f61689b8e2cdfd2e17d5efef3d79e
estapps/AndroidManifest.xml
51d0dfa37b075f0f5692784e7f8f5839ad5b7221 27-Apr-2015 Yorke Lee <yorkelee@google.com> DO NOT MERGE Make TestCallActivity Theme.NoDisplay

This prevents the activity from bringing up the UI at all,
which makes the initiation of a test call more realistic from the
ActivityManager's perspective since calls are usually
generated from the background.

Change-Id: Ie8893d38593f61689b8e2cdfd2e17d5efef3d79e
estapps/AndroidManifest.xml
fbc956311259d1cdd5978cb0b652d1561f06a33c 27-Apr-2015 Yorke Lee <yorkelee@google.com> Exercise voicemail permissions in Test Dialer

Bug: 20333102
Change-Id: Icc244816518a558ba5b841d7d9e070b3c6c34e8b
estapps/AndroidManifest.xml
estapps/res/layout/testdialer_main.xml
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
f3268b59ed95a381610c1c47e1ecff2d1ad61a17 27-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Default or system dialer does not need CONTROL_INCALL_EXPERIENCE" into mnc-dev
3aa8a8882fb737a3341ec89f7af97c1acc650985 27-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Fix wiring to allow default dialer to make emergency calls" into mnc-dev
81050722a5236234e5a127f30a139f0238d316ed 24-Apr-2015 Yorke Lee <yorkelee@google.com> Fix wiring to allow default dialer to make emergency calls

UserCallIntentProcessor was previously hard-coded to only check
for the system dialer.

Bug: 20304255
Change-Id: Ie8ad56445f664056c196a1c88e7b7d711533a2dd
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
439c988c82b0b952d113538e840abd49f481d4bf 25-Apr-2015 Yorke Lee <yorkelee@google.com> Default or system dialer does not need CONTROL_INCALL_EXPERIENCE

Bug: 20304411

Change-Id: I6f2496d20c0e21c433fd7c52d674ef4f1a6d8c1b
rc/com/android/server/telecom/InCallController.java
69f2f7c78b720c1e9748bd5b277b2b0ab94cac0e 25-Apr-2015 Yorke Lee <yorkelee@google.com> Fix some logspam

No need to log the entire exception when the caller is not
the default dialer. This can happen if the system (which has
MODIFIY_PHONE_STATE) calls a method, and can be confusing
when reading the logs.

Change-Id: I1c48b2a12961ab000995114aed7fe519021549d7
rc/com/android/server/telecom/TelecomServiceImpl.java
301f6c8bd1d4a570a86e7b801b6bc2d1bcc1321d 27-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 77f10d87a98a5ee2401ed98d4f8a981023e30104
7d0c685c6df5543285c58adba8383df118b3ce15 25-Apr-2015 Etan Cohen <etancohen@google.com> Merge changes from topic 'mwd-merge-042415'

* changes:
Fix build - renaming variables.
Merge commit 'a62b505' into merge2
Merge commit '77f10d8' into merge2
Merge commit '569b54e' into merge2
Merge commit 'f7aed89' into merge2
Merge commit '0751e61' into merge2
Merge commit '95ac444' into merge2
5291d4aeda2a4e7bfb6eeb33e0c910e8c14de82c 25-Apr-2015 Yorke Lee <yorkelee@google.com> Add some comments to TelecomServiceImpl

Change-Id: I92d8e83a5f06a08f12e641f8cd9e910baa957caf
rc/com/android/server/telecom/TelecomServiceImpl.java
d0000d649b7626191cdc5c93ec86da64fa6cc81b 25-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Add APIs to getDefaultDialerPackage and getSystemDialerPackage"
138626df993c4c60ceaede0a41cf1d0d55699427 25-Apr-2015 Santos Cordon <santoscordon@google.com> Merge "Add disconnect cause + phone number to event logging."
ee6c2fef0331f14f186c7f4cc2914b2cc280bafc 24-Apr-2015 Santos Cordon <santoscordon@google.com> Add disconnect cause + phone number to event logging.

Change-Id: I62528dbc5f8675d2b4401549ee8aaf950465da39
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/Log.java
3e77ce24a17564818a5fe8f4d20eac7285f1bcf7 23-Apr-2015 Etan Cohen <etancohen@google.com> Fix build - renaming variables.

Change-Id: I3f7652a0372dca59cddc122a89676a1b7238788d
estapps/src/com/android/server/telecom/testapps/TestCallList.java
5b3fc0a2ae85b893e7e971112458391c194f3d2d 24-Apr-2015 Yorke Lee <yorkelee@google.com> Add APIs to getDefaultDialerPackage and getSystemDialerPackage

getDefaultDialerPackage is a public API and will be used by
apps to determine if they are the default dialer.

getSystemDialerPackage is a hidden API and is only used by
system components.

Bug: 20304458
Change-Id: Ifed855ccb8827cb2f62fd13f7c5afc307425ef29
rc/com/android/server/telecom/TelecomServiceImpl.java
04d19e659789a0af0be737667c2661b63decbadb 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit 'a62b505' into merge2
016ddbf8ac1230b511a1b90ccda09f82fab8c90d 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit '77f10d8' into merge2
805917f7d6dfd87cad970cec9be55b24200db7b8 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit '569b54e' into merge2
bbd2c2093759d9596044245f613f35dce5d5bb88 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit 'f7aed89' into merge2
5b2c59e20e1fafeafa8f50cc8b9dc0df15cdd812 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit '0751e61' into merge2
a46c7ffcda445ff827c795a3483652e5b0d7d665 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit '95ac444' into merge2
b791066bb4661b56dc27faa8585065fdfffada6f 24-Apr-2015 Yorke Lee <yorkelee@google.com> Handle outgoing call broadcast with Telecom's permissions

The default dialer may not have MODIFY_PHONE_STATE permissions
anymore which is needed to start the outgoing call. We've
already checked for permissions at this point so do the
rest of the broadcast with Telecom's permissions.

Bug: 20304411
Change-Id: I50cfa75ae27072237ea7b6b8fe2a5113b8d1d959
rc/com/android/server/telecom/TelecomServiceImpl.java
b2f22a96675c7365535b2300aa0682e483b2a336 24-Apr-2015 Santos Cordon <santoscordon@google.com> Merge "Move CallState and rename PRE_DIAL_WAIT."
b4aa03d9620b7661185c91486b8caf12aed170e8 24-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Add TelecomManager.placeCall"
92694519535c54f542b4ef3973e9c1934f2feeff 23-Apr-2015 Santos Cordon <santoscordon@google.com> Move CallState and rename PRE_DIAL_WAIT.

CallState was a public API only being used by Telecom so I've moved it
into to Telecom and removed it from the public API. The translation
from CallState to Call.STATE_* was happening on the public Call object
which wasn't ideal (Call.java shouldn't have to know that other
representations of state exist). So I moved the translation into
InCallController.java and what we pass into ParcelableCall is now
Call.STATE_* constants.

Bug: 20532827
Bug: 20532435
Change-Id: I79ce36c7e971c1a49b857506c9a56cfe316069cf
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallState.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallToneMonitor.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/PhoneStateBroadcaster.java
rc/com/android/server/telecom/RingbackPlayer.java
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
estapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
ests/src/com/android/server/telecom/tests/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
a3a3adc39441d3c206400ff26fc117fae2ead5ed 23-Apr-2015 Yorke Lee <yorkelee@google.com> Add TelecomManager.placeCall

Places a new outgoing call using the system telecom service
with the specified parameters.

Making emergency calls using this method requires that the
method-caller is either the user-selected default dialer app
or preloaded system dialer app.

Requires that the caller have the
{@link android.Manifest.permission#CALL_PHONE} permission.

Bug: 20348183
Change-Id: Ieedb5628e8c6be25137944e7c3639dc1d9bc61df
rc/com/android/server/telecom/TelecomServiceImpl.java
4c03c9715c3bb4e9112d46d78a9bc09eabeba55b 23-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 77f10d87a98a5ee2401ed98d4f8a981023e30104
a62b5052b20beeb6ae7da4c9b63285f677c1f729 22-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 77f10d87a98a5ee2401ed98d4f8a981023e30104
29f495d1451751e332c6f94f4fa839f7d6d94e07 22-Apr-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I34047a7b83e82b55ecbb8fe0355c6f1091876453
Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-pa-rIN/strings.xml
es/values-sq-rAL/strings.xml
daa03880f5ed2d860d250f722a81cfaf126332db 22-Apr-2015 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of 43708477 to master

Change-Id: I39bddf45182d7be4610a3f870ef13ed46785fbe4
43708477b480d5b726d666abe1603ee6a78fdb02 22-Apr-2015 Brian Carlstrom <bdc@google.com> am 8c934ac6: Remove workaround now unneeded with Proguard 5.1

* commit '8c934ac65c7c361040d9c181fdb4bd258644fd53':
Remove workaround now unneeded with Proguard 5.1
8c934ac65c7c361040d9c181fdb4bd258644fd53 08-Jan-2015 Brian Carlstrom <bdc@google.com> Remove workaround now unneeded with Proguard 5.1

Bug: 17550647

Change-Id: I2f10897d8d20c27d7224fb6ab90fdbf39c2842ce
ndroid.mk
a1abbbf7e99b640f1369e429c78bce75b1329d7f 21-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 77f10d87a98a5ee2401ed98d4f8a981023e30104
77f10d87a98a5ee2401ed98d4f8a981023e30104 21-Apr-2015 Yorke Lee <yorkelee@google.com> DO NOT MERGE Make calls from TestDialerActivity

Bug: 20348183
Change-Id: Ib4c5b08aa7fdfe61a3dc31a880541423be255543
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
011f4741e8c32fdf2b4faa28e562737d56dcd288 21-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Make calls from TestDialerActivity"
562ad5e7577d13e0ac31c42ee6499543f4d1e684 21-Apr-2015 Yorke Lee <yorkelee@google.com> Make calls from TestDialerActivity

Bug: 20348183
Change-Id: Ib4c5b08aa7fdfe61a3dc31a880541423be255543
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
f136b2714c5dd4e85d0a875abfa7baa77b29be38 20-Apr-2015 Santos Cordon <santoscordon@google.com> Merge "Add call event logging to telecom."
2685dabdb656f72dfe851215f2e99f82896f052f 18-Apr-2015 Santos Cordon <santoscordon@google.com> Add call event logging to telecom.

This code saves the last 5 calls and prints out all the call-related
events when doing a "dumpsys telecom". This includes dumping all
information about the last 5 calls so that bug reports always contain
information about the calls.

Bug: 18923652

Change-Id: I4dbdea32ba4eea3b3a4158fbae99649dc045cd62
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/TelecomServiceImpl.java
d46d8c0c38cb1d461d91285dd0eb854908bb3c5a 20-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 8a11444dd0802b199b8d2d84582f46154d21c149
e99ee052d06963888c4bd4df0d85f137f9143101 18-Apr-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ibbaca774b431a2377664d3bf6a971698c9bc2a7c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
38f1a4d91fbf8d97e3acca5bb9ea3622cfb3d0e0 18-Apr-2015 Svet Ganov <svetoslavganov@google.com> Fix build

Change-Id: I900183e04e4aaf10bfb50c15ad00edf5d6953eaa
rc/com/android/server/telecom/TelecomServiceImpl.java
09611181c665403a8d9e70d95b7e0e4361976122 16-Apr-2015 Svet Ganov <svetoslavganov@google.com> Add OP_READ_PHONE_STATE app op - telecomm

Change-Id: Ie89bad3d47679eb99e7a1cfd326f4e81da1d088b
rc/com/android/server/telecom/TelecomServiceImpl.java
8a11444dd0802b199b8d2d84582f46154d21c149 16-Apr-2015 Andrew Lee <anwlee@google.com> DO NOT MERGE Use Callbacks instead of Listeners.

Change-Id: I108cfe06abbded9d2632b0d5207e8d80b53e6dbe
estapps/src/com/android/server/telecom/testapps/TestCallList.java
fc0e227881bbb1c0795e5223d0594f13e1b2de12 16-Apr-2015 Jay Shrauner <shrauner@google.com> DO NOT MERGE Remove connection substate

Bug:20300433
Change-Id: I4148ac2677598d4db60950712fda2a3be726d791
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
estapps/src/com/android/server/telecom/testapps/TestConnectionManager.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
569b54e5dff12cc29aa253efb3c61bc4fc5d778e 16-Apr-2015 Andrew Lee <anwlee@google.com> Update ConnectionServiceFixture with StatusHints.

Change-Id: Ia19cbaa541cd8265e7de58f3f430eae1a2197421
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
7cc486c725e2ae9b8051b4f36fd0c41ff3a8aca3 16-Apr-2015 Jay Shrauner <shrauner@google.com> Remove connection substate

Bug:20300433
Change-Id: I4148ac2677598d4db60950712fda2a3be726d791
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
estapps/src/com/android/server/telecom/testapps/TestConnectionManager.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
f7aed894b69099609a2e10dd0e1e7c1786f50d27 16-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "DO NOT MERGE Change hasVoicemailNumber to getVoicemailNumber" into m-wireless-dev
28adac49563a104948ba6ab7e3f6d9ca12e552a7 16-Apr-2015 Yorke Lee <yorkelee@google.com> Add some capabilities back to TestConnectionService

Lost in bad merge from mwd -> master

Change-Id: I5e0fe714cd0338d82e3814b254d9e1c05df609ee
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
4df0e9b99c1457d5e922fde9b5cb98b5b305e094 16-Apr-2015 Santos Cordon <santoscordon@google.com> Merge "Turn speakerphone on at DIALING state."
0751e61ed2fd4fd828a4ca170a696fce369b31ea 16-Apr-2015 Andrew Lee <anwlee@google.com> resolve merge conflicts of 57412d3 to m-wireless-dev.

Change-Id: I3c3dece8a0efebb82969b521a5fef37fe2283774
d99b66e40be5baeed3fd50cf91eb878dcb7f00db 16-Apr-2015 Yorke Lee <yorkelee@google.com> DO NOT MERGE Change hasVoicemailNumber to getVoicemailNumber

Bug: 20223485

Change-Id: I1db1d77cea5d0fadff116c8f8455438625f84153
rc/com/android/server/telecom/TelecomServiceImpl.java
4a414e88c32aa39a749733abe2816769836e8b99 16-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Change hasVoicemailNumber to getVoicemailNumber"
d6782cdb82bf1d235dfb164cce6db3c8a5629720 16-Apr-2015 Santos Cordon <santoscordon@google.com> Turn speakerphone on at DIALING state.

When start-with-speakerphone is on, call used to go to speakerphone on
ACTIVE, but should go on DIALING.
Also, bug existed where it would go to speakerphone every time the call
went through HOLD-UNHOLD sequence.

Bug: 20265686
Change-Id: I6d281054b691efe62cde1e02987b498c5ec1dd13
rc/com/android/server/telecom/CallsManager.java
633963ebba74f464cf134683ed985f8b237660cc 15-Apr-2015 Tyler Gunn <tgunn@google.com> Support for multiple VideoCall.Listeners for a VideoCall.

The current code assumes that only a single instance of VideoCall will be
provided to the default system InCall UI. Ideally multiple
InCallService implementations should be able to use the VideoCall APIs.
Note: it only really makes sense for a single InCallService to get/set
the video surfaces.

- Modify InCallController to only update the VideoProvider in the parcelled
call data if it has changed.
- In InCallController, removed check that would prevent sending video
provider to other InCallServices other than the default incall UI.
- Created TestCallList and modified TestInCallServiceImpl to track all
calls and output some debug information about the calls/video callbacks.
- Added a new Test intent, ACTION_SEND_UPGRADE_TO_VIDEO_REQUEST which will
cause the TestInCallServiceImpl to loop through all telecom calls and
trigger the VideoCall API to send an upgrade to video request. THis is
to mimic how the telephony test team will be using a test InCallService
to control the device.

Bug: 20092420
Change-Id: Ib781551d5168bc095f58b7b62906a9e59e43958e
rc/com/android/server/telecom/InCallController.java
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/TestCallActivity.java
estapps/src/com/android/server/telecom/testapps/TestCallList.java
estapps/src/com/android/server/telecom/testapps/TestInCallServiceImpl.java
7d7acd598562feb60c9c8633ee84dee2197026b1 16-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 95ac44451d432cbbb3908efed490e90a803edf22
c7f397243309599a88931c6110621bb1b507678a 16-Apr-2015 Vinit Deshpande <vinitd@google.com> Merge changes from topic 'mwd-merge-041515'

* changes:
Fix build issues after the merge
am 817090c..60db0ce from mirror-m-wireless-internal-release
am "DO NOT MERGE Add ability to simulate missed calls"
am 0be7b9d..b3e8a72 from mirror-m-wireless-internal-release
am 959afe0..abcbce4 from mirror-m-wireless-internal-release
fb5ec30b085321ffcc7c3229f9d217a22f3120b2 16-Apr-2015 Yorke Lee <yorkelee@google.com> Change hasVoicemailNumber to getVoicemailNumber

Bug: 20223485

Change-Id: I1db1d77cea5d0fadff116c8f8455438625f84153
rc/com/android/server/telecom/TelecomServiceImpl.java
b2dfc423ce184eb2c1411725f317338d1581cd96 15-Apr-2015 Vinit Deshpande <vinitd@google.com> Fix build issues after the merge

Change-Id: Ia856311187a0b2168cb859bd8b2300ff59df6569
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
95ac44451d432cbbb3908efed490e90a803edf22 15-Apr-2015 Andrew Lee <anwlee@google.com> DO NOT MERGE Suffix VT_LOCAL/VT_REMOTE with BIDIRECTIONAL.

Bug: 20160395
Change-Id: Id109cf1ee5206fc4a6d445716b6e5c8e20930b1c
rc/com/android/server/telecom/InCallController.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
f179930b940b447d3776037826312e92cc280511 15-Apr-2015 David Stevens <stevensd@google.com> Merge "Open up and fix TelecomManager#addNewUnknownCall"
476df788306db2e15172d341d8c0d1d3289c4281 15-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 90a319c06e77b369849b14f2bc3da99f4a81230e
8ae87d12ce9067e6c1851b4d5dbabd245d35d519 15-Apr-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia188ddb05d9e1cfa1b1bb35d99dc7bf98f407910
Auto-generated-cl: translation import
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-tl/strings.xml
57412d3a3079b2108d61747f4909bf02da29759f 14-Apr-2015 Andrew Lee <anwlee@google.com> Add StatusHints for Conferences.

Bug: 20160799
Change-Id: I88d3068a2c2d2d785e92bcb8b22143764f0a6207
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
6f9edf4d801dce1d5bcc914aa2d4212cd28adc84 15-Apr-2015 Vinit Deshpande <vinitd@google.com> am 817090c..60db0ce from mirror-m-wireless-internal-release

60db0ce merge in m-wireless-internal-release history after reset to 604757344ff406fc45b3c1279af2d484eee0e7a6
6047573 Merge "Allow default dialer to silence ringer" into m-wireless-dev
e3893f1 Allow default dialer to silence ringer
66f5296 merge in m-wireless-internal-release history after reset to 817090c6c6e43e13d2dbd6000c90331bfcbddaf8
b3e8a72 merge in m-wireless-internal-release history after reset to 959afe011bb4d41d7037844874acecb6e609e4f8
0be7b9d merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
3631b8e merge in m-wireless-internal-release history after reset to 827480f426ae7154dedb4cdfa50065aa3820f0a9
411b7c0 merge in m-wireless-internal-release history after reset to 827480f426ae7154dedb4cdfa50065aa3820f0a9
3c73246 merge in m-wireless-internal-release history after reset to eb39aa2c275ee5755e93eb4bc5b3b10085a97948
55b0b65 merge in m-wireless-internal-release history after reset to b63b57e2c35c4769e756f47131c7ebbc0af42c59
bba7176 merge in m-wireless-internal-release history after reset to 226ae567a63a3ae8dd5292b127d59abf107417f4
2fd2e2a merge in m-wireless-internal-release history after reset to 226ae567a63a3ae8dd5292b127d59abf107417f4
84c4eca merge in m-wireless-internal-release history after reset to 226ae567a63a3ae8dd5292b127d59abf107417f4
ef8212f Fix problem with AsyncQueryHandler
ae3b8d0 Fix problem where incoming calls would hang and never complete
c5dcd58 Clear the calling identity when using the notification manager.

Change-Id: Ib288850421bdb4444a8c22c7d1da63af5c31b703
f151f9371d87c9c54aefcdba00eb211d8f637928 15-Apr-2015 Vinit Deshpande <vinitd@google.com> am "DO NOT MERGE Add ability to simulate missed calls"

merged from mirror-m-wireless-internal-release with -s ours
No changes were actually committed

2a6985f DO NOT MERGE Add ability to simulate missed calls
020f04e486262412b2abe92f49c49c2e3fe602c0 15-Apr-2015 Vinit Deshpande <vinitd@google.com> am 0be7b9d..b3e8a72 from mirror-m-wireless-internal-release

b3e8a72 merge in m-wireless-internal-release history after reset to 959afe011bb4d41d7037844874acecb6e609e4f8
73ff372fda987a9e797d1c4ecf363a16b7d2abda 15-Apr-2015 Vinit Deshpande <vinitd@google.com> am 959afe0..abcbce4 from mirror-m-wireless-internal-release

abcbce4 Fix deadlock around locking in AudioManager
5a1b1fd Merge "Add more capabilities to TestVideoProvider" into m-wireless-dev
e09b47b Add more capabilities to TestVideoProvider

Change-Id: I00a8a3bebd56a5f78b6b3fa3958d6cf3929b1834
90a319c06e77b369849b14f2bc3da99f4a81230e 11-Apr-2015 Jay Shrauner <shrauner@google.com> DO NOT MERGE Use CameraCapabilities constructor w/o zoom params

Bug:20160534
Change-Id: I62cf20afeb22436ef4108db39b6067a9da627580
estapps/src/com/android/server/telecom/testapps/TestVideoProvider.java
60db0ceec1530c216b2ec183520f5b64316b3a2a 14-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 604757344ff406fc45b3c1279af2d484eee0e7a6
0785274982d454b4fa036cc7a7aa9dcf768ef074 11-Apr-2015 David Stevens <stevensd@google.com> Open up and fix TelecomManager#addNewUnknownCall

Bug: 20141479
Change-Id: I6d959cf402a5529842263bb71200bbe8601c86ad
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/TelecomServiceImpl.java
48105e1a3671c89bf7fb0dc1879221b7caa1351e 14-Apr-2015 Andrew Lee <anwlee@google.com> Merge commit '3631b8e' into mergemeister

Change-Id: I40c4794e1091b26c5cd366dc4baf55626b62a145
604757344ff406fc45b3c1279af2d484eee0e7a6 14-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Allow default dialer to silence ringer" into m-wireless-dev
e3893f1cb332578d7de5ca4c4a1c19f3ce7d3cea 14-Apr-2015 Yorke Lee <yorkelee@google.com> Allow default dialer to silence ringer

Bug: 20142222
Change-Id: If56a84b4ae39dfd3bfca737cdbfab2002a7ac858
rc/com/android/server/telecom/TelecomServiceImpl.java
3037e05ad456183c0db6b0e1464d3b526fdc20f6 13-Apr-2015 Andrew Lee <anwlee@google.com> Merge "Merge commit 'b63b57e' into mergemeister"
5aa226a177ff2b1e780993caa2f922368d0944ab 13-Apr-2015 Andrew Lee <anwlee@google.com> Merge commit 'b63b57e' into mergemeister

Change-Id: I63e820e6ba1095485c3d887c559eab0dc72f7712
58813ab3b4ff0fb1cf8a0964a5a740c313a0df47 13-Apr-2015 Yorke Lee <yorkelee@google.com> am cebbeced: am 161f1a7e: Merge "CallsManager: fix starting call from Contacts app with MSim"

* commit 'cebbeced660ffb5a128bf246ef8bc92ee9719210':
CallsManager: fix starting call from Contacts app with MSim
0ecbaf215d6928be597d486a0aebf4e68550fdc7 13-Apr-2015 Torbjorn Eklund <torbjorn.eklund@sonymobile.com> am 44651116: am cd3abbf7: Create new empty Bundles when creating new Call

* commit '446511160590d344478d04c2a5c60fcfb3c5f045':
Create new empty Bundles when creating new Call
cebbeced660ffb5a128bf246ef8bc92ee9719210 13-Apr-2015 Yorke Lee <yorkelee@google.com> am 161f1a7e: Merge "CallsManager: fix starting call from Contacts app with MSim"

* commit '161f1a7e21ef77846d0908f02a4d05b4ce3f5cbe':
CallsManager: fix starting call from Contacts app with MSim
446511160590d344478d04c2a5c60fcfb3c5f045 13-Apr-2015 Torbjorn Eklund <torbjorn.eklund@sonymobile.com> am cd3abbf7: Create new empty Bundles when creating new Call

* commit 'cd3abbf7209280fed6f39b9ab383919347c386ce':
Create new empty Bundles when creating new Call
161f1a7e21ef77846d0908f02a4d05b4ce3f5cbe 13-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "CallsManager: fix starting call from Contacts app with MSim"
66f5296f265c880df5107849ef8dfd693926594d 13-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 817090c6c6e43e13d2dbd6000c90331bfcbddaf8
0835211b8e7d35ecb2a39606975b6fcd182edeeb 13-Apr-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I138bade7cbce441644336536f4c97dc0720b0512
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
d240fe8e16205623eb6cb73c3d42448554690033 02-Apr-2015 Rekha Kumar <rekhak@codeaurora.org> IMS-VT: Change parameter type of data usage
Change Data Usage methods to take parameters of type long
instead of int.

Change-Id: I6a277dedb5976261035084955ed8a90da256061a

IMS-VT: When TTY is ON, do not allow MO VT call
When TTY mode is ON, the user SHOULD NOT be allowed to make
a Mobile Originating (MO) VT call and an UI alert message will
be displayed explaining MO VT call cannot be initiated.

Propagate the call substate changed message to the UI

IMS-VT : Set the flag to start call with speaker on for incoming VT calls
- There seems to be a race condition between when InCallUI
enters the video mode and sets the speaker phone on and
when call state changes to active.
- As a result, the audio route gets reset to earpiece as we
are not setting speaker phone on flag for the incoming
case. This change fixes that issue.

IMS-VT: Set speaker phone to true only if bluetooth or headset is not connected

IMS-VT: Convert emergency video call to voice call.
Convert emergency video call to voice call.

Change-Id: I09b82dcb6308a1177716b77e87da68161000518b

IMS-VT: Enable Video conferencing.
Enable Video conferencing.

Change-Id: Ief145e0592e58de46c7a75d858effdd72fa8b476

IMS-VT: Check for property before enabling speaker for MT VT calls
Check persist.radio.ims.audio.output before enabling speaker
if property is set to disable speaker then MT VT calls should not
use the speaker.

Change-Id: I0c6288a8fd672c9b7a13edac11e29875d0df4eb7
es/values/strings.xml
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
ests/src/com/android/server/telecom/testapps/TestConnectionManager.java
ests/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
ests/src/com/android/server/telecom/testapps/TestVideoProvider.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/SimpleTelecomTest.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
aa383cca668afd8578a6e007c3ea360768dc52f6 23-Mar-2015 Ihab Awad <ihab@google.com> Further cleanup, and move functionality into TestFixture objects

Change-Id: I62b514ae8fe10f720a60c681968efd2340616eba
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/HeadsetMediaButton.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/ComponentContextHolder.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceHolder.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/tests/MockitoHelper.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/TODO
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
ests/src/com/android/server/telecom/tests/TestDoubleHolder.java
ests/src/com/android/server/telecom/tests/TestFixture.java
ests/src/com/android/server/telecom/tests/unit/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
fd93244c8d002699942dfd45be9c7fb9f0eaa4a8 11-Apr-2015 Andrew Lee <anwlee@google.com> Missing BIDIRECTIONAL suffix.

Bug: 20160395
Change-Id: I9c38a13dcbdfa19ad621fbc81f0e049471bdd688
rc/com/android/server/telecom/InCallController.java
ests/src/com/android/server/telecom/testapps/TestConnectionService.java
dfa41feec8766d3863fb91c5f5a5d84c585845df 11-Apr-2015 Andrew Lee <anwlee@google.com> Merge "Suffix VT_LOCAL and VT_REMOTE with BIDIRECTIONAL."
08128af432ff1ff5358cf27fc0a5cf5d8615fa39 11-Apr-2015 Andrew Lee <anwlee@google.com> Suffix VT_LOCAL and VT_REMOTE with BIDIRECTIONAL.

Bug: 20160491
Change-Id: I4eadaec8df3ad415f3f7e10337d10165483222fd
rc/com/android/server/telecom/InCallController.java
31d68d261288a19e9a402efa84b7afcf7cec9dd2 11-Apr-2015 Jay Shrauner <shrauner@google.com> Use CameraCapabilities constructor w/o zoom params

Bug:20160534
Change-Id: I62cf20afeb22436ef4108db39b6067a9da627580
ests/src/com/android/server/telecom/testapps/TestVideoProvider.java
248cb718b4f2ff72f44f5fc09188b6a6563b978e 11-Apr-2015 Jay Shrauner <shrauner@google.com> Don't use deprecated AudioState accessor

Use AudioState.getRoute() instead of AudioState.route

Bug:
Change-Id: I3f17efd597d5fff9355930c364d3449f9db797f7
rc/com/android/server/telecom/CallAudioManager.java
817090c6c6e43e13d2dbd6000c90331bfcbddaf8 10-Apr-2015 Yorke Lee <yorkelee@google.com> Add ability to send video upgrade requests using TestVideoProvider

Bug: 20090411
Change-Id: I5db96fd41efc3baee0d80c73988cc0d6fba23b37
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
estapps/src/com/android/server/telecom/testapps/TestCallActivity.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
2a6985f675b0b4000b2a5a53e7df2fd3b55e91a1 27-Mar-2015 Yorke Lee <yorkelee@google.com> DO NOT MERGE Add ability to simulate missed calls

After initiating a call using
adb shell am start -a android.telecom.testapps.ACTION_START_INCOMING_CALL
-d "tel:14082932268"

Hang up the call using:
adb shell am start -a android.telecom.testapps.ACTION_HANGUP_CALLS

Bug: 19803865
Change-Id: I9ba12bac1eb5db5c19d0d830fc1e1e77cb3b86cb
estapps/Android.mk
estapps/AndroidManifest.xml
estapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
estapps/src/com/android/server/telecom/testapps/TestCallActivity.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
ests/Android.mk
abcbce4441720c52a443d292d5adc2d95f446494 07-Apr-2015 Ihab Awad <ihab@google.com> Fix deadlock around locking in AudioManager

Includes proof of concept tests, but the tests are not yet
highlighting the problem, due to its nondeterminism.

Bug: 20103143
Bug: 20108354
Change-Id: I8323a660c6cc4093888f4e608070709a828624e6
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallerInfoAsyncQueryFactory.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ContactsAsyncHelper.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/MissedCallNotifier.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/CallerInfoAsyncQueryFactoryFixture.java
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
5a1b1fde1fb0e473c814ad13cc43d06f4e32ff5a 09-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Add more capabilities to TestVideoProvider" into m-wireless-dev
b3e8a7278d950c9f43920096e053c0cfc2415dc3 09-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 959afe011bb4d41d7037844874acecb6e609e4f8
0be7b9d4929205a7cc5b287022370fa23109d492 09-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
e09b47b2f8b96780fc5c921785d73082cd932828 17-Mar-2015 Yorke Lee <yorkelee@google.com> Add more capabilities to TestVideoProvider

* Support outgoing video calls with TestConnectionService
* Add the ability to upgrade/downgrade between video/voice, with
a simulated delay.

Change-Id: Ie2408fcbf255023a55139618f1cc48f5ad4dcbce
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
estapps/src/com/android/server/telecom/testapps/TestVideoProvider.java
cd3abbf7209280fed6f39b9ab383919347c386ce 08-Apr-2015 Torbjorn Eklund <torbjorn.eklund@sonymobile.com> Create new empty Bundles when creating new Call

...instead of using Bundle.EMPTY.

Bundle.EMPTY is a global static resource and will no
longer be empty if one Call adds data to this Bundle.

Change-Id: I58c5bdd46a7c3468a6a12f967469cd1280af36d6
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallReceiver.java
3631b8e5042c390034907496320530bcb56e9588 08-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 827480f426ae7154dedb4cdfa50065aa3820f0a9
959afe011bb4d41d7037844874acecb6e609e4f8 08-Apr-2015 Tyler Gunn <tgunn@google.com> Cleanup of Video Call pause functionality.

Whether the paused videoState is available is dependent on the carrier's
implementation of the VT spec. The original VT implementation assumed
that this was stored in a system property accessed via InCall; these CLs
move this to a Call/Connection capability which will ultimately support
multisim video capable devices.

- Added mapping between Connection/Call capability.
- Changed toString for VideoState in a Call so that it is easier to see
the video state of a call in the logs.

Bug: 16680364
Bug: 19820114
Change-Id: I3840f92270100811161120dffcfe297bef7c4ea2
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/InCallController.java
411b7c0fcdd4c752efc84e79bc7eae6878d35f46 07-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 827480f426ae7154dedb4cdfa50065aa3820f0a9
827480f426ae7154dedb4cdfa50065aa3820f0a9 06-Apr-2015 Tyler Gunn <tgunn@google.com> Correcting issue where 1-way video calls do not log as video in call log.

The root of the issue is that the video state check in CallLogManager
was incorrect. Corrected to use the VideoState#isVideo() method which
checks if TX or RX is active for a video state.

Bug: 20066023
Change-Id: Ia1c0648dea7469c91855642c2c68b1b32d3827b1
rc/com/android/server/telecom/CallLogManager.java
3c732463ffa63293e37283398166d137dafd5e4d 06-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to eb39aa2c275ee5755e93eb4bc5b3b10085a97948
eb39aa2c275ee5755e93eb4bc5b3b10085a97948 03-Apr-2015 Tyler Gunn <tgunn@google.com> Video call accepted as audio shows up as video call in call log.

- Modified video state history tracking in Telecom Call to only track
video state history when call is active. This ensures while call is
dialing or ringing we do not capture the video state.

Bug: 20066023
Change-Id: I4c8227420ccd95fdd6f4e6e164b56ffa801114ca
rc/com/android/server/telecom/Call.java
032f8e415661339bd1e9a2da5e295062a996a7f5 02-Apr-2015 Rekha Kumar <rekhak@codeaurora.org> IMS-VT: Change parameter type of data usage
Change Data Usage methods to take parameters of type long
instead of int.

Change-Id: I6a277dedb5976261035084955ed8a90da256061a

IMS-VT: When TTY is ON, do not allow MO VT call
When TTY mode is ON, the user SHOULD NOT be allowed to make
a Mobile Originating (MO) VT call and an UI alert message will
be displayed explaining MO VT call cannot be initiated.

Propagate the call substate changed message to the UI

IMS-VT : Set the flag to start call with speaker on for incoming VT calls
- There seems to be a race condition between when InCallUI
enters the video mode and sets the speaker phone on and
when call state changes to active.
- As a result, the audio route gets reset to earpiece as we
are not setting speaker phone on flag for the incoming
case. This change fixes that issue.

IMS-VT: Set speaker phone to true only if bluetooth or headset is not connected

IMS-VT: Convert emergency video call to voice call.
Convert emergency video call to voice call.

Change-Id: I09b82dcb6308a1177716b77e87da68161000518b

IMS-VT: Enable Video conferencing.
Enable Video conferencing.

Change-Id: Ief145e0592e58de46c7a75d858effdd72fa8b476

IMS-VT: Check for property before enabling speaker for MT VT calls
Check persist.radio.ims.audio.output before enabling speaker
if property is set to disable speaker then MT VT calls should not
use the speaker.

Change-Id: I0c6288a8fd672c9b7a13edac11e29875d0df4eb7
es/values/strings.xml
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
estapps/src/com/android/server/telecom/testapps/TestConnectionManager.java
estapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
estapps/src/com/android/server/telecom/testapps/TestVideoProvider.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
945a82ea92bf4fcc8b505738760650f9fb74960b 02-Apr-2015 Ihab Awad <ihab@google.com> Split unit tests and interactive test apps apart

This CL splits the automated unit tests (*.tests package) and the
interactive test connection services (*.testapps package).

Apart from code hygiene and flexibility moving forward, this makes
Android manifest and build files, and the relevant dependencies,
simpler and easier to follow.

Change-Id: Id8c7763ae65f437fdfdabe8b0a4f3561adadbcb3
estapps/Android.mk
estapps/AndroidManifest.xml
estapps/res/drawable-xhdpi/stat_sys_phone_call.png
estapps/res/layout/testdialer_main.xml
estapps/res/raw/beep_boop.ogg
estapps/res/raw/outgoing_video.mp4
estapps/res/raw/test_pattern.mp4
estapps/res/raw/test_video.mp4
estapps/res/values/donottranslate_strings.xml
estapps/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
estapps/src/com/android/server/telecom/testapps/CallServiceNotifier.java
estapps/src/com/android/server/telecom/testapps/CameraThread.java
estapps/src/com/android/server/telecom/testapps/TestCallActivity.java
estapps/src/com/android/server/telecom/testapps/TestConnectionManager.java
estapps/src/com/android/server/telecom/testapps/TestConnectionService.java
estapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
estapps/src/com/android/server/telecom/testapps/TestInCallServiceImpl.java
estapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
estapps/src/com/android/server/telecom/testapps/TestVideoProvider.java
ests/Android.mk
ests/AndroidManifest.xml
ests/res/layout/testdialer_main.xml
ests/res/raw/beep_boop.ogg
ests/res/raw/outgoing_video.mp4
ests/res/raw/test_pattern.mp4
ests/res/raw/test_video.mp4
ests/res/values/donottranslate_strings.xml
ests/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
ests/src/com/android/server/telecom/testapps/CallServiceNotifier.java
ests/src/com/android/server/telecom/testapps/CameraThread.java
ests/src/com/android/server/telecom/testapps/TestCallActivity.java
ests/src/com/android/server/telecom/testapps/TestConnectionManager.java
ests/src/com/android/server/telecom/testapps/TestConnectionService.java
ests/src/com/android/server/telecom/testapps/TestDialerActivity.java
ests/src/com/android/server/telecom/testapps/TestInCallServiceImpl.java
ests/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
ests/src/com/android/server/telecom/testapps/TestVideoProvider.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
55b0b65c4f563a6e1825aff3200febb159082a1a 02-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to b63b57e2c35c4769e756f47131c7ebbc0af42c59
b63b57e2c35c4769e756f47131c7ebbc0af42c59 23-Mar-2015 Ihab Awad <ihab@google.com> Further cleanup, and move functionality into TestFixture objects

Change-Id: I62b514ae8fe10f720a60c681968efd2340616eba
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/HeadsetMediaButton.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/ComponentContextFixture.java
ests/src/com/android/server/telecom/tests/ComponentContextHolder.java
ests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
ests/src/com/android/server/telecom/tests/ConnectionServiceHolder.java
ests/src/com/android/server/telecom/tests/InCallServiceFixture.java
ests/src/com/android/server/telecom/tests/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/tests/MockitoHelper.java
ests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
ests/src/com/android/server/telecom/tests/SimpleTelecomTest.java
ests/src/com/android/server/telecom/tests/TODO
ests/src/com/android/server/telecom/tests/TelecomSystemTest.java
ests/src/com/android/server/telecom/tests/TelecomTestCase.java
ests/src/com/android/server/telecom/tests/TestDoubleHolder.java
ests/src/com/android/server/telecom/tests/TestFixture.java
ests/src/com/android/server/telecom/tests/unit/InCallWakeLockControllerTest.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
bba7176b823db5c0a8c5ce381099c6c513463189 01-Apr-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 226ae567a63a3ae8dd5292b127d59abf107417f4
69b8edf81b6ea5748ccd844cf8ff68593710c35b 31-Mar-2015 Etan Cohen <etancohen@google.com> Merge commit '84c4eca869f707e50f40e650da32f7172495e45c' into merge
2fd2e2a8dda56a53e8a6d930ac8a06b5248aeb89 31-Mar-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 226ae567a63a3ae8dd5292b127d59abf107417f4
84c4eca869f707e50f40e650da32f7172495e45c 30-Mar-2015 The Android Automerger <android-build@google.com> merge in m-wireless-internal-release history after reset to 226ae567a63a3ae8dd5292b127d59abf107417f4
226ae567a63a3ae8dd5292b127d59abf107417f4 27-Mar-2015 Yorke Lee <yorkelee@google.com> Fix some issues with TelecomBroadcastReceiver

* Fix missing ACTION_CLEAR_MISSED_CALLS action
* Make sure that PendingIntents are sent to the right class (TelecomBroadcastReciever,
not TelecomBroadcastIntentProcessor)

Bug: 19803865

Change-Id: I7611a5491286c34c82a85d3dfba30ec3527ee372
ndroidManifest.xml
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ba40955a6557b15ff488646f88d6d372e4c63fb6 27-Mar-2015 Yorke Lee <yorkelee@google.com> Merge "Fix some issues with TelecomBroadcastReceiver"
57f614997b6e6a40befd022059b803e15f0a030d 27-Mar-2015 Yorke Lee <yorkelee@google.com> Fix some issues with TelecomBroadcastReceiver

* Fix missing ACTION_CLEAR_MISSED_CALLS action
* Make sure that PendingIntents are sent to the right class (TelecomBroadcastReciever,
not TelecomBroadcastIntentProcessor)

Bug: 19803865

Change-Id: I7611a5491286c34c82a85d3dfba30ec3527ee372
ndroidManifest.xml
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
5ff911b0f08f286fe7bff3418626f6bb74d640d1 27-Mar-2015 Yorke Lee <yorkelee@google.com> Merge "Add ability to simulate missed calls"
7a593fa6806014a4f391c8a0d68b23f1ca7f6f04 27-Mar-2015 Yorke Lee <yorkelee@google.com> Add ability to simulate missed calls

After initiating a call using
adb shell am start -a android.telecom.testapps.ACTION_START_INCOMING_CALL
-d "tel:14082932268"

Hang up the call using:
adb shell am start -a android.telecom.testapps.ACTION_HANGUP_CALLS

Bug: 19803865

Change-Id: I913666dc45ea518f4f95a321121680fb7aabbb6f
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
ests/src/com/android/server/telecom/testapps/TestCallActivity.java
ests/src/com/android/server/telecom/testapps/TestConnectionService.java
ef8212fab6a11d9711a0a26bc65bac98bd2b1c78 26-Mar-2015 Ihab Awad <ihab@google.com> Fix problem with AsyncQueryHandler

AsyncQueryHandler uses Looper.myLooper(), which does not work in our
case when invoked from an arbitrary thread. Changed so its ctor is
invoked on the main thread.

And various other similar problems.

Bug: 19941246
Change-Id: I324f09a5161e26593c0d24d5311a371d8971870d
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/ServiceBinder.java
ae3b8d0499c791ec0a839353be307724c1305fdf 26-Mar-2015 Ihab Awad <ihab@google.com> Fix problem where incoming calls would hang and never complete

Bug: 19941246
Change-Id: I50f50f2ab81a79069a5a7a0884eaa75daa43a909
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/RespondViaSmsManager.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
c5dcd5854ced254ff0330649a5a4998f68bbc800 26-Mar-2015 Anthony Lee <anthonylee@google.com> Clear the calling identity when using the notification manager.

Some of the recent refactoring work could have caused this
code to run in a different context. Telecom used to be the
one executing this code but it is not anymore.

Bug: 19941388
Change-Id: I0590c0653c3bd43cba79b05ce5a747d1bc2402bb
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
eef83a54638d1292fd91f2e5fded602c4da56f3c 27-Mar-2015 Santos Cordon <santoscordon@google.com> Merge "Fix problem with AsyncQueryHandler"
8731faf3a1dcf888b894d4ad0faab97effab10bc 26-Mar-2015 Ihab Awad <ihab@google.com> Fix problem with AsyncQueryHandler

AsyncQueryHandler uses Looper.myLooper(), which does not work in our
case when invoked from an arbitrary thread. Changed so its ctor is
invoked on the main thread.

And various other similar problems.

Bug: 19941246
Change-Id: I324f09a5161e26593c0d24d5311a371d8971870d
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/ServiceBinder.java
512d6350a66b44f1065d6fd2e14ec328449e8119 26-Mar-2015 Ihab Awad <ihab@google.com> Fix problem with AsyncQueryHandler

AsyncQueryHandler uses Looper.myLooper(), which does not work in our
case when invoked from an arbitrary thread. Changed so its ctor is
invoked on the main thread.

And various other similar problems.

Bug: 19941246
Change-Id: I324f09a5161e26593c0d24d5311a371d8971870d
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/ServiceBinder.java
e6dbc9d8448211f10b245ededf25d740cb561b40 26-Mar-2015 Ihab Awad <ihab@google.com> Fix problem where incoming calls would hang and never complete

Bug: 19941246
Change-Id: I50f50f2ab81a79069a5a7a0884eaa75daa43a909
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/RespondViaSmsManager.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
3a057704049149f07e4dec749101c1127e6ec5e2 26-Mar-2015 Anthony Lee <anthonylee@google.com> Clear the calling identity when using the notification manager.

Some of the recent refactoring work could have caused this
code to run in a different context. Telecom used to be the
one executing this code but it is not anymore.

Bug: 19941388
Change-Id: I0590c0653c3bd43cba79b05ce5a747d1bc2402bb
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
d1d63e149fb9b820b4004c745c86d13b5334e780 26-Mar-2015 Ihab Awad <ihab@google.com> Fix problem where incoming calls would hang and never complete

Bug: 19941246
Change-Id: I50f50f2ab81a79069a5a7a0884eaa75daa43a909
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/RespondViaSmsManager.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
761a63fe47526bd48d1649da33f7ef213fbb6207 26-Mar-2015 Anthony Lee <anthonylee@google.com> Clear the calling identity when using the notification manager.

Some of the recent refactoring work could have caused this
code to run in a different context. Telecom used to be the
one executing this code but it is not anymore.

Bug: 19941388
Change-Id: I0590c0653c3bd43cba79b05ce5a747d1bc2402bb
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
2d4deb580ae7ded601c1d5f05498cb16252ed39e 25-Mar-2015 Prerepa Viswanadham <dham@google.com> Fix merge conflicts in CallAudioManager and CallsManager.
Update a call to a hidden platform ctor in SimpleTelecomTest.

Change-Id: I76f6d0b9c49862b9412196ce2ea4d3e3ed960357
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
ests/src/com/android/server/telecom/tests/SimpleTelecomTest.java
3d05da65a8e488be546b9cef2f44e1a5567132ad 24-Mar-2015 Prerepa Viswanadham <dham@google.com> Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge

Change-Id: I5d9ab761a1060a24680e69d1610ade206660e139
245faa7d42b2ae23ed0e8b500498f6dfaa5a7e7f 23-Mar-2015 Yorke Lee <yorkelee@google.com> DO NOT MERGE Fix potential NPE in Telecom

Bundle.EMPTY is immutable, use new Bundle() instead.

Change-Id: Ie1a452083d235fa3732e22fc0ea89d6fcc00c923
rc/com/android/server/telecom/CallIntentProcessor.java
12bc9c3125d165057bbdc5facf3b80038bb41707 23-Mar-2015 Yorke Lee <yorkelee@google.com> Merge "Fix NPE in CallIntentProcessor"
a49ede1c4fb4486c51c218384299ad686ba2650a 23-Mar-2015 Yorke Lee <yorkelee@google.com> Fix NPE in CallIntentProcessor

Fix was submitted to LMP MR1 but was lost in a series of merges to
master

Bug: 19888713
Change-Id: Iea83b55bad5bdbb4e15dccf26667cea0f4fdd7aa
rc/com/android/server/telecom/CallIntentProcessor.java
6a9e6485f2503c21140eb3ff79715aa88c6b6aee 22-Mar-2015 Dong Zhou <a22255@motorola.com> am 6a49ba9c: am 386b3349: am 3871849d: Speed up audio setup for IMS MT call

* commit '6a49ba9c47fb003026230beb9e6479b2853efa66':
ff54125b3e875461c3b8ba3ffd1eef606aee1ae6 21-Mar-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ied415a15330982694f6d623889e79df5ce0dfee6
Auto-generated-cl: translation import
es/values-en-rAU/strings.xml
8cde05ec98c0ae7df1f7664616ceeb1b57e4d069 20-Mar-2015 Dong Zhou <a22255@motorola.com> am 386b3349: (-s ours) am 3871849d: Speed up audio setup for IMS MT call

* commit '386b33497e2ecbcecd6243db6daa3ccade9f2e92':
Speed up audio setup for IMS MT call
b01dc316ebc28dd4265343f55db2b0e00c78cdf8 19-Mar-2015 Etan Cohen <etancohen@google.com> Fix merge error in CL #659205

As part of merge resolution a single line from original CL was dropped.
Merge CL = 3d4bafb60a202ab6a6c99a48b493d83a3229642e

Change-Id: I07bd7e4552eb54a18073ecbc5872a06b7cc9ee0d
rc/com/android/server/telecom/CallAudioManager.java
a247fedc24f2bd087cad83d79dbcfabdbe9e471b 19-Mar-2015 Etan Cohen <etancohen@google.com> Merge commit 'c289432' into manualmerge

Change-Id: If41bedc2b72823ec27f3d0d6536e9678e0f27561
3d4bafb60a202ab6a6c99a48b493d83a3229642e 12-Mar-2015 Dong Zhou <a22255@motorola.com> Speed up audio setup for IMS MT call

Set audio mode into in_call mode right after accepting the call
without waiting for the call be ACTIVE from RIL.

Bug: 19656525
Change-Id: I83ec03f14ba859680ab5a42e945d940d698e6915
rc/com/android/server/telecom/CallAudioManager.java
8d5d9ddc66b55b6906364ab3c0e244dab4d58f13 12-Mar-2015 Ihab Awad <ihab@google.com> Make Telecom synchronous

Remove main-thread handlers and add a systemwide lock object.

Change-Id: I6334fdfa6c244836f6375bea302404f61c81301b
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallIdMapper.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceRepository.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/ContactsAsyncHelper.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/MissedCallNotifier.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/RespondViaSmsManager.java
rc/com/android/server/telecom/RingbackPlayer.java
rc/com/android/server/telecom/ServiceBinder.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/TelephonyUtil.java
rc/com/android/server/telecom/UserCallIntentProcessor.java
rc/com/android/server/telecom/components/BluetoothPhoneService.java
rc/com/android/server/telecom/components/PrimaryCallReceiver.java
rc/com/android/server/telecom/components/TelecomBroadcastReceiver.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/components/UserCallActivity.java
rc/com/android/server/telecom/components/UserCallIntentProcessor.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/SimpleTelecomTest.java
6a49ba9c47fb003026230beb9e6479b2853efa66 18-Mar-2015 Dong Zhou <a22255@motorola.com> am 386b3349: am 3871849d: Speed up audio setup for IMS MT call

* commit '386b33497e2ecbcecd6243db6daa3ccade9f2e92':
Speed up audio setup for IMS MT call
20afacc3ccd361c93ab80ce7c438a113b4b5183d 17-Mar-2015 Yorke Lee <yorkelee@google.com> Support outgoing video calls with TestConnectionService

Change-Id: I28692515b43f6b0a7f6b651fcead97fe7b6e2e96
ests/src/com/android/server/telecom/testapps/TestConnectionService.java
386b33497e2ecbcecd6243db6daa3ccade9f2e92 17-Mar-2015 Dong Zhou <a22255@motorola.com> am 3871849d: Speed up audio setup for IMS MT call

* commit '3871849df66f1d60fa9a28ae0108b1f0689634aa':
Speed up audio setup for IMS MT call
c2894327d15bc69be4c6c0929773dd02f81e2c97 17-Mar-2015 Dong Zhou <a22255@motorola.com> am 3871849d: Speed up audio setup for IMS MT call

* commit '3871849df66f1d60fa9a28ae0108b1f0689634aa':
Speed up audio setup for IMS MT call
3871849df66f1d60fa9a28ae0108b1f0689634aa 12-Mar-2015 Dong Zhou <a22255@motorola.com> Speed up audio setup for IMS MT call

Set audio mode into in_call mode right after accepting the call
without waiting for the call be ACTIVE from RIL.

Bug: 19656525
Change-Id: I83ec03f14ba859680ab5a42e945d940d698e6915
rc/com/android/server/telecom/CallAudioManager.java
8de76915ea2772faeb41705aaaeb65f5b3478ac4 17-Feb-2015 Ihab Awad <ihab@google.com> Further refactor Telecom and add tests

Complete refactoring Telecom to remove singletons from the core code.

Introduce a unit test that simulates a full outgoing phone call from
start to hangup.

Change-Id: I8b09cac6eb9b6aeeb0aeba5d8ae032b4c303c08d
ndroid.mk
roguard.flags
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/ConnectionServiceRepository.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/HeadsetMediaButton.java
rc/com/android/server/telecom/HeadsetMediaButtonFactory.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallWakeLockControllerFactory.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/MissedCallNotifier.java
rc/com/android/server/telecom/PhoneStateBroadcaster.java
rc/com/android/server/telecom/ProximitySensorManager.java
rc/com/android/server/telecom/ProximitySensorManagerFactory.java
rc/com/android/server/telecom/RespondViaSmsManager.java
rc/com/android/server/telecom/ServiceBinder.java
rc/com/android/server/telecom/TelecomBroadcastIntentProcessor.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/ui/MissedCallNotifierImpl.java
ests/src/com/android/server/telecom/tests/ComponentContextHolder.java
ests/src/com/android/server/telecom/tests/ConnectionServiceHolder.java
ests/src/com/android/server/telecom/tests/MockConnectionService.java
ests/src/com/android/server/telecom/tests/MockitoHelper.java
ests/src/com/android/server/telecom/tests/SimpleTelecomTest.java
ests/src/com/android/server/telecom/tests/TestDoubleHolder.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
fd9e7b4cff85a56d3740078ae5086713a364f95d 16-Mar-2015 Vinit Deshpande <vinitd@google.com> Fixed build breaks after merge from m-wireless-internal-release

Change-Id: I9fe55d07f151914c54a266d956e6273102a8139e
rc/com/android/server/telecom/TelecomServiceImpl.java
2a61edaf7945ca15366040d29010c0a6e151a238 16-Mar-2015 Vinit Deshpande <vinitd@google.com> Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'

Change-Id: I5bde841b9c5766ab33077ae4fd25c546b10117c7
1b2fd28fb06327359644b2787c668d6ebbc6a68f 15-Mar-2015 Pawit Pornkitprasan <p.pawit@gmail.com> CallsManager: fix starting call from Contacts app with MSim

The extras bundle may be Bundle.EMPTY, which immutable. Create our
own copy to modify.

Change-Id: If875eddc6afe9c5ca4b0d59a51902529cf115487
rc/com/android/server/telecom/CallsManager.java
afd7a81087b63b3aec9dbb69bf5df00555b71fc3 13-Mar-2015 Yorke Lee <yorkelee@google.com> am f5728682: (-s ours) am e70f32b1: am cd5cbe96: Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev

* commit 'f5728682e97c3ed98e4dfcf55d3421175de4b002':
DO NOT MERGE Fix NPE in Telecom
23da3c292674b3ed1f6f4ed05ff20f8b5b9ba28f 12-Mar-2015 Santos Cordon <santoscordon@google.com> Log NewOutgoingCall events from telecom.

Change-Id: I30b181184828287ae651f69223cb82cb4c983f3f
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
f5728682e97c3ed98e4dfcf55d3421175de4b002 12-Mar-2015 Yorke Lee <yorkelee@google.com> am e70f32b1: am cd5cbe96: Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev

* commit 'e70f32b1ce411ad24e6dc97b7effe8951b5648ce':
DO NOT MERGE Fix NPE in Telecom
6fc960302811796104e161fe316bbec6da6018de 12-Mar-2015 Yorke Lee <yorkelee@google.com> am cd5cbe96: (-s ours) Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev
automerge: ff6e254 -s ours

* commit 'ff6e254821785f0b3e97be6351322a06f4ece916':
DO NOT MERGE Fix NPE in Telecom
ff6e254821785f0b3e97be6351322a06f4ece916 12-Mar-2015 Yorke Lee <yorkelee@google.com> am cd5cbe96: (-s ours) Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev

* commit 'cd5cbe96cd8a0a9ac9b1dfe2a2330bacf5ef8fd8':
DO NOT MERGE Fix NPE in Telecom
e70f32b1ce411ad24e6dc97b7effe8951b5648ce 12-Mar-2015 Yorke Lee <yorkelee@google.com> am cd5cbe96: Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev

* commit 'cd5cbe96cd8a0a9ac9b1dfe2a2330bacf5ef8fd8':
DO NOT MERGE Fix NPE in Telecom
cd5cbe96cd8a0a9ac9b1dfe2a2330bacf5ef8fd8 12-Mar-2015 Yorke Lee <yorkelee@google.com> Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev
f0046911cfce79f17e1c7853690fedb48e65d751 27-Feb-2015 Yorke Lee <yorkelee@google.com> DO NOT MERGE Fix NPE in Telecom

Use empty bundle instead of Bundle.EMPTY which is non mutable.

Bug: 19486064
Change-Id: Ia015a695c4e7849cb37b66c2ac73d8b1f58ac344
rc/com/android/server/telecom/CallReceiver.java
958e14df070ee4f430dd6d06ef2d4584f4b87d86 11-Mar-2015 Andrew Lee <anwlee@google.com> Update video capability conversion for TX/RX bits.

Change-Id: Ic7744a3a2daabb2f8cf6df37d7f929236bd392ff
rc/com/android/server/telecom/InCallController.java
d3004f70f501eda0a32d4711933b283183318be0 12-Mar-2015 Yorke Lee <yorkelee@google.com> Merge "Create new bundle instead of immutable Bundle.EMPTY"
96ca5014c59a74a0bb97c1e7b6d0c80f16634315 12-Mar-2015 Yorke Lee <yorkelee@google.com> Create new bundle instead of immutable Bundle.EMPTY

Create new bundle to avoid potential system crash

Change-Id: I0afe93f7795bd740c5d94cb1138e60bb639185a5
rc/com/android/server/telecom/CallReceiver.java
e296187bd471f482f5b8966b904a700ce9040a28 11-Mar-2015 Tyler Gunn <tgunn@google.com> Merge "Fix emergency callback number not shown for incoming calls." into m-wireless-dev
59f7008fbf8f7649d4f5c749fe2f386ad0c7f919 09-Mar-2015 Santos Cordon <santoscordon@google.com> Merge "Don't log the Emergency Phone Account in the call log."
2c625f3dac466b1391caf0a8c6a04199f5f7e6b8 07-Mar-2015 Santos Cordon <santoscordon@google.com> Don't log the Emergency Phone Account in the call log.

The emergency phone account is there because telecom system requires a
phone account to make calls (even emergency calls). It gets registered
when there is no SIM and unregistered when the user adds a SIM. It's a
place holder for the user to know that only emergency calls can be made
while there is no SIM. A side effect is that when the user attempts to
place a regular call when there is no SIM, we end up logging "Emergency
Calls" along side the dial attempt in the call log. This gives a false
impression that the call was an emergency call. This change makes it so
that the emergency phone account is never logged as part of the calllog.

Bug: 19569750
Change-Id: I842edd5d781dc8f4f1cc8fc6a12d2350063a1f82
rc/com/android/server/telecom/CallLogManager.java
b600a5f7a9905a86f1270997c03739037bfed48c 07-Mar-2015 Etan Cohen <etancohen@google.com> Amend ag/648273 (Allow PSTN phone account ...)

Amend above CL to build with re-organized TelecomService implementation.

Change-Id: I165549ec3ed27831f90c437c1a83803f56b62a34
rc/com/android/server/telecom/TelecomServiceImpl.java
712991aaea7ceba5c98cb1f7185ca8a7808f3dac 07-Mar-2015 Santos Cordon <santoscordon@google.com> Merge "Toggle speakerphone when user un/docks from car/desk dock."
0f764045684661baacacf7fa01ba8fc385c1828b 07-Mar-2015 Yorke Lee <yorkelee@google.com> Merge "Nuke TestDialerActivity"
0566c37d52b5cd62d6117ba4ee1943539a20b0cc 07-Mar-2015 Yorke Lee <yorkelee@google.com> Nuke TestDialerActivity

It doesn't do anything useful right now

Change-Id: I7cd66880a8692fc95273b39fd531230b26b4f70b
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/testapps/TestDialerActivity.java
a04bdcaf9f0d9dbb5b03080b74a7c562421d183f 05-Mar-2015 Santos Cordon <santoscordon@google.com> Toggle speakerphone when user un/docks from car/desk dock.

Bug: 18301017
Bug: 14996126

Change-Id: I82a4ee3114bbdd08d5d83bc7a3518c6856973072
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/DockManager.java
87ef3ed1bfc7f89bf350fa3aca658d6bf02cd415 06-Mar-2015 P.Y. Laligand <pylaligand@google.com> Merge "Made package name and directory structure match for a Telecomm unit test."
d35be75e088fd4f9073678d89186c959f79001f3 06-Mar-2015 P.Y. Laligand <pylaligand@google.com> Made package name and directory structure match for a Telecomm unit test.

This makes Eclipse happier, and helps make new projects error-free.

Change-Id: Ic91823155c280a3808c246f66325e5e9b77fea9a
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallWakeLockController.java
ests/src/com/android/server/telecom/tests/unit/InCallWakeLockControllerTest.java
7cb69462379c33299d009b5bcddab6432935a985 06-Mar-2015 Sailesh Nepal <sail@google.com> am 5706b3eb: am e566b575: am 2a98c97e: Allow PSTN phone account for incoming calls from connection manager

* commit '5706b3eb84f8f544897341b41fedff6bea5b67a3':
Allow PSTN phone account for incoming calls from connection manager
5706b3eb84f8f544897341b41fedff6bea5b67a3 06-Mar-2015 Sailesh Nepal <sail@google.com> am e566b575: am 2a98c97e: Allow PSTN phone account for incoming calls from connection manager

* commit 'e566b575d5edbd2dd73104579f8d906943713cda':
Allow PSTN phone account for incoming calls from connection manager
036171a0f7aa65316569c5a47d2a1a02bc83a249 06-Mar-2015 Sailesh Nepal <sail@google.com> am 2a98c97e: Allow PSTN phone account for incoming calls from connection manager
automerge: 348dcd9

* commit '348dcd9ddb95bee674ceb7dc37f7369ca5970908':
Allow PSTN phone account for incoming calls from connection manager
e566b575d5edbd2dd73104579f8d906943713cda 06-Mar-2015 Sailesh Nepal <sail@google.com> am 2a98c97e: Allow PSTN phone account for incoming calls from connection manager

* commit '2a98c97ee6e30e30d9378a1be030a05cab71c109':
Allow PSTN phone account for incoming calls from connection manager
348dcd9ddb95bee674ceb7dc37f7369ca5970908 06-Mar-2015 Sailesh Nepal <sail@google.com> am 2a98c97e: Allow PSTN phone account for incoming calls from connection manager

* commit '2a98c97ee6e30e30d9378a1be030a05cab71c109':
Allow PSTN phone account for incoming calls from connection manager
712f974b989997f1881dbd558a08069cbc18f7cc 06-Mar-2015 Nancy Chen <nancychen@google.com> Fix build breakage.

Because of refactoring, can't directly use the cherrypick as is.

Change-Id: Ic0d7bd95701c955c6277b065e6975e238209ff9f
rc/com/android/server/telecom/TelecomServiceImpl.java
738539670f87caa3edb6ba2b52f0ecba81ea25bd 28-Feb-2015 Santos Cordon <santoscordon@google.com> Broadcast phone account registrations

This is cherry-picked from master

Change-Id: I1ad86c6fde042f1b3b38687800e434dfc82c75e4
ndroidManifest.xml
rc/com/android/server/telecom/TelecomServiceImpl.java
2a98c97ee6e30e30d9378a1be030a05cab71c109 05-Mar-2015 Sailesh Nepal <sail@google.com> Allow PSTN phone account for incoming calls from connection manager

Currently the phone account specified for an incoming call must
match belong to the calling app.

This CL relaxes that restricition a little. Now connection managers
can specify PSTN phone accounts when adding a new incoming call.

This is necessary so that incoming calls from the connection manager
are displayed the same way as outgoing calls from the connection
manager.

Bug: 19591608, 19217193
Change-Id: I856ada853865c0ca01a2c3f9baede354f0855ea8
rc/com/android/server/telecom/TelecomService.java
72e47d5843810c17cea5cf3aadc76556f89e720a 06-Feb-2015 Tyler Gunn <tgunn@google.com> Fix emergency callback number not shown for incoming calls.

- Translate Connection CAPABILITY_SHOW_CALLBACK_NUMBER to Call equivalent.

Bug: 18689292
Change-Id: I290b2fbefcd68876dd03cdd671e55b58ae5d75ca
rc/com/android/server/telecom/InCallController.java
4c77849c7e70cfb93239a220beefd35a243c7c56 28-Feb-2015 Santos Cordon <santoscordon@google.com> Broadcast phone account registrations

Change-Id: I1ad86c6fde042f1b3b38687800e434dfc82c75e4
ndroidManifest.xml
rc/com/android/server/telecom/TelecomService.java
91fc8099a0690a3367eb206788c9c25ceff31875 15-Feb-2015 Sailesh Nepal <sail@google.com> Fix connection manager bugs related to work profiles

When calling TelecomManager.addNewIncomingCall with an account
that's was not registered we would crash. Fix was to check
for a null phone account.

Various TelecomManager APIs would throw security exceptions when
called from a work profile. Fix was to:
- switch to using APIs that allowed the user to be specified.
For example, using queryIntentServicesAsUse instead of
getServiceInfo
- don't look for work profiles if the calling user isn't the
owner.

The default connection manager (set using a config.xml overlay)
didn't work with work profiles. Fix was to allow the default
connection manager to resolve against the calling process's
user handle.

BUG: 19300886, 19301690, 19301359
Change-Id: I49d75b69dcfc829b74a5483d7a011f17d8d06838
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
78a5e6b9c1595c81f72d7a822617cb78db224e48 06-Feb-2015 Ihab Awad <ihab@google.com> Refactoring for testability

Refactor to a single app singleton, TelecomSystem, which owns the
intialization of the rest of the app.

Change-Id: I3036f200b56f710e7f830b469260a67145c327e7
ndroidManifest.xml
rc/com/android/server/telecom/BluetoothPhoneService.java
rc/com/android/server/telecom/BluetoothPhoneServiceImpl.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallActivity.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallIntentProcessor.java
rc/com/android/server/telecom/CallReceiver.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceRepository.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/ContactsAsyncHelper.java
rc/com/android/server/telecom/ErrorDialogActivity.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/MissedCallNotifier.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/PhoneAccountBroadcastReceiver.java
rc/com/android/server/telecom/PhoneStateBroadcaster.java
rc/com/android/server/telecom/ProximitySensorManager.java
rc/com/android/server/telecom/RespondViaSmsManager.java
rc/com/android/server/telecom/ServiceBinder.java
rc/com/android/server/telecom/TelecomBroadcastIntentProcessor.java
rc/com/android/server/telecom/TelecomBroadcastReceiver.java
rc/com/android/server/telecom/TelecomGlobals.java
rc/com/android/server/telecom/TelecomService.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelecomSystem.java
rc/com/android/server/telecom/UserCallIntentProcessor.java
rc/com/android/server/telecom/components/BluetoothPhoneService.java
rc/com/android/server/telecom/components/ErrorDialogActivity.java
rc/com/android/server/telecom/components/PhoneAccountBroadcastReceiver.java
rc/com/android/server/telecom/components/PrimaryCallReceiver.java
rc/com/android/server/telecom/components/TelecomBroadcastReceiver.java
rc/com/android/server/telecom/components/TelecomService.java
rc/com/android/server/telecom/components/UserCallActivity.java
479b3025ef8be1a115468fd6c113afa24cca2790 06-Feb-2015 Santos Cordon <santoscordon@google.com> Update Telecom to use getSubId* method

Remove custom code to convert PhoneAccount to sub-id from telecom and
start using the TelephonyManager version.

Change-Id: If324b4e577e4c0a43f93dd43e833d48a65e949cd
rc/com/android/server/telecom/PhoneAccountRegistrar.java
a365390b0d157fbe1655cdc41ea5d13fa13fdbdf 23-Jan-2015 Ihab Awad <ihab@google.com> Minor visibility changes to make tests work again.

Change-Id: I023974f9f145ec9b39b6d8a1c3b1679638dd59f7
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallWakeLockController.java
ests/src/com/android/server/telecom/tests/unit/InCallWakeLockControllerTest.java
0ef7e015abc2396cadba62399edea1539f8ad758 21-Jan-2015 Tyler Gunn <tgunn@google.com> Enable video telephony support. (3/4)

- Modified test connection service to set the video capability on its
phone accounts to enable testing of enabling video.
- Note: Had to change package/permission on the test app so that it could
register phone accounts.

Bug: 19062133
Change-Id: I391ca128a724a1bab2e4ffd5c5f6945e7cc057ec
ests/src/com/android/server/telecom/testapps/CallServiceNotifier.java
3b9ca5628c4577ab74111b3087951a66cdacb613 27-Feb-2015 Yorke Lee <yorkelee@google.com> Merge "Make TestCallActivity Theme.NoDisplay"
7fa4c315914124bf271d5e42b54debbfa0930959 27-Feb-2015 Geoff Mendal <mendal@google.com> am 571ee1dc: (-s ours) am 79b039f5: (-s ours) Import translations. DO NOT MERGE

* commit '571ee1dc20cba9183e1d006a1dba176810ab8d0f':
Import translations. DO NOT MERGE
571ee1dc20cba9183e1d006a1dba176810ab8d0f 27-Feb-2015 Geoff Mendal <mendal@google.com> am 79b039f5: (-s ours) Import translations. DO NOT MERGE

* commit '79b039f5b68a173cdd24613af8debc62a1aca82c':
Import translations. DO NOT MERGE
6e5c16f795c4a77928528425cfab00b7f3c5ff4a 27-Feb-2015 Yorke Lee <yorkelee@google.com> Make TestCallActivity Theme.NoDisplay

This prevents the activity from bringing up the UI at all,
which makes the initiation of a test call more realistic from the
ActivityManager's perspective since calls are usually
generated from the background.

Change-Id: I291e7fcc0bc1a03924328159da71304a86ee6252
ests/AndroidManifest.xml
b43490b883c2453d8680289e494b294860906e4c 27-Feb-2015 Yorke Lee <yorkelee@google.com> Merge "Fix NPE in Telecom"
e582173de66043547e4bb55eee1bec69275a265a 27-Feb-2015 Yorke Lee <yorkelee@google.com> Fix NPE in Telecom

Use empty bundle instead of Bundle.EMPTY which is non mutable.

Bug: 19486064
Change-Id: Ia015a695c4e7849cb37b66c2ac73d8b1f58ac344
rc/com/android/server/telecom/CallReceiver.java
79b039f5b68a173cdd24613af8debc62a1aca82c 27-Feb-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I2fb5d48b68f7d5b11f0739985752a521f3c94e1e
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
af22dd1f9ab859c2139ffd623c52ab90c7895e04 26-Feb-2015 Andrew Lee <anwlee@google.com> Cleanup RespondViaSmsSettings class.

Remove inner class, so there is just one class which extends
PreferenceActivity.

Bug: 19372734
Change-Id: I0cd1095edf12261b5957c9474238bcaaf3005831
ndroidManifest.xml
rc/com/android/server/telecom/RespondViaSmsSettings.java
471d0e0139eea5512388af549d43747cdee543a0 25-Feb-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I5f95f4c46ce4252793232d0dd5eb48e4bc7792aa
Auto-generated-cl: translation import
es/values-ar/strings.xml
bc37f5d4c9510057052fbc5a84705b90c6bcf1fd 20-Feb-2015 Yorke Lee <yorkelee@google.com> Merge "Release mediaplayer completely after destroying test call"
eb9d7ac1ad7aab6735cde889e05f1a3655e2c0d2 20-Feb-2015 Yorke Lee <yorkelee@google.com> Release mediaplayer completely after destroying test call

Change-Id: Ibbe174a35858942d1f00b8c98dccadd215e54592
ests/src/com/android/server/telecom/testapps/TestConnectionService.java
e78ab0dec44ac6575801b3b1263ddee3703c979d 06-Feb-2015 Santos Cordon <santoscordon@google.com> Update Telecom to use getSubId* method

Remove custom code to convert PhoneAccount to sub-id from telecom and
start using the TelephonyManager version.

Change-Id: If324b4e577e4c0a43f93dd43e833d48a65e949cd
rc/com/android/server/telecom/PhoneAccountRegistrar.java
9631da49ba48b20f50ea00d5edf1139811fddacf 19-Feb-2015 Andrew Lee <anwlee@google.com> Add intent-filter for intent to start RespondViaSMS.

Bug: 19372734
Change-Id: I8bf239b5297109907e25695cd433a38496683fe2
ndroidManifest.xml
df8b35e67830d0a2563faaac1e998364e9a95513 02-Feb-2015 Andrew Lee <anwlee@google.com> Rename from VoWIFI to WIFI.

Make capability lable for calls made over Wifi more generic.

Bug: 19151548
Change-Id: I90fef9540c9ccdc45309b6325d8ee4fbd38c0c4e
rc/com/android/server/telecom/InCallController.java
2792b9b8951e4b2d13490c1760fb111af9bea600 09-Feb-2015 Yorke Lee <yorkelee@google.com> am 7dfc17af: am 0713dbc1: am 47da9051: Fix possible deadlock in BluetoothPhoneService

* commit '7dfc17af3352a06380d17e05c8d49b25f4552873':
Fix possible deadlock in BluetoothPhoneService
7dfc17af3352a06380d17e05c8d49b25f4552873 09-Feb-2015 Yorke Lee <yorkelee@google.com> am 0713dbc1: am 47da9051: Fix possible deadlock in BluetoothPhoneService

* commit '0713dbc105c3c17a6530119f134f57facbe4bf8f':
Fix possible deadlock in BluetoothPhoneService
0713dbc105c3c17a6530119f134f57facbe4bf8f 09-Feb-2015 Yorke Lee <yorkelee@google.com> am 47da9051: Fix possible deadlock in BluetoothPhoneService

* commit '47da905183b4e2ec50eb16c75852d68b558c7c1e':
Fix possible deadlock in BluetoothPhoneService
47da905183b4e2ec50eb16c75852d68b558c7c1e 06-Feb-2015 Yorke Lee <yorkelee@google.com> Fix possible deadlock in BluetoothPhoneService

If MainThreadRequest.setResult is called with null, this will
cause a deadlock.

Bug: 18460910

Change-Id: I787511ea55a69b2f2b9b1dc293cc6fbab3dd8b5b
rc/com/android/server/telecom/BluetoothPhoneService.java
101d2969fc4236d659118e3be4b9bf3ec8f0f81b 30-Jan-2015 mike dooley <mdooley@google.com> am 8dae3ddd: am bb882521: am f17a31c4: Merge "Fixing conference managment regression." into lmp-mr1-dev

* commit '8dae3dddcfda490526c6a9aa24df9a4ed5f04e3a':
Fixing conference managment regression.
ea4c8a96e6d4cd1a14e206704736e5e5c41cd0cd 30-Jan-2015 Sailesh Nepal <sail@google.com> am 463dbd82: am 9ad2c558: am 646fa3d6: Add timeout for emergency calls

* commit '463dbd823955234aff4c7dd55c5feb941278f1db':
Add timeout for emergency calls
8dae3dddcfda490526c6a9aa24df9a4ed5f04e3a 30-Jan-2015 mike dooley <mdooley@google.com> am bb882521: am f17a31c4: Merge "Fixing conference managment regression." into lmp-mr1-dev

* commit 'bb88252119b7963c3baf4a2dcc5e1d87003affcf':
Fixing conference managment regression.
463dbd823955234aff4c7dd55c5feb941278f1db 30-Jan-2015 Sailesh Nepal <sail@google.com> am 9ad2c558: am 646fa3d6: Add timeout for emergency calls

* commit '9ad2c5588ce833ccfa3d2afe09e3e19e261b4100':
Add timeout for emergency calls
bb88252119b7963c3baf4a2dcc5e1d87003affcf 30-Jan-2015 mike dooley <mdooley@google.com> am f17a31c4: Merge "Fixing conference managment regression." into lmp-mr1-dev

* commit 'f17a31c46db212cfbd31116b54f4b98ffd6b5ca7':
Fixing conference managment regression.
f17a31c46db212cfbd31116b54f4b98ffd6b5ca7 30-Jan-2015 mike dooley <mdooley@google.com> Merge "Fixing conference managment regression." into lmp-mr1-dev
9ad2c5588ce833ccfa3d2afe09e3e19e261b4100 30-Jan-2015 Sailesh Nepal <sail@google.com> am 646fa3d6: Add timeout for emergency calls

* commit '646fa3d6eaea71fb4c3270fde1a30eeb7c5e4288':
Add timeout for emergency calls
646fa3d6eaea71fb4c3270fde1a30eeb7c5e4288 28-Jan-2015 Sailesh Nepal <sail@google.com> Add timeout for emergency calls

Currently connection managers are only able to route
emergency calls if the call can't be placed by the
normal phone account first.

Unfortunately this strategy only works for "fake" emergency
calls (for example when you set a fake number using
ril.ecclist).

When actually dialing "911" the call doesn't disconnect
even if there's no service. This means that the connection
manager never gets a chance to handle the call.

To fix this issue we're adding a timeout for emergency calls
if a connection manager is present. If after 25 seconds
the call is not yet active then we'll disconnect the call
and route it through the connection manager. The timeout
length is 60 seconds if the device is in airplane mode.
Both timeout values can be modified using config values.

To limit the impact of this change we've also added the
following extra condition:
- only use a connection manager if we have wifi
connectivity but no cellular connectivity

BUG: 19020123

Change-Id: Id2d740006cbf850db1cffb0d9f2aaca702ef1366
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/CreateConnectionTimeout.java
rc/com/android/server/telecom/Timeouts.java
bf9cd0e5f6b72668f84fe9e18373beca1086a238 30-Jan-2015 mike dooley <mdooley@google.com> Fixing conference managment regression.

This CL restores ag/553714 and adds a check to allow IMS conferences with 0 connections.

Bug: 17632595, 19184963, 19184481
Change-Id: I6a4c5d05b14e89cc4b335f45ed078e928c57abb3
rc/com/android/server/telecom/ConnectionServiceWrapper.java
5a264a9a673a4c384c9913634dede794e8605e51 26-Jan-2015 Nancy Chen <nancychen@google.com> am e0c247a1: am cafd2091: am 989947fc: Merge "PhoneAccount -> SubId for use in TelephonyManager#line1Number" into lmp-mr1-dev

* commit 'e0c247a15afffa6c7f7f30259fe9ee7a9a640d55':
PhoneAccount -> SubId for use in TelephonyManager#line1Number
e0c247a15afffa6c7f7f30259fe9ee7a9a640d55 26-Jan-2015 Nancy Chen <nancychen@google.com> am cafd2091: am 989947fc: Merge "PhoneAccount -> SubId for use in TelephonyManager#line1Number" into lmp-mr1-dev

* commit 'cafd209168b5d41662ae749530383acce987965c':
PhoneAccount -> SubId for use in TelephonyManager#line1Number
cafd209168b5d41662ae749530383acce987965c 26-Jan-2015 Nancy Chen <nancychen@google.com> am 989947fc: Merge "PhoneAccount -> SubId for use in TelephonyManager#line1Number" into lmp-mr1-dev

* commit '989947fc849a50c4a4e8b61f02b708b18b844e0d':
PhoneAccount -> SubId for use in TelephonyManager#line1Number
989947fc849a50c4a4e8b61f02b708b18b844e0d 26-Jan-2015 Nancy Chen <nancychen@google.com> Merge "PhoneAccount -> SubId for use in TelephonyManager#line1Number" into lmp-mr1-dev
ba304759d08cfe4995168b8eb359992ba97ccc89 25-Jan-2015 Nancy Chen <nancychen@google.com> PhoneAccount -> SubId for use in TelephonyManager#line1Number

Since we do not want to expose SubIds in the app layer, we need a
wrapper to extra the subId from a PhoneAccount and return the value of
TelephonyManager#line1Number. TelecomManager exposes the method, this is
the implementation.

Bug: 19087382
Change-Id: I4cb293e83baebfd135a01e2ffd0a86b22a3d8917
rc/com/android/server/telecom/TelecomService.java
cc8f9500faec3fbd99d8d9a4b8725d121942463d 22-Jan-2015 Nancy Chen <nancychen@google.com> am 727e3096: am 060f485d: am a6984072: Merge "Remove line to allow hiding SMS response from InCallUI in multiSIM." into lmp-mr1-dev

* commit '727e3096bb41fa84d2ac2c4d0b1c4b2bc81d2b03':
Remove line to allow hiding SMS response from InCallUI in multiSIM.
727e3096bb41fa84d2ac2c4d0b1c4b2bc81d2b03 22-Jan-2015 Nancy Chen <nancychen@google.com> am 060f485d: am a6984072: Merge "Remove line to allow hiding SMS response from InCallUI in multiSIM." into lmp-mr1-dev

* commit '060f485d8d72d9144010f40961a2a315d3402436':
Remove line to allow hiding SMS response from InCallUI in multiSIM.
060f485d8d72d9144010f40961a2a315d3402436 22-Jan-2015 Nancy Chen <nancychen@google.com> am a6984072: Merge "Remove line to allow hiding SMS response from InCallUI in multiSIM." into lmp-mr1-dev

* commit 'a698407215077ca783eb91459bbaa4f8f8ef40c5':
Remove line to allow hiding SMS response from InCallUI in multiSIM.
a698407215077ca783eb91459bbaa4f8f8ef40c5 22-Jan-2015 Nancy Chen <nancychen@google.com> Merge "Remove line to allow hiding SMS response from InCallUI in multiSIM." into lmp-mr1-dev
79d646f9a02d03f8cdc1dd81bb35cccbff09bf47 22-Jan-2015 Nancy Chen <nancychen@google.com> Remove line to allow hiding SMS response from InCallUI in multiSIM.

We sometimes will want to hide the SMS response option from the
InCallUI even if the subscription is able to send SMS messages. For
example in a multi-SIM phone where a call comes in to the non-default
SMS phone account. Remove a somewhat duplicate case of adding
CAPABILITY_RESPOND_VIA_SMS to handle this case.

Bug: 19034404
Change-Id: Ia2793c26a362de317e09ea0c5ea07f14fe326794
rc/com/android/server/telecom/InCallController.java
b7b22e8da533a011fadfe4de716b8f7571caa23e 19-Jan-2015 Geoff Mendal <mendal@google.com> am d2a8c1d8: (-s ours) am ffdc18a9: (-s ours) am 2808bb0a: (-s ours) Import translations. DO NOT MERGE

* commit 'd2a8c1d819565d7f2df2000824b31276bd6ad1f7':
Import translations. DO NOT MERGE
48a0b5a4abd6c265491c6bdd8e653508da434cfb 19-Jan-2015 Geoff Mendal <mendal@google.com> am c2526564: (-s ours) am 00e52d7b: (-s ours) Import translations. DO NOT MERGE

* commit 'c252656475260ca9dae008c9e7904ccf023db49c':
Import translations. DO NOT MERGE
d2a8c1d819565d7f2df2000824b31276bd6ad1f7 19-Jan-2015 Geoff Mendal <mendal@google.com> am ffdc18a9: (-s ours) am 2808bb0a: (-s ours) Import translations. DO NOT MERGE

* commit 'ffdc18a9daffa1077c4a044fca7156704cb6f55f':
Import translations. DO NOT MERGE
c252656475260ca9dae008c9e7904ccf023db49c 19-Jan-2015 Geoff Mendal <mendal@google.com> am 00e52d7b: (-s ours) Import translations. DO NOT MERGE

* commit '00e52d7b127184a6037d905dc3b991481a63f3ed':
Import translations. DO NOT MERGE
ffdc18a9daffa1077c4a044fca7156704cb6f55f 19-Jan-2015 Geoff Mendal <mendal@google.com> am 2808bb0a: (-s ours) Import translations. DO NOT MERGE

* commit '2808bb0a36a830fe2d60d5f3c7e0ca9850f4bf88':
Import translations. DO NOT MERGE
e614ec1ad74f28cf1cb95752988a5aa7fefb3eb1 19-Jan-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I70ad8a5b45de2a9ec557282041fcd3819050ff8b
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
00e52d7b127184a6037d905dc3b991481a63f3ed 19-Jan-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I8c1d471294716c6def69c8e5d83e59cc5f8ab9c2
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
2808bb0a36a830fe2d60d5f3c7e0ca9850f4bf88 19-Jan-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia58ec869f86fa15fe70597548e699675f0815f60
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
538917aad5b241e450f22dc68613dc44b32c15a8 16-Jan-2015 Santos Cordon <santoscordon@google.com> am 50899018: am f6ada0d4: am 32d4117c: Unplugging headset shouldn\'t stop Bluetooth.

* commit '508990186539107a24808d1cf5214d4842ee4b67':
Unplugging headset shouldn't stop Bluetooth.
508990186539107a24808d1cf5214d4842ee4b67 16-Jan-2015 Santos Cordon <santoscordon@google.com> am f6ada0d4: am 32d4117c: Unplugging headset shouldn\'t stop Bluetooth.

* commit 'f6ada0d4bcc5f82fb1b6584b567072b009ab1b77':
Unplugging headset shouldn't stop Bluetooth.
f6ada0d4bcc5f82fb1b6584b567072b009ab1b77 16-Jan-2015 Santos Cordon <santoscordon@google.com> am 32d4117c: Unplugging headset shouldn\'t stop Bluetooth.

* commit '32d4117cafae9d3af7da04cef13dfcf3b43ab514':
Unplugging headset shouldn't stop Bluetooth.
32d4117cafae9d3af7da04cef13dfcf3b43ab514 16-Jan-2015 Santos Cordon <santoscordon@google.com> Unplugging headset shouldn't stop Bluetooth.

When the headset was unplugged, we changes audio to earpiece even if the
audio was currently going through Bluetooth.

This change makes it so that we keep the current routing scheme when a
headset is unplugged unless the audio was actually going through the
wired earpiece. In that case, we go to either earpiece or speaker
depending on whether speaker was on prior to going to the wired headset.

Bug: 18823515
Change-Id: Ib12d669c2bcd8f4c8a95d450af6bcc28f15122f3
rc/com/android/server/telecom/CallAudioManager.java
37a2880ac1e0e4b9922c4b7b88a816eca3079df3 13-Jan-2015 Tyler Gunn <tgunn@google.com> am 82174563: am a9277f19: am 5b069901: Merge "Fix for call timer resetting when starting IMS conference call. 4/4" into lmp-mr1-dev

* commit '82174563b95b30b421c299cf097aacd2bb507312':
Fix for call timer resetting when starting IMS conference call. 4/4
82174563b95b30b421c299cf097aacd2bb507312 13-Jan-2015 Tyler Gunn <tgunn@google.com> am a9277f19: am 5b069901: Merge "Fix for call timer resetting when starting IMS conference call. 4/4" into lmp-mr1-dev

* commit 'a9277f19438448a393b5725a95a2a551846438f8':
Fix for call timer resetting when starting IMS conference call. 4/4
a9277f19438448a393b5725a95a2a551846438f8 13-Jan-2015 Tyler Gunn <tgunn@google.com> am 5b069901: Merge "Fix for call timer resetting when starting IMS conference call. 4/4" into lmp-mr1-dev

* commit '5b069901025c58f450d6d1eb29ffdf798db1ae00':
Fix for call timer resetting when starting IMS conference call. 4/4
5b069901025c58f450d6d1eb29ffdf798db1ae00 13-Jan-2015 Tyler Gunn <tgunn@google.com> Merge "Fix for call timer resetting when starting IMS conference call. 4/4" into lmp-mr1-dev
d77c29de777f1e7bbe9d38b4bd3393549391dd1f 13-Jan-2015 Geoff Mendal <mendal@google.com> am 54eb0b21: (-s ours) am 275da24d: (-s ours) am cca07e22: (-s ours) Import translations. DO NOT MERGE

* commit '54eb0b2101aeda80cacffa676af48004e1038a74':
Import translations. DO NOT MERGE
7cb85478d195be1534820482eb97697f9459bfbe 13-Jan-2015 Geoff Mendal <mendal@google.com> am 02bea7a8: (-s ours) am 5849b2a9: (-s ours) Import translations. DO NOT MERGE

* commit '02bea7a87b3e8b1e461766303aa2d7d982196f3b':
Import translations. DO NOT MERGE
54eb0b2101aeda80cacffa676af48004e1038a74 12-Jan-2015 Geoff Mendal <mendal@google.com> am 275da24d: (-s ours) am cca07e22: (-s ours) Import translations. DO NOT MERGE

* commit '275da24d52513763cc356943caa5b8c3f5931a0d':
Import translations. DO NOT MERGE
275da24d52513763cc356943caa5b8c3f5931a0d 12-Jan-2015 Geoff Mendal <mendal@google.com> am cca07e22: (-s ours) Import translations. DO NOT MERGE

* commit 'cca07e2243ff650d2199e0aae81a353815e3096b':
Import translations. DO NOT MERGE
02bea7a87b3e8b1e461766303aa2d7d982196f3b 12-Jan-2015 Geoff Mendal <mendal@google.com> am 5849b2a9: (-s ours) Import translations. DO NOT MERGE

* commit '5849b2a9bccbbce97e03fbd487a79405378f4a23':
Import translations. DO NOT MERGE
21b584f4aa5aba3c483c8106d3a301fea9347e2b 12-Jan-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I417c2e5e1a30df8b9382a5f2d976b638dfa8ca51
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
5849b2a9bccbbce97e03fbd487a79405378f4a23 12-Jan-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ib4e264bb3eb332de97185527d22fb24ee42ac4d3
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
cca07e2243ff650d2199e0aae81a353815e3096b 12-Jan-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I59eab3dc462029488ea139e3685ce155f2a0750d
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
52a1ecec97c30d23e5e9d1d345870bcb6a8a53b4 08-Jan-2015 Brian Carlstrom <bdc@google.com> Remove now unneeded Proguard workaround

Bug: 17550647
Change-Id: If372ee39c1e87772b1538c7f4026b5da57714a68
ndroid.mk
d92e73772327537fe65edda43ca0ceb6fc781e51 10-Jan-2015 Tyler Gunn <tgunn@google.com> Fix for call timer resetting when starting IMS conference call. 4/4

- Added support in Conference for specifying the connect time when the
conference is created.

Bug: 18959443
Change-Id: I7a0b9e65b955c53314f6b23a5543e0e161998da5
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
34b127f3286382cbecde2c58c645fce9bd5d700f 07-Jan-2015 Anthony Lee <anthonylee@google.com> am e5612698: am a5a4fecc: am 8f4711a9: Merge "Remove overflow menu for quick responses." into lmp-mr1-dev

* commit 'e56126989028b0546aeb217e4a5d7f9fd7ca5f41':
Remove overflow menu for quick responses.
e56126989028b0546aeb217e4a5d7f9fd7ca5f41 07-Jan-2015 Anthony Lee <anthonylee@google.com> am a5a4fecc: am 8f4711a9: Merge "Remove overflow menu for quick responses." into lmp-mr1-dev

* commit 'a5a4fecc27f09f27e1de350cc5ad9b9748ae2b37':
Remove overflow menu for quick responses.
a5a4fecc27f09f27e1de350cc5ad9b9748ae2b37 07-Jan-2015 Anthony Lee <anthonylee@google.com> am 8f4711a9: Merge "Remove overflow menu for quick responses." into lmp-mr1-dev

* commit '8f4711a936705b7edc0a37bae8f198c0d8b3ea82':
Remove overflow menu for quick responses.
8f4711a936705b7edc0a37bae8f198c0d8b3ea82 07-Jan-2015 Anthony Lee <anthonylee@google.com> Merge "Remove overflow menu for quick responses." into lmp-mr1-dev
a290b2aa9affd5967f8c1bcb3225123109a6064e 06-Jan-2015 Anthony Lee <anthonylee@google.com> Remove overflow menu for quick responses.

The existing overflow menu's only option to "Reset default app"
was supposed to reset the quick responses but it makes sense to
remove the menu instead of fixing the functionality at this
point in time.

Bug: 18567283
Change-Id: Ia4b2b56423666d456708602df5820d18ab3df6f5
es/menu/respond_via_message_settings_menu.xml
es/values/strings.xml
rc/com/android/server/telecom/RespondViaSmsSettings.java
6652caa6c151eff1f5cedcd38f0d32e8a5bac869 06-Jan-2015 Tyler Gunn <tgunn@google.com> am ce53c030: am 3926e3fb: am 3e59d689: Merge "Fixing unhold in CallsManager so it does not hold child calls." into lmp-mr1-dev

* commit 'ce53c030cdda08aaeaa49c2ea777adcdde9d8767':
Fixing unhold in CallsManager so it does not hold child calls.
ce53c030cdda08aaeaa49c2ea777adcdde9d8767 06-Jan-2015 Tyler Gunn <tgunn@google.com> am 3926e3fb: am 3e59d689: Merge "Fixing unhold in CallsManager so it does not hold child calls." into lmp-mr1-dev

* commit '3926e3fb29abc3efbb083c90991075b6457b064c':
Fixing unhold in CallsManager so it does not hold child calls.
3926e3fb29abc3efbb083c90991075b6457b064c 06-Jan-2015 Tyler Gunn <tgunn@google.com> am 3e59d689: Merge "Fixing unhold in CallsManager so it does not hold child calls." into lmp-mr1-dev

* commit '3e59d689d08b921244c0a8c2e7761a242c59a3d0':
Fixing unhold in CallsManager so it does not hold child calls.
3e59d689d08b921244c0a8c2e7761a242c59a3d0 06-Jan-2015 Tyler Gunn <tgunn@google.com> Merge "Fixing unhold in CallsManager so it does not hold child calls." into lmp-mr1-dev
f841d59fb4a3a362d4401dd4a0f4f93f74f1d187 05-Jan-2015 Andrew Lee <anwlee@google.com> am ad807f14: am 923a2d16: am 811ad27d: Merge "Disconnect held call when answering third call." into lmp-mr1-dev

* commit 'ad807f14f5d9b66bf34602373c03e6d33b962747':
Disconnect held call when answering third call.
ad807f14f5d9b66bf34602373c03e6d33b962747 05-Jan-2015 Andrew Lee <anwlee@google.com> am 923a2d16: am 811ad27d: Merge "Disconnect held call when answering third call." into lmp-mr1-dev

* commit '923a2d1692c1bbbd116b70e8e222b5ffe9cf7626':
Disconnect held call when answering third call.
923a2d1692c1bbbd116b70e8e222b5ffe9cf7626 05-Jan-2015 Andrew Lee <anwlee@google.com> am 811ad27d: Merge "Disconnect held call when answering third call." into lmp-mr1-dev

* commit '811ad27dabf38d305ff94cc41fc266d774821ddb':
Disconnect held call when answering third call.
811ad27dabf38d305ff94cc41fc266d774821ddb 05-Jan-2015 Andrew Lee <anwlee@google.com> Merge "Disconnect held call when answering third call." into lmp-mr1-dev
e94a8f1e28be35d538e1e485753b122ce7908e98 20-Dec-2014 Andrew Lee <anwlee@google.com> Disconnect held call when answering third call.

When accepting a call when there was already both an active
and held call, the CallsManager tried to hold the active call, and
then answer the new incoming call. But since there were still two
calls tracked by the calls manager, the answer failed.

To fix, if we are attempting to hold the active call before accepting
a new call, if there is a pre-existing held call disconnect that held
call before holding the active call.

Bug: 17318947
Change-Id: I78e5899c5f0344af0245b77827df75f9dde683b4
rc/com/android/server/telecom/CallsManager.java
f818b4dc8408f7fc9b9ac916f5377399570945c8 05-Jan-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I5c6cb3445240f0603e83d28e90b19dc25ea9b7f8
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
e44adb45088cc8fa199731a7f8cb0a5359028961 02-Jan-2015 Tyler Gunn <tgunn@google.com> Fixing unhold in CallsManager so it does not hold child calls.

There was an issue (see bug) where a conference could not be held in order
to swap with a held single party call.
Looking at how the CallsManager code works, we hold all calls including
the child calls of a conference. In Telephony, the TelephonyConference
code invokes hold on the first child-connection in the conference.
Changed the code so that the child calls are not held in Telecom.

Bug: 18793259
Change-Id: I83cde7be1e006fbd05ba79c13ee1a1138b1ae593
rc/com/android/server/telecom/CallsManager.java
48cc5de70c2b4e6afef44c49cb17dde7a4832371 31-Dec-2014 Shriram Ganesh <sganesh@codeaurora.org> am 1c350b4e: am ad344d00: am 0b4e8a27: Add support to clean up calls that are alive

* commit '1c350b4ed86e1df4c579e73e8279f7c211bb5c66':
Add support to clean up calls that are alive
1c350b4ed86e1df4c579e73e8279f7c211bb5c66 31-Dec-2014 Shriram Ganesh <sganesh@codeaurora.org> am ad344d00: am 0b4e8a27: Add support to clean up calls that are alive

* commit 'ad344d00b945bd32f963c943b76edd2d24c69b94':
Add support to clean up calls that are alive
ad344d00b945bd32f963c943b76edd2d24c69b94 31-Dec-2014 Shriram Ganesh <sganesh@codeaurora.org> am 0b4e8a27: Add support to clean up calls that are alive

* commit '0b4e8a270b9899c405b0c0a93ccbfe5b0835d58e':
Add support to clean up calls that are alive
0b4e8a270b9899c405b0c0a93ccbfe5b0835d58e 30-Dec-2014 Shriram Ganesh <sganesh@codeaurora.org> Add support to clean up calls that are alive

Remove request for a call does not correctly clean up the calls
that are alive and in non-active states such as held state. Add
support for such calls in this change.

Bug: 18804667
Change-Id: I17b13c933e2af401ed007a338fbaf2a181abc0ae
rc/com/android/server/telecom/ConnectionServiceWrapper.java
7d1fa3ac98512c12d810dc0a0cea911821fec588 29-Dec-2014 Santos Cordon <santoscordon@google.com> am c70c5016: am 54a8266d: am 4ba27e91: Set Quick Response pref as MULTI_PROCESS.

* commit 'c70c50161b93f06c0350ca4039d8a6e3844be042':
Set Quick Response pref as MULTI_PROCESS.
c70c50161b93f06c0350ca4039d8a6e3844be042 26-Dec-2014 Santos Cordon <santoscordon@google.com> am 54a8266d: am 4ba27e91: Set Quick Response pref as MULTI_PROCESS.

* commit '54a8266d95e7c215b74badce196cbc1847611382':
Set Quick Response pref as MULTI_PROCESS.
54a8266d95e7c215b74badce196cbc1847611382 23-Dec-2014 Santos Cordon <santoscordon@google.com> am 4ba27e91: Set Quick Response pref as MULTI_PROCESS.

* commit '4ba27e919d7b5cdf6ebb42eec1796f838565c1a7':
Set Quick Response pref as MULTI_PROCESS.
4ba27e919d7b5cdf6ebb42eec1796f838565c1a7 23-Dec-2014 Santos Cordon <santoscordon@google.com> Set Quick Response pref as MULTI_PROCESS.

Since telecom runs in a different process from the settings activity, it
can sometimes read a cached value for the quick responses. Adding this
flag ensures that it checks the backing file for modification to
prevent using stale values.

Bug: 18828265
Change-Id: Ib3d5ae282a8eca45648d58e69bc9670d6ff6e211
rc/com/android/server/telecom/RespondViaSmsManager.java
43e457879d216ef2dfef48f9618114b93e10af6f 19-Dec-2014 Tyler Gunn <tgunn@google.com> am 4d184893: am 2a50c988: am 3dc66997: Merge "Fixing Telecom state dumping." into lmp-mr1-dev

* commit '4d184893d39e690c10cd7a8e64237ea14a40ec08':
Fixing Telecom state dumping.
62826eb93116ee3398c56c8e0693c2e0c1d44db1 19-Dec-2014 Anju Mathapati <anjucm@quicinc.com> am 62d18d5f: am f22c524d: am c88574c7: IMS: Add phoneaccount to ims conference call.

* commit '62d18d5f3c7087f3e659964b415c498d17f747f1':
IMS: Add phoneaccount to ims conference call.
4d184893d39e690c10cd7a8e64237ea14a40ec08 18-Dec-2014 Tyler Gunn <tgunn@google.com> am 2a50c988: am 3dc66997: Merge "Fixing Telecom state dumping." into lmp-mr1-dev

* commit '2a50c98845b408d7a8cd9d891031a5e6a576e4af':
Fixing Telecom state dumping.
2a50c98845b408d7a8cd9d891031a5e6a576e4af 18-Dec-2014 Tyler Gunn <tgunn@google.com> am 3dc66997: Merge "Fixing Telecom state dumping." into lmp-mr1-dev

* commit '3dc66997190911a5a0a8fa4a4a16550136255b76':
Fixing Telecom state dumping.
3dc66997190911a5a0a8fa4a4a16550136255b76 18-Dec-2014 Tyler Gunn <tgunn@google.com> Merge "Fixing Telecom state dumping." into lmp-mr1-dev
62d18d5f3c7087f3e659964b415c498d17f747f1 18-Dec-2014 Anju Mathapati <anjucm@quicinc.com> am f22c524d: am c88574c7: IMS: Add phoneaccount to ims conference call.

* commit 'f22c524d9d4a9adede1ac10f71540899ec6f66ff':
IMS: Add phoneaccount to ims conference call.
f22c524d9d4a9adede1ac10f71540899ec6f66ff 18-Dec-2014 Anju Mathapati <anjucm@quicinc.com> am c88574c7: IMS: Add phoneaccount to ims conference call.

* commit 'c88574c74d48ec6d660cbe2563c826521d95e92b':
IMS: Add phoneaccount to ims conference call.
476898696befd384e92532aabb45be5c81efa9f6 18-Dec-2014 Tyler Gunn <tgunn@google.com> Fixing Telecom state dumping.

When migration to system service was performed, the dump method was
put in the outer "service" class, where it belongs in the stub
implementation.

Bug: 18792141
Change-Id: I38a1c1b79160f296d65641151b93c91adf46b37e
rc/com/android/server/telecom/TelecomService.java
c88574c74d48ec6d660cbe2563c826521d95e92b 16-Dec-2014 Anju Mathapati <anjucm@quicinc.com> IMS: Add phoneaccount to ims conference call.

Retrieve phoneaccount from ParcelableConference coming from
TeleService and set that account to Telecom Conference call.
This prevents hold and dial request from getting invoked from
Telecom during adding a call on top of an existing ims 3 way
conference call.

Bug: 18690773
Change-Id: Ie02e12c77272c2c889b1c7377e0bf461e67a1abd
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
1c317e56665bebd8f77c84b75452e2be4f0d634f 17-Dec-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Id4667d243c3846db3b34c3a81529cc30cf8c4798
Auto-generated-cl: translation import
es/values-da/strings.xml
96266f1389cb950898bde4605571313380e2e9e4 17-Dec-2014 Nancy Chen <nancychen@google.com> am a5015efe: am 4eb99014: am 386b5f9c: Merge "Play DTMF tones when sending DTMF tones during post dial wait." into lmp-mr1-dev

* commit 'a5015efeaf13191201e4ccb9cbca3c2d77ef9b99':
Play DTMF tones when sending DTMF tones during post dial wait.
a5015efeaf13191201e4ccb9cbca3c2d77ef9b99 17-Dec-2014 Nancy Chen <nancychen@google.com> am 4eb99014: am 386b5f9c: Merge "Play DTMF tones when sending DTMF tones during post dial wait." into lmp-mr1-dev

* commit '4eb99014a5d643908cec9749a8f36f3be16f7440':
Play DTMF tones when sending DTMF tones during post dial wait.
4eb99014a5d643908cec9749a8f36f3be16f7440 17-Dec-2014 Nancy Chen <nancychen@google.com> am 386b5f9c: Merge "Play DTMF tones when sending DTMF tones during post dial wait." into lmp-mr1-dev

* commit '386b5f9cae7ba9f5700d604fadf61157e79d8fae':
Play DTMF tones when sending DTMF tones during post dial wait.
386b5f9cae7ba9f5700d604fadf61157e79d8fae 17-Dec-2014 Nancy Chen <nancychen@google.com> Merge "Play DTMF tones when sending DTMF tones during post dial wait." into lmp-mr1-dev
a469f76c1710a945933910840f11f9fda0445d82 10-Dec-2014 Nancy Chen <nancychen@google.com> Play DTMF tones when sending DTMF tones during post dial wait.

Regression from KK -- when adding additional digits to a number limited
with a wait character (";"), the local DTMF player should make those
sounds audible to the caller.

Bug: 18644688
Change-Id: Ib04658316f725146a65b399d3f477791260c3f5a
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/Timeouts.java
75256907e927c38c633be6cff22883cc584f1ffc 16-Dec-2014 Santos Cordon <santoscordon@google.com> am bd4de475: am e9ac3082: am 581ec4ab: Make telecom a non-persistent process.

* commit 'bd4de4759c68b5a5eb5c5351bdbbe8815470b6cd':
Make telecom a non-persistent process.
bd4de4759c68b5a5eb5c5351bdbbe8815470b6cd 16-Dec-2014 Santos Cordon <santoscordon@google.com> am e9ac3082: am 581ec4ab: Make telecom a non-persistent process.

* commit 'e9ac3082c1a9f92459a75e41b43ed7b797d13a09':
Make telecom a non-persistent process.
e9ac3082c1a9f92459a75e41b43ed7b797d13a09 16-Dec-2014 Santos Cordon <santoscordon@google.com> am 581ec4ab: Make telecom a non-persistent process.

* commit '581ec4ab2ec8c039b715f130e26e1940bb9d5946':
Make telecom a non-persistent process.
581ec4ab2ec8c039b715f130e26e1940bb9d5946 15-Dec-2014 Santos Cordon <santoscordon@google.com> Make telecom a non-persistent process.

There are still activities that run in short-lived telecom processes
because the system process doesn't run activities. By having
persistent=true, these short-lived processes ended up living forever.
For the components that run in the system process, things should remain
unchanged since the system process is already persistent.

Bug: 18112269
Change-Id: I0cc59119dc421e1d3dd4c63440487bdd7ce99b9d
ndroidManifest.xml
770be67b447f205545ad5314d91f262959d2bb9c 12-Dec-2014 Wink Saville <wink@google.com> am 804c8f36: am bc4a330b: am fe363344: Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

* commit '804c8f36cdb0d8334293c08a036395418fa0ddcf':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
804c8f36cdb0d8334293c08a036395418fa0ddcf 12-Dec-2014 Wink Saville <wink@google.com> am bc4a330b: am fe363344: Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

* commit 'bc4a330bb42a6e28dedecfd2511853d2de5f9d8a':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
bc4a330bb42a6e28dedecfd2511853d2de5f9d8a 12-Dec-2014 Wink Saville <wink@google.com> am fe363344: Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

* commit 'fe363344269905f5ec433144f3590eeacd58f4b7':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
fe363344269905f5ec433144f3590eeacd58f4b7 11-Dec-2014 Wink Saville <wink@google.com> Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
rc/com/android/server/telecom/RespondViaSmsManager.java
7ebeb5f95fcf33cd7f310c94418149fa622f503e 11-Dec-2014 Ihab Awad <ihab@google.com> am 9edcc971: am 933e1e0f: am 398893b4: Remove android:debuggable from manifest

* commit '9edcc97138f8e4cf6537d07dee5828c7b83ad3f7':
Remove android:debuggable from manifest
9edcc97138f8e4cf6537d07dee5828c7b83ad3f7 11-Dec-2014 Ihab Awad <ihab@google.com> am 933e1e0f: am 398893b4: Remove android:debuggable from manifest

* commit '933e1e0fefa23a84518c70991355f91dc4da7408':
Remove android:debuggable from manifest
933e1e0fefa23a84518c70991355f91dc4da7408 11-Dec-2014 Ihab Awad <ihab@google.com> am 398893b4: Remove android:debuggable from manifest

* commit '398893b4e3f5241ade69fac145966ae0eb3f1197':
Remove android:debuggable from manifest
398893b4e3f5241ade69fac145966ae0eb3f1197 11-Dec-2014 Ihab Awad <ihab@google.com> Remove android:debuggable from manifest

Bug: 18707423
Change-Id: Ic9f29ad3c6f4505ddde3d7ba2ad0b97521dd943b
ndroidManifest.xml
675269876f2c8ae554c6ef94fcfbb76ca04537c9 10-Dec-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I42190e3c803f4983124b256740e1571158a26877
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
458ac2bf1dd53167aa410587451f9aa18db0018c 10-Dec-2014 Santos Cordon <santoscordon@google.com> am 5efde397: am ce1d81c6: am e6a33f2e: (Telecom-system part 4) Move telecom to the system server process.

* commit '5efde3973b8b89651c650262f6c92b0b08936fb2':
(Telecom-system part 4) Move telecom to the system server process.
3c4d40036b503b124cfe26a58ae2ef6150bee243 10-Dec-2014 Santos Cordon <santoscordon@google.com> am de7bbdef: am 4625edd0: am 9d29ded2: Merge "(Telecom-system part 2) Move telecom intialization from application to service." into lmp-mr1-dev

* commit 'de7bbdefd359b67be0e169131ff8e5fce8eff561':
(Telecom-system part 2) Move telecom intialization from application to service.
bb0c7186842f827250f521599593bfcfbabfd2c5 10-Dec-2014 Santos Cordon <santoscordon@google.com> am 708f9982: am 1a67c738: am 8afd76dc: Merge "(Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals." into lmp-mr1-dev

* commit '708f9982e7f9ba69a17d4bd5320cf56692fd8df2':
(Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals.
d0c4f6e24c32ef68a9ea54c93b4bf52d71c2058b 10-Dec-2014 Yorke Lee <yorkelee@google.com> am 815c8415: am 4188df71: am ffcffb39: Merge "Update missed calls in background" into lmp-mr1-dev

* commit '815c841512712f462d8efe48f1effbfc6fbbfa04':
Update missed calls in background
19fa8050180d2c4fe5b22f1910996b2cb07c23e4 10-Dec-2014 Yorke Lee <yorkelee@google.com> am 94e292c4: am 59228aef: am 0c8b973e: Merge "Turn off SYSTRACE_DEBUG" into lmp-mr1-dev

* commit '94e292c48df77164a84d967d2b7fdea34022527f':
Turn off SYSTRACE_DEBUG
b31abc317da1796f3fb820d09d120ddd14d3316e 10-Dec-2014 Geoff Mendal <mendal@google.com> am 17b12f2e: (-s ours) am 43377bc9: (-s ours) am 359bd96c: (-s ours) Import translations. DO NOT MERGE

* commit '17b12f2eefcb91de02966b1543c6909b16e82ecb':
Import translations. DO NOT MERGE
c7fba5ea9c8930e50e16d0073e236337827e64bc 10-Dec-2014 Geoff Mendal <mendal@google.com> am 59da9683: (-s ours) am e7895ecf: (-s ours) Import translations. DO NOT MERGE

* commit '59da9683d2037119d595e1fcf847bd70b38a7299':
Import translations. DO NOT MERGE
825a6e5d6f599cdec4697b8f4640a7a3b709cdb5 10-Dec-2014 Evan Charlton <evanc@google.com> am 3743e207: am 51023d99: am 105d9776: Track (and use) UserHandle to make connections

* commit '3743e20789a35dd9579bd25c450b7509bdeffd06':
Track (and use) UserHandle to make connections
40288058b391326bb45a18d9e1405fd01a370276 09-Dec-2014 Nancy Chen <nancychen@google.com> am 22c9fa97: am 5814d9bf: am 4ec83c02: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)" into lmp-mr1-dev

* commit '22c9fa975a6dd3bad80050667b6b5706f0525ccd':
Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)
4dc5edf48294b63e70c7ba6d6710008604e15b52 09-Dec-2014 Yorke Lee <yorkelee@google.com> am a4b27873: am 809feadc: am cf75232f: Merge "Improve outgoing call UI responsiveness" into lmp-mr1-dev

* commit 'a4b27873ae2b18bdddbeafaad98d2efec7f9eba9':
Improve outgoing call UI responsiveness
5efde3973b8b89651c650262f6c92b0b08936fb2 09-Dec-2014 Santos Cordon <santoscordon@google.com> am ce1d81c6: am e6a33f2e: (Telecom-system part 4) Move telecom to the system server process.

* commit 'ce1d81c697f30f2556aefa5c1a450a39a9dbe1e6':
(Telecom-system part 4) Move telecom to the system server process.
de7bbdefd359b67be0e169131ff8e5fce8eff561 09-Dec-2014 Santos Cordon <santoscordon@google.com> am 4625edd0: am 9d29ded2: Merge "(Telecom-system part 2) Move telecom intialization from application to service." into lmp-mr1-dev

* commit '4625edd007e7f6270469e127698c6eb892024696':
(Telecom-system part 2) Move telecom intialization from application to service.
708f9982e7f9ba69a17d4bd5320cf56692fd8df2 09-Dec-2014 Santos Cordon <santoscordon@google.com> am 1a67c738: am 8afd76dc: Merge "(Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals." into lmp-mr1-dev

* commit '1a67c738032ff5e8c7d134a15cf89daaff1a130b':
(Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals.
815c841512712f462d8efe48f1effbfc6fbbfa04 09-Dec-2014 Yorke Lee <yorkelee@google.com> am 4188df71: am ffcffb39: Merge "Update missed calls in background" into lmp-mr1-dev

* commit '4188df713d21eae8c034a7f5ed5bc84eed6f3bd9':
Update missed calls in background
ce1d81c697f30f2556aefa5c1a450a39a9dbe1e6 09-Dec-2014 Santos Cordon <santoscordon@google.com> am e6a33f2e: (Telecom-system part 4) Move telecom to the system server process.

* commit 'e6a33f2e9ec77f900260a50242d657668706c0ae':
(Telecom-system part 4) Move telecom to the system server process.
4625edd007e7f6270469e127698c6eb892024696 09-Dec-2014 Santos Cordon <santoscordon@google.com> am 9d29ded2: Merge "(Telecom-system part 2) Move telecom intialization from application to service." into lmp-mr1-dev

* commit '9d29ded21a24d9065c532a213798c7d7beef5f99':
(Telecom-system part 2) Move telecom intialization from application to service.
1a67c738032ff5e8c7d134a15cf89daaff1a130b 09-Dec-2014 Santos Cordon <santoscordon@google.com> am 8afd76dc: Merge "(Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals." into lmp-mr1-dev

* commit '8afd76dc4bee913834d4d29fabc1a3edb257e20d':
(Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals.
4188df713d21eae8c034a7f5ed5bc84eed6f3bd9 09-Dec-2014 Yorke Lee <yorkelee@google.com> am ffcffb39: Merge "Update missed calls in background" into lmp-mr1-dev

* commit 'ffcffb3968f576a1be5bbdb71000ccc02dd30aec':
Update missed calls in background
e6a33f2e9ec77f900260a50242d657668706c0ae 02-Dec-2014 Santos Cordon <santoscordon@google.com> (Telecom-system part 4) Move telecom to the system server process.

Also remove TelecomApp since it is no longer run/necessary after this
change.

Bug: 18112269
Change-Id: I901023a2333b5c664cd2dc314d2df638355e9d41
ndroidManifest.xml
rc/com/android/server/telecom/CallActivity.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomApp.java
rc/com/android/server/telecom/TelecomGlobals.java
rc/com/android/server/telecom/TelecomService.java
9d29ded21a24d9065c532a213798c7d7beef5f99 09-Dec-2014 Santos Cordon <santoscordon@google.com> Merge "(Telecom-system part 2) Move telecom intialization from application to service." into lmp-mr1-dev
8afd76dc4bee913834d4d29fabc1a3edb257e20d 09-Dec-2014 Santos Cordon <santoscordon@google.com> Merge "(Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals." into lmp-mr1-dev
f987d1a6f1d02164210a70b417db2bc14576236c 02-Dec-2014 Santos Cordon <santoscordon@google.com> (Telecom-system part 2) Move telecom intialization from application to service.

Instead of having TelecomApp initialize the global state of telecom, it
will bind to the telecom service and the service itself will
initialize the global state. This prepares telecom to run in the system
process since at that point TelecomAppw will stop running and the
framework will need to use the telecom service to start the global state.

Bug: 18112269
Change-Id: I76cd520e55ba2f58915ea2a7938cffd3cc101bab
ndroidManifest.xml
rc/com/android/server/telecom/TelecomApp.java
rc/com/android/server/telecom/TelecomGlobals.java
rc/com/android/server/telecom/TelecomService.java
rc/com/android/server/telecom/TelecomServiceImpl.java
0b5cb4d0036a45725d4a3250fe8475599a31a202 02-Dec-2014 Santos Cordon <santoscordon@google.com> (Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals.

TelecomApp will no longer function once telecom moves to a shared
process so we need an alternative for initializing global state. This
change moves everything in TelecomApp to TelecomGlobals.

Bug: 18112269
Change-Id: I79b5e7a3337adb6bae55ebe22c5a8f8506391ef3
rc/com/android/server/telecom/BluetoothPhoneService.java
rc/com/android/server/telecom/TelecomApp.java
rc/com/android/server/telecom/TelecomGlobals.java
ffcffb3968f576a1be5bbdb71000ccc02dd30aec 08-Dec-2014 Yorke Lee <yorkelee@google.com> Merge "Update missed calls in background" into lmp-mr1-dev
94e292c48df77164a84d967d2b7fdea34022527f 08-Dec-2014 Yorke Lee <yorkelee@google.com> am 59228aef: am 0c8b973e: Merge "Turn off SYSTRACE_DEBUG" into lmp-mr1-dev

* commit '59228aefaf45f49bfd89b6aeb213c4c95e8212c9':
Turn off SYSTRACE_DEBUG
17b12f2eefcb91de02966b1543c6909b16e82ecb 08-Dec-2014 Geoff Mendal <mendal@google.com> am 43377bc9: (-s ours) am 359bd96c: (-s ours) Import translations. DO NOT MERGE

* commit '43377bc9b51cf9a526f87ea4c404e0df28bcf3e7':
Import translations. DO NOT MERGE
59da9683d2037119d595e1fcf847bd70b38a7299 08-Dec-2014 Geoff Mendal <mendal@google.com> am e7895ecf: (-s ours) Import translations. DO NOT MERGE

* commit 'e7895ecfd57a72d5d1aaf03b77ce215b41a00f87':
Import translations. DO NOT MERGE
3743e20789a35dd9579bd25c450b7509bdeffd06 08-Dec-2014 Evan Charlton <evanc@google.com> am 51023d99: am 105d9776: Track (and use) UserHandle to make connections

* commit '51023d99083dec0144e3f854d0d6a8357896c0f2':
Track (and use) UserHandle to make connections
22c9fa975a6dd3bad80050667b6b5706f0525ccd 08-Dec-2014 Nancy Chen <nancychen@google.com> am 5814d9bf: am 4ec83c02: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)" into lmp-mr1-dev

* commit '5814d9bf34cfbdc3266ce8ff6a9a590553983a64':
Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)
a4b27873ae2b18bdddbeafaad98d2efec7f9eba9 08-Dec-2014 Yorke Lee <yorkelee@google.com> am 809feadc: am cf75232f: Merge "Improve outgoing call UI responsiveness" into lmp-mr1-dev

* commit '809feadca72359643bedf6d2e48728895abde983':
Improve outgoing call UI responsiveness
59228aefaf45f49bfd89b6aeb213c4c95e8212c9 08-Dec-2014 Yorke Lee <yorkelee@google.com> am 0c8b973e: Merge "Turn off SYSTRACE_DEBUG" into lmp-mr1-dev

* commit '0c8b973edc41421a238cd84ab4460cb4aec75878':
Turn off SYSTRACE_DEBUG
0c8b973edc41421a238cd84ab4460cb4aec75878 08-Dec-2014 Yorke Lee <yorkelee@google.com> Merge "Turn off SYSTRACE_DEBUG" into lmp-mr1-dev
43377bc9b51cf9a526f87ea4c404e0df28bcf3e7 08-Dec-2014 Geoff Mendal <mendal@google.com> am 359bd96c: (-s ours) Import translations. DO NOT MERGE

* commit '359bd96c266abbe7e7784655d4772c96b29e6be6':
Import translations. DO NOT MERGE
cb44990bf4c13e1cd01e7ae82aa295fc55bb651d 08-Dec-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ie3dab268ccca98d4cd3c2c85b6dafb3be84687dd
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
e7895ecfd57a72d5d1aaf03b77ce215b41a00f87 08-Dec-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I9c11c584dad89a2ac20ed0e77ea83061c13fa3d9
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
359bd96c266abbe7e7784655d4772c96b29e6be6 08-Dec-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I343f3a5744c7e835893d6150e92ce8adb7fd3cdb
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
51023d99083dec0144e3f854d0d6a8357896c0f2 06-Dec-2014 Evan Charlton <evanc@google.com> am 105d9776: Track (and use) UserHandle to make connections

* commit '105d977687d1d0de7cd9420fc140b01404261df1':
Track (and use) UserHandle to make connections
105d977687d1d0de7cd9420fc140b01404261df1 25-Nov-2014 Evan Charlton <evanc@google.com> Track (and use) UserHandle to make connections

When binding to services, use the UserHandle which registered the
PhoneAccount in order to ensure that the correct user receives the
Intent.

Also make sure that TelecomManager does not leak PhoneAccounts across
profiles, unless the caller is a system-privileged app. PhoneAccounts
will not leak across users, even for system-privileged apps.

Bug: 17421902
Bug: 17421044
Change-Id: I673904a7ae038c88688bba62642e93174e55c308
rc/com/android/server/telecom/ConnectionServiceRepository.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/ServiceBinder.java
rc/com/android/server/telecom/TelecomApp.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
ae11a97ed4c52c6d40bccc7e833320ae79e879fe 05-Dec-2014 Yorke Lee <yorkelee@google.com> Update missed calls in background

Bug: 18641722
Change-Id: I4cff5b181b7136a28abe087a86a1b61ec117178e
rc/com/android/server/telecom/MissedCallNotifier.java
5814d9bf34cfbdc3266ce8ff6a9a590553983a64 05-Dec-2014 Nancy Chen <nancychen@google.com> am 4ec83c02: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)" into lmp-mr1-dev

* commit '4ec83c0245771e63665494cc29cc27e5567209bc':
Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)
4ec83c0245771e63665494cc29cc27e5567209bc 05-Dec-2014 Nancy Chen <nancychen@google.com> Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)" into lmp-mr1-dev
809feadca72359643bedf6d2e48728895abde983 05-Dec-2014 Yorke Lee <yorkelee@google.com> am cf75232f: Merge "Improve outgoing call UI responsiveness" into lmp-mr1-dev

* commit 'cf75232f5d4a51d34a52671bee68bd2935aba149':
Improve outgoing call UI responsiveness
cf75232f5d4a51d34a52671bee68bd2935aba149 05-Dec-2014 Yorke Lee <yorkelee@google.com> Merge "Improve outgoing call UI responsiveness" into lmp-mr1-dev
641a71c4b38cab0fd4a0664a0ced8ce6deea54b6 05-Dec-2014 Geoff Mendal <mendal@google.com> am 712e5b88: (-s ours) am 99816c1d: (-s ours) am e48121ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '712e5b885381bc7c2cfd684941e087d5f2e9e6ef':
Import translations. DO NOT MERGE
abbb9e6236c6710b89f5fdf7695c0160a143a3d9 05-Dec-2014 Sailesh Nepal <sail@google.com> am e2f6024c: am 290c7379: am a2e1cebe: Merge "Fix fallback for emergency calls" into lmp-mr1-dev

* commit 'e2f6024c2e19bf3cfe100accba5db92b1c9b9636':
Fix fallback for emergency calls
1fdab8a00e601f19d7578c897bfd63d44704cb9b 04-Dec-2014 Nancy Chen <nancychen@google.com> Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)

Since we don't want the phone app to call TelephonyManager methods
directly, create a method in TelecomManager to mimic the behavior. The
reason we don't return the voicemail number directly is because once
TelecomManager becomes public, we don't want any old app to be able to
get the SIM's voicemail number.

Bug: 18233678

Change-Id: I7eb9a60ab65aababeef7da7bce3b035dcaa1ad1d
rc/com/android/server/telecom/TelecomServiceImpl.java
712e5b885381bc7c2cfd684941e087d5f2e9e6ef 04-Dec-2014 Geoff Mendal <mendal@google.com> am 99816c1d: (-s ours) am e48121ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '99816c1d6e6cd42888ef1c62ac9974e14e244e5f':
Import translations. DO NOT MERGE
e2f6024c2e19bf3cfe100accba5db92b1c9b9636 04-Dec-2014 Sailesh Nepal <sail@google.com> am 290c7379: am a2e1cebe: Merge "Fix fallback for emergency calls" into lmp-mr1-dev

* commit '290c7379f93ead6c2ed0995fb29eceed22d6d7ab':
Fix fallback for emergency calls
5552c938a7b37a01aac8936941d4b9c8adefe414 04-Dec-2014 Geoff Mendal <mendal@google.com> am 83ff8c53: (-s ours) am fc7de71e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '83ff8c534bea7560266e7931f6cca8c3a85182e2':
Import translations. DO NOT MERGE
4612f6055c37cc82b9469c76d02c02e329dcee44 04-Dec-2014 Anthony Lee <anthonylee@google.com> am c884a6b5: am 7786e055: am 0d79b684: Merge "Maintain Full Wake Lock while an incoming call is ringing." into lmp-mr1-dev

* commit 'c884a6b547d8126306ca0d812d42f6d48218c036':
Maintain Full Wake Lock while an incoming call is ringing.
83ff8c534bea7560266e7931f6cca8c3a85182e2 04-Dec-2014 Geoff Mendal <mendal@google.com> am fc7de71e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit 'fc7de71e2c9399b39b94c00797c294d711acdf8e':
Import translations. DO NOT MERGE
c884a6b547d8126306ca0d812d42f6d48218c036 04-Dec-2014 Anthony Lee <anthonylee@google.com> am 7786e055: am 0d79b684: Merge "Maintain Full Wake Lock while an incoming call is ringing." into lmp-mr1-dev

* commit '7786e055e43d3760694982c336071d117eb54eea':
Maintain Full Wake Lock while an incoming call is ringing.
ba17c7002f363957bfdfd4f25d143abde48f75bc 04-Dec-2014 Andrew Lee <anwlee@google.com> am a1c4f8d4: am 43396b87: am 1bf97f52: Merge "Don\'t show add if there is an outgoing call." into lmp-mr1-dev

* commit 'a1c4f8d47b17a1d2054bbe2f6143dfdb07775d18':
Don't show add if there is an outgoing call.
f01f86a85308d753b3bc85dcc6b17938307f0111 04-Dec-2014 Nancy Chen <nancychen@google.com> am 8141039b: am 8182537f: am 7ac515a2: Merge "Use AudioManager.MODE_NORMAL when selecting account from dialog." into lmp-mr1-dev

* commit '8141039bf7c949e9908ae400c29559178e30871b':
Use AudioManager.MODE_NORMAL when selecting account from dialog.
99816c1d6e6cd42888ef1c62ac9974e14e244e5f 04-Dec-2014 Geoff Mendal <mendal@google.com> am e48121ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'e48121ed5f3a6edf1bd988951e8845a2ab100472':
Import translations. DO NOT MERGE
290c7379f93ead6c2ed0995fb29eceed22d6d7ab 04-Dec-2014 Sailesh Nepal <sail@google.com> am a2e1cebe: Merge "Fix fallback for emergency calls" into lmp-mr1-dev

* commit 'a2e1cebe4b42dc4b4188d0d916bfcee468a77ac5':
Fix fallback for emergency calls
fc7de71e2c9399b39b94c00797c294d711acdf8e 04-Dec-2014 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
e48121ed5f3a6edf1bd988951e8845a2ab100472 04-Dec-2014 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
a2e1cebe4b42dc4b4188d0d916bfcee468a77ac5 04-Dec-2014 Sailesh Nepal <sail@google.com> Merge "Fix fallback for emergency calls" into lmp-mr1-dev
7786e055e43d3760694982c336071d117eb54eea 04-Dec-2014 Anthony Lee <anthonylee@google.com> am 0d79b684: Merge "Maintain Full Wake Lock while an incoming call is ringing." into lmp-mr1-dev

* commit '0d79b684bc7fe913d4b1a0a5ac3aec77dbf2364a':
Maintain Full Wake Lock while an incoming call is ringing.
0d79b684bc7fe913d4b1a0a5ac3aec77dbf2364a 03-Dec-2014 Anthony Lee <anthonylee@google.com> Merge "Maintain Full Wake Lock while an incoming call is ringing." into lmp-mr1-dev
2767926bb2d241d651e823a25d5a24295c120ec5 03-Dec-2014 Sailesh Nepal <sail@google.com> Fix fallback for emergency calls

When the first call service disconnects the
disconnect state causes the in-call UI to close.
This means that falling back to the call assistant
for emergency calls didn't work.

Fix was to not set the disconnect state until fallback
was completed.

Bug: 18593307
Change-Id: Ifd0a83662b3edd9b7f324a3eb0b8d519cab44513
rc/com/android/server/telecom/Call.java
a1c4f8d47b17a1d2054bbe2f6143dfdb07775d18 03-Dec-2014 Andrew Lee <anwlee@google.com> am 43396b87: am 1bf97f52: Merge "Don\'t show add if there is an outgoing call." into lmp-mr1-dev

* commit '43396b8773f8b6bf7530c0e501e4e21272a1b612':
Don't show add if there is an outgoing call.
8141039bf7c949e9908ae400c29559178e30871b 03-Dec-2014 Nancy Chen <nancychen@google.com> am 8182537f: am 7ac515a2: Merge "Use AudioManager.MODE_NORMAL when selecting account from dialog." into lmp-mr1-dev

* commit '8182537fa3977bb55aadc43fd8c410750657df76':
Use AudioManager.MODE_NORMAL when selecting account from dialog.
9b71ea8289cb3c6e14beb11f7707ae3ef4dfe83f 26-Nov-2014 Yorke Lee <yorkelee@google.com> Improve outgoing call UI responsiveness

* Send call extras in a bundle to the service when binding. This
provides information about the call so that the incall-service can
setup its UI immediately before the rest of Telecom is done.

* Move outgoing call flow to always go through the CallReceiver.
This allows CallActivity to finish and not block ActivityManager by
remaining as the foreground activity.

Bug: 18373617

Change-Id: I75ca3b12ce1b0db91bd05f3c77cad31f78ca8ebd
rc/com/android/server/telecom/CallActivity.java
rc/com/android/server/telecom/CallReceiver.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Timeouts.java
ests/src/com/android/server/telecom/testapps/CallServiceNotifier.java
43396b8773f8b6bf7530c0e501e4e21272a1b612 03-Dec-2014 Andrew Lee <anwlee@google.com> am 1bf97f52: Merge "Don\'t show add if there is an outgoing call." into lmp-mr1-dev

* commit '1bf97f5278c2a1d635e82ce41dfb3d223c9bfee7':
Don't show add if there is an outgoing call.
1bf97f5278c2a1d635e82ce41dfb3d223c9bfee7 03-Dec-2014 Andrew Lee <anwlee@google.com> Merge "Don't show add if there is an outgoing call." into lmp-mr1-dev
8182537fa3977bb55aadc43fd8c410750657df76 03-Dec-2014 Nancy Chen <nancychen@google.com> am 7ac515a2: Merge "Use AudioManager.MODE_NORMAL when selecting account from dialog." into lmp-mr1-dev

* commit '7ac515a200b872384cf53e2b8a5c89ea00dca140':
Use AudioManager.MODE_NORMAL when selecting account from dialog.
8b7ff44bc2538f18f81c4e09021042671df1f659 03-Dec-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I54623ade9093f3581e6b9013b214355bce24837d
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
0728ba0068309d6928df949e56d8f560fd96b2d8 03-Dec-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I5792ea982e49e9004e55fd3e0b62117fb58995d0
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
69677f8f32bbc926544acce3a7fe3a45d8f2417a 03-Dec-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I6729954ca825d377de48ee7bfa78bb5fc76abfe2
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
7ac515a200b872384cf53e2b8a5c89ea00dca140 03-Dec-2014 Nancy Chen <nancychen@google.com> Merge "Use AudioManager.MODE_NORMAL when selecting account from dialog." into lmp-mr1-dev
dda69194eb85033f85b68370d94b94ce13281ee1 03-Dec-2014 Nancy Chen <nancychen@google.com> Use AudioManager.MODE_NORMAL when selecting account from dialog.

Because the "Call with" dialog is part of the InCallUI, by default it
uses the audio mode of the InCallUI, which is MODE_IN_CALL. In order to
make TalkBack audible for the dialog, use AudioManager.MODE_NORMAL just
for the PRE_DIAL_WAIT case.

Bug: 18327621
Change-Id: Ie79053759fb84e3fff51a6bc63e8cc12291486cf
rc/com/android/server/telecom/CallAudioManager.java
61e6f352c9c1fe8dc346ccf8d3560f7060ec663a 03-Dec-2014 Santos Cordon <santoscordon@google.com> Maintain Full Wake Lock while an incoming call is ringing.

Bug: 18474158
Change-Id: Ia9190a4ee34e138ccd91515db080a98754a0dd27
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallWakeLockController.java
ests/Android.mk
ests/src/com/android/server/telecom/tests/unit/InCallWakeLockControllerTest.java
841c07397d3e29d15825d7915542e3ff48ec5dc7 03-Dec-2014 Tyler Gunn <tgunn@google.com> am 216609a5: am 521d19ad: am 333f34c6: Merge "Removing STOPSHIP comment that is not needed (per bug)." into lmp-mr1-dev

* commit '216609a501c5c467340b61e2827e93ebdf8a6df4':
Removing STOPSHIP comment that is not needed (per bug).
7d183f9c1dcc65fff4ffd7ba7c085f6beeaaecdc 03-Dec-2014 Tyler Gunn <tgunn@google.com> am 17c501f2: am 5747dc18: am 117f0ac3: Merge "Fixing issue where VoLTE conference calls have incorrect call time." into lmp-mr1-dev

* commit '17c501f236c9dd0808d03afe19e25c20a7748c8c':
Fixing issue where VoLTE conference calls have incorrect call time.
2f523e52241ea33c315dfc452e1a56d499b17073 03-Dec-2014 Andrew Lee <anwlee@google.com> am 8094064b: am 976fea98: am c3c238a3: Merge "Properly convert GENERIC_CONFERENCE capabilities." into lmp-mr1-dev

* commit '8094064bbe72b6a663d872962f830e452088356b':
Properly convert GENERIC_CONFERENCE capabilities.
1d7ee00c32daffe1a8a790860db51fff5dddf2bf 03-Dec-2014 Yorke Lee <yorkelee@google.com> am 7e532725: am ffce0588: am f834f422: Merge "Disconnect all calls that are not reused when placing new call" into lmp-mr1-dev

* commit '7e53272541bf8b5de03ee2622dc972d67f6a9e7b':
Disconnect all calls that are not reused when placing new call
216609a501c5c467340b61e2827e93ebdf8a6df4 03-Dec-2014 Tyler Gunn <tgunn@google.com> am 521d19ad: am 333f34c6: Merge "Removing STOPSHIP comment that is not needed (per bug)." into lmp-mr1-dev

* commit '521d19ad40eb4bf1d6d7be33c76db35fc33a5ad0':
Removing STOPSHIP comment that is not needed (per bug).
17c501f236c9dd0808d03afe19e25c20a7748c8c 03-Dec-2014 Tyler Gunn <tgunn@google.com> am 5747dc18: am 117f0ac3: Merge "Fixing issue where VoLTE conference calls have incorrect call time." into lmp-mr1-dev

* commit '5747dc188ebdbe212f6add17bcc20766434eb121':
Fixing issue where VoLTE conference calls have incorrect call time.
521d19ad40eb4bf1d6d7be33c76db35fc33a5ad0 03-Dec-2014 Tyler Gunn <tgunn@google.com> am 333f34c6: Merge "Removing STOPSHIP comment that is not needed (per bug)." into lmp-mr1-dev

* commit '333f34c6daa46ff72015680d4e9b0ada33979d93':
Removing STOPSHIP comment that is not needed (per bug).
5747dc188ebdbe212f6add17bcc20766434eb121 03-Dec-2014 Tyler Gunn <tgunn@google.com> am 117f0ac3: Merge "Fixing issue where VoLTE conference calls have incorrect call time." into lmp-mr1-dev

* commit '117f0ac39a1ad4bd849082b6e6aa5c12b1041239':
Fixing issue where VoLTE conference calls have incorrect call time.
333f34c6daa46ff72015680d4e9b0ada33979d93 03-Dec-2014 Tyler Gunn <tgunn@google.com> Merge "Removing STOPSHIP comment that is not needed (per bug)." into lmp-mr1-dev
117f0ac39a1ad4bd849082b6e6aa5c12b1041239 03-Dec-2014 Tyler Gunn <tgunn@google.com> Merge "Fixing issue where VoLTE conference calls have incorrect call time." into lmp-mr1-dev
8094064bbe72b6a663d872962f830e452088356b 03-Dec-2014 Andrew Lee <anwlee@google.com> am 976fea98: am c3c238a3: Merge "Properly convert GENERIC_CONFERENCE capabilities." into lmp-mr1-dev

* commit '976fea98681dd6622685a4f7887aec3c05b5921b':
Properly convert GENERIC_CONFERENCE capabilities.
7e53272541bf8b5de03ee2622dc972d67f6a9e7b 03-Dec-2014 Yorke Lee <yorkelee@google.com> am ffce0588: am f834f422: Merge "Disconnect all calls that are not reused when placing new call" into lmp-mr1-dev

* commit 'ffce0588381e33bac66ab9044d1c9b7610ee801c':
Disconnect all calls that are not reused when placing new call
976fea98681dd6622685a4f7887aec3c05b5921b 03-Dec-2014 Andrew Lee <anwlee@google.com> am c3c238a3: Merge "Properly convert GENERIC_CONFERENCE capabilities." into lmp-mr1-dev

* commit 'c3c238a3e3b3de9ced4d632182027b4af6ee7656':
Properly convert GENERIC_CONFERENCE capabilities.
ffce0588381e33bac66ab9044d1c9b7610ee801c 03-Dec-2014 Yorke Lee <yorkelee@google.com> am f834f422: Merge "Disconnect all calls that are not reused when placing new call" into lmp-mr1-dev

* commit 'f834f422b5d2891e9e8f70170ba0ec33c41b9ed8':
Disconnect all calls that are not reused when placing new call
c3c238a3e3b3de9ced4d632182027b4af6ee7656 02-Dec-2014 Andrew Lee <anwlee@google.com> Merge "Properly convert GENERIC_CONFERENCE capabilities." into lmp-mr1-dev
f834f422b5d2891e9e8f70170ba0ec33c41b9ed8 02-Dec-2014 Yorke Lee <yorkelee@google.com> Merge "Disconnect all calls that are not reused when placing new call" into lmp-mr1-dev
a5267a128b7dc3bbb46a90fb15b8b87acf4c162f 02-Dec-2014 Tyler Gunn <tgunn@google.com> Removing STOPSHIP comment that is not needed (per bug).

Bug: 13769374
Change-Id: Ieb775caab8f2a196a3798117fc68833d6623433e
rc/com/android/server/telecom/MissedCallNotifier.java
113ad62c43fa0cc8329c19cafa8dd8e2731b9b3c 02-Dec-2014 Andrew Lee <anwlee@google.com> Don't show add if there is an outgoing call.

We only support one outgoing call, so don't enable ADD when the call
is in an outgoing state (eg. dialing).

Bug: 18504905
Change-Id: Ie65beff2f1d7f4644d6b653902ce9fe4b3236e4f
rc/com/android/server/telecom/CallsManager.java
a21edb812cc2c5af94bdbb1f7d2d96ee1d9f4fb9 02-Dec-2014 Andrew Lee <anwlee@google.com> Properly convert GENERIC_CONFERENCE capabilities.

Bug: 18590173
Change-Id: I9821506ce85100662988ae4f8f653f067af1649f
rc/com/android/server/telecom/InCallController.java
ae5fe4e99c407a418079448d8516061a6548ff4a 02-Dec-2014 Andrew Lee <anwlee@google.com> am 4e623309: am fe21e3a2: am d5c2fcf3: Fix connection <=> call capability conversion.

* commit '4e62330949e70d3ef33201077d4d338a2b4449ef':
Fix connection <=> call capability conversion.
4e62330949e70d3ef33201077d4d338a2b4449ef 02-Dec-2014 Andrew Lee <anwlee@google.com> am fe21e3a2: am d5c2fcf3: Fix connection <=> call capability conversion.

* commit 'fe21e3a252a58b97aa6db5f3b9c562ce62928a0c':
Fix connection <=> call capability conversion.
fe21e3a252a58b97aa6db5f3b9c562ce62928a0c 02-Dec-2014 Andrew Lee <anwlee@google.com> am d5c2fcf3: Fix connection <=> call capability conversion.

* commit 'd5c2fcf3bc8fc8ae08c05d7172e2244335c73e8f':
Fix connection <=> call capability conversion.
d5c2fcf3bc8fc8ae08c05d7172e2244335c73e8f 02-Dec-2014 Andrew Lee <anwlee@google.com> Fix connection <=> call capability conversion.

Bug: 18583954
Bug: 18292176
Change-Id: I8c9b44375845fc802c2bffe32a575241a553e68d
rc/com/android/server/telecom/InCallController.java
d04de9dad82efd738dbe9bea254fa5a26bb830e6 02-Dec-2014 Yorke Lee <yorkelee@google.com> Turn off SYSTRACE_DEBUG

Bug: 18473078
Change-Id: I68d3e1f5ff842ebce1ab6435041368d80f969780
rc/com/android/server/telecom/Log.java
9049b8cc9cd2962021b42f861032912908c5ecae 02-Dec-2014 Andrew Lee <anwlee@google.com> am 52652daf: am 7f969399: am 15a71555: Rename VoLTE capability to HIGH_DEF_AUDIO.

* commit '52652dafef28cb60dca7bac1d9e898fee214dc7e':
Rename VoLTE capability to HIGH_DEF_AUDIO.
52652dafef28cb60dca7bac1d9e898fee214dc7e 02-Dec-2014 Andrew Lee <anwlee@google.com> am 7f969399: am 15a71555: Rename VoLTE capability to HIGH_DEF_AUDIO.

* commit '7f969399710e52b89d28667ea436d15ccaa1f84b':
Rename VoLTE capability to HIGH_DEF_AUDIO.
7f969399710e52b89d28667ea436d15ccaa1f84b 02-Dec-2014 Andrew Lee <anwlee@google.com> am 15a71555: Rename VoLTE capability to HIGH_DEF_AUDIO.

* commit '15a71555709aaf3574e8b39bebf022b5e6f75228':
Rename VoLTE capability to HIGH_DEF_AUDIO.
59979513fd16c03bc2b901177b679eb5af39504a 02-Dec-2014 Yorke Lee <yorkelee@google.com> Disconnect all calls that are not reused when placing new call

This fixes a bug with Google voice calls where a call that was not
reused was causing future calls to be rejected.

Also log an error when there is no more room for an outgoing call
to make it easier to debug.

Bug: 18481759
Change-Id: I20da180211d81fdf23e50479619a1f6a8a303c9b
rc/com/android/server/telecom/CallsManager.java
c314fcc186caa90c9c78b93aa2299d7641c9d4f1 02-Dec-2014 Tyler Gunn <tgunn@google.com> Fixing issue where VoLTE conference calls have incorrect call time.

1. In constructor for "Call", setting connect time for new conferences;
the connect time is normally set when a call goes ACTIVE, but since a
conference starts active it never gets a state change to active.
2. Changed code in InCallController which finds oldest connected child
call to handle the potential case where no children have a connect time
defined. This can occur when an IMS conference has just started and
conference event package participants are added. Since they are initially
added as "NEW", it is possible for there to be no active child call, which
could cause the timer to glitch until the child calls become active.

Bug: 18511011
Change-Id: I36782db8f89299c31e6f489d34a83701855d30c8
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/InCallController.java
15a71555709aaf3574e8b39bebf022b5e6f75228 01-Dec-2014 Andrew Lee <anwlee@google.com> Rename VoLTE capability to HIGH_DEF_AUDIO.

Bug: 18103173
Change-Id: I87ff31c674601bf63382a23daceb09b7c4a5ed9b
rc/com/android/server/telecom/InCallController.java
49fc4898ca4246a12f6ad4ba6e11e2cbd3b599c0 01-Dec-2014 Ihab Awad <ihab@google.com> am 05882f9d: am c63cf4b0: am 07bc5ee8: Telecom API updates (4/6)

* commit '05882f9d713080abca2fcccadec39bf07022a63f':
Telecom API updates (4/6)
05882f9d713080abca2fcccadec39bf07022a63f 01-Dec-2014 Ihab Awad <ihab@google.com> am c63cf4b0: am 07bc5ee8: Telecom API updates (4/6)

* commit 'c63cf4b0620075dc033d21ca1fa3064f68d77862':
Telecom API updates (4/6)
c63cf4b0620075dc033d21ca1fa3064f68d77862 01-Dec-2014 Ihab Awad <ihab@google.com> am 07bc5ee8: Telecom API updates (4/6)

* commit '07bc5ee853bc9a0b4cd46e0c702888b2c7989392':
Telecom API updates (4/6)
07bc5ee853bc9a0b4cd46e0c702888b2c7989392 12-Nov-2014 Ihab Awad <ihab@google.com> Telecom API updates (4/6)

Bug: 18292176

Change-Id: I28e6aa4fec20aadd77f9a861b0bb8e1e9828cffb
rc/com/android/server/telecom/BluetoothPhoneService.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/testapps/TestConnectionManager.java
ests/src/com/android/server/telecom/testapps/TestConnectionService.java
ests/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
ests/src/com/android/server/telecom/testapps/TestVideoProvider.java
42412524a8526f0e21f405a52a7989ceae2e3034 26-Nov-2014 Geoff Mendal <mendal@google.com> am 62bc5541: (-s ours) am 1bdaa4db: (-s ours) am ebdb7803: (-s ours) Import translations. DO NOT MERGE

* commit '62bc5541ede81e5ff9e5934b6bd348885353fced':
Import translations. DO NOT MERGE
30cef83eb494fdc8e1d0fc0fc41e3761c95772f3 26-Nov-2014 Geoff Mendal <mendal@google.com> am 05c9828a: (-s ours) am ba9a6d3d: (-s ours) Import translations. DO NOT MERGE

* commit '05c9828a8f2db6b2400f8cf95023eaa3b0427d2e':
Import translations. DO NOT MERGE
62bc5541ede81e5ff9e5934b6bd348885353fced 26-Nov-2014 Geoff Mendal <mendal@google.com> am 1bdaa4db: (-s ours) am ebdb7803: (-s ours) Import translations. DO NOT MERGE

* commit '1bdaa4dba229006b50d6fd7ba0a8c9df06cf5571':
Import translations. DO NOT MERGE
05c9828a8f2db6b2400f8cf95023eaa3b0427d2e 26-Nov-2014 Geoff Mendal <mendal@google.com> am ba9a6d3d: (-s ours) Import translations. DO NOT MERGE

* commit 'ba9a6d3d07396026a9d86df8ff61d05a2f3797eb':
Import translations. DO NOT MERGE
1bdaa4dba229006b50d6fd7ba0a8c9df06cf5571 26-Nov-2014 Geoff Mendal <mendal@google.com> am ebdb7803: (-s ours) Import translations. DO NOT MERGE

* commit 'ebdb78038acf6b4d486009fddd397bcf8b57118a':
Import translations. DO NOT MERGE
c94baadb0df58d6c82148339e6ec97d68ab509b6 26-Nov-2014 Nancy Chen <nancychen@google.com> am 6226b5a5: am 56be7d2f: am 82430ce4: Merge "When adding a new call, use same phone account for call." into lmp-mr1-dev

* commit '6226b5a513e8218772019cadd5f7606a82922495':
When adding a new call, use same phone account for call.
aa6a5f3cc85de73d1a7230166a6220d936b10b4c 26-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I7a7e083ba737b6a84d0ac499224d033140f4adf8
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-ur-rPK/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
ba9a6d3d07396026a9d86df8ff61d05a2f3797eb 26-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Id070b10ef8943f2a05178197943487bd45f2049c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-ur-rPK/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
ebdb78038acf6b4d486009fddd397bcf8b57118a 26-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ic8568f0ac568ecf5c8ef8051eea9175a15e74a3e
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-ur-rPK/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
6226b5a513e8218772019cadd5f7606a82922495 26-Nov-2014 Nancy Chen <nancychen@google.com> am 56be7d2f: am 82430ce4: Merge "When adding a new call, use same phone account for call." into lmp-mr1-dev

* commit '56be7d2faeaa7bec8cdd58959e17ab2220040e16':
When adding a new call, use same phone account for call.
673982883ad6fa0b0eb472abbada74bc7fffc879 26-Nov-2014 John Spurlock <jspurlock@google.com> am acb9722d: am f55886f0: am 1522691e: Ringer: Use internal ringer mode when determining vibration.

* commit 'acb9722dfb7b5fcb6bda96fa476702b78779c24d':
Ringer: Use internal ringer mode when determining vibration.
acb9722dfb7b5fcb6bda96fa476702b78779c24d 26-Nov-2014 John Spurlock <jspurlock@google.com> am f55886f0: am 1522691e: Ringer: Use internal ringer mode when determining vibration.

* commit 'f55886f0a063c2486ea145d39cd626aa7f35eb67':
Ringer: Use internal ringer mode when determining vibration.
56be7d2faeaa7bec8cdd58959e17ab2220040e16 26-Nov-2014 Nancy Chen <nancychen@google.com> am 82430ce4: Merge "When adding a new call, use same phone account for call." into lmp-mr1-dev

* commit '82430ce4a9211bcdf70a582519c979b4ef4506ff':
When adding a new call, use same phone account for call.
82430ce4a9211bcdf70a582519c979b4ef4506ff 26-Nov-2014 Nancy Chen <nancychen@google.com> Merge "When adding a new call, use same phone account for call." into lmp-mr1-dev
f55886f0a063c2486ea145d39cd626aa7f35eb67 25-Nov-2014 John Spurlock <jspurlock@google.com> am 1522691e: Ringer: Use internal ringer mode when determining vibration.

* commit '1522691edd4f2ac14e206ff49eff62e87228356d':
Ringer: Use internal ringer mode when determining vibration.
58d3e6dc831cc7052a0bb4fd5897fd799f0f795b 25-Nov-2014 Geoff Mendal <mendal@google.com> am b076cb94: (-s ours) am 0dcb7092: (-s ours) am 0d725fbe: (-s ours) Import translations. DO NOT MERGE

* commit 'b076cb94d2307dd0ceec59d61a733a67b9395afe':
Import translations. DO NOT MERGE
ee96acde0a1648ef5fb44d632565073c85228848 25-Nov-2014 Geoff Mendal <mendal@google.com> am 32fdf24f: (-s ours) am 98487453: (-s ours) Import translations. DO NOT MERGE

* commit '32fdf24f3eca90ca2c7ec22405f94a4b8a06c6ea':
Import translations. DO NOT MERGE
b076cb94d2307dd0ceec59d61a733a67b9395afe 25-Nov-2014 Geoff Mendal <mendal@google.com> am 0dcb7092: (-s ours) am 0d725fbe: (-s ours) Import translations. DO NOT MERGE

* commit '0dcb70922a777e0f12629cb6c1229f52c35eeace':
Import translations. DO NOT MERGE
32fdf24f3eca90ca2c7ec22405f94a4b8a06c6ea 25-Nov-2014 Geoff Mendal <mendal@google.com> am 98487453: (-s ours) Import translations. DO NOT MERGE

* commit '98487453bb42a9e245698c4de78c5a21129d53f8':
Import translations. DO NOT MERGE
1522691edd4f2ac14e206ff49eff62e87228356d 25-Nov-2014 John Spurlock <jspurlock@google.com> Ringer: Use internal ringer mode when determining vibration.

Bug: 17884168
Change-Id: I0aca94c0637db894dfc4b01d7e280b252394c69a
rc/com/android/server/telecom/Ringer.java
bc95db90d9f463fe475c53c8ce15ea99bb716cdb 24-Nov-2014 Nancy Chen <nancychen@google.com> When adding a new call, use same phone account for call.

Because MSIM does not support having two active calls with different
SIMs, use the SIM of the currently active call to place additional
calls.

Bug: 18461539
Change-Id: I38411a5f9f330d2064830068629651653a0871d3
rc/com/android/server/telecom/CallsManager.java
f69f10146c1c9358ec8aa15f23b6b16abddfb493 24-Nov-2014 Santos Cordon <santoscordon@google.com> am 0a1b6cc8: am 6a46118c: am 77804e73: Merge "Remove Guava references from Telecom." into lmp-mr1-dev

* commit '0a1b6cc8e7016ac1b54fad1af134c78fd3b02c84':
Remove Guava references from Telecom.
5625e5bd514d6399416e02f97a6352d0847b986f 24-Nov-2014 Yorke Lee <yorkelee@google.com> am 8a510f52: am dfbf1a38: am 09b53849: Merge "Fix bad merge in Telecom" into lmp-mr1-dev

* commit '8a510f5270304a854c3ab90e4af3eea97300623f':
Fix bad merge in Telecom
5bc5eb5fc5278c403ea929ce7bd0711b25b27b4a 24-Nov-2014 Wink Saville <wink@google.com> am 2a310758: am e8723106: am 33c05d3d: Additional changes to SubscriptionManager API as per API council.

* commit '2a3107583eeed57741338333ed87544134455523':
Additional changes to SubscriptionManager API as per API council.
0a1b6cc8e7016ac1b54fad1af134c78fd3b02c84 24-Nov-2014 Santos Cordon <santoscordon@google.com> am 6a46118c: am 77804e73: Merge "Remove Guava references from Telecom." into lmp-mr1-dev

* commit '6a46118c34f8bd6df5b466d040e6256c1a9782b5':
Remove Guava references from Telecom.
8a510f5270304a854c3ab90e4af3eea97300623f 24-Nov-2014 Yorke Lee <yorkelee@google.com> am dfbf1a38: am 09b53849: Merge "Fix bad merge in Telecom" into lmp-mr1-dev

* commit 'dfbf1a380ba0d6e0fb1dd070e861f006fd5283df':
Fix bad merge in Telecom
2a3107583eeed57741338333ed87544134455523 24-Nov-2014 Wink Saville <wink@google.com> am e8723106: am 33c05d3d: Additional changes to SubscriptionManager API as per API council.

* commit 'e872310625d799406a28d7b58c7d46cf17d2ee34':
Additional changes to SubscriptionManager API as per API council.
0dcb70922a777e0f12629cb6c1229f52c35eeace 24-Nov-2014 Geoff Mendal <mendal@google.com> am 0d725fbe: (-s ours) Import translations. DO NOT MERGE

* commit '0d725fbefd55175e6fea1d35313ff33704c1c9bd':
Import translations. DO NOT MERGE
c749433baaa60ab8722984c14d233c4e2432f807 24-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia8b725d029282eb126270153da5cc7abc975924c
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-mk-rMK/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-si-rLK/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zu/strings.xml
98487453bb42a9e245698c4de78c5a21129d53f8 24-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I54dcf94f34c5c5206a43464f8d013f16b63a1e4f
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-bn-rBD/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-eu-rES/strings.xml
es/values-gl-rES/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-iw/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-si-rLK/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zu/strings.xml
0d725fbefd55175e6fea1d35313ff33704c1c9bd 24-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I17507138bc8c5e1c4ce96caf662f19ee6ad16a9a
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-mk-rMK/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-si-rLK/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zu/strings.xml
6a46118c34f8bd6df5b466d040e6256c1a9782b5 24-Nov-2014 Santos Cordon <santoscordon@google.com> am 77804e73: Merge "Remove Guava references from Telecom." into lmp-mr1-dev

* commit '77804e7345660156b3c8421132be90ce00b70635':
Remove Guava references from Telecom.
77804e7345660156b3c8421132be90ce00b70635 24-Nov-2014 Santos Cordon <santoscordon@google.com> Merge "Remove Guava references from Telecom." into lmp-mr1-dev
dfbf1a380ba0d6e0fb1dd070e861f006fd5283df 24-Nov-2014 Yorke Lee <yorkelee@google.com> am 09b53849: Merge "Fix bad merge in Telecom" into lmp-mr1-dev

* commit '09b53849b2f85e1c1bf7ab471718c5013a9ba2dc':
Fix bad merge in Telecom
09b53849b2f85e1c1bf7ab471718c5013a9ba2dc 24-Nov-2014 Yorke Lee <yorkelee@google.com> Merge "Fix bad merge in Telecom" into lmp-mr1-dev
e872310625d799406a28d7b58c7d46cf17d2ee34 22-Nov-2014 Wink Saville <wink@google.com> am 33c05d3d: Additional changes to SubscriptionManager API as per API council.

* commit '33c05d3d8bf97bc8748d573858f2330c69902922':
Additional changes to SubscriptionManager API as per API council.
8a1932db04a00e341b1abce84b00bc03cbd4cd1e 22-Nov-2014 Yorke Lee <yorkelee@google.com> am c61babf0: am 40fedb78: am 8bc97b10: Merge "Set number presentation in call log correctly" into lmp-mr1-dev

* commit 'c61babf07eb6a27d3bb48677f21dc73929f905aa':
Set number presentation in call log correctly
c61babf07eb6a27d3bb48677f21dc73929f905aa 22-Nov-2014 Yorke Lee <yorkelee@google.com> am 40fedb78: am 8bc97b10: Merge "Set number presentation in call log correctly" into lmp-mr1-dev

* commit '40fedb78f269cf0fabccf5bc812266fba3f45166':
Set number presentation in call log correctly
33c05d3d8bf97bc8748d573858f2330c69902922 20-Nov-2014 Wink Saville <wink@google.com> Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/RespondViaSmsManager.java
40fedb78f269cf0fabccf5bc812266fba3f45166 22-Nov-2014 Yorke Lee <yorkelee@google.com> am 8bc97b10: Merge "Set number presentation in call log correctly" into lmp-mr1-dev

* commit '8bc97b102a91c308ec93ed1adb68dc74f931fcb5':
Set number presentation in call log correctly
b96131ea32e9eb4af22dca9ba0627ea79a211ccc 22-Nov-2014 Yorke Lee <yorkelee@google.com> am 0470252e: am 4ccc4f69: am 767790f6: Merge "Fix NPE if phone ringtone is set to None" into lmp-mr1-dev

* commit '0470252e94ca00a4277a16ea45cd5476fb986f3e':
Fix NPE if phone ringtone is set to None
8bc97b102a91c308ec93ed1adb68dc74f931fcb5 22-Nov-2014 Yorke Lee <yorkelee@google.com> Merge "Set number presentation in call log correctly" into lmp-mr1-dev
0470252e94ca00a4277a16ea45cd5476fb986f3e 22-Nov-2014 Yorke Lee <yorkelee@google.com> am 4ccc4f69: am 767790f6: Merge "Fix NPE if phone ringtone is set to None" into lmp-mr1-dev

* commit '4ccc4f6937b04fe345242a641e64e85a313fc200':
Fix NPE if phone ringtone is set to None
4ccc4f6937b04fe345242a641e64e85a313fc200 22-Nov-2014 Yorke Lee <yorkelee@google.com> am 767790f6: Merge "Fix NPE if phone ringtone is set to None" into lmp-mr1-dev

* commit '767790f68087c2f4b5a351cfe76276e83c498555':
Fix NPE if phone ringtone is set to None
767790f68087c2f4b5a351cfe76276e83c498555 22-Nov-2014 Yorke Lee <yorkelee@google.com> Merge "Fix NPE if phone ringtone is set to None" into lmp-mr1-dev
06d2693a85ac69490308d90a83f3ec9ddc15f769 21-Nov-2014 Nancy Chen <nancychen@google.com> am 51aed988: am e059f8b3: am e321383b: Merge "Hide "respond via SMS" option for non-default SMS SIM." into lmp-mr1-dev

* commit '51aed988289b16854a5c0140b5bd2cd10e575d18':
Hide "respond via SMS" option for non-default SMS SIM.
51aed988289b16854a5c0140b5bd2cd10e575d18 21-Nov-2014 Nancy Chen <nancychen@google.com> am e059f8b3: am e321383b: Merge "Hide "respond via SMS" option for non-default SMS SIM." into lmp-mr1-dev

* commit 'e059f8b386798306f4d9bcb5beec5edab9245ed3':
Hide "respond via SMS" option for non-default SMS SIM.
e059f8b386798306f4d9bcb5beec5edab9245ed3 21-Nov-2014 Nancy Chen <nancychen@google.com> am e321383b: Merge "Hide "respond via SMS" option for non-default SMS SIM." into lmp-mr1-dev

* commit 'e321383b381bf4dfe6274dbf190fbe4105880f71':
Hide "respond via SMS" option for non-default SMS SIM.
e321383b381bf4dfe6274dbf190fbe4105880f71 21-Nov-2014 Nancy Chen <nancychen@google.com> Merge "Hide "respond via SMS" option for non-default SMS SIM." into lmp-mr1-dev
4bc0245eb5c09ab48dcbb673eefdf7175ae8ac9c 20-Nov-2014 Santos Cordon <santoscordon@google.com> Remove Guava references from Telecom.

Prepping telecom to run in system-server process by removing references
to guava.

Bug: 18112269
Change-Id: I994be480284462240da46c9cf0e47aa83f5f1fe9
ndroid.mk
rc/com/android/server/telecom/CallIdMapper.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/DtmfLocalTonePlayer.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/ServiceBinder.java
1355a5d4f7bb3e03f0cb6edf8da13948731e140c 21-Nov-2014 Yorke Lee <yorkelee@google.com> am befeaae8: am 3e35a1dc: am cb189f98: am 7b9a15f2: am fe1ce0ac: Allow calling of voicemail using CALL_PRIVILEGED

* commit 'befeaae82361cf728202daf4e1b546b30bfb538b':
Allow calling of voicemail using CALL_PRIVILEGED
befeaae82361cf728202daf4e1b546b30bfb538b 21-Nov-2014 Yorke Lee <yorkelee@google.com> am 3e35a1dc: am cb189f98: am 7b9a15f2: am fe1ce0ac: Allow calling of voicemail using CALL_PRIVILEGED

* commit '3e35a1dce5128e11f3d4795d0d44c47a0f2687e1':
Allow calling of voicemail using CALL_PRIVILEGED
3e35a1dce5128e11f3d4795d0d44c47a0f2687e1 21-Nov-2014 Yorke Lee <yorkelee@google.com> am cb189f98: am 7b9a15f2: am fe1ce0ac: Allow calling of voicemail using CALL_PRIVILEGED

* commit 'cb189f986655e8445d95d0d1626924bf41502ebd':
Allow calling of voicemail using CALL_PRIVILEGED
cb189f986655e8445d95d0d1626924bf41502ebd 21-Nov-2014 Yorke Lee <yorkelee@google.com> am 7b9a15f2: am fe1ce0ac: Allow calling of voicemail using CALL_PRIVILEGED

* commit '7b9a15f2ae139504f02fab080b812e745e5a5279':
Allow calling of voicemail using CALL_PRIVILEGED
d5725fae8b4337c949c3e8fa036a5aea38fa7775 21-Nov-2014 Yorke Lee <yorkelee@google.com> Set number presentation in call log correctly

Bug: 17887770
Change-Id: I852a825580f0084ac45b4af7bc27d317089ee72e
rc/com/android/server/telecom/CallLogManager.java
ac23e53289ad1d67a96632959c3ac512f12d2e39 21-Nov-2014 Yorke Lee <yorkelee@google.com> Fix bad merge in Telecom

Don't call postDialContinue twice as it messes up the state
machine in ImsPhoneConnection

Bug: 18371919
Change-Id: I417b39594053c62601ed9b58b8a910d956f5a370
rc/com/android/server/telecom/InCallAdapter.java
711091bf8c8a7449faf501ba3fc58a081a92b5b1 21-Nov-2014 Wink Saville <wink@google.com> am 746bb27c: am 235b01e3: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 42b3b87

* commit '746bb27ccdf08714f481eccd53abeec3dfd07dfb':
Revert "Additional changes to SubscriptionManager API as per API council."
f3072a1cf5503a735df73c9ad3f34b0044b160c8 21-Nov-2014 Wink Saville <wink@google.com> am e9f3c4e1: am e293f2b0: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 40aec57

* commit 'e9f3c4e17f5c4f7118173c1a64441a6e71283a6d':
Additional changes to SubscriptionManager API as per API council.
746bb27ccdf08714f481eccd53abeec3dfd07dfb 21-Nov-2014 Wink Saville <wink@google.com> am 235b01e3: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
automerge: 42b3b87

* commit '42b3b874800bfe853f793eba8682a2298e58aab6':
Revert "Additional changes to SubscriptionManager API as per API council."
e9f3c4e17f5c4f7118173c1a64441a6e71283a6d 21-Nov-2014 Wink Saville <wink@google.com> am e293f2b0: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
automerge: 40aec57

* commit '40aec57c95d30dad611412dc15eadc46f3cb6107':
Additional changes to SubscriptionManager API as per API council.
eb44d11eaad87da9a134c4f7b148d04d7b23e2af 21-Nov-2014 Santos Cordon <santoscordon@google.com> am 58d9fe5a: am 98c4e2a1: Merge "Fix call duration for unanswered/missed calls." into lmp-mr1-dev
automerge: 258edd4

* commit '258edd49a64411bb0db4e7035f74efdf9350780c':
Fix call duration for unanswered/missed calls.
258edd49a64411bb0db4e7035f74efdf9350780c 21-Nov-2014 Santos Cordon <santoscordon@google.com> am 58d9fe5a: am 98c4e2a1: Merge "Fix call duration for unanswered/missed calls." into lmp-mr1-dev

* commit '58d9fe5a6239dd804dbbe987fbdf8db7cb138044':
Fix call duration for unanswered/missed calls.
a7997d3802c21f45ec5556664ff709812cd164e0 20-Nov-2014 Tyler Gunn <tgunn@google.com> am f90f8781: am 045b6c98: Create IMSConference to represent IMS conference calls. automerge: 37cf977

* commit 'f90f8781b6b38cd7bb31bfb39bad84de4e7eb06b':
Create IMSConference to represent IMS conference calls.
f90f8781b6b38cd7bb31bfb39bad84de4e7eb06b 20-Nov-2014 Tyler Gunn <tgunn@google.com> am 045b6c98: Create IMSConference to represent IMS conference calls.
automerge: 37cf977

* commit '37cf977185c4c61dfee3721b97a9e40893bcd5d5':
Create IMSConference to represent IMS conference calls.
42b3b874800bfe853f793eba8682a2298e58aab6 20-Nov-2014 Wink Saville <wink@google.com> am 235b01e3: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev

* commit '235b01e341d7a8d852c454d22cfe390b3cafc33d':
Revert "Additional changes to SubscriptionManager API as per API council."
235b01e341d7a8d852c454d22cfe390b3cafc33d 20-Nov-2014 Wink Saville <wink@google.com> Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
d45da14356db9e9ff0cba1d2bc75ccd749706aba 20-Nov-2014 Wink Saville <wink@google.com> Revert "Additional changes to SubscriptionManager API as per API council."

This reverts commit fe081559e29a8fc44b395b29ade6f19091eea18f.

Change-Id: I4259933c688b6e70df149cc50d83254217fe8f78
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/RespondViaSmsManager.java
40aec57c95d30dad611412dc15eadc46f3cb6107 20-Nov-2014 Wink Saville <wink@google.com> am e293f2b0: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev

* commit 'e293f2b0e61c64dde108c38835c622fc798cb284':
Additional changes to SubscriptionManager API as per API council.
e293f2b0e61c64dde108c38835c622fc798cb284 20-Nov-2014 Wink Saville <wink@google.com> Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
58d9fe5a6239dd804dbbe987fbdf8db7cb138044 20-Nov-2014 Santos Cordon <santoscordon@google.com> am 98c4e2a1: Merge "Fix call duration for unanswered/missed calls." into lmp-mr1-dev

* commit '98c4e2a1f98dcf27ee57151811814e2e0fbb76c3':
Fix call duration for unanswered/missed calls.
98c4e2a1f98dcf27ee57151811814e2e0fbb76c3 20-Nov-2014 Santos Cordon <santoscordon@google.com> Merge "Fix call duration for unanswered/missed calls." into lmp-mr1-dev
dcf7b1f6cdbf597f4e1da766eeb995a9cf9bc949 20-Nov-2014 Yorke Lee <yorkelee@google.com> Fix NPE if phone ringtone is set to None

Bug: 18418803
Change-Id: I50e5903cfe75da02e94a888e24c97d03cb7607c5
rc/com/android/server/telecom/AsyncRingtonePlayer.java
7b9a15f2ae139504f02fab080b812e745e5a5279 20-Nov-2014 Yorke Lee <yorkelee@google.com> am fe1ce0ac: Allow calling of voicemail using CALL_PRIVILEGED

* commit 'fe1ce0ac4f1496dc8f77a4c738fb47a8ef8676ae':
Allow calling of voicemail using CALL_PRIVILEGED
fe1ce0ac4f1496dc8f77a4c738fb47a8ef8676ae 20-Nov-2014 Yorke Lee <yorkelee@google.com> Allow calling of voicemail using CALL_PRIVILEGED

Bug: 18456519
Change-Id: I97bd63a726ca9bc6412266a5592696daf96e912d
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
37cf977185c4c61dfee3721b97a9e40893bcd5d5 20-Nov-2014 Tyler Gunn <tgunn@google.com> am 045b6c98: Create IMSConference to represent IMS conference calls.

* commit '045b6c98c38edd8312668d2ea2a4bfd583a4b8fa':
Create IMSConference to represent IMS conference calls.
668dee01ed4fb495c3711f6fd041a520b60a9a7f 20-Nov-2014 Nancy Chen <nancychen@google.com> Hide "respond via SMS" option for non-default SMS SIM.

If an incoming call is coming in through the non-default SMS SIM, do not
show the "respond via SMS" option. This is to prevent accidentally
sending the SMS through a SIM the user may not want to use for SMS.

Bug: 18275919
Change-Id: I0136f30d6341e72ac6e914de41f9c41bd58f1bbb
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
fe081559e29a8fc44b395b29ade6f19091eea18f 18-Nov-2014 Wink Saville <wink@google.com> Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/RespondViaSmsManager.java
045b6c98c38edd8312668d2ea2a4bfd583a4b8fa 13-Nov-2014 Tyler Gunn <tgunn@google.com> Create IMSConference to represent IMS conference calls.

- Removing check in ConnectionServiceWrapper which would prevent adding
a new confernece with no calls in it; an IMS conference by default will
have no calls.

Bug: 18200934
Change-Id: I2e70b9350e779310e8c4ee8e91bc8020b126bcfa
rc/com/android/server/telecom/ConnectionServiceWrapper.java
79d972c0216a9e9285a1f2d803101f278c96b98b 17-Nov-2014 Yorke Lee <yorkelee@google.com> am 30889b09: am dc0f028f: am 7cdd04c8: Merge "Create default InCallService with Context.BIND_IMPORTANT" into lmp-mr1-dev

* commit '30889b099c8105fe921b645961b6b5e810da81ea':
Create default InCallService with Context.BIND_IMPORTANT
adc6df2633d4c69e1765c0873c1f93dd7ddb15b1 17-Nov-2014 Yorke Lee <yorkelee@google.com> am c6aefc14: am 6df5bf5a: am 7878b0ce: Merge "Add Systrace logging to Telecom" into lmp-mr1-dev

* commit 'c6aefc1428529e51c2d7b42dc695830cb7fc69e9':
Add Systrace logging to Telecom
30889b099c8105fe921b645961b6b5e810da81ea 17-Nov-2014 Yorke Lee <yorkelee@google.com> am dc0f028f: am 7cdd04c8: Merge "Create default InCallService with Context.BIND_IMPORTANT" into lmp-mr1-dev

* commit 'dc0f028f10f14394e4c059b86ac23f27b95f4514':
Create default InCallService with Context.BIND_IMPORTANT
c6aefc1428529e51c2d7b42dc695830cb7fc69e9 17-Nov-2014 Yorke Lee <yorkelee@google.com> am 6df5bf5a: am 7878b0ce: Merge "Add Systrace logging to Telecom" into lmp-mr1-dev

* commit '6df5bf5a310a126b9beed2c72a73377f2da73da5':
Add Systrace logging to Telecom
40f9b179e6aaa0d906d38a48040425f82727aab4 17-Nov-2014 Santos Cordon <santoscordon@google.com> Fix call duration for unanswered/missed calls.

Made call times be equivalent to Jellybean/Kitkat.
Missed calls, rejected calls, unanswered outgoing calls all show 0:00.
Missed calls in particular dont show a time at all.

Tested with Conference calls, Active/Hold, Rejected, Missed,
Outgoing->Rejected, Outgoing->End Call.

Bug: 18403859
Change-Id: I60bedc425681808d48d768a435f86f2545916de1
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
dc0f028f10f14394e4c059b86ac23f27b95f4514 17-Nov-2014 Yorke Lee <yorkelee@google.com> am 7cdd04c8: Merge "Create default InCallService with Context.BIND_IMPORTANT" into lmp-mr1-dev

* commit '7cdd04c8ff9e3020a32a649f0e4887ffce0162cb':
Create default InCallService with Context.BIND_IMPORTANT
6df5bf5a310a126b9beed2c72a73377f2da73da5 17-Nov-2014 Yorke Lee <yorkelee@google.com> am 7878b0ce: Merge "Add Systrace logging to Telecom" into lmp-mr1-dev

* commit '7878b0ce24c789bc042fe41e6d4fdcd31640b188':
Add Systrace logging to Telecom
7cdd04c8ff9e3020a32a649f0e4887ffce0162cb 17-Nov-2014 Yorke Lee <yorkelee@google.com> Merge "Create default InCallService with Context.BIND_IMPORTANT" into lmp-mr1-dev
7878b0ce24c789bc042fe41e6d4fdcd31640b188 17-Nov-2014 Yorke Lee <yorkelee@google.com> Merge "Add Systrace logging to Telecom" into lmp-mr1-dev
e4a9c412f5c6f76f006659f0b4e171ef4547dc45 15-Nov-2014 Yorke Lee <yorkelee@google.com> Add Systrace logging to Telecom

More granular per-listener logging is protected by a
static boolean flag which is currently turned on for
dogfooding.

Bug: 18373617

Change-Id: Id37c75f2e2475923dcd66aa7325b3d8767f29a97
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallActivity.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
8efc0323cc51ed8536f2dfa8349c7216a7664413 15-Nov-2014 Yorke Lee <yorkelee@google.com> Create default InCallService with Context.BIND_IMPORTANT

Docs suggest that this is good to do when starting a service from an
activity.

Performance is too affected by b/18338152 to get accurate measurements
right now, but this change doesn't seem to hurt (~50ms faster across
9 runs, 3 runs per reboot).

Bug: 18373617

Change-Id: I235120f23ab972157653c9863f99511adbac747b
rc/com/android/server/telecom/InCallController.java
2660b2b1b8198b8ad344f3ba450640940fe94e25 14-Nov-2014 Andrew Lee <anwlee@google.com> am 549d9e2f: am e1f86eba: am aedf4587: Merge "Style quick responses to Dialer Material." into lmp-mr1-dev

* commit '549d9e2fcdd2a8fe652a16b637f5412616daefec':
Style quick responses to Dialer Material.
549d9e2fcdd2a8fe652a16b637f5412616daefec 14-Nov-2014 Andrew Lee <anwlee@google.com> am e1f86eba: am aedf4587: Merge "Style quick responses to Dialer Material." into lmp-mr1-dev

* commit 'e1f86eba13240706d9495db95bb26a7b0bb9e4fd':
Style quick responses to Dialer Material.
e1f86eba13240706d9495db95bb26a7b0bb9e4fd 14-Nov-2014 Andrew Lee <anwlee@google.com> am aedf4587: Merge "Style quick responses to Dialer Material." into lmp-mr1-dev

* commit 'aedf4587724bfce184bb0eaf020ae143605d0250':
Style quick responses to Dialer Material.
aedf4587724bfce184bb0eaf020ae143605d0250 14-Nov-2014 Andrew Lee <anwlee@google.com> Merge "Style quick responses to Dialer Material." into lmp-mr1-dev
fd053f46a6c4323f521ccf157a4d6ea29f7fd6e6 13-Nov-2014 Andrew Lee <anwlee@google.com> Style quick responses to Dialer Material.

This is replicating some assets and styles (in part) from Telephony,
but unlike Telephony we don't compile PhoneCommon into Telecom at
this time.

Most of this is to style the action bar the same as the "Dialer"
Telephony settings.

Bug: 18300861
Change-Id: Ic9eed11c81bf9205c89a508bb9271b621a9dc688
ndroidManifest.xml
es/drawable-hdpi/ic_arrow_back_white_24dp.png
es/drawable-hdpi/ic_more_vert_white_24dp.png
es/drawable-mdpi/ic_arrow_back_white_24dp.png
es/drawable-mdpi/ic_more_vert_white_24dp.png
es/drawable-xhdpi/ic_arrow_back_white_24dp.png
es/drawable-xhdpi/ic_more_vert_white_24dp.png
es/drawable-xxhdpi/ic_arrow_back_white_24dp.png
es/drawable-xxhdpi/ic_more_vert_white_24dp.png
es/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
es/drawable-xxxhdpi/ic_more_vert_white_24dp.png
es/drawable/ic_back_arrow.xml
es/values/colors.xml
es/values/dimens.xml
es/values/styles.xml
57c8fb843fb6813211935f56f7a9eb04593b521a 13-Nov-2014 Yorke Lee <yorkelee@google.com> am d20786bf: am 45087237: am d95ef5fc: Merge "Fix PhoneAccount parceling (2/2)" into lmp-mr1-dev

* commit 'd20786bf9527a893642c4e011e5b493b6ec49c1b':
Fix PhoneAccount parceling (2/2)
d20786bf9527a893642c4e011e5b493b6ec49c1b 13-Nov-2014 Yorke Lee <yorkelee@google.com> am 45087237: am d95ef5fc: Merge "Fix PhoneAccount parceling (2/2)" into lmp-mr1-dev

* commit '450872373385fefae367b1d93d5b1fd92185a4a5':
Fix PhoneAccount parceling (2/2)
450872373385fefae367b1d93d5b1fd92185a4a5 13-Nov-2014 Yorke Lee <yorkelee@google.com> am d95ef5fc: Merge "Fix PhoneAccount parceling (2/2)" into lmp-mr1-dev

* commit 'd95ef5fc8ae1b52bdf479848c5967b0c3e877f49':
Fix PhoneAccount parceling (2/2)
d95ef5fc8ae1b52bdf479848c5967b0c3e877f49 13-Nov-2014 Yorke Lee <yorkelee@google.com> Merge "Fix PhoneAccount parceling (2/2)" into lmp-mr1-dev
15acbc8ce9a94cf95088ed9f5b6b502c84e00bfb 13-Nov-2014 Geoff Mendal <mendal@google.com> am c4681bcd: (-s ours) am f293cc98: (-s ours) am a90d59b4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'c4681bcd164a9621a2021e74c6d7bbda261a6413':
Import translations. DO NOT MERGE
d6729429b7de4407c82b9e9f25843f3c17a5660f 13-Nov-2014 Geoff Mendal <mendal@google.com> am 7ab4e4f3: (-s ours) am 66a3f278: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '7ab4e4f3ada14636568ca6ab30edeb17b196fc5c':
Import translations. DO NOT MERGE
c4681bcd164a9621a2021e74c6d7bbda261a6413 13-Nov-2014 Geoff Mendal <mendal@google.com> am f293cc98: (-s ours) am a90d59b4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'f293cc980c772d42e77a3579e34545279289c75c':
Import translations. DO NOT MERGE
7ab4e4f3ada14636568ca6ab30edeb17b196fc5c 13-Nov-2014 Geoff Mendal <mendal@google.com> am 66a3f278: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '66a3f278ff51b7dcfdf35f387a55253d0c49ba21':
Import translations. DO NOT MERGE
f293cc980c772d42e77a3579e34545279289c75c 12-Nov-2014 Geoff Mendal <mendal@google.com> am a90d59b4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'a90d59b4d726c54dfaca5fc3f9909473a8b5ce43':
Import translations. DO NOT MERGE
f4d99568f534a1cb403d74124a0d280e65ed8caa 12-Nov-2014 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE"
66a3f278ff51b7dcfdf35f387a55253d0c49ba21 12-Nov-2014 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
a90d59b4d726c54dfaca5fc3f9909473a8b5ce43 12-Nov-2014 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
45968677daccef825fec8a4e8cdd32f017dabb7a 12-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I909b29f4684420bf30b67a7831f2c4b101ec0d68
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
e21481c6b506a65e88d39da832279a6c3362234e 12-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Icaca9f71a5012b1678710a66091004a73868a900
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
addfada961e706cd57cd63b9a3a113e0f206103b 12-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I84e8b76c3a447306dfa0ef18a6928907730d522b
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
02b462f76b26fdd2bfa21b12387c7abe8a3af56b 12-Nov-2014 Yorke Lee <yorkelee@google.com> am fd963a9c: am 818b2623: am 36e3ada7: Merge "Cleanup and remove call if ConnectionService crashes" into lmp-mr1-dev

* commit 'fd963a9c9129cedbebca7ba7072303f31c212ae2':
Cleanup and remove call if ConnectionService crashes
fd963a9c9129cedbebca7ba7072303f31c212ae2 12-Nov-2014 Yorke Lee <yorkelee@google.com> am 818b2623: am 36e3ada7: Merge "Cleanup and remove call if ConnectionService crashes" into lmp-mr1-dev

* commit '818b26232108ef627fb68f781e5aa65279c9f4b3':
Cleanup and remove call if ConnectionService crashes
818b26232108ef627fb68f781e5aa65279c9f4b3 12-Nov-2014 Yorke Lee <yorkelee@google.com> am 36e3ada7: Merge "Cleanup and remove call if ConnectionService crashes" into lmp-mr1-dev

* commit '36e3ada72c816a3802f43bc6116cbf1b7c24f18e':
Cleanup and remove call if ConnectionService crashes
36e3ada72c816a3802f43bc6116cbf1b7c24f18e 12-Nov-2014 Yorke Lee <yorkelee@google.com> Merge "Cleanup and remove call if ConnectionService crashes" into lmp-mr1-dev
ad4565e36bca27b95579138c1d9feff53f4b2cbc 12-Nov-2014 Ihab Awad <ihab@google.com> am 452f7042: Merge "Update PhoneAccount icon API (5/6)" into lmp-mr1-dev automerge: 76efe1d
automerge: 26c960f

* commit '26c960f5b3e9972013a8053880ad5a7ecc9e961c':
Update PhoneAccount icon API (5/6)
6ece28387a75e4a8c904b0d3a075dc33114005a3 12-Nov-2014 Nancy Chen <nancychen@google.com> am 679dc23e: Merge "String resource edits for Telecomm" into lmp-mr1-dev automerge: 0cd27fd
automerge: 7c7e628

* commit '7c7e628800e78fce0b53a4e0d7b8dafcec94f486':
String resource edits for Telecomm
156ae5b83be86098f180335ea940a377667d0698 12-Nov-2014 Ihab Awad <ihab@google.com> Fix PhoneAccount parceling (2/2)

Bug: 18343731
Change-Id: Ib3867448e7731160bc478659d0297a2044050972
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
2af16b65f88fcb84d15b701f8f112f7f5a443eaf 12-Nov-2014 Yorke Lee <yorkelee@google.com> Cleanup and remove call if ConnectionService crashes

Make sure that call is removed from CallsManager if its
ConnectionService crashes.

Verified fix with TestConnectionManager.

Bug: 18262469
Change-Id: Idae71186b6547cb5a4c89e273c779eef030a2952
rc/com/android/server/telecom/CallsManager.java
26c960f5b3e9972013a8053880ad5a7ecc9e961c 12-Nov-2014 Ihab Awad <ihab@google.com> am 452f7042: Merge "Update PhoneAccount icon API (5/6)" into lmp-mr1-dev
automerge: 76efe1d

* commit '76efe1d94baad84eb9b53503aafd21b09a6ee389':
Update PhoneAccount icon API (5/6)
7c7e628800e78fce0b53a4e0d7b8dafcec94f486 12-Nov-2014 Nancy Chen <nancychen@google.com> am 679dc23e: Merge "String resource edits for Telecomm" into lmp-mr1-dev
automerge: 0cd27fd

* commit '0cd27fd6e87fc6d1251f52c9ea8ecd59766266ab':
String resource edits for Telecomm
76efe1d94baad84eb9b53503aafd21b09a6ee389 12-Nov-2014 Ihab Awad <ihab@google.com> am 452f7042: Merge "Update PhoneAccount icon API (5/6)" into lmp-mr1-dev

* commit '452f70427b089f0d56bfac70b849f79b3268f1c2':
Update PhoneAccount icon API (5/6)
0cd27fd6e87fc6d1251f52c9ea8ecd59766266ab 11-Nov-2014 Nancy Chen <nancychen@google.com> am 679dc23e: Merge "String resource edits for Telecomm" into lmp-mr1-dev

* commit '679dc23ebb31a54d3c5c4e161269abe3c5f851e5':
String resource edits for Telecomm
452f70427b089f0d56bfac70b849f79b3268f1c2 11-Nov-2014 Ihab Awad <ihab@google.com> Merge "Update PhoneAccount icon API (5/6)" into lmp-mr1-dev
679dc23ebb31a54d3c5c4e161269abe3c5f851e5 11-Nov-2014 Nancy Chen <nancychen@google.com> Merge "String resource edits for Telecomm" into lmp-mr1-dev
4f29e5dbe1607d8e8b36d9c0d9690b0736a7a8c4 11-Nov-2014 Yorke Lee <yorkelee@google.com> am 38550ceb: am a01b656e: Set appropriate capabilities to TestConference automerge: 410eeb4

* commit '38550cebc7b504a49882f636933de3a7d7870212':
Set appropriate capabilities to TestConference
38550cebc7b504a49882f636933de3a7d7870212 11-Nov-2014 Yorke Lee <yorkelee@google.com> am a01b656e: Set appropriate capabilities to TestConference
automerge: 410eeb4

* commit '410eeb46966bb10e2c19fdc42d813f07b52540cc':
Set appropriate capabilities to TestConference
7e2c7f34dde14afd18c13d39777331ec2ef3a46a 03-Nov-2014 Ihab Awad <ihab@google.com> Update PhoneAccount icon API (5/6)

Bug: 18291787

Change-Id: I0b83c0d36c67e12c27355d0893a0fa78a4f3aaa6
ndroidManifest.xml
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/testapps/CallServiceNotifier.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
d9d9e643755e325fdf5f2b5caa616c38a53e4c85 11-Nov-2014 Nancy Chen <nancychen@google.com> String resource edits for Telecomm

Adjust strings in Telecomm per ewong@'s edits.

Bug: 17446974
Change-Id: Ife5fa5d05e8c0bd0bc205c7f4fce1290e5ace55b
es/values/strings.xml
410eeb46966bb10e2c19fdc42d813f07b52540cc 11-Nov-2014 Yorke Lee <yorkelee@google.com> am a01b656e: Set appropriate capabilities to TestConference

* commit 'a01b656e2f068646d787adb272377819871642a9':
Set appropriate capabilities to TestConference
a01b656e2f068646d787adb272377819871642a9 10-Nov-2014 Yorke Lee <yorkelee@google.com> Set appropriate capabilities to TestConference

This allows the "Manage conference" screen to show up correctly
for test conference calls

Bug: 18269622
Change-Id: I8467654a8158c5da8c354057f613f122b22a0ed3
ests/src/com/android/server/telecom/testapps/TestConnectionService.java
aad7a30b3814c7d504b8d12720715aaff1d1a5ef 10-Nov-2014 Santos Cordon <santoscordon@google.com> am 5f224589: am 926f57cd: Merge "Make add-call a global property of telecom. (2/4)" into lmp-mr1-dev automerge: d547a4b

* commit '5f2245896c0efc8e05de8e7e15589a87b52a9dec':
Make add-call a global property of telecom. (2/4)
5f2245896c0efc8e05de8e7e15589a87b52a9dec 10-Nov-2014 Santos Cordon <santoscordon@google.com> am 926f57cd: Merge "Make add-call a global property of telecom. (2/4)" into lmp-mr1-dev automerge: d547a4b

* commit '926f57cd674632d6a6dbf6ada617cef9b56b8e29':
Make add-call a global property of telecom. (2/4)
926f57cd674632d6a6dbf6ada617cef9b56b8e29 10-Nov-2014 Santos Cordon <santoscordon@google.com> Merge "Make add-call a global property of telecom. (2/4)" into lmp-mr1-dev
automerge: d547a4b

* commit 'd547a4b030c5e99023b8c3d7336c77f1f68686a9':
Make add-call a global property of telecom. (2/4)
d547a4b030c5e99023b8c3d7336c77f1f68686a9 10-Nov-2014 Santos Cordon <santoscordon@google.com> Merge "Make add-call a global property of telecom. (2/4)" into lmp-mr1-dev
1564a2fd591ab115f2c29f68b9872d66c585963b 08-Nov-2014 Santos Cordon <santoscordon@google.com> am f35579a1: Merge "Revert "Telecom, Telephony share a process."" into lmp-mr1-dev automerge: 7450251
automerge: 372062e

* commit '372062e219a5efb96ecc672832874f19a4965e59':
Revert "Telecom, Telephony share a process."
372062e219a5efb96ecc672832874f19a4965e59 08-Nov-2014 Santos Cordon <santoscordon@google.com> am f35579a1: Merge "Revert "Telecom, Telephony share a process."" into lmp-mr1-dev automerge: 7450251

* commit 'f35579a18011c29789ea8ca001db19191e0c48d0':
Revert "Telecom, Telephony share a process."
f35579a18011c29789ea8ca001db19191e0c48d0 08-Nov-2014 Santos Cordon <santoscordon@google.com> Merge "Revert "Telecom, Telephony share a process."" into lmp-mr1-dev
automerge: 7450251

* commit '74502518ffef536f3cb49eb1fd9ab2758abcf950':
Revert "Telecom, Telephony share a process."
74502518ffef536f3cb49eb1fd9ab2758abcf950 08-Nov-2014 Santos Cordon <santoscordon@google.com> Merge "Revert "Telecom, Telephony share a process."" into lmp-mr1-dev
52da7036afa9f2450fa703b6744925dc7550353d 08-Nov-2014 Santos Cordon <santoscordon@google.com> Revert "Telecom, Telephony share a process."

This reverts commit 2be04fc3c9c9d5ff14b67b06c0af6ea9422977b2.

Change-Id: I6f595086c23a07f46fe857e44587a7efb86113a6
ndroidManifest.xml
91bd74cbe13428643a73acb5c7fd5d7dd136b6d9 08-Nov-2014 Santos Cordon <santoscordon@google.com> Make add-call a global property of telecom. (2/4)

ADD_CALL didn't make sense as a property of Connection or Call.
This changes it to be a global property instead.

Bug: 18285352
Change-Id: I5189e114e74dba2d81d74c6d24cf5b17f1e0922a
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/InCallController.java
ests/src/com/android/server/telecom/testapps/TestConnectionService.java
554ddb2de8a591a4f7bfec7c0d002158e815afff 07-Nov-2014 Nancy Chen <nancychen@google.com> am 90f4cb5e: am ad4fe7b7: Merge "Add a subId extra to the respond via SMS intent." into lmp-mr1-dev automerge: 556cb9d

* commit '90f4cb5e555710ef65719a38f16528761ec6cdba':
Add a subId extra to the respond via SMS intent.
90f4cb5e555710ef65719a38f16528761ec6cdba 07-Nov-2014 Nancy Chen <nancychen@google.com> am ad4fe7b7: Merge "Add a subId extra to the respond via SMS intent." into lmp-mr1-dev automerge: 556cb9d

* commit 'ad4fe7b79476ba7eaab360de9d46b59c1780657c':
Add a subId extra to the respond via SMS intent.
ad4fe7b79476ba7eaab360de9d46b59c1780657c 07-Nov-2014 Nancy Chen <nancychen@google.com> Merge "Add a subId extra to the respond via SMS intent." into lmp-mr1-dev
automerge: 556cb9d

* commit '556cb9ded3be3e4023bc06bc98f1d156255357d6':
Add a subId extra to the respond via SMS intent.
556cb9ded3be3e4023bc06bc98f1d156255357d6 07-Nov-2014 Nancy Chen <nancychen@google.com> Merge "Add a subId extra to the respond via SMS intent." into lmp-mr1-dev
bc88ad13f74cbc4dc4313454ab0a810fe3938ce5 07-Nov-2014 Sailesh Nepal <sail@google.com> am 8920d2e2: am 365cd054: am f80aeb11: Merge "Continue processing calls that don\'t connect" into lmp-mr1-dev

* commit '8920d2e246dc1c3271f30f7d374169d0681a3c8d':
Continue processing calls that don't connect
8920d2e246dc1c3271f30f7d374169d0681a3c8d 07-Nov-2014 Sailesh Nepal <sail@google.com> am 365cd054: am f80aeb11: Merge "Continue processing calls that don\'t connect" into lmp-mr1-dev

* commit '365cd054db4f1940f1568d847af111d088c29160':
Continue processing calls that don't connect
365cd054db4f1940f1568d847af111d088c29160 07-Nov-2014 Sailesh Nepal <sail@google.com> am f80aeb11: Merge "Continue processing calls that don\'t connect" into lmp-mr1-dev

* commit 'f80aeb113a0ec12538435f03cc86f1ebce518573':
Continue processing calls that don't connect
f80aeb113a0ec12538435f03cc86f1ebce518573 07-Nov-2014 Sailesh Nepal <sail@google.com> Merge "Continue processing calls that don't connect" into lmp-mr1-dev
752cacbc0b88b9b4cb4ab7bd547e17b5d2690693 06-Nov-2014 Sailesh Nepal <sail@google.com> Continue processing calls that don't connect

If a call goes from DIALING to DISCONNECTED and there are
unprocessed phone accounts then we continue processing.

This fixes a problem where we didn't fallback to the
connection manager for emergency calls.

Bug: 16192560
Change-Id: Ic693a810e4a386f7fdb6f36700d95c8bbd325d0b
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
3089fa6c20745846531e3b3e7d780f0196662fe0 07-Nov-2014 Yorke Lee <yorkelee@google.com> am 96bfaf9e: am 3f92aa2b: am 00b9d0f8: Merge "Add SIP support to TestCallActivity" into lmp-mr1-dev

* commit '96bfaf9e4bd3d309087e772dfbf6d8cb8d9ff008':
Add SIP support to TestCallActivity
96bfaf9e4bd3d309087e772dfbf6d8cb8d9ff008 07-Nov-2014 Yorke Lee <yorkelee@google.com> am 3f92aa2b: am 00b9d0f8: Merge "Add SIP support to TestCallActivity" into lmp-mr1-dev

* commit '3f92aa2bfdb17fe7569e92948773d4dad7a0aac8':
Add SIP support to TestCallActivity
3f92aa2bfdb17fe7569e92948773d4dad7a0aac8 07-Nov-2014 Yorke Lee <yorkelee@google.com> am 00b9d0f8: Merge "Add SIP support to TestCallActivity" into lmp-mr1-dev

* commit '00b9d0f8fcf5c0dbb0e68fa895052369a298d397':
Add SIP support to TestCallActivity
00b9d0f8fcf5c0dbb0e68fa895052369a298d397 07-Nov-2014 Yorke Lee <yorkelee@google.com> Merge "Add SIP support to TestCallActivity" into lmp-mr1-dev
6ae4c99172fea38e16055e51484e550e6bba4aa1 06-Nov-2014 Nancy Chen <nancychen@google.com> Add a subId extra to the respond via SMS intent.

In order to support replying to a caller via the same SIM that the
incoming call came through, add an extra to the respond via SMS intent
with the subId.

Bug: 18275919
Change-Id: I48ea3246194cb957045f12fea92a473ac0edaa23
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/RespondViaSmsManager.java
c33769b2a36998b2719eda56b27e611e7230dfd9 07-Nov-2014 Santos Cordon <santoscordon@google.com> am 146a6bde: am a0d775fa: am 68f209b2: Merge "TestConnectionService needs more permissions!" into lmp-mr1-dev

* commit '146a6bdeb0903ee910941bd92595b6a16242525e':
TestConnectionService needs more permissions!
b6129513e478f1608222ae02f7a886513367f335 07-Nov-2014 Santos Cordon <santoscordon@google.com> am 23876fb6: am 2b82cf6b: am f1a6458c: Merge "Telecom, Telephony share a process." into lmp-mr1-dev

* commit '23876fb68cc177eb73ac001f5a229941e1983171':
Telecom, Telephony share a process.
3d7315c9281a3278b664e40b8fb9961bc9f74f38 07-Nov-2014 mike dooley <mdooley@google.com> am 2051a4b6: am 2e3bfe78: Merge "Checking that the connection service can be resolved when setting new connection manager." into lmp-mr1-dev automerge: 6f2c1eb

* commit '2051a4b69c1416f99c95c6df2867bfb6e46baa71':
Checking that the connection service can be resolved when setting new connection manager.
1469d318a98cd64eb700accbd129ddbf6945ae23 07-Nov-2014 Yorke Lee <yorkelee@google.com> am 0def7d1d: am 4b0436b8: Merge "Don\'t set voicemail handle to null" into lmp-mr1-dev automerge: 9644c42

* commit '0def7d1d462a85fa09e0e452b7d5798c68c1c409':
Don't set voicemail handle to null
6e4eea418e53931df0bbb6b3f2d2a856e4b1aa6b 07-Nov-2014 Santos Cordon <santoscordon@google.com> am 0dfd4ed9: am ed15c414: Merge "Reuse calls canceled through NEW_OUTGOING_CALL broadcast." into lmp-mr1-dev automerge: 4a04e84

* commit '0dfd4ed9e3f3ef036d69f6cb9ddc659caef1cb78':
Reuse calls canceled through NEW_OUTGOING_CALL broadcast.
146a6bdeb0903ee910941bd92595b6a16242525e 07-Nov-2014 Santos Cordon <santoscordon@google.com> am a0d775fa: am 68f209b2: Merge "TestConnectionService needs more permissions!" into lmp-mr1-dev

* commit 'a0d775fad2b98b2676df5d9368d66a1176a9e4da':
TestConnectionService needs more permissions!
a0d775fad2b98b2676df5d9368d66a1176a9e4da 07-Nov-2014 Santos Cordon <santoscordon@google.com> am 68f209b2: Merge "TestConnectionService needs more permissions!" into lmp-mr1-dev

* commit '68f209b244e35b5c39d36a23894ef92e3b434ac8':
TestConnectionService needs more permissions!
68f209b244e35b5c39d36a23894ef92e3b434ac8 07-Nov-2014 Santos Cordon <santoscordon@google.com> Merge "TestConnectionService needs more permissions!" into lmp-mr1-dev
23876fb68cc177eb73ac001f5a229941e1983171 07-Nov-2014 Santos Cordon <santoscordon@google.com> am 2b82cf6b: am f1a6458c: Merge "Telecom, Telephony share a process." into lmp-mr1-dev

* commit '2b82cf6b4e368cd399920e4c1f881fe442261e09':
Telecom, Telephony share a process.
2b82cf6b4e368cd399920e4c1f881fe442261e09 07-Nov-2014 Santos Cordon <santoscordon@google.com> am f1a6458c: Merge "Telecom, Telephony share a process." into lmp-mr1-dev

* commit 'f1a6458c87056ca53d1f4c7df85231cfc0975b29':
Telecom, Telephony share a process.
f1a6458c87056ca53d1f4c7df85231cfc0975b29 07-Nov-2014 Santos Cordon <santoscordon@google.com> Merge "Telecom, Telephony share a process." into lmp-mr1-dev
32a4eb78939f18b447ecef889ced561cb4aab2fa 07-Nov-2014 Yorke Lee <yorkelee@google.com> Add SIP support to TestCallActivity

Bug: 18094576
Change-Id: I5c61a2be433955aa29e00696364c9ec3f7d18824
ests/AndroidManifest.xml
2be04fc3c9c9d5ff14b67b06c0af6ea9422977b2 07-Nov-2014 Santos Cordon <santoscordon@google.com> Telecom, Telephony share a process.

Bug: 18112269
Change-Id: I6d8ff447f202d91fe0d29f8f734624e4f4398dc7
ndroidManifest.xml
2051a4b69c1416f99c95c6df2867bfb6e46baa71 07-Nov-2014 mike dooley <mdooley@google.com> am 2e3bfe78: Merge "Checking that the connection service can be resolved when setting new connection manager." into lmp-mr1-dev automerge: 6f2c1eb

* commit '2e3bfe78a844d3340ed882d9dfe8319f22582a30':
Checking that the connection service can be resolved when setting new connection manager.
0def7d1d462a85fa09e0e452b7d5798c68c1c409 07-Nov-2014 Yorke Lee <yorkelee@google.com> am 4b0436b8: Merge "Don\'t set voicemail handle to null" into lmp-mr1-dev automerge: 9644c42

* commit '4b0436b8ecf962105261e7e3bbea8da9fe6d466a':
Don't set voicemail handle to null
0dfd4ed9e3f3ef036d69f6cb9ddc659caef1cb78 07-Nov-2014 Santos Cordon <santoscordon@google.com> am ed15c414: Merge "Reuse calls canceled through NEW_OUTGOING_CALL broadcast." into lmp-mr1-dev automerge: 4a04e84

* commit 'ed15c414a4cf80429f9613d2c5cfd915186b381b':
Reuse calls canceled through NEW_OUTGOING_CALL broadcast.
eee6fa52b58aaaf75a4f042d5975ce8732de2840 07-Nov-2014 Santos Cordon <santoscordon@google.com> TestConnectionService needs more permissions!

Bug: 18280189
Change-Id: I2fdc9b531ebd08de44bb4d48b545b2d2e643b266
ests/AndroidManifest.xml
2e3bfe78a844d3340ed882d9dfe8319f22582a30 07-Nov-2014 mike dooley <mdooley@google.com> Merge "Checking that the connection service can be resolved when setting new connection manager." into lmp-mr1-dev
automerge: 6f2c1eb

* commit '6f2c1ebb26b3e1837ac69dcc5394b365b32ea430':
Checking that the connection service can be resolved when setting new connection manager.
4b0436b8ecf962105261e7e3bbea8da9fe6d466a 07-Nov-2014 Yorke Lee <yorkelee@google.com> Merge "Don\'t set voicemail handle to null" into lmp-mr1-dev
automerge: 9644c42

* commit '9644c42647f39d710d9d2900cdf6400e00e23ffe':
Don't set voicemail handle to null
ed15c414a4cf80429f9613d2c5cfd915186b381b 07-Nov-2014 Santos Cordon <santoscordon@google.com> Merge "Reuse calls canceled through NEW_OUTGOING_CALL broadcast." into lmp-mr1-dev
automerge: 4a04e84

* commit '4a04e84a3c247b7b2f6021fa9be7d4e89e8630cf':
Reuse calls canceled through NEW_OUTGOING_CALL broadcast.
6f2c1ebb26b3e1837ac69dcc5394b365b32ea430 07-Nov-2014 mike dooley <mdooley@google.com> Merge "Checking that the connection service can be resolved when setting new connection manager." into lmp-mr1-dev
9644c42647f39d710d9d2900cdf6400e00e23ffe 07-Nov-2014 Yorke Lee <yorkelee@google.com> Merge "Don't set voicemail handle to null" into lmp-mr1-dev
4a04e84a3c247b7b2f6021fa9be7d4e89e8630cf 07-Nov-2014 Santos Cordon <santoscordon@google.com> Merge "Reuse calls canceled through NEW_OUTGOING_CALL broadcast." into lmp-mr1-dev
10a5831cf61b3ab3b126329044ea05dc3181fa63 06-Nov-2014 mike dooley <mdooley@google.com> Checking that the connection service can be resolved when setting
new connection manager.

This is to fix an edge case where downgrading could cause an invalid
connection manager to be set, resulting in all calls failing.

Also filtering out unresolveable phone accounts (which prevents the UI
from showing invalid choices).

Bug: 18225329
Change-Id: If46dea2937af42b81d3d7062c385f98370015cbe
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
96e662d3811673f284da0f9d2deabe939918a3b1 06-Nov-2014 Yorke Lee <yorkelee@google.com> Don't set voicemail handle to null

Voicemail handles have empty numbers, keep them as-is so that
they can be correctly handled in Telephony.

Bug: 18275014

Change-Id: Ia6c9d004e978e8a121944b50fd84c178624b0a7f
rc/com/android/server/telecom/Call.java
cf5b2918ca58b155911a66222ae5b4d21cb5b8ec 06-Nov-2014 Santos Cordon <santoscordon@google.com> Reuse calls canceled through NEW_OUTGOING_CALL broadcast.

When a call is canceled because of NEW_OUTGOING_CALL broadcast,
we no longer remove it immediately. This code adds a 200ms delay.
The 200ms delay is long enough that if an app reposts another call
to the same number (with a gateway number, for example), instead of
destroying and recreating the call, we attempt to reuse the existing
one. This eliminates the jank in the UI caused by the call being
destroyed and a new one recreated.

Bug: 17692408
Change-Id: I225a4fcc6f00d764cf76595f15f6d2d0785b9fe2
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/Timeouts.java
baa984226a329ba081f9eccee05b861850fe0f22 06-Nov-2014 Sailesh Nepal <sail@google.com> am 52c616b7: am 5334f660: am e4696770: Merge "Add connection manager fallback" into lmp-mr1-dev

* commit '52c616b7b55b953252c0203af614413b6f7cd9f1':
Add connection manager fallback
52c616b7b55b953252c0203af614413b6f7cd9f1 06-Nov-2014 Sailesh Nepal <sail@google.com> am 5334f660: am e4696770: Merge "Add connection manager fallback" into lmp-mr1-dev

* commit '5334f660913aafc255fcbc821dfeef33368421ed':
Add connection manager fallback
f877330673b77306f177773070b99f7f2f5ae663 06-Nov-2014 Santos Cordon <santoscordon@google.com> am d55da226: am 4e88f448: Don\'t show quick response messages for private numbers. automerge: ecaaeac

* commit 'd55da226450501d373aecdcfdf100ecb5103ac6a':
Don't show quick response messages for private numbers.
5334f660913aafc255fcbc821dfeef33368421ed 06-Nov-2014 Sailesh Nepal <sail@google.com> am e4696770: Merge "Add connection manager fallback" into lmp-mr1-dev

* commit 'e4696770d0160c084bb69b1a285a000175300025':
Add connection manager fallback
d55da226450501d373aecdcfdf100ecb5103ac6a 06-Nov-2014 Santos Cordon <santoscordon@google.com> am 4e88f448: Don\'t show quick response messages for private numbers. automerge: ecaaeac

* commit '4e88f4483c8b40ea866d179a313c05b230e08c14':
Don't show quick response messages for private numbers.
e4696770d0160c084bb69b1a285a000175300025 06-Nov-2014 Sailesh Nepal <sail@google.com> Merge "Add connection manager fallback" into lmp-mr1-dev
4e88f4483c8b40ea866d179a313c05b230e08c14 06-Nov-2014 Santos Cordon <santoscordon@google.com> Don\'t show quick response messages for private numbers.
automerge: ecaaeac

* commit 'ecaaeac225ada350b9b3acfb485583cc388050de':
Don't show quick response messages for private numbers.
ecaaeac225ada350b9b3acfb485583cc388050de 06-Nov-2014 Santos Cordon <santoscordon@google.com> Don't show quick response messages for private numbers.

The respond-to-sms code was seeing "tel:" as the uri address, so I
updated the code so that restricted, unknown, and the above example all
get translated to a null address. This forces everything to work as
intended.

Bug: 18092431
Change-Id: Ibad1b510afd523268a9a37e2f48d0d62a7a7ebe4
rc/com/android/server/telecom/BluetoothPhoneService.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/RespondViaSmsManager.java
bafadce53332c7e0f7be0482cf04333c72487a70 06-Nov-2014 Sailesh Nepal <sail@google.com> Add connection manager fallback

With this CL we fallback to not using a connection manager in
two cases:
- if the connection manager disconnects a call with
CONNECTION_MANAGER_NOT_SUPPORTED
- or if the connection manager crashed while creating the connection

Bug: 16903083
Change-Id: I05822991c5c34ca3533652a10fbcb8845a604925
rc/com/android/server/telecom/CreateConnectionProcessor.java
9f464e5c6d5c800be64acae1fab88f3de99f284e 04-Nov-2014 Nancy Chen <nancychen@google.com> am 4a24b6ac: am 3f10c244: am 64883a94: Merge "Adn queries for multi-SIM. (3/3)" into lmp-mr1-dev

* commit '4a24b6acfb3d74819b4251358bd26bab20946c3d':
Adn queries for multi-SIM. (3/3)
4a24b6acfb3d74819b4251358bd26bab20946c3d 04-Nov-2014 Nancy Chen <nancychen@google.com> am 3f10c244: am 64883a94: Merge "Adn queries for multi-SIM. (3/3)" into lmp-mr1-dev

* commit '3f10c2440f4d5382b38066ecf7379aad89430131':
Adn queries for multi-SIM. (3/3)
3f10c2440f4d5382b38066ecf7379aad89430131 04-Nov-2014 Nancy Chen <nancychen@google.com> am 64883a94: Merge "Adn queries for multi-SIM. (3/3)" into lmp-mr1-dev

* commit '64883a9430c9245d4884af05787c79ab16ccdb42':
Adn queries for multi-SIM. (3/3)
64883a9430c9245d4884af05787c79ab16ccdb42 04-Nov-2014 Nancy Chen <nancychen@google.com> Merge "Adn queries for multi-SIM. (3/3)" into lmp-mr1-dev
c28f260236e32c2aa47011bcdc557305c988e7e8 31-Oct-2014 Nancy Chen <nancychen@google.com> Adn queries for multi-SIM. (3/3)

Process Telecom method to take in a subscription account and
return the URI for an ADN query for that account.

Bug: 17917937

Change-Id: Idedbe1c6fc63d21c7673c50c1d7894ba981d27ea
rc/com/android/server/telecom/TelecomServiceImpl.java
fea9213f3399b4a96de723019852f67a33be49bc 03-Nov-2014 Santos Cordon <santoscordon@google.com> am 4431f535: am 3b6ffc27: am 6e557e04: Merge "Use new telecom PhoneAccount registration permissions." into lmp-mr1-dev

* commit '4431f53519d2b6d959902ea745b069a47361a2d8':
Use new telecom PhoneAccount registration permissions.
4431f53519d2b6d959902ea745b069a47361a2d8 03-Nov-2014 Santos Cordon <santoscordon@google.com> am 3b6ffc27: am 6e557e04: Merge "Use new telecom PhoneAccount registration permissions." into lmp-mr1-dev

* commit '3b6ffc27d6047176c09065b5ee0ee4c25151a9eb':
Use new telecom PhoneAccount registration permissions.
3b6ffc27d6047176c09065b5ee0ee4c25151a9eb 03-Nov-2014 Santos Cordon <santoscordon@google.com> am 6e557e04: Merge "Use new telecom PhoneAccount registration permissions." into lmp-mr1-dev

* commit '6e557e0453352823fba703664eb6fcebad9f961a':
Use new telecom PhoneAccount registration permissions.
6e557e0453352823fba703664eb6fcebad9f961a 03-Nov-2014 Santos Cordon <santoscordon@google.com> Merge "Use new telecom PhoneAccount registration permissions." into lmp-mr1-dev
0b4ce8e6947ddbebd79b51017e780bda0ef692ea 01-Nov-2014 Nancy Chen <nancychen@google.com> am 390b5d5c: am b1c30439: am 4ffff831: Merge "Handle MMI for multi-SIM (2/3)" into lmp-mr1-dev

* commit '390b5d5caa1df76437c5dc80129b4e7f1b98dcbc':
Handle MMI for multi-SIM (2/3)
390b5d5caa1df76437c5dc80129b4e7f1b98dcbc 01-Nov-2014 Nancy Chen <nancychen@google.com> am b1c30439: am 4ffff831: Merge "Handle MMI for multi-SIM (2/3)" into lmp-mr1-dev

* commit 'b1c304390127f1acc24d7ef17e91b4f567b0b6cc':
Handle MMI for multi-SIM (2/3)
b1c304390127f1acc24d7ef17e91b4f567b0b6cc 31-Oct-2014 Nancy Chen <nancychen@google.com> am 4ffff831: Merge "Handle MMI for multi-SIM (2/3)" into lmp-mr1-dev

* commit '4ffff831de7ae9ff960da92970a0073d6e369a0d':
Handle MMI for multi-SIM (2/3)
4ffff831de7ae9ff960da92970a0073d6e369a0d 31-Oct-2014 Nancy Chen <nancychen@google.com> Merge "Handle MMI for multi-SIM (2/3)" into lmp-mr1-dev
6be5e8c2a234f60a248c6ae6f4e3803574c20e06 31-Oct-2014 Santos Cordon <santoscordon@google.com> Use new telecom PhoneAccount registration permissions.

Bug: 18106506
Change-Id: Ic825b44c2dc42709073a3990f6a7ca8e372025e9
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/AndroidManifest.xml
c0e7139e5d98a34911a1f30e9558e1365fe48715 31-Oct-2014 Baligh Uddin <baligh@google.com> am f40ec166: (-s ours) am 88d44c3f: (-s ours) Import translations. DO NOT MERGE

* commit 'f40ec1661a729e7701e48e166c1ef8f171cd93fd':
Import translations. DO NOT MERGE
f40ec1661a729e7701e48e166c1ef8f171cd93fd 31-Oct-2014 Baligh Uddin <baligh@google.com> am 88d44c3f: (-s ours) Import translations. DO NOT MERGE

* commit '88d44c3fdb01d714c361aca74ba9724c555c651f':
Import translations. DO NOT MERGE
c775377d9c6fe27e6822397908a59d0f41d28280 31-Oct-2014 Tyler Gunn <tgunn@google.com> am 399f8516: am 84db3377: Creating connections for conference event package participants. automerge: 6e2b94e

* commit '399f8516a70f103496782ee09fdff05b8d8a378e':
Creating connections for conference event package participants.
399f8516a70f103496782ee09fdff05b8d8a378e 31-Oct-2014 Tyler Gunn <tgunn@google.com> am 84db3377: Creating connections for conference event package participants. automerge: 6e2b94e

* commit '84db3377e94088df5bb0c89138ec354003622b58':
Creating connections for conference event package participants.
84db3377e94088df5bb0c89138ec354003622b58 31-Oct-2014 Tyler Gunn <tgunn@google.com> Creating connections for conference event package participants.
automerge: 6e2b94e

* commit '6e2b94eae72c72b11358fdb99f87471b5ab11e4f':
Creating connections for conference event package participants.
88d44c3fdb01d714c361aca74ba9724c555c651f 31-Oct-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I5aef7fc7951ea858c50ade5636a4f5b9614891da
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
90218ba7565f8299b70c81a0fa5d90b7d7e87c07 30-Oct-2014 Geoff Mendal <mendal@google.com> am 0ed051c2: (-s ours) am 9b8badbc: (-s ours) Import translations. DO NOT MERGE automerge: d21f8fc -s ours

* commit '0ed051c20b2b692e6cea45c676c19a27b44d9871':
Import translations. DO NOT MERGE
0ed051c20b2b692e6cea45c676c19a27b44d9871 30-Oct-2014 Geoff Mendal <mendal@google.com> am 9b8badbc: (-s ours) Import translations. DO NOT MERGE
automerge: d21f8fc -s ours

* commit 'd21f8fc1078197996dcfb4fadf1d72af2d698c7c':
Import translations. DO NOT MERGE
31a066544b778ce9fadc21aa905122656bdaeab0 30-Oct-2014 Anthony Lee <anthonylee@google.com> am 3d76c514: am b664954e: Clear account using TelecomManager not CallsManager. automerge: aa80545

* commit '3d76c5142d5fb533ce1d0fb512137c5694a1ca50':
Clear account using TelecomManager not CallsManager.
3d76c5142d5fb533ce1d0fb512137c5694a1ca50 30-Oct-2014 Anthony Lee <anthonylee@google.com> am b664954e: Clear account using TelecomManager not CallsManager.
automerge: aa80545

* commit 'aa80545c6ff36a244c6b356d59334ef9600adfff':
Clear account using TelecomManager not CallsManager.
94ce06bcb43c7b56edf8ab5ed16ea23771c31f6e 30-Oct-2014 Geoff Mendal <mendal@google.com> am f67cf060: (-s ours) am 3955e6d2: (-s ours) Import translations. DO NOT MERGE

* commit 'f67cf060eb5804a307dbde174989fa1ddc7cc796':
Import translations. DO NOT MERGE
e84e76f6fa27ab728a77fc7c7a7019a5191bbb09 30-Oct-2014 Ihab Awad <ihab@google.com> am 43d6f970: PhoneAccounts include literal icon bitmap (3/4) automerge: d9f5438 automerge: 9931b4c

* commit '43d6f97057833d7de33ca479c15c67a5000efc99':
PhoneAccounts include literal icon bitmap (3/4)
6e2b94eae72c72b11358fdb99f87471b5ab11e4f 30-Oct-2014 Tyler Gunn <tgunn@google.com> Creating connections for conference event package participants.

- Add "addExistingCall" method to Connection service wrapper to handle
the creation of new calls for connections which already exist in telephony.
- Fixed but in setIsConference message where an isValidCallId check made
outside of the handler would result in a newly added call NOT being
marked as conferenced due to a race condition. The MSG_SET_IS_CONFERENCED
handler already checks if the call exists before performing its operation.

Bug: 18057361
Change-Id: I2348c8e6985cd831f2cae56b37dfcb33bae014a8
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
f67cf060eb5804a307dbde174989fa1ddc7cc796 30-Oct-2014 Geoff Mendal <mendal@google.com> am 3955e6d2: (-s ours) Import translations. DO NOT MERGE

* commit '3955e6d2afde5d7f10eb0eae065916fb20f32464':
Import translations. DO NOT MERGE
43d6f97057833d7de33ca479c15c67a5000efc99 30-Oct-2014 Ihab Awad <ihab@google.com> PhoneAccounts include literal icon bitmap (3/4) automerge: d9f5438
automerge: 9931b4c

* commit '9931b4c2a3bfce01483f2bdd332371e4a2cf32a0':
PhoneAccounts include literal icon bitmap (3/4)
3ab204c11eb56bbf1fa5a0b4343b2382614bb46e 17-Oct-2014 Nancy Chen <nancychen@google.com> Handle MMI for multi-SIM (2/3)

+ Add Telecomm and Telephony methods for handlePinMMIForSubscriber
+ Add Select Account dialog in Dialer for MMI

Bug: 17917937
Change-Id: I47d1a2e9555434bb99759b957fa119dac92eb7cd
rc/com/android/server/telecom/TelecomServiceImpl.java
d21f8fc1078197996dcfb4fadf1d72af2d698c7c 29-Oct-2014 Geoff Mendal <mendal@google.com> am 9b8badbc: (-s ours) Import translations. DO NOT MERGE

* commit '9b8badbc2cdff6ed2ff6676f4e47c3c46d0eb7e4':
Import translations. DO NOT MERGE
aa80545c6ff36a244c6b356d59334ef9600adfff 29-Oct-2014 Anthony Lee <anthonylee@google.com> am b664954e: Clear account using TelecomManager not CallsManager.

* commit 'b664954ed814d52c9bc5d6c392f4f0a14d4f53ae':
Clear account using TelecomManager not CallsManager.
4942553098204628d087f95ebe10b56e7dc3f92d 29-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I0ed9167263f0e7ee0dcaaf36a616b74603377b88
Auto-generated-cl: translation import
es/values-fi/strings.xml
es/values-ka-rGE/strings.xml
es/values-lo-rLA/strings.xml
es/values-ms-rMY/strings.xml
es/values-ro/strings.xml
es/values-si-rLK/strings.xml
es/values-zh-rCN/strings.xml
3955e6d2afde5d7f10eb0eae065916fb20f32464 29-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I31d1e995a65e80833f94e0d300abc35b4d19f495
Auto-generated-cl: translation import
es/values-fi/strings.xml
es/values-ka-rGE/strings.xml
es/values-lo-rLA/strings.xml
es/values-ms-rMY/strings.xml
es/values-ro/strings.xml
es/values-zh-rCN/strings.xml
9b8badbc2cdff6ed2ff6676f4e47c3c46d0eb7e4 29-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I9430deaea9e402eacc18eeb6929e8edfd6f651a3
Auto-generated-cl: translation import
es/values-fi/strings.xml
es/values-ka-rGE/strings.xml
es/values-lo-rLA/strings.xml
es/values-ms-rMY/strings.xml
es/values-ro/strings.xml
es/values-si-rLK/strings.xml
es/values-zh-rCN/strings.xml
b664954ed814d52c9bc5d6c392f4f0a14d4f53ae 27-Oct-2014 Anthony Lee <anthonylee@google.com> Clear account using TelecomManager not CallsManager.

TelecomManager is the right way to handle this since this
code could run as the second user. It gets the system Telecom
service and calls a method on it to do its work.

Bug: 17689845
Change-Id: I2895e2f386e5bb97f6de67140c4f2dc4c4403b15
rc/com/android/server/telecom/PhoneAccountBroadcastReceiver.java
9931b4c2a3bfce01483f2bdd332371e4a2cf32a0 29-Oct-2014 Ihab Awad <ihab@google.com> PhoneAccounts include literal icon bitmap (3/4)
automerge: d9f5438

* commit 'd9f5438b2b4595a784947b92a49406ee99de2589':
PhoneAccounts include literal icon bitmap (3/4)
d9f5438b2b4595a784947b92a49406ee99de2589 24-Oct-2014 Ihab Awad <ihab@google.com> PhoneAccounts include literal icon bitmap (3/4)

Change-Id: Ie3f02a5032b01e91d4620134bb7917cddd8b93e6
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/testapps/CallServiceNotifier.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
59e55799871915bed4a5395b428eccac89314c39 28-Oct-2014 Geoff Mendal <mendal@google.com> am 922bcbb8: (-s ours) am 0f1d2ebd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 187e861 -s ours

* commit '922bcbb822bbc1777c4119caedb03327281a40fc':
Import translations. DO NOT MERGE
5c3481b8882d612b03ed6a1ae037fa28f42a8cd0 28-Oct-2014 Wink Saville <wink@google.com> am 897f5c4e: am 7ce6e785: Fix a long subId. automerge: bba28a7

* commit '897f5c4ef5d4b0fb5183cbbca9aee424cf3d0198':
Fix a long subId.
1cbd3902f5f7dc2a5615c732d69434c68ce9d133 28-Oct-2014 Wink Saville <wink@google.com> am ba4a68cd: am 3b62312e: Merge "Change subId to int from long" into lmp-mr1-dev automerge: 0751c95

* commit 'ba4a68cdc0e043e751a1e761f8c0b14a8c6b3ed7':
Change subId to int from long
7d8d265a6c13b26454f3c143b8588be3b74bae0c 28-Oct-2014 Evan Charlton <evanc@google.com> am 5bcc5d59: am f1082805: Merge "Use the public API permissions" into lmp-mr1-dev automerge: 9fcd76e

* commit '5bcc5d59e6f7b6dbcb103a587b57f3ba349e544e':
Use the public API permissions
f23da49265e798e6d129f223d9a7bc56fc0d26d8 28-Oct-2014 Geoff Mendal <mendal@google.com> am 9473c78a: (-s ours) Import translations. DO NOT MERGE automerge: 879acf3 -s ours

* commit '9473c78a5d15e748a0d83f5094c6bf17f4f1c78f':
Import translations. DO NOT MERGE
922bcbb822bbc1777c4119caedb03327281a40fc 27-Oct-2014 Geoff Mendal <mendal@google.com> am 0f1d2ebd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: 187e861 -s ours

* commit '187e861899a026866f7394dca4b6f1d74485e3fd':
Import translations. DO NOT MERGE
897f5c4ef5d4b0fb5183cbbca9aee424cf3d0198 27-Oct-2014 Wink Saville <wink@google.com> am 7ce6e785: Fix a long subId.
automerge: bba28a7

* commit 'bba28a7c4b0582eb86b83dc219075c25941f2d2e':
Fix a long subId.
ba4a68cdc0e043e751a1e761f8c0b14a8c6b3ed7 27-Oct-2014 Wink Saville <wink@google.com> am 3b62312e: Merge "Change subId to int from long" into lmp-mr1-dev
automerge: 0751c95

* commit '0751c9503c480b6753b02e013218a5325f3f2206':
Change subId to int from long
5bcc5d59e6f7b6dbcb103a587b57f3ba349e544e 27-Oct-2014 Evan Charlton <evanc@google.com> am f1082805: Merge "Use the public API permissions" into lmp-mr1-dev
automerge: 9fcd76e

* commit '9fcd76e0bd8942cc571aaf041d43bb804f024367':
Use the public API permissions
187e861899a026866f7394dca4b6f1d74485e3fd 27-Oct-2014 Geoff Mendal <mendal@google.com> am 0f1d2ebd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '0f1d2ebda912dc81e463c3c60e156d18fef2ce26':
Import translations. DO NOT MERGE
bba28a7c4b0582eb86b83dc219075c25941f2d2e 27-Oct-2014 Wink Saville <wink@google.com> am 7ce6e785: Fix a long subId.

* commit '7ce6e78563893ef8da687787bd96d9b7d4af1ace':
Fix a long subId.
0751c9503c480b6753b02e013218a5325f3f2206 27-Oct-2014 Wink Saville <wink@google.com> am 3b62312e: Merge "Change subId to int from long" into lmp-mr1-dev

* commit '3b62312e0596321c7bd256b90ddce46ade57e1c0':
Change subId to int from long
9fcd76e0bd8942cc571aaf041d43bb804f024367 27-Oct-2014 Evan Charlton <evanc@google.com> am f1082805: Merge "Use the public API permissions" into lmp-mr1-dev

* commit 'f1082805fb45dae866c7e1d1f405a567cac86650':
Use the public API permissions
9473c78a5d15e748a0d83f5094c6bf17f4f1c78f 27-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
automerge: 879acf3 -s ours

* commit '879acf3077dae1f0fe6bb26eb607b6bc23466d3b':
Import translations. DO NOT MERGE
0f1d2ebda912dc81e463c3c60e156d18fef2ce26 27-Oct-2014 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
392d4e1db63e88baf83a96951bf2c188236268e4 27-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I458ca515152d930138f51bcae2ab21e1795da9ae
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
7ce6e78563893ef8da687787bd96d9b7d4af1ace 27-Oct-2014 Wink Saville <wink@google.com> Fix a long subId.

Change-Id: Ie512720965cf92591fb66996e1743b2b80612985
rc/com/android/server/telecom/PhoneAccountRegistrar.java
879acf3077dae1f0fe6bb26eb607b6bc23466d3b 27-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: If230ef1901c4a2ee0cc0f0d682ae89896c022aad
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
b1fb2aefbe2b14026614d8c35a1f37fc56d0634a 27-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I201521360ca0355904143e2b20e8eb71d62f21d8
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
3b62312e0596321c7bd256b90ddce46ade57e1c0 27-Oct-2014 Wink Saville <wink@google.com> Merge "Change subId to int from long" into lmp-mr1-dev
f1082805fb45dae866c7e1d1f405a567cac86650 27-Oct-2014 Evan Charlton <evanc@google.com> Merge "Use the public API permissions" into lmp-mr1-dev
2223411f2d0ab21c0f155c9ab9139717a274e98b 25-Oct-2014 Nancy Chen <nancychen@google.com> am e27c3f5a: am a56aeba3: am 1813bdd2: Merge "Propagate "call with" account to Telephony layer." into lmp-mr1-dev

* commit 'e27c3f5a5119011703f01b7884b5c6f2508551fd':
Propagate "call with" account to Telephony layer.
a1606ef734c95958ddc953d4908bf61f4f93bfe0 25-Oct-2014 Yorke Lee <yorkelee@google.com> am b231b5dc: am 7f191ccb: Merge "Filter various callbacks in BluetoothPhoneService" into lmp-dev automerge: baf107f automerge: 831a975 automerge: 41e1c96

* commit 'b231b5dc7bce49ba6a3f58b485a0d4a5ce8a840d':
Filter various callbacks in BluetoothPhoneService
f5709cbc3a680f98db1eb3eb065895622a7348fb 25-Oct-2014 Santos Cordon <santoscordon@google.com> am 2ae5f2a2: am 0ceb5a12: Add permission to CONNECTION_MANAGER PhoneAccount registration. automerge: 5ae91bd automerge: 9451460 automerge: 03d06ff

* commit '2ae5f2a2ecbbf6a85f3dfa8e00179fa1f9b20c74':
Add permission to CONNECTION_MANAGER PhoneAccount registration.
e27c3f5a5119011703f01b7884b5c6f2508551fd 25-Oct-2014 Nancy Chen <nancychen@google.com> am a56aeba3: am 1813bdd2: Merge "Propagate "call with" account to Telephony layer." into lmp-mr1-dev

* commit 'a56aeba337228b96382f8a8e6442b246eabd1425':
Propagate "call with" account to Telephony layer.
a56aeba337228b96382f8a8e6442b246eabd1425 25-Oct-2014 Nancy Chen <nancychen@google.com> am 1813bdd2: Merge "Propagate "call with" account to Telephony layer." into lmp-mr1-dev

* commit '1813bdd2744791ef007620d85407bb22ea4ed13a':
Propagate "call with" account to Telephony layer.
1813bdd2744791ef007620d85407bb22ea4ed13a 25-Oct-2014 Nancy Chen <nancychen@google.com> Merge "Propagate "call with" account to Telephony layer." into lmp-mr1-dev
5a36b6e9dcf9b5d5d065b6e1e705d67b94a388af 24-Oct-2014 Nancy Chen <nancychen@google.com> Propagate "call with" account to Telephony layer.

When the user checks "always use this for calls", the setting should
also be saved through to SubInfoRecord.

Bug:18078232

Change-Id: I42874f16521155ed79ab72da57ca8a2d967d0179
rc/com/android/server/telecom/PhoneAccountRegistrar.java
116549bfd182fab4a5b8f6c314838fa9648a41f2 25-Oct-2014 Evan Charlton <evanc@google.com> Use the public API permissions

Migrate the permissions to the new ones in the android.* namespace
instead of the com.android.server.telecom.* namespace.

Bug: 18114695
Change-Id: I1b8578cbc82e95ea78b4a2166f4a23650a0c375f
ndroidManifest.xml
rc/com/android/server/telecom/TelecomServiceImpl.java
b231b5dc7bce49ba6a3f58b485a0d4a5ce8a840d 24-Oct-2014 Yorke Lee <yorkelee@google.com> am 7f191ccb: Merge "Filter various callbacks in BluetoothPhoneService" into lmp-dev automerge: baf107f automerge: 831a975
automerge: 41e1c96

* commit '41e1c96d8c6553b875d24f061bb6e3adb0e40f7b':
Filter various callbacks in BluetoothPhoneService
41e1c96d8c6553b875d24f061bb6e3adb0e40f7b 24-Oct-2014 Yorke Lee <yorkelee@google.com> am 7f191ccb: Merge "Filter various callbacks in BluetoothPhoneService" into lmp-dev automerge: baf107f automerge: 831a975

* commit '7f191ccbd4463548d6d6d3ed35ab60eca74c732c':
Filter various callbacks in BluetoothPhoneService
7f191ccbd4463548d6d6d3ed35ab60eca74c732c 24-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Filter various callbacks in BluetoothPhoneService" into lmp-dev automerge: baf107f
automerge: 831a975

* commit '831a9752933a01b3c7576a466ee77d0e7d765d62':
Filter various callbacks in BluetoothPhoneService
831a9752933a01b3c7576a466ee77d0e7d765d62 24-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Filter various callbacks in BluetoothPhoneService" into lmp-dev
automerge: baf107f

* commit 'baf107ff358bf96b43ab4ff42de3936e9e517687':
Filter various callbacks in BluetoothPhoneService
2ae5f2a2ecbbf6a85f3dfa8e00179fa1f9b20c74 24-Oct-2014 Santos Cordon <santoscordon@google.com> am 0ceb5a12: Add permission to CONNECTION_MANAGER PhoneAccount registration. automerge: 5ae91bd automerge: 9451460
automerge: 03d06ff

* commit '03d06ffe6717eb66161dbe3a0d92b8b40166bd53':
Add permission to CONNECTION_MANAGER PhoneAccount registration.
03d06ffe6717eb66161dbe3a0d92b8b40166bd53 24-Oct-2014 Santos Cordon <santoscordon@google.com> am 0ceb5a12: Add permission to CONNECTION_MANAGER PhoneAccount registration. automerge: 5ae91bd
automerge: 9451460

* commit '9451460dfabac4572094abeba04a83dc22bbbc70':
Add permission to CONNECTION_MANAGER PhoneAccount registration.
9451460dfabac4572094abeba04a83dc22bbbc70 24-Oct-2014 Santos Cordon <santoscordon@google.com> am 0ceb5a12: Add permission to CONNECTION_MANAGER PhoneAccount registration.
automerge: 5ae91bd

* commit '5ae91bdbbf00f36eec1d66ed854454611264a787':
Add permission to CONNECTION_MANAGER PhoneAccount registration.
baf107ff358bf96b43ab4ff42de3936e9e517687 24-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Filter various callbacks in BluetoothPhoneService" into lmp-dev
5ae91bdbbf00f36eec1d66ed854454611264a787 24-Oct-2014 Santos Cordon <santoscordon@google.com> am 0ceb5a12: Add permission to CONNECTION_MANAGER PhoneAccount registration.

* commit '0ceb5a12f6fc2d9a4c9abe5361cbf7b4736e1a85':
Add permission to CONNECTION_MANAGER PhoneAccount registration.
0ceb5a12f6fc2d9a4c9abe5361cbf7b4736e1a85 23-Oct-2014 Santos Cordon <santoscordon@google.com> Add permission to CONNECTION_MANAGER PhoneAccount registration.

We need to add a system-level permission for registering PhoneAccounts
to prevent third party apps from registering and being able to
control the call.

Bug: 18100571
Change-Id: I06de9311620b271904babc78f23faff90a15e1a9
ndroidManifest.xml
rc/com/android/server/telecom/TelecomServiceImpl.java
720bcbe344a3e907393026f7019d590306c92194 23-Oct-2014 Yorke Lee <yorkelee@google.com> Filter various callbacks in BluetoothPhoneService

The BT spec is extremely strict on state updates which conflicts with
Telecom's architecture which often sends multiple non-atomic callbacks
for a single UI change. Filter out certain updates in
BluetoothPhoneService to eliminate redundant/spurious headset state
updates that can cause problems in BT devices.

One of the scenarios is described below for CDMA conference calls.

1) Call 1 and Call 2 are being merged into conference Call 3.
2) Call 1 has its parent set to Call 3, but Call 2 does not have
a parent yet.
3) updateHeadsetWithCallState now thinks that there are two active
calls (Call 2 and Call 3) when there is actually only one active
call (Call 3).

Bug: 18053043
Change-Id: I1766b430c23018638dbc1b88956d905c013bb8ad
rc/com/android/server/telecom/BluetoothPhoneService.java
358506069eedd8840ff8a332362682f18e1668e7 24-Oct-2014 Wink Saville <wink@google.com> Change subId to int from long

Also remove an unused method.

Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
rc/com/android/server/telecom/PhoneAccountRegistrar.java
dec76683dc2ea3bb253e50fb3bb273479da69cf5 24-Oct-2014 Andrew Lee <anwlee@google.com> am e36c842d: am f573cc96: am e5a629ed: Merge "Don\'t start video call if already in a video call." into lmp-mr1-dev

* commit 'e36c842d91966572b9f2c2cde7a701d271fb8626':
Don't start video call if already in a video call.
e36c842d91966572b9f2c2cde7a701d271fb8626 24-Oct-2014 Andrew Lee <anwlee@google.com> am f573cc96: am e5a629ed: Merge "Don\'t start video call if already in a video call." into lmp-mr1-dev

* commit 'f573cc96fcdb0495df115a0257fac44ce753ded8':
Don't start video call if already in a video call.
3a65702741ff2bb8b1bb65fbda947a9aa1e50672 23-Oct-2014 Nancy Chen <nancychen@google.com> am 273ea089: am 3e31fdc4: am 34ed7470: am bf35150d: Merge "Revert "Revert "Add color to PhoneAccount objects (2/3)""" into lmp-sprout-dev

* commit '273ea089e9b9fe96ba9d950c0ceac9f493ca349f':
Revert "Revert "Add color to PhoneAccount objects (2/3)""
3388ac14d28246253510129e4b7c423999e03c11 23-Oct-2014 Nancy Chen <nancychen@google.com> am b3129008: am 948af47f: am 48096c7e: Merge "Rejected calls should be logged as "incoming" not "missed"" into lmp-mr1-dev

* commit 'b3129008b6c171d5c8bb16e50ac557ec8219f505':
Rejected calls should be logged as "incoming" not "missed"
f573cc96fcdb0495df115a0257fac44ce753ded8 23-Oct-2014 Andrew Lee <anwlee@google.com> am e5a629ed: Merge "Don\'t start video call if already in a video call." into lmp-mr1-dev

* commit 'e5a629ed3e650e820b53f5b85bc65e42d6cb4d7d':
Don't start video call if already in a video call.
273ea089e9b9fe96ba9d950c0ceac9f493ca349f 23-Oct-2014 Nancy Chen <nancychen@google.com> am 3e31fdc4: am 34ed7470: am bf35150d: Merge "Revert "Revert "Add color to PhoneAccount objects (2/3)""" into lmp-sprout-dev

* commit '3e31fdc45574262e209a6a1d5a7e9e4c15fcd7e6':
Revert "Revert "Add color to PhoneAccount objects (2/3)""
b3129008b6c171d5c8bb16e50ac557ec8219f505 23-Oct-2014 Nancy Chen <nancychen@google.com> am 948af47f: am 48096c7e: Merge "Rejected calls should be logged as "incoming" not "missed"" into lmp-mr1-dev

* commit '948af47fa0a4964e660662e0de86c6cf19cfb1c7':
Rejected calls should be logged as "incoming" not "missed"
3e31fdc45574262e209a6a1d5a7e9e4c15fcd7e6 23-Oct-2014 Nancy Chen <nancychen@google.com> am 34ed7470: am bf35150d: Merge "Revert "Revert "Add color to PhoneAccount objects (2/3)""" into lmp-sprout-dev

* commit '34ed74708b2ae8f6bb3b0d90e36fe81fb6c0cd9b':
Revert "Revert "Add color to PhoneAccount objects (2/3)""
e5a629ed3e650e820b53f5b85bc65e42d6cb4d7d 23-Oct-2014 Andrew Lee <anwlee@google.com> Merge "Don't start video call if already in a video call." into lmp-mr1-dev
948af47fa0a4964e660662e0de86c6cf19cfb1c7 23-Oct-2014 Nancy Chen <nancychen@google.com> am 48096c7e: Merge "Rejected calls should be logged as "incoming" not "missed"" into lmp-mr1-dev

* commit '48096c7e383d38ce23fccbeff4652f7ffd0a26e4':
Rejected calls should be logged as "incoming" not "missed"
34ed74708b2ae8f6bb3b0d90e36fe81fb6c0cd9b 23-Oct-2014 Nancy Chen <nancychen@google.com> am bf35150d: Merge "Revert "Revert "Add color to PhoneAccount objects (2/3)""" into lmp-sprout-dev

* commit 'bf35150db3ad0ce05130db1880485da167d2e373':
Revert "Revert "Add color to PhoneAccount objects (2/3)""
a5c0b1e8d52f3fc8822cce11e15b5ad8a18dbbee 23-Oct-2014 Nancy Chen <nancychen@google.com> am 4ce8f70d: am 0af80fc9: am 0bde0c54: am 1e01a160: Merge "Add an option to set the selected phone account as the default. (2/3)" into lmp-sprout-dev

* commit '4ce8f70d86875f59cd31ffff0c3470f27a4822b2':
Add an option to set the selected phone account as the default. (2/3)
4550623ca162ccb3291ec3f020b7ad3346784ebd 23-Oct-2014 Andrew Lee <anwlee@google.com> Don't start video call if already in a video call.

+ Check enforced if the intent has an extra for bidirectional
videocalling and the calls manager already has a call with
video state bidirectional.
+ Show an error toast message if that's the case.

Bug: 17009418
Change-Id: I72d4c3660c19f163eadd88abed7677892ce6b1cc
es/values/strings.xml
rc/com/android/server/telecom/CallReceiver.java
rc/com/android/server/telecom/CallsManager.java
bf35150db3ad0ce05130db1880485da167d2e373 23-Oct-2014 Nancy Chen <nancychen@google.com> Merge "Revert "Revert "Add color to PhoneAccount objects (2/3)""" into lmp-sprout-dev
48096c7e383d38ce23fccbeff4652f7ffd0a26e4 23-Oct-2014 Nancy Chen <nancychen@google.com> Merge "Rejected calls should be logged as "incoming" not "missed"" into lmp-mr1-dev
4ce8f70d86875f59cd31ffff0c3470f27a4822b2 23-Oct-2014 Nancy Chen <nancychen@google.com> am 0af80fc9: am 0bde0c54: am 1e01a160: Merge "Add an option to set the selected phone account as the default. (2/3)" into lmp-sprout-dev

* commit '0af80fc931399e1f55b7c2c5a607db79f502ba2d':
Add an option to set the selected phone account as the default. (2/3)
0af80fc931399e1f55b7c2c5a607db79f502ba2d 23-Oct-2014 Nancy Chen <nancychen@google.com> am 0bde0c54: am 1e01a160: Merge "Add an option to set the selected phone account as the default. (2/3)" into lmp-sprout-dev

* commit '0bde0c54da301d30e1bfcf40603cb2a6e4141883':
Add an option to set the selected phone account as the default. (2/3)
0bde0c54da301d30e1bfcf40603cb2a6e4141883 23-Oct-2014 Nancy Chen <nancychen@google.com> am 1e01a160: Merge "Add an option to set the selected phone account as the default. (2/3)" into lmp-sprout-dev

* commit '1e01a1603ff2a99fdf4fcf8b73c72eb867f0dd97':
Add an option to set the selected phone account as the default. (2/3)
ac19f3d150f22be843be4d9f75cb7b5c26e77914 23-Oct-2014 Nancy Chen <nancychen@google.com> Rejected calls should be logged as "incoming" not "missed"

Changed incoming calls to log as "missed" only when they are actually
missed rather than rejected/dismissed.

Bug: 18078903
Change-Id: I304d49ef6c03ce0f79a0f1d220c3cf8da518796b
rc/com/android/server/telecom/CallLogManager.java
06ce062a2ceb7ca73560edd6b2f85d0f16a17667 23-Oct-2014 Nancy Chen <nancychen@google.com> Revert "Revert "Add color to PhoneAccount objects (2/3)""

This reverts commit 5f8eaaee9c50567a4b2714bd28b4ed39b7aac2b7.
We're ready to add color to PhoneAccounts

Change-Id: Ie65a13e565c26ea5e93f0835bb2c4684140455c9
ndroid.mk
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
1e01a1603ff2a99fdf4fcf8b73c72eb867f0dd97 23-Oct-2014 Nancy Chen <nancychen@google.com> Merge "Add an option to set the selected phone account as the default. (2/3)" into lmp-sprout-dev
a251aac63132c3f096cfa73379bfa4e2c23a8d3a 23-Oct-2014 Yorke Lee <yorkelee@google.com> am 31f81dc1: am 4872c11a: am 7fa8a55a: resolved conflicts for merge of ef324a3f to lmp-mr1-dev

* commit '31f81dc1600f403a196cbac2fb382c7c713b3166':
Create handle with correct scheme in MissedCallNotifier
31f81dc1600f403a196cbac2fb382c7c713b3166 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 4872c11a: am 7fa8a55a: resolved conflicts for merge of ef324a3f to lmp-mr1-dev

* commit '4872c11a3d0ef5b151875967e945091e2210a05d':
Create handle with correct scheme in MissedCallNotifier
4a607b0fe05e99df0501d0952f1812a74235b3a6 22-Oct-2014 Santos Cordon <santoscordon@google.com> am b25b71c9: am 6cb4e971: am 9aedea32: am e5cbf7d6: am 27d9e273: Merge "Send BTPhoneService update when active/background calls switch." into lmp-dev

* commit 'b25b71c9ba9111742943eeb9a00e0ffb4049f410':
Send BTPhoneService update when active/background calls switch.
6a0ab095f04bf1dc6f5d0a43f053abb33833cb59 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 218058cf: am 45177f44: am adc473a6: am d3205573: am 45d7a205: Merge "Once responded to a call, remove it from list of ringing calls" into lmp-dev

* commit '218058cfccefc2e7eea9ff7cbe2f84521c8c1ccd':
Once responded to a call, remove it from list of ringing calls
09580895594557de9da34b7b437724d96707a606 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 7fe7ff90: am 1b254f59: am 89e060ee: am 76a123e9: am efba60b2: Merge "Fix typo when forcing recalculation of call capabilities" into lmp-dev

* commit '7fe7ff907f586cd898b589b88e7388b882347b3c':
Fix typo when forcing recalculation of call capabilities
4872c11a3d0ef5b151875967e945091e2210a05d 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 7fa8a55a: resolved conflicts for merge of ef324a3f to lmp-mr1-dev

* commit '7fa8a55a0548e8bf9d8643520741e2e868c4cf80':
Create handle with correct scheme in MissedCallNotifier
b25b71c9ba9111742943eeb9a00e0ffb4049f410 22-Oct-2014 Santos Cordon <santoscordon@google.com> am 6cb4e971: am 9aedea32: am e5cbf7d6: am 27d9e273: Merge "Send BTPhoneService update when active/background calls switch." into lmp-dev

* commit '6cb4e971abaa2421f4ea06f3e0fe32bbfc95d86d':
Send BTPhoneService update when active/background calls switch.
218058cfccefc2e7eea9ff7cbe2f84521c8c1ccd 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 45177f44: am adc473a6: am d3205573: am 45d7a205: Merge "Once responded to a call, remove it from list of ringing calls" into lmp-dev

* commit '45177f44c67be8a7403a0608b15f70027d90e836':
Once responded to a call, remove it from list of ringing calls
7fe7ff907f586cd898b589b88e7388b882347b3c 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 1b254f59: am 89e060ee: am 76a123e9: am efba60b2: Merge "Fix typo when forcing recalculation of call capabilities" into lmp-dev

* commit '1b254f5958e7f47c6c4dfe92f198c5db81696dd8':
Fix typo when forcing recalculation of call capabilities
6cb4e971abaa2421f4ea06f3e0fe32bbfc95d86d 22-Oct-2014 Santos Cordon <santoscordon@google.com> am 9aedea32: am e5cbf7d6: am 27d9e273: Merge "Send BTPhoneService update when active/background calls switch." into lmp-dev

* commit '9aedea3224a45242786d352f5454ffcfa44b8eba':
Send BTPhoneService update when active/background calls switch.
45177f44c67be8a7403a0608b15f70027d90e836 22-Oct-2014 Yorke Lee <yorkelee@google.com> am adc473a6: am d3205573: am 45d7a205: Merge "Once responded to a call, remove it from list of ringing calls" into lmp-dev

* commit 'adc473a6064559363c9fe8b50644e38bfe2c5a2e':
Once responded to a call, remove it from list of ringing calls
1b254f5958e7f47c6c4dfe92f198c5db81696dd8 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 89e060ee: am 76a123e9: am efba60b2: Merge "Fix typo when forcing recalculation of call capabilities" into lmp-dev

* commit '89e060ee6762f34b16a3d90e3295d707800b313d':
Fix typo when forcing recalculation of call capabilities
7fa8a55a0548e8bf9d8643520741e2e868c4cf80 22-Oct-2014 Yorke Lee <yorkelee@google.com> resolved conflicts for merge of ef324a3f to lmp-mr1-dev

Change-Id: I6e3403c7353c2cf78aae87827ae2a6c1b2584a38
336d0e451f17587687b9529bb4a47128d29df6e1 22-Oct-2014 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE"
9aedea3224a45242786d352f5454ffcfa44b8eba 22-Oct-2014 Santos Cordon <santoscordon@google.com> am e5cbf7d6: am 27d9e273: Merge "Send BTPhoneService update when active/background calls switch." into lmp-dev

* commit 'e5cbf7d6066fa68ffc2a7ba9042c888593355574':
Send BTPhoneService update when active/background calls switch.
adc473a6064559363c9fe8b50644e38bfe2c5a2e 22-Oct-2014 Yorke Lee <yorkelee@google.com> am d3205573: am 45d7a205: Merge "Once responded to a call, remove it from list of ringing calls" into lmp-dev

* commit 'd3205573ef388e71d754e9298681727acdac8642':
Once responded to a call, remove it from list of ringing calls
89e060ee6762f34b16a3d90e3295d707800b313d 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 76a123e9: am efba60b2: Merge "Fix typo when forcing recalculation of call capabilities" into lmp-dev

* commit '76a123e96a3cf4c68f5d4c0d80db10729f479ffb':
Fix typo when forcing recalculation of call capabilities
1926669a6400b77ae8433e706284c7f771687457 22-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I3d1c185d5d4811cd85ff574f3511d0bfd5235ce6
Auto-generated-cl: translation import
es/values-te-rIN/strings.xml
64bae441c9b8730a411dc27f094d8e9753e809b3 22-Oct-2014 Andrew Lee <anwlee@google.com> am 165b2556: am 9839aa5d: Merge "Remove ADD_CALL if not only top-level call." into lmp-mr1-dev automerge: 163f670

* commit '165b2556069660075b9fb5983939c03056d03967':
Remove ADD_CALL if not only top-level call.
165b2556069660075b9fb5983939c03056d03967 22-Oct-2014 Andrew Lee <anwlee@google.com> am 9839aa5d: Merge "Remove ADD_CALL if not only top-level call." into lmp-mr1-dev automerge: 163f670

* commit '9839aa5d8365eadf37e29afe7f70bf051255ff30':
Remove ADD_CALL if not only top-level call.
9839aa5d8365eadf37e29afe7f70bf051255ff30 22-Oct-2014 Andrew Lee <anwlee@google.com> Merge "Remove ADD_CALL if not only top-level call." into lmp-mr1-dev
automerge: 163f670

* commit '163f670d5524c58c810cd4f1f60122baa5adc83e':
Remove ADD_CALL if not only top-level call.
163f670d5524c58c810cd4f1f60122baa5adc83e 22-Oct-2014 Andrew Lee <anwlee@google.com> Merge "Remove ADD_CALL if not only top-level call." into lmp-mr1-dev
ef324a3f5e44b44538fb84ea7887e4ac0c7cd600 22-Oct-2014 Yorke Lee <yorkelee@google.com> am cf1b37c6: Merge "Create handle with correct scheme in MissedCallNotifier" into lmp-dev

* commit 'cf1b37c694c935524ea7039bf5f4d8e6e898317b':
Create handle with correct scheme in MissedCallNotifier
cf1b37c694c935524ea7039bf5f4d8e6e898317b 22-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Create handle with correct scheme in MissedCallNotifier" into lmp-dev
0c345e9bd4415983725d4469e4711fe6b3af4670 22-Oct-2014 Yorke Lee <yorkelee@google.com> Create handle with correct scheme in MissedCallNotifier

Bug: 18074511
Change-Id: If724708d3ac16ca524f03257e66b0e650a6030dd
rc/com/android/server/telecom/MissedCallNotifier.java
e5cbf7d6066fa68ffc2a7ba9042c888593355574 22-Oct-2014 Santos Cordon <santoscordon@google.com> am 27d9e273: Merge "Send BTPhoneService update when active/background calls switch." into lmp-dev

* commit '27d9e2734a7f6f3c413c91a4501c2e95f503f747':
Send BTPhoneService update when active/background calls switch.
27d9e2734a7f6f3c413c91a4501c2e95f503f747 22-Oct-2014 Santos Cordon <santoscordon@google.com> Merge "Send BTPhoneService update when active/background calls switch." into lmp-dev
3278376f7b03c5629bc7a2977f7387a3e3a08020 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 10f07c2e: am 77c1a153: am 790eed91: am 0e27e89d: am 4c33f22f: Merge "Protect against INCALL->RINGING transition in AudioManager" into lmp-dev

* commit '10f07c2e680864e6d353bedb7123a47caf333734':
Protect against INCALL->RINGING transition in AudioManager
250037d8dc3db93bd7d9aba6fff663a74c9b762c 22-Oct-2014 Nancy Chen <nancychen@google.com> am f096a453: am bfdc75a7: am 10feec62: am a4a4bbd9: Merge "Enforce permissions for isVoiceMailNumber." into lmp-sprout-dev

* commit 'f096a4530f63db878cbc1ccaafe1b1294438c6af':
Enforce permissions for isVoiceMailNumber.
7615d32eea2b6cf72997669d2bb906e345be4c34 22-Oct-2014 Nancy Chen <nancychen@google.com> am 4aa51c7a: am a8f27f6e: am 8d44b907: am 94586cdd: Merge "Enable account selection for MMI codes that involve "dialing"." into lmp-sprout-dev

* commit '4aa51c7adadb2bf479d733fad63e4a6b3813da56':
Enable account selection for MMI codes that involve "dialing".
10f07c2e680864e6d353bedb7123a47caf333734 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 77c1a153: am 790eed91: am 0e27e89d: am 4c33f22f: Merge "Protect against INCALL->RINGING transition in AudioManager" into lmp-dev

* commit '77c1a153d8b1dbd1e181241ec9437d9f74f92980':
Protect against INCALL->RINGING transition in AudioManager
f096a4530f63db878cbc1ccaafe1b1294438c6af 22-Oct-2014 Nancy Chen <nancychen@google.com> am bfdc75a7: am 10feec62: am a4a4bbd9: Merge "Enforce permissions for isVoiceMailNumber." into lmp-sprout-dev

* commit 'bfdc75a764a585323796e89b8add4a0a38dc2899':
Enforce permissions for isVoiceMailNumber.
4aa51c7adadb2bf479d733fad63e4a6b3813da56 22-Oct-2014 Nancy Chen <nancychen@google.com> am a8f27f6e: am 8d44b907: am 94586cdd: Merge "Enable account selection for MMI codes that involve "dialing"." into lmp-sprout-dev

* commit 'a8f27f6ec5369cde79b88e9f6c967dfd86d85b31':
Enable account selection for MMI codes that involve "dialing".
77c1a153d8b1dbd1e181241ec9437d9f74f92980 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 790eed91: am 0e27e89d: am 4c33f22f: Merge "Protect against INCALL->RINGING transition in AudioManager" into lmp-dev

* commit '790eed913f4fe782a6a4f67d09e665ff49fd08cb':
Protect against INCALL->RINGING transition in AudioManager
bfdc75a764a585323796e89b8add4a0a38dc2899 22-Oct-2014 Nancy Chen <nancychen@google.com> am 10feec62: am a4a4bbd9: Merge "Enforce permissions for isVoiceMailNumber." into lmp-sprout-dev

* commit '10feec62cd40c10ccece315db49c33c153c2a231':
Enforce permissions for isVoiceMailNumber.
a8f27f6ec5369cde79b88e9f6c967dfd86d85b31 22-Oct-2014 Nancy Chen <nancychen@google.com> am 8d44b907: am 94586cdd: Merge "Enable account selection for MMI codes that involve "dialing"." into lmp-sprout-dev

* commit '8d44b907e9fe1b15b922ff188c199319cf0c89a0':
Enable account selection for MMI codes that involve "dialing".
790eed913f4fe782a6a4f67d09e665ff49fd08cb 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 0e27e89d: am 4c33f22f: Merge "Protect against INCALL->RINGING transition in AudioManager" into lmp-dev

* commit '0e27e89d428fb9202e529590cc6a9d70526d38a6':
Protect against INCALL->RINGING transition in AudioManager
10feec62cd40c10ccece315db49c33c153c2a231 22-Oct-2014 Nancy Chen <nancychen@google.com> am a4a4bbd9: Merge "Enforce permissions for isVoiceMailNumber." into lmp-sprout-dev

* commit 'a4a4bbd96987f8ccdf040c179001924202c1035d':
Enforce permissions for isVoiceMailNumber.
8d44b907e9fe1b15b922ff188c199319cf0c89a0 22-Oct-2014 Nancy Chen <nancychen@google.com> am 94586cdd: Merge "Enable account selection for MMI codes that involve "dialing"." into lmp-sprout-dev

* commit '94586cdd5f29066e041d4c95f43a8e8e539ee1a0':
Enable account selection for MMI codes that involve "dialing".
d3205573ef388e71d754e9298681727acdac8642 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 45d7a205: Merge "Once responded to a call, remove it from list of ringing calls" into lmp-dev

* commit '45d7a2057a18e8d58f26a53f7dc62a7faf2d2bbd':
Once responded to a call, remove it from list of ringing calls
45d7a2057a18e8d58f26a53f7dc62a7faf2d2bbd 22-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Once responded to a call, remove it from list of ringing calls" into lmp-dev
f5e5d3ccf108c41e06983a582742b00d221b78b7 22-Oct-2014 Nancy Chen <nancychen@google.com> Add an option to set the selected phone account as the default. (2/3)

Modify the phoneAccountSelected method to support the option to set the
selected phone account as the default for outgoing phone calls.

Bug: 18078232
Change-Id: I1c0e1ba9ef7d886d890d86825eb53bc0ba8483d1
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallAdapter.java
cd6c87ecc9b626301abef1466882c61b4e5b722f 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 531a5074: am c9fe671f: Merge "Update call capabilities when call is removed" into lmp-dev
automerge: 09a247c

* commit '09a247c9fd0b0f54dbffca0983fef9a3b4991fdc':
230e6487f7f96fe653ea5c473ee64ca5f17345d5 22-Oct-2014 Baligh Uddin <baligh@google.com> am a7910e7f: (-s ours) am 346e1e7d: (-s ours) Import translations. DO NOT MERGE
automerge: ddebbdc -s ours

* commit 'ddebbdc153470626d6628d43f5626f0d931b54c4':
64b01e4e001f403e4e45caa58c581ca3b8b08392 22-Oct-2014 Yorke Lee <yorkelee@google.com> am d7eadff6: Make more audio logging visible automerge: e5a7c92
automerge: d97625c

* commit 'd97625c66dc18fdc174576099bf3eed699a53382':
b63767c1280e269e5ef8bf93e069e7a11e5e40ed 22-Oct-2014 Yorke Lee <yorkelee@google.com> am de9aba5f: am aa6ea25b: Merge "Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9" into lmp-dev
automerge: 4bb1f20

* commit '4bb1f200d2257089837538aa64e0df932a5715ba':
363049865401530e90a684ce66d55cb7d40f9ee0 22-Oct-2014 Yorke Lee <yorkelee@google.com> am b4ea3642: am 5aed1294: Merge "Always return at least the default emergency phone account" into lmp-dev
automerge: 34a9de7

* commit '34a9de7e6ed6d59415b9dcd2639cee35004b42a4':
e304767200a2a48e6c446b37a45c95f4ff17516c 22-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 5a336f04: am 62e1ab16: Merge "Broadcast the call type/duration information" into lmp-dev
automerge: c372ace

* commit 'c372aced84ea15332e4b0b6ddabf19024da72171':
c4bfbedc211aa307d9cc296239d7423181f0be26 22-Oct-2014 Andrew Lee <anwlee@google.com> am 517edba5: am 9846dd39: Merge "Notify current user of missed calls." into lmp-dev
automerge: 30bb34c

* commit '30bb34c0add30ad5eefe478635933c98245ced5d':
1a964ee034fae07af85501b1eca13bd172380a62 22-Oct-2014 Tyler Gunn <tgunn@google.com> am cccf7303: am 127faa82: Merge "Fixing issue where Google Voice calls are logged twice to call log." into lmp-dev
automerge: e964feb

* commit 'e964feb7e56aaa78825af9195807f262f427e3f3':
7d5522647b694f0247caad91d817ebe8ac299228 22-Oct-2014 Yorke Lee <yorkelee@google.com> am adf67894: am ae117a6c: Merge "Don\'t play call waiting for first incoming call" into lmp-dev
automerge: ff1029f

* commit 'ff1029fde635cf4fbdabcea7f81ac30caec05c31':
98c774406100c3db2c4bd97f006e49395e6badb1 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 5557cd86: am 7062bb96: Set correct InCall tone lengths
automerge: f76c578

* commit 'f76c578ddb49befbeb2cd02ba0748f54eb04b52d':
6c7ca639da61ca80e3dd0d6b184da153307c7e8c 22-Oct-2014 Santos Cordon <santoscordon@google.com> am 5598df15: am 88336c2e: Merge "Update foreground calls with child-parent call changes." into lmp-dev
automerge: 092d3b0

* commit '092d3b07b3fee0af102de6a8aa967f5096de63c6':
dbccdacf2482e47f7543576a0153c8150bcb3cc2 22-Oct-2014 Tyler Gunn <tgunn@google.com> am ad04b7bd: am 36e50968: Merge "Issue: turning on bluetooth headset in call doesn\'t change route (1/2)." into lmp-dev
automerge: 0688748

* commit '0688748ea91adc174e73fe801551c7c024f71b22':
c77e16412954a68458232b437df5227cbf1733ae 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 6729e2d2: am 9e79dbe0: Merge "Protect against null mBluetoothHeadset" into lmp-dev
automerge: 57886f3

* commit '57886f35e0a955d96b60e58f6c0dcebf35cedf77':
d7227d95c5c3e989369a24a1a90d66a0c372d5e2 22-Oct-2014 Santos Cordon <santoscordon@google.com> am 4ad2a7eb: am d9bae25a: Merge "Unset disconnecting boolean when a call transitions to DISCONNECTED." into lmp-dev
automerge: da96a50

* commit 'da96a50ddb9365b9684a194776abe1471341b31e':
a3fc40647fa70846f667c24a0ff61086c3328979 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 2834c3f9: am e0175431: Merge "Enforce CALL_PRIVILEGED check at start of CallActivity" into lmp-dev
automerge: 03d9784

* commit '03d97842452285a07dc37b104cf28175d9202ced':
235a52fae2ce75a38311569c4a22fcbeed8c5c94 21-Oct-2014 Andrew Lee <anwlee@google.com> Remove ADD_CALL if not only top-level call.

ADD_CALL now depends on the state of the underlying connections, and
the mix of GSM/CDMA/IMS connections.

I propose to address this by setting those capabilities as true on
the GSM/CDMA connections, then further filtering in Telecom depending
on the call state (ie. whether it is the only top level call, and
whether or not we're dialing). I think this logic should be simpler,
and also allows us to more directly control this capability depending
on the connection type.

Bug: 18062269
Change-Id: Ie5be502545a580719e65595e495ff30cbc3fc22f
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/InCallController.java
a94c29082f532280315710610372a1110c591b2a 22-Oct-2014 Tyler Gunn <tgunn@google.com> am 81520e99: am aa479376: Fixing where call goes from disconnecting to active to disconnecting state.
automerge: 570bfad

* commit '570bfadb82bfe4a47d781ae6b2a99bd5c6bb862e':
4d9bb9aa2ae51ff17bcd4c8a38093f0d4dde06dd 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 383341be: am fae0efd9: Merge "Add ability to add sim-initiated MO call to UI (3/4)" into lmp-dev
automerge: 86d5dcf

* commit '86d5dcfa5a732f5f6fd9b81ccf350239a2ee97da':
fb332ffa24a389a6390ecb1c6a6b1102bb4aae81 22-Oct-2014 Andrew Lee <anwlee@google.com> am c677f0c6: am 81db23b8: Merge "Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver." into lmp-dev
automerge: 980e2db

* commit '980e2db304c4f8601892801fd69b723b6f973212':
7cecfa0fd62625b4ca5bf6200435b3f572ec5ed9 22-Oct-2014 Santos Cordon <santoscordon@google.com> am 0ea47ddb: am 5adc858b: Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev
automerge: 0d79852

* commit '0d7985241babc817b86dea376f1bdad0092d2763':
9cfb55d780b86fcdca632c0108ba44b063baa712 22-Oct-2014 Andrew Lee <anwlee@google.com> am 439c5b52: am 72d271c4: Process intent immediately for primary users.
automerge: b87b8f4

* commit 'b87b8f4f812023bd97827e115f1119f1fddfa90f':
60f493c098bd56b64b2c6c073b9a86991af8ed65 22-Oct-2014 Tyler Gunn <tgunn@google.com> am e60d3c1e: am c3f986b5: Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev
automerge: e6fe7b1

* commit 'e6fe7b18651f89ccce795682f34f44834fb5825d':
efc929f1aeddddcde1fe3833312e7cf911869ee8 22-Oct-2014 Santos Cordon <santoscordon@google.com> am 03f51471: am efc5519c: Merge "Support MERGE/HOLD for Cdma calls through BT Headset." into lmp-dev
automerge: 6f53897

* commit '6f538972c45e83b453d628252773356c5b8521be':
e3fd5067a06c7bd998f608bc60e04895b8353d0e 22-Oct-2014 Andrew Lee <anwlee@google.com> am 04fe71aa: am 7984e0a7: Merge "Removed failed outgoing calls." into lmp-dev
automerge: b96374a

* commit 'b96374a0f14282fef3533f69798b4f104a6b4519':
f161bc97e66a256e61b33f776150fb51e24999ca 22-Oct-2014 Tyler Gunn <tgunn@google.com> am 26aa3b87: am f3d17409: Merge "Allow sending of in-call MMI codes through to telephony." into lmp-dev
automerge: 494d3c7

* commit '494d3c7e1a0193e2ed05d00f0b4c28d605e24917':
c0ca76ee6dc2d21cf1e9f310f2d16662c8ceb25e 22-Oct-2014 Santos Cordon <santoscordon@google.com> Send BTPhoneService update when active/background calls switch.

This sends an update if the call-on-hold changes (when active and
background calls swap) as well as using a proper held-call count instead
of hardcoded 1 when there are multiple calls on hold.

This is needed to pass BT PTS test TC_AG_TWC_BV_03_I.

Bug: 17962996
Change-Id: Ia6d5f649020837a1ca37d0895f8844fcdec04446
rc/com/android/server/telecom/BluetoothPhoneService.java
rc/com/android/server/telecom/CallsManager.java
4764bc3b2657978c92656af2a0686309a5c21a1c 22-Oct-2014 Ihab Awad <ihab@google.com> am c0caa70c: am 3e3cde1b: Merge "Refine implementation of GSM conferences (2/3)" into lmp-dev
automerge: eda2a84

* commit 'eda2a84c6c78ed25385b11afbfad404e5e2ed685':
4d78e484d245d4340798cd27788881eff69bd975 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 0851c941: am 802363d9: Merge "Correctly send the original address in BluetoothPhoneService if using gateway" into lmp-dev
automerge: bd23cdd

* commit 'bd23cdd301562cbe5d3839693550e8d84c7849a0':
40532b329ad13b340b03b837f511ba110ee5541e 22-Oct-2014 Santos Cordon <santoscordon@google.com> am f18e45a6: am b9d90a66: Merge "BT: Sending DIALING state prior to changing to ALERTING state." into lmp-dev
automerge: 2288891

* commit '228889117c7ef7de4b1b2c98c3e45a27770cdb97':
0364801e46752b3343a54a1bb08ece5e5e6d98eb 22-Oct-2014 Nancy Chen <nancychen@google.com> am 7e46a392: am b92682c6: Merge "Remove invalid warning from BluetoothPhoneService" into lmp-dev
automerge: 5680e9e

* commit '5680e9e8a6cf51f12e6fba6c7c7271298c5a3680':
5db1579a62791f2ed812b4572096568c646a1b68 22-Oct-2014 Jay Shrauner <shrauner@google.com> am 50fe6d44: am 6426ce8d: Merge "Fix NPE when calls manager isn\'t initialized" into lmp-dev
automerge: 0a9bb64

* commit '0a9bb64d510083787a2834dc1e7fe609fdbb071b':
8f14e04990af2d1e5b4072579800f91386e54d9c 22-Oct-2014 Baligh Uddin <baligh@google.com> am a646e2bf: (-s ours) am e471c51b: (-s ours) Import translations. DO NOT MERGE
automerge: b480f88 -s ours

* commit 'b480f88b805c6bb145eca74cd0624f5d588a3bb5':
7fa8b908705cff9a73c0a753762e71a32e3e51ee 22-Oct-2014 Jay Shrauner <shrauner@google.com> am 95c74bbc: am 54e563bd: Merge "Fix NPE when disconnect cause wasn\'t set" into lmp-dev
automerge: 529010c

* commit '529010cf44cdcc988c5b2441df961a26e55c3473':
bb309c4766e90ce96ba39a66fea3fcc6f349695b 22-Oct-2014 Yorke Lee <yorkelee@google.com> am f741f036: am 36bf1ca0: Merge "Correctly report phone state when call waiting is rejected" into lmp-dev
automerge: 40a5f91

* commit '40a5f91873e74e70ebe8226c6a79e949c3508ede':
13f3360e5677dc34bbb4dda85e1ca51d7239bb16 22-Oct-2014 Qiwen Zhao <zhao@google.com> am 57a620f1: am b63254cf: Merge "Don\'t stop outgoing calls if we are the foreground call." into lmp-dev
automerge: 38ec821

* commit '38ec821d90a3f389ced53454965e523b2e8c49c5':
4130ebb13baa4d7866dfca4312a60d66e04a23c0 22-Oct-2014 Ihab Awad <ihab@google.com> am c1155c1e: am bb907d48: Merge "Attempt to unhold remaining holding call on disconnect (1/2)" into lmp-dev
automerge: 2a291a5

* commit '2a291a54d02a5459fa0d80556dcd09eb7ffc60cc':
ec6b23d4aab9e9b50cf2345dc274d7ad908040f0 22-Oct-2014 Nancy Chen <nancychen@google.com> am 2c4f8de0: am 05a9e40b: Ensure bluetooth does not get hangup sound when calling through gvoice
automerge: 4c37ecc

* commit '4c37ecc590d124000c41d41cea85ac27c8e3e28d':
90c255da805903f71902655b3701047b490cb2bd 22-Oct-2014 Santos Cordon <santoscordon@google.com> am 87874ea4: am 9019ebc5: Merge "Turn on Bluetooth automatically for outgoing calls." into lmp-dev
automerge: 613952c

* commit '613952cc0f3ba15032ef8405d2586a3d995bb2a0':
aa7b55b28e6bf01033d28dd9d93105d94ef3dc10 22-Oct-2014 Santos Cordon <santoscordon@google.com> am e9cb7cfe: am 33fff490: Adding clcc request support for Bluetooth Phone Service.
automerge: aa5ff5f

* commit 'aa5ff5f3cf40b94bfb4de44abce49e219105d65d':
38c3e4fa7afce0e115a734d7f6bdf6fb3e2ae03d 22-Oct-2014 Santos Cordon <santoscordon@google.com> am e8f95056: am fddf12ed: Register BluetoothPhoneService.
automerge: a71d60a

* commit 'a71d60a8ee02c2b5b4a1c5017612734098ce3d6e':
6ebed009b8b6828e95b03499d845b4b702f4883b 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 396db602: am e6f575c8: Fix IllegalStateException when sending broadcast to CallReceiver
automerge: e419449

* commit 'e4194496a7af5be57443bb4aef0c3ec33bd0bd2c':
1b3ed71a3f7bb84b0a48d8309156ffa400b36389 22-Oct-2014 Santos Cordon <santoscordon@google.com> am 4612a0dd: am 68d1a6b0: Move BluetoothPhoneService to telecom.
automerge: f963a40

* commit 'f963a4064a8bfd226fa4e7958627c12d3c1014e5':
fcb5275f71a31251bd43da7a41c7185d30be4932 22-Oct-2014 Andrew Lee <anwlee@google.com> am 411c4f37: am ad3355a3: Merge "Refuse outgoing call if max outgoing exceeded." into lmp-dev
automerge: 38c9278

* commit '38c92789163b23ff38c60c478acae5b42c57b5d4':
6ed2541b1a21335783008c95f2107dd8918e92f9 22-Oct-2014 Sailesh Nepal <sail@google.com> am 84f5cf2a: am c673b996: Merge "Don\'t create conferences with invalid calls" into lmp-dev
automerge: 1ee7346

* commit '1ee73461839294326f24742f81055942293cda6f':
70698869d84a0184e0b3b3b43cb8d8b101bf5a6a 22-Oct-2014 Nancy Chen <nancychen@google.com> am 3509299d: am 15608a8f: Merge "Register TelecomBroadcastReceiver through AndroidManifest" into lmp-dev
automerge: 564837c

* commit '564837c75e549fb1ee01f6c0e37056db7f6464c5':
07fff544d5640c3d0fea7ff97743d2139a1251b9 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 52b45b05: am 6dc1c75f: Split CallActivity into trampoline activity and CallReceiver
automerge: 8c940cf

* commit '8c940cfb80104f378aa979397099e03d29e87b00':
38b31d0751fe8cc995ec5c0b258eae4f66767370 22-Oct-2014 Evan Charlton <evanc@google.com> am 23f647bb: am 9c3e4f3d: am 1082d72d: Merge "Fix the broken unit tests" into lmp-dev
automerge: 3e24eb2

* commit '3e24eb29faf8ade89af1c27928c096f46c8cd654':
e1b6c7ec40acbfddb87f6b19737add71ebe8b7a4 22-Oct-2014 Santos Cordon <santoscordon@google.com> am 38442297: am d2ab50b2: am 77658c4d: Merge "Forward CallActivity invocations to the primary user." into lmp-dev
automerge: 27e5fed

* commit '27e5fed5e87597d1bb2856b8ef913fa8ce166f37':
1d7756b54d90e58e3288f6011c5b2b93f3fd9ed7 22-Oct-2014 Andrew Lee <anwlee@google.com> am b802b6a9: am da278ad5: am add3c272: Merge "Don\'t enable "add call" if CDMA and in conference." into lmp-dev
automerge: f10f77e

* commit 'f10f77ed0fe40adace9caa0e40535670c1857571':
19751009edf50e212c9c5087e1db3f0b941738b9 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 4853fc71: am ee880e6f: am c7f6f8cd: Merge "Use handle uri instead null if caller info lookup is not done" into lmp-dev
automerge: 182b2ca

* commit '182b2ca816db1a0d437e7558673af36935b56ee6':
28f05f467379569df094e911d0f87097e20fe5a0 22-Oct-2014 Nancy Chen <nancychen@google.com> am 6ce36f36: am 126a677b: am 150d8684: Merge "Skip "PRE_DIAL_WAIT" when no accounts are available to chose from." into lmp-dev
automerge: 0a450a7

* commit '0a450a70378b52c5dc66a511a0b3ba9a34e8020f':
57bce06c10d50819fee8dde84231d195bf5cfa6b 22-Oct-2014 Baligh Uddin <baligh@google.com> am 106f8994: (-s ours) am dbede8e2: (-s ours) am eb09f6c7: (-s ours) Import translations. DO NOT MERGE
automerge: c058e1b -s ours

* commit 'c058e1b1256219619c00c7f63bef60ff73575ca0':
de4d1655c3670cb1f00a7be6a7caade24d727310 22-Oct-2014 Santos Cordon <santoscordon@google.com> am 2994f14e: am 7ba73d9f: am be374add: Merge "Only initialize Telecomm for the primary user." into lmp-dev
automerge: 6f41b50

* commit '6f41b503f9b19d586524c24ca9045b0f8d9edd7e':
ae064ce42ce283a5f5125938b273d11d6eaf26e7 22-Oct-2014 Sailesh Nepal <sail@google.com> am 727ec32f: am 91277357: am e9036db9: Fix bad format arg in InCallToneMonitor
automerge: 795c166

* commit '795c166699e90e0d0a4f7da23072ebd626e4722b':
16dc5c8f2ef57427eb9b0e140bbc834df87129ec 22-Oct-2014 Nancy Chen <nancychen@google.com> am d8661dc9: am 9a747153: am 1c5926fc: Replace get*PhoneAccounts* public API methods with new method (2/3)
automerge: 1b34485

* commit '1b34485fd557a78f8315daf8df74dbdd8b884140':
5332bd511e217ece2d38fbd7bff8597b85c03365 22-Oct-2014 Tyler Gunn <tgunn@google.com> am 24c404eb: am 1e565b25: am ce1a21ef: Merge "Preparatory work to move Telecom to system service." into lmp-dev
automerge: ccb99b2

* commit 'ccb99b28a0e6e5d3782f27a9d678c71f2a2fcf22':
c5263e065f10f00f8b8ce58074781765c36a2c00 22-Oct-2014 Ihab Awad <ihab@google.com> am e8d8cfad: am d32b0e6b: am c9433c38: Merge "Automatically un-hold calls brought to the foreground" into lmp-dev
automerge: 378700f

* commit '378700f4354bcb46bddddc31c3af9c17dfffef19':
c2d39117ef809a1c3edb6cb8fbacdc63ceb2f7d9 22-Oct-2014 Sailesh Nepal <sail@google.com> am a699e952: am 8c244fc5: am a53eb7f3: Remove MODIFY_PHONE_STATE requirement for Connection Managers
automerge: d23ed09

* commit 'd23ed091d31dae0e07d4b1147287740d4ee33aeb':
364a6ef42e74d70868957ba1bf07ecff2e52733e 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 2fd7d9aa: am c0c362f2: am 465cec04: Merge "Implement DTMF tones in test RemoteConference" into lmp-dev
automerge: 8ef4099

* commit '8ef4099fde48aee08f41a4717aa85f3fdf5f6770':
060a5ba9ea2e6f135efe0f108b95f31768fea548 22-Oct-2014 Nancy Chen <nancychen@google.com> am ba739c28: am cf3459dc: am b3c4b285: Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev
automerge: e14263f

* commit 'e14263f1314612b517447f4e45da641092c7a033':
9da01ef82da93a358953cb0ab6b56a8b06f3e879 22-Oct-2014 Andrew Lee <anwlee@google.com> am 665a6adb: am b4b44ee0: am 701dc006: Use telecomm DiconnectCause in services/Telecomm.
automerge: 064435f

* commit '064435f1e7bc177e695295c9386a769d3ab4c0e9':
e8b0d037c7046ad995f06280fc6f75a23cd514ae 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 39861068: am d0cbdb0b: am e425e060: Merge "Fix for busted call duration in CDMA conference" into lmp-dev
automerge: f1af38a

* commit 'f1af38ab34b56e07fe5a97c936f5ce11d46f82c6':
1a53813f7fd6bee5b461db1905ccc3b17b8ebc85 22-Oct-2014 Santos Cordon <santoscordon@google.com> am e46556f8: am 0d661ca8: am cf2a3643: Merge "Remove config variable to disable connection service APIs" into lmp-dev
automerge: 87eb4c9

* commit '87eb4c978eabd2341498de152b81dd300abf6829':
972f924e5a4c956f9fb7aa5856ae3b524ea84227 22-Oct-2014 Yorke Lee <yorkelee@google.com> am 7dccaef0: am 729a2b21: am ee9649b8: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev
automerge: c452e4a

* commit 'c452e4a9347d7ecdbc0588d6b45fb22ff121186e':
922cf8bfddfdee8e56a317882ccc0506e1119ece 22-Oct-2014 Ihab Awad <ihab@google.com> am 04b1c7dd: am 01553658: am f1863270: Add system feature for ConnectionService API support (3/3)
automerge: bbfebe7

* commit 'bbfebe77387e496d59b0488a094e126d25d49368':
99c8520bcdbdf94bcf74dfa8e9ed40ad7e5fba5a 21-Oct-2014 Yorke Lee <yorkelee@google.com> Once responded to a call, remove it from list of ringing calls

Remove a call from mRingingCalls immediately once it is responded to.
This fixes an erroneous transition as described below
1) Call waiting is received
2) Call waiting is answered
3) Currently active call is put on hold
4) onForegroundCallChanged is called with the new call waiting, before it
goes to active
5) Ringtone is played in Ringer.startRingingOrCallWaiting
This CL ensures that if 4) happens, we do not erroneously transition to
AudioManager.MODE_RINGTONE.

Tested with the following scenarios to ensure that the ringtone/call waiting
tone is correctly sounded, and invalid audio mode transitions are not
encountered.

1) Multiple MT calls in a row
2) MT call + call waiting + reject
3) MT call + call waiting + answer
4) Conference call + call waiting + reject
5) Conference call + call waiting + answer

Bug: 18058600
Change-Id: I97cd798656cc56c937964fb1ebb3032c4cee4ed7
rc/com/android/server/telecom/Ringer.java
76a123e96a3cf4c68f5d4c0d80db10729f479ffb 21-Oct-2014 Yorke Lee <yorkelee@google.com> am efba60b2: Merge "Fix typo when forcing recalculation of call capabilities" into lmp-dev

* commit 'efba60b21218cc41251b04c71fa0ec5edc44d798':
Fix typo when forcing recalculation of call capabilities
09a247c9fd0b0f54dbffca0983fef9a3b4991fdc 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 531a5074: am c9fe671f: Merge "Update call capabilities when call is removed" into lmp-dev

* commit '531a5074c995eaa6df3f4782431d72178572b6ff':
ddebbdc153470626d6628d43f5626f0d931b54c4 21-Oct-2014 Baligh Uddin <baligh@google.com> am a7910e7f: (-s ours) am 346e1e7d: (-s ours) Import translations. DO NOT MERGE

* commit 'a7910e7f9a1e1c794a4087ad12e1fa09a6d19ad3':
d97625c66dc18fdc174576099bf3eed699a53382 21-Oct-2014 Yorke Lee <yorkelee@google.com> am d7eadff6: Make more audio logging visible automerge: e5a7c92

* commit 'd7eadff6758ce9c7545d5566f9d0feba38e398a6':
4bb1f200d2257089837538aa64e0df932a5715ba 21-Oct-2014 Yorke Lee <yorkelee@google.com> am de9aba5f: am aa6ea25b: Merge "Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9" into lmp-dev

* commit 'de9aba5f2255e1ec1b2400288fe24881f5d6814d':
34a9de7e6ed6d59415b9dcd2639cee35004b42a4 21-Oct-2014 Yorke Lee <yorkelee@google.com> am b4ea3642: am 5aed1294: Merge "Always return at least the default emergency phone account" into lmp-dev

* commit 'b4ea3642f29d92ca23d41ed336f10354d3d773b1':
c372aced84ea15332e4b0b6ddabf19024da72171 21-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 5a336f04: am 62e1ab16: Merge "Broadcast the call type/duration information" into lmp-dev

* commit '5a336f048c643134a1d1bb89195212884385b087':
30bb34c0add30ad5eefe478635933c98245ced5d 21-Oct-2014 Andrew Lee <anwlee@google.com> am 517edba5: am 9846dd39: Merge "Notify current user of missed calls." into lmp-dev

* commit '517edba58549bf7df133ba2704e8510b10214da0':
e964feb7e56aaa78825af9195807f262f427e3f3 21-Oct-2014 Tyler Gunn <tgunn@google.com> am cccf7303: am 127faa82: Merge "Fixing issue where Google Voice calls are logged twice to call log." into lmp-dev

* commit 'cccf73037d15f1c1f313041ed0f5474acdc456a7':
ff1029fde635cf4fbdabcea7f81ac30caec05c31 21-Oct-2014 Yorke Lee <yorkelee@google.com> am adf67894: am ae117a6c: Merge "Don\'t play call waiting for first incoming call" into lmp-dev

* commit 'adf67894a61914eebbfb6e175bc1f20b64e22b2b':
f76c578ddb49befbeb2cd02ba0748f54eb04b52d 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 5557cd86: am 7062bb96: Set correct InCall tone lengths

* commit '5557cd8652954ffa4a0c9ae80b30d070f77b0b34':
092d3b07b3fee0af102de6a8aa967f5096de63c6 21-Oct-2014 Santos Cordon <santoscordon@google.com> am 5598df15: am 88336c2e: Merge "Update foreground calls with child-parent call changes." into lmp-dev

* commit '5598df15e702f83d40a6af13974abbc3636583e1':
0688748ea91adc174e73fe801551c7c024f71b22 21-Oct-2014 Tyler Gunn <tgunn@google.com> am ad04b7bd: am 36e50968: Merge "Issue: turning on bluetooth headset in call doesn\'t change route (1/2)." into lmp-dev

* commit 'ad04b7bd7a97d1711a5fda31baf993ce80701fb2':
57886f35e0a955d96b60e58f6c0dcebf35cedf77 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 6729e2d2: am 9e79dbe0: Merge "Protect against null mBluetoothHeadset" into lmp-dev

* commit '6729e2d2a91f35922e41e98af7f71c28b53f3a74':
da96a50ddb9365b9684a194776abe1471341b31e 21-Oct-2014 Santos Cordon <santoscordon@google.com> am 4ad2a7eb: am d9bae25a: Merge "Unset disconnecting boolean when a call transitions to DISCONNECTED." into lmp-dev

* commit '4ad2a7eb1acdf261e5a58f226670dcb5c0b841dd':
03d97842452285a07dc37b104cf28175d9202ced 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 2834c3f9: am e0175431: Merge "Enforce CALL_PRIVILEGED check at start of CallActivity" into lmp-dev

* commit '2834c3f9d0b074e6087dc6c2f9b4dbba106d8081':
570bfadb82bfe4a47d781ae6b2a99bd5c6bb862e 21-Oct-2014 Tyler Gunn <tgunn@google.com> am 81520e99: am aa479376: Fixing where call goes from disconnecting to active to disconnecting state.

* commit '81520e99bf8359be46a26534777b9aed67822faf':
86d5dcfa5a732f5f6fd9b81ccf350239a2ee97da 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 383341be: am fae0efd9: Merge "Add ability to add sim-initiated MO call to UI (3/4)" into lmp-dev

* commit '383341be1ee261fdad33c1b8f2d8561149fb4d58':
980e2db304c4f8601892801fd69b723b6f973212 21-Oct-2014 Andrew Lee <anwlee@google.com> am c677f0c6: am 81db23b8: Merge "Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver." into lmp-dev

* commit 'c677f0c66a9dede686a01b2727b8fc9518ebdd52':
0d7985241babc817b86dea376f1bdad0092d2763 21-Oct-2014 Santos Cordon <santoscordon@google.com> am 0ea47ddb: am 5adc858b: Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev

* commit '0ea47ddbcdcf16f85cdbed3ca9da1bb5a0aacb76':
b87b8f4f812023bd97827e115f1119f1fddfa90f 21-Oct-2014 Andrew Lee <anwlee@google.com> am 439c5b52: am 72d271c4: Process intent immediately for primary users.

* commit '439c5b5218823853fe47c92bfcf956223b0b26be':
e6fe7b18651f89ccce795682f34f44834fb5825d 21-Oct-2014 Tyler Gunn <tgunn@google.com> am e60d3c1e: am c3f986b5: Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev

* commit 'e60d3c1ec38ebf74bfce73ba2a68eac5508b2419':
6f538972c45e83b453d628252773356c5b8521be 21-Oct-2014 Santos Cordon <santoscordon@google.com> am 03f51471: am efc5519c: Merge "Support MERGE/HOLD for Cdma calls through BT Headset." into lmp-dev

* commit '03f514716977ce6ef4a7cf2e4375d9baaf771fb9':
b96374a0f14282fef3533f69798b4f104a6b4519 21-Oct-2014 Andrew Lee <anwlee@google.com> am 04fe71aa: am 7984e0a7: Merge "Removed failed outgoing calls." into lmp-dev

* commit '04fe71aa8b00ec47b90cb2fda4af5e38fc850b11':
494d3c7e1a0193e2ed05d00f0b4c28d605e24917 21-Oct-2014 Tyler Gunn <tgunn@google.com> am 26aa3b87: am f3d17409: Merge "Allow sending of in-call MMI codes through to telephony." into lmp-dev

* commit '26aa3b879e0a383a5b6acd2b0413f9d91c38651f':
eda2a84c6c78ed25385b11afbfad404e5e2ed685 21-Oct-2014 Ihab Awad <ihab@google.com> am c0caa70c: am 3e3cde1b: Merge "Refine implementation of GSM conferences (2/3)" into lmp-dev

* commit 'c0caa70cb628c8bdd15482c564f1c000d4614d5a':
bd23cdd301562cbe5d3839693550e8d84c7849a0 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 0851c941: am 802363d9: Merge "Correctly send the original address in BluetoothPhoneService if using gateway" into lmp-dev

* commit '0851c941bb7884a81ab50ff2b548dd1731e1d3e5':
228889117c7ef7de4b1b2c98c3e45a27770cdb97 21-Oct-2014 Santos Cordon <santoscordon@google.com> am f18e45a6: am b9d90a66: Merge "BT: Sending DIALING state prior to changing to ALERTING state." into lmp-dev

* commit 'f18e45a69405b233020cb670ec7bb54e8db17c06':
5680e9e8a6cf51f12e6fba6c7c7271298c5a3680 21-Oct-2014 Nancy Chen <nancychen@google.com> am 7e46a392: am b92682c6: Merge "Remove invalid warning from BluetoothPhoneService" into lmp-dev

* commit '7e46a3923936d83520ede07cc1fb3c46831c4d1a':
0a9bb64d510083787a2834dc1e7fe609fdbb071b 21-Oct-2014 Jay Shrauner <shrauner@google.com> am 50fe6d44: am 6426ce8d: Merge "Fix NPE when calls manager isn\'t initialized" into lmp-dev

* commit '50fe6d4431909b875b4b127dcd69eeb08ac31b9b':
b480f88b805c6bb145eca74cd0624f5d588a3bb5 21-Oct-2014 Baligh Uddin <baligh@google.com> am a646e2bf: (-s ours) am e471c51b: (-s ours) Import translations. DO NOT MERGE

* commit 'a646e2bfdef32e1052561e7a546fe292ebfa8763':
529010cf44cdcc988c5b2441df961a26e55c3473 21-Oct-2014 Jay Shrauner <shrauner@google.com> am 95c74bbc: am 54e563bd: Merge "Fix NPE when disconnect cause wasn\'t set" into lmp-dev

* commit '95c74bbcf90babb9e26496855007d019cd8320f5':
40a5f91873e74e70ebe8226c6a79e949c3508ede 21-Oct-2014 Yorke Lee <yorkelee@google.com> am f741f036: am 36bf1ca0: Merge "Correctly report phone state when call waiting is rejected" into lmp-dev

* commit 'f741f036b47ee82bb0d8e59fde0da11c1b5096e6':
38ec821d90a3f389ced53454965e523b2e8c49c5 21-Oct-2014 Qiwen Zhao <zhao@google.com> am 57a620f1: am b63254cf: Merge "Don\'t stop outgoing calls if we are the foreground call." into lmp-dev

* commit '57a620f128521574da584dfad182069bfe4a903d':
2a291a54d02a5459fa0d80556dcd09eb7ffc60cc 21-Oct-2014 Ihab Awad <ihab@google.com> am c1155c1e: am bb907d48: Merge "Attempt to unhold remaining holding call on disconnect (1/2)" into lmp-dev

* commit 'c1155c1e3c4d131ebe611160e34f02efa2100927':
4c37ecc590d124000c41d41cea85ac27c8e3e28d 21-Oct-2014 Nancy Chen <nancychen@google.com> am 2c4f8de0: am 05a9e40b: Ensure bluetooth does not get hangup sound when calling through gvoice

* commit '2c4f8de0073bf45394a87bf731594253e4b45492':
613952cc0f3ba15032ef8405d2586a3d995bb2a0 21-Oct-2014 Santos Cordon <santoscordon@google.com> am 87874ea4: am 9019ebc5: Merge "Turn on Bluetooth automatically for outgoing calls." into lmp-dev

* commit '87874ea4531b63d2504539c2f42673f7fbda5588':
aa5ff5f3cf40b94bfb4de44abce49e219105d65d 21-Oct-2014 Santos Cordon <santoscordon@google.com> am e9cb7cfe: am 33fff490: Adding clcc request support for Bluetooth Phone Service.

* commit 'e9cb7cfeb2ab0319257a033abcacf4d4b2bce367':
a71d60a8ee02c2b5b4a1c5017612734098ce3d6e 21-Oct-2014 Santos Cordon <santoscordon@google.com> am e8f95056: am fddf12ed: Register BluetoothPhoneService.

* commit 'e8f950567b9e4b2c115f821f3e82705143531bec':
e4194496a7af5be57443bb4aef0c3ec33bd0bd2c 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 396db602: am e6f575c8: Fix IllegalStateException when sending broadcast to CallReceiver

* commit '396db60297b2d88eb666e1408f6e69e06873c851':
f963a4064a8bfd226fa4e7958627c12d3c1014e5 21-Oct-2014 Santos Cordon <santoscordon@google.com> am 4612a0dd: am 68d1a6b0: Move BluetoothPhoneService to telecom.

* commit '4612a0dd8aada99789a7391a9954c43096965078':
38c92789163b23ff38c60c478acae5b42c57b5d4 21-Oct-2014 Andrew Lee <anwlee@google.com> am 411c4f37: am ad3355a3: Merge "Refuse outgoing call if max outgoing exceeded." into lmp-dev

* commit '411c4f3786e6f433ed4882429fb1356244825fae':
1ee73461839294326f24742f81055942293cda6f 21-Oct-2014 Sailesh Nepal <sail@google.com> am 84f5cf2a: am c673b996: Merge "Don\'t create conferences with invalid calls" into lmp-dev

* commit '84f5cf2a9aaa445958a85a46320d30db6d61c0fe':
564837c75e549fb1ee01f6c0e37056db7f6464c5 21-Oct-2014 Nancy Chen <nancychen@google.com> am 3509299d: am 15608a8f: Merge "Register TelecomBroadcastReceiver through AndroidManifest" into lmp-dev

* commit '3509299d9a88e8f7af2b3ef3c3247c1fdf809e91':
8c940cfb80104f378aa979397099e03d29e87b00 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 52b45b05: am 6dc1c75f: Split CallActivity into trampoline activity and CallReceiver

* commit '52b45b05a3242afb2f3b9062ac49108b0a2a1a48':
3e24eb29faf8ade89af1c27928c096f46c8cd654 21-Oct-2014 Evan Charlton <evanc@google.com> am 23f647bb: am 9c3e4f3d: am 1082d72d: Merge "Fix the broken unit tests" into lmp-dev

* commit '23f647bbe71643084bf598a562595b841b450a6f':
27e5fed5e87597d1bb2856b8ef913fa8ce166f37 21-Oct-2014 Santos Cordon <santoscordon@google.com> am 38442297: am d2ab50b2: am 77658c4d: Merge "Forward CallActivity invocations to the primary user." into lmp-dev

* commit '38442297ecb60902293558adbbef39c75e9cf6b5':
f10f77ed0fe40adace9caa0e40535670c1857571 21-Oct-2014 Andrew Lee <anwlee@google.com> am b802b6a9: am da278ad5: am add3c272: Merge "Don\'t enable "add call" if CDMA and in conference." into lmp-dev

* commit 'b802b6a99b065cefb93154a26d423afa731e0a02':
182b2ca816db1a0d437e7558673af36935b56ee6 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 4853fc71: am ee880e6f: am c7f6f8cd: Merge "Use handle uri instead null if caller info lookup is not done" into lmp-dev

* commit '4853fc713e854abf369d82a7fbef593cce253c5e':
0a450a70378b52c5dc66a511a0b3ba9a34e8020f 21-Oct-2014 Nancy Chen <nancychen@google.com> am 6ce36f36: am 126a677b: am 150d8684: Merge "Skip "PRE_DIAL_WAIT" when no accounts are available to chose from." into lmp-dev

* commit '6ce36f368e6389d6230fb753129ec69b033bb4d3':
c058e1b1256219619c00c7f63bef60ff73575ca0 21-Oct-2014 Baligh Uddin <baligh@google.com> am 106f8994: (-s ours) am dbede8e2: (-s ours) am eb09f6c7: (-s ours) Import translations. DO NOT MERGE

* commit '106f8994383ceebd6e24e7ca5a99a608714de4c9':
6f41b503f9b19d586524c24ca9045b0f8d9edd7e 21-Oct-2014 Santos Cordon <santoscordon@google.com> am 2994f14e: am 7ba73d9f: am be374add: Merge "Only initialize Telecomm for the primary user." into lmp-dev

* commit '2994f14eb84813517f6f8becfc067fb860620429':
795c166699e90e0d0a4f7da23072ebd626e4722b 21-Oct-2014 Sailesh Nepal <sail@google.com> am 727ec32f: am 91277357: am e9036db9: Fix bad format arg in InCallToneMonitor

* commit '727ec32f8d2865e84f2c2a13bc04cd7859c140e1':
1b34485fd557a78f8315daf8df74dbdd8b884140 21-Oct-2014 Nancy Chen <nancychen@google.com> am d8661dc9: am 9a747153: am 1c5926fc: Replace get*PhoneAccounts* public API methods with new method (2/3)

* commit 'd8661dc9f10fd2505114d99e6f343f7ef6db7e58':
ccb99b28a0e6e5d3782f27a9d678c71f2a2fcf22 21-Oct-2014 Tyler Gunn <tgunn@google.com> am 24c404eb: am 1e565b25: am ce1a21ef: Merge "Preparatory work to move Telecom to system service." into lmp-dev

* commit '24c404eb39c7b707a6e7fe3428cf154954457a72':
378700f4354bcb46bddddc31c3af9c17dfffef19 21-Oct-2014 Ihab Awad <ihab@google.com> am e8d8cfad: am d32b0e6b: am c9433c38: Merge "Automatically un-hold calls brought to the foreground" into lmp-dev

* commit 'e8d8cfadc0f4960b5b4afbea91f8fba9c782b810':
d23ed091d31dae0e07d4b1147287740d4ee33aeb 21-Oct-2014 Sailesh Nepal <sail@google.com> am a699e952: am 8c244fc5: am a53eb7f3: Remove MODIFY_PHONE_STATE requirement for Connection Managers

* commit 'a699e95218e3e62592d8feb3512e1f2258119e9c':
8ef4099fde48aee08f41a4717aa85f3fdf5f6770 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 2fd7d9aa: am c0c362f2: am 465cec04: Merge "Implement DTMF tones in test RemoteConference" into lmp-dev

* commit '2fd7d9aa72dc1d87d9044c4e32927d43c7edd6ee':
e14263f1314612b517447f4e45da641092c7a033 21-Oct-2014 Nancy Chen <nancychen@google.com> am ba739c28: am cf3459dc: am b3c4b285: Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev

* commit 'ba739c2855bbbe3a6aba9b1928578befdfdcb71f':
064435f1e7bc177e695295c9386a769d3ab4c0e9 21-Oct-2014 Andrew Lee <anwlee@google.com> am 665a6adb: am b4b44ee0: am 701dc006: Use telecomm DiconnectCause in services/Telecomm.

* commit '665a6adb9e1b3dbc679778d0e5d5366365b6c42f':
f1af38ab34b56e07fe5a97c936f5ce11d46f82c6 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 39861068: am d0cbdb0b: am e425e060: Merge "Fix for busted call duration in CDMA conference" into lmp-dev

* commit '39861068f723a83198bc9393c95fed82a2ffa0f4':
87eb4c978eabd2341498de152b81dd300abf6829 21-Oct-2014 Santos Cordon <santoscordon@google.com> am e46556f8: am 0d661ca8: am cf2a3643: Merge "Remove config variable to disable connection service APIs" into lmp-dev

* commit 'e46556f8ec8b6b4c4efef130b44b3266d147167b':
c452e4a9347d7ecdbc0588d6b45fb22ff121186e 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 7dccaef0: am 729a2b21: am ee9649b8: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev

* commit '7dccaef0b7abba4ac0bd8201a8febb4dda5789c8':
bbfebe77387e496d59b0488a094e126d25d49368 21-Oct-2014 Ihab Awad <ihab@google.com> am 04b1c7dd: am 01553658: am f1863270: Add system feature for ConnectionService API support (3/3)

* commit '04b1c7dd21a3c6aebd4982ac7064043c6ceef71b':
efba60b21218cc41251b04c71fa0ec5edc44d798 21-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Fix typo when forcing recalculation of call capabilities" into lmp-dev
7ae9eed7b50b423a7351c0de292e1ef4d3861344 21-Oct-2014 Yorke Lee <yorkelee@google.com> Fix typo when forcing recalculation of call capabilities

Bug: 18071704
Change-Id: Ib389ce72bc43e2fc073af5afc6383f3250046b27
rc/com/android/server/telecom/CallsManager.java
a77a07e4c3c270acc025ba5e11fe113507cb0294 21-Oct-2014 Andrew Lee <anwlee@google.com> am c7c51385: am c7397fd8: am 6b8eb44b: Merge "Disable add call/upgrade to video during dialing." into lmp-mr1-dev

* commit 'c7c513851ff088ff4ff18b11dfdda0659d53a6b1':
Disable add call/upgrade to video during dialing.
c7c513851ff088ff4ff18b11dfdda0659d53a6b1 21-Oct-2014 Andrew Lee <anwlee@google.com> am c7397fd8: am 6b8eb44b: Merge "Disable add call/upgrade to video during dialing." into lmp-mr1-dev

* commit 'c7397fd84e0de1ff524c3e85f28796539f41472a':
Disable add call/upgrade to video during dialing.
0e27e89d428fb9202e529590cc6a9d70526d38a6 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 4c33f22f: Merge "Protect against INCALL->RINGING transition in AudioManager" into lmp-dev

* commit '4c33f22fe2a8db07b6fedcd4becf5159bc1c5a22':
Protect against INCALL->RINGING transition in AudioManager
c7397fd84e0de1ff524c3e85f28796539f41472a 21-Oct-2014 Andrew Lee <anwlee@google.com> am 6b8eb44b: Merge "Disable add call/upgrade to video during dialing." into lmp-mr1-dev

* commit '6b8eb44bc574362715f033d1c134721309a1a3ca':
Disable add call/upgrade to video during dialing.
4c33f22fe2a8db07b6fedcd4becf5159bc1c5a22 21-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Protect against INCALL->RINGING transition in AudioManager" into lmp-dev
6b8eb44bc574362715f033d1c134721309a1a3ca 21-Oct-2014 Andrew Lee <anwlee@google.com> Merge "Disable add call/upgrade to video during dialing." into lmp-mr1-dev
800c9ad07201f9bddefba8356f8d70d1159f4e91 21-Oct-2014 Yorke Lee <yorkelee@google.com> am de13aea3: am 8d2ab109: am d84e684a: Merge "Add more logging to proximity sensor" into lmp-mr1-dev

* commit 'de13aea355dea8b988c964a82c37534fd97b7c01':
Add more logging to proximity sensor
a4a4bbd96987f8ccdf040c179001924202c1035d 21-Oct-2014 Nancy Chen <nancychen@google.com> Merge "Enforce permissions for isVoiceMailNumber." into lmp-sprout-dev
de13aea355dea8b988c964a82c37534fd97b7c01 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 8d2ab109: am d84e684a: Merge "Add more logging to proximity sensor" into lmp-mr1-dev

* commit '8d2ab10960257239d0aa2c06e51604f5d27897e1':
Add more logging to proximity sensor
a29b046bd45069852db2512c1c474b3fc4219353 21-Oct-2014 Nancy Chen <nancychen@google.com> Enforce permissions for isVoiceMailNumber.

Third party apps should not be able to discover a user's voicemail
number. Enforce permission to read state or dialing app only.

Bug: 17925501
Change-Id: Ieba52fe4bb4fbb57819519ded6a113473bf2a012
rc/com/android/server/telecom/TelecomServiceImpl.java
8d2ab10960257239d0aa2c06e51604f5d27897e1 21-Oct-2014 Yorke Lee <yorkelee@google.com> am d84e684a: Merge "Add more logging to proximity sensor" into lmp-mr1-dev

* commit 'd84e684acb40c0e0af54d47b9ce311185d32bc04':
Add more logging to proximity sensor
d84e684acb40c0e0af54d47b9ce311185d32bc04 21-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Add more logging to proximity sensor" into lmp-mr1-dev
94586cdd5f29066e041d4c95f43a8e8e539ee1a0 21-Oct-2014 Nancy Chen <nancychen@google.com> Merge "Enable account selection for MMI codes that involve "dialing"." into lmp-sprout-dev
8d92f45672193c2b1179113b6cf5aedb19d2dc39 21-Oct-2014 Nancy Chen <nancychen@google.com> Enable account selection for MMI codes that involve "dialing".

Some MMI codes (specifically a small set of GSM codes) involve pressing
"dial" to send the code. The connection service identifies that this is
an MMI code and responds accordingly, including canceling the call. In
the multi-SIM case, we want to bring up a dialog to select a SIM
"connect" through. We can use the current PRE_DIAL_WAIT state and select
account dialog to do this.

Bug: 17573147
Change-Id: Id765e595f3149c088ae5de72a97cc2034338b6ee
rc/com/android/server/telecom/CallsManager.java
60b6e2830ee5c7d11c0fb8018595bf174d94a086 21-Oct-2014 Yorke Lee <yorkelee@google.com> Protect against INCALL->RINGING transition in AudioManager

If such a transition occurs, reset to NORMAL first, to prevent the loss
of uplink audio.

Tested with:
1) Answering Call WAITING (before fix in
https://googleplex-android-review.git.corp.google.com/#/c/571861/1 is applied)
2) Receiving an incoming call while in-call tone is still playing

Bug: 18058600
Bug: 18020190
Change-Id: Ib5ec8d202ed6c5d8262853696e8fadfa7a222ac8
rc/com/android/server/telecom/CallAudioManager.java
0e4a4ffdca8822eeff75981bfce902e7ea5341b1 21-Oct-2014 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE"
b3ee100084a253da80ee1ff7b884b376a1ea9393 21-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I63adc91d3618b81b8df393252d8b53cf54270395
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-kn-rIN/strings.xml
es/values-ml-rIN/strings.xml
167985fa9e6a56d2736ec04956d65691b9464bf6 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 5c56502e: am 071e725b: am 686f4539: am eae93b4c: am c9fe671f: Merge "Update call capabilities when call is removed" into lmp-dev

* commit '5c56502e97d7a37c36c5bd3adcd5e2766d656a2c':
Update call capabilities when call is removed
5c56502e97d7a37c36c5bd3adcd5e2766d656a2c 21-Oct-2014 Yorke Lee <yorkelee@google.com> am 071e725b: am 686f4539: am eae93b4c: am c9fe671f: Merge "Update call capabilities when call is removed" into lmp-dev

* commit '071e725bbc3425cf296121a4b03dfca7a7fdc70d':
Update call capabilities when call is removed
071e725bbc3425cf296121a4b03dfca7a7fdc70d 20-Oct-2014 Yorke Lee <yorkelee@google.com> am 686f4539: am eae93b4c: am c9fe671f: Merge "Update call capabilities when call is removed" into lmp-dev

* commit '686f453920381348ec162828269e751aca535580':
Update call capabilities when call is removed
686f453920381348ec162828269e751aca535580 20-Oct-2014 Yorke Lee <yorkelee@google.com> am eae93b4c: am c9fe671f: Merge "Update call capabilities when call is removed" into lmp-dev

* commit 'eae93b4c741e70d8f0780ca92c747f6950173d8d':
Update call capabilities when call is removed
eae93b4c741e70d8f0780ca92c747f6950173d8d 20-Oct-2014 Yorke Lee <yorkelee@google.com> am c9fe671f: Merge "Update call capabilities when call is removed" into lmp-dev

* commit 'c9fe671fe1e780cf6d6e2bb59ddb47c51ea038a3':
Update call capabilities when call is removed
531a5074c995eaa6df3f4782431d72178572b6ff 20-Oct-2014 Yorke Lee <yorkelee@google.com> am c9fe671f: Merge "Update call capabilities when call is removed" into lmp-dev

* commit 'c9fe671fe1e780cf6d6e2bb59ddb47c51ea038a3':
Update call capabilities when call is removed
c9fe671fe1e780cf6d6e2bb59ddb47c51ea038a3 20-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Update call capabilities when call is removed" into lmp-dev
cfd8f563630612fc22480643b10dd95df90f51d0 20-Oct-2014 Andrew Lee <anwlee@google.com> Disable add call/upgrade to video during dialing.

Add call worked in earlier versions, but we don't support multiple
outgoing calls right now.

Bug: 17009425
Change-Id: I5e80741ed11e21659ec359e5f9a88220ca31e6c8
rc/com/android/server/telecom/InCallController.java
604a90f596deb41998e021151b3ddc8019e28eac 20-Oct-2014 Yorke Lee <yorkelee@google.com> Update call capabilities when call is removed

Bug: 18018700
Bug: 17586196
Change-Id: I4bb733fea421e4c18378f0ff96b571e6b2f66a14
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
cce72fcf2db1e502a6ef52cdc15f47da62126a72 20-Oct-2014 Yorke Lee <yorkelee@google.com> Add more logging to proximity sensor

Change-Id: Ic9329699daffff19fc25bcdcbc3378cd1313e658
rc/com/android/server/telecom/ProximitySensorManager.java
11e306b4ae3a3143d65fd78d209c1b7416b8bf81 19-Oct-2014 Baligh Uddin <baligh@google.com> am 8eb13adf: (-s ours) am 8340716d: (-s ours) am 7ab57174: (-s ours) am 1ff01964: (-s ours) am 346e1e7d: (-s ours) Import translations. DO NOT MERGE

* commit '8eb13adfbf5ebddca2493a9d5b2080af4e8a3980':
Import translations. DO NOT MERGE
8eb13adfbf5ebddca2493a9d5b2080af4e8a3980 19-Oct-2014 Baligh Uddin <baligh@google.com> am 8340716d: (-s ours) am 7ab57174: (-s ours) am 1ff01964: (-s ours) am 346e1e7d: (-s ours) Import translations. DO NOT MERGE

* commit '8340716d72402d813dd2bb50807cf91c41a68a63':
Import translations. DO NOT MERGE
8340716d72402d813dd2bb50807cf91c41a68a63 19-Oct-2014 Baligh Uddin <baligh@google.com> am 7ab57174: (-s ours) am 1ff01964: (-s ours) am 346e1e7d: (-s ours) Import translations. DO NOT MERGE

* commit '7ab5717418fe77e59e17b1f7cdea903a8d24721a':
Import translations. DO NOT MERGE
7ab5717418fe77e59e17b1f7cdea903a8d24721a 19-Oct-2014 Baligh Uddin <baligh@google.com> am 1ff01964: (-s ours) am 346e1e7d: (-s ours) Import translations. DO NOT MERGE

* commit '1ff019649dac2f69f965064749fc5510593dedc6':
Import translations. DO NOT MERGE
a7910e7f9a1e1c794a4087ad12e1fa09a6d19ad3 19-Oct-2014 Baligh Uddin <baligh@google.com> am 346e1e7d: (-s ours) Import translations. DO NOT MERGE

* commit '346e1e7d331ff3e03a741dc3f275705c89f4dc15':
Import translations. DO NOT MERGE
1ff019649dac2f69f965064749fc5510593dedc6 19-Oct-2014 Baligh Uddin <baligh@google.com> am 346e1e7d: (-s ours) Import translations. DO NOT MERGE

* commit '346e1e7d331ff3e03a741dc3f275705c89f4dc15':
Import translations. DO NOT MERGE
346e1e7d331ff3e03a741dc3f275705c89f4dc15 19-Oct-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic31942163246efd143eaa4052ca9a93f0e682382
Auto-generated-cl: translation import
es/values-hi/strings.xml
27308d256ce6ebeece46bd0b35bbc323b4be5f87 17-Oct-2014 Yorke Lee <yorkelee@google.com> am 654bbcf9: am e7ec97c4: am 78081e43: am 2d5883ed: am e5a7c921: Make more audio logging visible

* commit '654bbcf964bf5d3b64a565dd81781613c5ff30f9':
Make more audio logging visible
654bbcf964bf5d3b64a565dd81781613c5ff30f9 17-Oct-2014 Yorke Lee <yorkelee@google.com> am e7ec97c4: am 78081e43: am 2d5883ed: am e5a7c921: Make more audio logging visible

* commit 'e7ec97c470f15a2c41460bcf01dcc5c13a389d04':
Make more audio logging visible
e7ec97c470f15a2c41460bcf01dcc5c13a389d04 17-Oct-2014 Yorke Lee <yorkelee@google.com> am 78081e43: am 2d5883ed: am e5a7c921: Make more audio logging visible

* commit '78081e435da21360b8abd182dd50d12d4b9692a4':
Make more audio logging visible
78081e435da21360b8abd182dd50d12d4b9692a4 17-Oct-2014 Yorke Lee <yorkelee@google.com> am 2d5883ed: am e5a7c921: Make more audio logging visible

* commit '2d5883eda4008be7953eb50fd15ed7ef26fbdf49':
Make more audio logging visible
2d5883eda4008be7953eb50fd15ed7ef26fbdf49 17-Oct-2014 Yorke Lee <yorkelee@google.com> am e5a7c921: Make more audio logging visible

* commit 'e5a7c921546825810996bd51414f251f005e0766':
Make more audio logging visible
d7eadff6758ce9c7545d5566f9d0feba38e398a6 17-Oct-2014 Yorke Lee <yorkelee@google.com> Make more audio logging visible
automerge: e5a7c92

* commit 'e5a7c921546825810996bd51414f251f005e0766':
Make more audio logging visible
e5a7c921546825810996bd51414f251f005e0766 17-Oct-2014 Yorke Lee <yorkelee@google.com> Make more audio logging visible

These are very useful when diagnosing audio routing issues in
bug reports.

Bug: 18017081

Change-Id: I44e6553a9fe9fc9399ce26899b829cda735af02b
rc/com/android/server/telecom/CallAudioManager.java
bf8bf24976cdbc06b70f2ae3e471784c52e4d84f 17-Oct-2014 Nancy Chen <nancychen@google.com> am 140004a1: Use Telecom API for checking if a number is voicemail (2/2) automerge: b1c12f0 automerge: 682f3e5
automerge: 9ca7a7d

* commit '9ca7a7d513f5209d2b095de6872fe6d44023edd0':
Use Telecom API for checking if a number is voicemail (2/2)
c18a8b1cf4271bc540f84e65d96cb7c6d65688e8 17-Oct-2014 Nancy Chen <nancychen@google.com> am 5610e1de: Merge "Revert "Add API method to extract subscription ID from phone account (2/3)"" into lmp-sprout-dev automerge: 9c95a95 automerge: d828e2f
automerge: 4721564

* commit '47215642b1db64f12179177d054e03f493a8dcad':
Revert "Add API method to extract subscription ID from phone account (2/3)"
9ca7a7d513f5209d2b095de6872fe6d44023edd0 17-Oct-2014 Nancy Chen <nancychen@google.com> am 140004a1: Use Telecom API for checking if a number is voicemail (2/2) automerge: b1c12f0
automerge: 682f3e5

* commit '682f3e53d5f300cad45f6f57925f7163f30afaac':
Use Telecom API for checking if a number is voicemail (2/2)
47215642b1db64f12179177d054e03f493a8dcad 17-Oct-2014 Nancy Chen <nancychen@google.com> am 5610e1de: Merge "Revert "Add API method to extract subscription ID from phone account (2/3)"" into lmp-sprout-dev automerge: 9c95a95
automerge: d828e2f

* commit 'd828e2f1c4fd2973128e6f7c289441e49565814b':
Revert "Add API method to extract subscription ID from phone account (2/3)"
682f3e53d5f300cad45f6f57925f7163f30afaac 17-Oct-2014 Nancy Chen <nancychen@google.com> am 140004a1: Use Telecom API for checking if a number is voicemail (2/2)
automerge: b1c12f0

* commit 'b1c12f0a8ae1fd7402d3ca9c8268e53204020e27':
Use Telecom API for checking if a number is voicemail (2/2)
d828e2f1c4fd2973128e6f7c289441e49565814b 17-Oct-2014 Nancy Chen <nancychen@google.com> am 5610e1de: Merge "Revert "Add API method to extract subscription ID from phone account (2/3)"" into lmp-sprout-dev
automerge: 9c95a95

* commit '9c95a953c1c39f21e8fb6f4e2fe58441f43b488e':
Revert "Add API method to extract subscription ID from phone account (2/3)"
b1c12f0a8ae1fd7402d3ca9c8268e53204020e27 17-Oct-2014 Nancy Chen <nancychen@google.com> am 140004a1: Use Telecom API for checking if a number is voicemail (2/2)

* commit '140004a104402fde514f8a2182dc2d10a4f6917d':
Use Telecom API for checking if a number is voicemail (2/2)
9c95a953c1c39f21e8fb6f4e2fe58441f43b488e 17-Oct-2014 Nancy Chen <nancychen@google.com> am 5610e1de: Merge "Revert "Add API method to extract subscription ID from phone account (2/3)"" into lmp-sprout-dev

* commit '5610e1de7ee7bfb1543efce4a09b60028aba5ba5':
Revert "Add API method to extract subscription ID from phone account (2/3)"
140004a104402fde514f8a2182dc2d10a4f6917d 16-Oct-2014 Nancy Chen <nancychen@google.com> Use Telecom API for checking if a number is voicemail (2/2)

Since we don't want to communicate directly with Telephony in dialer,
call
PhoneNumberUtils.isVoiceMailNumber (a Telephony method) through the
Telecom API. Add a method in TelecomManager to do this.

Bug: 17925501

Change-Id: Id1e5824f27ef40f64b8a03ee912d82d1cc5324ac
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
5610e1de7ee7bfb1543efce4a09b60028aba5ba5 16-Oct-2014 Nancy Chen <nancychen@google.com> Merge "Revert "Add API method to extract subscription ID from phone account (2/3)"" into lmp-sprout-dev
178b3c4a023bb77835a1deecd6288854b48a2244 16-Oct-2014 Nancy Chen <nancychen@google.com> Revert "Add API method to extract subscription ID from phone account (2/3)"

This reverts commit e6c7587d9d208dfb4b62749cfa3ac4f6ff9c0c3a.

Change-Id: I4bdee16074cac190ea90101bf8cb7b40a1315499
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
4e4a5e110438c2e6a643bb7c8cdde89684ee70a6 16-Oct-2014 Yorke Lee <yorkelee@google.com> am 936f81bc: am 65ad30be: am bd33024d: am b38c54f8: am aa6ea25b: Merge "Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9" into lmp-dev

* commit '936f81bc0c2b0298e0daf57a828b3ef79dcd00b0':
Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9
711c02ab89ea495eb112babd0f5ce843587b9bc4 16-Oct-2014 Yorke Lee <yorkelee@google.com> am 89743d39: am 5fd0db43: am b0284790: am 427883c7: am 5aed1294: Merge "Always return at least the default emergency phone account" into lmp-dev

* commit '89743d39d1fd6a9145535a07c1c89b1edeebc2fb':
Always return at least the default emergency phone account
936f81bc0c2b0298e0daf57a828b3ef79dcd00b0 16-Oct-2014 Yorke Lee <yorkelee@google.com> am 65ad30be: am bd33024d: am b38c54f8: am aa6ea25b: Merge "Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9" into lmp-dev

* commit '65ad30be378a319e8546f1ba01930b9d1c208871':
Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9
65ad30be378a319e8546f1ba01930b9d1c208871 16-Oct-2014 Yorke Lee <yorkelee@google.com> am bd33024d: am b38c54f8: am aa6ea25b: Merge "Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9" into lmp-dev

* commit 'bd33024d5e1d2069896821d95c9888368597a157':
Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9
bd33024d5e1d2069896821d95c9888368597a157 16-Oct-2014 Yorke Lee <yorkelee@google.com> am b38c54f8: am aa6ea25b: Merge "Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9" into lmp-dev

* commit 'b38c54f8348ee11677ef689c56c987113e008aa1':
Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9
89743d39d1fd6a9145535a07c1c89b1edeebc2fb 16-Oct-2014 Yorke Lee <yorkelee@google.com> am 5fd0db43: am b0284790: am 427883c7: am 5aed1294: Merge "Always return at least the default emergency phone account" into lmp-dev

* commit '5fd0db439bb837b86ea653a29d24554b1b3a00d8':
Always return at least the default emergency phone account
de9aba5f2255e1ec1b2400288fe24881f5d6814d 16-Oct-2014 Yorke Lee <yorkelee@google.com> am aa6ea25b: Merge "Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9" into lmp-dev

* commit 'aa6ea25b28c896762a93a1191f6765b0bbfe5261':
Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9
b38c54f8348ee11677ef689c56c987113e008aa1 16-Oct-2014 Yorke Lee <yorkelee@google.com> am aa6ea25b: Merge "Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9" into lmp-dev

* commit 'aa6ea25b28c896762a93a1191f6765b0bbfe5261':
Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9
5fd0db439bb837b86ea653a29d24554b1b3a00d8 16-Oct-2014 Yorke Lee <yorkelee@google.com> am b0284790: am 427883c7: am 5aed1294: Merge "Always return at least the default emergency phone account" into lmp-dev

* commit 'b028479036a5ab7388d11ee382081916b9b27b88':
Always return at least the default emergency phone account
aa6ea25b28c896762a93a1191f6765b0bbfe5261 16-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9" into lmp-dev
b028479036a5ab7388d11ee382081916b9b27b88 16-Oct-2014 Yorke Lee <yorkelee@google.com> am 427883c7: am 5aed1294: Merge "Always return at least the default emergency phone account" into lmp-dev

* commit '427883c785697d9c11fddcad702224f3ff7653d1':
Always return at least the default emergency phone account
a348438f79205afd3a0ca564f18d75e1505372de 16-Oct-2014 Yorke Lee <yorkelee@google.com> Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9

The original fix for Google Voice caused the account selection
dialog to not show up.

Bug: 18014056
Change-Id: I6d5ed0a60e4bad2d7a023006b794e0cbc21eab5a
rc/com/android/server/telecom/CallsManager.java
427883c785697d9c11fddcad702224f3ff7653d1 16-Oct-2014 Yorke Lee <yorkelee@google.com> am 5aed1294: Merge "Always return at least the default emergency phone account" into lmp-dev

* commit '5aed12944ea440e0c741a001b09b1494692fd098':
Always return at least the default emergency phone account
b4ea3642f29d92ca23d41ed336f10354d3d773b1 16-Oct-2014 Yorke Lee <yorkelee@google.com> am 5aed1294: Merge "Always return at least the default emergency phone account" into lmp-dev

* commit '5aed12944ea440e0c741a001b09b1494692fd098':
Always return at least the default emergency phone account
5aed12944ea440e0c741a001b09b1494692fd098 16-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Always return at least the default emergency phone account" into lmp-dev
c127211ffd269bffc8a393a3c5ebfe7bdd99896b 16-Oct-2014 Yorke Lee <yorkelee@google.com> Always return at least the default emergency phone account

If Telephony hasn't registered any phone accounts yet, return a
default emergency phone account so that emergency calls can still be
made.

Bug: 18003823

Change-Id: I090abb170c9c7d718afd370a1d8c620decf4dbc3
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/TelephonyUtil.java
837a406f392aaeec3842443fe5dfc42a1a16b323 16-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 20699393: am ef30d088: am 17fc4135: am d48dcb2c: am 62e1ab16: Merge "Broadcast the call type/duration information" into lmp-dev

* commit '206993938093dcf2a9ac7442763825f870d19323':
Broadcast the call type/duration information
206993938093dcf2a9ac7442763825f870d19323 16-Oct-2014 Amit Mahajan <amitmahajan@google.com> am ef30d088: am 17fc4135: am d48dcb2c: am 62e1ab16: Merge "Broadcast the call type/duration information" into lmp-dev

* commit 'ef30d088c7fbe4a5b99216985ae94dfe8d530629':
Broadcast the call type/duration information
ef30d088c7fbe4a5b99216985ae94dfe8d530629 16-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 17fc4135: am d48dcb2c: am 62e1ab16: Merge "Broadcast the call type/duration information" into lmp-dev

* commit '17fc4135fe89dde1bb58039a4f1e33df91baf240':
Broadcast the call type/duration information
17fc4135fe89dde1bb58039a4f1e33df91baf240 16-Oct-2014 Amit Mahajan <amitmahajan@google.com> am d48dcb2c: am 62e1ab16: Merge "Broadcast the call type/duration information" into lmp-dev

* commit 'd48dcb2c4f65dcce98cf825ba3ba856e9c4f2b7d':
Broadcast the call type/duration information
5a336f048c643134a1d1bb89195212884385b087 16-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 62e1ab16: Merge "Broadcast the call type/duration information" into lmp-dev

* commit '62e1ab16c4b459c7194b157a2fa6cf27f20deeca':
Broadcast the call type/duration information
d48dcb2c4f65dcce98cf825ba3ba856e9c4f2b7d 16-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 62e1ab16: Merge "Broadcast the call type/duration information" into lmp-dev

* commit '62e1ab16c4b459c7194b157a2fa6cf27f20deeca':
Broadcast the call type/duration information
62e1ab16c4b459c7194b157a2fa6cf27f20deeca 16-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Broadcast the call type/duration information" into lmp-dev
271b9ae5fe05a3b46a954f0013d642aacea8e045 09-Oct-2014 Yong Jiang <yongjiang@motorola.com> Broadcast the call type/duration information

Allows interested system app to update information like life timer of device
and call durations. Intent is restricted to system apps.

Bug: 17571977
Change-Id: Ie61da174bf6bce479449e8153e318de026775652
ndroidManifest.xml
rc/com/android/server/telecom/CallLogManager.java
07f352b86badc7b748217171423ebf34ed74db84 15-Oct-2014 Nancy Chen <nancychen@google.com> am b073540d: am d9d0e554: am 75a9b63c: am f3ccd9d1: Merge "Add API method to extract subscription ID from phone account (2/3)" into lmp-sprout-dev

* commit 'b073540d930e543c5757498a0349592450f08959':
Add API method to extract subscription ID from phone account (2/3)
b073540d930e543c5757498a0349592450f08959 15-Oct-2014 Nancy Chen <nancychen@google.com> am d9d0e554: am 75a9b63c: am f3ccd9d1: Merge "Add API method to extract subscription ID from phone account (2/3)" into lmp-sprout-dev

* commit 'd9d0e5544aacfd324f6b6260166eeeaf0757427b':
Add API method to extract subscription ID from phone account (2/3)
d9d0e5544aacfd324f6b6260166eeeaf0757427b 15-Oct-2014 Nancy Chen <nancychen@google.com> am 75a9b63c: am f3ccd9d1: Merge "Add API method to extract subscription ID from phone account (2/3)" into lmp-sprout-dev

* commit '75a9b63c753c8f52e6edb239095170301694de93':
Add API method to extract subscription ID from phone account (2/3)
75a9b63c753c8f52e6edb239095170301694de93 15-Oct-2014 Nancy Chen <nancychen@google.com> am f3ccd9d1: Merge "Add API method to extract subscription ID from phone account (2/3)" into lmp-sprout-dev

* commit 'f3ccd9d13f5451b54bb157625d4ede6dcb32d7f2':
Add API method to extract subscription ID from phone account (2/3)
f3ccd9d13f5451b54bb157625d4ede6dcb32d7f2 15-Oct-2014 Nancy Chen <nancychen@google.com> Merge "Add API method to extract subscription ID from phone account (2/3)" into lmp-sprout-dev
e6c7587d9d208dfb4b62749cfa3ac4f6ff9c0c3a 09-Oct-2014 Nancy Chen <nancychen@google.com> Add API method to extract subscription ID from phone account (2/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: Iee044e3d6b88f598eefd3bafd01d2ca3b5ac0bb8
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ba2daeb5e2e33cc4f73179d57e200c9d1061c9e5 15-Oct-2014 Yorke Lee <yorkelee@google.com> am 54eea81d: am 1c8e4897: am 2adbf6a0: Merge "Fix incorrect reported time for missed calls upon reboot" into lmp-mr1-dev

* commit '54eea81d380a190f7d71a9391ed70d7d3f598254':
Fix incorrect reported time for missed calls upon reboot
54eea81d380a190f7d71a9391ed70d7d3f598254 15-Oct-2014 Yorke Lee <yorkelee@google.com> am 1c8e4897: am 2adbf6a0: Merge "Fix incorrect reported time for missed calls upon reboot" into lmp-mr1-dev

* commit '1c8e489735b64f21ebf32500fc72611e22f79965':
Fix incorrect reported time for missed calls upon reboot
1c8e489735b64f21ebf32500fc72611e22f79965 15-Oct-2014 Yorke Lee <yorkelee@google.com> am 2adbf6a0: Merge "Fix incorrect reported time for missed calls upon reboot" into lmp-mr1-dev

* commit '2adbf6a0b65d8ed45c051dbe92780d821a3454dd':
Fix incorrect reported time for missed calls upon reboot
2adbf6a0b65d8ed45c051dbe92780d821a3454dd 15-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Fix incorrect reported time for missed calls upon reboot" into lmp-mr1-dev
a35e264b7b0927df75db108486d752ae3fa2bb1d 15-Oct-2014 Tyler Gunn <tgunn@google.com> am 832f4573: am aedad1b2: am 9f040550: Merge "Adding more Telecom state dumping." into lmp-mr1-dev

* commit '832f457331dddb68232fa450b5fbb06b4cb22768':
Adding more Telecom state dumping.
832f457331dddb68232fa450b5fbb06b4cb22768 15-Oct-2014 Tyler Gunn <tgunn@google.com> am aedad1b2: am 9f040550: Merge "Adding more Telecom state dumping." into lmp-mr1-dev

* commit 'aedad1b29855b3040cb0e2fbda45bbb532e5d3a8':
Adding more Telecom state dumping.
aedad1b29855b3040cb0e2fbda45bbb532e5d3a8 15-Oct-2014 Tyler Gunn <tgunn@google.com> am 9f040550: Merge "Adding more Telecom state dumping." into lmp-mr1-dev

* commit '9f040550d16599113df65b6ec8c412f699298a76':
Adding more Telecom state dumping.
9f040550d16599113df65b6ec8c412f699298a76 15-Oct-2014 Tyler Gunn <tgunn@google.com> Merge "Adding more Telecom state dumping." into lmp-mr1-dev
ea8c5e3c5d04306ee531547e0e2c131a119d11ff 15-Oct-2014 Yorke Lee <yorkelee@google.com> am 16942254: am c57001b3: am 2b0bfff4: Merge "Send incoming call directly to CallReceiver" into lmp-mr1-dev

* commit '16942254388efb341e2a862bbb2f29e8b6f368f8':
Send incoming call directly to CallReceiver
e0c86b4968a12864c88559406d6f71e9594d90e8 15-Oct-2014 Yorke Lee <yorkelee@google.com> am a6dcbe8d: am d84e55c2: am 20d03d3d: Merge "Fix typo in TestCallActivity" into lmp-mr1-dev

* commit 'a6dcbe8df380ff6bf0a5bbefab46f865758c446e':
Fix typo in TestCallActivity
477de88dcd134e9ebf0e2cab0deee03ba3d840d5 15-Oct-2014 Andrew Lee <anwlee@google.com> am fd47a66f: am 5e86b078: am 928ef38b: am 55a0f2dd: am 9846dd39: Merge "Notify current user of missed calls." into lmp-dev

* commit 'fd47a66f8038bac092843d5bf012be98a26f6955':
Notify current user of missed calls.
f8bae665a76fca963ed0eff7243ec5e783671e2f 15-Oct-2014 Tyler Gunn <tgunn@google.com> am 6fea479d: am c763007b: am 9b1ab4df: am 58a770cd: am 127faa82: Merge "Fixing issue where Google Voice calls are logged twice to call log." into lmp-dev

* commit '6fea479dfe3716af5213ec111219cb4bc7b61ab5':
Fixing issue where Google Voice calls are logged twice to call log.
16942254388efb341e2a862bbb2f29e8b6f368f8 15-Oct-2014 Yorke Lee <yorkelee@google.com> am c57001b3: am 2b0bfff4: Merge "Send incoming call directly to CallReceiver" into lmp-mr1-dev

* commit 'c57001b3b1bfc77129761a0d6b5147ee9f386f8b':
Send incoming call directly to CallReceiver
a6dcbe8df380ff6bf0a5bbefab46f865758c446e 15-Oct-2014 Yorke Lee <yorkelee@google.com> am d84e55c2: am 20d03d3d: Merge "Fix typo in TestCallActivity" into lmp-mr1-dev

* commit 'd84e55c2a1951be25126d78ad4f69358be2c2172':
Fix typo in TestCallActivity
fd47a66f8038bac092843d5bf012be98a26f6955 15-Oct-2014 Andrew Lee <anwlee@google.com> am 5e86b078: am 928ef38b: am 55a0f2dd: am 9846dd39: Merge "Notify current user of missed calls." into lmp-dev

* commit '5e86b0781530a7b0b0d9271a39583fc634ab0b12':
Notify current user of missed calls.
6fea479dfe3716af5213ec111219cb4bc7b61ab5 15-Oct-2014 Tyler Gunn <tgunn@google.com> am c763007b: am 9b1ab4df: am 58a770cd: am 127faa82: Merge "Fixing issue where Google Voice calls are logged twice to call log." into lmp-dev

* commit 'c763007b615a87a584d820a79281dd7fecd31e22':
Fixing issue where Google Voice calls are logged twice to call log.
0c1e4f6713d04f193e211e0b3d25968c0ece8535 15-Oct-2014 Yorke Lee <yorkelee@google.com> Fix incorrect reported time for missed calls upon reboot

Bug: 17550526
Change-Id: I019e02649c0821b0e3e6b78a6b59e0fba51ad240
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/MissedCallNotifier.java
c57001b3b1bfc77129761a0d6b5147ee9f386f8b 15-Oct-2014 Yorke Lee <yorkelee@google.com> am 2b0bfff4: Merge "Send incoming call directly to CallReceiver" into lmp-mr1-dev

* commit '2b0bfff4008a627a8e5dbc7c3d3ac0b348fc5316':
Send incoming call directly to CallReceiver
d84e55c2a1951be25126d78ad4f69358be2c2172 15-Oct-2014 Yorke Lee <yorkelee@google.com> am 20d03d3d: Merge "Fix typo in TestCallActivity" into lmp-mr1-dev

* commit '20d03d3d926a37f19a9e271356498d24ae9b4dcf':
Fix typo in TestCallActivity
2b0bfff4008a627a8e5dbc7c3d3ac0b348fc5316 15-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Send incoming call directly to CallReceiver" into lmp-mr1-dev
20d03d3d926a37f19a9e271356498d24ae9b4dcf 15-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Fix typo in TestCallActivity" into lmp-mr1-dev
3d0ef1dc6a9eb1f4733be472b993f87183cd4d4c 15-Oct-2014 Yorke Lee <yorkelee@google.com> Fix typo in TestCallActivity

Change-Id: I0746a09181337960bcc0cb0044b000f2419108ec
ests/src/com/android/server/telecom/testapps/TestCallActivity.java
5e86b0781530a7b0b0d9271a39583fc634ab0b12 15-Oct-2014 Andrew Lee <anwlee@google.com> am 928ef38b: am 55a0f2dd: am 9846dd39: Merge "Notify current user of missed calls." into lmp-dev

* commit '928ef38bd6d7d64b2156413b220383c89cdf3e6e':
Notify current user of missed calls.
c763007b615a87a584d820a79281dd7fecd31e22 15-Oct-2014 Tyler Gunn <tgunn@google.com> am 9b1ab4df: am 58a770cd: am 127faa82: Merge "Fixing issue where Google Voice calls are logged twice to call log." into lmp-dev

* commit '9b1ab4df6716e367b872f430be890b943ced3735':
Fixing issue where Google Voice calls are logged twice to call log.
e732ef425aba8df0229d61b071d4c00553ead469 14-Oct-2014 Yorke Lee <yorkelee@google.com> Send incoming call directly to CallReceiver

Remove CallActivity from the flow that happens when an incoming call
is received. This fixes the problem where the foreground activity is
paused when an incoming call is received. This also has the benefit
of eliminating any potential latency the CallActivity could have
introduced.

Bug: 17703900

Change-Id: Ibed8aa3fb8d1a88fec27435330b26aa1ed4fc3aa
ndroidManifest.xml
rc/com/android/server/telecom/CallActivity.java
rc/com/android/server/telecom/CallReceiver.java
rc/com/android/server/telecom/TelecomServiceImpl.java
9787e0e80d8960cf8b0ca74c7cdc4c4aac97187a 14-Oct-2014 Tyler Gunn <tgunn@google.com> Adding more Telecom state dumping.

Bug: 17730966
Change-Id: I47c83591417784c9484002213230065514b43f63
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceRepository.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TtyManager.java
rc/com/android/server/telecom/WiredHeadsetManager.java
928ef38bd6d7d64b2156413b220383c89cdf3e6e 14-Oct-2014 Andrew Lee <anwlee@google.com> am 55a0f2dd: am 9846dd39: Merge "Notify current user of missed calls." into lmp-dev

* commit '55a0f2dd4187a2ee15210eb02e06777b68936ba4':
Notify current user of missed calls.
9b1ab4df6716e367b872f430be890b943ced3735 14-Oct-2014 Tyler Gunn <tgunn@google.com> am 58a770cd: am 127faa82: Merge "Fixing issue where Google Voice calls are logged twice to call log." into lmp-dev

* commit '58a770cddc72a8d4e3a499dbd527d7dad5d8cd60':
Fixing issue where Google Voice calls are logged twice to call log.
b2dfd1e508155a17fe2a860312ca3ae44c4b16aa 14-Oct-2014 Yorke Lee <yorkelee@google.com> am 84a7969e: am b5c507e9: am 78f8bf42: am 907a9737: am ae117a6c: Merge "Don\'t play call waiting for first incoming call" into lmp-dev

* commit '84a7969eb860e6e54496c23bd7ea455ea4e62b36':
Don't play call waiting for first incoming call
55a0f2dd4187a2ee15210eb02e06777b68936ba4 14-Oct-2014 Andrew Lee <anwlee@google.com> am 9846dd39: Merge "Notify current user of missed calls." into lmp-dev

* commit '9846dd398e1e55570c7ef38a4f3fca97ec154678':
Notify current user of missed calls.
58a770cddc72a8d4e3a499dbd527d7dad5d8cd60 14-Oct-2014 Tyler Gunn <tgunn@google.com> am 127faa82: Merge "Fixing issue where Google Voice calls are logged twice to call log." into lmp-dev

* commit '127faa821e0ddfd7314af2f736f3eb23e67e4205':
Fixing issue where Google Voice calls are logged twice to call log.
84a7969eb860e6e54496c23bd7ea455ea4e62b36 14-Oct-2014 Yorke Lee <yorkelee@google.com> am b5c507e9: am 78f8bf42: am 907a9737: am ae117a6c: Merge "Don\'t play call waiting for first incoming call" into lmp-dev

* commit 'b5c507e95de0ff83b8eff16af26a415ed2c40ff9':
Don't play call waiting for first incoming call
517edba58549bf7df133ba2704e8510b10214da0 14-Oct-2014 Andrew Lee <anwlee@google.com> am 9846dd39: Merge "Notify current user of missed calls." into lmp-dev

* commit '9846dd398e1e55570c7ef38a4f3fca97ec154678':
Notify current user of missed calls.
9846dd398e1e55570c7ef38a4f3fca97ec154678 14-Oct-2014 Andrew Lee <anwlee@google.com> Merge "Notify current user of missed calls." into lmp-dev
cccf73037d15f1c1f313041ed0f5474acdc456a7 14-Oct-2014 Tyler Gunn <tgunn@google.com> am 127faa82: Merge "Fixing issue where Google Voice calls are logged twice to call log." into lmp-dev

* commit '127faa821e0ddfd7314af2f736f3eb23e67e4205':
Fixing issue where Google Voice calls are logged twice to call log.
127faa821e0ddfd7314af2f736f3eb23e67e4205 14-Oct-2014 Tyler Gunn <tgunn@google.com> Merge "Fixing issue where Google Voice calls are logged twice to call log." into lmp-dev
d1c45f5063e7e40eaca20316099b155742499322 10-Oct-2014 Andrew Lee <anwlee@google.com> Notify current user of missed calls.

Bug: 17950718
Change-Id: Idd8201b4ea60d597c776cd390bd385deb292e033
rc/com/android/server/telecom/MissedCallNotifier.java
b5c507e95de0ff83b8eff16af26a415ed2c40ff9 14-Oct-2014 Yorke Lee <yorkelee@google.com> am 78f8bf42: am 907a9737: am ae117a6c: Merge "Don\'t play call waiting for first incoming call" into lmp-dev

* commit '78f8bf429d21b5be7202ce7206db81c140286df7':
Don't play call waiting for first incoming call
78f8bf429d21b5be7202ce7206db81c140286df7 14-Oct-2014 Yorke Lee <yorkelee@google.com> am 907a9737: am ae117a6c: Merge "Don\'t play call waiting for first incoming call" into lmp-dev

* commit '907a9737537361dad054b8ab6a4cf39f0b080e5b':
Don't play call waiting for first incoming call
907a9737537361dad054b8ab6a4cf39f0b080e5b 14-Oct-2014 Yorke Lee <yorkelee@google.com> am ae117a6c: Merge "Don\'t play call waiting for first incoming call" into lmp-dev

* commit 'ae117a6c66c4c3b695764bd1e4384cc4b7aaf818':
Don't play call waiting for first incoming call
adf67894a61914eebbfb6e175bc1f20b64e22b2b 14-Oct-2014 Yorke Lee <yorkelee@google.com> am ae117a6c: Merge "Don\'t play call waiting for first incoming call" into lmp-dev

* commit 'ae117a6c66c4c3b695764bd1e4384cc4b7aaf818':
Don't play call waiting for first incoming call
ae117a6c66c4c3b695764bd1e4384cc4b7aaf818 13-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Don't play call waiting for first incoming call" into lmp-dev
504eb83ea06f4c737a4f4fdbd65aa2450505420c 13-Oct-2014 Tyler Gunn <tgunn@google.com> Fixing issue where Google Voice calls are logged twice to call log.

1. Changed disconnect cause for aborted calls to "CANCELED" which ensures
they are not logged.
2. Also, added a check in Telecom to avoid bringing up the InCall UI
immediately when a new call is made, if Google Voice is installed. This
is to ensure that the user does not see two reveal animations. This was
due to the fact that when the call was initially added and subsequently
aborted, the InCall ui would be shown. With this change, if GVoice is
installed, adding the call is delayed.

Bug: 17961478
Change-Id: Ic0055a53ac85980fa22136a5c8b6cb59be347da9
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
f33991563d6abf6308dc562d05bcf95e50667678 13-Oct-2014 Yorke Lee <yorkelee@google.com> Don't play call waiting for first incoming call

The first incoming call causes the ringer to play call waiting
for a split second before the ringtone sounds because it is
not in the foreground at that point in time.

This causes issues with the audio layer as going to IN_CALL right before
MODE_RINGTONE results in a loss of outgoing audio for the first call.

Add a special check to avoid this scenario.

Bug: 17961223
Change-Id: I580f9c8fa21e375d0c1d6fada80aa23d1ecdb913
rc/com/android/server/telecom/Ringer.java
c1d8fb828e11a5e53c4b7e9d2f25de9f243002d1 13-Oct-2014 Yorke Lee <yorkelee@google.com> am f65a77d8: am 82bea973: am e58c423a: am cb781559: am 7062bb96: Set correct InCall tone lengths

* commit 'f65a77d81eb171530536cff0d992ec777f32e159':
Set correct InCall tone lengths
f65a77d81eb171530536cff0d992ec777f32e159 13-Oct-2014 Yorke Lee <yorkelee@google.com> am 82bea973: am e58c423a: am cb781559: am 7062bb96: Set correct InCall tone lengths

* commit '82bea97321885d2fdff93ba52ffff0e17a26a96f':
Set correct InCall tone lengths
82bea97321885d2fdff93ba52ffff0e17a26a96f 13-Oct-2014 Yorke Lee <yorkelee@google.com> am e58c423a: am cb781559: am 7062bb96: Set correct InCall tone lengths

* commit 'e58c423a480cb2a3f5a77d5046dddd36a19f211a':
Set correct InCall tone lengths
e58c423a480cb2a3f5a77d5046dddd36a19f211a 13-Oct-2014 Yorke Lee <yorkelee@google.com> am cb781559: am 7062bb96: Set correct InCall tone lengths

* commit 'cb7815598df2cba28195af527c3fd0d11bc06bdd':
Set correct InCall tone lengths
cb7815598df2cba28195af527c3fd0d11bc06bdd 13-Oct-2014 Yorke Lee <yorkelee@google.com> am 7062bb96: Set correct InCall tone lengths

* commit '7062bb96f567e7dc9c7bf933b7bee17bb2c8108c':
Set correct InCall tone lengths
5557cd8652954ffa4a0c9ae80b30d070f77b0b34 13-Oct-2014 Yorke Lee <yorkelee@google.com> am 7062bb96: Set correct InCall tone lengths

* commit '7062bb96f567e7dc9c7bf933b7bee17bb2c8108c':
Set correct InCall tone lengths
5d83e5e06c855d3bd3639bd0a72c07c0a92f7f45 13-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I8fe8dd8f68ac3e7e0e97806821c16e4da8648519
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
7062bb96f567e7dc9c7bf933b7bee17bb2c8108c 13-Oct-2014 Yorke Lee <yorkelee@google.com> Set correct InCall tone lengths

TONE_CALL_ENDED should be 200ms instead of 4000ms.
This reduces the time needed for music to resume playing after a call
ends to 200ms.

Also update a typo in TONE_REORDER (5000 -> 4000)

Bug: 17954404
Change-Id: I2afb5e180bdcb10c6a1a4dcffcc650fcaad63b17
rc/com/android/server/telecom/InCallTonePlayer.java
156742825b1b07005bae036619e147f5e93d1de9 12-Oct-2014 Ihab Awad <ihab@google.com> am 73bc6a19: am 811aea70: am 9d84d56c: am 5f8eaaee: Revert "Add color to PhoneAccount objects (2/3)"

* commit '73bc6a197e2c723e1163c454743ba1cafb731a41':
Revert "Add color to PhoneAccount objects (2/3)"
73bc6a197e2c723e1163c454743ba1cafb731a41 12-Oct-2014 Ihab Awad <ihab@google.com> am 811aea70: am 9d84d56c: am 5f8eaaee: Revert "Add color to PhoneAccount objects (2/3)"

* commit '811aea70e36bbe04133dd8c95c472107fd3d4467':
Revert "Add color to PhoneAccount objects (2/3)"
811aea70e36bbe04133dd8c95c472107fd3d4467 12-Oct-2014 Ihab Awad <ihab@google.com> am 9d84d56c: am 5f8eaaee: Revert "Add color to PhoneAccount objects (2/3)"

* commit '9d84d56cf9a6ea130c884601b83b570ec3f38282':
Revert "Add color to PhoneAccount objects (2/3)"
9d84d56cf9a6ea130c884601b83b570ec3f38282 12-Oct-2014 Ihab Awad <ihab@google.com> am 5f8eaaee: Revert "Add color to PhoneAccount objects (2/3)"

* commit '5f8eaaee9c50567a4b2714bd28b4ed39b7aac2b7':
Revert "Add color to PhoneAccount objects (2/3)"
5f8eaaee9c50567a4b2714bd28b4ed39b7aac2b7 12-Oct-2014 Ihab Awad <ihab@google.com> Revert "Add color to PhoneAccount objects (2/3)"

This reverts commit 09c1fec085e1e2b350b36cc4fcbcc31865945a51.
ndroid.mk
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
1123d141e8b135bbd18364e9b5c5452cee0f7c03 11-Oct-2014 Santos Cordon <santoscordon@google.com> am d8e85e2f: am a8b89f31: am 8b209efd: am 0cf9c681: am 88336c2e: Merge "Update foreground calls with child-parent call changes." into lmp-dev

* commit 'd8e85e2f69492843ce62217e8932ba5e9f90b6e4':
Update foreground calls with child-parent call changes.
d8e85e2f69492843ce62217e8932ba5e9f90b6e4 11-Oct-2014 Santos Cordon <santoscordon@google.com> am a8b89f31: am 8b209efd: am 0cf9c681: am 88336c2e: Merge "Update foreground calls with child-parent call changes." into lmp-dev

* commit 'a8b89f31d20c353abb599bc2e3a66732df26af01':
Update foreground calls with child-parent call changes.
a8b89f31d20c353abb599bc2e3a66732df26af01 11-Oct-2014 Santos Cordon <santoscordon@google.com> am 8b209efd: am 0cf9c681: am 88336c2e: Merge "Update foreground calls with child-parent call changes." into lmp-dev

* commit '8b209efde3817b1f23594f7d3570c03996619371':
Update foreground calls with child-parent call changes.
8b209efde3817b1f23594f7d3570c03996619371 11-Oct-2014 Santos Cordon <santoscordon@google.com> am 0cf9c681: am 88336c2e: Merge "Update foreground calls with child-parent call changes." into lmp-dev

* commit '0cf9c681777a5f30bbc9422824baa8c482741a5c':
Update foreground calls with child-parent call changes.
0cf9c681777a5f30bbc9422824baa8c482741a5c 11-Oct-2014 Santos Cordon <santoscordon@google.com> am 88336c2e: Merge "Update foreground calls with child-parent call changes." into lmp-dev

* commit '88336c2e3410acef37c376547610013bed347013':
Update foreground calls with child-parent call changes.
5598df15e702f83d40a6af13974abbc3636583e1 11-Oct-2014 Santos Cordon <santoscordon@google.com> am 88336c2e: Merge "Update foreground calls with child-parent call changes." into lmp-dev

* commit '88336c2e3410acef37c376547610013bed347013':
Update foreground calls with child-parent call changes.
88336c2e3410acef37c376547610013bed347013 11-Oct-2014 Santos Cordon <santoscordon@google.com> Merge "Update foreground calls with child-parent call changes." into lmp-dev
f76ea0068f352f23cd93b5d5bc44747fa0e41cea 11-Oct-2014 Ihab Awad <ihab@google.com> am 967c0d80: am 707289ce: am 2642c22c: am d7a34972: Merge "Add color to PhoneAccount objects (2/3)" into lmp-sprout-dev

* commit '967c0d80f500e5c885652504126435fffdb7eb06':
Add color to PhoneAccount objects (2/3)
967c0d80f500e5c885652504126435fffdb7eb06 11-Oct-2014 Ihab Awad <ihab@google.com> am 707289ce: am 2642c22c: am d7a34972: Merge "Add color to PhoneAccount objects (2/3)" into lmp-sprout-dev

* commit '707289ce95852af9d2d11dc11571c2eb2aede32f':
Add color to PhoneAccount objects (2/3)
707289ce95852af9d2d11dc11571c2eb2aede32f 11-Oct-2014 Ihab Awad <ihab@google.com> am 2642c22c: am d7a34972: Merge "Add color to PhoneAccount objects (2/3)" into lmp-sprout-dev

* commit '2642c22c1b8528c8c91d491a3f754062120507b9':
Add color to PhoneAccount objects (2/3)
2642c22c1b8528c8c91d491a3f754062120507b9 11-Oct-2014 Ihab Awad <ihab@google.com> am d7a34972: Merge "Add color to PhoneAccount objects (2/3)" into lmp-sprout-dev

* commit 'd7a3497213c959b68ed2cbd6c47620d09b59a7d4':
Add color to PhoneAccount objects (2/3)
f5b2385fab69c030f24b17c2ffe55c70e1251773 11-Oct-2014 Tyler Gunn <tgunn@google.com> am ac505eb5: am c0059985: am 28f9784d: am 965832c0: am 36e50968: Merge "Issue: turning on bluetooth headset in call doesn\'t change route (1/2)." into lmp-dev

* commit 'ac505eb5eca48b2cb456cceeee21ca70eac44c74':
Issue: turning on bluetooth headset in call doesn't change route (1/2).
66fe882a6437de1010af0dc8cd7350f81f2e028a 11-Oct-2014 Santos Cordon <santoscordon@google.com> Update foreground calls with child-parent call changes.

Bug: 17699262
Change-Id: I4de8bd876b142e2762a369a36ea2e7dcc7b84e65
rc/com/android/server/telecom/BluetoothPhoneService.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallsManager.java
ac505eb5eca48b2cb456cceeee21ca70eac44c74 11-Oct-2014 Tyler Gunn <tgunn@google.com> am c0059985: am 28f9784d: am 965832c0: am 36e50968: Merge "Issue: turning on bluetooth headset in call doesn\'t change route (1/2)." into lmp-dev

* commit 'c005998597bb1bda875fc4c525a89fae1e9c2849':
Issue: turning on bluetooth headset in call doesn't change route (1/2).
c005998597bb1bda875fc4c525a89fae1e9c2849 11-Oct-2014 Tyler Gunn <tgunn@google.com> am 28f9784d: am 965832c0: am 36e50968: Merge "Issue: turning on bluetooth headset in call doesn\'t change route (1/2)." into lmp-dev

* commit '28f9784d5222dd09cd4f0a67150be14474869036':
Issue: turning on bluetooth headset in call doesn't change route (1/2).
d7a3497213c959b68ed2cbd6c47620d09b59a7d4 11-Oct-2014 Ihab Awad <ihab@google.com> Merge "Add color to PhoneAccount objects (2/3)" into lmp-sprout-dev
28f9784d5222dd09cd4f0a67150be14474869036 11-Oct-2014 Tyler Gunn <tgunn@google.com> am 965832c0: am 36e50968: Merge "Issue: turning on bluetooth headset in call doesn\'t change route (1/2)." into lmp-dev

* commit '965832c0e11deabcc7a2e3bc750923c41461c174':
Issue: turning on bluetooth headset in call doesn't change route (1/2).
a73e51be892bb0b8eb16e4cc8b56d92a1e086c27 11-Oct-2014 Yorke Lee <yorkelee@google.com> am 4d876a0f: am b8b3cdf0: am 53387b9e: am a84c1546: am 9e79dbe0: Merge "Protect against null mBluetoothHeadset" into lmp-dev

* commit '4d876a0f2ef0b6b543ed34f8fa52917a7770773d':
Protect against null mBluetoothHeadset
965832c0e11deabcc7a2e3bc750923c41461c174 10-Oct-2014 Tyler Gunn <tgunn@google.com> am 36e50968: Merge "Issue: turning on bluetooth headset in call doesn\'t change route (1/2)." into lmp-dev

* commit '36e50968e104037636b0898ec476944d72cf8b88':
Issue: turning on bluetooth headset in call doesn't change route (1/2).
ad04b7bd7a97d1711a5fda31baf993ce80701fb2 10-Oct-2014 Tyler Gunn <tgunn@google.com> am 36e50968: Merge "Issue: turning on bluetooth headset in call doesn\'t change route (1/2)." into lmp-dev

* commit '36e50968e104037636b0898ec476944d72cf8b88':
Issue: turning on bluetooth headset in call doesn't change route (1/2).
36e50968e104037636b0898ec476944d72cf8b88 10-Oct-2014 Tyler Gunn <tgunn@google.com> Merge "Issue: turning on bluetooth headset in call doesn't change route (1/2)." into lmp-dev
cd685e56453b2e1feb118b560a1caa1ef40039d6 10-Oct-2014 Tyler Gunn <tgunn@google.com> Issue: turning on bluetooth headset in call doesn't change route (1/2).

Forcing queryPhoneState to send CallState to connected bluetooth headset.
The method updateHeadsetWithCallState, which queryPhoneState calls, checks
to see if any state information has changed, and then updates the headset
with the new state information. In HeadsetStateMachine, there are calls
to queryPhoneState made when the headset is connected. In response to the
change in call state, the headset will automatically connect or not.
However, since updateHeadsetWithCallState was not detecting a change in
the call state, the update was never sent to HeadsetStateMachine, which
meant that it would never attempt to turn on the audio for the headset.

Bug: 17933664
Change-Id: I9270a20e2d227d90f5401e0f237a908b192fc174
rc/com/android/server/telecom/BluetoothPhoneService.java
e44e2146b6a0e047dc4a76678709b8f8e4e6362d 10-Oct-2014 Santos Cordon <santoscordon@google.com> am 2646d25e: am b4b9c334: am 031ea822: am cb387e29: am d9bae25a: Merge "Unset disconnecting boolean when a call transitions to DISCONNECTED." into lmp-dev

* commit '2646d25e3cb66e3da1e82d809b1b15330efd4f74':
Unset disconnecting boolean when a call transitions to DISCONNECTED.
2f4482bec32195b6e5482a7e957aca565f928b3b 10-Oct-2014 Yorke Lee <yorkelee@google.com> am 68a3ae23: am c9269a5a: am 8d433678: am fc8d3442: am e0175431: Merge "Enforce CALL_PRIVILEGED check at start of CallActivity" into lmp-dev

* commit '68a3ae23ddb15de4569aeb9ba811012cfcf14fcb':
Enforce CALL_PRIVILEGED check at start of CallActivity
615fcd62c503e9dd3a718a84273aa544b955b84b 09-Oct-2014 Ihab Awad <ihab@google.com> Add color to PhoneAccount objects (2/3)

Change-Id: I2c53dbf3275b4c46933cf23e228a10936145cb9f
ndroid.mk
rc/com/android/server/telecom/PhoneAccountRegistrar.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
4d876a0f2ef0b6b543ed34f8fa52917a7770773d 10-Oct-2014 Yorke Lee <yorkelee@google.com> am b8b3cdf0: am 53387b9e: am a84c1546: am 9e79dbe0: Merge "Protect against null mBluetoothHeadset" into lmp-dev

* commit 'b8b3cdf042936bb8bc2c0f79537d0e3b36f92018':
Protect against null mBluetoothHeadset
2646d25e3cb66e3da1e82d809b1b15330efd4f74 10-Oct-2014 Santos Cordon <santoscordon@google.com> am b4b9c334: am 031ea822: am cb387e29: am d9bae25a: Merge "Unset disconnecting boolean when a call transitions to DISCONNECTED." into lmp-dev

* commit 'b4b9c33470954082dba59ff0c7259115771114c6':
Unset disconnecting boolean when a call transitions to DISCONNECTED.
68a3ae23ddb15de4569aeb9ba811012cfcf14fcb 10-Oct-2014 Yorke Lee <yorkelee@google.com> am c9269a5a: am 8d433678: am fc8d3442: am e0175431: Merge "Enforce CALL_PRIVILEGED check at start of CallActivity" into lmp-dev

* commit 'c9269a5af3ba90f33f89524307726fa84ed13486':
Enforce CALL_PRIVILEGED check at start of CallActivity
b8b3cdf042936bb8bc2c0f79537d0e3b36f92018 10-Oct-2014 Yorke Lee <yorkelee@google.com> am 53387b9e: am a84c1546: am 9e79dbe0: Merge "Protect against null mBluetoothHeadset" into lmp-dev

* commit '53387b9edebe16402308b5522391555eda5051f6':
Protect against null mBluetoothHeadset
53387b9edebe16402308b5522391555eda5051f6 10-Oct-2014 Yorke Lee <yorkelee@google.com> am a84c1546: am 9e79dbe0: Merge "Protect against null mBluetoothHeadset" into lmp-dev

* commit 'a84c1546b776610e46fd4a00f6ce9a9cca902b71':
Protect against null mBluetoothHeadset
6729e2d2a91f35922e41e98af7f71c28b53f3a74 09-Oct-2014 Yorke Lee <yorkelee@google.com> am 9e79dbe0: Merge "Protect against null mBluetoothHeadset" into lmp-dev

* commit '9e79dbe0d60087368f702b2dc98d36778c128032':
Protect against null mBluetoothHeadset
a84c1546b776610e46fd4a00f6ce9a9cca902b71 09-Oct-2014 Yorke Lee <yorkelee@google.com> am 9e79dbe0: Merge "Protect against null mBluetoothHeadset" into lmp-dev

* commit '9e79dbe0d60087368f702b2dc98d36778c128032':
Protect against null mBluetoothHeadset
9e79dbe0d60087368f702b2dc98d36778c128032 09-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Protect against null mBluetoothHeadset" into lmp-dev
e241cd6f340fedb82e1aa76d35bbcbca31fe423c 09-Oct-2014 Yorke Lee <yorkelee@google.com> Protect against null mBluetoothHeadset

Bug: 17922576
Change-Id: I96a9e3005c4e6ac5c97bc5e4f11527f87d9d5e38
rc/com/android/server/telecom/BluetoothPhoneService.java
b4b9c33470954082dba59ff0c7259115771114c6 09-Oct-2014 Santos Cordon <santoscordon@google.com> am 031ea822: am cb387e29: am d9bae25a: Merge "Unset disconnecting boolean when a call transitions to DISCONNECTED." into lmp-dev

* commit '031ea822f82ccda0ff463812f74e972937fc497e':
Unset disconnecting boolean when a call transitions to DISCONNECTED.
c9269a5af3ba90f33f89524307726fa84ed13486 09-Oct-2014 Yorke Lee <yorkelee@google.com> am 8d433678: am fc8d3442: am e0175431: Merge "Enforce CALL_PRIVILEGED check at start of CallActivity" into lmp-dev

* commit '8d433678b07d4b2066d045a87a0e9070406095a7':
Enforce CALL_PRIVILEGED check at start of CallActivity
031ea822f82ccda0ff463812f74e972937fc497e 09-Oct-2014 Santos Cordon <santoscordon@google.com> am cb387e29: am d9bae25a: Merge "Unset disconnecting boolean when a call transitions to DISCONNECTED." into lmp-dev

* commit 'cb387e29f926d8906f092c9ed79d5fc36dac78d1':
Unset disconnecting boolean when a call transitions to DISCONNECTED.
8d433678b07d4b2066d045a87a0e9070406095a7 09-Oct-2014 Yorke Lee <yorkelee@google.com> am fc8d3442: am e0175431: Merge "Enforce CALL_PRIVILEGED check at start of CallActivity" into lmp-dev

* commit 'fc8d3442fbd26bdc08322c38206bea16f711ca2e':
Enforce CALL_PRIVILEGED check at start of CallActivity
cb387e29f926d8906f092c9ed79d5fc36dac78d1 09-Oct-2014 Santos Cordon <santoscordon@google.com> am d9bae25a: Merge "Unset disconnecting boolean when a call transitions to DISCONNECTED." into lmp-dev

* commit 'd9bae25ac27cdd891289f64c9b4c9376bbd6b2eb':
Unset disconnecting boolean when a call transitions to DISCONNECTED.
fc8d3442fbd26bdc08322c38206bea16f711ca2e 09-Oct-2014 Yorke Lee <yorkelee@google.com> am e0175431: Merge "Enforce CALL_PRIVILEGED check at start of CallActivity" into lmp-dev

* commit 'e0175431ee7c98fe21ead154cb0e241855f63144':
Enforce CALL_PRIVILEGED check at start of CallActivity
4ad2a7eb1acdf261e5a58f226670dcb5c0b841dd 09-Oct-2014 Santos Cordon <santoscordon@google.com> am d9bae25a: Merge "Unset disconnecting boolean when a call transitions to DISCONNECTED." into lmp-dev

* commit 'd9bae25ac27cdd891289f64c9b4c9376bbd6b2eb':
Unset disconnecting boolean when a call transitions to DISCONNECTED.
2834c3f9d0b074e6087dc6c2f9b4dbba106d8081 09-Oct-2014 Yorke Lee <yorkelee@google.com> am e0175431: Merge "Enforce CALL_PRIVILEGED check at start of CallActivity" into lmp-dev

* commit 'e0175431ee7c98fe21ead154cb0e241855f63144':
Enforce CALL_PRIVILEGED check at start of CallActivity
d9bae25ac27cdd891289f64c9b4c9376bbd6b2eb 09-Oct-2014 Santos Cordon <santoscordon@google.com> Merge "Unset disconnecting boolean when a call transitions to DISCONNECTED." into lmp-dev
5dfd3800f15e9b0f1420813d8d7638e1cf9d621d 09-Oct-2014 Santos Cordon <santoscordon@google.com> Unset disconnecting boolean when a call transitions to DISCONNECTED.

Bug: 17923738
Change-Id: I420a2e20d8e080463acec4f329ed26fad1416a1f
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/InCallController.java
e0175431ee7c98fe21ead154cb0e241855f63144 09-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Enforce CALL_PRIVILEGED check at start of CallActivity" into lmp-dev
39d94c1b821e7da3a551f487b052ee347e3377a7 09-Oct-2014 Yorke Lee <yorkelee@google.com> Enforce CALL_PRIVILEGED check at start of CallActivity

This prevents third party apps from using the CALL_PRIVILEGED action with
an explicit intent to place emergency phone calls for secondary users.

The original component check did not work for secondary users because the
component name was being clobbered and replaced with the CallReceiver's
component name.

Also make sure to start the system dialer as the UserHandle.CURRENT instead of
UserHandle.OWNER so that it shows up if the user is not the primary user.

Bug: 17920957
Change-Id: Ie2aba734205361bf780f1c81ae2709da4162d4f5
rc/com/android/server/telecom/CallActivity.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
cf81d34b4ef358596cb0bc5dcc03a2c966179942 07-Oct-2014 Tyler Gunn <tgunn@google.com> am 73c24885: am 6b2c0750: am 4cc96a3e: am 8c94165d: am aa479376: Fixing where call goes from disconnecting to active to disconnecting state.

* commit '73c24885b77274dfdaed9600fd25ee9ce6462c94':
Fixing where call goes from disconnecting to active to disconnecting state.
73c24885b77274dfdaed9600fd25ee9ce6462c94 07-Oct-2014 Tyler Gunn <tgunn@google.com> am 6b2c0750: am 4cc96a3e: am 8c94165d: am aa479376: Fixing where call goes from disconnecting to active to disconnecting state.

* commit '6b2c0750595bce497b25c6ab64bf9c2810c3ca73':
Fixing where call goes from disconnecting to active to disconnecting state.
6b2c0750595bce497b25c6ab64bf9c2810c3ca73 07-Oct-2014 Tyler Gunn <tgunn@google.com> am 4cc96a3e: am 8c94165d: am aa479376: Fixing where call goes from disconnecting to active to disconnecting state.

* commit '4cc96a3e5dd65c60c634f1ef284044b70d4fce32':
Fixing where call goes from disconnecting to active to disconnecting state.
4cc96a3e5dd65c60c634f1ef284044b70d4fce32 07-Oct-2014 Tyler Gunn <tgunn@google.com> am 8c94165d: am aa479376: Fixing where call goes from disconnecting to active to disconnecting state.

* commit '8c94165d54a8696746acb3820c47b4ccf06702fb':
Fixing where call goes from disconnecting to active to disconnecting state.
81520e99bf8359be46a26534777b9aed67822faf 07-Oct-2014 Tyler Gunn <tgunn@google.com> am aa479376: Fixing where call goes from disconnecting to active to disconnecting state.

* commit 'aa47937652d80d8bd19860ec521d28ffea745e63':
Fixing where call goes from disconnecting to active to disconnecting state.
8c94165d54a8696746acb3820c47b4ccf06702fb 07-Oct-2014 Tyler Gunn <tgunn@google.com> am aa479376: Fixing where call goes from disconnecting to active to disconnecting state.

* commit 'aa47937652d80d8bd19860ec521d28ffea745e63':
Fixing where call goes from disconnecting to active to disconnecting state.
aa47937652d80d8bd19860ec521d28ffea745e63 07-Oct-2014 Tyler Gunn <tgunn@google.com> Fixing where call goes from disconnecting to active to disconnecting state.

- Marking calls parceled for InCall as disconnecting when they are
locally disconneted by the user but not yet confirmed as disconnected
by the connection service.

Bug: 17821930
Change-Id: I6640ef4d92d275f75f6a1e0be71d6e1811ba374d
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/InCallController.java
d51fb4bc9e87a5e04c1b0e9a4a68eb24eb336411 07-Oct-2014 Yorke Lee <yorkelee@google.com> am 46c99d55: am 529ee47f: am 5df25a5b: am 83b39a07: am fae0efd9: Merge "Add ability to add sim-initiated MO call to UI (3/4)" into lmp-dev

* commit '46c99d5547da220963069f3d02d994dca3ebccf0':
Add ability to add sim-initiated MO call to UI (3/4)
46c99d5547da220963069f3d02d994dca3ebccf0 07-Oct-2014 Yorke Lee <yorkelee@google.com> am 529ee47f: am 5df25a5b: am 83b39a07: am fae0efd9: Merge "Add ability to add sim-initiated MO call to UI (3/4)" into lmp-dev

* commit '529ee47f055201bb49ef055dcd9f947b6b05ece5':
Add ability to add sim-initiated MO call to UI (3/4)
529ee47f055201bb49ef055dcd9f947b6b05ece5 07-Oct-2014 Yorke Lee <yorkelee@google.com> am 5df25a5b: am 83b39a07: am fae0efd9: Merge "Add ability to add sim-initiated MO call to UI (3/4)" into lmp-dev

* commit '5df25a5b4c78e6bf611d6791a07572d1e951ab38':
Add ability to add sim-initiated MO call to UI (3/4)
5df25a5b4c78e6bf611d6791a07572d1e951ab38 07-Oct-2014 Yorke Lee <yorkelee@google.com> am 83b39a07: am fae0efd9: Merge "Add ability to add sim-initiated MO call to UI (3/4)" into lmp-dev

* commit '83b39a0715fd28bd6779d6ee28f323b57f9e7e1b':
Add ability to add sim-initiated MO call to UI (3/4)
2404cfe63faf117e370014a8643067ca95b9fd8e 07-Oct-2014 Andrew Lee <anwlee@google.com> am 3373856e: am cf65189e: am 4484150e: am 3ef144b4: am 81db23b8: Merge "Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver." into lmp-dev

* commit '3373856e30b25e992a8aacd01f8f0de6f05437a7':
Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver.
1d5e078b5eaec3c89ff19927bd4e3af3e1005152 07-Oct-2014 Santos Cordon <santoscordon@google.com> am 2dce6017: am 8ee2fc46: am 42e545e9: am b656eb5f: am 5adc858b: Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev

* commit '2dce6017a9d06836e53fefd31766896503a9c260':
Dont clear serviceConnections on subsequent bind() calls.
83b39a0715fd28bd6779d6ee28f323b57f9e7e1b 07-Oct-2014 Yorke Lee <yorkelee@google.com> am fae0efd9: Merge "Add ability to add sim-initiated MO call to UI (3/4)" into lmp-dev

* commit 'fae0efd9745da43764b527ea130ef1bf7c362811':
Add ability to add sim-initiated MO call to UI (3/4)
383341be1ee261fdad33c1b8f2d8561149fb4d58 07-Oct-2014 Yorke Lee <yorkelee@google.com> am fae0efd9: Merge "Add ability to add sim-initiated MO call to UI (3/4)" into lmp-dev

* commit 'fae0efd9745da43764b527ea130ef1bf7c362811':
Add ability to add sim-initiated MO call to UI (3/4)
3373856e30b25e992a8aacd01f8f0de6f05437a7 07-Oct-2014 Andrew Lee <anwlee@google.com> am cf65189e: am 4484150e: am 3ef144b4: am 81db23b8: Merge "Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver." into lmp-dev

* commit 'cf65189e686bce173b2a5fcca9a4989b47274087':
Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver.
2dce6017a9d06836e53fefd31766896503a9c260 07-Oct-2014 Santos Cordon <santoscordon@google.com> am 8ee2fc46: am 42e545e9: am b656eb5f: am 5adc858b: Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev

* commit '8ee2fc465a2c869785882915856f12c0cb9a22bf':
Dont clear serviceConnections on subsequent bind() calls.
fae0efd9745da43764b527ea130ef1bf7c362811 07-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Add ability to add sim-initiated MO call to UI (3/4)" into lmp-dev
cf65189e686bce173b2a5fcca9a4989b47274087 07-Oct-2014 Andrew Lee <anwlee@google.com> am 4484150e: am 3ef144b4: am 81db23b8: Merge "Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver." into lmp-dev

* commit '4484150e8bdfcdfc208fde5431a4d5a35ecb3f39':
Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver.
8ee2fc465a2c869785882915856f12c0cb9a22bf 07-Oct-2014 Santos Cordon <santoscordon@google.com> am 42e545e9: am b656eb5f: am 5adc858b: Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev

* commit '42e545e90162c8d98cdb76c58f635f23261a21be':
Dont clear serviceConnections on subsequent bind() calls.
4484150e8bdfcdfc208fde5431a4d5a35ecb3f39 07-Oct-2014 Andrew Lee <anwlee@google.com> am 3ef144b4: am 81db23b8: Merge "Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver." into lmp-dev

* commit '3ef144b434f4b56968af19862d168ff0505795a5':
Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver.
42e545e90162c8d98cdb76c58f635f23261a21be 07-Oct-2014 Santos Cordon <santoscordon@google.com> am b656eb5f: am 5adc858b: Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev

* commit 'b656eb5f4d30ea368bde98dd7a3d9beeab8aecf7':
Dont clear serviceConnections on subsequent bind() calls.
3ef144b434f4b56968af19862d168ff0505795a5 07-Oct-2014 Andrew Lee <anwlee@google.com> am 81db23b8: Merge "Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver." into lmp-dev

* commit '81db23b811498a89bf0b4beb1afd022fef63e772':
Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver.
c677f0c66a9dede686a01b2727b8fc9518ebdd52 07-Oct-2014 Andrew Lee <anwlee@google.com> am 81db23b8: Merge "Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver." into lmp-dev

* commit '81db23b811498a89bf0b4beb1afd022fef63e772':
Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver.
81db23b811498a89bf0b4beb1afd022fef63e772 07-Oct-2014 Andrew Lee <anwlee@google.com> Merge "Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver." into lmp-dev
b656eb5f4d30ea368bde98dd7a3d9beeab8aecf7 07-Oct-2014 Santos Cordon <santoscordon@google.com> am 5adc858b: Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev

* commit '5adc858b0f19003194b061946b00d8a2fd3f666e':
Dont clear serviceConnections on subsequent bind() calls.
0ea47ddbcdcf16f85cdbed3ca9da1bb5a0aacb76 07-Oct-2014 Santos Cordon <santoscordon@google.com> am 5adc858b: Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev

* commit '5adc858b0f19003194b061946b00d8a2fd3f666e':
Dont clear serviceConnections on subsequent bind() calls.
5adc858b0f19003194b061946b00d8a2fd3f666e 07-Oct-2014 Santos Cordon <santoscordon@google.com> Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev
9250e5fa9987c3ab80e11e1955657055f5866539 01-Oct-2014 Yorke Lee <yorkelee@google.com> Add ability to add sim-initiated MO call to UI (3/4)

Pipe an unknown call through CallsManager via various new APIs like
onSuccessfulUnknownCall, onFailedUnknownCall, etc. These are the unknown call's
equivalent of onSuccessfulOutgoingCall and onFailedOutgoingCall.

Only the TelephonyConnectionService is allowed to call this hidden new API
in Telecom.

Also add the ability for TestConnectionService to test this API (although the
check for TelephonyConnectionService must be disabled at build time first).

Bug: 16852844
Change-Id: I5dfdfc1bd4675f6b300a4a55a3098582f9d715a2
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallReceiver.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
ests/src/com/android/server/telecom/testapps/TestCallActivity.java
ests/src/com/android/server/telecom/testapps/TestConnectionService.java
c0670ffdc003c43f78f5fc7034f02a3e7fef5753 06-Oct-2014 Andrew Lee <anwlee@google.com> Add FLAG_RECEIVER_FOREGROUND to broadcast to call receiver.

Bug: 17692294
Change-Id: Ibe2b012a83b940735a11e4adccc3d7d8ec99e8ea
rc/com/android/server/telecom/CallActivity.java
7aadcdd749822f5ea3f3be811f3bb28c6b99988f 06-Oct-2014 Andrew Lee <anwlee@google.com> am df203b4a: am 32651fbe: am 15789ac7: am 75423efe: am 72d271c4: Process intent immediately for primary users.

* commit 'df203b4a6f10dd5851d88fe253783bb50064e4f9':
Process intent immediately for primary users.
df203b4a6f10dd5851d88fe253783bb50064e4f9 06-Oct-2014 Andrew Lee <anwlee@google.com> am 32651fbe: am 15789ac7: am 75423efe: am 72d271c4: Process intent immediately for primary users.

* commit '32651fbeaaa94652efc16019e7962fe2c4c130f4':
Process intent immediately for primary users.
4f50f8e29d7479351ec344ec592686708ff01055 06-Oct-2014 Santos Cordon <santoscordon@google.com> Dont clear serviceConnections on subsequent bind() calls.

Bind() gets invoked with each call that is added before the first bind()
is complete. We were clearing the service connection set each time which
effectively meant that we were dropping the previous bind requests on
the floor. The rest of the code already does the right checks to not
rebind to the same service so just remove the clear().

Bug:17735448
Change-Id: I614225b05fa29b143604fe4dfedaa1e417dc2d2d
rc/com/android/server/telecom/InCallController.java
32651fbeaaa94652efc16019e7962fe2c4c130f4 06-Oct-2014 Andrew Lee <anwlee@google.com> am 15789ac7: am 75423efe: am 72d271c4: Process intent immediately for primary users.

* commit '15789ac7eca9b4129e42d45fa3f04fdda114c323':
Process intent immediately for primary users.
15789ac7eca9b4129e42d45fa3f04fdda114c323 06-Oct-2014 Andrew Lee <anwlee@google.com> am 75423efe: am 72d271c4: Process intent immediately for primary users.

* commit '75423efe88b6386c3866344cdc98a5a2c9e5f4fe':
Process intent immediately for primary users.
75423efe88b6386c3866344cdc98a5a2c9e5f4fe 06-Oct-2014 Andrew Lee <anwlee@google.com> am 72d271c4: Process intent immediately for primary users.

* commit '72d271c4fdb6e497cf374ac1bfd1e615393fc4b2':
Process intent immediately for primary users.
439c5b5218823853fe47c92bfcf956223b0b26be 06-Oct-2014 Andrew Lee <anwlee@google.com> am 72d271c4: Process intent immediately for primary users.

* commit '72d271c4fdb6e497cf374ac1bfd1e615393fc4b2':
Process intent immediately for primary users.
02ba3b532110e258d21e9d7552c2222c735b1bbc 06-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I1eda026784dc3e79726f6bc336a80b0e256c40b0
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
72d271c4fdb6e497cf374ac1bfd1e615393fc4b2 03-Oct-2014 Andrew Lee <anwlee@google.com> Process intent immediately for primary users.

- Change process outgoing and incoming intent methods in CallReceiver
to package-level visibility.
- Call directly instead of sending broadcast in CallActivity if the
current user is the primary user.
- Tweak CallReceiver logging so that methods can be made static.

Bug: 17692294
Bug: 17789200
Change-Id: Id2bd885c87a75a1a13ade5cc660e4c81563df1bc
rc/com/android/server/telecom/CallActivity.java
rc/com/android/server/telecom/CallReceiver.java
52bcea2da767da573d80f7e821869e9a1a60a86d 03-Oct-2014 Tyler Gunn <tgunn@google.com> am dfa69d70: am 7ea55631: am 27565019: am 495a8172: am c3f986b5: Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev

* commit 'dfa69d703ab1ed0bb3137d3d13f0df830b7b7a24':
Conference call merge button visibility issue. (1/2)
dfa69d703ab1ed0bb3137d3d13f0df830b7b7a24 03-Oct-2014 Tyler Gunn <tgunn@google.com> am 7ea55631: am 27565019: am 495a8172: am c3f986b5: Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev

* commit '7ea55631b9a1068bc5bdfe70f104f05a6474fdc5':
Conference call merge button visibility issue. (1/2)
7ea55631b9a1068bc5bdfe70f104f05a6474fdc5 03-Oct-2014 Tyler Gunn <tgunn@google.com> am 27565019: am 495a8172: am c3f986b5: Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev

* commit '2756501999f0a73005b86ab175ff4e3560e05447':
Conference call merge button visibility issue. (1/2)
2756501999f0a73005b86ab175ff4e3560e05447 03-Oct-2014 Tyler Gunn <tgunn@google.com> am 495a8172: am c3f986b5: Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev

* commit '495a817210ee0a95f3fe6c67f6a963ea7d2d80d3':
Conference call merge button visibility issue. (1/2)
5c9e6f5e44a6197599d95c2fd203c4141b969e9b 03-Oct-2014 Santos Cordon <santoscordon@google.com> am 0d4c8a02: am 44cf2942: am 3c8ff0c7: am 4dc2bed1: am efc5519c: Merge "Support MERGE/HOLD for Cdma calls through BT Headset." into lmp-dev

* commit '0d4c8a0267558449dcad55d65078bf63fa4c7b81':
Support MERGE/HOLD for Cdma calls through BT Headset.
0d4c8a0267558449dcad55d65078bf63fa4c7b81 03-Oct-2014 Santos Cordon <santoscordon@google.com> am 44cf2942: am 3c8ff0c7: am 4dc2bed1: am efc5519c: Merge "Support MERGE/HOLD for Cdma calls through BT Headset." into lmp-dev

* commit '44cf294210bb23a7b520c32cdce16084f18bcfe9':
Support MERGE/HOLD for Cdma calls through BT Headset.
e60d3c1ec38ebf74bfce73ba2a68eac5508b2419 03-Oct-2014 Tyler Gunn <tgunn@google.com> am c3f986b5: Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev

* commit 'c3f986b5ac49756ba44de15e8fdeb761c124e913':
Conference call merge button visibility issue. (1/2)
495a817210ee0a95f3fe6c67f6a963ea7d2d80d3 03-Oct-2014 Tyler Gunn <tgunn@google.com> am c3f986b5: Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev

* commit 'c3f986b5ac49756ba44de15e8fdeb761c124e913':
Conference call merge button visibility issue. (1/2)
44cf294210bb23a7b520c32cdce16084f18bcfe9 03-Oct-2014 Santos Cordon <santoscordon@google.com> am 3c8ff0c7: am 4dc2bed1: am efc5519c: Merge "Support MERGE/HOLD for Cdma calls through BT Headset." into lmp-dev

* commit '3c8ff0c7c5924b11137960fe3d81f13afcee0957':
Support MERGE/HOLD for Cdma calls through BT Headset.
3c8ff0c7c5924b11137960fe3d81f13afcee0957 03-Oct-2014 Santos Cordon <santoscordon@google.com> am 4dc2bed1: am efc5519c: Merge "Support MERGE/HOLD for Cdma calls through BT Headset." into lmp-dev

* commit '4dc2bed1f5160726db2b8797c0e89fa4c8a4884a':
Support MERGE/HOLD for Cdma calls through BT Headset.
c3f986b5ac49756ba44de15e8fdeb761c124e913 03-Oct-2014 Tyler Gunn <tgunn@google.com> Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev
03f514716977ce6ef4a7cf2e4375d9baaf771fb9 03-Oct-2014 Santos Cordon <santoscordon@google.com> am efc5519c: Merge "Support MERGE/HOLD for Cdma calls through BT Headset." into lmp-dev

* commit 'efc5519c6b07568035c9dcd3e131c6fb01550496':
Support MERGE/HOLD for Cdma calls through BT Headset.
4dc2bed1f5160726db2b8797c0e89fa4c8a4884a 03-Oct-2014 Santos Cordon <santoscordon@google.com> am efc5519c: Merge "Support MERGE/HOLD for Cdma calls through BT Headset." into lmp-dev

* commit 'efc5519c6b07568035c9dcd3e131c6fb01550496':
Support MERGE/HOLD for Cdma calls through BT Headset.
efc5519c6b07568035c9dcd3e131c6fb01550496 03-Oct-2014 Santos Cordon <santoscordon@google.com> Merge "Support MERGE/HOLD for Cdma calls through BT Headset." into lmp-dev
703d7cfdab59f84221fd803dd5810bea0e26cc56 03-Oct-2014 Tyler Gunn <tgunn@google.com> Conference call merge button visibility issue. (1/2)

- Calling onConferenceableCallsChanged listener on change of Call.
- This was preventing the change in conferenceable calls from being
communicated to the InCall UI.

Bug: 17767618
Change-Id: Ib9f7c9dbc0d05089475b6fe79e338be2c32e8698
rc/com/android/server/telecom/Call.java
8939c4e7b9143ddf869ee2fb155068f85609f765 02-Oct-2014 Andrew Lee <anwlee@google.com> am ef3d8592: am 99fd952e: am 514a540c: am fda6807d: am 7984e0a7: Merge "Removed failed outgoing calls." into lmp-dev

* commit 'ef3d8592ee8db9c0dfc5604218b7a79bc9d8b85c':
Removed failed outgoing calls.
ef3d8592ee8db9c0dfc5604218b7a79bc9d8b85c 02-Oct-2014 Andrew Lee <anwlee@google.com> am 99fd952e: am 514a540c: am fda6807d: am 7984e0a7: Merge "Removed failed outgoing calls." into lmp-dev

* commit '99fd952eb99b477f3905a0a15aadcae2edbbe1f6':
Removed failed outgoing calls.
99fd952eb99b477f3905a0a15aadcae2edbbe1f6 02-Oct-2014 Andrew Lee <anwlee@google.com> am 514a540c: am fda6807d: am 7984e0a7: Merge "Removed failed outgoing calls." into lmp-dev

* commit '514a540cea546b5b5e09f4046c028b002cc9587e':
Removed failed outgoing calls.
514a540cea546b5b5e09f4046c028b002cc9587e 02-Oct-2014 Andrew Lee <anwlee@google.com> am fda6807d: am 7984e0a7: Merge "Removed failed outgoing calls." into lmp-dev

* commit 'fda6807d5fd0356ae94460c1f02bd162eb504b70':
Removed failed outgoing calls.
fda6807d5fd0356ae94460c1f02bd162eb504b70 02-Oct-2014 Andrew Lee <anwlee@google.com> am 7984e0a7: Merge "Removed failed outgoing calls." into lmp-dev

* commit '7984e0a7909d18ec4b16741fa28d9126f49018d4':
Removed failed outgoing calls.
04fe71aa8b00ec47b90cb2fda4af5e38fc850b11 02-Oct-2014 Andrew Lee <anwlee@google.com> am 7984e0a7: Merge "Removed failed outgoing calls." into lmp-dev

* commit '7984e0a7909d18ec4b16741fa28d9126f49018d4':
Removed failed outgoing calls.
7984e0a7909d18ec4b16741fa28d9126f49018d4 02-Oct-2014 Andrew Lee <anwlee@google.com> Merge "Removed failed outgoing calls." into lmp-dev
c3214b799c57df2c864d96a86ab6a3da1a7a269a 02-Oct-2014 Tyler Gunn <tgunn@google.com> am b7d4a951: am 54f6c2af: am 5d472e8a: am 50dae572: am f3d17409: Merge "Allow sending of in-call MMI codes through to telephony." into lmp-dev

* commit 'b7d4a95137d4b5fa0294b87c3172a1e7739a31bd':
Allow sending of in-call MMI codes through to telephony.
b7d4a95137d4b5fa0294b87c3172a1e7739a31bd 02-Oct-2014 Tyler Gunn <tgunn@google.com> am 54f6c2af: am 5d472e8a: am 50dae572: am f3d17409: Merge "Allow sending of in-call MMI codes through to telephony." into lmp-dev

* commit '54f6c2af7915def5493986a93c1dc60f95ce9de7':
Allow sending of in-call MMI codes through to telephony.
eb5ab35cd05fa2880c55076262553d31ae38f44e 02-Oct-2014 Ihab Awad <ihab@google.com> am 6270b3e0: am 8746a702: am 72e87795: am ed50688d: am 3e3cde1b: Merge "Refine implementation of GSM conferences (2/3)" into lmp-dev

* commit '6270b3e02dded639dc386cc889edc633e5063148':
Refine implementation of GSM conferences (2/3)
6270b3e02dded639dc386cc889edc633e5063148 02-Oct-2014 Ihab Awad <ihab@google.com> am 8746a702: am 72e87795: am ed50688d: am 3e3cde1b: Merge "Refine implementation of GSM conferences (2/3)" into lmp-dev

* commit '8746a70298f8383c4e3128391aaf9ab00126f0a6':
Refine implementation of GSM conferences (2/3)
88a4a60284de8e1222488667b810b098c16d22ac 30-Sep-2014 Santos Cordon <santoscordon@google.com> Support MERGE/HOLD for Cdma calls through BT Headset.

We have to manufacture states for CDMA multi-calls, which do not
expose HOLD/SWAP in the traditional way other calls do.

Bug:17699262
Change-Id: I251e59b1f15b5e2d9a6b2929ec1fcaba3d9f4101
rc/com/android/server/telecom/BluetoothPhoneService.java
rc/com/android/server/telecom/Call.java
54f6c2af7915def5493986a93c1dc60f95ce9de7 02-Oct-2014 Tyler Gunn <tgunn@google.com> am 5d472e8a: am 50dae572: am f3d17409: Merge "Allow sending of in-call MMI codes through to telephony." into lmp-dev

* commit '5d472e8a51d4a8332d402a6f85726948f9327865':
Allow sending of in-call MMI codes through to telephony.
5d472e8a51d4a8332d402a6f85726948f9327865 02-Oct-2014 Tyler Gunn <tgunn@google.com> am 50dae572: am f3d17409: Merge "Allow sending of in-call MMI codes through to telephony." into lmp-dev

* commit '50dae572f4310d678e80414bf8b5e7defb60b89e':
Allow sending of in-call MMI codes through to telephony.
26aa3b879e0a383a5b6acd2b0413f9d91c38651f 02-Oct-2014 Tyler Gunn <tgunn@google.com> am f3d17409: Merge "Allow sending of in-call MMI codes through to telephony." into lmp-dev

* commit 'f3d174091c76b4c4f051dd891cc3fbdc19002379':
Allow sending of in-call MMI codes through to telephony.
50dae572f4310d678e80414bf8b5e7defb60b89e 02-Oct-2014 Tyler Gunn <tgunn@google.com> am f3d17409: Merge "Allow sending of in-call MMI codes through to telephony." into lmp-dev

* commit 'f3d174091c76b4c4f051dd891cc3fbdc19002379':
Allow sending of in-call MMI codes through to telephony.
f3d174091c76b4c4f051dd891cc3fbdc19002379 02-Oct-2014 Tyler Gunn <tgunn@google.com> Merge "Allow sending of in-call MMI codes through to telephony." into lmp-dev
c0caa70cb628c8bdd15482c564f1c000d4614d5a 02-Oct-2014 Ihab Awad <ihab@google.com> am 3e3cde1b: Merge "Refine implementation of GSM conferences (2/3)" into lmp-dev

* commit '3e3cde1b54e52f200b6c0f5bd3f838eade87b317':
Refine implementation of GSM conferences (2/3)
8746a70298f8383c4e3128391aaf9ab00126f0a6 02-Oct-2014 Ihab Awad <ihab@google.com> am 72e87795: am ed50688d: am 3e3cde1b: Merge "Refine implementation of GSM conferences (2/3)" into lmp-dev

* commit '72e8779556e161b7f595e392f4163d1d688ee4d3':
Refine implementation of GSM conferences (2/3)
72e8779556e161b7f595e392f4163d1d688ee4d3 02-Oct-2014 Ihab Awad <ihab@google.com> am ed50688d: am 3e3cde1b: Merge "Refine implementation of GSM conferences (2/3)" into lmp-dev

* commit 'ed50688d3982f96ff0d9aff545bb54c6d770e5ad':
Refine implementation of GSM conferences (2/3)
5b452df44f5bbd1b8984611d5e6de6ebf14aa0f2 02-Oct-2014 Tyler Gunn <tgunn@google.com> Allow sending of in-call MMI codes through to telephony.

1. Fixing bug where having multiple calls in progress it would not be
possible to send the ECT MMI code due to code that checks for the number
of current calls.
2. Fixed issue where InCall MMI codes would be dialed as a regular call,
showing the InCall UI. In KitKat, dialing an incall MMI code would
bypass the InCall UI, dialing the MMI code directly.

Bug: 17700763
Change-Id: I41b9b329609e100540c4d60e1243dc08354bb481
rc/com/android/server/telecom/CallsManager.java
e6288a7a6765006f155d259bea8bfd26ce8c6205 01-Oct-2014 Andrew Lee <anwlee@google.com> Removed failed outgoing calls.

The user is unable to add a call in this bug, because the call is not
add capable. It fails the isAddCallCapable check because there are
multiple calls; one of which is not the same call and does not have
a parent.

This appears to be because of some interaction with Google Voice (at
least in the specific case I was observing), where the initial call
is disconnected and then the call is rerouted. When this initial call
is disconnected, it was not removed, leading to this (erroneous) two
call state.

Fixing this by explicitly calling remove call for failed outgoing
calls. Formerly, they were only marked as disconnected.

Bug: 17731082
Change-Id: I0d6401cbc593a128483072c5faa189949e73d71e
rc/com/android/server/telecom/CallsManager.java
ed50688d3982f96ff0d9aff545bb54c6d770e5ad 01-Oct-2014 Ihab Awad <ihab@google.com> am 3e3cde1b: Merge "Refine implementation of GSM conferences (2/3)" into lmp-dev

* commit '3e3cde1b54e52f200b6c0f5bd3f838eade87b317':
Refine implementation of GSM conferences (2/3)
3e3cde1b54e52f200b6c0f5bd3f838eade87b317 01-Oct-2014 Ihab Awad <ihab@google.com> Merge "Refine implementation of GSM conferences (2/3)" into lmp-dev
9f4cda046aa006c5ced0b25584ceaff98234438b 01-Oct-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
224396ea28a951fb01f72a783e32039b29b596c9 01-Oct-2014 Yorke Lee <yorkelee@google.com> am bd2baced: am 7d963e4f: am a8027bda: am 14034756: am 802363d9: Merge "Correctly send the original address in BluetoothPhoneService if using gateway" into lmp-dev

* commit 'bd2baced3a9342ceee3256b1762dee243ed2ff62':
Correctly send the original address in BluetoothPhoneService if using gateway
dc58daa4e9ac069a2d3bc008afd6257106a45c96 01-Oct-2014 Santos Cordon <santoscordon@google.com> am 53035ba7: am badf854a: am 6fd43408: am 51ad9bcd: am b9d90a66: Merge "BT: Sending DIALING state prior to changing to ALERTING state." into lmp-dev

* commit '53035ba73ea9681745a7c15b2a9556783450f802':
BT: Sending DIALING state prior to changing to ALERTING state.
886b8de24aec9e89986c8bff8c775c71beb598bc 01-Oct-2014 Nancy Chen <nancychen@google.com> am 2a084c34: am 65eaeaa0: am 09f67c07: am d1561b58: am b92682c6: Merge "Remove invalid warning from BluetoothPhoneService" into lmp-dev

* commit '2a084c34f7a6ffd406674d6fb30b712df8d2210c':
Remove invalid warning from BluetoothPhoneService
b6507cfcd0bd93d396578dd90d667f103f312e99 01-Oct-2014 Jay Shrauner <shrauner@google.com> am 3c0fb39a: am d2fc6409: am 11c5ba6a: am 4b4f2e04: am 6426ce8d: Merge "Fix NPE when calls manager isn\'t initialized" into lmp-dev

* commit '3c0fb39ae972238b22c3ed5ca4d084e2a8bcb09a':
Fix NPE when calls manager isn't initialized
921bf60783eb01ac92b0a065fdbf4773ac259f34 01-Oct-2014 Baligh Uddin <baligh@google.com> am 9c6d0bd8: (-s ours) am e39f2421: (-s ours) am b7d5cb42: (-s ours) am f5c0f672: (-s ours) am e471c51b: (-s ours) Import translations. DO NOT MERGE

* commit '9c6d0bd87cec1fdfe402328f0b00344fef3a20df':
Import translations. DO NOT MERGE
bd2baced3a9342ceee3256b1762dee243ed2ff62 01-Oct-2014 Yorke Lee <yorkelee@google.com> am 7d963e4f: am a8027bda: am 14034756: am 802363d9: Merge "Correctly send the original address in BluetoothPhoneService if using gateway" into lmp-dev

* commit '7d963e4f4dfee5b728819f1c40151330f9d00c75':
Correctly send the original address in BluetoothPhoneService if using gateway
53035ba73ea9681745a7c15b2a9556783450f802 01-Oct-2014 Santos Cordon <santoscordon@google.com> am badf854a: am 6fd43408: am 51ad9bcd: am b9d90a66: Merge "BT: Sending DIALING state prior to changing to ALERTING state." into lmp-dev

* commit 'badf854abab2b8aba4e2ffccd4589ca37c8db3aa':
BT: Sending DIALING state prior to changing to ALERTING state.
2a084c34f7a6ffd406674d6fb30b712df8d2210c 01-Oct-2014 Nancy Chen <nancychen@google.com> am 65eaeaa0: am 09f67c07: am d1561b58: am b92682c6: Merge "Remove invalid warning from BluetoothPhoneService" into lmp-dev

* commit '65eaeaa0ae9de8706c6522fade21b3647db239ba':
Remove invalid warning from BluetoothPhoneService
3c0fb39ae972238b22c3ed5ca4d084e2a8bcb09a 01-Oct-2014 Jay Shrauner <shrauner@google.com> am d2fc6409: am 11c5ba6a: am 4b4f2e04: am 6426ce8d: Merge "Fix NPE when calls manager isn\'t initialized" into lmp-dev

* commit 'd2fc6409bc96196a3fef8eb9125c5464b1c1fde4':
Fix NPE when calls manager isn't initialized
9c6d0bd87cec1fdfe402328f0b00344fef3a20df 01-Oct-2014 Baligh Uddin <baligh@google.com> am e39f2421: (-s ours) am b7d5cb42: (-s ours) am f5c0f672: (-s ours) am e471c51b: (-s ours) Import translations. DO NOT MERGE

* commit 'e39f2421b024cbc0728f42b4f967da8b81c6984b':
Import translations. DO NOT MERGE
7d963e4f4dfee5b728819f1c40151330f9d00c75 01-Oct-2014 Yorke Lee <yorkelee@google.com> am a8027bda: am 14034756: am 802363d9: Merge "Correctly send the original address in BluetoothPhoneService if using gateway" into lmp-dev

* commit 'a8027bda38d51f0c41858884476749538fef034e':
Correctly send the original address in BluetoothPhoneService if using gateway
badf854abab2b8aba4e2ffccd4589ca37c8db3aa 01-Oct-2014 Santos Cordon <santoscordon@google.com> am 6fd43408: am 51ad9bcd: am b9d90a66: Merge "BT: Sending DIALING state prior to changing to ALERTING state." into lmp-dev

* commit '6fd434089cf3ed84c3c3bd31e663c1dd74f1ccc9':
BT: Sending DIALING state prior to changing to ALERTING state.
a8027bda38d51f0c41858884476749538fef034e 01-Oct-2014 Yorke Lee <yorkelee@google.com> am 14034756: am 802363d9: Merge "Correctly send the original address in BluetoothPhoneService if using gateway" into lmp-dev

* commit '14034756a6c2bf8dcaee019c9f369fa354744290':
Correctly send the original address in BluetoothPhoneService if using gateway
6fd434089cf3ed84c3c3bd31e663c1dd74f1ccc9 01-Oct-2014 Santos Cordon <santoscordon@google.com> am 51ad9bcd: am b9d90a66: Merge "BT: Sending DIALING state prior to changing to ALERTING state." into lmp-dev

* commit '51ad9bcd2a06881fc4eb00c3e88e7c07ab5152e9':
BT: Sending DIALING state prior to changing to ALERTING state.
14034756a6c2bf8dcaee019c9f369fa354744290 01-Oct-2014 Yorke Lee <yorkelee@google.com> am 802363d9: Merge "Correctly send the original address in BluetoothPhoneService if using gateway" into lmp-dev

* commit '802363d98e810e8cf54eef0dc59807a077654d54':
Correctly send the original address in BluetoothPhoneService if using gateway
51ad9bcd2a06881fc4eb00c3e88e7c07ab5152e9 01-Oct-2014 Santos Cordon <santoscordon@google.com> am b9d90a66: Merge "BT: Sending DIALING state prior to changing to ALERTING state." into lmp-dev

* commit 'b9d90a66a85223e5a01ecf55eaa9594aa8a59300':
BT: Sending DIALING state prior to changing to ALERTING state.
60ccd779d1448675ad42caa537348c2bcae186c2 30-Sep-2014 Ihab Awad <ihab@google.com> Refine implementation of GSM conferences (2/3)

Bug: 17684223

Change-Id: I7a274de891b7efc2a781a16ce7596bf5cd3ea6ff
rc/com/android/server/telecom/ConnectionServiceWrapper.java
0851c941bb7884a81ab50ff2b548dd1731e1d3e5 30-Sep-2014 Yorke Lee <yorkelee@google.com> am 802363d9: Merge "Correctly send the original address in BluetoothPhoneService if using gateway" into lmp-dev

* commit '802363d98e810e8cf54eef0dc59807a077654d54':
Correctly send the original address in BluetoothPhoneService if using gateway
c7a69034d8efc2f75c811e53a392528cf6e79a43 30-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ife0ca75659a928140e3ad9b7b095db13092ab07a
Auto-generated-cl: translation import
es/values-kn-rIN/strings.xml
f18e45a69405b233020cb670ec7bb54e8db17c06 30-Sep-2014 Santos Cordon <santoscordon@google.com> am b9d90a66: Merge "BT: Sending DIALING state prior to changing to ALERTING state." into lmp-dev

* commit 'b9d90a66a85223e5a01ecf55eaa9594aa8a59300':
BT: Sending DIALING state prior to changing to ALERTING state.
802363d98e810e8cf54eef0dc59807a077654d54 30-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Correctly send the original address in BluetoothPhoneService if using gateway" into lmp-dev
b9d90a66a85223e5a01ecf55eaa9594aa8a59300 30-Sep-2014 Santos Cordon <santoscordon@google.com> Merge "BT: Sending DIALING state prior to changing to ALERTING state." into lmp-dev
a0b4612909c6046315a11072d245e4ff0b9e784e 29-Sep-2014 Santos Cordon <santoscordon@google.com> BT: Sending DIALING state prior to changing to ALERTING state.

- When the state changes to ALERTING, make sure to send DIALING first.
- Add caching to reduce number of times we update the bluetooth headset.

Bug:17681198
Change-Id: Icb8dfd8fb2078d94652b37d1b6212823a3107567
rc/com/android/server/telecom/BluetoothPhoneService.java
fb70e1efbcf173a995e9bb9b312713f8f554e307 29-Sep-2014 Yorke Lee <yorkelee@google.com> Correctly send the original address in BluetoothPhoneService if using gateway

Bug: 17662993
Change-Id: I3e02f74ace399361033f126bb1e01b8ef5753827
rc/com/android/server/telecom/BluetoothPhoneService.java
65eaeaa0ae9de8706c6522fade21b3647db239ba 29-Sep-2014 Nancy Chen <nancychen@google.com> am 09f67c07: am d1561b58: am b92682c6: Merge "Remove invalid warning from BluetoothPhoneService" into lmp-dev

* commit '09f67c07f4cd44951bb5dd3f31b080b5b3269862':
Remove invalid warning from BluetoothPhoneService
d2fc6409bc96196a3fef8eb9125c5464b1c1fde4 29-Sep-2014 Jay Shrauner <shrauner@google.com> am 11c5ba6a: am 4b4f2e04: am 6426ce8d: Merge "Fix NPE when calls manager isn\'t initialized" into lmp-dev

* commit '11c5ba6aa80d7c27bfc6c5e8dc1a6b76b3382e22':
Fix NPE when calls manager isn't initialized
e39f2421b024cbc0728f42b4f967da8b81c6984b 29-Sep-2014 Baligh Uddin <baligh@google.com> am b7d5cb42: (-s ours) am f5c0f672: (-s ours) am e471c51b: (-s ours) Import translations. DO NOT MERGE

* commit 'b7d5cb425bd5041e06af0b55336bc2a51cbb1fe7':
Import translations. DO NOT MERGE
09f67c07f4cd44951bb5dd3f31b080b5b3269862 29-Sep-2014 Nancy Chen <nancychen@google.com> am d1561b58: am b92682c6: Merge "Remove invalid warning from BluetoothPhoneService" into lmp-dev

* commit 'd1561b588dffbc6dbda818a2e3b4a51ed731bd96':
Remove invalid warning from BluetoothPhoneService
11c5ba6aa80d7c27bfc6c5e8dc1a6b76b3382e22 29-Sep-2014 Jay Shrauner <shrauner@google.com> am 4b4f2e04: am 6426ce8d: Merge "Fix NPE when calls manager isn\'t initialized" into lmp-dev

* commit '4b4f2e0401cb15b1f6a2dcee6bbffb71a364bc08':
Fix NPE when calls manager isn't initialized
b7d5cb425bd5041e06af0b55336bc2a51cbb1fe7 29-Sep-2014 Baligh Uddin <baligh@google.com> am f5c0f672: (-s ours) am e471c51b: (-s ours) Import translations. DO NOT MERGE

* commit 'f5c0f672fea277bd117f64289233d44cadcc7a20':
Import translations. DO NOT MERGE
d1561b588dffbc6dbda818a2e3b4a51ed731bd96 29-Sep-2014 Nancy Chen <nancychen@google.com> am b92682c6: Merge "Remove invalid warning from BluetoothPhoneService" into lmp-dev

* commit 'b92682c6b5aa03483df048e899010ad95ee9294e':
Remove invalid warning from BluetoothPhoneService
4b4f2e0401cb15b1f6a2dcee6bbffb71a364bc08 29-Sep-2014 Jay Shrauner <shrauner@google.com> am 6426ce8d: Merge "Fix NPE when calls manager isn\'t initialized" into lmp-dev

* commit '6426ce8d11e935c9358754286158e8b26108145b':
Fix NPE when calls manager isn't initialized
f5c0f672fea277bd117f64289233d44cadcc7a20 29-Sep-2014 Baligh Uddin <baligh@google.com> am e471c51b: (-s ours) Import translations. DO NOT MERGE

* commit 'e471c51b7d758ed8973a1b121e181bd4adb50c61':
Import translations. DO NOT MERGE
7e46a3923936d83520ede07cc1fb3c46831c4d1a 29-Sep-2014 Nancy Chen <nancychen@google.com> am b92682c6: Merge "Remove invalid warning from BluetoothPhoneService" into lmp-dev

* commit 'b92682c6b5aa03483df048e899010ad95ee9294e':
Remove invalid warning from BluetoothPhoneService
50fe6d4431909b875b4b127dcd69eeb08ac31b9b 29-Sep-2014 Jay Shrauner <shrauner@google.com> am 6426ce8d: Merge "Fix NPE when calls manager isn\'t initialized" into lmp-dev

* commit '6426ce8d11e935c9358754286158e8b26108145b':
Fix NPE when calls manager isn't initialized
a646e2bfdef32e1052561e7a546fe292ebfa8763 29-Sep-2014 Baligh Uddin <baligh@google.com> am e471c51b: (-s ours) Import translations. DO NOT MERGE

* commit 'e471c51b7d758ed8973a1b121e181bd4adb50c61':
Import translations. DO NOT MERGE
b92682c6b5aa03483df048e899010ad95ee9294e 29-Sep-2014 Nancy Chen <nancychen@google.com> Merge "Remove invalid warning from BluetoothPhoneService" into lmp-dev
c127fd8082a9c2254c777072d1de274cfd95d201 29-Sep-2014 Jay Shrauner <shrauner@google.com> am 3225c8fe: am b2deb6cc: am 92b1721a: am 86ad5b02: am 54e563bd: Merge "Fix NPE when disconnect cause wasn\'t set" into lmp-dev

* commit '3225c8fe6e02e0b5eb09660e54419b8f3a5e33af':
Fix NPE when disconnect cause wasn't set
9db6caeb52b46a77a6c703a38b9ed6e8188b5240 29-Sep-2014 Yorke Lee <yorkelee@google.com> am c08366ca: am fb24d079: am bafbe284: am 5d71ca77: am 36bf1ca0: Merge "Correctly report phone state when call waiting is rejected" into lmp-dev

* commit 'c08366ca36a83c3063c30cd25c51ca444125c96e':
Correctly report phone state when call waiting is rejected
e7cf1e65d10d2674dfb482b1112e0fd48c9dee5a 29-Sep-2014 Qiwen Zhao <zhao@google.com> am c40c794c: am 7a29221c: am e10ef43b: am ea30cfca: am b63254cf: Merge "Don\'t stop outgoing calls if we are the foreground call." into lmp-dev

* commit 'c40c794c12e675a5e9f146d5d10bdb993ffdf13e':
Don't stop outgoing calls if we are the foreground call.
6b5addd72e4a469db7adb3e0e979de1d10c78517 29-Sep-2014 Ihab Awad <ihab@google.com> am 4b3020a8: am 9880f36f: am e084f730: am 8df44561: am bb907d48: Merge "Attempt to unhold remaining holding call on disconnect (1/2)" into lmp-dev

* commit '4b3020a8fcc76508fd0e4ec36e122c8600a7b7c8':
Attempt to unhold remaining holding call on disconnect (1/2)
9e7628201e27ffafd024fe4794f5f766ad70dfdc 29-Sep-2014 Nancy Chen <nancychen@google.com> am 3528448d: am 0a1e0ea8: am 51fd6bab: am e4caa11d: am 05a9e40b: Ensure bluetooth does not get hangup sound when calling through gvoice

* commit '3528448d395b551eec3f25b65367bea5321bc12e':
Ensure bluetooth does not get hangup sound when calling through gvoice
9bf8758e92129d3a68a4bd9e2330d5f3e5b7678f 29-Sep-2014 Santos Cordon <santoscordon@google.com> am b28347ee: am cc94e5b4: am 3db63635: am cd1b1a0e: am 9019ebc5: Merge "Turn on Bluetooth automatically for outgoing calls." into lmp-dev

* commit 'b28347ee60c8296516d6bdf5de7599e0a9738865':
Turn on Bluetooth automatically for outgoing calls.
9a2f710331f99141ecdc19439b1c4fd8f8bc4033 29-Sep-2014 Santos Cordon <santoscordon@google.com> am 87699d18: am 86a298bb: am 627da1f3: am 35c64608: am 33fff490: Adding clcc request support for Bluetooth Phone Service.

* commit '87699d1821520cf134212d1b41b2565f602b8936':
Adding clcc request support for Bluetooth Phone Service.
6426ce8d11e935c9358754286158e8b26108145b 29-Sep-2014 Jay Shrauner <shrauner@google.com> Merge "Fix NPE when calls manager isn't initialized" into lmp-dev
d675ae718ef5f701dafbab1b0ad8544fe49be5f2 29-Sep-2014 Nancy Chen <nancychen@google.com> Remove invalid warning from BluetoothPhoneService

There was originally supposed to be a check earlier in the code so that
this case would not be reached, but since that was not added and this
fallthrough produces the intended behavior, it is fine to remove the
warning.

Bug: 17662993
Change-Id: I2b91d4e1375bc8f8c9a2c0905299828733ddfa3c
rc/com/android/server/telecom/BluetoothPhoneService.java
e471c51b7d758ed8973a1b121e181bd4adb50c61 29-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I3d5111b4aa19655f85ee842efbc5694d198480bd
Auto-generated-cl: translation import
es/values-kn-rIN/strings.xml
65ff88c1251189543284abe02a90ef04203c1ae5 29-Sep-2014 Jay Shrauner <shrauner@google.com> Fix NPE when calls manager isn't initialized

CallsManager isn't initialized for users other than USER_OWNER, so need
to check whether getInstance() is null.

Bug:17684364
Change-Id: Ic3a2a41170a259f13ed4b685e00631c126db3951
rc/com/android/server/telecom/PhoneAccountBroadcastReceiver.java
3225c8fe6e02e0b5eb09660e54419b8f3a5e33af 28-Sep-2014 Jay Shrauner <shrauner@google.com> am b2deb6cc: am 92b1721a: am 86ad5b02: am 54e563bd: Merge "Fix NPE when disconnect cause wasn\'t set" into lmp-dev

* commit 'b2deb6cc04bcc7f37434a2f52b9416c16bee5fa6':
Fix NPE when disconnect cause wasn't set
b2deb6cc04bcc7f37434a2f52b9416c16bee5fa6 28-Sep-2014 Jay Shrauner <shrauner@google.com> am 92b1721a: am 86ad5b02: am 54e563bd: Merge "Fix NPE when disconnect cause wasn\'t set" into lmp-dev

* commit '92b1721aa07b1f10776fd8d351a5ac0c3b06a620':
Fix NPE when disconnect cause wasn't set
92b1721aa07b1f10776fd8d351a5ac0c3b06a620 28-Sep-2014 Jay Shrauner <shrauner@google.com> am 86ad5b02: am 54e563bd: Merge "Fix NPE when disconnect cause wasn\'t set" into lmp-dev

* commit '86ad5b02a9034255f7bdd0bd3fe734ad7673ebe3':
Fix NPE when disconnect cause wasn't set
95c74bbcf90babb9e26496855007d019cd8320f5 28-Sep-2014 Jay Shrauner <shrauner@google.com> am 54e563bd: Merge "Fix NPE when disconnect cause wasn\'t set" into lmp-dev

* commit '54e563bd1e42657cd86dc63e85a52ddc73ba05ae':
Fix NPE when disconnect cause wasn't set
86ad5b02a9034255f7bdd0bd3fe734ad7673ebe3 28-Sep-2014 Jay Shrauner <shrauner@google.com> am 54e563bd: Merge "Fix NPE when disconnect cause wasn\'t set" into lmp-dev

* commit '54e563bd1e42657cd86dc63e85a52ddc73ba05ae':
Fix NPE when disconnect cause wasn't set
54e563bd1e42657cd86dc63e85a52ddc73ba05ae 28-Sep-2014 Jay Shrauner <shrauner@google.com> Merge "Fix NPE when disconnect cause wasn't set" into lmp-dev
c08366ca36a83c3063c30cd25c51ca444125c96e 28-Sep-2014 Yorke Lee <yorkelee@google.com> am fb24d079: am bafbe284: am 5d71ca77: am 36bf1ca0: Merge "Correctly report phone state when call waiting is rejected" into lmp-dev

* commit 'fb24d07977e0f54ce9ae57c6f6f4bab4d8192398':
Correctly report phone state when call waiting is rejected
fb24d07977e0f54ce9ae57c6f6f4bab4d8192398 28-Sep-2014 Yorke Lee <yorkelee@google.com> am bafbe284: am 5d71ca77: am 36bf1ca0: Merge "Correctly report phone state when call waiting is rejected" into lmp-dev

* commit 'bafbe28437f563fb0b0050cf94b7d04917520469':
Correctly report phone state when call waiting is rejected
bafbe28437f563fb0b0050cf94b7d04917520469 28-Sep-2014 Yorke Lee <yorkelee@google.com> am 5d71ca77: am 36bf1ca0: Merge "Correctly report phone state when call waiting is rejected" into lmp-dev

* commit '5d71ca779f0de3f0231ecd54f48b444135bde7e0':
Correctly report phone state when call waiting is rejected
f741f036b47ee82bb0d8e59fde0da11c1b5096e6 28-Sep-2014 Yorke Lee <yorkelee@google.com> am 36bf1ca0: Merge "Correctly report phone state when call waiting is rejected" into lmp-dev

* commit '36bf1ca0a2eae3f40bc94e931e399100d7a14482':
Correctly report phone state when call waiting is rejected
5d71ca779f0de3f0231ecd54f48b444135bde7e0 28-Sep-2014 Yorke Lee <yorkelee@google.com> am 36bf1ca0: Merge "Correctly report phone state when call waiting is rejected" into lmp-dev

* commit '36bf1ca0a2eae3f40bc94e931e399100d7a14482':
Correctly report phone state when call waiting is rejected
36bf1ca0a2eae3f40bc94e931e399100d7a14482 28-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Correctly report phone state when call waiting is rejected" into lmp-dev
f211ce79c1034315d454289ed233c11dd3aa4d0f 27-Sep-2014 Jay Shrauner <shrauner@google.com> Fix NPE when disconnect cause wasn't set

Ensure DisconnectCause is set when fail to make a call.

Bug:17681453
Change-Id: I31466dd6c7d71cec5ee5c44789fd30bbef80017d
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/InCallToneMonitor.java
677e811379dba9b0cce2230b770697d474ed8e56 27-Sep-2014 Yorke Lee <yorkelee@google.com> Correctly report phone state when call waiting is rejected

Bug: 17673093
Change-Id: Ibb539858ff9644621139f4829d1e6d1c521d597a
rc/com/android/server/telecom/PhoneStateBroadcaster.java
c40c794c12e675a5e9f146d5d10bdb993ffdf13e 27-Sep-2014 Qiwen Zhao <zhao@google.com> am 7a29221c: am e10ef43b: am ea30cfca: am b63254cf: Merge "Don\'t stop outgoing calls if we are the foreground call." into lmp-dev

* commit '7a29221c6da19be3c0e4fe678acb51b416386ad1':
Don't stop outgoing calls if we are the foreground call.
7a29221c6da19be3c0e4fe678acb51b416386ad1 27-Sep-2014 Qiwen Zhao <zhao@google.com> am e10ef43b: am ea30cfca: am b63254cf: Merge "Don\'t stop outgoing calls if we are the foreground call." into lmp-dev

* commit 'e10ef43b9b85838e2aabfb4bf49198608a9466a2':
Don't stop outgoing calls if we are the foreground call.
e10ef43b9b85838e2aabfb4bf49198608a9466a2 27-Sep-2014 Qiwen Zhao <zhao@google.com> am ea30cfca: am b63254cf: Merge "Don\'t stop outgoing calls if we are the foreground call." into lmp-dev

* commit 'ea30cfca5f3c08f404277e5c987850deb947054e':
Don't stop outgoing calls if we are the foreground call.
57a620f128521574da584dfad182069bfe4a903d 27-Sep-2014 Qiwen Zhao <zhao@google.com> am b63254cf: Merge "Don\'t stop outgoing calls if we are the foreground call." into lmp-dev

* commit 'b63254cfa6a9c404fab98f51b2b2f4acf34b59b6':
Don't stop outgoing calls if we are the foreground call.
ea30cfca5f3c08f404277e5c987850deb947054e 27-Sep-2014 Qiwen Zhao <zhao@google.com> am b63254cf: Merge "Don\'t stop outgoing calls if we are the foreground call." into lmp-dev

* commit 'b63254cfa6a9c404fab98f51b2b2f4acf34b59b6':
Don't stop outgoing calls if we are the foreground call.
b63254cfa6a9c404fab98f51b2b2f4acf34b59b6 27-Sep-2014 Qiwen Zhao <zhao@google.com> Merge "Don't stop outgoing calls if we are the foreground call." into lmp-dev
4b3020a8fcc76508fd0e4ec36e122c8600a7b7c8 27-Sep-2014 Ihab Awad <ihab@google.com> am 9880f36f: am e084f730: am 8df44561: am bb907d48: Merge "Attempt to unhold remaining holding call on disconnect (1/2)" into lmp-dev

* commit '9880f36f41f62fe0fcda229fe3e8a15163eb5130':
Attempt to unhold remaining holding call on disconnect (1/2)
9880f36f41f62fe0fcda229fe3e8a15163eb5130 27-Sep-2014 Ihab Awad <ihab@google.com> am e084f730: am 8df44561: am bb907d48: Merge "Attempt to unhold remaining holding call on disconnect (1/2)" into lmp-dev

* commit 'e084f730462cb419fa8f6e591a86d99df145131a':
Attempt to unhold remaining holding call on disconnect (1/2)
e084f730462cb419fa8f6e591a86d99df145131a 27-Sep-2014 Ihab Awad <ihab@google.com> am 8df44561: am bb907d48: Merge "Attempt to unhold remaining holding call on disconnect (1/2)" into lmp-dev

* commit '8df4456102006bede3291f6cc254ce904ca1a6fd':
Attempt to unhold remaining holding call on disconnect (1/2)
d176650e14205f34fff93b14341f6313437b703c 27-Sep-2014 Santos Cordon <santoscordon@google.com> Don't stop outgoing calls if we are the foreground call.

When attempting outgoing calls we do checks to make sure there is room
for another outgoing call (we only support 1 at a time). But that code
needs to check to see if the new call is already the foreground call and
if so, let it continue.

Without this change, we never make an outgoing call in the "Ask
First" case

Bug: 17672699
Change-Id: I9bf37b08e54e2fc2ace1295ce269775cb14d08f1
rc/com/android/server/telecom/CallsManager.java
c1155c1e3c4d131ebe611160e34f02efa2100927 27-Sep-2014 Ihab Awad <ihab@google.com> am bb907d48: Merge "Attempt to unhold remaining holding call on disconnect (1/2)" into lmp-dev

* commit 'bb907d4878612ffc45464afeb70e06b91b6d91f6':
Attempt to unhold remaining holding call on disconnect (1/2)
8df4456102006bede3291f6cc254ce904ca1a6fd 27-Sep-2014 Ihab Awad <ihab@google.com> am bb907d48: Merge "Attempt to unhold remaining holding call on disconnect (1/2)" into lmp-dev

* commit 'bb907d4878612ffc45464afeb70e06b91b6d91f6':
Attempt to unhold remaining holding call on disconnect (1/2)
bb907d4878612ffc45464afeb70e06b91b6d91f6 27-Sep-2014 Ihab Awad <ihab@google.com> Merge "Attempt to unhold remaining holding call on disconnect (1/2)" into lmp-dev
3528448d395b551eec3f25b65367bea5321bc12e 27-Sep-2014 Nancy Chen <nancychen@google.com> am 0a1e0ea8: am 51fd6bab: am e4caa11d: am 05a9e40b: Ensure bluetooth does not get hangup sound when calling through gvoice

* commit '0a1e0ea8c3b8a792eea2d2dd2d31222cf3751fad':
Ensure bluetooth does not get hangup sound when calling through gvoice
0a1e0ea8c3b8a792eea2d2dd2d31222cf3751fad 27-Sep-2014 Nancy Chen <nancychen@google.com> am 51fd6bab: am e4caa11d: am 05a9e40b: Ensure bluetooth does not get hangup sound when calling through gvoice

* commit '51fd6babed73a7653501963d4ad3ec77266059ce':
Ensure bluetooth does not get hangup sound when calling through gvoice
51fd6babed73a7653501963d4ad3ec77266059ce 27-Sep-2014 Nancy Chen <nancychen@google.com> am e4caa11d: am 05a9e40b: Ensure bluetooth does not get hangup sound when calling through gvoice

* commit 'e4caa11dd83ae051fb0a0d68183c683c429863f2':
Ensure bluetooth does not get hangup sound when calling through gvoice
2c4f8de0073bf45394a87bf731594253e4b45492 27-Sep-2014 Nancy Chen <nancychen@google.com> am 05a9e40b: Ensure bluetooth does not get hangup sound when calling through gvoice

* commit '05a9e40ba1edc7b4597163f73503e2e92b746208':
Ensure bluetooth does not get hangup sound when calling through gvoice
e4caa11dd83ae051fb0a0d68183c683c429863f2 27-Sep-2014 Nancy Chen <nancychen@google.com> am 05a9e40b: Ensure bluetooth does not get hangup sound when calling through gvoice

* commit '05a9e40ba1edc7b4597163f73503e2e92b746208':
Ensure bluetooth does not get hangup sound when calling through gvoice
87874ea4531b63d2504539c2f42673f7fbda5588 26-Sep-2014 Santos Cordon <santoscordon@google.com> am 9019ebc5: Merge "Turn on Bluetooth automatically for outgoing calls." into lmp-dev

* commit '9019ebc5cf2477c0a413f1bf2d6c089a0a108f03':
Turn on Bluetooth automatically for outgoing calls.
e9cb7cfeb2ab0319257a033abcacf4d4b2bce367 26-Sep-2014 Santos Cordon <santoscordon@google.com> am 33fff490: Adding clcc request support for Bluetooth Phone Service.

* commit '33fff4905fb4e977cb982fbc89d5d0c52a92b55c':
Adding clcc request support for Bluetooth Phone Service.
b28347ee60c8296516d6bdf5de7599e0a9738865 26-Sep-2014 Santos Cordon <santoscordon@google.com> am cc94e5b4: am 3db63635: am cd1b1a0e: am 9019ebc5: Merge "Turn on Bluetooth automatically for outgoing calls." into lmp-dev

* commit 'cc94e5b4151c75d5fd414213e25b9fd0fde05587':
Turn on Bluetooth automatically for outgoing calls.
87699d1821520cf134212d1b41b2565f602b8936 26-Sep-2014 Santos Cordon <santoscordon@google.com> am 86a298bb: am 627da1f3: am 35c64608: am 33fff490: Adding clcc request support for Bluetooth Phone Service.

* commit '86a298bb4b9d0af1a00e04296bbf42f87c6e58f0':
Adding clcc request support for Bluetooth Phone Service.
05a9e40ba1edc7b4597163f73503e2e92b746208 26-Sep-2014 Nancy Chen <nancychen@google.com> Ensure bluetooth does not get hangup sound when calling through gvoice

Because Google Voice works by canceling an outgoing call and starting up
its own outgoing call, telecom registers the first call as a
disconnecting call and sends a signal to the bluetooth device that the
call was disconnected. This causes a hangup sound from the bluetooth
device. This fix works by having bluetooth ignore a call until it gets
into the dialing state, which only happens after the google voice call
has connected.

Bug: 17662993
Change-Id: I52c504f615534c59ede8c0de520f755484922730
rc/com/android/server/telecom/BluetoothPhoneService.java
rc/com/android/server/telecom/CallsManager.java
cc94e5b4151c75d5fd414213e25b9fd0fde05587 26-Sep-2014 Santos Cordon <santoscordon@google.com> am 3db63635: am cd1b1a0e: am 9019ebc5: Merge "Turn on Bluetooth automatically for outgoing calls." into lmp-dev

* commit '3db6363564616ecabeb6c482381bde574d3513fa':
Turn on Bluetooth automatically for outgoing calls.
3db6363564616ecabeb6c482381bde574d3513fa 26-Sep-2014 Santos Cordon <santoscordon@google.com> am cd1b1a0e: am 9019ebc5: Merge "Turn on Bluetooth automatically for outgoing calls." into lmp-dev

* commit 'cd1b1a0e2a23c362b74c2785f7987ffd344c0625':
Turn on Bluetooth automatically for outgoing calls.
cd1b1a0e2a23c362b74c2785f7987ffd344c0625 26-Sep-2014 Santos Cordon <santoscordon@google.com> am 9019ebc5: Merge "Turn on Bluetooth automatically for outgoing calls." into lmp-dev

* commit '9019ebc5cf2477c0a413f1bf2d6c089a0a108f03':
Turn on Bluetooth automatically for outgoing calls.
9019ebc5cf2477c0a413f1bf2d6c089a0a108f03 26-Sep-2014 Santos Cordon <santoscordon@google.com> Merge "Turn on Bluetooth automatically for outgoing calls." into lmp-dev
5753f309976589302e1e319b44d0bf2777bbb2a0 26-Sep-2014 Santos Cordon <santoscordon@google.com> Turn on Bluetooth automatically for outgoing calls.

For outgoing calls, we introduced a state before DIALING called
CONNECTING. This indicated that we were attempting to place the call
but that there wasn't an indication that it was dialing quite yet.

The CallAudioManager code which sets the initial state for new calls
was still looking for DIALING as the initial state before opting
to turn on blueooth on behalf of the user. Add CONNECTING as a state
which does that, too.

Bug:17661926
Change-Id: I7c27d0a462b7933cbf0276332b1d9f63d100f345
rc/com/android/server/telecom/CallAudioManager.java
86a298bb4b9d0af1a00e04296bbf42f87c6e58f0 26-Sep-2014 Santos Cordon <santoscordon@google.com> am 627da1f3: am 35c64608: am 33fff490: Adding clcc request support for Bluetooth Phone Service.

* commit '627da1f3f90a5df65754bb06abe3a3abaaa77849':
Adding clcc request support for Bluetooth Phone Service.
627da1f3f90a5df65754bb06abe3a3abaaa77849 26-Sep-2014 Santos Cordon <santoscordon@google.com> am 35c64608: am 33fff490: Adding clcc request support for Bluetooth Phone Service.

* commit '35c64608529930ed2d0a63854b305cfe594f37fc':
Adding clcc request support for Bluetooth Phone Service.
35c64608529930ed2d0a63854b305cfe594f37fc 26-Sep-2014 Santos Cordon <santoscordon@google.com> am 33fff490: Adding clcc request support for Bluetooth Phone Service.

* commit '33fff4905fb4e977cb982fbc89d5d0c52a92b55c':
Adding clcc request support for Bluetooth Phone Service.
33fff4905fb4e977cb982fbc89d5d0c52a92b55c 25-Sep-2014 Santos Cordon <santoscordon@google.com> Adding clcc request support for Bluetooth Phone Service.

This change gives additional information about calls to the bluetooth
headset so that BT devices that can show more info (e.g., cars) will
show it. This change puts BluetoothPhoneService at par with K release.

Bug:17475562
Change-Id: I0dd4e4e978687b25692d1dbe060db45a825184c0
rc/com/android/server/telecom/BluetoothPhoneService.java
5b28132e9e05b33ed08421f9c0fe85523da1f064 26-Sep-2014 Ihab Awad <ihab@google.com> Attempt to unhold remaining holding call on disconnect (1/2)

Bug: 17480900
Change-Id: I9d16419a969f833aa830de7f9ab5df8772a935c4
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
0b196b9d75f587f4c7850b69bac1d0ae9e0abf79 26-Sep-2014 Santos Cordon <santoscordon@google.com> am b681eb7f: am daff696f: am 45e97b72: am 934e5509: am fddf12ed: Register BluetoothPhoneService.

* commit 'b681eb7f7716a8cee7776d3ae8706e65bccb3bc1':
Register BluetoothPhoneService.
12dc90007156e9f83b47f587fe4a484801b7fd83 26-Sep-2014 Yorke Lee <yorkelee@google.com> am 3f4cfaec: am fb9ec920: am c2a9f2ca: am 6001ba3d: am e6f575c8: Fix IllegalStateException when sending broadcast to CallReceiver

* commit '3f4cfaecd9cb4298a52c6e84a81379203c2284f8':
Fix IllegalStateException when sending broadcast to CallReceiver
562ca962cd4f132784d1630a9df70d69ddf30967 26-Sep-2014 Santos Cordon <santoscordon@google.com> am b8fe8a0b: am 6aa756bf: am f380a709: am f8456efc: am 68d1a6b0: Move BluetoothPhoneService to telecom.

* commit 'b8fe8a0bf7f4754bd02d5966690af827e9fcda49':
Move BluetoothPhoneService to telecom.
b681eb7f7716a8cee7776d3ae8706e65bccb3bc1 26-Sep-2014 Santos Cordon <santoscordon@google.com> am daff696f: am 45e97b72: am 934e5509: am fddf12ed: Register BluetoothPhoneService.

* commit 'daff696fdf36a97f9b8800cee60060d58f8ce4c1':
Register BluetoothPhoneService.
3f4cfaecd9cb4298a52c6e84a81379203c2284f8 26-Sep-2014 Yorke Lee <yorkelee@google.com> am fb9ec920: am c2a9f2ca: am 6001ba3d: am e6f575c8: Fix IllegalStateException when sending broadcast to CallReceiver

* commit 'fb9ec92059bc2c47491a83e784dcf800a1cf2802':
Fix IllegalStateException when sending broadcast to CallReceiver
b8fe8a0bf7f4754bd02d5966690af827e9fcda49 26-Sep-2014 Santos Cordon <santoscordon@google.com> am 6aa756bf: am f380a709: am f8456efc: am 68d1a6b0: Move BluetoothPhoneService to telecom.

* commit '6aa756bfe3276d52eeadb4f5dfce7c868c23b72e':
Move BluetoothPhoneService to telecom.
e8f950567b9e4b2c115f821f3e82705143531bec 26-Sep-2014 Santos Cordon <santoscordon@google.com> am fddf12ed: Register BluetoothPhoneService.

* commit 'fddf12ed41b47446cd34c730e3d391989a99c32d':
Register BluetoothPhoneService.
daff696fdf36a97f9b8800cee60060d58f8ce4c1 26-Sep-2014 Santos Cordon <santoscordon@google.com> am 45e97b72: am 934e5509: am fddf12ed: Register BluetoothPhoneService.

* commit '45e97b72665b4fe8579169ac1f9e68e795dd1ec8':
Register BluetoothPhoneService.
45e97b72665b4fe8579169ac1f9e68e795dd1ec8 26-Sep-2014 Santos Cordon <santoscordon@google.com> am 934e5509: am fddf12ed: Register BluetoothPhoneService.

* commit '934e550978ba056536dfc0250866a9e1ac93dbd0':
Register BluetoothPhoneService.
934e550978ba056536dfc0250866a9e1ac93dbd0 26-Sep-2014 Santos Cordon <santoscordon@google.com> am fddf12ed: Register BluetoothPhoneService.

* commit 'fddf12ed41b47446cd34c730e3d391989a99c32d':
Register BluetoothPhoneService.
fddf12ed41b47446cd34c730e3d391989a99c32d 26-Sep-2014 Santos Cordon <santoscordon@google.com> Register BluetoothPhoneService.

Bug:17475562
Change-Id: I4f7eb205fade9e39180dedae2cd8d0bf25444579
ndroidManifest.xml
fb9ec92059bc2c47491a83e784dcf800a1cf2802 26-Sep-2014 Yorke Lee <yorkelee@google.com> am c2a9f2ca: am 6001ba3d: am e6f575c8: Fix IllegalStateException when sending broadcast to CallReceiver

* commit 'c2a9f2ca53c28451a7ca13410319bd5616b3c63b':
Fix IllegalStateException when sending broadcast to CallReceiver
c2a9f2ca53c28451a7ca13410319bd5616b3c63b 25-Sep-2014 Yorke Lee <yorkelee@google.com> am 6001ba3d: am e6f575c8: Fix IllegalStateException when sending broadcast to CallReceiver

* commit '6001ba3dd81e798da95002407d348b0ee441235c':
Fix IllegalStateException when sending broadcast to CallReceiver
396db60297b2d88eb666e1408f6e69e06873c851 25-Sep-2014 Yorke Lee <yorkelee@google.com> am e6f575c8: Fix IllegalStateException when sending broadcast to CallReceiver

* commit 'e6f575c88ed863a89bf4bb91e017b4340e0ddb38':
Fix IllegalStateException when sending broadcast to CallReceiver
6001ba3dd81e798da95002407d348b0ee441235c 25-Sep-2014 Yorke Lee <yorkelee@google.com> am e6f575c8: Fix IllegalStateException when sending broadcast to CallReceiver

* commit 'e6f575c88ed863a89bf4bb91e017b4340e0ddb38':
Fix IllegalStateException when sending broadcast to CallReceiver
e6f575c88ed863a89bf4bb91e017b4340e0ddb38 25-Sep-2014 Yorke Lee <yorkelee@google.com> Fix IllegalStateException when sending broadcast to CallReceiver

Bug: 17656099
Change-Id: I12ebd394ec31a9be3d1127cf8f45332ebfa40d0a
rc/com/android/server/telecom/CallActivity.java
6aa756bfe3276d52eeadb4f5dfce7c868c23b72e 25-Sep-2014 Santos Cordon <santoscordon@google.com> am f380a709: am f8456efc: am 68d1a6b0: Move BluetoothPhoneService to telecom.

* commit 'f380a70941af53fb16aa4ef9342de364501841de':
Move BluetoothPhoneService to telecom.
f380a70941af53fb16aa4ef9342de364501841de 25-Sep-2014 Santos Cordon <santoscordon@google.com> am f8456efc: am 68d1a6b0: Move BluetoothPhoneService to telecom.

* commit 'f8456efc98215673316e308c9a4b5e2f46035c4d':
Move BluetoothPhoneService to telecom.
4612a0dd8aada99789a7391a9954c43096965078 25-Sep-2014 Santos Cordon <santoscordon@google.com> am 68d1a6b0: Move BluetoothPhoneService to telecom.

* commit '68d1a6b0bd8840b74c61a94928610312c09b0486':
Move BluetoothPhoneService to telecom.
f8456efc98215673316e308c9a4b5e2f46035c4d 25-Sep-2014 Santos Cordon <santoscordon@google.com> am 68d1a6b0: Move BluetoothPhoneService to telecom.

* commit '68d1a6b0bd8840b74c61a94928610312c09b0486':
Move BluetoothPhoneService to telecom.
68d1a6b0bd8840b74c61a94928610312c09b0486 19-Sep-2014 Santos Cordon <santoscordon@google.com> Move BluetoothPhoneService to telecom.

BluetoothPhoneService needs to be in telecom to be aware of all types of
calls. While in telephony, there's no way for it to know about
third-party sourced calls.

Additionally, conference calls for CDMA are no longer functional in the
telephony layer and needs to move to telecom to support BT commands on
CDMA calls.

Bug: 17475562
Change-Id: I443431291a3b0120d92b52dba2acca17a4c0c983
ndroidManifest.xml
rc/com/android/server/telecom/BluetoothPhoneService.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/TelecomApp.java
62c2ec768509dcb9a837aa8f40696918470cbbf2 25-Sep-2014 Andrew Lee <anwlee@google.com> am 10ba6b9b: am 8e744052: am 46155426: am c5ad5707: am ad3355a3: Merge "Refuse outgoing call if max outgoing exceeded." into lmp-dev

* commit '10ba6b9b8f24e201ef8448037cf8f0c8ae2d3b4b':
Refuse outgoing call if max outgoing exceeded.
99bab5051bf2ec69793ab3bafcafd6c1648ca074 25-Sep-2014 Sailesh Nepal <sail@google.com> am 09c94c1d: am 639846c8: am 865c3c0b: am d1de6182: am c673b996: Merge "Don\'t create conferences with invalid calls" into lmp-dev

* commit '09c94c1d2a2e979edeb531b2c3dddeb0cc747eeb':
Don't create conferences with invalid calls
10ba6b9b8f24e201ef8448037cf8f0c8ae2d3b4b 25-Sep-2014 Andrew Lee <anwlee@google.com> am 8e744052: am 46155426: am c5ad5707: am ad3355a3: Merge "Refuse outgoing call if max outgoing exceeded." into lmp-dev

* commit '8e744052f11fc75a10eddca8d38de60a61725d46':
Refuse outgoing call if max outgoing exceeded.
09c94c1d2a2e979edeb531b2c3dddeb0cc747eeb 25-Sep-2014 Sailesh Nepal <sail@google.com> am 639846c8: am 865c3c0b: am d1de6182: am c673b996: Merge "Don\'t create conferences with invalid calls" into lmp-dev

* commit '639846c8157c13a1dfa1f15fcdc76bb312df781f':
Don't create conferences with invalid calls
8e744052f11fc75a10eddca8d38de60a61725d46 25-Sep-2014 Andrew Lee <anwlee@google.com> am 46155426: am c5ad5707: am ad3355a3: Merge "Refuse outgoing call if max outgoing exceeded." into lmp-dev

* commit '461554264e862e51530de195bfa2403a6d0c5fa8':
Refuse outgoing call if max outgoing exceeded.
639846c8157c13a1dfa1f15fcdc76bb312df781f 25-Sep-2014 Sailesh Nepal <sail@google.com> am 865c3c0b: am d1de6182: am c673b996: Merge "Don\'t create conferences with invalid calls" into lmp-dev

* commit '865c3c0b0b30a40cbdf2457aab7872ea5a0e1e38':
Don't create conferences with invalid calls
461554264e862e51530de195bfa2403a6d0c5fa8 25-Sep-2014 Andrew Lee <anwlee@google.com> am c5ad5707: am ad3355a3: Merge "Refuse outgoing call if max outgoing exceeded." into lmp-dev

* commit 'c5ad570708c4dc4e71696f07fc69590a197a2b45':
Refuse outgoing call if max outgoing exceeded.
865c3c0b0b30a40cbdf2457aab7872ea5a0e1e38 25-Sep-2014 Sailesh Nepal <sail@google.com> am d1de6182: am c673b996: Merge "Don\'t create conferences with invalid calls" into lmp-dev

* commit 'd1de618215ea540bfd6e7870ce3b3c2a3bc6de31':
Don't create conferences with invalid calls
411c4f3786e6f433ed4882429fb1356244825fae 24-Sep-2014 Andrew Lee <anwlee@google.com> am ad3355a3: Merge "Refuse outgoing call if max outgoing exceeded." into lmp-dev

* commit 'ad3355a3eac640e14a2da77a11bf2fcc96286984':
Refuse outgoing call if max outgoing exceeded.
c5ad570708c4dc4e71696f07fc69590a197a2b45 24-Sep-2014 Andrew Lee <anwlee@google.com> am ad3355a3: Merge "Refuse outgoing call if max outgoing exceeded." into lmp-dev

* commit 'ad3355a3eac640e14a2da77a11bf2fcc96286984':
Refuse outgoing call if max outgoing exceeded.
ad3355a3eac640e14a2da77a11bf2fcc96286984 24-Sep-2014 Andrew Lee <anwlee@google.com> Merge "Refuse outgoing call if max outgoing exceeded." into lmp-dev
d1de618215ea540bfd6e7870ce3b3c2a3bc6de31 24-Sep-2014 Sailesh Nepal <sail@google.com> am c673b996: Merge "Don\'t create conferences with invalid calls" into lmp-dev

* commit 'c673b996c7be0956ab5ebfb6b786d1f80b0403ac':
Don't create conferences with invalid calls
84f5cf2a9aaa445958a85a46320d30db6d61c0fe 24-Sep-2014 Sailesh Nepal <sail@google.com> am c673b996: Merge "Don\'t create conferences with invalid calls" into lmp-dev

* commit 'c673b996c7be0956ab5ebfb6b786d1f80b0403ac':
Don't create conferences with invalid calls
c673b996c7be0956ab5ebfb6b786d1f80b0403ac 24-Sep-2014 Sailesh Nepal <sail@google.com> Merge "Don't create conferences with invalid calls" into lmp-dev
0de17696d7e05d2edd257411a13aeb5b703967ca 24-Sep-2014 Nancy Chen <nancychen@google.com> am cd459860: am 27fa7432: am cc4a5481: am 38d4ab07: am 15608a8f: Merge "Register TelecomBroadcastReceiver through AndroidManifest" into lmp-dev

* commit 'cd4598606a6be77a75063feb0d97ccc0b306e296':
Register TelecomBroadcastReceiver through AndroidManifest
e66ee5aa612aae2267efa0875c913fd9d25a51fc 24-Sep-2014 Yorke Lee <yorkelee@google.com> am 6a7c2cda: am c9112f83: am 75ed3ff3: am 9002d0f9: am 6dc1c75f: Split CallActivity into trampoline activity and CallReceiver

* commit '6a7c2cda90480fd502d296224fd289a349bdbe09':
Split CallActivity into trampoline activity and CallReceiver
3509299d9a88e8f7af2b3ef3c3247c1fdf809e91 24-Sep-2014 Nancy Chen <nancychen@google.com> am 15608a8f: Merge "Register TelecomBroadcastReceiver through AndroidManifest" into lmp-dev

* commit '15608a8f24bf65f5ecc67e811ea07ffe7118c298':
Register TelecomBroadcastReceiver through AndroidManifest
52b45b05a3242afb2f3b9062ac49108b0a2a1a48 24-Sep-2014 Yorke Lee <yorkelee@google.com> am 6dc1c75f: Split CallActivity into trampoline activity and CallReceiver

* commit '6dc1c75ff9fbabce11540c2bbe3972159899b414':
Split CallActivity into trampoline activity and CallReceiver
cd4598606a6be77a75063feb0d97ccc0b306e296 24-Sep-2014 Nancy Chen <nancychen@google.com> am 27fa7432: am cc4a5481: am 38d4ab07: am 15608a8f: Merge "Register TelecomBroadcastReceiver through AndroidManifest" into lmp-dev

* commit '27fa743292db388e030375772d2f9f3bf375b01d':
Register TelecomBroadcastReceiver through AndroidManifest
6a7c2cda90480fd502d296224fd289a349bdbe09 24-Sep-2014 Yorke Lee <yorkelee@google.com> am c9112f83: am 75ed3ff3: am 9002d0f9: am 6dc1c75f: Split CallActivity into trampoline activity and CallReceiver

* commit 'c9112f83c0dd9a2c87102bcd466d1ea80f60c781':
Split CallActivity into trampoline activity and CallReceiver
27fa743292db388e030375772d2f9f3bf375b01d 24-Sep-2014 Nancy Chen <nancychen@google.com> am cc4a5481: am 38d4ab07: am 15608a8f: Merge "Register TelecomBroadcastReceiver through AndroidManifest" into lmp-dev

* commit 'cc4a5481780720bd5a3a66007ea0878e85cdfe94':
Register TelecomBroadcastReceiver through AndroidManifest
c9112f83c0dd9a2c87102bcd466d1ea80f60c781 24-Sep-2014 Yorke Lee <yorkelee@google.com> am 75ed3ff3: am 9002d0f9: am 6dc1c75f: Split CallActivity into trampoline activity and CallReceiver

* commit '75ed3ff3fd6741e57f56124db5c7c6b1c7d4e65e':
Split CallActivity into trampoline activity and CallReceiver
e659518bac4b3551446e813751abc8d1c70b2d5b 24-Sep-2014 Andrew Lee <anwlee@google.com> Refuse outgoing call if max outgoing exceeded.

This bug was happening because multiple calls in the CONNECTING state
were being added. Now, if there's an attempt to place multiple calls,
ignore when the maximum number of outgoing calls is exceeded.

Exception: if the outgoing call is an emergency call, cancel the
current outgoing call if the current outgoing call is not an
emergency call itself.

Bug: 17610917
Change-Id: I0ae041fa3a09a2fb9508f2342894e77b87001b43
rc/com/android/server/telecom/CallsManager.java
cc4a5481780720bd5a3a66007ea0878e85cdfe94 24-Sep-2014 Nancy Chen <nancychen@google.com> am 38d4ab07: am 15608a8f: Merge "Register TelecomBroadcastReceiver through AndroidManifest" into lmp-dev

* commit '38d4ab075f4fc1612d494d08bd66fb24b9c24e69':
Register TelecomBroadcastReceiver through AndroidManifest
75ed3ff3fd6741e57f56124db5c7c6b1c7d4e65e 24-Sep-2014 Yorke Lee <yorkelee@google.com> am 9002d0f9: am 6dc1c75f: Split CallActivity into trampoline activity and CallReceiver

* commit '9002d0f94025ed6ca805eb9ca126bc94617f467f':
Split CallActivity into trampoline activity and CallReceiver
38d4ab075f4fc1612d494d08bd66fb24b9c24e69 24-Sep-2014 Nancy Chen <nancychen@google.com> am 15608a8f: Merge "Register TelecomBroadcastReceiver through AndroidManifest" into lmp-dev

* commit '15608a8f24bf65f5ecc67e811ea07ffe7118c298':
Register TelecomBroadcastReceiver through AndroidManifest
9002d0f94025ed6ca805eb9ca126bc94617f467f 24-Sep-2014 Yorke Lee <yorkelee@google.com> am 6dc1c75f: Split CallActivity into trampoline activity and CallReceiver

* commit '6dc1c75ff9fbabce11540c2bbe3972159899b414':
Split CallActivity into trampoline activity and CallReceiver
15608a8f24bf65f5ecc67e811ea07ffe7118c298 24-Sep-2014 Nancy Chen <nancychen@google.com> Merge "Register TelecomBroadcastReceiver through AndroidManifest" into lmp-dev
6dc1c75ff9fbabce11540c2bbe3972159899b414 24-Sep-2014 Yorke Lee <yorkelee@google.com> Split CallActivity into trampoline activity and CallReceiver

Move most of CallActivity logic into CallReceiver. Only significant logic
remaining in CallActivity is checking for OUTGOING_CALL_RESTRICTED and
showing a toast.

Also fixes a bug where the secondary user would never be able to make
a call if the primary user had Google Voice installed, because the
ordered broadcast is sent out for the primary user, allowing Google
voice to cancel it.

Bug: 17579886

Change-Id: Id1689f36503a74e5754b10d019a8b64024d27f77
ndroidManifest.xml
rc/com/android/server/telecom/CallActivity.java
rc/com/android/server/telecom/CallReceiver.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/TelecomServiceImpl.java
6f5c08d34fed66b8937bd5051372c1e9466b6095 24-Sep-2014 Nancy Chen <nancychen@google.com> Register TelecomBroadcastReceiver through AndroidManifest

Moving broadcast receiver from AndroidManifest to TelecomApp caused the
MissedCallNotifier to stop working, therefore restoring back to
AndroidManifest.

Bug: 17613424
Change-Id: I24e4c00655f1b8714fc7aed72b7ed27b0a436e83
ndroidManifest.xml
rc/com/android/server/telecom/PhoneAccountBroadcastReceiver.java
rc/com/android/server/telecom/TelecomApp.java
rc/com/android/server/telecom/TelecomBroadcastReceiver.java
0b66e1c8102c09e0d6e0d4bf0d717dccfc65c4d0 24-Sep-2014 Sailesh Nepal <sail@google.com> Don't create conferences with invalid calls

When a remote conference was created
ConnectionServiceWrapper would actually create 2
conferences. One for the remote connection service with no
valid calls one for the real connection service with valid
calls.

When the conference was destroyed the remove call on the
remote connection serivce would trigger a unbind causing
android.telecom.ConnectionService to end call connections
for that service.

Fix was to ensure that we only create conferences with
valid calls.

Bug: 17632595
Change-Id: I3f339120dde8eb07ee7e40a26d3a37f1dbd1409e
rc/com/android/server/telecom/ConnectionServiceWrapper.java
600c92328505aa67034b21a4964bffe8e20b1c74 23-Sep-2014 Evan Charlton <evanc@google.com> am b3c81e9b: am 184c8846: am 3b32754a: am 497f8b67: am 1082d72d: Merge "Fix the broken unit tests" into lmp-dev

* commit 'b3c81e9b399a4acc874e22b212d9219b62aa238d':
Fix the broken unit tests
b3c81e9b399a4acc874e22b212d9219b62aa238d 23-Sep-2014 Evan Charlton <evanc@google.com> am 184c8846: am 3b32754a: am 497f8b67: am 1082d72d: Merge "Fix the broken unit tests" into lmp-dev

* commit '184c88468a0e5e8aab1ee5847f1ffae348a99fc4':
Fix the broken unit tests
184c88468a0e5e8aab1ee5847f1ffae348a99fc4 23-Sep-2014 Evan Charlton <evanc@google.com> am 3b32754a: am 497f8b67: am 1082d72d: Merge "Fix the broken unit tests" into lmp-dev

* commit '3b32754aa3f2a5e699e37a326e0c7f711e8a5b67':
Fix the broken unit tests
23f647bbe71643084bf598a562595b841b450a6f 23-Sep-2014 Evan Charlton <evanc@google.com> am 9c3e4f3d: am 1082d72d: Merge "Fix the broken unit tests" into lmp-dev

* commit '9c3e4f3dc33dfa35a2daa77bf7c56b6e1b6c2c7a':
Fix the broken unit tests
3b32754aa3f2a5e699e37a326e0c7f711e8a5b67 23-Sep-2014 Evan Charlton <evanc@google.com> am 497f8b67: am 1082d72d: Merge "Fix the broken unit tests" into lmp-dev

* commit '497f8b675ca8cf12ba4a5d4394aa1782fe1bafa9':
Fix the broken unit tests
beaa7951237f8d4ec9e3f00555b3076200677b73 23-Sep-2014 Santos Cordon <santoscordon@google.com> am 8bfe51c1: am f3a777e4: am 65909700: am 8a863df0: am 77658c4d: Merge "Forward CallActivity invocations to the primary user." into lmp-dev

* commit '8bfe51c1b2cd13fbe49c3ed39f438a83a8b836b9':
Forward CallActivity invocations to the primary user.
e697a2c7ec16d910867a6dbcfbd5fe3e2110816c 23-Sep-2014 Andrew Lee <anwlee@google.com> am c68055d7: am 60a65394: am d255519d: am 5b9ffa9f: am add3c272: Merge "Don\'t enable "add call" if CDMA and in conference." into lmp-dev

* commit 'c68055d7f4e60ac875c8402d064afe3ffd657549':
Don't enable "add call" if CDMA and in conference.
13976d13a69289bdd91b08e40d66aa7465dfee43 23-Sep-2014 Yorke Lee <yorkelee@google.com> am fe4a690f: am b361c562: am a319d313: am 252e8f7b: am c7f6f8cd: Merge "Use handle uri instead null if caller info lookup is not done" into lmp-dev

* commit 'fe4a690f1d41683f16790da14eb410afbc1b8b55':
Use handle uri instead null if caller info lookup is not done
9c3e4f3dc33dfa35a2daa77bf7c56b6e1b6c2c7a 23-Sep-2014 Evan Charlton <evanc@google.com> am 1082d72d: Merge "Fix the broken unit tests" into lmp-dev

* commit '1082d72d18f7dccaeff8a396ed35009539c158d4':
Fix the broken unit tests
497f8b675ca8cf12ba4a5d4394aa1782fe1bafa9 23-Sep-2014 Evan Charlton <evanc@google.com> am 1082d72d: Merge "Fix the broken unit tests" into lmp-dev

* commit '1082d72d18f7dccaeff8a396ed35009539c158d4':
Fix the broken unit tests
1082d72d18f7dccaeff8a396ed35009539c158d4 23-Sep-2014 Evan Charlton <evanc@google.com> Merge "Fix the broken unit tests" into lmp-dev
6de1445a3ef308bfbffaf43cc69d1dcf8e2a22ea 23-Sep-2014 Evan Charlton <evanc@google.com> Fix the broken unit tests

PhoneAccountRegistrarTest is broken, and also non-functional. Get them
updated by fixing proguard (don't strip @VisibleForTesting things),
fixing the setup (need a real ConnectionService), and fixing the tests
themselves to test what PhoneAccountRegistrar does now.

Bug: 17620636
Change-Id: Ibd4d5a4104ff2158b0e7c01a41910f866b94196a
roguard.flags
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/tests/MockConnectionService.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
402b960ab49bf716cf00155b9f29b1aa0a9b93a0 23-Sep-2014 Nancy Chen <nancychen@google.com> am 1894c650: am 1e08de26: am d3d690e9: am bf81b24a: am 150d8684: Merge "Skip "PRE_DIAL_WAIT" when no accounts are available to chose from." into lmp-dev

* commit '1894c650f0bc7aa9f5a1355be32dd9fc6ebf61f3':
Skip "PRE_DIAL_WAIT" when no accounts are available to chose from.
1aa12b8164c87fb6a290eb9bbf0fdc8bf61feb1d 23-Sep-2014 Baligh Uddin <baligh@google.com> am 06fc4e5d: (-s ours) am 35c5ce3a: (-s ours) am b5617e58: (-s ours) am f2c90a9c: (-s ours) am eb09f6c7: (-s ours) Import translations. DO NOT MERGE

* commit '06fc4e5dbe12fd9c341a1bc695085ee9673a1213':
Import translations. DO NOT MERGE
47052f089bbcc0c8d9003b987a0c610342c98c11 23-Sep-2014 Baligh Uddin <baligh@google.com> am 5618c95e: (-s ours) am c38823fe: (-s ours) am 2a055b05: (-s ours) am 0511d269: (-s ours) Import translations. DO NOT MERGE

* commit '5618c95ef36d14f685641817d55742da16cf3e6a':
Import translations. DO NOT MERGE
8bfe51c1b2cd13fbe49c3ed39f438a83a8b836b9 23-Sep-2014 Santos Cordon <santoscordon@google.com> am f3a777e4: am 65909700: am 8a863df0: am 77658c4d: Merge "Forward CallActivity invocations to the primary user." into lmp-dev

* commit 'f3a777e4f2838453c7c13b143d8e3b42cbfdd354':
Forward CallActivity invocations to the primary user.
c68055d7f4e60ac875c8402d064afe3ffd657549 23-Sep-2014 Andrew Lee <anwlee@google.com> am 60a65394: am d255519d: am 5b9ffa9f: am add3c272: Merge "Don\'t enable "add call" if CDMA and in conference." into lmp-dev

* commit '60a65394ef074b24b4946670e69c7eb5531f25e2':
Don't enable "add call" if CDMA and in conference.
fe4a690f1d41683f16790da14eb410afbc1b8b55 23-Sep-2014 Yorke Lee <yorkelee@google.com> am b361c562: am a319d313: am 252e8f7b: am c7f6f8cd: Merge "Use handle uri instead null if caller info lookup is not done" into lmp-dev

* commit 'b361c562d4e18438f4353cc7fef2b6053bffa630':
Use handle uri instead null if caller info lookup is not done
38442297ecb60902293558adbbef39c75e9cf6b5 23-Sep-2014 Santos Cordon <santoscordon@google.com> am d2ab50b2: am 77658c4d: Merge "Forward CallActivity invocations to the primary user." into lmp-dev

* commit 'd2ab50b2aff51ea1c300fa681c413d66480b9f95':
Forward CallActivity invocations to the primary user.
b802b6a99b065cefb93154a26d423afa731e0a02 23-Sep-2014 Andrew Lee <anwlee@google.com> am da278ad5: am add3c272: Merge "Don\'t enable "add call" if CDMA and in conference." into lmp-dev

* commit 'da278ad55642957dcff1e84a75cceff2e66d9538':
Don't enable "add call" if CDMA and in conference.
4853fc713e854abf369d82a7fbef593cce253c5e 23-Sep-2014 Yorke Lee <yorkelee@google.com> am ee880e6f: am c7f6f8cd: Merge "Use handle uri instead null if caller info lookup is not done" into lmp-dev

* commit 'ee880e6f1414044b5a5b7b5095d7196163e37a3a':
Use handle uri instead null if caller info lookup is not done
f3a777e4f2838453c7c13b143d8e3b42cbfdd354 23-Sep-2014 Santos Cordon <santoscordon@google.com> am 65909700: am 8a863df0: am 77658c4d: Merge "Forward CallActivity invocations to the primary user." into lmp-dev

* commit '65909700636c897bf32bee3649ff9f758aa29ed8':
Forward CallActivity invocations to the primary user.
65909700636c897bf32bee3649ff9f758aa29ed8 23-Sep-2014 Santos Cordon <santoscordon@google.com> am 8a863df0: am 77658c4d: Merge "Forward CallActivity invocations to the primary user." into lmp-dev

* commit '8a863df042c96f4d9ab3103f94f1cb66b226faaa':
Forward CallActivity invocations to the primary user.
d2ab50b2aff51ea1c300fa681c413d66480b9f95 23-Sep-2014 Santos Cordon <santoscordon@google.com> am 77658c4d: Merge "Forward CallActivity invocations to the primary user." into lmp-dev

* commit '77658c4d1c79f16898979c2ace2727045867279d':
Forward CallActivity invocations to the primary user.
8a863df042c96f4d9ab3103f94f1cb66b226faaa 23-Sep-2014 Santos Cordon <santoscordon@google.com> am 77658c4d: Merge "Forward CallActivity invocations to the primary user." into lmp-dev

* commit '77658c4d1c79f16898979c2ace2727045867279d':
Forward CallActivity invocations to the primary user.
77658c4d1c79f16898979c2ace2727045867279d 23-Sep-2014 Santos Cordon <santoscordon@google.com> Merge "Forward CallActivity invocations to the primary user." into lmp-dev
60a65394ef074b24b4946670e69c7eb5531f25e2 23-Sep-2014 Andrew Lee <anwlee@google.com> am d255519d: am 5b9ffa9f: am add3c272: Merge "Don\'t enable "add call" if CDMA and in conference." into lmp-dev

* commit 'd255519d4704b8e02ac54f94ffe72c83c70cb99c':
Don't enable "add call" if CDMA and in conference.
d255519d4704b8e02ac54f94ffe72c83c70cb99c 23-Sep-2014 Andrew Lee <anwlee@google.com> am 5b9ffa9f: am add3c272: Merge "Don\'t enable "add call" if CDMA and in conference." into lmp-dev

* commit '5b9ffa9f1f5a2b7a870568fb336e66e3047e7099':
Don't enable "add call" if CDMA and in conference.
5b9ffa9f1f5a2b7a870568fb336e66e3047e7099 23-Sep-2014 Andrew Lee <anwlee@google.com> am add3c272: Merge "Don\'t enable "add call" if CDMA and in conference." into lmp-dev

* commit 'add3c272faf44a46e94b25eca78d831c49bec375':
Don't enable "add call" if CDMA and in conference.
da278ad55642957dcff1e84a75cceff2e66d9538 23-Sep-2014 Andrew Lee <anwlee@google.com> am add3c272: Merge "Don\'t enable "add call" if CDMA and in conference." into lmp-dev

* commit 'add3c272faf44a46e94b25eca78d831c49bec375':
Don't enable "add call" if CDMA and in conference.
add3c272faf44a46e94b25eca78d831c49bec375 23-Sep-2014 Andrew Lee <anwlee@google.com> Merge "Don't enable "add call" if CDMA and in conference." into lmp-dev
b361c562d4e18438f4353cc7fef2b6053bffa630 23-Sep-2014 Yorke Lee <yorkelee@google.com> am a319d313: am 252e8f7b: am c7f6f8cd: Merge "Use handle uri instead null if caller info lookup is not done" into lmp-dev

* commit 'a319d313b4982ba386d7f28c4897da0ec9dbe8f6':
Use handle uri instead null if caller info lookup is not done
a319d313b4982ba386d7f28c4897da0ec9dbe8f6 23-Sep-2014 Yorke Lee <yorkelee@google.com> am 252e8f7b: am c7f6f8cd: Merge "Use handle uri instead null if caller info lookup is not done" into lmp-dev

* commit '252e8f7b59f77c92accc4539db66fd17fb4f7608':
Use handle uri instead null if caller info lookup is not done
ee880e6f1414044b5a5b7b5095d7196163e37a3a 23-Sep-2014 Yorke Lee <yorkelee@google.com> am c7f6f8cd: Merge "Use handle uri instead null if caller info lookup is not done" into lmp-dev

* commit 'c7f6f8cdf1c27d89b1a8723b8bbb047acd853fca':
Use handle uri instead null if caller info lookup is not done
252e8f7b59f77c92accc4539db66fd17fb4f7608 23-Sep-2014 Yorke Lee <yorkelee@google.com> am c7f6f8cd: Merge "Use handle uri instead null if caller info lookup is not done" into lmp-dev

* commit 'c7f6f8cdf1c27d89b1a8723b8bbb047acd853fca':
Use handle uri instead null if caller info lookup is not done
c7f6f8cdf1c27d89b1a8723b8bbb047acd853fca 23-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Use handle uri instead null if caller info lookup is not done" into lmp-dev
a7fa743f76242e9f039eea2fea0911f59255522e 22-Sep-2014 Yorke Lee <yorkelee@google.com> Use handle uri instead null if caller info lookup is not done

Bug: 17598245
Change-Id: Ib5acc62d212c85d4364b8ff98e469ca4780ebe36
rc/com/android/server/telecom/Call.java
1894c650f0bc7aa9f5a1355be32dd9fc6ebf61f3 22-Sep-2014 Nancy Chen <nancychen@google.com> am 1e08de26: am d3d690e9: am bf81b24a: am 150d8684: Merge "Skip "PRE_DIAL_WAIT" when no accounts are available to chose from." into lmp-dev

* commit '1e08de26754579d46f9402748cf34557d24774e9':
Skip "PRE_DIAL_WAIT" when no accounts are available to chose from.
06fc4e5dbe12fd9c341a1bc695085ee9673a1213 22-Sep-2014 Baligh Uddin <baligh@google.com> am 35c5ce3a: (-s ours) am b5617e58: (-s ours) am f2c90a9c: (-s ours) am eb09f6c7: (-s ours) Import translations. DO NOT MERGE

* commit '35c5ce3a56452163c2c267f76e3bb58bdc9604e1':
Import translations. DO NOT MERGE
5618c95ef36d14f685641817d55742da16cf3e6a 22-Sep-2014 Baligh Uddin <baligh@google.com> am c38823fe: (-s ours) am 2a055b05: (-s ours) am 0511d269: (-s ours) Import translations. DO NOT MERGE

* commit 'c38823fe31d48623f4cda24bacb3a0f907ffca01':
Import translations. DO NOT MERGE
1e08de26754579d46f9402748cf34557d24774e9 22-Sep-2014 Nancy Chen <nancychen@google.com> am d3d690e9: am bf81b24a: am 150d8684: Merge "Skip "PRE_DIAL_WAIT" when no accounts are available to chose from." into lmp-dev

* commit 'd3d690e9d9e6f5e81dc179dec195472599ccd900':
Skip "PRE_DIAL_WAIT" when no accounts are available to chose from.
35c5ce3a56452163c2c267f76e3bb58bdc9604e1 22-Sep-2014 Baligh Uddin <baligh@google.com> am b5617e58: (-s ours) am f2c90a9c: (-s ours) am eb09f6c7: (-s ours) Import translations. DO NOT MERGE

* commit 'b5617e58c5ba56f21d2481fc2da450e9a646e36b':
Import translations. DO NOT MERGE
c38823fe31d48623f4cda24bacb3a0f907ffca01 22-Sep-2014 Baligh Uddin <baligh@google.com> am 2a055b05: (-s ours) am 0511d269: (-s ours) Import translations. DO NOT MERGE

* commit '2a055b0552ea1eb8893a40c50fe60fc36c29dc87':
Import translations. DO NOT MERGE
d3d690e9d9e6f5e81dc179dec195472599ccd900 22-Sep-2014 Nancy Chen <nancychen@google.com> am bf81b24a: am 150d8684: Merge "Skip "PRE_DIAL_WAIT" when no accounts are available to chose from." into lmp-dev

* commit 'bf81b24afcbba6d54129494892c4852dda9fbc4d':
Skip "PRE_DIAL_WAIT" when no accounts are available to chose from.
b5617e58c5ba56f21d2481fc2da450e9a646e36b 22-Sep-2014 Baligh Uddin <baligh@google.com> am f2c90a9c: (-s ours) am eb09f6c7: (-s ours) Import translations. DO NOT MERGE

* commit 'f2c90a9c4f8320a8953a5b8aff9dd602d06b8809':
Import translations. DO NOT MERGE
2a055b0552ea1eb8893a40c50fe60fc36c29dc87 22-Sep-2014 Baligh Uddin <baligh@google.com> am 0511d269: (-s ours) Import translations. DO NOT MERGE

* commit '0511d2697fc66565a01d56d17d8d1d3860970eb9':
Import translations. DO NOT MERGE
5070b0da14bd2da6f68a1ba011f9125fb9d193c5 20-Sep-2014 Santos Cordon <santoscordon@google.com> Forward CallActivity invocations to the primary user.

Telecom framework runs as the primary user only.

When CALL intents are sent via startActivity, they invoke
telecom.CallActivity on the current user (activities don't allow
specifying them as singleUser="true"). This code checks to see if
CallActivity was invoked from as the secondary user and if so
forwards the intent to the primary user's version of CallActivity.
CallActivity then simply calls directly into the rest of telecom.

NOTE: Telecom already does the right thing when binding to the
In-Call UI so that the UI always shows up under the current user.

Bug: 17253031
Change-Id: Iea7ecf4aa48ed80710a1ed35603cbf4588581afc
rc/com/android/server/telecom/CallActivity.java
rc/com/android/server/telecom/TelecomServiceImpl.java
6ce36f368e6389d6230fb753129ec69b033bb4d3 22-Sep-2014 Nancy Chen <nancychen@google.com> am 126a677b: am 150d8684: Merge "Skip "PRE_DIAL_WAIT" when no accounts are available to chose from." into lmp-dev

* commit '126a677b0eaa54c63d8b13442dd238147e094a68':
Skip "PRE_DIAL_WAIT" when no accounts are available to chose from.
bf81b24afcbba6d54129494892c4852dda9fbc4d 22-Sep-2014 Nancy Chen <nancychen@google.com> am 150d8684: Merge "Skip "PRE_DIAL_WAIT" when no accounts are available to chose from." into lmp-dev

* commit '150d8684a9782da6a2d55a997676d619ab2caa4d':
Skip "PRE_DIAL_WAIT" when no accounts are available to chose from.
126a677b0eaa54c63d8b13442dd238147e094a68 22-Sep-2014 Nancy Chen <nancychen@google.com> am 150d8684: Merge "Skip "PRE_DIAL_WAIT" when no accounts are available to chose from." into lmp-dev

* commit '150d8684a9782da6a2d55a997676d619ab2caa4d':
Skip "PRE_DIAL_WAIT" when no accounts are available to chose from.
150d8684a9782da6a2d55a997676d619ab2caa4d 22-Sep-2014 Nancy Chen <nancychen@google.com> Merge "Skip "PRE_DIAL_WAIT" when no accounts are available to chose from." into lmp-dev
2758d3c654af8a1296e886524ca97c2a3be54b04 21-Sep-2014 Baligh Uddin <baligh@google.com> am a9e09bbc: (-s ours) am df9c75f0: (-s ours) am 9671759a: (-s ours) Import translations. DO NOT MERGE

* commit 'a9e09bbc0b6f5abfc68ebbe2d78f981f2ec35a5a':
Import translations. DO NOT MERGE
30ae431bb74ff3dcbc45ea4b9a0038e467d954e3 21-Sep-2014 Baligh Uddin <baligh@google.com> am 76a5e63f: (-s ours) am 42f3efd8: (-s ours) Import translations. DO NOT MERGE

* commit '76a5e63f4a3ba7ea8a4856a41c465d6f9bcd36f5':
Import translations. DO NOT MERGE
a9e09bbc0b6f5abfc68ebbe2d78f981f2ec35a5a 21-Sep-2014 Baligh Uddin <baligh@google.com> am df9c75f0: (-s ours) am 9671759a: (-s ours) Import translations. DO NOT MERGE

* commit 'df9c75f01bbc2ba1404d35e82d67f191d3eeac31':
Import translations. DO NOT MERGE
106f8994383ceebd6e24e7ca5a99a608714de4c9 21-Sep-2014 Baligh Uddin <baligh@google.com> am dbede8e2: (-s ours) am eb09f6c7: (-s ours) Import translations. DO NOT MERGE

* commit 'dbede8e25aa7d28453aa8b841d6eefe18e785761':
Import translations. DO NOT MERGE
df9c75f01bbc2ba1404d35e82d67f191d3eeac31 21-Sep-2014 Baligh Uddin <baligh@google.com> am 9671759a: (-s ours) Import translations. DO NOT MERGE

* commit '9671759ad0dadd5be015b899879a9a5760aaf9c2':
Import translations. DO NOT MERGE
dbede8e25aa7d28453aa8b841d6eefe18e785761 21-Sep-2014 Baligh Uddin <baligh@google.com> am eb09f6c7: (-s ours) Import translations. DO NOT MERGE

* commit 'eb09f6c7d58493ee511ab8b618c044d36068aa8f':
Import translations. DO NOT MERGE
76a5e63f4a3ba7ea8a4856a41c465d6f9bcd36f5 21-Sep-2014 Baligh Uddin <baligh@google.com> am 42f3efd8: (-s ours) Import translations. DO NOT MERGE

* commit '42f3efd8ddda77b79052409f032ed173ef8ffd0b':
Import translations. DO NOT MERGE
f2c90a9c4f8320a8953a5b8aff9dd602d06b8809 21-Sep-2014 Baligh Uddin <baligh@google.com> am eb09f6c7: (-s ours) Import translations. DO NOT MERGE

* commit 'eb09f6c7d58493ee511ab8b618c044d36068aa8f':
Import translations. DO NOT MERGE
330a11e3f5c54a3dd81865b2abcc1ce0738dd91e 20-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ib6cb1faf0a8c8cb430086816a4bb9dc2ba2164e0
Auto-generated-cl: translation import
es/values-pt/strings.xml
0511d2697fc66565a01d56d17d8d1d3860970eb9 20-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: If87eb6e2cd2fb7a28e021d44eb0ceeb851ed4b32
Auto-generated-cl: translation import
es/values-pt/strings.xml
42f3efd8ddda77b79052409f032ed173ef8ffd0b 20-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic5562aefdbf2db8048aa99192f0943ee4e801929
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
9671759ad0dadd5be015b899879a9a5760aaf9c2 20-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I69791c367549dd1b3839ff2a362aea41382aecc7
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
eb09f6c7d58493ee511ab8b618c044d36068aa8f 20-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I825020c2e3fd0da2a639d89a066c69eb2b664aa2
Auto-generated-cl: translation import
es/values-pt/strings.xml
c11fcd97994f469d24b58a2d9dc5cddaa5a1081f 20-Sep-2014 Andrew Lee <anwlee@google.com> Don't enable "add call" if CDMA and in conference.

Bug: 17581379
Change-Id: Id64dd7b2c780f2de7fcc637a68ba2e6bd1483889
rc/com/android/server/telecom/CallsManager.java
6f6020fb5fd014419417d4539d9bc63d9b482e46 20-Sep-2014 Santos Cordon <santoscordon@google.com> am 6ce5aaf5: am d3b08fda: am a235be10: am 017290f5: am be374add: Merge "Only initialize Telecomm for the primary user." into lmp-dev

* commit '6ce5aaf5bbe12345acc640478d5b565c1bdfc885':
Only initialize Telecomm for the primary user.
24731f711987db8f3d8251860c7a7c324e154e9e 20-Sep-2014 Sailesh Nepal <sail@google.com> am 7b28223a: am 5ee89005: am d151ca45: am 2d50e0a4: am e9036db9: Fix bad format arg in InCallToneMonitor

* commit '7b28223af270613dcc6bfbe253a22f361be1a4e5':
Fix bad format arg in InCallToneMonitor
6ce5aaf5bbe12345acc640478d5b565c1bdfc885 19-Sep-2014 Santos Cordon <santoscordon@google.com> am d3b08fda: am a235be10: am 017290f5: am be374add: Merge "Only initialize Telecomm for the primary user." into lmp-dev

* commit 'd3b08fda88981bd440f8734659bfed97ff3dab9b':
Only initialize Telecomm for the primary user.
d3b08fda88981bd440f8734659bfed97ff3dab9b 19-Sep-2014 Santos Cordon <santoscordon@google.com> am a235be10: am 017290f5: am be374add: Merge "Only initialize Telecomm for the primary user." into lmp-dev

* commit 'a235be102f42475a095f5674f64c135629bbe84c':
Only initialize Telecomm for the primary user.
2994f14eb84813517f6f8becfc067fb860620429 19-Sep-2014 Santos Cordon <santoscordon@google.com> am 7ba73d9f: am be374add: Merge "Only initialize Telecomm for the primary user." into lmp-dev

* commit '7ba73d9f403db446e1e3ce7084fd6eb2d832db78':
Only initialize Telecomm for the primary user.
a235be102f42475a095f5674f64c135629bbe84c 19-Sep-2014 Santos Cordon <santoscordon@google.com> am 017290f5: am be374add: Merge "Only initialize Telecomm for the primary user." into lmp-dev

* commit '017290f5eac79c03e2d73df28304013737175e7e':
Only initialize Telecomm for the primary user.
7ba73d9f403db446e1e3ce7084fd6eb2d832db78 19-Sep-2014 Santos Cordon <santoscordon@google.com> am be374add: Merge "Only initialize Telecomm for the primary user." into lmp-dev

* commit 'be374addc18a5a49464179e313baedfa35aca9cc':
Only initialize Telecomm for the primary user.
017290f5eac79c03e2d73df28304013737175e7e 19-Sep-2014 Santos Cordon <santoscordon@google.com> am be374add: Merge "Only initialize Telecomm for the primary user." into lmp-dev

* commit 'be374addc18a5a49464179e313baedfa35aca9cc':
Only initialize Telecomm for the primary user.
be374addc18a5a49464179e313baedfa35aca9cc 19-Sep-2014 Santos Cordon <santoscordon@google.com> Merge "Only initialize Telecomm for the primary user." into lmp-dev
7b28223af270613dcc6bfbe253a22f361be1a4e5 19-Sep-2014 Sailesh Nepal <sail@google.com> am 5ee89005: am d151ca45: am 2d50e0a4: am e9036db9: Fix bad format arg in InCallToneMonitor

* commit '5ee89005902b566808049acb17b03d50a33c953e':
Fix bad format arg in InCallToneMonitor
5ee89005902b566808049acb17b03d50a33c953e 19-Sep-2014 Sailesh Nepal <sail@google.com> am d151ca45: am 2d50e0a4: am e9036db9: Fix bad format arg in InCallToneMonitor

* commit 'd151ca45336223a654c0ddbc7362938975d594a8':
Fix bad format arg in InCallToneMonitor
d151ca45336223a654c0ddbc7362938975d594a8 19-Sep-2014 Sailesh Nepal <sail@google.com> am 2d50e0a4: am e9036db9: Fix bad format arg in InCallToneMonitor

* commit '2d50e0a460f3aadc1e40d81e0920bbf7b49ca202':
Fix bad format arg in InCallToneMonitor
2d50e0a460f3aadc1e40d81e0920bbf7b49ca202 19-Sep-2014 Sailesh Nepal <sail@google.com> am e9036db9: Fix bad format arg in InCallToneMonitor

* commit 'e9036db9b6dec6a35602a411b8076b0ea4271bdb':
Fix bad format arg in InCallToneMonitor
727ec32f8d2865e84f2c2a13bc04cd7859c140e1 19-Sep-2014 Sailesh Nepal <sail@google.com> am 91277357: am e9036db9: Fix bad format arg in InCallToneMonitor

* commit '91277357748e987a8cb77caf7cedf4fefc449110':
Fix bad format arg in InCallToneMonitor
91277357748e987a8cb77caf7cedf4fefc449110 19-Sep-2014 Sailesh Nepal <sail@google.com> am e9036db9: Fix bad format arg in InCallToneMonitor

* commit 'e9036db9b6dec6a35602a411b8076b0ea4271bdb':
Fix bad format arg in InCallToneMonitor
1ccab206c39d0fafde7475bd1ff23fd346a17339 19-Sep-2014 Nancy Chen <nancychen@google.com> Skip "PRE_DIAL_WAIT" when no accounts are available to chose from.

Go straight into "CONNECTING" state when no account is preset and there
are no available accounts to select from (for example if it is a SIP
call and no SIP accounts are registered). The InCallUi will handle
disconnecting the call and displaying an error message.

Bug: 17486242

Change-Id: Ieaa89c908caab15811d4708f76fe674bd96900b8
rc/com/android/server/telecom/CallsManager.java
e9036db9b6dec6a35602a411b8076b0ea4271bdb 19-Sep-2014 Sailesh Nepal <sail@google.com> Fix bad format arg in InCallToneMonitor

Bug: 17582817
Change-Id: I6acd538a0e39ea5f62f72761e5768fa5de593de6
rc/com/android/server/telecom/InCallToneMonitor.java
43541c16a52f1a6ba5639fbb525223699b2de389 19-Sep-2014 Santos Cordon <santoscordon@google.com> Only initialize Telecomm for the primary user.

Bug: 17579886
Change-Id: Ie88229bddbe84ba3103a1c423b8d4504849d8a08
rc/com/android/server/telecom/TelecomApp.java
cc3cdb5e2467f1916080689ca32c275373e4f255 19-Sep-2014 Nancy Chen <nancychen@google.com> am 0ed47989: am 9f6d071c: am 1df2135d: am e66664b7: am 1c5926fc: Replace get*PhoneAccounts* public API methods with new method (2/3)

* commit '0ed47989443cf3d3adcaa9d66ab387395f3f4051':
edb7d6bef32b6adc218449f1d80326130b7e5365 19-Sep-2014 Tyler Gunn <tgunn@google.com> am a7e6cc7a: am c383fdf4: am ebd651ff: am 4a968a18: am ce1a21ef: Merge "Preparatory work to move Telecom to system service." into lmp-dev

* commit 'a7e6cc7a6d4ad60e1142fb7d9c9aa70b9e351225':
6ae93919bb49d4ba200b1fb9c0b04ba75083eca4 19-Sep-2014 Ihab Awad <ihab@google.com> am 623e1297: am 32f5cc45: am 78b91abc: am c95ebde4: am c9433c38: Merge "Automatically un-hold calls brought to the foreground" into lmp-dev

* commit '623e1297d81648cb65b55996ab258e36d152db1b':
21c8606d29d3b2adb3592cd178000f2a08a3e65f 19-Sep-2014 Sailesh Nepal <sail@google.com> am 590b33d4: am 754c8988: am 7238532a: am 61f3e6c0: am a53eb7f3: Remove MODIFY_PHONE_STATE requirement for Connection Managers

* commit '590b33d4b17184c8567d1b232a5a04a66b98937b':
e62b62ac72a76de2ce5831f410b059a32f133347 19-Sep-2014 Yorke Lee <yorkelee@google.com> am a1468a46: am a75cf673: am 845fc6d0: am c635cc9a: am 465cec04: Merge "Implement DTMF tones in test RemoteConference" into lmp-dev

* commit 'a1468a46520a4f7a9be59c5de891fbdc509fe65c':
355d940234159d697d3f839a3fb4b755b2ca18e4 19-Sep-2014 Nancy Chen <nancychen@google.com> am 94479553: am c610992a: am 70b32cf6: am 0fada668: am b3c4b285: Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev

* commit '9447955361a00c4565f77384c382c0922f1e569c':
585981c0c1e4451fc1894e4b47ef8073712f085c 19-Sep-2014 Andrew Lee <anwlee@google.com> am 15f59600: am a5ef39b1: am ba925154: am 7c1d5c56: am 701dc006: Use telecomm DiconnectCause in services/Telecomm.

* commit '15f59600faef9873b27205a9f52e364f09ee4c86':
914425643361fcc47251a2071e75d8fbe56a0f7f 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 2b04564f: am 25fa3bdf: am 44595723: am 7ff302ce: am e425e060: Merge "Fix for busted call duration in CDMA conference" into lmp-dev

* commit '2b04564f0c9df325aa4ac9b204303ce669da0a42':
2bc233bf9d30f8d79bca9bffe43d8fe9f67eb3ab 19-Sep-2014 Santos Cordon <santoscordon@google.com> am 569a1b75: am 656f1ed6: am 78b3abdc: am bc8aadfd: am cf2a3643: Merge "Remove config variable to disable connection service APIs" into lmp-dev

* commit '569a1b752e675d6260b58c5f2991f537c631643a':
fc9c52fc5ccc7a2ce8d603d877dd8aaaf2567696 19-Sep-2014 Yorke Lee <yorkelee@google.com> am d9f1bc19: am 90fd2ef6: am f7232813: am 565d0a56: am ee9649b8: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev

* commit 'd9f1bc198e9d0d07e881c56317dc3d450b1d85b0':
58503a9a5757b0fe7e46ede465d0dc970b970c11 19-Sep-2014 Ihab Awad <ihab@google.com> am 1fedf267: am c927094a: am 0c464ca1: am f02c6622: am f1863270: Add system feature for ConnectionService API support (3/3)

* commit '1fedf267deb55ad5ab950d46027829a7f7193fd5':
5ab7d0aec90dab302681540ecf840bf2def507fa 19-Sep-2014 Baligh Uddin <baligh@google.com> am cf5c34be: (-s ours) am 52a5473d: (-s ours) am 2b8aa505: (-s ours) am 13a52774: (-s ours) am 2fb76dd5: (-s ours) Import translations. DO NOT MERGE

* commit 'cf5c34be516a47fc66fc8bebe85c81f799679298':
622bfc418ff413c1b610e250f245a0c346a008a0 19-Sep-2014 Santos Cordon <santoscordon@google.com> am 3f27d5fe: am e8efabb7: am 5a6245c8: am 12963ccd: am 8ed91f13: Merge "Repeat ringtones every 3 seconds." into lmp-dev

* commit '3f27d5fe99997b0241dc5f54408b2d3d797068fa':
dfae4b1ad1e5a26cf9f65ce66551ec5881f02a69 19-Sep-2014 Santos Cordon <santoscordon@google.com> am 9c19edad: am e516108e: am cf9403d1: am cb437d76: am f193ba45: Guard against simultaneous calls.

* commit '9c19edad23c5379d61e5ad506a0982984dad083c':
0475ae2a92dd691225aff7830450ce0015488538 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 5d1495f5: am 5863a779: am e78e0fec: am 5d20b687: am de4500b9: Delete unnecessary obj/APPS/Telecomm_intermediates folder

* commit '5d1495f5669f154bd9e78c24f72848db978665f5':
a8314479ba8f79b2760ae112aa2eab2093bc2c02 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 46d81937: am 91b27002: am 4f1cad70: am 6e20ee5a: am 1dcca119: Merge "Add cleanspec to Telecomm." into lmp-dev

* commit '46d81937a9ea20ebef530f1bd74ee997137fff94':
d9f49ede1cd3c258ffc544a28599187b6dff27b3 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 3378ba27: am 0b8e9a37: am 4147c48f: am af7ab8cc: am f86db2e6: Add getCallState to Telecomm

* commit '3378ba271b8f16de4d4bbd641e6bf1e55a391833':
32c0ae13e3a81a9cc7eac6cd21793d879978ea1d 19-Sep-2014 Tyler Gunn <tgunn@google.com> am 25a91d6c: am 2899eb86: am 20372058: am 33bc44e9: am 7cc70b4f: Renaming Telecomm to Telecom.

* commit '25a91d6c3007f3ac8ed6a1a75162e9bf2f131e96':
46b387d9d5e34f7fc203d9b56e0ddea265a44ac9 19-Sep-2014 Sailesh Nepal <sail@google.com> am 3fcecb10: am 68a16c0b: am 8feba762: am 2f0891fb: am b9fc537f: Merge "Use the new phone number extra for incoming calls" into lmp-dev

* commit '3fcecb104301132028488dd9060fbea15d6a3d82':
39bdcf02979b457c8a0f026e54c56f1a21e261e9 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 6072990c: am 68804c07: am f598808f: am 5d926544: am d1305253: Merge "Broadcast phone state changes on an aggregate basis" into lmp-dev

* commit '6072990c5747f87c9c348819f8d4a0ea41a7e3c1':
43abc7f7cc5e3d0f76926541baa443b76ecc8e7e 19-Sep-2014 Santos Cordon <santoscordon@google.com> am 0407b313: am 9eeed9bd: am 140cc693: am f6d862b6: am 31953644: Choose WIRELESS or HEADSET when Bluetooth disconnects.

* commit '0407b3132b0bd05217ca9538dfb60bc976a57118':
87bdb57485b696071681fb7ad17501607fe5a30e 19-Sep-2014 Santos Cordon <santoscordon@google.com> am 19059851: am dd5ed5cd: am c6352009: am faf9169e: am a2d34dc2: Merge "Force setting initial audio state on first call." into lmp-dev

* commit '19059851bac36cfa4228c6a02359ddee47c0b713':
93b56003713cd66b8e9b7d7372e908d18312f99e 19-Sep-2014 Tyler Gunn <tgunn@google.com> am 85e6a4dc: am 2fb3f6c3: am 522c4380: am a95f206d: am 901837c2: Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)" into lmp-dev

* commit '85e6a4dc7d9b225ef1e39157415fd00bfa08f92c':
68ddbb960861d8aa77cc7c0be45357a7b092c11e 19-Sep-2014 Michael Wright <michaelwr@google.com> am a2d93779: am ba7a15ef: am 5446991b: am 1b51e477: am cfe34ea2: Merge "Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY" into lmp-dev

* commit 'a2d937795531f15518fd3dd933d8779564f80784':
0d13be1cf4035225aa137d887acde77c6f1cc11e 19-Sep-2014 Andrew Lee <anwlee@google.com> am 518d3c2a: am 6ac7064d: am aa6e7f8d: am dc787d60: am 5be64bc4: Changes to complement Telecomm API cleanup.

* commit '518d3c2ac54a1939f7fd99bf8c9b364fff05086c':
baaebeeed5be2d73ff6fff097ef34af3566b8005 19-Sep-2014 Nancy Chen <nancychen@google.com> am ef92891d: am 6b3a7fc9: am e4aadd35: am d611b784: am edffa4c2: Merge "Update TelecommManager per API requirements. (2/3)" into lmp-dev

* commit 'ef92891d185dcbdbe3f4c89e4b488c558259695b':
f7e8b37f8efe1d818e40b1168e9d3f9d0dab5cb6 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 373d3a4f: am 12c72906: am 38c45b18: am a501a299: am d51e4f90: Merge "Fix for mConnectTimeMillis being incorrectly set" into lmp-dev

* commit '373d3a4fd386ad71ac2d8017c3b889847cfef2e2':
2a4759b4a1ac931d18f6a9d3de47d07447816469 19-Sep-2014 Nancy Chen <nancychen@google.com> am 2e7ef5dc: am 2ae21986: am 79295607: am 53999d0a: am 24d3cd78: Merge "Make changes to Connection in Telecomm API (3/4)" into lmp-dev

* commit '2e7ef5dcac3502c77a8505e44554e08fabc45432':
6d7cc8a58258311862e4731ebab61f6e37649b67 19-Sep-2014 Tyler Gunn <tgunn@google.com> am 486d32aa: am 8e1cd138: am 754851f4: am fdaadd0f: am 8e0fef4e: Allowing enable/disable of phone accounts. (2/3)

* commit '486d32aac91ccd9f51cd587e47eb247ea6a5baf0':
14bc302bf875ffecb26cff1cab3534c4018297e3 19-Sep-2014 Nancy Chen <nancychen@google.com> am 04e1e7f2: am d686a9ee: am 1cf912ad: am f6289f39: am 671ce297: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (4/4)" into lmp-dev

* commit '04e1e7f29789991e5d2ca7fdea5ca8b954b82ac6':
a76304e9e245e52c372cd9494b8c4e8bc44a8073 19-Sep-2014 Baligh Uddin <baligh@google.com> am f4a84138: (-s ours) am 2daa872e: (-s ours) am 838f860d: (-s ours) am b6b25d80: (-s ours) am d1a9da2a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'f4a84138edd484ca168317c258693792775defa6':
cab6226dfaf0044e92890e4234e884280137f634 19-Sep-2014 Baligh Uddin <baligh@google.com> am 0d85538e: (-s ours) am 1e30ebe8: (-s ours) am 636d78a3: (-s ours) am ecc7180c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '0d85538e5173bb590b104c1873463d4a827d9386':
Import translations. DO NOT MERGE
2b40b6df1e24567d57a4c0055ab5f113a7bd452a 19-Sep-2014 Yorke Lee <yorkelee@google.com> am dbcccec7: am f1691a67: am 3dfd372f: Merge "Fix for DisconnectCause.INVALID_NUMBER being returned" into lmp-dev

* commit 'dbcccec7fe00a8870abc3102598a8b29f5186da8':
8ce3d0cb691dd9db86c968434073a04d52b22fc0 19-Sep-2014 Ihab Awad <ihab@google.com> am fc81117b: am 2c5c5b3c: am a123a5b7: Enable (@hidden) video connection support for RemoteConnections

* commit 'fc81117bcf81d28ab4aa23f16b3e241d5c4fb829':
67f9c643a6ca44ac727b11ae7ede991bd40e1fb3 19-Sep-2014 Andrew Lee <anwlee@google.com> am c8715158: am 51d6d6ef: am 35719ef4: Merge "API cleanup for PhoneAccount." into lmp-dev

* commit 'c87151586dbf853b1bbd9ef1815084c37471423d':
404c589ac6bee32c60ae3f4012ceac81c2a92e0c 19-Sep-2014 Yorke Lee <yorkelee@google.com> am afabb895: am 88a76a76: am ad5235df: Replace Calls.FEATURES_NONE with 0 (4/4)

* commit 'afabb89587389199bc3a0318df932fc8537899ed':
c293bfde84adb22ab2429a99b54044740cc27a94 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 0a860432: am f97f2e89: am 62623c80: Merge "Fix for temporary loss of audio focus when accepting a call" into lmp-dev

* commit '0a860432ccc4c5b6534518f8d407cfbeab0d73ed':
54f521ee1dd8824b0c7cb5c701766b77d26f028c 19-Sep-2014 Nancy Chen <nancychen@google.com> am 23d2fea5: am 386d98b0: am ea6969bc: Merge "getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation" into lmp-dev

* commit '23d2fea5e5a7f98e6462f5ab8fb952a0225b606b':
7a79d1dbdb78e2bfeb0131c9e2da0e07f5b3a4b9 19-Sep-2014 Santos Cordon <santoscordon@google.com> am 8938652d: am 3488b13a: am d93a4412: Fix some unbind logic.

* commit '8938652dcb66a35bdf8cc342b433955103205c21':
6003b8bc3aab84c5d6ed2ed3ed33a5ce12ebf99f 19-Sep-2014 Jay Shrauner <shrauner@google.com> am 21a3775a: am 1c5f58ff: am 56a76b79: Use framework scheme definitions

* commit '21a3775ad95b7c1db3ba364bc9a3f65d7644f2e6':
d7deccf3106a65216c4c36911c040bcf4473ab73 19-Sep-2014 Santos Cordon <santoscordon@google.com> am 292c5f61: am ce21b301: am 81c06342: Merge "Add CDMA conference call capabilities" into lmp-dev

* commit '292c5f6196d1b90037565b3377229940b28d7cb0':
c96409e428f1f97780aa3c3cfba889904c98ed85 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 37469eed: am a7ecafe8: am a91bc411: Merge "Disable add call for emergency calls" into lmp-dev

* commit '37469eed752c6c09a5f586c425583d9b8d7e7fd2':
1fe01a70c90b1b5126cb1e76c0cc3a907cd08234 19-Sep-2014 Nancy Chen <nancychen@google.com> am 04e1754c: am 0f33e835: am 5f6f77e2: Merge "Rename listener to callback for ConferenceManager and rename strings 2/4" into lmp-dev

* commit '04e1754cefd46a7b939ec0c5c4882d608247a3f2':
7241d325dc393f4af6e75cfffa060988d277641f 19-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am 31c5ed25: am 2fdb5e4e: am 075a0214: Merge "TestVideoProvider: Update to latest camera2 API" into lmp-dev

* commit '31c5ed257d0b07b3915cde19b1da594bfd25bc06':
b3a6fec1f03bdde7c637e00bcf72ec90b1f69c81 19-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> am f5870e78: am 2e280ecf: am cb54048e: Merge "Add MODIFY_PHONE_STATE permission for changing the audio mode" into lmp-dev

* commit 'f5870e78ec4fa40f4d7c5feb4a6f7b1ae8ec7a4d':
5c21c4d5b68f10c155987549981d4a9922b479f4 19-Sep-2014 Andrew Lee <anwlee@google.com> am b84e5470: am d64c672a: am e011342a: Merge "Remove Phone Account Preferences; moved to Telephony." into lmp-dev

* commit 'b84e547006388e1111b127d9a154b433e7366326':
26e5308b4a45b91d6d833011a4c5542d3c511e4f 19-Sep-2014 Yorke Lee <yorkelee@google.com> am a85fe904: am 16921811: am 8b6f2850: Merge "Allow starting of test incoming calls directly via adb" into lmp-dev

* commit 'a85fe90416cf7c2f172b170fba9109de19f7c640':
0554c590dd05faea43cc4b43fc705a2528a3749e 19-Sep-2014 Nancy Chen <nancychen@google.com> am 9b3c5b53: am f2f42f6c: am d75fabf9: Retain "voicemail:" URI for startOutgoingCall and add scheme Constants.

* commit '9b3c5b53e51ec82c0d75526188c54793df9b5366':
c784ba1489266f47f3b788248e96c52d1707bef3 19-Sep-2014 Nancy Chen <nancychen@google.com> am 93493b8e: am 2a679855: am 81283c93: Merge "Pass voicemail: URIs directly to Telephony. Rename handle -> number" into lmp-dev

* commit '93493b8ed7f3107b2174f880f416b9a314bbe4e9':
77e2bab98d14ff01edc146e428d520a427505f72 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 9892e6f2: am ffa2191b: am 82907364: Merge "Fix cursor leak in MissedCallNotifier" into lmp-dev

* commit '9892e6f27b0953d2ee4a7e03ba332a9ba0862bb0':
a8b22a7784cd1161e7c69da5b08bd50ca8e23cba 19-Sep-2014 Baligh Uddin <baligh@google.com> am 60e38ddd: (-s ours) am ce7ac414: (-s ours) am 18e39757: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '60e38ddd998e78fcd1f846b5b7a1d6c6dbd83706':
f7414b432c64d5a1f2029106370f82c1c80563c0 19-Sep-2014 Baligh Uddin <baligh@google.com> am f1712881: (-s ours) am 123c75ca: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'f17128819fa9994e050c20c95150705c116b6db2':
Import translations. DO NOT MERGE
9d3b31c08ceff811302aa900d8a4688c4f18c47b 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 1dc11644: am 2ceee9df: am eaad2f46: Merge "Add more logging to InCallController" into lmp-dev

* commit '1dc11644013d84e5a18fa4f07372ac0313ac7ceb':
f1d7ab5a27aaf319c9a033ce9cf0d224eb03a74e 19-Sep-2014 Anthony Lee <anthonylee@google.com> am f82a46bd: am 44821a6b: am 942e8baf: Merge "b/16804395. Migrate QuickResponses from Telephony as needed." into lmp-dev

* commit 'f82a46bdcb7362f85c907b3cc5d6881eb53ec7f0':
f521bc498daec4fad88cb8ee135bdafd6c45ee3e 19-Sep-2014 Evan Charlton <evanc@google.com> am c252c0b9: am 34af3830: am 11795fe7: Merge "Remove startActivityFromInCall API" into lmp-dev

* commit 'c252c0b93c5fce69309ad66acc54134ba4ba752c':
6c0145f384345264789c0086be7cf4bf8371d36a 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 0ba789e8: am 9453cb77: am 65e05c6d: Merge "Don\'t send new outgoing call intent broadcast twice" into lmp-dev

* commit '0ba789e872f2d925f541193e1e3d2faa668e336c':
1d4ea9fc6edfc66dcebd58c74bcccdd7ad334917 19-Sep-2014 Tyler Gunn <tgunn@google.com> am ce0b7045: am fc8a45b6: am 9bc67524: Merge "Add supported URI scheme to PhoneAccounts. (2/4)" into lmp-dev

* commit 'ce0b7045c8abed56d4d3ace52dcd8e8611c8228c':
a430c56b775499a5ffb5059c82442a3ad537e5ee 19-Sep-2014 Santos Cordon <santoscordon@google.com> am 50df89aa: am f71d3575: am dd6147dd: Merge "Dont acquire prox sensor if there are no calls." into lmp-dev

* commit '50df89aa5b789ddc360b81b9bad3da0655aea402':
6b68728922ffba9f1b62cf4e53e345d0843218b6 19-Sep-2014 Yorke Lee <yorkelee@google.com> am 90869ca5: am f83c3a4d: am f2ca85e7: Merge "Respect DND mode when activating ringer/vibrator" into lmp-dev

* commit '90869ca51665e08239b54169a8233aa4a0e8851d':
39ecda88b04b455d591c27f998f49de0d9693986 19-Sep-2014 Baligh Uddin <baligh@google.com> am 43076a6d: (-s ours) am c967ac35: (-s ours) am a28dbcc7: (-s ours) Import translations. DO NOT MERGE

* commit '43076a6d853cb90dc39bcadf1745c855b770e08b':
e8828ff6b8a8a0df7ba8e27624030dcdb61454da 19-Sep-2014 Baligh Uddin <baligh@google.com> am 1ad093ed: (-s ours) am 59651417: (-s ours) am fbc75f52: (-s ours) Import translations. DO NOT MERGE

* commit '1ad093ededa9d60fbee718f176b9d34a48812d0e':
0b18b415d3ed50120abbb997d4a59439ced2ff66 19-Sep-2014 Baligh Uddin <baligh@google.com> am 67f09c87: (-s ours) am 56017d15: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '67f09c873f81e19d8699b9e87298a97fa30be433':
Import translations. DO NOT MERGE
d41cec6516b0b7ead898e7aa361c1d531615d555 18-Sep-2014 Nancy Chen <nancychen@google.com> am d8661dc9: am 9a747153: am 1c5926fc: Replace get*PhoneAccounts* public API methods with new method (2/3)

* commit 'd8661dc9f10fd2505114d99e6f343f7ef6db7e58':
Replace get*PhoneAccounts* public API methods with new method (2/3)
d8661dc9f10fd2505114d99e6f343f7ef6db7e58 18-Sep-2014 Nancy Chen <nancychen@google.com> am 9a747153: am 1c5926fc: Replace get*PhoneAccounts* public API methods with new method (2/3)

* commit '9a747153173988d12d5786a57686c4225c032ab2':
Replace get*PhoneAccounts* public API methods with new method (2/3)
0ed47989443cf3d3adcaa9d66ab387395f3f4051 18-Sep-2014 Nancy Chen <nancychen@google.com> am 9f6d071c: am 1df2135d: am e66664b7: am 1c5926fc: Replace get*PhoneAccounts* public API methods with new method (2/3)

* commit '9f6d071cbb74a573c6b069748f06ffe461d05dc3':
Replace get*PhoneAccounts* public API methods with new method (2/3)
9f6d071cbb74a573c6b069748f06ffe461d05dc3 18-Sep-2014 Nancy Chen <nancychen@google.com> am 1df2135d: am e66664b7: am 1c5926fc: Replace get*PhoneAccounts* public API methods with new method (2/3)

* commit '1df2135d46121bbf998b67cc3357510098c91d30':
Replace get*PhoneAccounts* public API methods with new method (2/3)
1df2135d46121bbf998b67cc3357510098c91d30 18-Sep-2014 Nancy Chen <nancychen@google.com> am e66664b7: am 1c5926fc: Replace get*PhoneAccounts* public API methods with new method (2/3)

* commit 'e66664b78c31350db92e1444de3f1dbfd40e6362':
Replace get*PhoneAccounts* public API methods with new method (2/3)
9a747153173988d12d5786a57686c4225c032ab2 18-Sep-2014 Nancy Chen <nancychen@google.com> am 1c5926fc: Replace get*PhoneAccounts* public API methods with new method (2/3)

* commit '1c5926fc5f3c828c5b16c25a5154e5a0306ea3e7':
Replace get*PhoneAccounts* public API methods with new method (2/3)
e66664b78c31350db92e1444de3f1dbfd40e6362 18-Sep-2014 Nancy Chen <nancychen@google.com> am 1c5926fc: Replace get*PhoneAccounts* public API methods with new method (2/3)

* commit '1c5926fc5f3c828c5b16c25a5154e5a0306ea3e7':
Replace get*PhoneAccounts* public API methods with new method (2/3)
c60ca06fa81a25979979fca7922a22e93a207589 18-Sep-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
1c5926fc5f3c828c5b16c25a5154e5a0306ea3e7 17-Sep-2014 Nancy Chen <nancychen@google.com> Replace get*PhoneAccounts* public API methods with new method (2/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.
Also pass available phone accounts for the user to select from through
Telecom to InCallUI so InCallUI will not be calling the Telecom API
directly to get these accounts.

Bug: 17510811

Change-Id: Ia91972bc4cfa938b743f6b3b165a81d4acd58c45
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
a7e6cc7a6d4ad60e1142fb7d9c9aa70b9e351225 17-Sep-2014 Tyler Gunn <tgunn@google.com> am c383fdf4: am ebd651ff: am 4a968a18: am ce1a21ef: Merge "Preparatory work to move Telecom to system service." into lmp-dev

* commit 'c383fdf48cc74ab9a3ff740844cde80a3166358a':
Preparatory work to move Telecom to system service.
c383fdf48cc74ab9a3ff740844cde80a3166358a 17-Sep-2014 Tyler Gunn <tgunn@google.com> am ebd651ff: am 4a968a18: am ce1a21ef: Merge "Preparatory work to move Telecom to system service." into lmp-dev

* commit 'ebd651ff5880c0cfa1bc435090c8190694aa76ab':
Preparatory work to move Telecom to system service.
cd293c243b372bc01b628d490344285c7bf054ad 17-Sep-2014 Tyler Gunn <tgunn@google.com> am 24c404eb: am 1e565b25: am ce1a21ef: Merge "Preparatory work to move Telecom to system service." into lmp-dev

* commit '24c404eb39c7b707a6e7fe3428cf154954457a72':
Preparatory work to move Telecom to system service.
623e1297d81648cb65b55996ab258e36d152db1b 17-Sep-2014 Ihab Awad <ihab@google.com> am 32f5cc45: am 78b91abc: am c95ebde4: am c9433c38: Merge "Automatically un-hold calls brought to the foreground" into lmp-dev

* commit '32f5cc452e7c6862eb1bbd24e3f64d736a46db95':
Automatically un-hold calls brought to the foreground
24c404eb39c7b707a6e7fe3428cf154954457a72 17-Sep-2014 Tyler Gunn <tgunn@google.com> am 1e565b25: am ce1a21ef: Merge "Preparatory work to move Telecom to system service." into lmp-dev

* commit '1e565b2596a8f202870120b448e18831bd5b1410':
Preparatory work to move Telecom to system service.
ebd651ff5880c0cfa1bc435090c8190694aa76ab 17-Sep-2014 Tyler Gunn <tgunn@google.com> am 4a968a18: am ce1a21ef: Merge "Preparatory work to move Telecom to system service." into lmp-dev

* commit '4a968a1861d92b011a95b704cac7b3c254790d9e':
Preparatory work to move Telecom to system service.
32f5cc452e7c6862eb1bbd24e3f64d736a46db95 17-Sep-2014 Ihab Awad <ihab@google.com> am 78b91abc: am c95ebde4: am c9433c38: Merge "Automatically un-hold calls brought to the foreground" into lmp-dev

* commit '78b91abcfd3bef653dca493c829ab4dd7a400ce3':
Automatically un-hold calls brought to the foreground
6556b958ba1473334799e87956b07de9d50b1e6a 17-Sep-2014 Ihab Awad <ihab@google.com> am e8d8cfad: am d32b0e6b: am c9433c38: Merge "Automatically un-hold calls brought to the foreground" into lmp-dev

* commit 'e8d8cfadc0f4960b5b4afbea91f8fba9c782b810':
Automatically un-hold calls brought to the foreground
4a968a1861d92b011a95b704cac7b3c254790d9e 17-Sep-2014 Tyler Gunn <tgunn@google.com> am ce1a21ef: Merge "Preparatory work to move Telecom to system service." into lmp-dev

* commit 'ce1a21ef6e0221107383b228c2219b3f0586eb67':
Preparatory work to move Telecom to system service.
1e565b2596a8f202870120b448e18831bd5b1410 17-Sep-2014 Tyler Gunn <tgunn@google.com> am ce1a21ef: Merge "Preparatory work to move Telecom to system service." into lmp-dev

* commit 'ce1a21ef6e0221107383b228c2219b3f0586eb67':
Preparatory work to move Telecom to system service.
ce1a21ef6e0221107383b228c2219b3f0586eb67 17-Sep-2014 Tyler Gunn <tgunn@google.com> Merge "Preparatory work to move Telecom to system service." into lmp-dev
78b91abcfd3bef653dca493c829ab4dd7a400ce3 17-Sep-2014 Ihab Awad <ihab@google.com> am c95ebde4: am c9433c38: Merge "Automatically un-hold calls brought to the foreground" into lmp-dev

* commit 'c95ebde463f9da9c48c9efcf08f1f5defd2e96bb':
Automatically un-hold calls brought to the foreground
e8d8cfadc0f4960b5b4afbea91f8fba9c782b810 17-Sep-2014 Ihab Awad <ihab@google.com> am d32b0e6b: am c9433c38: Merge "Automatically un-hold calls brought to the foreground" into lmp-dev

* commit 'd32b0e6bdc2d3ac73aa9f214a32bb7b7b09daac9':
Automatically un-hold calls brought to the foreground
d32b0e6bdc2d3ac73aa9f214a32bb7b7b09daac9 17-Sep-2014 Ihab Awad <ihab@google.com> am c9433c38: Merge "Automatically un-hold calls brought to the foreground" into lmp-dev

* commit 'c9433c3804369d72474883242ca38a7ef76f03cf':
Automatically un-hold calls brought to the foreground
c95ebde463f9da9c48c9efcf08f1f5defd2e96bb 17-Sep-2014 Ihab Awad <ihab@google.com> am c9433c38: Merge "Automatically un-hold calls brought to the foreground" into lmp-dev

* commit 'c9433c3804369d72474883242ca38a7ef76f03cf':
Automatically un-hold calls brought to the foreground
590b33d4b17184c8567d1b232a5a04a66b98937b 17-Sep-2014 Sailesh Nepal <sail@google.com> am 754c8988: am 7238532a: am 61f3e6c0: am a53eb7f3: Remove MODIFY_PHONE_STATE requirement for Connection Managers

* commit '754c89886f8dc8f68a80ed97da15d43a39fa6502':
Remove MODIFY_PHONE_STATE requirement for Connection Managers
c9433c3804369d72474883242ca38a7ef76f03cf 17-Sep-2014 Ihab Awad <ihab@google.com> Merge "Automatically un-hold calls brought to the foreground" into lmp-dev
10d0f5359dba12739f206eedeb5de1dcbd892cf0 17-Sep-2014 Sailesh Nepal <sail@google.com> am a699e952: am 8c244fc5: am a53eb7f3: Remove MODIFY_PHONE_STATE requirement for Connection Managers

* commit 'a699e95218e3e62592d8feb3512e1f2258119e9c':
Remove MODIFY_PHONE_STATE requirement for Connection Managers
754c89886f8dc8f68a80ed97da15d43a39fa6502 17-Sep-2014 Sailesh Nepal <sail@google.com> am 7238532a: am 61f3e6c0: am a53eb7f3: Remove MODIFY_PHONE_STATE requirement for Connection Managers

* commit '7238532a05f8f095b4d7a1cb99ee48b0b12b4b56':
Remove MODIFY_PHONE_STATE requirement for Connection Managers
91d43cf9c985cc5a83795f256ef5c46ebb8fbdc1 17-Sep-2014 Tyler Gunn <tgunn@google.com> Preparatory work to move Telecom to system service.

- Removed use of TelecomApp.getInstance() as context.
- Refactored singleton logic and initialization to support being
performed from a SystemService.
- Note: You will see some commented out references to
"import com.android.internal.R"; these must uncommented when the code
is moved to a system service.
- You will also notice in PhoneAccountRegistrar.java a comment block with:
"UNCOMMENT_FOR_MOVE_TO_SYSTEM_SERVICE"
The code in that comment block will replace the existing file path
code.
These were added as a convenience so that I can run a simple sed script
to make the required changes to the code in an automated manner once it
is moved to its new location.

Bug: 17364651
Change-Id: I8e80e9cffc481b688c10a2bca0b59f5ccf8e0fb2
ndroidManifest.xml
rc/com/android/server/telecom/AsyncRingtonePlayer.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallActivity.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceRepository.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/ContactsAsyncHelper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/DtmfLocalTonePlayer.java
rc/com/android/server/telecom/ErrorDialogActivity.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/MissedCallNotifier.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/PhoneAccountBroadcastReceiver.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/QuickResponseUtils.java
rc/com/android/server/telecom/RespondViaSmsManager.java
rc/com/android/server/telecom/RespondViaSmsSettings.java
rc/com/android/server/telecom/RingbackPlayer.java
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/ServiceBinder.java
rc/com/android/server/telecom/StatusBarNotifier.java
rc/com/android/server/telecom/TelecomApp.java
rc/com/android/server/telecom/TelecomBroadcastReceiver.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/Timeouts.java
rc/com/android/server/telecom/TtyManager.java
a699e95218e3e62592d8feb3512e1f2258119e9c 17-Sep-2014 Sailesh Nepal <sail@google.com> am 8c244fc5: am a53eb7f3: Remove MODIFY_PHONE_STATE requirement for Connection Managers

* commit '8c244fc53dc17af76369be4f8392a1bb709f52db':
Remove MODIFY_PHONE_STATE requirement for Connection Managers
7238532a05f8f095b4d7a1cb99ee48b0b12b4b56 17-Sep-2014 Sailesh Nepal <sail@google.com> am 61f3e6c0: am a53eb7f3: Remove MODIFY_PHONE_STATE requirement for Connection Managers

* commit '61f3e6c0080bd7211d101fbc197d6d3bc9459604':
Remove MODIFY_PHONE_STATE requirement for Connection Managers
8c244fc53dc17af76369be4f8392a1bb709f52db 17-Sep-2014 Sailesh Nepal <sail@google.com> am a53eb7f3: Remove MODIFY_PHONE_STATE requirement for Connection Managers

* commit 'a53eb7f3b260c0601f0a01dae597a789450b2872':
Remove MODIFY_PHONE_STATE requirement for Connection Managers
61f3e6c0080bd7211d101fbc197d6d3bc9459604 17-Sep-2014 Sailesh Nepal <sail@google.com> am a53eb7f3: Remove MODIFY_PHONE_STATE requirement for Connection Managers

* commit 'a53eb7f3b260c0601f0a01dae597a789450b2872':
Remove MODIFY_PHONE_STATE requirement for Connection Managers
a53eb7f3b260c0601f0a01dae597a789450b2872 17-Sep-2014 Sailesh Nepal <sail@google.com> Remove MODIFY_PHONE_STATE requirement for Connection Managers

3rd party apps can't get this permission.

Bug: 17546794
Bug: 17510811
Change-Id: Ic479d4efb1e3aa9f418a0cf9c9a4fd879211b4bc
rc/com/android/server/telecom/TelecomServiceImpl.java
a1468a46520a4f7a9be59c5de891fbdc509fe65c 17-Sep-2014 Yorke Lee <yorkelee@google.com> am a75cf673: am 845fc6d0: am c635cc9a: am 465cec04: Merge "Implement DTMF tones in test RemoteConference" into lmp-dev

* commit 'a75cf6736443027172b0008d5a45d94b9cc0a769':
Implement DTMF tones in test RemoteConference
a75cf6736443027172b0008d5a45d94b9cc0a769 17-Sep-2014 Yorke Lee <yorkelee@google.com> am 845fc6d0: am c635cc9a: am 465cec04: Merge "Implement DTMF tones in test RemoteConference" into lmp-dev

* commit '845fc6d0391a3fd838adf7576db366c667380498':
Implement DTMF tones in test RemoteConference
20d5b581942458b8079ce82e2e28c751a4dd01d5 17-Sep-2014 Yorke Lee <yorkelee@google.com> am 2fd7d9aa: am c0c362f2: am 465cec04: Merge "Implement DTMF tones in test RemoteConference" into lmp-dev

* commit '2fd7d9aa72dc1d87d9044c4e32927d43c7edd6ee':
Implement DTMF tones in test RemoteConference
2fd7d9aa72dc1d87d9044c4e32927d43c7edd6ee 17-Sep-2014 Yorke Lee <yorkelee@google.com> am c0c362f2: am 465cec04: Merge "Implement DTMF tones in test RemoteConference" into lmp-dev

* commit 'c0c362f2507c9a11f3935ddeffc4c6414f3e5643':
Implement DTMF tones in test RemoteConference
845fc6d0391a3fd838adf7576db366c667380498 17-Sep-2014 Yorke Lee <yorkelee@google.com> am c635cc9a: am 465cec04: Merge "Implement DTMF tones in test RemoteConference" into lmp-dev

* commit 'c635cc9a65ec24e7b1136c5543eb64f0615aa9fd':
Implement DTMF tones in test RemoteConference
c635cc9a65ec24e7b1136c5543eb64f0615aa9fd 17-Sep-2014 Yorke Lee <yorkelee@google.com> am 465cec04: Merge "Implement DTMF tones in test RemoteConference" into lmp-dev

* commit '465cec049a604655b2c7459458cc2d9136b5d86d':
Implement DTMF tones in test RemoteConference
c0c362f2507c9a11f3935ddeffc4c6414f3e5643 17-Sep-2014 Yorke Lee <yorkelee@google.com> am 465cec04: Merge "Implement DTMF tones in test RemoteConference" into lmp-dev

* commit '465cec049a604655b2c7459458cc2d9136b5d86d':
Implement DTMF tones in test RemoteConference
465cec049a604655b2c7459458cc2d9136b5d86d 17-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Implement DTMF tones in test RemoteConference" into lmp-dev
9447955361a00c4565f77384c382c0922f1e569c 17-Sep-2014 Nancy Chen <nancychen@google.com> am c610992a: am 70b32cf6: am 0fada668: am b3c4b285: Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev

* commit 'c610992a6e1a37d211bdab2c9b55aaca06102a5e':
Remove ability to enable/disable phoneaccounts (3/6)
15f59600faef9873b27205a9f52e364f09ee4c86 17-Sep-2014 Andrew Lee <anwlee@google.com> am a5ef39b1: am ba925154: am 7c1d5c56: am 701dc006: Use telecomm DiconnectCause in services/Telecomm.

* commit 'a5ef39b1f1d96c3af3771c7176a2176c55ccf493':
Use telecomm DiconnectCause in services/Telecomm.
c610992a6e1a37d211bdab2c9b55aaca06102a5e 17-Sep-2014 Nancy Chen <nancychen@google.com> am 70b32cf6: am 0fada668: am b3c4b285: Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev

* commit '70b32cf67eaa0d62919ba9d70c1e353cb0419c49':
Remove ability to enable/disable phoneaccounts (3/6)
13492445041904a89ec191ab72a5aff0f6ed53ea 17-Sep-2014 Nancy Chen <nancychen@google.com> am ba739c28: am cf3459dc: am b3c4b285: Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev

* commit 'ba739c2855bbbe3a6aba9b1928578befdfdcb71f':
Remove ability to enable/disable phoneaccounts (3/6)
70b32cf67eaa0d62919ba9d70c1e353cb0419c49 17-Sep-2014 Nancy Chen <nancychen@google.com> am 0fada668: am b3c4b285: Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev

* commit '0fada66859204d88f8a997d3a449b06220cf887d':
Remove ability to enable/disable phoneaccounts (3/6)
ba739c2855bbbe3a6aba9b1928578befdfdcb71f 17-Sep-2014 Nancy Chen <nancychen@google.com> am cf3459dc: am b3c4b285: Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev

* commit 'cf3459dc966a8943f0719994f20223d6f3cceb38':
Remove ability to enable/disable phoneaccounts (3/6)
0fada66859204d88f8a997d3a449b06220cf887d 17-Sep-2014 Nancy Chen <nancychen@google.com> am b3c4b285: Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev

* commit 'b3c4b285b747c58bfa58e2c58e09cdfb2c2b03b8':
Remove ability to enable/disable phoneaccounts (3/6)
cf3459dc966a8943f0719994f20223d6f3cceb38 17-Sep-2014 Nancy Chen <nancychen@google.com> am b3c4b285: Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev

* commit 'b3c4b285b747c58bfa58e2c58e09cdfb2c2b03b8':
Remove ability to enable/disable phoneaccounts (3/6)
b3c4b285b747c58bfa58e2c58e09cdfb2c2b03b8 17-Sep-2014 Nancy Chen <nancychen@google.com> Merge "Remove ability to enable/disable phoneaccounts (3/6)" into lmp-dev
a5ef39b1f1d96c3af3771c7176a2176c55ccf493 17-Sep-2014 Andrew Lee <anwlee@google.com> am ba925154: am 7c1d5c56: am 701dc006: Use telecomm DiconnectCause in services/Telecomm.

* commit 'ba925154546a161eafe086e66e956a2c0079109f':
Use telecomm DiconnectCause in services/Telecomm.
2d1acb6af47d13dc330b99c476e4208db38e1cd3 17-Sep-2014 Andrew Lee <anwlee@google.com> am 665a6adb: am b4b44ee0: am 701dc006: Use telecomm DiconnectCause in services/Telecomm.

* commit '665a6adb9e1b3dbc679778d0e5d5366365b6c42f':
Use telecomm DiconnectCause in services/Telecomm.
ba925154546a161eafe086e66e956a2c0079109f 17-Sep-2014 Andrew Lee <anwlee@google.com> am 7c1d5c56: am 701dc006: Use telecomm DiconnectCause in services/Telecomm.

* commit '7c1d5c563f39482091224907885e70fdf2237202':
Use telecomm DiconnectCause in services/Telecomm.
665a6adb9e1b3dbc679778d0e5d5366365b6c42f 17-Sep-2014 Andrew Lee <anwlee@google.com> am b4b44ee0: am 701dc006: Use telecomm DiconnectCause in services/Telecomm.

* commit 'b4b44ee053672675e62c8b20f1baf094adb4e74d':
Use telecomm DiconnectCause in services/Telecomm.
b4b44ee053672675e62c8b20f1baf094adb4e74d 16-Sep-2014 Andrew Lee <anwlee@google.com> am 701dc006: Use telecomm DiconnectCause in services/Telecomm.

* commit '701dc006ac11625b55d872f1639107b028933895':
Use telecomm DiconnectCause in services/Telecomm.
7c1d5c563f39482091224907885e70fdf2237202 16-Sep-2014 Andrew Lee <anwlee@google.com> am 701dc006: Use telecomm DiconnectCause in services/Telecomm.

* commit '701dc006ac11625b55d872f1639107b028933895':
Use telecomm DiconnectCause in services/Telecomm.
c43894f93d4481eac726e1a47b3fe1b620f37876 16-Sep-2014 Yorke Lee <yorkelee@google.com> Implement DTMF tones in test RemoteConference

Bug: 17512380
Change-Id: I645366e38d52ab6f09664a3466306eb5bfe9daf2
ests/src/com/android/server/telecom/testapps/TestConnectionManager.java
2b04564f0c9df325aa4ac9b204303ce669da0a42 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 25fa3bdf: am 44595723: am 7ff302ce: am e425e060: Merge "Fix for busted call duration in CDMA conference" into lmp-dev

* commit '25fa3bdfa2b39443cb8a6c9f3db7d1b0eab29a12':
Fix for busted call duration in CDMA conference
569a1b752e675d6260b58c5f2991f537c631643a 16-Sep-2014 Santos Cordon <santoscordon@google.com> am 656f1ed6: am 78b3abdc: am bc8aadfd: am cf2a3643: Merge "Remove config variable to disable connection service APIs" into lmp-dev

* commit '656f1ed6d765ac728b4a3850ade267be86683cb6':
Remove config variable to disable connection service APIs
d9f1bc198e9d0d07e881c56317dc3d450b1d85b0 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 90fd2ef6: am f7232813: am 565d0a56: am ee9649b8: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev

* commit '90fd2ef651e0361dc0d01a4a0ef7f2a00c88053c':
No longer require READ_PHONE_STATE permission for getCallState
1fedf267deb55ad5ab950d46027829a7f7193fd5 16-Sep-2014 Ihab Awad <ihab@google.com> am c927094a: am 0c464ca1: am f02c6622: am f1863270: Add system feature for ConnectionService API support (3/3)

* commit 'c927094aae4fa54843f53371c48a3deb0db56583':
Add system feature for ConnectionService API support (3/3)
309198ec4d8b2738cf955316ea7a2f9418929fd1 16-Sep-2014 Nancy Chen <nancychen@google.com> Remove ability to enable/disable phoneaccounts (3/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 to getCallCapablePhoneAccounts

Bug: 17510811
Change-Id: I5e8a59fe2aaac2563fe4bf97138975e30b45aa3c
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/TelecomServiceImpl.java
ests/src/com/android/server/telecom/testapps/CallServiceNotifier.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
cf5c34be516a47fc66fc8bebe85c81f799679298 16-Sep-2014 Baligh Uddin <baligh@google.com> am 52a5473d: (-s ours) am 2b8aa505: (-s ours) am 13a52774: (-s ours) am 2fb76dd5: (-s ours) Import translations. DO NOT MERGE

* commit '52a5473da5ae5214a3114c2521d7b3289f056b44':
3f27d5fe99997b0241dc5f54408b2d3d797068fa 16-Sep-2014 Santos Cordon <santoscordon@google.com> am e8efabb7: am 5a6245c8: am 12963ccd: am 8ed91f13: Merge "Repeat ringtones every 3 seconds." into lmp-dev

* commit 'e8efabb7b2fbb68bb9e9fb7abb7746d722c1e0e8':
9c19edad23c5379d61e5ad506a0982984dad083c 16-Sep-2014 Santos Cordon <santoscordon@google.com> am e516108e: am cf9403d1: am cb437d76: am f193ba45: Guard against simultaneous calls.

* commit 'e516108e3db475b3f30f44731f5e8ade81120dbf':
5d1495f5669f154bd9e78c24f72848db978665f5 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 5863a779: am e78e0fec: am 5d20b687: am de4500b9: Delete unnecessary obj/APPS/Telecomm_intermediates folder

* commit '5863a7791e010a62a4cf3897ed28d2e780cc8d1e':
46d81937a9ea20ebef530f1bd74ee997137fff94 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 91b27002: am 4f1cad70: am 6e20ee5a: am 1dcca119: Merge "Add cleanspec to Telecomm." into lmp-dev

* commit '91b27002141dcfeccde39ea87adcc784fb2c40b3':
3378ba271b8f16de4d4bbd641e6bf1e55a391833 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 0b8e9a37: am 4147c48f: am af7ab8cc: am f86db2e6: Add getCallState to Telecomm

* commit '0b8e9a37426c0453ffd724a26009541de20be658':
25a91d6c3007f3ac8ed6a1a75162e9bf2f131e96 16-Sep-2014 Tyler Gunn <tgunn@google.com> am 2899eb86: am 20372058: am 33bc44e9: am 7cc70b4f: Renaming Telecomm to Telecom.

* commit '2899eb865b8bc428c0f3ac27ed42fdd37bb480e8':
3fcecb104301132028488dd9060fbea15d6a3d82 16-Sep-2014 Sailesh Nepal <sail@google.com> am 68a16c0b: am 8feba762: am 2f0891fb: am b9fc537f: Merge "Use the new phone number extra for incoming calls" into lmp-dev

* commit '68a16c0b3a230a03f04440734d07df6265c7bda1':
6072990c5747f87c9c348819f8d4a0ea41a7e3c1 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 68804c07: am f598808f: am 5d926544: am d1305253: Merge "Broadcast phone state changes on an aggregate basis" into lmp-dev

* commit '68804c070bc04c738b8542e7d9143b9f26c0eeea':
701dc006ac11625b55d872f1639107b028933895 12-Sep-2014 Andrew Lee <anwlee@google.com> Use telecomm DiconnectCause in services/Telecomm.

+ Some of this is straightforward replacing the old disconnect cause
code/message with the new DisconnectCause object.
+ Replace codes in some instances; most maps straightforwardly to the
newer generic set of disconnect causes.
+ InCallToneMonitor can no longer rely on the specific telephony
DisconnectCauses. Now, instead, they map from a tone (which is
specified on the new telecomm DisconnectCauses) to the type of tone
which should be played in InCall. Most of these are just taking
unique matches from InCallTonePlayer. It is a little redundant, as
the conversion just flips, but it seemed like the easiest way to
accomplish this given current constraints.

+ Behavior is unchanged, but now DisconnectCause.OUT_OF_SERVICE
will invoke InCallTonePlayer.TONE_CDMA_DROP.
+ Now play TONE_PROP_PROMPT regardless of whether there is precisely
one remaining call; this is because we can't distinguish between
telephony DisconnectCause.ERROR_UNSPECIFIED/NORMAL/LOCAL. I figured
this would be a relatively minor change in scenario, and it wouldn't
hurt for a tone to be played even in a disconnect in that scenario.

Bug: 17329632
Change-Id: I85767d424bcfd59b3929819c9c6de46fc4a8629e
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/CreateConnectionResponse.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallToneMonitor.java
rc/com/android/server/telecom/MissedCallNotifier.java
ests/src/com/android/server/telecom/testapps/TestConnectionManager.java
ests/src/com/android/server/telecom/testapps/TestConnectionService.java
17c3941f6393365e1d1f4c4a5ba26556f1a674ee 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 39861068: am d0cbdb0b: am e425e060: Merge "Fix for busted call duration in CDMA conference" into lmp-dev

* commit '39861068f723a83198bc9393c95fed82a2ffa0f4':
Fix for busted call duration in CDMA conference
39861068f723a83198bc9393c95fed82a2ffa0f4 16-Sep-2014 Yorke Lee <yorkelee@google.com> am d0cbdb0b: am e425e060: Merge "Fix for busted call duration in CDMA conference" into lmp-dev

* commit 'd0cbdb0b667a6cd2d80f3dba9ea361fffa8b8ab7':
Fix for busted call duration in CDMA conference
96a4f8d9bfb3081dfc07984f5d75d9cc12f79215 16-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I6ff7f983b537680ca46af7169b2d4f410e899488
Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
25fa3bdfa2b39443cb8a6c9f3db7d1b0eab29a12 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 44595723: am 7ff302ce: am e425e060: Merge "Fix for busted call duration in CDMA conference" into lmp-dev

* commit '44595723f4623bf04f9e8e6a8c2f128fb1c018bd':
Fix for busted call duration in CDMA conference
656f1ed6d765ac728b4a3850ade267be86683cb6 16-Sep-2014 Santos Cordon <santoscordon@google.com> am 78b3abdc: am bc8aadfd: am cf2a3643: Merge "Remove config variable to disable connection service APIs" into lmp-dev

* commit '78b3abdc08feace1b4220a0252ed9cd9eccc0d37':
Remove config variable to disable connection service APIs
90fd2ef651e0361dc0d01a4a0ef7f2a00c88053c 16-Sep-2014 Yorke Lee <yorkelee@google.com> am f7232813: am 565d0a56: am ee9649b8: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev

* commit 'f72328139d2ef022c37f976dd090ae0c7bdaac45':
No longer require READ_PHONE_STATE permission for getCallState
c927094aae4fa54843f53371c48a3deb0db56583 16-Sep-2014 Ihab Awad <ihab@google.com> am 0c464ca1: am f02c6622: am f1863270: Add system feature for ConnectionService API support (3/3)

* commit '0c464ca1b8f4e14efc23313c4e454daec29b4c83':
Add system feature for ConnectionService API support (3/3)
44595723f4623bf04f9e8e6a8c2f128fb1c018bd 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 7ff302ce: am e425e060: Merge "Fix for busted call duration in CDMA conference" into lmp-dev

* commit '7ff302ceaed645074948a10882901271efe9dae7':
Fix for busted call duration in CDMA conference
78b3abdc08feace1b4220a0252ed9cd9eccc0d37 16-Sep-2014 Santos Cordon <santoscordon@google.com> am bc8aadfd: am cf2a3643: Merge "Remove config variable to disable connection service APIs" into lmp-dev

* commit 'bc8aadfd63c71c16f3389fbfe31f8330930deef0':
Remove config variable to disable connection service APIs
f72328139d2ef022c37f976dd090ae0c7bdaac45 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 565d0a56: am ee9649b8: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev

* commit '565d0a5653c828caea486a5b07f1f2e0ded878f0':
No longer require READ_PHONE_STATE permission for getCallState
0c464ca1b8f4e14efc23313c4e454daec29b4c83 16-Sep-2014 Ihab Awad <ihab@google.com> am f02c6622: am f1863270: Add system feature for ConnectionService API support (3/3)

* commit 'f02c6622c21760adb39dae7cab8fb26ad09f2211':
Add system feature for ConnectionService API support (3/3)
d0cbdb0b667a6cd2d80f3dba9ea361fffa8b8ab7 16-Sep-2014 Yorke Lee <yorkelee@google.com> am e425e060: Merge "Fix for busted call duration in CDMA conference" into lmp-dev

* commit 'e425e0602bacacc0c23b14dd5070e7adf66aaf47':
Fix for busted call duration in CDMA conference
7ff302ceaed645074948a10882901271efe9dae7 16-Sep-2014 Yorke Lee <yorkelee@google.com> am e425e060: Merge "Fix for busted call duration in CDMA conference" into lmp-dev

* commit 'e425e0602bacacc0c23b14dd5070e7adf66aaf47':
Fix for busted call duration in CDMA conference
e425e0602bacacc0c23b14dd5070e7adf66aaf47 16-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Fix for busted call duration in CDMA conference" into lmp-dev
0407b3132b0bd05217ca9538dfb60bc976a57118 16-Sep-2014 Santos Cordon <santoscordon@google.com> am 9eeed9bd: am 140cc693: am f6d862b6: am 31953644: Choose WIRELESS or HEADSET when Bluetooth disconnects.

* commit '9eeed9bd2dad149515390497dd1577f6b28a1286':
19059851bac36cfa4228c6a02359ddee47c0b713 16-Sep-2014 Santos Cordon <santoscordon@google.com> am dd5ed5cd: am c6352009: am faf9169e: am a2d34dc2: Merge "Force setting initial audio state on first call." into lmp-dev

* commit 'dd5ed5cda4904e93a86b51e0b3ad163f68ed0e22':
85e6a4dc7d9b225ef1e39157415fd00bfa08f92c 16-Sep-2014 Tyler Gunn <tgunn@google.com> am 2fb3f6c3: am 522c4380: am a95f206d: am 901837c2: Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)" into lmp-dev

* commit '2fb3f6c383f2de59a240dfbbe78c159701e6d000':
a2d937795531f15518fd3dd933d8779564f80784 16-Sep-2014 Michael Wright <michaelwr@google.com> am ba7a15ef: am 5446991b: am 1b51e477: am cfe34ea2: Merge "Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY" into lmp-dev

* commit 'ba7a15eff928bdb062b68b97386b1d754052fb51':
518d3c2ac54a1939f7fd99bf8c9b364fff05086c 16-Sep-2014 Andrew Lee <anwlee@google.com> am 6ac7064d: am aa6e7f8d: am dc787d60: am 5be64bc4: Changes to complement Telecomm API cleanup.

* commit '6ac7064d98f47ac48c0f824abc16efccb20bae3b':
ef92891d185dcbdbe3f4c89e4b488c558259695b 16-Sep-2014 Nancy Chen <nancychen@google.com> am 6b3a7fc9: am e4aadd35: am d611b784: am edffa4c2: Merge "Update TelecommManager per API requirements. (2/3)" into lmp-dev

* commit '6b3a7fc91580d295762c5c1a65817158499938de':
373d3a4fd386ad71ac2d8017c3b889847cfef2e2 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 12c72906: am 38c45b18: am a501a299: am d51e4f90: Merge "Fix for mConnectTimeMillis being incorrectly set" into lmp-dev

* commit '12c729067ef80b81daa5dc11be017c5d4f146a2a':
c69d1d03e6de03dcbdb9bd19242573f34a70d167 16-Sep-2014 Santos Cordon <santoscordon@google.com> am e46556f8: am 0d661ca8: am cf2a3643: Merge "Remove config variable to disable connection service APIs" into lmp-dev

* commit 'e46556f8ec8b6b4c4efef130b44b3266d147167b':
Remove config variable to disable connection service APIs
05709574322b6dccd6c207def584a5eedc44b3ab 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 7dccaef0: am 729a2b21: am ee9649b8: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev

* commit '7dccaef0b7abba4ac0bd8201a8febb4dda5789c8':
No longer require READ_PHONE_STATE permission for getCallState
e46556f8ec8b6b4c4efef130b44b3266d147167b 16-Sep-2014 Santos Cordon <santoscordon@google.com> am 0d661ca8: am cf2a3643: Merge "Remove config variable to disable connection service APIs" into lmp-dev

* commit '0d661ca8319e8618e4924fde9c06462145aaeb5b':
Remove config variable to disable connection service APIs
7dccaef0b7abba4ac0bd8201a8febb4dda5789c8 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 729a2b21: am ee9649b8: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev

* commit '729a2b21897f8fbafb6c71d0d583f26db694360a':
No longer require READ_PHONE_STATE permission for getCallState
97c6a14cb7b8391da4761f101eb7b02a6de9b03f 16-Sep-2014 Ihab Awad <ihab@google.com> am 04b1c7dd: am 01553658: am f1863270: Add system feature for ConnectionService API support (3/3)

* commit '04b1c7dd21a3c6aebd4982ac7064043c6ceef71b':
Add system feature for ConnectionService API support (3/3)
0d661ca8319e8618e4924fde9c06462145aaeb5b 16-Sep-2014 Santos Cordon <santoscordon@google.com> am cf2a3643: Merge "Remove config variable to disable connection service APIs" into lmp-dev

* commit 'cf2a3643939b82dec60f1213a0a9890d56158120':
Remove config variable to disable connection service APIs
729a2b21897f8fbafb6c71d0d583f26db694360a 16-Sep-2014 Yorke Lee <yorkelee@google.com> am ee9649b8: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev

* commit 'ee9649b8694f2f6867b99072b8184e998359fc7c':
No longer require READ_PHONE_STATE permission for getCallState
04b1c7dd21a3c6aebd4982ac7064043c6ceef71b 16-Sep-2014 Ihab Awad <ihab@google.com> am 01553658: am f1863270: Add system feature for ConnectionService API support (3/3)

* commit '015536588ba864acf77d3a63f43acac295758a87':
Add system feature for ConnectionService API support (3/3)
bc8aadfd63c71c16f3389fbfe31f8330930deef0 16-Sep-2014 Santos Cordon <santoscordon@google.com> am cf2a3643: Merge "Remove config variable to disable connection service APIs" into lmp-dev

* commit 'cf2a3643939b82dec60f1213a0a9890d56158120':
Remove config variable to disable connection service APIs
565d0a5653c828caea486a5b07f1f2e0ded878f0 16-Sep-2014 Yorke Lee <yorkelee@google.com> am ee9649b8: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev

* commit 'ee9649b8694f2f6867b99072b8184e998359fc7c':
No longer require READ_PHONE_STATE permission for getCallState
a9173085c5c176d3f632e50e962701bba2473b2a 16-Sep-2014 Yorke Lee <yorkelee@google.com> Fix for busted call duration in CDMA conference

A connect time of 0 is invalid and should not be used to determine
a parent's connect time.

Bug: 17508340
Change-Id: I21723100deee349b00a10f142b32a882f3bd925e
rc/com/android/server/telecom/InCallController.java
2e7ef5dcac3502c77a8505e44554e08fabc45432 16-Sep-2014 Nancy Chen <nancychen@google.com> am 2ae21986: am 79295607: am 53999d0a: am 24d3cd78: Merge "Make changes to Connection in Telecomm API (3/4)" into lmp-dev

* commit '2ae21986be74e36aaa2cb54e76d451b51929b990':
486d32aac91ccd9f51cd587e47eb247ea6a5baf0 16-Sep-2014 Tyler Gunn <tgunn@google.com> am 8e1cd138: am 754851f4: am fdaadd0f: am 8e0fef4e: Allowing enable/disable of phone accounts. (2/3)

* commit '8e1cd1383d88c2309ebb78d333b4fff3ab931868':
04e1e7f29789991e5d2ca7fdea5ca8b954b82ac6 16-Sep-2014 Nancy Chen <nancychen@google.com> am d686a9ee: am 1cf912ad: am f6289f39: am 671ce297: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (4/4)" into lmp-dev

* commit 'd686a9ee7d069f6e2b4749a2d910830f6e3535d2':
f4a84138edd484ca168317c258693792775defa6 16-Sep-2014 Baligh Uddin <baligh@google.com> am 2daa872e: (-s ours) am 838f860d: (-s ours) am b6b25d80: (-s ours) am d1a9da2a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '2daa872e7a98dfff4d7d66763f578f3d813a9cd8':
0d85538e5173bb590b104c1873463d4a827d9386 16-Sep-2014 Baligh Uddin <baligh@google.com> am 1e30ebe8: (-s ours) am 636d78a3: (-s ours) am ecc7180c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '1e30ebe8e7e64bfb0737ad32110199d773989932':
Import translations. DO NOT MERGE
dbcccec7fe00a8870abc3102598a8b29f5186da8 16-Sep-2014 Yorke Lee <yorkelee@google.com> am f1691a67: am 3dfd372f: Merge "Fix for DisconnectCause.INVALID_NUMBER being returned" into lmp-dev

* commit 'f1691a676ce7125f35114e68f2d52a29ce4fa363':
fc81117bcf81d28ab4aa23f16b3e241d5c4fb829 16-Sep-2014 Ihab Awad <ihab@google.com> am 2c5c5b3c: am a123a5b7: Enable (@hidden) video connection support for RemoteConnections

* commit '2c5c5b3ce0adbab2aca3850c1e1cc5516b44771b':
c87151586dbf853b1bbd9ef1815084c37471423d 16-Sep-2014 Andrew Lee <anwlee@google.com> am 51d6d6ef: am 35719ef4: Merge "API cleanup for PhoneAccount." into lmp-dev

* commit '51d6d6efb1c102f1c1f0f1f81855199dfcfaf1b5':
afabb89587389199bc3a0318df932fc8537899ed 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 88a76a76: am ad5235df: Replace Calls.FEATURES_NONE with 0 (4/4)

* commit '88a76a766354757602cce0e8e889991d11fd74b6':
0a860432ccc4c5b6534518f8d407cfbeab0d73ed 16-Sep-2014 Yorke Lee <yorkelee@google.com> am f97f2e89: am 62623c80: Merge "Fix for temporary loss of audio focus when accepting a call" into lmp-dev

* commit 'f97f2e89e886f2218af79087a02d1eba5e2b9e26':
23d2fea5e5a7f98e6462f5ab8fb952a0225b606b 16-Sep-2014 Nancy Chen <nancychen@google.com> am 386d98b0: am ea6969bc: Merge "getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation" into lmp-dev

* commit '386d98b0b7707625864754c0b951fea0851411a3':
8938652dcb66a35bdf8cc342b433955103205c21 16-Sep-2014 Santos Cordon <santoscordon@google.com> am 3488b13a: am d93a4412: Fix some unbind logic.

* commit '3488b13ab76b702adc6e57dde3048729959efc5c':
21a3775ad95b7c1db3ba364bc9a3f65d7644f2e6 16-Sep-2014 Jay Shrauner <shrauner@google.com> am 1c5f58ff: am 56a76b79: Use framework scheme definitions

* commit '1c5f58ffe743a2e85bfd986e876b4657966f2f47':
292c5f6196d1b90037565b3377229940b28d7cb0 16-Sep-2014 Santos Cordon <santoscordon@google.com> am ce21b301: am 81c06342: Merge "Add CDMA conference call capabilities" into lmp-dev

* commit 'ce21b30135e29eae53bf973e094a85631e6982a1':
37469eed752c6c09a5f586c425583d9b8d7e7fd2 16-Sep-2014 Yorke Lee <yorkelee@google.com> am a7ecafe8: am a91bc411: Merge "Disable add call for emergency calls" into lmp-dev

* commit 'a7ecafe8f3596a4eef14132532bad54bb8f43a61':
04e1754cefd46a7b939ec0c5c4882d608247a3f2 16-Sep-2014 Nancy Chen <nancychen@google.com> am 0f33e835: am 5f6f77e2: Merge "Rename listener to callback for ConferenceManager and rename strings 2/4" into lmp-dev

* commit '0f33e835d057b72d878daec9ab9b5411d2b6bcc5':
31c5ed257d0b07b3915cde19b1da594bfd25bc06 16-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am 2fdb5e4e: am 075a0214: Merge "TestVideoProvider: Update to latest camera2 API" into lmp-dev

* commit '2fdb5e4e756d63324b0dd6c8f1cee81134c92d72':
f5870e78ec4fa40f4d7c5feb4a6f7b1ae8ec7a4d 16-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> am 2e280ecf: am cb54048e: Merge "Add MODIFY_PHONE_STATE permission for changing the audio mode" into lmp-dev

* commit '2e280ecf7272b368c1ce7947dbe33cc99622aead':
b84e547006388e1111b127d9a154b433e7366326 16-Sep-2014 Andrew Lee <anwlee@google.com> am d64c672a: am e011342a: Merge "Remove Phone Account Preferences; moved to Telephony." into lmp-dev

* commit 'd64c672a9274d327679d80cd75f614f18d08a437':
a85fe90416cf7c2f172b170fba9109de19f7c640 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 16921811: am 8b6f2850: Merge "Allow starting of test incoming calls directly via adb" into lmp-dev

* commit '16921811695a8862b10dece9270b232d4f24d959':
9b3c5b53e51ec82c0d75526188c54793df9b5366 16-Sep-2014 Nancy Chen <nancychen@google.com> am f2f42f6c: am d75fabf9: Retain "voicemail:" URI for startOutgoingCall and add scheme Constants.

* commit 'f2f42f6cced79f5d9046fa89a87e6c064527c87b':
93493b8ed7f3107b2174f880f416b9a314bbe4e9 16-Sep-2014 Nancy Chen <nancychen@google.com> am 2a679855: am 81283c93: Merge "Pass voicemail: URIs directly to Telephony. Rename handle -> number" into lmp-dev

* commit '2a67985507ebec1d3e253be4417444402a0b9886':
9892e6f27b0953d2ee4a7e03ba332a9ba0862bb0 16-Sep-2014 Yorke Lee <yorkelee@google.com> am ffa2191b: am 82907364: Merge "Fix cursor leak in MissedCallNotifier" into lmp-dev

* commit 'ffa2191b1dfc72d1a3a021e63591f88cd3c38859':
60e38ddd998e78fcd1f846b5b7a1d6c6dbd83706 16-Sep-2014 Baligh Uddin <baligh@google.com> am ce7ac414: (-s ours) am 18e39757: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'ce7ac414d732ec8921f641cec0ff7df739cb3a35':
f17128819fa9994e050c20c95150705c116b6db2 16-Sep-2014 Baligh Uddin <baligh@google.com> am 123c75ca: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '123c75ca09fc02b4201a0670c22c891742fa0a40':
Import translations. DO NOT MERGE
1dc11644013d84e5a18fa4f07372ac0313ac7ceb 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 2ceee9df: am eaad2f46: Merge "Add more logging to InCallController" into lmp-dev

* commit '2ceee9df75eca876bd41e406c9c3aed477323b42':
f82a46bdcb7362f85c907b3cc5d6881eb53ec7f0 16-Sep-2014 Anthony Lee <anthonylee@google.com> am 44821a6b: am 942e8baf: Merge "b/16804395. Migrate QuickResponses from Telephony as needed." into lmp-dev

* commit '44821a6b45ec506e287a65ff0ce7e2c95a31f9ff':
c252c0b93c5fce69309ad66acc54134ba4ba752c 16-Sep-2014 Evan Charlton <evanc@google.com> am 34af3830: am 11795fe7: Merge "Remove startActivityFromInCall API" into lmp-dev

* commit '34af383048df866a0719c05556e5d1b07d72b993':
0ba789e872f2d925f541193e1e3d2faa668e336c 16-Sep-2014 Yorke Lee <yorkelee@google.com> am 9453cb77: am 65e05c6d: Merge "Don\'t send new outgoing call intent broadcast twice" into lmp-dev

* commit '9453cb773e893f7c8a69c769408868b052c833a5':
ce0b7045c8abed56d4d3ace52dcd8e8611c8228c 16-Sep-2014 Tyler Gunn <tgunn@google.com> am fc8a45b6: am 9bc67524: Merge "Add supported URI scheme to PhoneAccounts. (2/4)" into lmp-dev

* commit 'fc8a45b6a61114ef94d4c90174ac3c6003e7ac35':
50df89aa5b789ddc360b81b9bad3da0655aea402 16-Sep-2014 Santos Cordon <santoscordon@google.com> am f71d3575: am dd6147dd: Merge "Dont acquire prox sensor if there are no calls." into lmp-dev

* commit 'f71d357598c03c6f4bdb466dbfbd4c02e0ed3507':
90869ca51665e08239b54169a8233aa4a0e8851d 16-Sep-2014 Yorke Lee <yorkelee@google.com> am f83c3a4d: am f2ca85e7: Merge "Respect DND mode when activating ringer/vibrator" into lmp-dev

* commit 'f83c3a4de9ffe6b0afe53b55e9542ba34203776a':
43076a6d853cb90dc39bcadf1745c855b770e08b 16-Sep-2014 Baligh Uddin <baligh@google.com> am c967ac35: (-s ours) am a28dbcc7: (-s ours) Import translations. DO NOT MERGE

* commit 'c967ac355272f1af2f606737f2a508c086f124b1':
1ad093ededa9d60fbee718f176b9d34a48812d0e 16-Sep-2014 Baligh Uddin <baligh@google.com> am 59651417: (-s ours) am fbc75f52: (-s ours) Import translations. DO NOT MERGE

* commit '596514172d74f76372fbb895757c4705e95c1b89':
67f09c873f81e19d8699b9e87298a97fa30be433 16-Sep-2014 Baligh Uddin <baligh@google.com> am 56017d15: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '56017d15e9c91bee87433f00a7d1c1a36c4a05cf':
Import translations. DO NOT MERGE
cf2a3643939b82dec60f1213a0a9890d56158120 16-Sep-2014 Santos Cordon <santoscordon@google.com> Merge "Remove config variable to disable connection service APIs" into lmp-dev
ee9649b8694f2f6867b99072b8184e998359fc7c 16-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev
97f8c770399a8fcc3ce740129cdc01066f3ae976 16-Sep-2014 Yorke Lee <yorkelee@google.com> No longer require READ_PHONE_STATE permission for getCallState

Bug: 17510808
Change-Id: I4c10d1440fefc85d777516353e4be5245038ed68
rc/com/android/server/telecom/TelecomServiceImpl.java
015536588ba864acf77d3a63f43acac295758a87 16-Sep-2014 Ihab Awad <ihab@google.com> am f1863270: Add system feature for ConnectionService API support (3/3)

* commit 'f1863270a872c18f73fc59ab581194ed203e6612':
Add system feature for ConnectionService API support (3/3)
a1ce6671ab8b48b422ec20954ac9dd7690b95aac 16-Sep-2014 Ihab Awad <ihab@google.com> Automatically un-hold calls brought to the foreground

Bug: 17480900
Change-Id: I2018759d05fdb75794983e276c1c5c1d5a5724a6
rc/com/android/server/telecom/CallsManager.java
f02c6622c21760adb39dae7cab8fb26ad09f2211 16-Sep-2014 Ihab Awad <ihab@google.com> am f1863270: Add system feature for ConnectionService API support (3/3)

* commit 'f1863270a872c18f73fc59ab581194ed203e6612':
Add system feature for ConnectionService API support (3/3)
e3d8245f09c9d5333ebc7e2d82e684ecfeb6040e 15-Sep-2014 Santos Cordon <santoscordon@google.com> Remove config variable to disable connection service APIs

Bug: 17445268
Change-Id: I152225ffdb81dafb9bd972d7294f05a8e6e0c746
es/values/config.xml
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
f1863270a872c18f73fc59ab581194ed203e6612 12-Sep-2014 Ihab Awad <ihab@google.com> Add system feature for ConnectionService API support (3/3)

Bug: 17445268

Change-Id: I01394f91d00401c572b598ea8ffc05b613de5045
rc/com/android/server/telecom/TelecomServiceImpl.java
52a5473da5ae5214a3114c2521d7b3289f056b44 15-Sep-2014 Baligh Uddin <baligh@google.com> am 2b8aa505: (-s ours) am 13a52774: (-s ours) am 2fb76dd5: (-s ours) Import translations. DO NOT MERGE

* commit '2b8aa505b53256f2bd0a8dbe3e1282b52c0e9081':
Import translations. DO NOT MERGE
2b8aa505b53256f2bd0a8dbe3e1282b52c0e9081 15-Sep-2014 Baligh Uddin <baligh@google.com> am 13a52774: (-s ours) am 2fb76dd5: (-s ours) Import translations. DO NOT MERGE

* commit '13a5277489fa48f4031a746f5102e0b840890403':
Import translations. DO NOT MERGE
05a638076f4257e41a57159791469a46e143d319 15-Sep-2014 Baligh Uddin <baligh@google.com> am 1b7aebc3: (-s ours) am d7d05f1e: (-s ours) am 2fb76dd5: (-s ours) Import translations. DO NOT MERGE

* commit '1b7aebc341faae9af490923841e90bdfc551e681':
Import translations. DO NOT MERGE
1b7aebc341faae9af490923841e90bdfc551e681 15-Sep-2014 Baligh Uddin <baligh@google.com> am d7d05f1e: (-s ours) am 2fb76dd5: (-s ours) Import translations. DO NOT MERGE

* commit 'd7d05f1e571fe38780c5029433563c0f5733d574':
Import translations. DO NOT MERGE
d7d05f1e571fe38780c5029433563c0f5733d574 15-Sep-2014 Baligh Uddin <baligh@google.com> am 2fb76dd5: (-s ours) Import translations. DO NOT MERGE

* commit '2fb76dd595b0dffa471fe87f4f632daed81ea3dc':
Import translations. DO NOT MERGE
13a5277489fa48f4031a746f5102e0b840890403 15-Sep-2014 Baligh Uddin <baligh@google.com> am 2fb76dd5: (-s ours) Import translations. DO NOT MERGE

* commit '2fb76dd595b0dffa471fe87f4f632daed81ea3dc':
Import translations. DO NOT MERGE
2fb76dd595b0dffa471fe87f4f632daed81ea3dc 15-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic0191eeb0606a9d9c83e9a8e63d5b7baf7192c50
Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
fe5a55e551439a994c1d6a454a7c8d13a7ffd66a 15-Sep-2014 Santos Cordon <santoscordon@google.com> am 48d722b9: am 77c533ed: am 8ed91f13: Merge "Repeat ringtones every 3 seconds." into lmp-dev

* commit '48d722b92c83844e6a9e55d1d1dfbe67dc968b66':
Repeat ringtones every 3 seconds.
595c33d69a4f2f76568fb75c0562dca73d122b98 15-Sep-2014 Santos Cordon <santoscordon@google.com> am 0ff4b1ea: am e86560c4: am f193ba45: Guard against simultaneous calls.

* commit '0ff4b1ea05e40c4907f1ae7f4a8faa078fec03ae':
Guard against simultaneous calls.
e8efabb7b2fbb68bb9e9fb7abb7746d722c1e0e8 15-Sep-2014 Santos Cordon <santoscordon@google.com> am 5a6245c8: am 12963ccd: am 8ed91f13: Merge "Repeat ringtones every 3 seconds." into lmp-dev

* commit '5a6245c8c730dc9cc1fa5f5c55d2b94d7aac4d49':
Repeat ringtones every 3 seconds.
48d722b92c83844e6a9e55d1d1dfbe67dc968b66 15-Sep-2014 Santos Cordon <santoscordon@google.com> am 77c533ed: am 8ed91f13: Merge "Repeat ringtones every 3 seconds." into lmp-dev

* commit '77c533eda0b89fffba003d484dd292309e7cbbbf':
Repeat ringtones every 3 seconds.
0ff4b1ea05e40c4907f1ae7f4a8faa078fec03ae 15-Sep-2014 Santos Cordon <santoscordon@google.com> am e86560c4: am f193ba45: Guard against simultaneous calls.

* commit 'e86560c44fc16063579873d42f49c1e887a42616':
Guard against simultaneous calls.
e516108e3db475b3f30f44731f5e8ade81120dbf 15-Sep-2014 Santos Cordon <santoscordon@google.com> am cf9403d1: am cb437d76: am f193ba45: Guard against simultaneous calls.

* commit 'cf9403d16d7e1d92a271c4774026785f8cc50d01':
Guard against simultaneous calls.
5a6245c8c730dc9cc1fa5f5c55d2b94d7aac4d49 15-Sep-2014 Santos Cordon <santoscordon@google.com> am 12963ccd: am 8ed91f13: Merge "Repeat ringtones every 3 seconds." into lmp-dev

* commit '12963ccdbe6073deb46e95bb1935a440f697f861':
Repeat ringtones every 3 seconds.
77c533eda0b89fffba003d484dd292309e7cbbbf 15-Sep-2014 Santos Cordon <santoscordon@google.com> am 8ed91f13: Merge "Repeat ringtones every 3 seconds." into lmp-dev

* commit '8ed91f13aa723be75b303d1615f70992f1d4186a':
Repeat ringtones every 3 seconds.
e86560c44fc16063579873d42f49c1e887a42616 15-Sep-2014 Santos Cordon <santoscordon@google.com> am f193ba45: Guard against simultaneous calls.

* commit 'f193ba45fae5bc87e6a57779e4f5b56be59d08b0':
Guard against simultaneous calls.
cf9403d16d7e1d92a271c4774026785f8cc50d01 15-Sep-2014 Santos Cordon <santoscordon@google.com> am cb437d76: am f193ba45: Guard against simultaneous calls.

* commit 'cb437d76fc750552ada00729e53f62343d69ee2b':
Guard against simultaneous calls.
12963ccdbe6073deb46e95bb1935a440f697f861 15-Sep-2014 Santos Cordon <santoscordon@google.com> am 8ed91f13: Merge "Repeat ringtones every 3 seconds." into lmp-dev

* commit '8ed91f13aa723be75b303d1615f70992f1d4186a':
Repeat ringtones every 3 seconds.
8ed91f13aa723be75b303d1615f70992f1d4186a 15-Sep-2014 Santos Cordon <santoscordon@google.com> Merge "Repeat ringtones every 3 seconds." into lmp-dev
cb437d76fc750552ada00729e53f62343d69ee2b 15-Sep-2014 Santos Cordon <santoscordon@google.com> am f193ba45: Guard against simultaneous calls.

* commit 'f193ba45fae5bc87e6a57779e4f5b56be59d08b0':
Guard against simultaneous calls.
f193ba45fae5bc87e6a57779e4f5b56be59d08b0 12-Sep-2014 Santos Cordon <santoscordon@google.com> Guard against simultaneous calls.

1. If you get an incoming call we auto reject it if any calls exist which
are in any state of dialing out. (Tested with SIP/PSTN combination).
2. If you answer an incoming call, we automatically disconnect the
foreground call if it does not support being put on hold. (Tested with
SIP/Cdma combination).

- Also fix bug where we were allowing a child call to be set as the
foreground call.

Bug: 17323602
Change-Id: Idf448299a17c6e6d9a6ed2c148af8e4cc9c16594
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/MissedCallNotifier.java
5863a7791e010a62a4cf3897ed28d2e780cc8d1e 14-Sep-2014 Yorke Lee <yorkelee@google.com> am e78e0fec: am 5d20b687: am de4500b9: Delete unnecessary obj/APPS/Telecomm_intermediates folder

* commit 'e78e0fec343233877296de46b31f70c2d087cc96':
Delete unnecessary obj/APPS/Telecomm_intermediates folder
b21c5daa6ce683d7f6a1605a50a7ae05c520309f 12-Sep-2014 Santos Cordon <santoscordon@google.com> Repeat ringtones every 3 seconds.

This repeats ringtones at multiples of 3 seconds. E.g., if the ringtone
is 2 seconds long it will repeat every 3 seconds, if it is 4 secs long
it will repeat every 6 seconds, if it is 7 secs long, it repeats every
9...you get the picture.

Bug: 17466554
Change-Id: I4cad6d03b92cde7d5d1652fc91834c7499c2960a
rc/com/android/server/telecom/AsyncRingtonePlayer.java
e78e0fec343233877296de46b31f70c2d087cc96 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 5d20b687: am de4500b9: Delete unnecessary obj/APPS/Telecomm_intermediates folder

* commit '5d20b687ebbaa341fe7eaa5e888c1744f2c62c39':
Delete unnecessary obj/APPS/Telecomm_intermediates folder
5d20b687ebbaa341fe7eaa5e888c1744f2c62c39 14-Sep-2014 Yorke Lee <yorkelee@google.com> am de4500b9: Delete unnecessary obj/APPS/Telecomm_intermediates folder

* commit 'de4500b92314f724a8d8e013571e044343a972b9':
Delete unnecessary obj/APPS/Telecomm_intermediates folder
365b5e877546fd25e28aa6a14426f1525354d43b 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 5fadad26: am 206ab952: am de4500b9: Delete unnecessary obj/APPS/Telecomm_intermediates folder

* commit '5fadad26982c91c50d156454d763e5043705bb0c':
Delete unnecessary obj/APPS/Telecomm_intermediates folder
5fadad26982c91c50d156454d763e5043705bb0c 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 206ab952: am de4500b9: Delete unnecessary obj/APPS/Telecomm_intermediates folder

* commit '206ab952a3a609ad8e2bd7cae158ba9dd58a10d4':
Delete unnecessary obj/APPS/Telecomm_intermediates folder
ae9b268265360abcdeb70c4cd0a44e4386142258 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 794e3b39: am 80943efc: am 1dcca119: Merge "Add cleanspec to Telecomm." into lmp-dev

* commit '794e3b396b48fb764170b4b112d7dfe93dab8d3d':
Add cleanspec to Telecomm.
18453c11273e5b38fb16e9cbfb09ff406a099b07 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 752d45c7: am 30070b90: am f86db2e6: Add getCallState to Telecomm

* commit '752d45c7fd9a56ae2b8c5b7d776cebd929901c90':
Add getCallState to Telecomm
206ab952a3a609ad8e2bd7cae158ba9dd58a10d4 14-Sep-2014 Yorke Lee <yorkelee@google.com> am de4500b9: Delete unnecessary obj/APPS/Telecomm_intermediates folder

* commit 'de4500b92314f724a8d8e013571e044343a972b9':
Delete unnecessary obj/APPS/Telecomm_intermediates folder
91b27002141dcfeccde39ea87adcc784fb2c40b3 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 4f1cad70: am 6e20ee5a: am 1dcca119: Merge "Add cleanspec to Telecomm." into lmp-dev

* commit '4f1cad708da8dc7e143cee284bfa4ba260728f30':
Add cleanspec to Telecomm.
0b8e9a37426c0453ffd724a26009541de20be658 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 4147c48f: am af7ab8cc: am f86db2e6: Add getCallState to Telecomm

* commit '4147c48f021f58d7d303a623368280449aec23f7':
Add getCallState to Telecomm
794e3b396b48fb764170b4b112d7dfe93dab8d3d 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 80943efc: am 1dcca119: Merge "Add cleanspec to Telecomm." into lmp-dev

* commit '80943efcc75f190649bf3b5d4cb4ef0554df2128':
Add cleanspec to Telecomm.
752d45c7fd9a56ae2b8c5b7d776cebd929901c90 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 30070b90: am f86db2e6: Add getCallState to Telecomm

* commit '30070b90b628594e46d6e116d17a385486c34c74':
Add getCallState to Telecomm
4f1cad708da8dc7e143cee284bfa4ba260728f30 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 6e20ee5a: am 1dcca119: Merge "Add cleanspec to Telecomm." into lmp-dev

* commit '6e20ee5aa08b28e5824e0ff3552dd8197dfe7e4c':
Add cleanspec to Telecomm.
4147c48f021f58d7d303a623368280449aec23f7 14-Sep-2014 Yorke Lee <yorkelee@google.com> am af7ab8cc: am f86db2e6: Add getCallState to Telecomm

* commit 'af7ab8ccb61fc99ecb071f66a6cad9a344b959b7':
Add getCallState to Telecomm
80943efcc75f190649bf3b5d4cb4ef0554df2128 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 1dcca119: Merge "Add cleanspec to Telecomm." into lmp-dev

* commit '1dcca119e3ca585b002abcc3812379f7e7f8847c':
Add cleanspec to Telecomm.
6e20ee5aa08b28e5824e0ff3552dd8197dfe7e4c 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 1dcca119: Merge "Add cleanspec to Telecomm." into lmp-dev

* commit '1dcca119e3ca585b002abcc3812379f7e7f8847c':
Add cleanspec to Telecomm.
30070b90b628594e46d6e116d17a385486c34c74 14-Sep-2014 Yorke Lee <yorkelee@google.com> am f86db2e6: Add getCallState to Telecomm

* commit 'f86db2e63ec71781ac8214ed6d2603d02266143d':
Add getCallState to Telecomm
af7ab8ccb61fc99ecb071f66a6cad9a344b959b7 14-Sep-2014 Yorke Lee <yorkelee@google.com> am f86db2e6: Add getCallState to Telecomm

* commit 'f86db2e63ec71781ac8214ed6d2603d02266143d':
Add getCallState to Telecomm
de4500b92314f724a8d8e013571e044343a972b9 14-Sep-2014 Yorke Lee <yorkelee@google.com> Delete unnecessary obj/APPS/Telecomm_intermediates folder

Change-Id: Id7e45c79ac008dbbe16d613dc930bf6d8aad620a
leanSpec.mk
1dcca119e3ca585b002abcc3812379f7e7f8847c 14-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Add cleanspec to Telecomm." into lmp-dev
f86db2e63ec71781ac8214ed6d2603d02266143d 13-Sep-2014 Yorke Lee <yorkelee@google.com> Add getCallState to Telecomm

Use getCallState in TelecommManager.isInCall and isRinging

Bug: 17378767
Change-Id: Id356c03f7fa21297d0376d56e09ce3f45399435b
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/PhoneStateBroadcaster.java
rc/com/android/server/telecom/TelecomServiceImpl.java
11d3f2ca53daf07aed9345b815d07c59e5299e33 14-Sep-2014 Michael Wright <michaelwr@google.com> Add cleanspec to Telecomm.

For some reason the Telecomm APK was still referencing things in the
telecomm rather than telecom package. Removing and rebuilding fixes
these issues.

Change-Id: If0abbe6d8ece327b376788bc5915b54ff7177826
leanSpec.mk
7a1130906eb7a279aa76041af897fcf372168785 13-Sep-2014 Tyler Gunn <tgunn@google.com> am 6213a505: am e316e1e4: am 7cc70b4f: Renaming Telecomm to Telecom.

* commit '6213a505b14115fb8b7f1b9870ad51c2c3808fe5':
Renaming Telecomm to Telecom.
2899eb865b8bc428c0f3ac27ed42fdd37bb480e8 13-Sep-2014 Tyler Gunn <tgunn@google.com> am 20372058: am 33bc44e9: am 7cc70b4f: Renaming Telecomm to Telecom.

* commit '20372058e4abb237ab25c9ef753b5f84c6eb6713':
Renaming Telecomm to Telecom.
20372058e4abb237ab25c9ef753b5f84c6eb6713 13-Sep-2014 Tyler Gunn <tgunn@google.com> am 33bc44e9: am 7cc70b4f: Renaming Telecomm to Telecom.

* commit '33bc44e9ca8fb088bdd609c2406c10151fab009d':
Renaming Telecomm to Telecom.
6213a505b14115fb8b7f1b9870ad51c2c3808fe5 13-Sep-2014 Tyler Gunn <tgunn@google.com> am e316e1e4: am 7cc70b4f: Renaming Telecomm to Telecom.

* commit 'e316e1e4eb0cb15f196c139a950b1d9060f3326e':
Renaming Telecomm to Telecom.
e316e1e4eb0cb15f196c139a950b1d9060f3326e 13-Sep-2014 Tyler Gunn <tgunn@google.com> am 7cc70b4f: Renaming Telecomm to Telecom.

* commit '7cc70b4f0ad1064a4a0dce6056ad82b205887160':
Renaming Telecomm to Telecom.
33bc44e9ca8fb088bdd609c2406c10151fab009d 13-Sep-2014 Tyler Gunn <tgunn@google.com> am 7cc70b4f: Renaming Telecomm to Telecom.

* commit '7cc70b4f0ad1064a4a0dce6056ad82b205887160':
Renaming Telecomm to Telecom.
68a16c0b3a230a03f04440734d07df6265c7bda1 13-Sep-2014 Sailesh Nepal <sail@google.com> am 8feba762: am 2f0891fb: am b9fc537f: Merge "Use the new phone number extra for incoming calls" into lmp-dev

* commit '8feba762a0fcbfdd0b217e53d02daea0373542c8':
Use the new phone number extra for incoming calls
68804c070bc04c738b8542e7d9143b9f26c0eeea 13-Sep-2014 Yorke Lee <yorkelee@google.com> am f598808f: am 5d926544: am d1305253: Merge "Broadcast phone state changes on an aggregate basis" into lmp-dev

* commit 'f598808fc936d3d49df02102cc2c7b15c60a7c98':
Broadcast phone state changes on an aggregate basis
7cc70b4f0ad1064a4a0dce6056ad82b205887160 13-Sep-2014 Tyler Gunn <tgunn@google.com> 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: Ib7b20ba6348948afb391450b4eef8919261f3272
ndroid.mk
ndroidManifest.xml
es/xml/respond_via_sms_settings.xml
rc/com/android/server/telecom/AsyncResultCallback.java
rc/com/android/server/telecom/AsyncRingtonePlayer.java
rc/com/android/server/telecom/BluetoothManager.java
rc/com/android/server/telecom/Call.java
rc/com/android/server/telecom/CallActivity.java
rc/com/android/server/telecom/CallAudioManager.java
rc/com/android/server/telecom/CallIdMapper.java
rc/com/android/server/telecom/CallLogManager.java
rc/com/android/server/telecom/CallsManager.java
rc/com/android/server/telecom/CallsManagerListenerBase.java
rc/com/android/server/telecom/ConnectionServiceRepository.java
rc/com/android/server/telecom/ConnectionServiceWrapper.java
rc/com/android/server/telecom/Constants.java
rc/com/android/server/telecom/ContactsAsyncHelper.java
rc/com/android/server/telecom/CreateConnectionProcessor.java
rc/com/android/server/telecom/CreateConnectionResponse.java
rc/com/android/server/telecom/DtmfLocalTonePlayer.java
rc/com/android/server/telecom/ErrorDialogActivity.java
rc/com/android/server/telecom/HeadsetMediaButton.java
rc/com/android/server/telecom/InCallAdapter.java
rc/com/android/server/telecom/InCallController.java
rc/com/android/server/telecom/InCallToneMonitor.java
rc/com/android/server/telecom/InCallTonePlayer.java
rc/com/android/server/telecom/Log.java
rc/com/android/server/telecom/MissedCallNotifier.java
rc/com/android/server/telecom/MultiLineTitleEditTextPreference.java
rc/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
rc/com/android/server/telecom/PhoneAccountBroadcastReceiver.java
rc/com/android/server/telecom/PhoneAccountRegistrar.java
rc/com/android/server/telecom/PhoneStateBroadcaster.java
rc/com/android/server/telecom/ProximitySensorManager.java
rc/com/android/server/telecom/QuickResponseUtils.java
rc/com/android/server/telecom/README
rc/com/android/server/telecom/RespondViaSmsManager.java
rc/com/android/server/telecom/RespondViaSmsSettings.java
rc/com/android/server/telecom/RingbackPlayer.java
rc/com/android/server/telecom/Ringer.java
rc/com/android/server/telecom/ServiceBinder.java
rc/com/android/server/telecom/StatusBarNotifier.java
rc/com/android/server/telecom/TelecomApp.java
rc/com/android/server/telecom/TelecomBroadcastReceiver.java
rc/com/android/server/telecom/TelecomServiceImpl.java
rc/com/android/server/telecom/TelephonyUtil.java
rc/com/android/server/telecom/ThreadUtil.java
rc/com/android/server/telecom/Timeouts.java
rc/com/android/server/telecom/TtyManager.java
rc/com/android/server/telecom/WiredHeadsetManager.java
rc/com/android/telecomm/AsyncResultCallback.java
rc/com/android/telecomm/AsyncRingtonePlayer.java
rc/com/android/telecomm/BluetoothManager.java
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/ConnectionServiceRepository.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/Constants.java
rc/com/android/telecomm/ContactsAsyncHelper.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/CreateConnectionResponse.java
rc/com/android/telecomm/DtmfLocalTonePlayer.java
rc/com/android/telecomm/ErrorDialogActivity.java
rc/com/android/telecomm/HeadsetMediaButton.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/InCallToneMonitor.java
rc/com/android/telecomm/InCallTonePlayer.java
rc/com/android/telecomm/Log.java
rc/com/android/telecomm/MissedCallNotifier.java
rc/com/android/telecomm/MultiLineTitleEditTextPreference.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
rc/com/android/telecomm/PhoneAccountBroadcastReceiver.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/PhoneStateBroadcaster.java
rc/com/android/telecomm/ProximitySensorManager.java
rc/com/android/telecomm/QuickResponseUtils.java
rc/com/android/telecomm/README
rc/com/android/telecomm/RespondViaSmsManager.java
rc/com/android/telecomm/RespondViaSmsSettings.java
rc/com/android/telecomm/RingbackPlayer.java
rc/com/android/telecomm/Ringer.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/StatusBarNotifier.java
rc/com/android/telecomm/TelecommApp.java
rc/com/android/telecomm/TelecommBroadcastReceiver.java
rc/com/android/telecomm/TelecommServiceImpl.java
rc/com/android/telecomm/TelephonyUtil.java
rc/com/android/telecomm/ThreadUtil.java
rc/com/android/telecomm/Timeouts.java
rc/com/android/telecomm/TtyManager.java
rc/com/android/telecomm/WiredHeadsetManager.java
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/server/telecom/testapps/CallNotificationReceiver.java
ests/src/com/android/server/telecom/testapps/CallServiceNotifier.java
ests/src/com/android/server/telecom/testapps/CameraThread.java
ests/src/com/android/server/telecom/testapps/TestCallActivity.java
ests/src/com/android/server/telecom/testapps/TestConnectionManager.java
ests/src/com/android/server/telecom/testapps/TestConnectionService.java
ests/src/com/android/server/telecom/testapps/TestDialerActivity.java
ests/src/com/android/server/telecom/testapps/TestInCallServiceImpl.java
ests/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
ests/src/com/android/server/telecom/testapps/TestVideoProvider.java
ests/src/com/android/server/telecom/tests/unit/PhoneAccountRegistrarTest.java
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/CameraThread.java
ests/src/com/android/telecomm/testapps/TestCallActivity.java
ests/src/com/android/telecomm/testapps/TestConnectionManager.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
ests/src/com/android/telecomm/testapps/TestDialerActivity.java
ests/src/com/android/telecomm/testapps/TestInCallServiceImpl.java
ests/src/com/android/telecomm/testapps/TestManagedVideoProvider.java
ests/src/com/android/telecomm/testapps/TestVideoProvider.java
ests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
9eeed9bd2dad149515390497dd1577f6b28a1286 13-Sep-2014 Santos Cordon <santoscordon@google.com> am 140cc693: am f6d862b6: am 31953644: Choose WIRELESS or HEADSET when Bluetooth disconnects.

* commit '140cc69378d01691c08bf931b01cba63a06f7820':
Choose WIRELESS or HEADSET when Bluetooth disconnects.
acc6aeadf4c337e3ac43d06973c2d6e0268aa6f7 13-Sep-2014 Sailesh Nepal <sail@google.com> am 74c61b19: am 829dca44: am b9fc537f: Merge "Use the new phone number extra for incoming calls" into lmp-dev

* commit '74c61b192b6b8aaeac1ee1c815196639183356f2':
Use the new phone number extra for incoming calls
74c61b192b6b8aaeac1ee1c815196639183356f2 13-Sep-2014 Sailesh Nepal <sail@google.com> am 829dca44: am b9fc537f: Merge "Use the new phone number extra for incoming calls" into lmp-dev

* commit '829dca44c62799558ffbf4ec211ce7dea776ba5a':
Use the new phone number extra for incoming calls
30640ae6f5ea5a93ba6f4ba278081b1ee98004e8 13-Sep-2014 Yorke Lee <yorkelee@google.com> am 018f3f08: am fd49bb7a: am d1305253: Merge "Broadcast phone state changes on an aggregate basis" into lmp-dev

* commit '018f3f082af6cb998c7f374eb28908e4a9e681b9':
Broadcast phone state changes on an aggregate basis
018f3f082af6cb998c7f374eb28908e4a9e681b9 13-Sep-2014 Yorke Lee <yorkelee@google.com> am fd49bb7a: am d1305253: Merge "Broadcast phone state changes on an aggregate basis" into lmp-dev

* commit 'fd49bb7a0d54fff93b926a88bf275e31563c53af':
Broadcast phone state changes on an aggregate basis
8995c7cff70ef5b019893a3756ed4025034c464b 13-Sep-2014 Santos Cordon <santoscordon@google.com> am d4a78456: am 56a05775: am 31953644: Choose WIRELESS or HEADSET when Bluetooth disconnects.

* commit 'd4a7845637238fa3e251529223f2d11f2074fd7a':
Choose WIRELESS or HEADSET when Bluetooth disconnects.
8feba762a0fcbfdd0b217e53d02daea0373542c8 13-Sep-2014 Sailesh Nepal <sail@google.com> am 2f0891fb: am b9fc537f: Merge "Use the new phone number extra for incoming calls" into lmp-dev

* commit '2f0891fbd3ad72a6b2ead39de68f9e0a0ff22739':
Use the new phone number extra for incoming calls
2f0891fbd3ad72a6b2ead39de68f9e0a0ff22739 13-Sep-2014 Sailesh Nepal <sail@google.com> am b9fc537f: Merge "Use the new phone number extra for incoming calls" into lmp-dev

* commit 'b9fc537ff7913bda4fd7efc8c511bc3e493e4d06':
Use the new phone number extra for incoming calls
829dca44c62799558ffbf4ec211ce7dea776ba5a 13-Sep-2014 Sailesh Nepal <sail@google.com> am b9fc537f: Merge "Use the new phone number extra for incoming calls" into lmp-dev

* commit 'b9fc537ff7913bda4fd7efc8c511bc3e493e4d06':
Use the new phone number extra for incoming calls
b9fc537ff7913bda4fd7efc8c511bc3e493e4d06 13-Sep-2014 Sailesh Nepal <sail@google.com> Merge "Use the new phone number extra for incoming calls" into lmp-dev
dd5ed5cda4904e93a86b51e0b3ad163f68ed0e22 13-Sep-2014 Santos Cordon <santoscordon@google.com> am c6352009: am faf9169e: am a2d34dc2: Merge "Force setting initial audio state on first call." into lmp-dev

* commit 'c6352009fe9c80bac9612f4131311112518fca39':
Force setting initial audio state on first call.
2fb3f6c383f2de59a240dfbbe78c159701e6d000 13-Sep-2014 Tyler Gunn <tgunn@google.com> am 522c4380: am a95f206d: am 901837c2: Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)" into lmp-dev

* commit '522c4380e85e69e34e892b06751b2e345c3626be':
Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)
ba7a15eff928bdb062b68b97386b1d754052fb51 13-Sep-2014 Michael Wright <michaelwr@google.com> am 5446991b: am 1b51e477: am cfe34ea2: Merge "Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY" into lmp-dev

* commit '5446991b8181e7e0f3e6e9bd2eb68e6957a2a05d':
Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY
6ac7064d98f47ac48c0f824abc16efccb20bae3b 13-Sep-2014 Andrew Lee <anwlee@google.com> am aa6e7f8d: am dc787d60: am 5be64bc4: Changes to complement Telecomm API cleanup.

* commit 'aa6e7f8d330d30ef890d0f7df0a7c0d9ecfabb2c':
Changes to complement Telecomm API cleanup.
6b3a7fc91580d295762c5c1a65817158499938de 13-Sep-2014 Nancy Chen <nancychen@google.com> am e4aadd35: am d611b784: am edffa4c2: Merge "Update TelecommManager per API requirements. (2/3)" into lmp-dev

* commit 'e4aadd355aa02e0c23a81e275948bf6146869b0d':
Update TelecommManager per API requirements. (2/3)
12c729067ef80b81daa5dc11be017c5d4f146a2a 13-Sep-2014 Yorke Lee <yorkelee@google.com> am 38c45b18: am a501a299: am d51e4f90: Merge "Fix for mConnectTimeMillis being incorrectly set" into lmp-dev

* commit '38c45b18972efe34fe0c8149bdae286baecadcb0':
Fix for mConnectTimeMillis being incorrectly set
f598808fc936d3d49df02102cc2c7b15c60a7c98 13-Sep-2014 Yorke Lee <yorkelee@google.com> am 5d926544: am d1305253: Merge "Broadcast phone state changes on an aggregate basis" into lmp-dev

* commit '5d9265445ac5de2e85162628fadf3b7ad876bad2':
Broadcast phone state changes on an aggregate basis
fd49bb7a0d54fff93b926a88bf275e31563c53af 13-Sep-2014 Yorke Lee <yorkelee@google.com> am d1305253: Merge "Broadcast phone state changes on an aggregate basis" into lmp-dev

* commit 'd1305253f405e70aa6eb59d6db9f70b1562be8cd':
Broadcast phone state changes on an aggregate basis
5d9265445ac5de2e85162628fadf3b7ad876bad2 13-Sep-2014 Yorke Lee <yorkelee@google.com> am d1305253: Merge "Broadcast phone state changes on an aggregate basis" into lmp-dev

* commit 'd1305253f405e70aa6eb59d6db9f70b1562be8cd':
Broadcast phone state changes on an aggregate basis
d1305253f405e70aa6eb59d6db9f70b1562be8cd 13-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Broadcast phone state changes on an aggregate basis" into lmp-dev
140cc69378d01691c08bf931b01cba63a06f7820 12-Sep-2014 Santos Cordon <santoscordon@google.com> am f6d862b6: am 31953644: Choose WIRELESS or HEADSET when Bluetooth disconnects.

* commit 'f6d862b619120cf155c5e549e0dfb7c7976d8a73':
Choose WIRELESS or HEADSET when Bluetooth disconnects.
d4a7845637238fa3e251529223f2d11f2074fd7a 12-Sep-2014 Santos Cordon <santoscordon@google.com> am 56a05775: am 31953644: Choose WIRELESS or HEADSET when Bluetooth disconnects.

* commit '56a05775d0dd64a4da4bc0c23a921f41fd3ac9e2':
Choose WIRELESS or HEADSET when Bluetooth disconnects.
f6d862b619120cf155c5e549e0dfb7c7976d8a73 12-Sep-2014 Santos Cordon <santoscordon@google.com> am 31953644: Choose WIRELESS or HEADSET when Bluetooth disconnects.

* commit '31953644b056deb3da675a6305cd8d371a8d7d5a':
Choose WIRELESS or HEADSET when Bluetooth disconnects.
56a05775d0dd64a4da4bc0c23a921f41fd3ac9e2 12-Sep-2014 Santos Cordon <santoscordon@google.com> am 31953644: Choose WIRELESS or HEADSET when Bluetooth disconnects.

* commit '31953644b056deb3da675a6305cd8d371a8d7d5a':
Choose WIRELESS or HEADSET when Bluetooth disconnects.
5c86643d889c3be08a88b968834a452601d3e548 12-Sep-2014 Santos Cordon <santoscordon@google.com> am 7adbf3e1: am 964d18b3: am a2d34dc2: Merge "Force setting initial audio state on first call." into lmp-dev

* commit '7adbf3e1bc89c7f902c444a4a06fada9e7301636':
Force setting initial audio state on first call.
8a53d7513e4fd9613d23e1cb9cb46d98d9255f62 12-Sep-2014 Tyler Gunn <tgunn@google.com> am ae70dc93: am 1431130c: am 901837c2: Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)" into lmp-dev

* commit 'ae70dc93af839351502188e50a16337f70911948':
Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)
e2f9ce066c4de9b5e3146bc5ba57ee4165d85c37 12-Sep-2014 Michael Wright <michaelwr@google.com> am 565229d3: am 312c45e1: am cfe34ea2: Merge "Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY" into lmp-dev

* commit '565229d3f6814dea676feff502b5d94550c7088a':
Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY
dde5e6af4346f1fb0d56b25912dc43583434aedf 12-Sep-2014 Andrew Lee <anwlee@google.com> am ba56b190: am 6acf9c65: am 5be64bc4: Changes to complement Telecomm API cleanup.

* commit 'ba56b19079580e60e9e845831c58e997eb8eefb8':
Changes to complement Telecomm API cleanup.
edad2f7e0c00382de75754bebef11fbcb0b1e3f7 12-Sep-2014 Nancy Chen <nancychen@google.com> am 4347050d: am 2057e7e7: am edffa4c2: Merge "Update TelecommManager per API requirements. (2/3)" into lmp-dev

* commit '4347050de17a094446fdfa5772cc1ef6a785373c':
Update TelecommManager per API requirements. (2/3)
5db7149c872fcfc935b33cb5fd699fad37ff7d9b 12-Sep-2014 Yorke Lee <yorkelee@google.com> am c79fcd37: am 98457d5a: am d51e4f90: Merge "Fix for mConnectTimeMillis being incorrectly set" into lmp-dev

* commit 'c79fcd3702d25a780e688ae1b30557954a04d068':
Fix for mConnectTimeMillis being incorrectly set
8537d6ffc7c4e165c046f2c83f5cadca1a151ab9 12-Sep-2014 Nancy Chen <nancychen@google.com> am ed6fecb1: am 0ac366f8: am 24d3cd78: Merge "Make changes to Connection in Telecomm API (3/4)" into lmp-dev

* commit 'ed6fecb10973ed090d2f02cd0a20ad561832a987':
Make changes to Connection in Telecomm API (3/4)
857d7bafafcf0fa4dcadeb2fbfb9b64a08b83c63 12-Sep-2014 Tyler Gunn <tgunn@google.com> am 3890250c: am e1cf1efb: am 8e0fef4e: Allowing enable/disable of phone accounts. (2/3)

* commit '3890250c155104cd33c9a5fdec4ed76cb948eb9a':
Allowing enable/disable of phone accounts. (2/3)
dfa0236be18dbf6f4b0c2913c43b6b3bcdabd50f 12-Sep-2014 Nancy Chen <nancychen@google.com> am 604dd42e: am 2033e21f: am 671ce297: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (4/4)" into lmp-dev

* commit '604dd42e731981f83a324816971afaeec0ad906b':
API changes in GatewayInfo, Response, and PropertyPresentation (4/4)
f250ac4131d00efc4314cfac24e4da3e9517c468 12-Sep-2014 Baligh Uddin <baligh@google.com> am c2589135: (-s ours) am 58d09d59: (-s ours) am d1a9da2a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'c25891358c9f6b284eeb0a6780f46546721d39d5':
Import translations. DO NOT MERGE
2ae21986be74e36aaa2cb54e76d451b51929b990 12-Sep-2014 Nancy Chen <nancychen@google.com> am 79295607: am 53999d0a: am 24d3cd78: Merge "Make changes to Connection in Telecomm API (3/4)" into lmp-dev

* commit '7929560704d3e9ea3e615e6bf9388f1f00c10a79':
Make changes to Connection in Telecomm API (3/4)
8e1cd1383d88c2309ebb78d333b4fff3ab931868 12-Sep-2014 Tyler Gunn <tgunn@google.com> am 754851f4: am fdaadd0f: am 8e0fef4e: Allowing enable/disable of phone accounts. (2/3)

* commit '754851f4af014516f600ae8cf37a5de4ea150e97':
Allowing enable/disable of phone accounts. (2/3)
d686a9ee7d069f6e2b4749a2d910830f6e3535d2 12-Sep-2014 Nancy Chen <nancychen@google.com> am 1cf912ad: am f6289f39: am 671ce297: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (4/4)" into lmp-dev

* commit '1cf912ada8c8309578e411d4464aeabdf89c8541':
API changes in GatewayInfo, Response, and PropertyPresentation (4/4)
2daa872e7a98dfff4d7d66763f578f3d813a9cd8 12-Sep-2014 Baligh Uddin <baligh@google.com> am 838f860d: (-s ours) am b6b25d80: (-s ours) am d1a9da2a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '838f860d44a8f0623c2368240f59252007bad3d6':
Import translations. DO NOT MERGE
1e30ebe8e7e64bfb0737ad32110199d773989932 12-Sep-2014 Baligh Uddin <baligh@google.com> am 636d78a3: (-s ours) am ecc7180c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '636d78a340cf93b0b0f179827cfda102bc17987d':
Import translations. DO NOT MERGE
c6352009fe9c80bac9612f4131311112518fca39 12-Sep-2014 Santos Cordon <santoscordon@google.com> am faf9169e: am a2d34dc2: Merge "Force setting initial audio state on first call." into lmp-dev

* commit 'faf9169eeb341fe1b2cee09f3c89440632439b21':
Force setting initial audio state on first call.
522c4380e85e69e34e892b06751b2e345c3626be 12-Sep-2014 Tyler Gunn <tgunn@google.com> am a95f206d: am 901837c2: Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)" into lmp-dev

* commit 'a95f206ddfd8541da10dccb9c59d1b20bd906bb4':
Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)
5446991b8181e7e0f3e6e9bd2eb68e6957a2a05d 12-Sep-2014 Michael Wright <michaelwr@google.com> am 1b51e477: am cfe34ea2: Merge "Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY" into lmp-dev

* commit '1b51e477d4c853e9c4e4efbb9447777913303ef9':
Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY
aa6e7f8d330d30ef890d0f7df0a7c0d9ecfabb2c 12-Sep-2014 Andrew Lee <anwlee@google.com> am dc787d60: am 5be64bc4: Changes to complement Telecomm API cleanup.

* commit 'dc787d609f33ae1e6bf65d2fab6c44c07265b933':
Changes to complement Telecomm API cleanup.
e4aadd355aa02e0c23a81e275948bf6146869b0d 12-Sep-2014 Nancy Chen <nancychen@google.com> am d611b784: am edffa4c2: Merge "Update TelecommManager per API requirements. (2/3)" into lmp-dev

* commit 'd611b784eee1d5b53a5c90dd7dba8cc4bba57d7c':
Update TelecommManager per API requirements. (2/3)
38c45b18972efe34fe0c8149bdae286baecadcb0 12-Sep-2014 Yorke Lee <yorkelee@google.com> am a501a299: am d51e4f90: Merge "Fix for mConnectTimeMillis being incorrectly set" into lmp-dev

* commit 'a501a299c260de964446f4cb62dff80221001c0d':
Fix for mConnectTimeMillis being incorrectly set
8aa6a0070fae1f5ddfd83eb97be8230a66f213b2 12-Sep-2014 Sailesh Nepal <sail@google.com> Use the new phone number extra for incoming calls

Bug: 17485366
Change-Id: I4033c6adc64651109de290c9bcea6e6eaa46b0b6
rc/com/android/telecomm/CallsManager.java
e19d33e309b1024261c085ddc1ee1e438442bb14 09-Sep-2014 Yorke Lee <yorkelee@google.com> Broadcast phone state changes on an aggregate basis

* Broadcast phone state changes (EXTRA_STATE_IDLE, EXTRA_STATE_OFFHOOK,
EXTRA_STATE_RINGING) based on the overall state of Telecomm rather than
on a per phone basis, to mirror previous behavior of the TelephonyManager API.

* Correctly send out EXTRA_STATE_RINGING broadcasts in onCallAdded. They
weren't getting sent out before.

* Only send a new broadcast if the phone state has changed.

* Delay the sending of the EXTRA_STATE_IDLE broadcast to when all calls
have been removed from CallsManager.
When the EXTRA_STATE_IDLE broadcast is sent by PhoneStateTracker,
TelecommManager.isInCall() returns true because the call has not
been removed from CallsManager even though it has been set to
CallState.DISCONNECTED. This causes the emergency call button in the
lock screen to think that we are still in a call, even though the
user has actually disconnected the call.

Bug: 17428150
Bug: 13455864
Change-Id: If794b269350f2032300a894f930da514da8f3118
rc/com/android/telecomm/PhoneStateBroadcaster.java
7929560704d3e9ea3e615e6bf9388f1f00c10a79 12-Sep-2014 Nancy Chen <nancychen@google.com> am 53999d0a: am 24d3cd78: Merge "Make changes to Connection in Telecomm API (3/4)" into lmp-dev

* commit '53999d0ad34fc35496c34008e3bace67cb0c1099':
Make changes to Connection in Telecomm API (3/4)
754851f4af014516f600ae8cf37a5de4ea150e97 12-Sep-2014 Tyler Gunn <tgunn@google.com> am fdaadd0f: am 8e0fef4e: Allowing enable/disable of phone accounts. (2/3)

* commit 'fdaadd0f50b08a25e4c27e8aaa6f08dd6eacac37':
Allowing enable/disable of phone accounts. (2/3)
1cf912ada8c8309578e411d4464aeabdf89c8541 12-Sep-2014 Nancy Chen <nancychen@google.com> am f6289f39: am 671ce297: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (4/4)" into lmp-dev

* commit 'f6289f39bfc1aead9c587cdb6f4a867424f89d3f':
API changes in GatewayInfo, Response, and PropertyPresentation (4/4)
838f860d44a8f0623c2368240f59252007bad3d6 12-Sep-2014 Baligh Uddin <baligh@google.com> am b6b25d80: (-s ours) am d1a9da2a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'b6b25d80b932ed1a93092e2ea6eebbf89311fc86':
Import translations. DO NOT MERGE
636d78a340cf93b0b0f179827cfda102bc17987d 12-Sep-2014 Baligh Uddin <baligh@google.com> am ecc7180c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'ecc7180c9165d71bc6155332256018b45e8203e7':
Import translations. DO NOT MERGE
31953644b056deb3da675a6305cd8d371a8d7d5a 12-Sep-2014 Santos Cordon <santoscordon@google.com> Choose WIRELESS or HEADSET when Bluetooth disconnects.

Bug: 17431383
Change-Id: I0557c325816480afcf5c255d47881c79efd984af
rc/com/android/telecomm/CallAudioManager.java
7adbf3e1bc89c7f902c444a4a06fada9e7301636 12-Sep-2014 Santos Cordon <santoscordon@google.com> am 964d18b3: am a2d34dc2: Merge "Force setting initial audio state on first call." into lmp-dev

* commit '964d18b326cf4a705810d863c8eecebac014023a':
Force setting initial audio state on first call.
faf9169eeb341fe1b2cee09f3c89440632439b21 12-Sep-2014 Santos Cordon <santoscordon@google.com> am a2d34dc2: Merge "Force setting initial audio state on first call." into lmp-dev

* commit 'a2d34dc26e4256e35616840fb4fdf1cb1f6cdb00':
Force setting initial audio state on first call.
a95f206ddfd8541da10dccb9c59d1b20bd906bb4 12-Sep-2014 Tyler Gunn <tgunn@google.com> am 901837c2: Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)" into lmp-dev

* commit '901837c2d6d107034ffcd52ddc52efc05e5c7a67':
Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)
1b51e477d4c853e9c4e4efbb9447777913303ef9 12-Sep-2014 Michael Wright <michaelwr@google.com> am cfe34ea2: Merge "Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY" into lmp-dev

* commit 'cfe34ea27689e0554d583dbd0cf39ef1ee83b6ed':
Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY
dc787d609f33ae1e6bf65d2fab6c44c07265b933 12-Sep-2014 Andrew Lee <anwlee@google.com> am 5be64bc4: Changes to complement Telecomm API cleanup.

* commit '5be64bc46c23b614d5452ca398a6bb7a512f1887':
Changes to complement Telecomm API cleanup.
d611b784eee1d5b53a5c90dd7dba8cc4bba57d7c 12-Sep-2014 Nancy Chen <nancychen@google.com> am edffa4c2: Merge "Update TelecommManager per API requirements. (2/3)" into lmp-dev

* commit 'edffa4c2929ab57262068cfd33811d57478052d4':
Update TelecommManager per API requirements. (2/3)
a501a299c260de964446f4cb62dff80221001c0d 12-Sep-2014 Yorke Lee <yorkelee@google.com> am d51e4f90: Merge "Fix for mConnectTimeMillis being incorrectly set" into lmp-dev

* commit 'd51e4f90253a1a7551a9687139f4e34e6046f926':
Fix for mConnectTimeMillis being incorrectly set
964d18b326cf4a705810d863c8eecebac014023a 12-Sep-2014 Santos Cordon <santoscordon@google.com> am a2d34dc2: Merge "Force setting initial audio state on first call." into lmp-dev

* commit 'a2d34dc26e4256e35616840fb4fdf1cb1f6cdb00':
Force setting initial audio state on first call.
a2d34dc26e4256e35616840fb4fdf1cb1f6cdb00 12-Sep-2014 Santos Cordon <santoscordon@google.com> Merge "Force setting initial audio state on first call." into lmp-dev
ae70dc93af839351502188e50a16337f70911948 12-Sep-2014 Tyler Gunn <tgunn@google.com> am 1431130c: am 901837c2: Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)" into lmp-dev

* commit '1431130c25c06cb74e59512b1e2d2ea693ab84f7':
Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)
565229d3f6814dea676feff502b5d94550c7088a 12-Sep-2014 Michael Wright <michaelwr@google.com> am 312c45e1: am cfe34ea2: Merge "Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY" into lmp-dev

* commit '312c45e1a9331491c30f791d2c59282b8f16fdf0':
Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY
ba56b19079580e60e9e845831c58e997eb8eefb8 12-Sep-2014 Andrew Lee <anwlee@google.com> am 6acf9c65: am 5be64bc4: Changes to complement Telecomm API cleanup.

* commit '6acf9c655e8c556bffa03ed1215fdde97dd680a7':
Changes to complement Telecomm API cleanup.
4347050de17a094446fdfa5772cc1ef6a785373c 12-Sep-2014 Nancy Chen <nancychen@google.com> am 2057e7e7: am edffa4c2: Merge "Update TelecommManager per API requirements. (2/3)" into lmp-dev

* commit '2057e7e7de67a00c7ddd0bf42371cfee5ddcf744':
Update TelecommManager per API requirements. (2/3)
c79fcd3702d25a780e688ae1b30557954a04d068 12-Sep-2014 Yorke Lee <yorkelee@google.com> am 98457d5a: am d51e4f90: Merge "Fix for mConnectTimeMillis being incorrectly set" into lmp-dev

* commit '98457d5ab139aa8088d16990a73d28be6ae67ffe':
Fix for mConnectTimeMillis being incorrectly set
1431130c25c06cb74e59512b1e2d2ea693ab84f7 12-Sep-2014 Tyler Gunn <tgunn@google.com> am 901837c2: Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)" into lmp-dev

* commit '901837c2d6d107034ffcd52ddc52efc05e5c7a67':
Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)
312c45e1a9331491c30f791d2c59282b8f16fdf0 12-Sep-2014 Michael Wright <michaelwr@google.com> am cfe34ea2: Merge "Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY" into lmp-dev

* commit 'cfe34ea27689e0554d583dbd0cf39ef1ee83b6ed':
Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY
6acf9c655e8c556bffa03ed1215fdde97dd680a7 12-Sep-2014 Andrew Lee <anwlee@google.com> am 5be64bc4: Changes to complement Telecomm API cleanup.

* commit '5be64bc46c23b614d5452ca398a6bb7a512f1887':
Changes to complement Telecomm API cleanup.
2057e7e7de67a00c7ddd0bf42371cfee5ddcf744 12-Sep-2014 Nancy Chen <nancychen@google.com> am edffa4c2: Merge "Update TelecommManager per API requirements. (2/3)" into lmp-dev

* commit 'edffa4c2929ab57262068cfd33811d57478052d4':
Update TelecommManager per API requirements. (2/3)
98457d5ab139aa8088d16990a73d28be6ae67ffe 12-Sep-2014 Yorke Lee <yorkelee@google.com> am d51e4f90: Merge "Fix for mConnectTimeMillis being incorrectly set" into lmp-dev

* commit 'd51e4f90253a1a7551a9687139f4e34e6046f926':
Fix for mConnectTimeMillis being incorrectly set
7c6a5ec5c039cb3cc2e19024910fbcba0ce6b4e4 12-Sep-2014 Santos Cordon <santoscordon@google.com> Force setting initial audio state on first call.

Bug: 17449052
Change-Id: I091e9ffa56e5dc5e6fefb4b7fe8c4a5f31d0750f
rc/com/android/telecomm/CallAudioManager.java
901837c2d6d107034ffcd52ddc52efc05e5c7a67 12-Sep-2014 Tyler Gunn <tgunn@google.com> Merge "Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)" into lmp-dev
cfe34ea27689e0554d583dbd0cf39ef1ee83b6ed 12-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY" into lmp-dev
5be64bc46c23b614d5452ca398a6bb7a512f1887 09-Sep-2014 Andrew Lee <anwlee@google.com> Changes to complement Telecomm API cleanup.

+ Rename from handle -> address.
+ Rename audioModeIsVoip to isVoipAudioMode.
+ Rename isRequestingRingback to isRingbackRequested.
+ Update tests.

Bug: 17329632
Change-Id: Id089a385610736fb2a69bcad5a6e3a209ea7f082
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/RingbackPlayer.java
ests/src/com/android/telecomm/testapps/TestConnectionManager.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
167090b3c21e151ad64ca7a991c526f92475b4b8 11-Sep-2014 Tyler Gunn <tgunn@google.com> Add intent broadcast when a PhoneAccount is enabled or disabled. (2/3)

- Send intent from PhoneAccountRegistry.

Bug: 17408536
Change-Id: I3f29d7bdd96347ed51458f07b50fd8e06d44da1c
rc/com/android/telecomm/PhoneAccountRegistrar.java
edffa4c2929ab57262068cfd33811d57478052d4 11-Sep-2014 Nancy Chen <nancychen@google.com> Merge "Update TelecommManager per API requirements. (2/3)" into lmp-dev
af28651e86d372991c05e5c32d60d07e87021936 10-Sep-2014 Nancy Chen <nancychen@google.com> Update TelecommManager per API requirements. (2/3)

+ Add constants GATEWAY_PROVIDER_PACKAGE and GATEWAY_ORIGINAL_ADDRESS
- Remove those corresponding constants from private packages
+ Modify clearAccounts() so it no longer takes an argument.

Bug: 17329632
Change-Id: I8b5f945f40dcab9e422ec2c69034a8e0c3249d0d
rc/com/android/telecomm/ConnectionServiceWrapper.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
d51e4f90253a1a7551a9687139f4e34e6046f926 11-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Fix for mConnectTimeMillis being incorrectly set" into lmp-dev
ed6fecb10973ed090d2f02cd0a20ad561832a987 11-Sep-2014 Nancy Chen <nancychen@google.com> am 0ac366f8: am 24d3cd78: Merge "Make changes to Connection in Telecomm API (3/4)" into lmp-dev

* commit '0ac366f840642213bb277ad0320f74e861e6678d':
Make changes to Connection in Telecomm API (3/4)
53999d0ad34fc35496c34008e3bace67cb0c1099 11-Sep-2014 Nancy Chen <nancychen@google.com> am 24d3cd78: Merge "Make changes to Connection in Telecomm API (3/4)" into lmp-dev

* commit '24d3cd78208c323461fa3a22ae734e8d331bd83b':
Make changes to Connection in Telecomm API (3/4)
0ac366f840642213bb277ad0320f74e861e6678d 11-Sep-2014 Nancy Chen <nancychen@google.com> am 24d3cd78: Merge "Make changes to Connection in Telecomm API (3/4)" into lmp-dev

* commit '24d3cd78208c323461fa3a22ae734e8d331bd83b':
Make changes to Connection in Telecomm API (3/4)
3890250c155104cd33c9a5fdec4ed76cb948eb9a 11-Sep-2014 Tyler Gunn <tgunn@google.com> am e1cf1efb: am 8e0fef4e: Allowing enable/disable of phone accounts. (2/3)

* commit 'e1cf1efb27a16f4df7abcb43194740ca572efdce':
Allowing enable/disable of phone accounts. (2/3)
604dd42e731981f83a324816971afaeec0ad906b 11-Sep-2014 Nancy Chen <nancychen@google.com> am 2033e21f: am 671ce297: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (4/4)" into lmp-dev

* commit '2033e21f9fc41ec11b26b228edce3968014e8b75':
API changes in GatewayInfo, Response, and PropertyPresentation (4/4)
24d3cd78208c323461fa3a22ae734e8d331bd83b 11-Sep-2014 Nancy Chen <nancychen@google.com> Merge "Make changes to Connection in Telecomm API (3/4)" into lmp-dev
fdaadd0f50b08a25e4c27e8aaa6f08dd6eacac37 11-Sep-2014 Tyler Gunn <tgunn@google.com> am 8e0fef4e: Allowing enable/disable of phone accounts. (2/3)

* commit '8e0fef4e1fd09116e4df4ba2ecc18f06cebe71c2':
Allowing enable/disable of phone accounts. (2/3)
f6289f39bfc1aead9c587cdb6f4a867424f89d3f 11-Sep-2014 Nancy Chen <nancychen@google.com> am 671ce297: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (4/4)" into lmp-dev

* commit '671ce297a59a74c992ca25a443386be88cb81ad7':
API changes in GatewayInfo, Response, and PropertyPresentation (4/4)
e1cf1efb27a16f4df7abcb43194740ca572efdce 11-Sep-2014 Tyler Gunn <tgunn@google.com> am 8e0fef4e: Allowing enable/disable of phone accounts. (2/3)

* commit '8e0fef4e1fd09116e4df4ba2ecc18f06cebe71c2':
Allowing enable/disable of phone accounts. (2/3)
2033e21f9fc41ec11b26b228edce3968014e8b75 11-Sep-2014 Nancy Chen <nancychen@google.com> am 671ce297: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (4/4)" into lmp-dev

* commit '671ce297a59a74c992ca25a443386be88cb81ad7':
API changes in GatewayInfo, Response, and PropertyPresentation (4/4)
8e0fef4e1fd09116e4df4ba2ecc18f06cebe71c2 09-Sep-2014 Tyler Gunn <tgunn@google.com> Allowing enable/disable of phone accounts. (2/3)

- Change broadcast listener to listen to PACKAGE_FULLY_REMOVED instead
of PACKAGE_REMOVED. This ensures re-installing an app will not
remove all PhoneAccounts, losing the enabled states.
- Changed some method names.
- Added PhoneAccountRegistrar methods to enable/disable PhoneAccounts.
- Changed PhoneAccountRegistrar register method to copy over the
previous enabled state for phone accounts.
- Added some TelecomService methods.


Bug: 17306514
Bug: 17408536

Change-Id: Ie8c5e9f3ddec988b42bee682c91671cec904076b
ndroidManifest.xml
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/PhoneAccountBroadcastReceiver.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
671ce297a59a74c992ca25a443386be88cb81ad7 11-Sep-2014 Nancy Chen <nancychen@google.com> Merge "API changes in GatewayInfo, Response, and PropertyPresentation (4/4)" into lmp-dev
03f51283f587aa08bd4a40f21c866cbb9f679e6a 11-Sep-2014 Yorke Lee <yorkelee@google.com> Fix for mConnectTimeMillis being incorrectly set

mConnectTimeMillis should be 0 at construction so that
it is correctly updated in CallsManager.markCallAsActive.

To take care of the case where CDMA conference calls go directly
into active mode, explictly set the connection time when the
conference call is created.

Bug: 17464436
Change-Id: I2e1ec98aa18a3993e1356387edeb040672826f3f
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
b6b25d80b932ed1a93092e2ea6eebbf89311fc86 11-Sep-2014 Baligh Uddin <baligh@google.com> am d1a9da2a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'd1a9da2af003a615a8a3fb2c9bcd67ead47197af':
Import translations. DO NOT MERGE
c25891358c9f6b284eeb0a6780f46546721d39d5 11-Sep-2014 Baligh Uddin <baligh@google.com> am 58d09d59: (-s ours) am d1a9da2a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '58d09d59821a75af30662cffd06b5b21e2c94946':
Import translations. DO NOT MERGE
58d09d59821a75af30662cffd06b5b21e2c94946 11-Sep-2014 Baligh Uddin <baligh@google.com> am d1a9da2a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'd1a9da2af003a615a8a3fb2c9bcd67ead47197af':
Import translations. DO NOT MERGE
d1a9da2af003a615a8a3fb2c9bcd67ead47197af 11-Sep-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-dev
ecc7180c9165d71bc6155332256018b45e8203e7 11-Sep-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
355b29d2a8c24da0586d7c38f763b1eed2a9c151 11-Sep-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
201b437535ebd07a3d8bf771920a4cb72d145ff3 08-Sep-2014 Nancy Chen <nancychen@google.com> API changes in GatewayInfo, Response, and PropertyPresentation (4/4)

* GatewayInfo: handle -> address, becomes SystemApi
* Response: hidden
* PropertyPresentation: class goes away, constants move to
TelecommManager

Bug: 17329632

Change-Id: I2514ef82b8572d22a725be34d9c9d73c301bb99f
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallController.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
204528560f29b1e4ff2abf151fe9c000ad846467 09-Sep-2014 Yorke Lee <yorkelee@google.com> am bdf2cfc9: am 5ddb7730: am 3dfd372f: Merge "Fix for DisconnectCause.INVALID_NUMBER being returned" into lmp-dev

* commit 'bdf2cfc9ea653a8fd9d66f14676d50b4bf1b59ac':
Fix for DisconnectCause.INVALID_NUMBER being returned
bdf2cfc9ea653a8fd9d66f14676d50b4bf1b59ac 09-Sep-2014 Yorke Lee <yorkelee@google.com> am 5ddb7730: am 3dfd372f: Merge "Fix for DisconnectCause.INVALID_NUMBER being returned" into lmp-dev

* commit '5ddb7730cbfbfd09c37e4eb9b1967f2663ac1476':
Fix for DisconnectCause.INVALID_NUMBER being returned
5ddb7730cbfbfd09c37e4eb9b1967f2663ac1476 09-Sep-2014 Yorke Lee <yorkelee@google.com> am 3dfd372f: Merge "Fix for DisconnectCause.INVALID_NUMBER being returned" into lmp-dev

* commit '3dfd372f9f4f74e4adaba614669f9f5894a54f81':
Fix for DisconnectCause.INVALID_NUMBER being returned
f1691a676ce7125f35114e68f2d52a29ce4fa363 09-Sep-2014 Yorke Lee <yorkelee@google.com> am 3dfd372f: Merge "Fix for DisconnectCause.INVALID_NUMBER being returned" into lmp-dev

* commit '3dfd372f9f4f74e4adaba614669f9f5894a54f81':
Fix for DisconnectCause.INVALID_NUMBER being returned
3dfd372f9f4f74e4adaba614669f9f5894a54f81 09-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Fix for DisconnectCause.INVALID_NUMBER being returned" into lmp-dev
6c801474048dffe3be4ed44f06667daa3aae03a9 09-Sep-2014 Michael Wright <michaelwr@google.com> Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY

Bug: 17290118
Change-Id: I8ec47496f5489e985d30b11681acdc37e35ef137
rc/com/android/telecomm/ProximitySensorManager.java
2d8eb3a3ef1c4d0d4b6d96392d8e0542d34a4b8c 09-Sep-2014 Nancy Chen <nancychen@google.com> Make changes to Connection in Telecomm API (3/4)

* onPhoneAccountClicked removed
* onSetAudioState -> onAudioStateChanged
* onSetState -> onStateChanged

Bug: 17329632
Change-Id: If80a82ebdef304ca16755cd1ce176940b647b9e8
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallAdapter.java
ests/src/com/android/telecomm/testapps/TestConnectionManager.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
e05257c9cd0b86f0c161bc12fc913c76e7b8ae6c 09-Sep-2014 Yorke Lee <yorkelee@google.com> Fix for DisconnectCause.INVALID_NUMBER being returned

The local variable action wasn't being updated with new intent action
after rewriteCallIntentAction was called, causing it to retain the value of
CALL_PRIVILEGED and the INVALID_NUMBER codepath to be executed.

Bug: 17430765
Change-Id: I092b94f2cbaec8fbf9d39c739a6c976483869526
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
2a4d08067e6625d9af8ec817180eafd0ed0ea05f 09-Sep-2014 Ihab Awad <ihab@google.com> am 37733344: am 228e55d6: am a123a5b7: Enable (@hidden) video connection support for RemoteConnections

* commit '37733344e516722aee6bcfe3b226ea29fa033e83':
Enable (@hidden) video connection support for RemoteConnections
2c5c5b3ce0adbab2aca3850c1e1cc5516b44771b 09-Sep-2014 Ihab Awad <ihab@google.com> am a123a5b7: Enable (@hidden) video connection support for RemoteConnections

* commit 'a123a5b741135a4f97a997e498a88ab33257d72d':
Enable (@hidden) video connection support for RemoteConnections
37733344e516722aee6bcfe3b226ea29fa033e83 09-Sep-2014 Ihab Awad <ihab@google.com> am 228e55d6: am a123a5b7: Enable (@hidden) video connection support for RemoteConnections

* commit '228e55d6f9a9de2bf87b8a743390206652c1b56a':
Enable (@hidden) video connection support for RemoteConnections
228e55d6f9a9de2bf87b8a743390206652c1b56a 09-Sep-2014 Ihab Awad <ihab@google.com> am a123a5b7: Enable (@hidden) video connection support for RemoteConnections

* commit 'a123a5b741135a4f97a997e498a88ab33257d72d':
Enable (@hidden) video connection support for RemoteConnections
a123a5b741135a4f97a997e498a88ab33257d72d 21-Aug-2014 Ihab Awad <ihab@google.com> Enable (@hidden) video connection support for RemoteConnections

Bug: 16958934

Change-Id: I315ff6ed5242c38103568b1c7710ae013cf02c4d
ests/src/com/android/telecomm/testapps/TestConnectionManager.java
ests/src/com/android/telecomm/testapps/TestManagedVideoProvider.java
615c8369370b21d8f30e5b64cf0e2927ed706913 09-Sep-2014 Andrew Lee <anwlee@google.com> am bd9de32a: am 32f5ab27: am 35719ef4: Merge "API cleanup for PhoneAccount." into lmp-dev

* commit 'bd9de32a017edbe79288ff325440fe309757c594':
API cleanup for PhoneAccount.
afbe3b3ecc57b9b7dbe76e007970a02ef0f53dd1 09-Sep-2014 Yorke Lee <yorkelee@google.com> am 47881bcc: am feda0916: am ad5235df: Replace Calls.FEATURES_NONE with 0 (4/4)

* commit '47881bccda29a3501ab07324998bc01815656cd9':
Replace Calls.FEATURES_NONE with 0 (4/4)
bd9de32a017edbe79288ff325440fe309757c594 09-Sep-2014 Andrew Lee <anwlee@google.com> am 32f5ab27: am 35719ef4: Merge "API cleanup for PhoneAccount." into lmp-dev

* commit '32f5ab271f584f09fcdb2e5f2042b0489d3bf70d':
API cleanup for PhoneAccount.
47881bccda29a3501ab07324998bc01815656cd9 09-Sep-2014 Yorke Lee <yorkelee@google.com> am feda0916: am ad5235df: Replace Calls.FEATURES_NONE with 0 (4/4)

* commit 'feda0916a994f86b18f1560aa1a87e25440e6646':
Replace Calls.FEATURES_NONE with 0 (4/4)
32f5ab271f584f09fcdb2e5f2042b0489d3bf70d 08-Sep-2014 Andrew Lee <anwlee@google.com> am 35719ef4: Merge "API cleanup for PhoneAccount." into lmp-dev

* commit '35719ef435e990485a4a1d90ce870028385775ea':
API cleanup for PhoneAccount.
feda0916a994f86b18f1560aa1a87e25440e6646 08-Sep-2014 Yorke Lee <yorkelee@google.com> am ad5235df: Replace Calls.FEATURES_NONE with 0 (4/4)

* commit 'ad5235dfde833ae2c5be986ba9f681d7538742d3':
Replace Calls.FEATURES_NONE with 0 (4/4)
51d6d6efb1c102f1c1f0f1f81855199dfcfaf1b5 08-Sep-2014 Andrew Lee <anwlee@google.com> am 35719ef4: Merge "API cleanup for PhoneAccount." into lmp-dev

* commit '35719ef435e990485a4a1d90ce870028385775ea':
API cleanup for PhoneAccount.
88a76a766354757602cce0e8e889991d11fd74b6 08-Sep-2014 Yorke Lee <yorkelee@google.com> am ad5235df: Replace Calls.FEATURES_NONE with 0 (4/4)

* commit 'ad5235dfde833ae2c5be986ba9f681d7538742d3':
Replace Calls.FEATURES_NONE with 0 (4/4)
35719ef435e990485a4a1d90ce870028385775ea 08-Sep-2014 Andrew Lee <anwlee@google.com> Merge "API cleanup for PhoneAccount." into lmp-dev
7129f1c47945f9aca51858c04daef58ada6bcc39 04-Sep-2014 Andrew Lee <anwlee@google.com> API cleanup for PhoneAccount.

Bug: 17390175
Bug: 17329632
Change-Id: I133cc2cdaa5c3abbdc88920a4995b4af570c53ef
rc/com/android/telecomm/PhoneAccountRegistrar.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
ad5235dfde833ae2c5be986ba9f681d7538742d3 08-Sep-2014 Yorke Lee <yorkelee@google.com> Replace Calls.FEATURES_NONE with 0 (4/4)

Bug: 17253963
Change-Id: I9e9e56cdf4c9a60ac1e047bef0eba2ba0c8f10fb
rc/com/android/telecomm/CallLogManager.java
bb8d49a193d1e640c974eb8d3a798d68137e3213 08-Sep-2014 Yorke Lee <yorkelee@google.com> am b06eb973: am 08a5e49b: am 62623c80: Merge "Fix for temporary loss of audio focus when accepting a call" into lmp-dev

* commit 'b06eb973c027aabd8d612bd5653cbd84e455242c':
Fix for temporary loss of audio focus when accepting a call
b06eb973c027aabd8d612bd5653cbd84e455242c 08-Sep-2014 Yorke Lee <yorkelee@google.com> am 08a5e49b: am 62623c80: Merge "Fix for temporary loss of audio focus when accepting a call" into lmp-dev

* commit '08a5e49ba2f8548b7ef1fe3f5c58488b1ee0b4c9':
Fix for temporary loss of audio focus when accepting a call
f97f2e89e886f2218af79087a02d1eba5e2b9e26 08-Sep-2014 Yorke Lee <yorkelee@google.com> am 62623c80: Merge "Fix for temporary loss of audio focus when accepting a call" into lmp-dev

* commit '62623c8055697d454990d2c995cfba405a59e92a':
Fix for temporary loss of audio focus when accepting a call
08a5e49ba2f8548b7ef1fe3f5c58488b1ee0b4c9 08-Sep-2014 Yorke Lee <yorkelee@google.com> am 62623c80: Merge "Fix for temporary loss of audio focus when accepting a call" into lmp-dev

* commit '62623c8055697d454990d2c995cfba405a59e92a':
Fix for temporary loss of audio focus when accepting a call
62623c8055697d454990d2c995cfba405a59e92a 08-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Fix for temporary loss of audio focus when accepting a call" into lmp-dev
b58fa11b354da00f09afcc76d48c8216ad9344ce 08-Sep-2014 Nancy Chen <nancychen@google.com> am a21bc117: am 5b78aad7: am ea6969bc: Merge "getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation" into lmp-dev

* commit 'a21bc11712318b676d92efbfcdcc498464cecda2':
getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation
f1614a2a07bcb0258dc57a6a908859f66c013ae3 08-Sep-2014 Santos Cordon <santoscordon@google.com> am 6ee5103f: am 5c0507a4: am d93a4412: Fix some unbind logic.

* commit '6ee5103f32b75fcda336d797e9a7389436899188':
Fix some unbind logic.
a21bc11712318b676d92efbfcdcc498464cecda2 08-Sep-2014 Nancy Chen <nancychen@google.com> am 5b78aad7: am ea6969bc: Merge "getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation" into lmp-dev

* commit '5b78aad7c732dfe02681681dd7b6ba4ef3ded72c':
getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation
6ee5103f32b75fcda336d797e9a7389436899188 08-Sep-2014 Santos Cordon <santoscordon@google.com> am 5c0507a4: am d93a4412: Fix some unbind logic.

* commit '5c0507a451d50e17479008a37e32068ce434b7ef':
Fix some unbind logic.
05705c55b81b65a3a54f4cb91cd268f6864ce6ab 08-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Iac101950bb2f9fe017ddb52e255c3252d974623c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
45e99ec9864a20cb970cb15ed796681b1e6ba5e1 08-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ib2c86aa0ebaf7ca95086a9dc0c7957ecb7777748
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
d59ec2ab437b034fbe646f4bd361d146e8585495 08-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Id78c8fe8c87620b52636ae2acd8ed6f79cb70b6b
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
5b78aad7c732dfe02681681dd7b6ba4ef3ded72c 08-Sep-2014 Nancy Chen <nancychen@google.com> am ea6969bc: Merge "getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation" into lmp-dev

* commit 'ea6969bc9b49476814b15189874fcd8f0ba33959':
getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation
5c0507a451d50e17479008a37e32068ce434b7ef 08-Sep-2014 Santos Cordon <santoscordon@google.com> am d93a4412: Fix some unbind logic.

* commit 'd93a441281e2505cc305b8037847feb1a27f9c08':
Fix some unbind logic.
386d98b0b7707625864754c0b951fea0851411a3 08-Sep-2014 Nancy Chen <nancychen@google.com> am ea6969bc: Merge "getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation" into lmp-dev

* commit 'ea6969bc9b49476814b15189874fcd8f0ba33959':
getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation
ea6969bc9b49476814b15189874fcd8f0ba33959 08-Sep-2014 Nancy Chen <nancychen@google.com> Merge "getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation" into lmp-dev
3488b13ab76b702adc6e57dde3048729959efc5c 08-Sep-2014 Santos Cordon <santoscordon@google.com> am d93a4412: Fix some unbind logic.

* commit 'd93a441281e2505cc305b8037847feb1a27f9c08':
Fix some unbind logic.
d1f1c60957edc72ea554e18b67d33419bddddf1b 06-Sep-2014 Nancy Chen <nancychen@google.com> getHandle -> getAddress (ConnectionRequest). Remove getHandlePresentation

Made changes per API review.

Bug: 17329632
Change-Id: Ib1993a6393a6f426473ad666374d0a2952070838
rc/com/android/telecomm/ConnectionServiceWrapper.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
d93a441281e2505cc305b8037847feb1a27f9c08 04-Sep-2014 Santos Cordon <santoscordon@google.com> Fix some unbind logic.

- Dont rebind to a Service if we already bound to it.
- Clean up mServiceConnection map when services disconnect.
- Unbind services which randomly disconnected.
- reuse unbind() method where possible.

Bug: 17354788
Change-Id: If31391b19da19d9da92270213641e8ba703d6ca1
rc/com/android/telecomm/InCallController.java
42afb97b25495a0ed2153738b1e4a0c3b4c17276 08-Sep-2014 Yorke Lee <yorkelee@google.com> Fix for temporary loss of audio focus when accepting a call

Bug: 16400213
Change-Id: Ia6f84a77b169122c42181c09e5d52962c8af6941
rc/com/android/telecomm/CallAudioManager.java
6b40bf237e097c1323f3932fd9e9279efa317760 07-Sep-2014 Jay Shrauner <shrauner@google.com> am df335abe: am a4af3dff: am 56a76b79: Use framework scheme definitions

* commit 'df335abe07b5d8414c845fcf01e25a78a50b24b1':
Use framework scheme definitions
df335abe07b5d8414c845fcf01e25a78a50b24b1 07-Sep-2014 Jay Shrauner <shrauner@google.com> am a4af3dff: am 56a76b79: Use framework scheme definitions

* commit 'a4af3dffa0d8b5d9fbc6c05b3f234da8cf937571':
Use framework scheme definitions
a4af3dffa0d8b5d9fbc6c05b3f234da8cf937571 07-Sep-2014 Jay Shrauner <shrauner@google.com> am 56a76b79: Use framework scheme definitions

* commit '56a76b79e2a03eb0fe070d3ef17e474ae27bb6f3':
Use framework scheme definitions
1c5f58ffe743a2e85bfd986e876b4657966f2f47 07-Sep-2014 Jay Shrauner <shrauner@google.com> am 56a76b79: Use framework scheme definitions

* commit '56a76b79e2a03eb0fe070d3ef17e474ae27bb6f3':
Use framework scheme definitions
56a76b79e2a03eb0fe070d3ef17e474ae27bb6f3 05-Sep-2014 Jay Shrauner <shrauner@google.com> Use framework scheme definitions

Use PhoneAccount defined values for SCHEME_{TEL, SIP, VOICEMAIL}.

Bug:17398074
Change-Id: I9ee0aa081cd6a98fc569a32906a3de73fed6bcbe
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/Constants.java
rc/com/android/telecomm/Log.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
ests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
607a402fd566ef67069cfb3ba63871b843be3a5d 06-Sep-2014 Santos Cordon <santoscordon@google.com> am 1957edad: am 0fa8290c: am 81c06342: Merge "Add CDMA conference call capabilities" into lmp-dev

* commit '1957edade8ea4d2f892483d54ecaa711ba5c0b93':
Add CDMA conference call capabilities
1957edade8ea4d2f892483d54ecaa711ba5c0b93 06-Sep-2014 Santos Cordon <santoscordon@google.com> am 0fa8290c: am 81c06342: Merge "Add CDMA conference call capabilities" into lmp-dev

* commit '0fa8290c2a90b0fc4e609b3c7bf929b63af3a6cf':
Add CDMA conference call capabilities
0fa8290c2a90b0fc4e609b3c7bf929b63af3a6cf 06-Sep-2014 Santos Cordon <santoscordon@google.com> am 81c06342: Merge "Add CDMA conference call capabilities" into lmp-dev

* commit '81c06342f8f6b3bbd891d2f630641671a4f2c7ce':
Add CDMA conference call capabilities
ce21b30135e29eae53bf973e094a85631e6982a1 06-Sep-2014 Santos Cordon <santoscordon@google.com> am 81c06342: Merge "Add CDMA conference call capabilities" into lmp-dev

* commit '81c06342f8f6b3bbd891d2f630641671a4f2c7ce':
Add CDMA conference call capabilities
81c06342f8f6b3bbd891d2f630641671a4f2c7ce 06-Sep-2014 Santos Cordon <santoscordon@google.com> Merge "Add CDMA conference call capabilities" into lmp-dev
6805923a2d91f9e193a4dd33f7a655587d2f173c 05-Sep-2014 Santos Cordon <santoscordon@google.com> Add CDMA conference call capabilities

Bug:17316859
Change-Id: I9cade45df541ec3e2e2e39a02a1ba989019a0e93
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallAdapter.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
812fd05f38576538585b8249652016ad0cbf3abb 06-Sep-2014 Yorke Lee <yorkelee@google.com> am 6ef8aa2d: am a637363b: am a91bc411: Merge "Disable add call for emergency calls" into lmp-dev

* commit '6ef8aa2d131f9f7d4bb0186fbd8d67f4e06a4b85':
Disable add call for emergency calls
6ef8aa2d131f9f7d4bb0186fbd8d67f4e06a4b85 06-Sep-2014 Yorke Lee <yorkelee@google.com> am a637363b: am a91bc411: Merge "Disable add call for emergency calls" into lmp-dev

* commit 'a637363b0b01e92b24ba6d70253cf33c0cfa6fc6':
Disable add call for emergency calls
a7ecafe8f3596a4eef14132532bad54bb8f43a61 06-Sep-2014 Yorke Lee <yorkelee@google.com> am a91bc411: Merge "Disable add call for emergency calls" into lmp-dev

* commit 'a91bc41142a1dcfe0329e65aa763fb44d59c1630':
Disable add call for emergency calls
a637363b0b01e92b24ba6d70253cf33c0cfa6fc6 06-Sep-2014 Yorke Lee <yorkelee@google.com> am a91bc411: Merge "Disable add call for emergency calls" into lmp-dev

* commit 'a91bc41142a1dcfe0329e65aa763fb44d59c1630':
Disable add call for emergency calls
a91bc41142a1dcfe0329e65aa763fb44d59c1630 06-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Disable add call for emergency calls" into lmp-dev
10ce856c075a06e7300dfc279a88279b0716d43c 06-Sep-2014 Yorke Lee <yorkelee@google.com> Disable add call for emergency calls

Bug: 17399223
Change-Id: I9027629273a71d6b0e5d3a469a9279fca3d527e0
rc/com/android/telecomm/InCallController.java
5c07a81510c305bcddff58463a404110c258f328 06-Sep-2014 Nancy Chen <nancychen@google.com> am 9213fbb6: am 6bdc3b27: am 5f6f77e2: Merge "Rename listener to callback for ConferenceManager and rename strings 2/4" into lmp-dev

* commit '9213fbb68bd65f860bcc9313f371e4cbcccd6ac4':
Rename listener to callback for ConferenceManager and rename strings 2/4
ac4e526d2f02bc8d613634e0cb06e98152c42c6a 06-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am a2a48399: am 4dd5f460: am 075a0214: Merge "TestVideoProvider: Update to latest camera2 API" into lmp-dev

* commit 'a2a483999ab49795d028b5cb245b45327cfaf2dd':
TestVideoProvider: Update to latest camera2 API
9213fbb68bd65f860bcc9313f371e4cbcccd6ac4 06-Sep-2014 Nancy Chen <nancychen@google.com> am 6bdc3b27: am 5f6f77e2: Merge "Rename listener to callback for ConferenceManager and rename strings 2/4" into lmp-dev

* commit '6bdc3b27e0f23813e19dae8979f72a1f9db04f7f':
Rename listener to callback for ConferenceManager and rename strings 2/4
a2a483999ab49795d028b5cb245b45327cfaf2dd 05-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am 4dd5f460: am 075a0214: Merge "TestVideoProvider: Update to latest camera2 API" into lmp-dev

* commit '4dd5f46006ff35970e7f52ed68533cc94e249042':
TestVideoProvider: Update to latest camera2 API
6bdc3b27e0f23813e19dae8979f72a1f9db04f7f 05-Sep-2014 Nancy Chen <nancychen@google.com> am 5f6f77e2: Merge "Rename listener to callback for ConferenceManager and rename strings 2/4" into lmp-dev

* commit '5f6f77e2dc1a579e9915a74cf1a30417a032e7d1':
Rename listener to callback for ConferenceManager and rename strings 2/4
0f33e835d057b72d878daec9ab9b5411d2b6bcc5 05-Sep-2014 Nancy Chen <nancychen@google.com> am 5f6f77e2: Merge "Rename listener to callback for ConferenceManager and rename strings 2/4" into lmp-dev

* commit '5f6f77e2dc1a579e9915a74cf1a30417a032e7d1':
Rename listener to callback for ConferenceManager and rename strings 2/4
5f6f77e2dc1a579e9915a74cf1a30417a032e7d1 05-Sep-2014 Nancy Chen <nancychen@google.com> Merge "Rename listener to callback for ConferenceManager and rename strings 2/4" into lmp-dev
2fdb5e4e756d63324b0dd6c8f1cee81134c92d72 05-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am 075a0214: Merge "TestVideoProvider: Update to latest camera2 API" into lmp-dev

* commit '075a021429de28760672ecaba0bd4bde2c9200d1':
TestVideoProvider: Update to latest camera2 API
4dd5f46006ff35970e7f52ed68533cc94e249042 05-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am 075a0214: Merge "TestVideoProvider: Update to latest camera2 API" into lmp-dev

* commit '075a021429de28760672ecaba0bd4bde2c9200d1':
TestVideoProvider: Update to latest camera2 API
075a021429de28760672ecaba0bd4bde2c9200d1 05-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Merge "TestVideoProvider: Update to latest camera2 API" into lmp-dev
066fc775ad653e0ce94b6253746081f6a5ea5272 05-Sep-2014 Nancy Chen <nancychen@google.com> Rename listener to callback for ConferenceManager and rename strings 2/4

Updates for items from API review. See bug for details.

Bug: 17390175
Change-Id: I608d5bed9f6ffd6ef46025cdae88af5a6787663a
ndroidManifest.xml
ests/src/com/android/telecomm/testapps/TestConnectionManager.java
70f285d0b7cb57730cdc2a8ec7700090c1d8137c 05-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> am 79b870be: am 9e7faece: am cb54048e: Merge "Add MODIFY_PHONE_STATE permission for changing the audio mode" into lmp-dev

* commit '79b870be69f373da788b8bdfd1e4a1fc42629be2':
Add MODIFY_PHONE_STATE permission for changing the audio mode
79b870be69f373da788b8bdfd1e4a1fc42629be2 05-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> am 9e7faece: am cb54048e: Merge "Add MODIFY_PHONE_STATE permission for changing the audio mode" into lmp-dev

* commit '9e7faece800a93f9441a16ab0c956f0fb8fcff2a':
Add MODIFY_PHONE_STATE permission for changing the audio mode
2e280ecf7272b368c1ce7947dbe33cc99622aead 05-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> am cb54048e: Merge "Add MODIFY_PHONE_STATE permission for changing the audio mode" into lmp-dev

* commit 'cb54048edba913f2a1eacb30ecfaa2c33456ef1f':
Add MODIFY_PHONE_STATE permission for changing the audio mode
9e7faece800a93f9441a16ab0c956f0fb8fcff2a 05-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> am cb54048e: Merge "Add MODIFY_PHONE_STATE permission for changing the audio mode" into lmp-dev

* commit 'cb54048edba913f2a1eacb30ecfaa2c33456ef1f':
Add MODIFY_PHONE_STATE permission for changing the audio mode
cb54048edba913f2a1eacb30ecfaa2c33456ef1f 05-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add MODIFY_PHONE_STATE permission for changing the audio mode" into lmp-dev
9399ae6672196db82e491ddb425c48d6a3b67451 05-Sep-2014 Eino-Ville Talvala <etalvala@google.com> TestVideoProvider: Update to latest camera2 API

- Listener -> Callback
- add/remove callbacks -> register/unregister

Bug: 17389922
Change-Id: I4b6865ca0b30f9f80707da18c90de70ec8bd9090
ests/src/com/android/telecomm/testapps/TestVideoProvider.java
5fcbe91533dcd16501770b41a8c6a7cef869a0ce 05-Sep-2014 Jean-Michel Trivi <jmtrivi@google.com> Add MODIFY_PHONE_STATE permission for changing the audio mode

AudioManager.setMode(MODE_IN_CALL) requires the
MODIFY_PHONE_STATE permission.

Bug 14964198

Change-Id: I932284b9baa83a6498ad88a87f9f19812282cd71
ndroidManifest.xml
636aa142b87307236b5f537a794763d4746601a3 05-Sep-2014 Andrew Lee <anwlee@google.com> am cecce507: am 7920f657: am e011342a: Merge "Remove Phone Account Preferences; moved to Telephony." into lmp-dev

* commit 'cecce507f74183771e0a56caa56770706d1e79d4':
Remove Phone Account Preferences; moved to Telephony.
cecce507f74183771e0a56caa56770706d1e79d4 05-Sep-2014 Andrew Lee <anwlee@google.com> am 7920f657: am e011342a: Merge "Remove Phone Account Preferences; moved to Telephony." into lmp-dev

* commit '7920f6577daae9dc553244d1ad95cc4c7ee21f9f':
Remove Phone Account Preferences; moved to Telephony.
7920f6577daae9dc553244d1ad95cc4c7ee21f9f 05-Sep-2014 Andrew Lee <anwlee@google.com> am e011342a: Merge "Remove Phone Account Preferences; moved to Telephony." into lmp-dev

* commit 'e011342ac8d79aa7a9b7e21da30f076e55946015':
Remove Phone Account Preferences; moved to Telephony.
bdb0f4c0f5dc8b560c93e0c831663029e75cbd55 05-Sep-2014 Yorke Lee <yorkelee@google.com> am b4350526: am 5b43a5f6: am 8b6f2850: Merge "Allow starting of test incoming calls directly via adb" into lmp-dev

* commit 'b435052640b3f71149d0486ca6e1dd420247ef8e':
Allow starting of test incoming calls directly via adb
d64c672a9274d327679d80cd75f614f18d08a437 05-Sep-2014 Andrew Lee <anwlee@google.com> am e011342a: Merge "Remove Phone Account Preferences; moved to Telephony." into lmp-dev

* commit 'e011342ac8d79aa7a9b7e21da30f076e55946015':
Remove Phone Account Preferences; moved to Telephony.
b435052640b3f71149d0486ca6e1dd420247ef8e 05-Sep-2014 Yorke Lee <yorkelee@google.com> am 5b43a5f6: am 8b6f2850: Merge "Allow starting of test incoming calls directly via adb" into lmp-dev

* commit '5b43a5f642433561809c9e4dc19b714313f48d94':
Allow starting of test incoming calls directly via adb
e011342ac8d79aa7a9b7e21da30f076e55946015 05-Sep-2014 Andrew Lee <anwlee@google.com> Merge "Remove Phone Account Preferences; moved to Telephony." into lmp-dev
bb8d6c023b0331daa65fb31ed4a66bc76e53a387 05-Sep-2014 Nancy Chen <nancychen@google.com> am ef560f7f: am 7ef9f1c4: am d75fabf9: Retain "voicemail:" URI for startOutgoingCall and add scheme Constants.

* commit 'ef560f7f18d1bb7eb8f343208a9a1c057ced10b5':
Retain "voicemail:" URI for startOutgoingCall and add scheme Constants.
5b43a5f642433561809c9e4dc19b714313f48d94 05-Sep-2014 Yorke Lee <yorkelee@google.com> am 8b6f2850: Merge "Allow starting of test incoming calls directly via adb" into lmp-dev

* commit '8b6f2850e5e9b3802cf8311cd1566386614af916':
Allow starting of test incoming calls directly via adb
16921811695a8862b10dece9270b232d4f24d959 05-Sep-2014 Yorke Lee <yorkelee@google.com> am 8b6f2850: Merge "Allow starting of test incoming calls directly via adb" into lmp-dev

* commit '8b6f2850e5e9b3802cf8311cd1566386614af916':
Allow starting of test incoming calls directly via adb
8b6f2850e5e9b3802cf8311cd1566386614af916 05-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Allow starting of test incoming calls directly via adb" into lmp-dev
ef560f7f18d1bb7eb8f343208a9a1c057ced10b5 05-Sep-2014 Nancy Chen <nancychen@google.com> am 7ef9f1c4: am d75fabf9: Retain "voicemail:" URI for startOutgoingCall and add scheme Constants.

* commit '7ef9f1c4d6b1cb6c657331b947a9ac371d4c2c8d':
Retain "voicemail:" URI for startOutgoingCall and add scheme Constants.
7ef9f1c4d6b1cb6c657331b947a9ac371d4c2c8d 05-Sep-2014 Nancy Chen <nancychen@google.com> am d75fabf9: Retain "voicemail:" URI for startOutgoingCall and add scheme Constants.

* commit 'd75fabf9b3787b851a29e1396d9525706c11864d':
Retain "voicemail:" URI for startOutgoingCall and add scheme Constants.
f2f42f6cced79f5d9046fa89a87e6c064527c87b 05-Sep-2014 Nancy Chen <nancychen@google.com> am d75fabf9: Retain "voicemail:" URI for startOutgoingCall and add scheme Constants.

* commit 'd75fabf9b3787b851a29e1396d9525706c11864d':
Retain "voicemail:" URI for startOutgoingCall and add scheme Constants.
edaa77a067dff2c9011653171930c052eb87aef7 04-Sep-2014 Yorke Lee <yorkelee@google.com> Allow starting of test incoming calls directly via adb

Bug: 16825519

Change-Id: I789bfed9fbe19c7775bb83455462cda39a22fb2f
ests/AndroidManifest.xml
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/TestCallActivity.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
d75fabf9b3787b851a29e1396d9525706c11864d 04-Sep-2014 Nancy Chen <nancychen@google.com> Retain "voicemail:" URI for startOutgoingCall and add scheme Constants.

We want the "voicemail:" URI to be passed to InCallUI, so do
not convert to "tel" before startOutgoingCall. Also factor out
"SCHEME_*" constants to a separate file.

Bug: 17363355
Change-Id: I6ee42bb5262d4de8121082681ccd4f2f06b74b95
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/Constants.java
rc/com/android/telecomm/MissedCallNotifier.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
rc/com/android/telecomm/RespondViaSmsManager.java
a51a386c818d3e4116b38b68daf588e2ab5e0499 03-Sep-2014 Andrew Lee <anwlee@google.com> Remove Phone Account Preferences; moved to Telephony.

+ Renamed setUserDefaultPhoneAccount to
setUserSelectedOutgoingPhoneAccount and updated test.

Bug: 17179743
Change-Id: Id2e2dc9bc0da7a8f5a35f1441db56dc99cd4bf47
ndroidManifest.xml
es/layout/phone_account_preferences.xml
es/values/strings.xml
es/xml/phone_account_preferences.xml
rc/com/android/telecomm/AccountSelectionPreference.java
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
fad924e214b780eef12f0df13d66f82786b64627 04-Sep-2014 Nancy Chen <nancychen@google.com> am 1efad59c: am bf6cdd4e: am 81283c93: Merge "Pass voicemail: URIs directly to Telephony. Rename handle -> number" into lmp-dev

* commit '1efad59cee0602307966bc0267da12796c04886c':
Pass voicemail: URIs directly to Telephony. Rename handle -> number
1efad59cee0602307966bc0267da12796c04886c 04-Sep-2014 Nancy Chen <nancychen@google.com> am bf6cdd4e: am 81283c93: Merge "Pass voicemail: URIs directly to Telephony. Rename handle -> number" into lmp-dev

* commit 'bf6cdd4efb344609ac6d3adb0a49c877e3ca60c0':
Pass voicemail: URIs directly to Telephony. Rename handle -> number
bf6cdd4efb344609ac6d3adb0a49c877e3ca60c0 04-Sep-2014 Nancy Chen <nancychen@google.com> am 81283c93: Merge "Pass voicemail: URIs directly to Telephony. Rename handle -> number" into lmp-dev

* commit '81283c937adb6527eb5401179f860099809c8a2d':
Pass voicemail: URIs directly to Telephony. Rename handle -> number
2a67985507ebec1d3e253be4417444402a0b9886 04-Sep-2014 Nancy Chen <nancychen@google.com> am 81283c93: Merge "Pass voicemail: URIs directly to Telephony. Rename handle -> number" into lmp-dev

* commit '81283c937adb6527eb5401179f860099809c8a2d':
Pass voicemail: URIs directly to Telephony. Rename handle -> number
81283c937adb6527eb5401179f860099809c8a2d 04-Sep-2014 Nancy Chen <nancychen@google.com> Merge "Pass voicemail: URIs directly to Telephony. Rename handle -> number" into lmp-dev
1bb5b87897ef3c6753ff301699183411569a0b27 04-Sep-2014 Yorke Lee <yorkelee@google.com> am 485a75a9: am 6446d28e: am 82907364: Merge "Fix cursor leak in MissedCallNotifier" into lmp-dev

* commit '485a75a9c4d33544be9affd5eb0cc13747b40f4f':
Fix cursor leak in MissedCallNotifier
308ab8bd691f4a1bc4c7c094bcffc84f5fe345aa 03-Sep-2014 Nancy Chen <nancychen@google.com> Pass voicemail: URIs directly to Telephony. Rename handle -> number

voicemail calls should be transformed to tel: numbers through Telephony.
TelephonyConnectionManager is able to pick the right number because it
has knowledge of the subscription being used for the call.

Also rename "handle" to "number" in all cases where "handle" was
referring to the phone number within a URI. The code referred to
URI "handles" as well as phone number "handles", which made it confusing
to differentiate.

Additionally removed an incorrect comment and parsed CallStates in log
messages for easier readability.

Bug: 17317190
Change-Id: I8269adef76d7770f8ef180f97c75d72b31b0bdd8
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
485a75a9c4d33544be9affd5eb0cc13747b40f4f 04-Sep-2014 Yorke Lee <yorkelee@google.com> am 6446d28e: am 82907364: Merge "Fix cursor leak in MissedCallNotifier" into lmp-dev

* commit '6446d28ee792399960825c4a4250e8c7f6f31c0f':
Fix cursor leak in MissedCallNotifier
0e655ac42148334c196e4d2756135469c23283bf 04-Sep-2014 Baligh Uddin <baligh@google.com> am 36c6323b: (-s ours) am 8b8af320: (-s ours) am 18e39757: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '36c6323b0f48c09eaa3f728d711ee25780b09e9d':
Import translations. DO NOT MERGE
6446d28ee792399960825c4a4250e8c7f6f31c0f 04-Sep-2014 Yorke Lee <yorkelee@google.com> am 82907364: Merge "Fix cursor leak in MissedCallNotifier" into lmp-dev

* commit '82907364623f47e5b92d700d1852dad680b60434':
Fix cursor leak in MissedCallNotifier
ffa2191b1dfc72d1a3a021e63591f88cd3c38859 04-Sep-2014 Yorke Lee <yorkelee@google.com> am 82907364: Merge "Fix cursor leak in MissedCallNotifier" into lmp-dev

* commit '82907364623f47e5b92d700d1852dad680b60434':
Fix cursor leak in MissedCallNotifier
82907364623f47e5b92d700d1852dad680b60434 04-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Fix cursor leak in MissedCallNotifier" into lmp-dev
36c6323b0f48c09eaa3f728d711ee25780b09e9d 04-Sep-2014 Baligh Uddin <baligh@google.com> am 8b8af320: (-s ours) am 18e39757: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '8b8af320a9823f4e491568c321b576dcca7449fb':
Import translations. DO NOT MERGE
546710be97b3adb8274233208eb8f63debff3f50 04-Sep-2014 Yorke Lee <yorkelee@google.com> Fix cursor leak in MissedCallNotifier

Bug: 17364651
Change-Id: I7f1b22f683c7dd92167e5dd96c69c2d82131e295
rc/com/android/telecomm/MissedCallNotifier.java
8b8af320a9823f4e491568c321b576dcca7449fb 04-Sep-2014 Baligh Uddin <baligh@google.com> am 18e39757: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '18e39757e53dcf174665fc5dddb19d2a6c80aa82':
Import translations. DO NOT MERGE
ce7ac414d732ec8921f641cec0ff7df739cb3a35 04-Sep-2014 Baligh Uddin <baligh@google.com> am 18e39757: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '18e39757e53dcf174665fc5dddb19d2a6c80aa82':
Import translations. DO NOT MERGE
18e39757e53dcf174665fc5dddb19d2a6c80aa82 04-Sep-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-dev
123c75ca09fc02b4201a0670c22c891742fa0a40 04-Sep-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
497b5ac9aa91b44f8cbd459968b69cdb6113623f 04-Sep-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
2ceee9df75eca876bd41e406c9c3aed477323b42 04-Sep-2014 Yorke Lee <yorkelee@google.com> am eaad2f46: Merge "Add more logging to InCallController" into lmp-dev

* commit 'eaad2f46bbe720c4d521f2955b6bd72c07b06fd5':
Add more logging to InCallController
a21fb120423625adf543bc2276940716bc2887f0 04-Sep-2014 Yorke Lee <yorkelee@google.com> am 4f72a78e: am f72638bc: am eaad2f46: Merge "Add more logging to InCallController" into lmp-dev

* commit '4f72a78e1b2149e91259530970cae0de506ef9d9':
Add more logging to InCallController
4f72a78e1b2149e91259530970cae0de506ef9d9 04-Sep-2014 Yorke Lee <yorkelee@google.com> am f72638bc: am eaad2f46: Merge "Add more logging to InCallController" into lmp-dev

* commit 'f72638bc39424717e57064333482c051ab316da3':
Add more logging to InCallController
f72638bc39424717e57064333482c051ab316da3 04-Sep-2014 Yorke Lee <yorkelee@google.com> am eaad2f46: Merge "Add more logging to InCallController" into lmp-dev

* commit 'eaad2f46bbe720c4d521f2955b6bd72c07b06fd5':
Add more logging to InCallController
eaad2f46bbe720c4d521f2955b6bd72c07b06fd5 04-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Add more logging to InCallController" into lmp-dev
49eca35430c47878acd9325607dc7474b6efeafa 04-Sep-2014 Anthony Lee <anthonylee@google.com> am 8fbfb913: am b527820a: am 942e8baf: Merge "b/16804395. Migrate QuickResponses from Telephony as needed." into lmp-dev

* commit '8fbfb91351264a8e01e107cdf66ee97f3a748e27':
b/16804395. Migrate QuickResponses from Telephony as needed.
d21aa85558fc00f233b3dd46886c52be0857ce2b 04-Sep-2014 Evan Charlton <evanc@google.com> am 69b0def2: am 9a549be4: am 11795fe7: Merge "Remove startActivityFromInCall API" into lmp-dev

* commit '69b0def208cf3f941626fbfd584e4442b3f341bb':
Remove startActivityFromInCall API
7c8c7d56066ed01030f2d84241c44cecc0fef937 04-Sep-2014 Yorke Lee <yorkelee@google.com> am 1f693a34: am a13f8ed2: am 65e05c6d: Merge "Don\'t send new outgoing call intent broadcast twice" into lmp-dev

* commit '1f693a34be19a75ab425dec7db7aa57048f1092e':
Don't send new outgoing call intent broadcast twice
aaa88dd2d46639092b95b290ac28ac81e8319dd3 03-Sep-2014 Yorke Lee <yorkelee@google.com> Add more logging to InCallController

Bug: 17354788
Change-Id: I71f2d276843f421a35241fa93ce0d56cac4fd3b8
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/InCallController.java
8fbfb91351264a8e01e107cdf66ee97f3a748e27 04-Sep-2014 Anthony Lee <anthonylee@google.com> am b527820a: am 942e8baf: Merge "b/16804395. Migrate QuickResponses from Telephony as needed." into lmp-dev

* commit 'b527820a49199f516ebde9bd8ee6011eb1b570a6':
b/16804395. Migrate QuickResponses from Telephony as needed.
69b0def208cf3f941626fbfd584e4442b3f341bb 04-Sep-2014 Evan Charlton <evanc@google.com> am 9a549be4: am 11795fe7: Merge "Remove startActivityFromInCall API" into lmp-dev

* commit '9a549be4124430e82b072060d5efcb51627a438c':
Remove startActivityFromInCall API
1f693a34be19a75ab425dec7db7aa57048f1092e 04-Sep-2014 Yorke Lee <yorkelee@google.com> am a13f8ed2: am 65e05c6d: Merge "Don\'t send new outgoing call intent broadcast twice" into lmp-dev

* commit 'a13f8ed2dae42c5e616f55c5007b0785d2b9be1d':
Don't send new outgoing call intent broadcast twice
44821a6b45ec506e287a65ff0ce7e2c95a31f9ff 04-Sep-2014 Anthony Lee <anthonylee@google.com> am 942e8baf: Merge "b/16804395. Migrate QuickResponses from Telephony as needed." into lmp-dev

* commit '942e8bafe1b6e880df9f471fe32e6a7fbe11f089':
b/16804395. Migrate QuickResponses from Telephony as needed.
34af383048df866a0719c05556e5d1b07d72b993 04-Sep-2014 Evan Charlton <evanc@google.com> am 11795fe7: Merge "Remove startActivityFromInCall API" into lmp-dev

* commit '11795fe77ec74d3fd291c7eef40fc517e6064048':
Remove startActivityFromInCall API
9453cb773e893f7c8a69c769408868b052c833a5 04-Sep-2014 Yorke Lee <yorkelee@google.com> am 65e05c6d: Merge "Don\'t send new outgoing call intent broadcast twice" into lmp-dev

* commit '65e05c6d52175827148f0db482f43357b6b8e25e':
Don't send new outgoing call intent broadcast twice
b527820a49199f516ebde9bd8ee6011eb1b570a6 04-Sep-2014 Anthony Lee <anthonylee@google.com> am 942e8baf: Merge "b/16804395. Migrate QuickResponses from Telephony as needed." into lmp-dev

* commit '942e8bafe1b6e880df9f471fe32e6a7fbe11f089':
b/16804395. Migrate QuickResponses from Telephony as needed.
942e8bafe1b6e880df9f471fe32e6a7fbe11f089 04-Sep-2014 Anthony Lee <anthonylee@google.com> Merge "b/16804395. Migrate QuickResponses from Telephony as needed." into lmp-dev
9a549be4124430e82b072060d5efcb51627a438c 03-Sep-2014 Evan Charlton <evanc@google.com> am 11795fe7: Merge "Remove startActivityFromInCall API" into lmp-dev

* commit '11795fe77ec74d3fd291c7eef40fc517e6064048':
Remove startActivityFromInCall API
11795fe77ec74d3fd291c7eef40fc517e6064048 03-Sep-2014 Evan Charlton <evanc@google.com> Merge "Remove startActivityFromInCall API" into lmp-dev
7dc31a8ca2dc0e0c20751b71263fcdaf5a9b5589 03-Sep-2014 Tyler Gunn <tgunn@google.com> am e3165bd7: am b28b1614: am 9bc67524: Merge "Add supported URI scheme to PhoneAccounts. (2/4)" into lmp-dev

* commit 'e3165bd761e1435352da4bce5c0eebe79754369d':
Add supported URI scheme to PhoneAccounts. (2/4)
8107ec4c842f55dfdd8e2f19b22dbcb304d992d3 03-Sep-2014 Santos Cordon <santoscordon@google.com> am f31da2be: am d260e7f3: am dd6147dd: Merge "Dont acquire prox sensor if there are no calls." into lmp-dev

* commit 'f31da2be6aa91dd19022440f894b3da0ff2df975':
Dont acquire prox sensor if there are no calls.
a13f8ed2dae42c5e616f55c5007b0785d2b9be1d 03-Sep-2014 Yorke Lee <yorkelee@google.com> am 65e05c6d: Merge "Don\'t send new outgoing call intent broadcast twice" into lmp-dev

* commit '65e05c6d52175827148f0db482f43357b6b8e25e':
Don't send new outgoing call intent broadcast twice
65e05c6d52175827148f0db482f43357b6b8e25e 03-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Don't send new outgoing call intent broadcast twice" into lmp-dev
c67cd758268dc4b18e17223cbde92e32d11715ab 03-Sep-2014 Anthony Lee <anthonylee@google.com> b/16804395. Migrate QuickResponses from Telephony as needed.

SharedPreferences containing QuickResponses might be located
in Telephony (Pre-L). So when loading QuickResponses in L, we
should make sure that we migrate legacy QuickReponses if they
exist.

Change-Id: Ieed9f39a224383f2de1712ad6d3fc35613167768
rc/com/android/telecomm/QuickResponseUtils.java
rc/com/android/telecomm/RespondViaSmsManager.java
rc/com/android/telecomm/RespondViaSmsSettings.java
e3165bd761e1435352da4bce5c0eebe79754369d 03-Sep-2014 Tyler Gunn <tgunn@google.com> am b28b1614: am 9bc67524: Merge "Add supported URI scheme to PhoneAccounts. (2/4)" into lmp-dev

* commit 'b28b16142de976c13bb4bb71fd4e7ed37442d1c0':
Add supported URI scheme to PhoneAccounts. (2/4)
f31da2be6aa91dd19022440f894b3da0ff2df975 03-Sep-2014 Santos Cordon <santoscordon@google.com> am d260e7f3: am dd6147dd: Merge "Dont acquire prox sensor if there are no calls." into lmp-dev

* commit 'd260e7f3ce80a35aaa0961223183edb208651e7a':
Dont acquire prox sensor if there are no calls.
fc8a45b6a61114ef94d4c90174ac3c6003e7ac35 03-Sep-2014 Tyler Gunn <tgunn@google.com> am 9bc67524: Merge "Add supported URI scheme to PhoneAccounts. (2/4)" into lmp-dev

* commit '9bc6752482548fd4188227c0f0ae2d09f7db2dc8':
Add supported URI scheme to PhoneAccounts. (2/4)
f71d357598c03c6f4bdb466dbfbd4c02e0ed3507 03-Sep-2014 Santos Cordon <santoscordon@google.com> am dd6147dd: Merge "Dont acquire prox sensor if there are no calls." into lmp-dev

* commit 'dd6147dd65a14e48290519e3e67fa24bfcebead1':
Dont acquire prox sensor if there are no calls.
b28b16142de976c13bb4bb71fd4e7ed37442d1c0 03-Sep-2014 Tyler Gunn <tgunn@google.com> am 9bc67524: Merge "Add supported URI scheme to PhoneAccounts. (2/4)" into lmp-dev

* commit '9bc6752482548fd4188227c0f0ae2d09f7db2dc8':
Add supported URI scheme to PhoneAccounts. (2/4)
d260e7f3ce80a35aaa0961223183edb208651e7a 03-Sep-2014 Santos Cordon <santoscordon@google.com> am dd6147dd: Merge "Dont acquire prox sensor if there are no calls." into lmp-dev

* commit 'dd6147dd65a14e48290519e3e67fa24bfcebead1':
Dont acquire prox sensor if there are no calls.
9bc6752482548fd4188227c0f0ae2d09f7db2dc8 03-Sep-2014 Tyler Gunn <tgunn@google.com> Merge "Add supported URI scheme to PhoneAccounts. (2/4)" into lmp-dev
dd6147dd65a14e48290519e3e67fa24bfcebead1 03-Sep-2014 Santos Cordon <santoscordon@google.com> Merge "Dont acquire prox sensor if there are no calls." into lmp-dev
e24c49353c06a5a679c98fdb282de7f57d033950 03-Sep-2014 Yorke Lee <yorkelee@google.com> am b173f211: am bfe1eb0c: am f2ca85e7: Merge "Respect DND mode when activating ringer/vibrator" into lmp-dev

* commit 'b173f211090b140e444da8329fa6890c1046a255':
Respect DND mode when activating ringer/vibrator
28fa9ce778d1870c8c0d7daece1d95aa2f5c69c0 03-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I8fa1a8e4be711931f14653d27300aa27d2914250
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-eu-rES/strings.xml
es/values-fi/strings.xml
es/values-ka-rGE/strings.xml
es/values-ms-rMY/strings.xml
es/values-pt/strings.xml
es/values-si-rLK/strings.xml
es/values-ta-rIN/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
c5b51caaa4b50d8880ed6255c8c78f548969f73e 03-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I77988d22e97ac780cc3ce5d4b41cc98438dcb262
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-fi/strings.xml
es/values-ka-rGE/strings.xml
es/values-ms-rMY/strings.xml
es/values-pt/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
33d03ed0842c82d90e057cde2f99e5b8d62949b2 03-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic2ce84a4fff83648301fbbf12ef7bcf9f02887d5
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-eu-rES/strings.xml
es/values-ta-rIN/strings.xml
es/values-vi/strings.xml
f83c3a4de9ffe6b0afe53b55e9542ba34203776a 03-Sep-2014 Yorke Lee <yorkelee@google.com> am f2ca85e7: Merge "Respect DND mode when activating ringer/vibrator" into lmp-dev

* commit 'f2ca85e7a618a4d8285dc0b75a586ab2be042228':
Respect DND mode when activating ringer/vibrator
b173f211090b140e444da8329fa6890c1046a255 03-Sep-2014 Yorke Lee <yorkelee@google.com> am bfe1eb0c: am f2ca85e7: Merge "Respect DND mode when activating ringer/vibrator" into lmp-dev

* commit 'bfe1eb0cd1dd0db3e02af6805faeea7f3bc8489e':
Respect DND mode when activating ringer/vibrator
bfe1eb0cd1dd0db3e02af6805faeea7f3bc8489e 03-Sep-2014 Yorke Lee <yorkelee@google.com> am f2ca85e7: Merge "Respect DND mode when activating ringer/vibrator" into lmp-dev

* commit 'f2ca85e7a618a4d8285dc0b75a586ab2be042228':
Respect DND mode when activating ringer/vibrator
8b054e0935ac79cbb5279564a2a1b7418a30267c 03-Sep-2014 Evan Charlton <evanc@google.com> Remove startActivityFromInCall API

Remove this API as per API council feedback. It will be replaced with
something better at a later date.

Bug: 16988478
Change-Id: Ib7b0493353262d9e795d78b78a98dd29e7a3f88e
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallController.java
ests/src/com/android/telecomm/testapps/TestConnectionManager.java
f2ca85e7a618a4d8285dc0b75a586ab2be042228 03-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Respect DND mode when activating ringer/vibrator" into lmp-dev
15a30c3d3f8886a79a0dfdd005a6f7d808f0bf0a 03-Sep-2014 Yorke Lee <yorkelee@google.com> Don't send new outgoing call intent broadcast twice

Bug: 17335285
Bug: 17354788
Change-Id: I1aeaac46243a5d2e1bb9b44bf9c2d93330450b12
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallsManager.java
b6a108fdd3992f52be1b72f1ec694fd80fab1c41 03-Sep-2014 Santos Cordon <santoscordon@google.com> Dont acquire prox sensor if there are no calls.

Bug:17323179
Change-Id: Ibc022b1ff9c4a80a2e53a3af74a1659b8047386c
rc/com/android/telecomm/ProximitySensorManager.java
8425357e131867f33587641f23a1d1a328acf139 02-Sep-2014 Tyler Gunn <tgunn@google.com> Add supported URI scheme to PhoneAccounts. (2/4)

Modify PhoneAccountRegistrar to load/save supported URI schemes to
the state XML file.
Added version check to state XML file and migration step to add
'sip' for SIPConnectionService PhoneAccounts, and 'tel' for all other
PhoneAccounts.

Bug: 17140110
Change-Id: Ic5d41254bade421cc39eb197a1d6fc2d6695f62f
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/AndroidManifest.xml
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
eb4f0ea3d15c21fae89519f6f8f75afc8e5eb064 02-Sep-2014 Baligh Uddin <baligh@google.com> am 4f5444ae: (-s ours) am 7813ed22: (-s ours) am a28dbcc7: (-s ours) Import translations. DO NOT MERGE

* commit '4f5444ae7e68d50fe7d8f352d02fb9da875ec6d4':
Import translations. DO NOT MERGE
e0583578ef589a5949ea67d9a22567c6bdb5c75a 02-Sep-2014 Baligh Uddin <baligh@google.com> am d863d827: (-s ours) am 32b01d1e: (-s ours) am fbc75f52: (-s ours) Import translations. DO NOT MERGE

* commit 'd863d8278f834ea46bfad326e16e197fef614ae2':
Import translations. DO NOT MERGE
e6101620e085f8c7c92e70ec710852a1903bddc0 02-Sep-2014 Tyler Gunn <tgunn@google.com> am e427edc8: am 3c41c2d9: am b6c18699: Merge "Hiding videoState values in telecomm APIs. (2/3)" into lmp-dev

* commit 'e427edc85cf6f3a629f02b7cb28a3f8bedf699ec':
Hiding videoState values in telecomm APIs. (2/3)
8efb366ac2b58b30d197330d91229ac7af4f4643 02-Sep-2014 Andrew Lee <anwlee@google.com> am bfa93fb8: am 1c93baaa: am c176aa62: Add methods for getting/setting phone accounts.

* commit 'bfa93fb83617d17bdc83a7c4c87d007637452f88':
Add methods for getting/setting phone accounts.
4f5444ae7e68d50fe7d8f352d02fb9da875ec6d4 02-Sep-2014 Baligh Uddin <baligh@google.com> am 7813ed22: (-s ours) am a28dbcc7: (-s ours) Import translations. DO NOT MERGE

* commit '7813ed2203fc62e84200cffa5e2fb2bfd27ad272':
Import translations. DO NOT MERGE
7813ed2203fc62e84200cffa5e2fb2bfd27ad272 02-Sep-2014 Baligh Uddin <baligh@google.com> am a28dbcc7: (-s ours) Import translations. DO NOT MERGE

* commit 'a28dbcc78b2dae08b3b042d017bbdb9fe41531c1':
Import translations. DO NOT MERGE
c967ac355272f1af2f606737f2a508c086f124b1 02-Sep-2014 Baligh Uddin <baligh@google.com> am a28dbcc7: (-s ours) Import translations. DO NOT MERGE

* commit 'a28dbcc78b2dae08b3b042d017bbdb9fe41531c1':
Import translations. DO NOT MERGE
a28dbcc78b2dae08b3b042d017bbdb9fe41531c1 02-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ib312294cc4b0543c2de4da03d99d3ec1133ffa2b
Auto-generated-cl: translation import
es/values-fi/strings.xml
es/values-ka-rGE/strings.xml
es/values-ms-rMY/strings.xml
es/values-pt/strings.xml
es/values-si-rLK/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
d863d8278f834ea46bfad326e16e197fef614ae2 01-Sep-2014 Baligh Uddin <baligh@google.com> am 32b01d1e: (-s ours) am fbc75f52: (-s ours) Import translations. DO NOT MERGE

* commit '32b01d1e22c05522c61c48bfecfbf742486be30a':
Import translations. DO NOT MERGE
596514172d74f76372fbb895757c4705e95c1b89 01-Sep-2014 Baligh Uddin <baligh@google.com> am fbc75f52: (-s ours) Import translations. DO NOT MERGE

* commit 'fbc75f52f56e6bb2006cf45e051a56dafb778f28':
Import translations. DO NOT MERGE
32b01d1e22c05522c61c48bfecfbf742486be30a 01-Sep-2014 Baligh Uddin <baligh@google.com> am fbc75f52: (-s ours) Import translations. DO NOT MERGE

* commit 'fbc75f52f56e6bb2006cf45e051a56dafb778f28':
Import translations. DO NOT MERGE
56017d15e9c91bee87433f00a7d1c1a36c4a05cf 01-Sep-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
4042bca1a2903212c8b8f03dd479180d2686777a 31-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I67a50810a079c0a8b67c3c5c0f3c5d52268bb786
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
dd1607ce7b6fcc6945cf2e8fccdb0a798ffbbef3 31-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I029745ec9286a545f0c8d4d7cda83e041fb4cff5
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
fbc75f52f56e6bb2006cf45e051a56dafb778f28 31-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ied383a5078ebcda6bc6120695c92d7272aad4900
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
e427edc85cf6f3a629f02b7cb28a3f8bedf699ec 31-Aug-2014 Tyler Gunn <tgunn@google.com> am 3c41c2d9: am b6c18699: Merge "Hiding videoState values in telecomm APIs. (2/3)" into lmp-dev

* commit '3c41c2d9c954bb3156362906aa269c9a737b07f2':
Hiding videoState values in telecomm APIs. (2/3)
8a736a887b50d4d042c008b2073e24e1b4681dfb 31-Aug-2014 Yorke Lee <yorkelee@google.com> Respect DND mode when activating ringer/vibrator

Bug: 16825519
Change-Id: Ia3accc9aaa10ee09d0dad435be254613d6c23678
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/Ringer.java
3c41c2d9c954bb3156362906aa269c9a737b07f2 30-Aug-2014 Tyler Gunn <tgunn@google.com> am b6c18699: Merge "Hiding videoState values in telecomm APIs. (2/3)" into lmp-dev

* commit 'b6c18699844c158cf2bf3b39f13bd7a7df5cd16a':
Hiding videoState values in telecomm APIs. (2/3)
b6c18699844c158cf2bf3b39f13bd7a7df5cd16a 30-Aug-2014 Tyler Gunn <tgunn@google.com> Merge "Hiding videoState values in telecomm APIs. (2/3)" into lmp-dev
bfa93fb83617d17bdc83a7c4c87d007637452f88 30-Aug-2014 Andrew Lee <anwlee@google.com> am 1c93baaa: am c176aa62: Add methods for getting/setting phone accounts.

* commit '1c93baaafabb01edbb3029ffe2be107f888fbdb1':
Add methods for getting/setting phone accounts.
1c93baaafabb01edbb3029ffe2be107f888fbdb1 30-Aug-2014 Andrew Lee <anwlee@google.com> am c176aa62: Add methods for getting/setting phone accounts.

* commit 'c176aa626520d93287d6849542482775ff7b22d8':
Add methods for getting/setting phone accounts.
c176aa626520d93287d6849542482775ff7b22d8 29-Aug-2014 Andrew Lee <anwlee@google.com> Add methods for getting/setting phone accounts.

More specifically, setting the default outgoing phone call account,
and getting/setting sim call manager phone accounts.

Bug: 17179743
Change-Id: I6d326dfe8cd85ae332025ef199a4b0eb13ea23bb
rc/com/android/telecomm/TelecommServiceImpl.java
6dd6d720f364c80aa614a9ba981dea5b0b5c97d5 28-Aug-2014 Andrew Lee <anwlee@google.com> am 6dbf9c4b: am 2731bff0: am a29f4036: Merge "Use CallProperties on Telecomm Call." into lmp-dev

* commit '6dbf9c4b6c6a1f92657c73d292bbd0adabc9dc1c':
Use CallProperties on Telecomm Call.
6dbf9c4b6c6a1f92657c73d292bbd0adabc9dc1c 28-Aug-2014 Andrew Lee <anwlee@google.com> am 2731bff0: am a29f4036: Merge "Use CallProperties on Telecomm Call." into lmp-dev

* commit '2731bff0c2f89c8d093f8975649d4fc4ca8a954c':
Use CallProperties on Telecomm Call.
2731bff0c2f89c8d093f8975649d4fc4ca8a954c 28-Aug-2014 Andrew Lee <anwlee@google.com> am a29f4036: Merge "Use CallProperties on Telecomm Call." into lmp-dev

* commit 'a29f4036a6dc2ba2acfabd223fe78581355cae06':
Use CallProperties on Telecomm Call.
a29f4036a6dc2ba2acfabd223fe78581355cae06 28-Aug-2014 Andrew Lee <anwlee@google.com> Merge "Use CallProperties on Telecomm Call." into lmp-dev
b605fbf53efe4b27dce260aa26eb16ce29887632 28-Aug-2014 Tyler Gunn <tgunn@google.com> am abd220fe: am 8baf1b65: am 947c1922: Merge "Support CDMA emergency callback. (2/2)" into lmp-dev

* commit 'abd220fe83ec06469d878800e3f9cf8bba4026eb':
Support CDMA emergency callback. (2/2)
abd220fe83ec06469d878800e3f9cf8bba4026eb 28-Aug-2014 Tyler Gunn <tgunn@google.com> am 8baf1b65: am 947c1922: Merge "Support CDMA emergency callback. (2/2)" into lmp-dev

* commit '8baf1b65a6c082aa09fc68f259f6072a0ac1bb73':
Support CDMA emergency callback. (2/2)
8baf1b65a6c082aa09fc68f259f6072a0ac1bb73 28-Aug-2014 Tyler Gunn <tgunn@google.com> am 947c1922: Merge "Support CDMA emergency callback. (2/2)" into lmp-dev

* commit '947c1922e7796ce04c508314b346dded8b36efa3':
Support CDMA emergency callback. (2/2)
947c1922e7796ce04c508314b346dded8b36efa3 28-Aug-2014 Tyler Gunn <tgunn@google.com> Merge "Support CDMA emergency callback. (2/2)" into lmp-dev
01656ae60a0cbaaed29c74d365554bc5496e6479 28-Aug-2014 Michael Wright <michaelwr@google.com> am fd434923: am 70ab740a: am c4374a43: Merge "Change constant to PowerManager.WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev

* commit 'fd4349234ebd08611b37a975635fc992c8f04eba':
Change constant to PowerManager.WAIT_FOR_DISTANT_PROXIMITY
fd4349234ebd08611b37a975635fc992c8f04eba 28-Aug-2014 Michael Wright <michaelwr@google.com> am 70ab740a: am c4374a43: Merge "Change constant to PowerManager.WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev

* commit '70ab740ae669869bdec31d76f68e789402b02e2f':
Change constant to PowerManager.WAIT_FOR_DISTANT_PROXIMITY
70ab740ae669869bdec31d76f68e789402b02e2f 28-Aug-2014 Michael Wright <michaelwr@google.com> am c4374a43: Merge "Change constant to PowerManager.WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev

* commit 'c4374a43d6bd8940af9890e2121e6571da07910f':
Change constant to PowerManager.WAIT_FOR_DISTANT_PROXIMITY
c4374a43d6bd8940af9890e2121e6571da07910f 28-Aug-2014 Michael Wright <michaelwr@google.com> Merge "Change constant to PowerManager.WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev
bfffd2d175cc0219e512f64ff47d1e9ba5a50aff 28-Aug-2014 Andrew Lee <anwlee@google.com> Use CallProperties on Telecomm Call.

Bug: 17304243
Change-Id: I96ed599e77c619cff7d24b214969a5d449bcc9a3
rc/com/android/telecomm/InCallController.java
3e048a7165184dae9092a46056aba045bcb00f27 27-Aug-2014 Michael Wright <michaelwr@google.com> Change constant to PowerManager.WAIT_FOR_DISTANT_PROXIMITY

Bug: 17290118
Change-Id: Ie60213a061fe73637cd4ea49988ca89e91ea3e00
rc/com/android/telecomm/ProximitySensorManager.java
4815e361caa51251000c05b681dfde8558b3e0bb 27-Aug-2014 Yorke Lee <yorkelee@google.com> am 430dbad7: am 088c9d22: am c35ea27a: Merge "Fix bracket issue." into lmp-dev

* commit '430dbad760bbbb7615addf6ca552d50f5353991e':
Fix bracket issue.
16c9912900312205ff82750d9906cd929b80c406 27-Aug-2014 Yorke Lee <yorkelee@google.com> am a2ea4bb9: am a3f5ed2b: am 30fc57e2: Merge "Add error dialogs to Telecomm" into lmp-dev

* commit 'a2ea4bb9e00ca19479d4d6b5f22226bb98ea3b5d':
Add error dialogs to Telecomm
430dbad760bbbb7615addf6ca552d50f5353991e 27-Aug-2014 Yorke Lee <yorkelee@google.com> am 088c9d22: am c35ea27a: Merge "Fix bracket issue." into lmp-dev

* commit '088c9d227805bdb6ecd9606fe9ac7fb250a22462':
Fix bracket issue.
a2ea4bb9e00ca19479d4d6b5f22226bb98ea3b5d 27-Aug-2014 Yorke Lee <yorkelee@google.com> am a3f5ed2b: am 30fc57e2: Merge "Add error dialogs to Telecomm" into lmp-dev

* commit 'a3f5ed2b723243cc4570cb0fead9c8d6db997573':
Add error dialogs to Telecomm
088c9d227805bdb6ecd9606fe9ac7fb250a22462 27-Aug-2014 Yorke Lee <yorkelee@google.com> am c35ea27a: Merge "Fix bracket issue." into lmp-dev

* commit 'c35ea27a7fba02da2e40253c69ad4a07ded09c2e':
Fix bracket issue.
c35ea27a7fba02da2e40253c69ad4a07ded09c2e 27-Aug-2014 Yorke Lee <yorkelee@google.com> Merge "Fix bracket issue." into lmp-dev
f7b77011b5ccf36cbf0d7b7eead11dca8d6d78ee 27-Aug-2014 Santos Cordon <santoscordon@google.com> Fix bracket issue.

Bug: 17301771
Change-Id: Ibbe95855765dfc9abe13e0545f82051bb73e0401
ndroidManifest.xml
a3f5ed2b723243cc4570cb0fead9c8d6db997573 27-Aug-2014 Yorke Lee <yorkelee@google.com> am 30fc57e2: Merge "Add error dialogs to Telecomm" into lmp-dev

* commit '30fc57e240bde10a3a1f7c9ec7576f99fc8681e6':
Add error dialogs to Telecomm
30fc57e240bde10a3a1f7c9ec7576f99fc8681e6 27-Aug-2014 Yorke Lee <yorkelee@google.com> Merge "Add error dialogs to Telecomm" into lmp-dev
273a210d120e1d402016121c81eca888209506bd 27-Aug-2014 Baligh Uddin <baligh@google.com> am 8b671dc5: (-s ours) am 4c1ffb3c: (-s ours) am 65c6f3f6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '8b671dc50173a33789c9c19156404581bfbec582':
Import translations. DO NOT MERGE
8b671dc50173a33789c9c19156404581bfbec582 27-Aug-2014 Baligh Uddin <baligh@google.com> am 4c1ffb3c: (-s ours) am 65c6f3f6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '4c1ffb3cde49dc8527b631676912ea41df309e5c':
Import translations. DO NOT MERGE
4c1ffb3cde49dc8527b631676912ea41df309e5c 27-Aug-2014 Baligh Uddin <baligh@google.com> am 65c6f3f6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '65c6f3f69994b24f46f38f60472fc794b0f55021':
Import translations. DO NOT MERGE
65c6f3f69994b24f46f38f60472fc794b0f55021 27-Aug-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-dev
e6eeedfcc18901b76e97e1c235c9b071d4db22fb 27-Aug-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
d7255872e2204a074bc5dfb5dceb4da13574864c 26-Aug-2014 Yorke Lee <yorkelee@google.com> Add error dialogs to Telecomm

* Add error dialog popups for DisconnectCause.INVALID_NUMBER and
VOICEMAIL_NUMBER_MISSING
* Move ErrorDialogActivity from Telephony to Telecomm
* NewOutgoingCallBroadcaster.processIntent now returns an error code
rather than a boolean

Bug: 17209051
Bug: 17196776
Change-Id: Ifc8b23472510fefc0c2763d28f9c990b4598cadd
ndroidManifest.xml
es/values/strings.xml
es/values/styles.xml
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/ErrorDialogActivity.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
b51b7c8998ebf18a4810c3244a77042cdf090f87 27-Aug-2014 Craig Mautner <cmautner@google.com> am 3b569d06: am 9ff3a00b: am 309f9ef2: Start ACTION_INCOMING_CALL as current user.

* commit '3b569d0610921c94a13751730cfbbc2ebb839175':
Start ACTION_INCOMING_CALL as current user.
3b569d0610921c94a13751730cfbbc2ebb839175 26-Aug-2014 Craig Mautner <cmautner@google.com> am 9ff3a00b: am 309f9ef2: Start ACTION_INCOMING_CALL as current user.

* commit '9ff3a00b253e6c86c7f13e167e6d34e57ed758c7':
Start ACTION_INCOMING_CALL as current user.
1711aec69264a36fda29c825bc6fb8fbceeb1efd 26-Aug-2014 Tyler Gunn <tgunn@google.com> Support CDMA emergency callback. (2/2)

Fixed bug in toParcelableCall which prevents mute capability from being
removed from emergency calls and makes ALL non-emergency calls support
mute, despite what the underlying Connection states.

Bug: 16182748
Change-Id: Ic65498182dfaf85b84ab9a0c7766eb64c729d123
rc/com/android/telecomm/InCallController.java
9ff3a00b253e6c86c7f13e167e6d34e57ed758c7 26-Aug-2014 Craig Mautner <cmautner@google.com> am 309f9ef2: Start ACTION_INCOMING_CALL as current user.

* commit '309f9ef2ad19fbd13e9446f31d06ab35288e8175':
Start ACTION_INCOMING_CALL as current user.
309f9ef2ad19fbd13e9446f31d06ab35288e8175 26-Aug-2014 Craig Mautner <cmautner@google.com> Start ACTION_INCOMING_CALL as current user.

Starting it as user 0 causes the incoming call to be placed below
tasks belonging to the current user in the stack.

Fixes bug 16634716.

Change-Id: I36277b4729b5aa4ac154b1e26ab73e1ef5ff8c23
rc/com/android/telecomm/TelecommServiceImpl.java
b98a70c7b0fe0238580913f5d2f69c0dbbfe805b 26-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I4b9cad08fc1f1de0f84e4e9420698c73c8661361
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
99cfa5cd1cc48c5a4a2ebb30d045e943539b9576 26-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: If7071b5169d695197ae5cec672d75465fd9c5927
Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-de/strings.xml
es/values-fi/strings.xml
es/values-ka-rGE/strings.xml
es/values-ms-rMY/strings.xml
es/values-ne-rNP/strings.xml
es/values-si-rLK/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
8886ea946a24fd136027b86603a4850ad3e584e8 26-Aug-2014 Ihab Awad <ihab@google.com> am 4eb08626: am 8f69d6f9: am 8000845a: Support Conferences in Remote Connections

* commit '4eb08626a21b5acd84ecea61610d5dee1157f571':
Support Conferences in Remote Connections
4eb08626a21b5acd84ecea61610d5dee1157f571 26-Aug-2014 Ihab Awad <ihab@google.com> am 8f69d6f9: am 8000845a: Support Conferences in Remote Connections

* commit '8f69d6f97436b4948aa16055517c005dc92a9032':
Support Conferences in Remote Connections
576870844f0716ad0d9ba81135d30db04d44fad2 26-Aug-2014 Yorke Lee <yorkelee@google.com> am 6ef9f4ef: am 188615ef: am bedebe30: Merge "Fix PhoneAccountPreferences not being saved" into lmp-dev

* commit '6ef9f4ef6c79a95114f64dd21a37bac2dd8b44c4':
Fix PhoneAccountPreferences not being saved
6b5b17a4cff848a8734141fa33f09a24b247310c 26-Aug-2014 Nancy Chen <nancychen@google.com> am bf19a1df: am ec01ecd1: am 6ade2480: Merge "API Review PhoneManager -> TelecommManager. Rename methods (5/6)" into lmp-dev

* commit 'bf19a1df6e6b086bed34ec0da44664a48812fe4b':
API Review PhoneManager -> TelecommManager. Rename methods (5/6)
8f69d6f97436b4948aa16055517c005dc92a9032 26-Aug-2014 Ihab Awad <ihab@google.com> am 8000845a: Support Conferences in Remote Connections

* commit '8000845a81fd6a88ff69cb11e1b6dff5f47c2332':
Support Conferences in Remote Connections
6ef9f4ef6c79a95114f64dd21a37bac2dd8b44c4 26-Aug-2014 Yorke Lee <yorkelee@google.com> am 188615ef: am bedebe30: Merge "Fix PhoneAccountPreferences not being saved" into lmp-dev

* commit '188615efa06ddf0722357ef12a06d800659ebe45':
Fix PhoneAccountPreferences not being saved
bf19a1df6e6b086bed34ec0da44664a48812fe4b 26-Aug-2014 Nancy Chen <nancychen@google.com> am ec01ecd1: am 6ade2480: Merge "API Review PhoneManager -> TelecommManager. Rename methods (5/6)" into lmp-dev

* commit 'ec01ecd1255631cf6be98f4b94c14d40db82ed8d':
API Review PhoneManager -> TelecommManager. Rename methods (5/6)
8000845a81fd6a88ff69cb11e1b6dff5f47c2332 24-Aug-2014 Ihab Awad <ihab@google.com> Support Conferences in Remote Connections

Bug: 16957997

Change-Id: I009924eac0f06a863b4c4c4148ecbcf27d220e14
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/CreateConnectionResponse.java
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/TestConnectionManager.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
188615efa06ddf0722357ef12a06d800659ebe45 26-Aug-2014 Yorke Lee <yorkelee@google.com> am bedebe30: Merge "Fix PhoneAccountPreferences not being saved" into lmp-dev

* commit 'bedebe30372bf91b20b6dd666f33c0d5d52052c5':
Fix PhoneAccountPreferences not being saved
bedebe30372bf91b20b6dd666f33c0d5d52052c5 26-Aug-2014 Yorke Lee <yorkelee@google.com> Merge "Fix PhoneAccountPreferences not being saved" into lmp-dev
ec01ecd1255631cf6be98f4b94c14d40db82ed8d 26-Aug-2014 Nancy Chen <nancychen@google.com> am 6ade2480: Merge "API Review PhoneManager -> TelecommManager. Rename methods (5/6)" into lmp-dev

* commit '6ade2480b78ff92d9af918a380921cbb6c463e9d':
API Review PhoneManager -> TelecommManager. Rename methods (5/6)
6ade2480b78ff92d9af918a380921cbb6c463e9d 26-Aug-2014 Nancy Chen <nancychen@google.com> Merge "API Review PhoneManager -> TelecommManager. Rename methods (5/6)" into lmp-dev
041eff6b45ff885e77d2e1b8b9ca9099dd0885d2 25-Aug-2014 Tyler Gunn <tgunn@google.com> Hiding videoState values in telecomm APIs. (2/3)

Ensuring audio-only calls only trigger the "answer" method in
ConnectionServices.

Bug: 17243002
Change-Id: I5f19d96fa7dabc335748cd473ad285e94f4d698f
rc/com/android/telecomm/ConnectionServiceWrapper.java
3ca7e8e942b610b03b53cebf79789d728f3a141c 22-Aug-2014 Nancy Chen <nancychen@google.com> API Review PhoneManager -> TelecommManager. Rename methods (5/6)

PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both

Bug: 16960458

Change-Id: I7a31cbe97ba6ca48c038dd9bfb18da3ad724239d
rc/com/android/telecomm/TelecommServiceImpl.java
f8d57adf75eb82287d971c45ea7572c5a1f45ecc 25-Aug-2014 Santos Cordon <santoscordon@google.com> am cc70ec78: am f7282126: am afe59e51: Add setting to turn off connection manager support.

* commit 'cc70ec78541dc2ea37ac5868b77a072cda2cf35c':
Add setting to turn off connection manager support.
cc70ec78541dc2ea37ac5868b77a072cda2cf35c 25-Aug-2014 Santos Cordon <santoscordon@google.com> am f7282126: am afe59e51: Add setting to turn off connection manager support.

* commit 'f7282126b4ffa2a0a02f36cedfdeba8ae8320a2f':
Add setting to turn off connection manager support.
f7282126b4ffa2a0a02f36cedfdeba8ae8320a2f 25-Aug-2014 Santos Cordon <santoscordon@google.com> am afe59e51: Add setting to turn off connection manager support.

* commit 'afe59e5194e394922819eacc1b2ee12754479bf4':
Add setting to turn off connection manager support.
afe59e5194e394922819eacc1b2ee12754479bf4 23-Aug-2014 Santos Cordon <santoscordon@google.com> Add setting to turn off connection manager support.

connection manager support allows a component to supply alternative
calling methods in place of a SIM-based call.

Bug: 16794451
Change-Id: I7cbe8342bff5ba8e8f20ceb61a1b6fdbee7a543c
es/values/config.xml
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
2fa26bc8c7e75b31eeed581738a0ecff3a811e68 25-Aug-2014 Baligh Uddin <baligh@google.com> am 7f4bf84e: (-s ours) am 1350d480: (-s ours) am 944a3da9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '7f4bf84ef0b9eb0cae6532c0e2788eec36f94242':
Import translations. DO NOT MERGE
8ff81b74dec4c825cc41f408686ab2e2a3118709 25-Aug-2014 Yorke Lee <yorkelee@google.com> am eb3340e0: am 62e50816: am 1aa6e603: Merge "Prevent zombie call when processIntent fails" into lmp-dev

* commit 'eb3340e0fc778fbb27f696825d4b62908cf50722':
Prevent zombie call when processIntent fails
7f4bf84ef0b9eb0cae6532c0e2788eec36f94242 25-Aug-2014 Baligh Uddin <baligh@google.com> am 1350d480: (-s ours) am 944a3da9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '1350d4809365441011c776baa2d559b30cc66e18':
Import translations. DO NOT MERGE
eb3340e0fc778fbb27f696825d4b62908cf50722 25-Aug-2014 Yorke Lee <yorkelee@google.com> am 62e50816: am 1aa6e603: Merge "Prevent zombie call when processIntent fails" into lmp-dev

* commit '62e5081667b7242d0d1c65c496a6621321deb78e':
Prevent zombie call when processIntent fails
1350d4809365441011c776baa2d559b30cc66e18 25-Aug-2014 Baligh Uddin <baligh@google.com> am 944a3da9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '944a3da92a426d61d001a429b2b22c41552bee3e':
Import translations. DO NOT MERGE
62e5081667b7242d0d1c65c496a6621321deb78e 25-Aug-2014 Yorke Lee <yorkelee@google.com> am 1aa6e603: Merge "Prevent zombie call when processIntent fails" into lmp-dev

* commit '1aa6e60398a2c4ff9ea8ab37fc87ecdb20c3c90d':
Prevent zombie call when processIntent fails
944a3da92a426d61d001a429b2b22c41552bee3e 25-Aug-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-dev
1aa6e60398a2c4ff9ea8ab37fc87ecdb20c3c90d 25-Aug-2014 Yorke Lee <yorkelee@google.com> Merge "Prevent zombie call when processIntent fails" into lmp-dev
0d4877b1ceb754e35fe982fd8725c7ff189d4832 25-Aug-2014 Santos Cordon <santoscordon@google.com> am 9d4bf4f4: am b6452493: am cff03a32: Play ringtone even when bluetooth is connected.

* commit '9d4bf4f44667b57b69d21a67a703f3dcde61e91e':
Play ringtone even when bluetooth is connected.
7e78b19aa63a826148b5330318ea6af0b7efd479 24-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Icc3539d8f902b9c30449c7705ea1adefb6b0871c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
e6b42e9d7dc346371c6b0b869aedbed84b0846d9 23-Aug-2014 Yorke Lee <yorkelee@google.com> Prevent zombie call when processIntent fails

Bug: 17196776
Change-Id: If78061dd899a9ca2bd20af562512b8b65716f82d
rc/com/android/telecomm/CallActivity.java
5e8836a73b8db1529308867d5a41145cb16cbfb0 23-Aug-2014 Yorke Lee <yorkelee@google.com> Fix PhoneAccountPreferences not being saved

* Add a dummy PhoneAccountHandle, which is used to differentiate
between the user selecting a null PhoneAccountHandle, and no
preference being present at all.

* Refactor getDefaultOutgoingPhoneAccount slightly and add
getUserSelectedOutgoingPhoneAccount. getUserSelectedOutgoingPhoneAccount
is only used by PhoneAccountPreferencesActivity to determine the user's
true selection. getDefaultOutgoingPhoneAccount will continue to behave
the same, and is the method that will be continue to be used to determine
the correct default PhoneAccount to use.

Bug: 17140770

Change-Id: I5f5b4940d3babde05d563024ee9618d5d65204ea
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
9d4bf4f44667b57b69d21a67a703f3dcde61e91e 23-Aug-2014 Santos Cordon <santoscordon@google.com> am b6452493: am cff03a32: Play ringtone even when bluetooth is connected.

* commit 'b645249306e264e55e2e3da7e51e66360c8543ec':
Play ringtone even when bluetooth is connected.
b645249306e264e55e2e3da7e51e66360c8543ec 23-Aug-2014 Santos Cordon <santoscordon@google.com> am cff03a32: Play ringtone even when bluetooth is connected.

* commit 'cff03a3225ca7f3b0d513a94a012c644185ed046':
Play ringtone even when bluetooth is connected.
cff03a3225ca7f3b0d513a94a012c644185ed046 23-Aug-2014 Santos Cordon <santoscordon@google.com> Play ringtone even when bluetooth is connected.

Bug: 15589644
Change-Id: I7df7593e7d69b0dbcca76220a5afd4c2cd172c5f
rc/com/android/telecomm/Ringer.java
e0a9b6b6abe175d8b24ea20c63263fdc43ff98bf 22-Aug-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
eef49a742a36ec4531dd8b83afacb2ecfecaf1a2 22-Aug-2014 Tyler Gunn <tgunn@google.com> am 6f921f70: am a99cd704: am 5a3bb67b: Merge "Ensure VideoProvider is only set on ParcelableCalls for the default InCallService (i.e. the Incall UI)." into lmp-dev

* commit '6f921f706fdc3fb6b4cf8ce819c5c913063888f8':
Ensure VideoProvider is only set on ParcelableCalls for the default InCallService (i.e. the Incall UI).
6f921f706fdc3fb6b4cf8ce819c5c913063888f8 22-Aug-2014 Tyler Gunn <tgunn@google.com> am a99cd704: am 5a3bb67b: Merge "Ensure VideoProvider is only set on ParcelableCalls for the default InCallService (i.e. the Incall UI)." into lmp-dev

* commit 'a99cd704e2980e011bc11c127cadaf77fd9f461a':
Ensure VideoProvider is only set on ParcelableCalls for the default InCallService (i.e. the Incall UI).
a99cd704e2980e011bc11c127cadaf77fd9f461a 22-Aug-2014 Tyler Gunn <tgunn@google.com> am 5a3bb67b: Merge "Ensure VideoProvider is only set on ParcelableCalls for the default InCallService (i.e. the Incall UI)." into lmp-dev

* commit '5a3bb67b18e35dbc253c3971803a1331acb6e7d3':
Ensure VideoProvider is only set on ParcelableCalls for the default InCallService (i.e. the Incall UI).
5a3bb67b18e35dbc253c3971803a1331acb6e7d3 22-Aug-2014 Tyler Gunn <tgunn@google.com> Merge "Ensure VideoProvider is only set on ParcelableCalls for the default InCallService (i.e. the Incall UI)." into lmp-dev
b5a079dfb58ed8b916a2cf69557b0dd818b010ef 22-Aug-2014 Santos Cordon <santoscordon@google.com> am 66a28f44: am 49e3f68e: am 672321e6: Fix conference call issues.

* commit '66a28f4417e9058ddbd48a0e21c69286ce6830f3':
Fix conference call issues.
66a28f4417e9058ddbd48a0e21c69286ce6830f3 22-Aug-2014 Santos Cordon <santoscordon@google.com> am 49e3f68e: am 672321e6: Fix conference call issues.

* commit '49e3f68ed48f73c51d200b54a1f0500dbe980700':
Fix conference call issues.
49e3f68ed48f73c51d200b54a1f0500dbe980700 22-Aug-2014 Santos Cordon <santoscordon@google.com> am 672321e6: Fix conference call issues.

* commit '672321e603555849831dd88d5c9f93d88143ee48':
Fix conference call issues.
672321e603555849831dd88d5c9f93d88143ee48 21-Aug-2014 Santos Cordon <santoscordon@google.com> Fix conference call issues.

1) When disconnecting a child conference call, undo the parent
relationship before setting Disconnected state & before destroying.
2) Do not log conference calls in the call log.
3) for setIsConferenced, stop checking to see if the conference ID is
valid since it can be set to null when you want to undo the parent/child
relationship.
4) Add some logging.

Bug: 15621105
Bug: 17136172
Change-Id: I8371e46484a9ce9a8986aebd1fe771e1794979de
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
12bccade85d58ca73d861aeba26ee25e97681895 21-Aug-2014 Tyler Gunn <tgunn@google.com> Ensure VideoProvider is only set on ParcelableCalls for the default
InCallService (i.e. the Incall UI).

This ensures that only one InCallService ends up receiving the video
provider, and resolves an issue where multiple InCallServices would
register an video listener.

Bug: 17185020
Change-Id: I8aa021e091ba87788259c7eeda5e0cf408d3a964
rc/com/android/telecomm/InCallController.java
79a52fefa59c72bdd38610e94b29ad5092fcd50f 21-Aug-2014 Tyler Gunn <tgunn@google.com> am 53426f2b: am 10ff688f: am cac5b2ca: Merge "Support for third-party emergency calls." into lmp-dev

* commit '53426f2bc27d535799bf946bd370714d143a6640':
Support for third-party emergency calls.
53426f2bc27d535799bf946bd370714d143a6640 21-Aug-2014 Tyler Gunn <tgunn@google.com> am 10ff688f: am cac5b2ca: Merge "Support for third-party emergency calls." into lmp-dev

* commit '10ff688f8240a8bc561dd0d10d1c88bea9a87b5e':
Support for third-party emergency calls.
10ff688f8240a8bc561dd0d10d1c88bea9a87b5e 21-Aug-2014 Tyler Gunn <tgunn@google.com> am cac5b2ca: Merge "Support for third-party emergency calls." into lmp-dev

* commit 'cac5b2ca40ae1ceff5cb8d8fcc7b0884901e1895':
Support for third-party emergency calls.
cac5b2ca40ae1ceff5cb8d8fcc7b0884901e1895 21-Aug-2014 Tyler Gunn <tgunn@google.com> Merge "Support for third-party emergency calls." into lmp-dev
cd7fd63afe9efb597141eb78cdf22ffa3777aed9 21-Aug-2014 Andrew Lee <anwlee@google.com> am 5cbe575f: am bc7d89a4: am 64ac4b79: Merge "Update phone account settings string, for consistency." into lmp-dev

* commit '5cbe575f189af867655ec267ce555fadc9a47ee5':
Update phone account settings string, for consistency.
765b7019d86744100da4fd1068a2a7bd4dd424b0 21-Aug-2014 Sai Cheemalapati <saicheems@google.com> am dfb94831: am 3aba223b: am 604605ec: Merge "Fix for call switching." into lmp-dev

* commit 'dfb9483188fa6687d0413dace3ebe40b0fdeaf4a':
Fix for call switching.
38f6fe16c705cc8d15a29df42cd2f21d8ec1a68c 21-Aug-2014 Yorke Lee <yorkelee@google.com> am f928b3e6: am ff51b006: am 8d522d53: Merge "Pass call capabilities from connection to call" into lmp-dev

* commit 'f928b3e633495909cbbb5af9661924b879606dfb':
Pass call capabilities from connection to call
0f3554de3d829bf0be6b50ee9e06bfcc3ebd7965 21-Aug-2014 Sailesh Nepal <sail@google.com> am 2c20abcd: am ee757632: am 1f25f39f: Merge "createConnection fix and misc cleanup" into lmp-dev

* commit '2c20abcd25c34ad7ae85aba557910ee4e3a9dc47':
createConnection fix and misc cleanup
5cbe575f189af867655ec267ce555fadc9a47ee5 21-Aug-2014 Andrew Lee <anwlee@google.com> am bc7d89a4: am 64ac4b79: Merge "Update phone account settings string, for consistency." into lmp-dev

* commit 'bc7d89a484dcc5a7ceead8ca770986187dc1a58d':
Update phone account settings string, for consistency.
dfb9483188fa6687d0413dace3ebe40b0fdeaf4a 21-Aug-2014 Sai Cheemalapati <saicheems@google.com> am 3aba223b: am 604605ec: Merge "Fix for call switching." into lmp-dev

* commit '3aba223b57f2995c97712ff1a4425397d26dde67':
Fix for call switching.
f928b3e633495909cbbb5af9661924b879606dfb 21-Aug-2014 Yorke Lee <yorkelee@google.com> am ff51b006: am 8d522d53: Merge "Pass call capabilities from connection to call" into lmp-dev

* commit 'ff51b006143e865836cfb2fb45aa79d91bc1e0f0':
Pass call capabilities from connection to call
2c20abcd25c34ad7ae85aba557910ee4e3a9dc47 21-Aug-2014 Sailesh Nepal <sail@google.com> am ee757632: am 1f25f39f: Merge "createConnection fix and misc cleanup" into lmp-dev

* commit 'ee757632537941ebac95aae6153ab039e068e1d9':
createConnection fix and misc cleanup
9b4a861fc69261e532af5c936e8d9a3047e44e5f 21-Aug-2014 Nancy Chen <nancychen@google.com> am 68950ac5: am a2245889: am f3fd1950: Merge "Bring up Select Account Dialog before launching InCallUI." into lmp-dev

* commit '68950ac522bb58e765ea249643bd5754ec16d7e1':
Bring up Select Account Dialog before launching InCallUI.
68950ac522bb58e765ea249643bd5754ec16d7e1 21-Aug-2014 Nancy Chen <nancychen@google.com> am a2245889: am f3fd1950: Merge "Bring up Select Account Dialog before launching InCallUI." into lmp-dev

* commit 'a2245889b70ab4fadfce71ffb4daa2746b60b7f6':
Bring up Select Account Dialog before launching InCallUI.
bc7d89a484dcc5a7ceead8ca770986187dc1a58d 21-Aug-2014 Andrew Lee <anwlee@google.com> am 64ac4b79: Merge "Update phone account settings string, for consistency." into lmp-dev

* commit '64ac4b797588ee693958d40d5f66c3e752497606':
Update phone account settings string, for consistency.
3aba223b57f2995c97712ff1a4425397d26dde67 21-Aug-2014 Sai Cheemalapati <saicheems@google.com> am 604605ec: Merge "Fix for call switching." into lmp-dev

* commit '604605ec899aed8aeabf5aff9a4faae87de89019':
Fix for call switching.
ff51b006143e865836cfb2fb45aa79d91bc1e0f0 21-Aug-2014 Yorke Lee <yorkelee@google.com> am 8d522d53: Merge "Pass call capabilities from connection to call" into lmp-dev

* commit '8d522d53a48c9d4ea5ab93bbe94b0f703c4ab5ba':
Pass call capabilities from connection to call
ee757632537941ebac95aae6153ab039e068e1d9 21-Aug-2014 Sailesh Nepal <sail@google.com> am 1f25f39f: Merge "createConnection fix and misc cleanup" into lmp-dev

* commit '1f25f39ff9dfe4910b807a893c9e87dc053566ce':
createConnection fix and misc cleanup
6e6f6d1f7b7e5b5b506c198e6719c9c68e205042 21-Aug-2014 Tyler Gunn <tgunn@google.com> Support for third-party emergency calls.

Modified CreateConnectionProcessor to get the PhoneAccount with
CAPABILITY_CONNECTION_MANAGER and add it to the mAttemptRecords so that
it will be tried after the PSTN phone account.

Bug: 16846053
Change-Id: Ib8df2c6f1a717bccff57d0354b7d4a4fb661d0f3
rc/com/android/telecomm/CreateConnectionProcessor.java
64ac4b797588ee693958d40d5f66c3e752497606 21-Aug-2014 Andrew Lee <anwlee@google.com> Merge "Update phone account settings string, for consistency." into lmp-dev
791c0f62f0fcb600688b2cf89860615d94c9e530 21-Aug-2014 Andrew Lee <anwlee@google.com> Update phone account settings string, for consistency.

Bug: 16788935
Change-Id: Ifb30a04ebdb39b4ed51d4fee95d0b7be146a192f
es/values/strings.xml
1f25f39ff9dfe4910b807a893c9e87dc053566ce 21-Aug-2014 Sailesh Nepal <sail@google.com> Merge "createConnection fix and misc cleanup" into lmp-dev
a2245889b70ab4fadfce71ffb4daa2746b60b7f6 20-Aug-2014 Nancy Chen <nancychen@google.com> am f3fd1950: Merge "Bring up Select Account Dialog before launching InCallUI." into lmp-dev

* commit 'f3fd1950de75d7c5824df8ff4b0a52d7ca40bd7e':
Bring up Select Account Dialog before launching InCallUI.
2e379d92b9fc12503bd83ef782845ac7d998b515 20-Aug-2014 Yorke Lee <yorkelee@google.com> am 0000d6cc: am 36359cb8: am 43df90f8: Don\'t log calls where disconnectCause == OUTGOING_CANCELED

* commit '0000d6ccd22376b6f73d125143cc03fc210c078b':
Don't log calls where disconnectCause == OUTGOING_CANCELED
0000d6ccd22376b6f73d125143cc03fc210c078b 20-Aug-2014 Yorke Lee <yorkelee@google.com> am 36359cb8: am 43df90f8: Don\'t log calls where disconnectCause == OUTGOING_CANCELED

* commit '36359cb8d8a0f4ef33c90bc9d67c8e7ce87057d2':
Don't log calls where disconnectCause == OUTGOING_CANCELED
36359cb8d8a0f4ef33c90bc9d67c8e7ce87057d2 20-Aug-2014 Yorke Lee <yorkelee@google.com> am 43df90f8: Don\'t log calls where disconnectCause == OUTGOING_CANCELED

* commit '43df90f875f867e1e5cfd32b0cbc45440606c946':
Don't log calls where disconnectCause == OUTGOING_CANCELED
43df90f875f867e1e5cfd32b0cbc45440606c946 20-Aug-2014 Yorke Lee <yorkelee@google.com> Don't log calls where disconnectCause == OUTGOING_CANCELED

Also fixed a bug where Google voice calls would be logged twice,
once for the canceled call and once for the call that actually happened.

Bug: 17142353
Change-Id: I1e5fe78b7d84005416e4d3a6732bd92a8ad4e5e6
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
f5eaecdc318ed0d93012855de8c41e29547376d5 20-Aug-2014 Tyler Gunn <tgunn@google.com> am 4e451505: am c44594f3: am cb59b679: Permission check for ConnectionService PhoneAccounts. (1/2)

* commit '4e451505f90f089a7edb95fc89de087e3987604b':
Permission check for ConnectionService PhoneAccounts. (1/2)
4e451505f90f089a7edb95fc89de087e3987604b 20-Aug-2014 Tyler Gunn <tgunn@google.com> am c44594f3: am cb59b679: Permission check for ConnectionService PhoneAccounts. (1/2)

* commit 'c44594f3b3fc3eb94ddf2a4db516a65f4825ecb6':
Permission check for ConnectionService PhoneAccounts. (1/2)
50e41d0d9c179e9628098cdddb12546b8882839f 20-Aug-2014 Sailesh Nepal <sail@google.com> createConnection fix and misc cleanup

This CL does the following:
- update ConnectionServiceWrapper to use latest
ParcelableConnection property names
- revert part of Ihab's change to CallServiceNotifier to
get SIM subscriptions working again

Bug: 17156304
Change-Id: I4d6f6829f8d77b928ade3c806c6262cc072d6361
rc/com/android/telecomm/ConnectionServiceWrapper.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestConnectionManager.java
c44594f3b3fc3eb94ddf2a4db516a65f4825ecb6 20-Aug-2014 Tyler Gunn <tgunn@google.com> am cb59b679: Permission check for ConnectionService PhoneAccounts. (1/2)

* commit 'cb59b679e98d346c9725697ce08b05dd4c2f0a69':
Permission check for ConnectionService PhoneAccounts. (1/2)
cb59b679e98d346c9725697ce08b05dd4c2f0a69 20-Aug-2014 Tyler Gunn <tgunn@google.com> Permission check for ConnectionService PhoneAccounts. (1/2)

Adding permission check which ocurrs when registering a PhoneAccount.
The permission ensures the ConnectionService for the PhoneAccount
has BIND_CONNECTION_SERVICE permission.
Removed lookupServices method in ConnectionServiceRepository,
which was unused.
Set TestConnectionService service permission to BIND_CONNECTION_SERVICE.

Bug: 16171070
Change-Id: I5475a1af9e63deef9ceb3a549425a8c3b5f7e175
rc/com/android/telecomm/ConnectionServiceRepository.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
ests/AndroidManifest.xml
3f3ccef0c3f4173fa84a23ecfb2658297414aa00 19-Aug-2014 Ihab Awad <ihab@google.com> am 95c498c3: am ac30f740: am d0a8d8be: Merge "ConnectionService API has only one completed callback (2/3)" into lmp-dev

* commit '95c498c3aafba38ded65d52814a96a98cad26c4b':
ConnectionService API has only one completed callback (2/3)
95c498c3aafba38ded65d52814a96a98cad26c4b 19-Aug-2014 Ihab Awad <ihab@google.com> am ac30f740: am d0a8d8be: Merge "ConnectionService API has only one completed callback (2/3)" into lmp-dev

* commit 'ac30f740af4485e873c51b9a6742e90e02382988':
ConnectionService API has only one completed callback (2/3)
ac30f740af4485e873c51b9a6742e90e02382988 19-Aug-2014 Ihab Awad <ihab@google.com> am d0a8d8be: Merge "ConnectionService API has only one completed callback (2/3)" into lmp-dev

* commit 'd0a8d8be59f7d8148a87700a7787b35c952886ae':
ConnectionService API has only one completed callback (2/3)
60b804cfd48a2d2e85a6b88eeef0d6133d33ffd6 19-Aug-2014 Yorke Lee <yorkelee@google.com> am a3fc97cf: am 339a0326: am 2039bcf5: Merge "Add theme color to notifications (2/4)" into lmp-dev

* commit 'a3fc97cf14efd04c9e8f549763be096f47964206':
Add theme color to notifications (2/4)
a3fc97cf14efd04c9e8f549763be096f47964206 19-Aug-2014 Yorke Lee <yorkelee@google.com> am 339a0326: am 2039bcf5: Merge "Add theme color to notifications (2/4)" into lmp-dev

* commit '339a0326cc30ac4f45d7b5de7400f27511a79d37':
Add theme color to notifications (2/4)
339a0326cc30ac4f45d7b5de7400f27511a79d37 19-Aug-2014 Yorke Lee <yorkelee@google.com> am 2039bcf5: Merge "Add theme color to notifications (2/4)" into lmp-dev

* commit '2039bcf5d9c9c98fd87a864e9108c43e2d046f5a':
Add theme color to notifications (2/4)
3dd26a9053ebc3fea49aba576eef15b2b2a7b48d 19-Aug-2014 Tyler Gunn <tgunn@google.com> am b3606170: am a00a6fe3: am 61b9210e: Exposing in-call API to other implementing classes. (2/4)

* commit 'b360617061bcffdadc18a61ac5510eb8acfc89c3':
Exposing in-call API to other implementing classes. (2/4)
b360617061bcffdadc18a61ac5510eb8acfc89c3 19-Aug-2014 Tyler Gunn <tgunn@google.com> am a00a6fe3: am 61b9210e: Exposing in-call API to other implementing classes. (2/4)

* commit 'a00a6fe3beb7ee50c6b0e72c9216df1acb3ca48b':
Exposing in-call API to other implementing classes. (2/4)
a00a6fe3beb7ee50c6b0e72c9216df1acb3ca48b 19-Aug-2014 Tyler Gunn <tgunn@google.com> am 61b9210e: Exposing in-call API to other implementing classes. (2/4)

* commit '61b9210e5757db0cb49424fe917be0f788ea2218':
Exposing in-call API to other implementing classes. (2/4)
61b9210e5757db0cb49424fe917be0f788ea2218 19-Aug-2014 Tyler Gunn <tgunn@google.com> Exposing in-call API to other implementing classes. (2/4)

- Modifying InCallController to look for and bind to all implementors of
the InCallService (not just the the InCallUI's).
- Added TestInCallServiceImpl to test binding to multiple InCallServices.
- Added new CONTROL_INCALL_EXPERIENCE system permission.

Bug: 16133960
Bug: 17007163
Change-Id: I4630dfd31f0c86228189c89902292856bd255642
ndroidManifest.xml
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
ests/AndroidManifest.xml
ests/src/com/android/telecomm/testapps/TestInCallServiceImpl.java
604605ec899aed8aeabf5aff9a4faae87de89019 21-Aug-2014 Sai Cheemalapati <saicheems@google.com> Merge "Fix for call switching." into lmp-dev
45b3e3f3065d5a3d235260be83f079d2b6d2158e 15-Aug-2014 Sai Cheemalapati <saicheems@google.com> Fix for call switching.

Bug: 15273391
Change-Id: I7a358882763e79968badd2b697c7f8b1613d4bca
rc/com/android/telecomm/CallsManager.java
d0a8d8be59f7d8148a87700a7787b35c952886ae 19-Aug-2014 Ihab Awad <ihab@google.com> Merge "ConnectionService API has only one completed callback (2/3)" into lmp-dev
fb5560d634aef745466e8869f8acf496447da17b 18-Aug-2014 Ihab Awad <ihab@google.com> ConnectionService API has only one completed callback (2/3)

Refactor ConnectionService API so it has only one "completed"
callback, and connection state and failure codes indicates what
happened. Previous design where we had separate callbacks for failure,
cancellation and success was error prone because it was easy to forget
to implement one of them.

This particular change in this set of changes also makes one crucial
fix. The Call object, when it is notified of an unsuccessful attempt
to make a connection, previously told itself:

setState(CallState.DISCONNECTED);

But that led to its DISCONNECTED state never being published to
anyone, while on the other hand it was now removed from the
CallIdMapper, so nobody could talk to it (symptom: InCall UI hangup
button becomes a no-op). The correct thing to do is:

CallsManager.getInstance().
markCallAsDisconnected(this, code, msg);

which goes through the CallsManager to set the appropriate states. I
think that, post-L, our code here is really ripe for a refactoring
that prioritizes encapsulation and more ubiquitous use of the
"listener" pattern, otherwise we're going to have a bunch more of
these kinds of bugs. :)

Bug: 16993846
Bug: 17070939

Change-Id: Ie79e585dfbc2a1b79a3721d749855704cd8270ed
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/CreateConnectionResponse.java
f3fd1950de75d7c5824df8ff4b0a52d7ca40bd7e 20-Aug-2014 Nancy Chen <nancychen@google.com> Merge "Bring up Select Account Dialog before launching InCallUI." into lmp-dev
bc9ef17acc7940fdaec78a5dc1efdd29dff41488 16-Aug-2014 Nancy Chen <nancychen@google.com> Bring up Select Account Dialog before launching InCallUI.

Moving code for determining phone account for call from placeOutgoingCall
to startOutgoingCall so that the select phone account dialog can show up
before the InCallUI.

Bug: 16396523

Change-Id: I191bc17d07facbce57988606736319754a381979
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
2039bcf5d9c9c98fd87a864e9108c43e2d046f5a 19-Aug-2014 Yorke Lee <yorkelee@google.com> Merge "Add theme color to notifications (2/4)" into lmp-dev
7245c758b48027d97992472de7e6eadee43caf64 19-Aug-2014 Yorke Lee <yorkelee@google.com> Add theme color to notifications (2/4)

Bug: 17129072

Change-Id: I2c90274ac0c3730e1b1209994710e88fcd225e2d
es/values/colors.xml
rc/com/android/telecomm/MissedCallNotifier.java
bc5fff55c4e4122f516cd098af570ee081f74cf5 18-Aug-2014 Yorke Lee <yorkelee@google.com> am e9fd5209: am 57231395: am 0ef3eee3: Merge "Disallow non-emergency phone calls for restricted users" into lmp-dev

* commit 'e9fd520985dd23c9356b9dc4a7d6262d8cc5587d':
Disallow non-emergency phone calls for restricted users
e9fd520985dd23c9356b9dc4a7d6262d8cc5587d 18-Aug-2014 Yorke Lee <yorkelee@google.com> am 57231395: am 0ef3eee3: Merge "Disallow non-emergency phone calls for restricted users" into lmp-dev

* commit '57231395eaf688fdb4b3e0c4fdf5561716901ed6':
Disallow non-emergency phone calls for restricted users
57231395eaf688fdb4b3e0c4fdf5561716901ed6 18-Aug-2014 Yorke Lee <yorkelee@google.com> am 0ef3eee3: Merge "Disallow non-emergency phone calls for restricted users" into lmp-dev

* commit '0ef3eee3157dc003a638a47709c43c7c203f71f8':
Disallow non-emergency phone calls for restricted users
5c7ffe24733f5775f9b1a1f9c58a225e46ac2cc4 18-Aug-2014 Santos Cordon <santoscordon@google.com> am 5570f167: am afab319e: am 0fbe6321: Update telecomm to use new Conference call APIs.

* commit '5570f167eda76c8b5825c5c91b03329338f2db20':
Update telecomm to use new Conference call APIs.
5570f167eda76c8b5825c5c91b03329338f2db20 18-Aug-2014 Santos Cordon <santoscordon@google.com> am afab319e: am 0fbe6321: Update telecomm to use new Conference call APIs.

* commit 'afab319e1819066c017a7af74e5ce05c876642ab':
Update telecomm to use new Conference call APIs.
afab319e1819066c017a7af74e5ce05c876642ab 18-Aug-2014 Santos Cordon <santoscordon@google.com> am 0fbe6321: Update telecomm to use new Conference call APIs.

* commit '0fbe6321e341ddce186634266dba2db3fa426b88':
Update telecomm to use new Conference call APIs.
0fbe6321e341ddce186634266dba2db3fa426b88 14-Aug-2014 Santos Cordon <santoscordon@google.com> Update telecomm to use new Conference call APIs.

Bug:16844332
Bug:16449372
Change-Id: I897df73b3e552c498ef36211e03970db7e0d303e
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/Timeouts.java
b34c781291acf5e882cfa09c74ab6f28027d1127 18-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I39efae0088385c34264a7574c215da89e5b56af1
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
a6ed8bafa3a1b5505a857141da2b472931604c67 17-Aug-2014 Baligh Uddin <baligh@google.com> am d5923f04: (-s ours) am 9ab2ecac: (-s ours) am a0231634: (-s ours) Import translations. DO NOT MERGE

* commit 'd5923f04e384c5dddd39e52aee25a5567b3ec983':
Import translations. DO NOT MERGE
d5923f04e384c5dddd39e52aee25a5567b3ec983 17-Aug-2014 Baligh Uddin <baligh@google.com> am 9ab2ecac: (-s ours) am a0231634: (-s ours) Import translations. DO NOT MERGE

* commit '9ab2ecac03b993d4c41b8d31485fb75e6c6d81ff':
Import translations. DO NOT MERGE
9ab2ecac03b993d4c41b8d31485fb75e6c6d81ff 17-Aug-2014 Baligh Uddin <baligh@google.com> am a0231634: (-s ours) Import translations. DO NOT MERGE

* commit 'a0231634888add49c180b5dfb5e7e3f1656276d1':
Import translations. DO NOT MERGE
8d522d53a48c9d4ea5ab93bbe94b0f703c4ab5ba 21-Aug-2014 Yorke Lee <yorkelee@google.com> Merge "Pass call capabilities from connection to call" into lmp-dev
b2920b3dfe8782a61db7ecd4b783bb11856cfda3 20-Aug-2014 Yorke Lee <yorkelee@google.com> Pass call capabilities from connection to call

This fixes TestConnectionService so that various capabilities
like hold work as expected

Bug: 17147682
Change-Id: If15f7ea2f14dfb985244956d5876bb8ec638f40e
rc/com/android/telecomm/Call.java
0ef3eee3157dc003a638a47709c43c7c203f71f8 18-Aug-2014 Yorke Lee <yorkelee@google.com> Merge "Disallow non-emergency phone calls for restricted users" into lmp-dev
35bcc89cddc7bbcf891454059bf78cd5f35da0a7 14-Aug-2014 Yorke Lee <yorkelee@google.com> Disallow non-emergency phone calls for restricted users

Bug: 16217514

Change-Id: Idc89a5945a30099654ca8b8cd467f69a4002c8f6
es/values/strings.xml
rc/com/android/telecomm/CallActivity.java
a0231634888add49c180b5dfb5e7e3f1656276d1 16-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I6add1a3ac38d8c4ba2e80d4e61c9fa21f716351a
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
f2b765d7001128dddfcc2e94f85a5c2109b9918c 16-Aug-2014 Tyler Gunn <tgunn@google.com> am 512f6adf: am 0a634dc8: am 1746aea6: Merge "Add BIND_CONNECTION_SERVICE permission. (2/2)" into lmp-dev

* commit '512f6adf68b8821295dcda12229d91b4916ced48':
Add BIND_CONNECTION_SERVICE permission. (2/2)
dba357a2fd03c16149751408eab6fd85569ccae8 16-Aug-2014 Santos Cordon <santoscordon@google.com> am 907c19c3: am 65fd1cb0: am 2d0b331f: Disconnect calls which were canceled via NEW_OUTGOING_CALL intent.

* commit '907c19c3833e47e195fe43dcf2e7c67ff1a48042':
Disconnect calls which were canceled via NEW_OUTGOING_CALL intent.
b0c358aa1930de97294265277ec99db0a62b6ca2 16-Aug-2014 Ihab Awad <ihab@google.com> am bb548395: am 17392d6e: am 1228e101: Merge "Fix problems with wiring of initializing calls (2/2)" into lmp-dev

* commit 'bb548395eedac090b137e1c5aa962771519b6596':
Fix problems with wiring of initializing calls (2/2)
4e70af866e1bd75192138304cff2729913674b9b 16-Aug-2014 Jay Shrauner <shrauner@google.com> am 1c891fd0: am 7c0b91ce: am a82c8f79: Prevent ConcurrentModificationExceptions

* commit '1c891fd023648ee5c80672d8cbc024a4a1f4e9b4':
Prevent ConcurrentModificationExceptions
512f6adf68b8821295dcda12229d91b4916ced48 16-Aug-2014 Tyler Gunn <tgunn@google.com> am 0a634dc8: am 1746aea6: Merge "Add BIND_CONNECTION_SERVICE permission. (2/2)" into lmp-dev

* commit '0a634dc8623b8186652545b5419a7a59298e363b':
Add BIND_CONNECTION_SERVICE permission. (2/2)
907c19c3833e47e195fe43dcf2e7c67ff1a48042 16-Aug-2014 Santos Cordon <santoscordon@google.com> am 65fd1cb0: am 2d0b331f: Disconnect calls which were canceled via NEW_OUTGOING_CALL intent.

* commit '65fd1cb0d2171fd9dc0c1642b67818bbf8f13e09':
Disconnect calls which were canceled via NEW_OUTGOING_CALL intent.
0a634dc8623b8186652545b5419a7a59298e363b 16-Aug-2014 Tyler Gunn <tgunn@google.com> am 1746aea6: Merge "Add BIND_CONNECTION_SERVICE permission. (2/2)" into lmp-dev

* commit '1746aea67b44455c5fde5416b0c8857353b653ba':
Add BIND_CONNECTION_SERVICE permission. (2/2)
65fd1cb0d2171fd9dc0c1642b67818bbf8f13e09 16-Aug-2014 Santos Cordon <santoscordon@google.com> am 2d0b331f: Disconnect calls which were canceled via NEW_OUTGOING_CALL intent.

* commit '2d0b331f659e4e95621e738bbddaa38a80a70d4c':
Disconnect calls which were canceled via NEW_OUTGOING_CALL intent.
2d0b331f659e4e95621e738bbddaa38a80a70d4c 16-Aug-2014 Santos Cordon <santoscordon@google.com> Disconnect calls which were canceled via NEW_OUTGOING_CALL intent.

Bug: 17067923
Change-Id: Ida72b045f07e335bfa8c5542bdf40102e0a7a5de
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
bb548395eedac090b137e1c5aa962771519b6596 16-Aug-2014 Ihab Awad <ihab@google.com> am 17392d6e: am 1228e101: Merge "Fix problems with wiring of initializing calls (2/2)" into lmp-dev

* commit '17392d6e8c1739b873c7b83165a072410617ea41':
Fix problems with wiring of initializing calls (2/2)
17392d6e8c1739b873c7b83165a072410617ea41 16-Aug-2014 Ihab Awad <ihab@google.com> am 1228e101: Merge "Fix problems with wiring of initializing calls (2/2)" into lmp-dev

* commit '1228e10147f1a33269b161c46f269207ef3f34a1':
Fix problems with wiring of initializing calls (2/2)
1c891fd023648ee5c80672d8cbc024a4a1f4e9b4 16-Aug-2014 Jay Shrauner <shrauner@google.com> am 7c0b91ce: am a82c8f79: Prevent ConcurrentModificationExceptions

* commit '7c0b91ce7d9e9bcdc7e5fd7ea5339a74bfd6b424':
Prevent ConcurrentModificationExceptions
7c0b91ce7d9e9bcdc7e5fd7ea5339a74bfd6b424 16-Aug-2014 Jay Shrauner <shrauner@google.com> am a82c8f79: Prevent ConcurrentModificationExceptions

* commit 'a82c8f794a0a1a9eaa1329a6361abe28043d139a':
Prevent ConcurrentModificationExceptions
87b3d063d6c6a9043d4c3e6655fcd425d5b93920 15-Aug-2014 Andrew Lee <anwlee@google.com> am 8a19f98a: am e1eb9a09: am 28b57a5a: Merge "Finish the respond via SMS setting activity to return to top level." into lmp-dev

* commit '8a19f98a0f1c580f4b999848612977f8af2d117c':
Finish the respond via SMS setting activity to return to top level.
8a19f98a0f1c580f4b999848612977f8af2d117c 15-Aug-2014 Andrew Lee <anwlee@google.com> am e1eb9a09: am 28b57a5a: Merge "Finish the respond via SMS setting activity to return to top level." into lmp-dev

* commit 'e1eb9a0935e65ccfd9c41ec311ed13efb3fb1d25':
Finish the respond via SMS setting activity to return to top level.
a82c8f794a0a1a9eaa1329a6361abe28043d139a 15-Aug-2014 Jay Shrauner <shrauner@google.com> Prevent ConcurrentModificationExceptions

Use sets backed by ConcurrentHashMaps instead of HashSets to prevent
concurrent exceptions if listeners try to remove themselves in callbacks
while iterating over the listeners.

Bug:16325026
Change-Id: I5089eac83154f8d71b759a891c0fbf3d3a9a4e6a
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/WiredHeadsetManager.java
1228e10147f1a33269b161c46f269207ef3f34a1 16-Aug-2014 Ihab Awad <ihab@google.com> Merge "Fix problems with wiring of initializing calls (2/2)" into lmp-dev
1746aea67b44455c5fde5416b0c8857353b653ba 16-Aug-2014 Tyler Gunn <tgunn@google.com> Merge "Add BIND_CONNECTION_SERVICE permission. (2/2)" into lmp-dev
d160768de741927c3e8afb79971bf33371a8518c 15-Aug-2014 Tyler Gunn <tgunn@google.com> Add BIND_CONNECTION_SERVICE permission. (2/2)

- Adding permission to Telecomm AndroidManifest.

Bug: 16171070
Change-Id: I3e57ac0a345f95b3147b89914ad1c292644f0073
ndroidManifest.xml
e1eb9a0935e65ccfd9c41ec311ed13efb3fb1d25 15-Aug-2014 Andrew Lee <anwlee@google.com> am 28b57a5a: Merge "Finish the respond via SMS setting activity to return to top level." into lmp-dev

* commit '28b57a5abd668ab9239bcd82d6f90e9e104b3044':
Finish the respond via SMS setting activity to return to top level.
73fb19f7470874972d30415f9d8fe29cd30a0fa7 15-Aug-2014 Sailesh Nepal <sail@google.com> am 6caf3232: am de0356fd: am 9a93a026: Merge "Telecomm Impl: Include more state in ParcelableConnection" into lmp-dev

* commit '6caf3232cfc62602c7122cda85a80c8767018f6c':
Telecomm Impl: Include more state in ParcelableConnection
a84ad686491c5c77cf9be3d46804a618f5b86250 15-Aug-2014 Jay Shrauner <shrauner@google.com> am ecbfbeee: am 6ae587f1: am fd4d7b5c: Handle null mConnectionService in disconnect

* commit 'ecbfbeee17611d393691a53ea9b38b53d19bbee3':
Handle null mConnectionService in disconnect
90dcff475c61f1dbb2c470c6438107661dc9b43c 15-Aug-2014 Nancy Chen <nancychen@google.com> am 20c992b9: am d2ed4744: am d7f8b052: Merge "Pass extras between call intents and Telecomm for outgoing calls" into lmp-dev

* commit '20c992b99d6244760bcedd59a32b881d341ea4c7':
Pass extras between call intents and Telecomm for outgoing calls
6caf3232cfc62602c7122cda85a80c8767018f6c 15-Aug-2014 Sailesh Nepal <sail@google.com> am de0356fd: am 9a93a026: Merge "Telecomm Impl: Include more state in ParcelableConnection" into lmp-dev

* commit 'de0356fdba10bec9606ccb6ccfbb1d37740e47f1':
Telecomm Impl: Include more state in ParcelableConnection
ecbfbeee17611d393691a53ea9b38b53d19bbee3 15-Aug-2014 Jay Shrauner <shrauner@google.com> am 6ae587f1: am fd4d7b5c: Handle null mConnectionService in disconnect

* commit '6ae587f14c578c383f33d4f477f1ea91f4bd730b':
Handle null mConnectionService in disconnect
20c992b99d6244760bcedd59a32b881d341ea4c7 15-Aug-2014 Nancy Chen <nancychen@google.com> am d2ed4744: am d7f8b052: Merge "Pass extras between call intents and Telecomm for outgoing calls" into lmp-dev

* commit 'd2ed47446415b3447eb0b28d6e006d2f5a537d57':
Pass extras between call intents and Telecomm for outgoing calls
28b57a5abd668ab9239bcd82d6f90e9e104b3044 15-Aug-2014 Andrew Lee <anwlee@google.com> Merge "Finish the respond via SMS setting activity to return to top level." into lmp-dev
de0356fdba10bec9606ccb6ccfbb1d37740e47f1 15-Aug-2014 Sailesh Nepal <sail@google.com> am 9a93a026: Merge "Telecomm Impl: Include more state in ParcelableConnection" into lmp-dev

* commit '9a93a026e06200620e6d713ec1b8f705dd55c43a':
Telecomm Impl: Include more state in ParcelableConnection
55f3c6932d45c061eace226003f5f7cbd646c594 15-Aug-2014 Andrew Lee <anwlee@google.com> Finish the respond via SMS setting activity to return to top level.

Formerly, it was redirecting to Telephony's call settings. Now, we
want to just go back to general settings in AOSP/Google dialer.

Bug: 16788935
Change-Id: I208d1cb6be12a177b313f0129259943637a5e0f7
rc/com/android/telecomm/RespondViaSmsSettings.java
a02bef5d67f261d7457d0dab9e51595f1960128b 14-Aug-2014 Ihab Awad <ihab@google.com> Fix problems with wiring of initializing calls (2/2)

Bug: 16993846
Change-Id: Iee3b33fb01d1a567532d791496aa03f908c22bf6
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
6ae587f14c578c383f33d4f477f1ea91f4bd730b 15-Aug-2014 Jay Shrauner <shrauner@google.com> am fd4d7b5c: Handle null mConnectionService in disconnect

* commit 'fd4d7b5c86bb3ae9fc78b6dd820654ab977b7092':
Handle null mConnectionService in disconnect
fd4d7b5c86bb3ae9fc78b6dd820654ab977b7092 14-Aug-2014 Jay Shrauner <shrauner@google.com> Handle null mConnectionService in disconnect

Check for null mConnectionService rather that throwing an exception.

Bug:17016200
Change-Id: Ib01d778b1991d4d44a5bc47d4c2d7dac6c262db8
rc/com/android/telecomm/Call.java
d2ed47446415b3447eb0b28d6e006d2f5a537d57 14-Aug-2014 Nancy Chen <nancychen@google.com> am d7f8b052: Merge "Pass extras between call intents and Telecomm for outgoing calls" into lmp-dev

* commit 'd7f8b0529f76d829bceb9bf9ee6cd934c4df711b':
Pass extras between call intents and Telecomm for outgoing calls
4cc44ceb6634aa3978597a7f12b582c262379a23 14-Aug-2014 Yorke Lee <yorkelee@google.com> am d14f8f6f: am 0f38f9d4: am b701f6d3: Fix MMI code handling

* commit 'd14f8f6f052c0ffd583119e88cc47b1ba6227ddd':
Fix MMI code handling
f18d0f8d8b27461dc318146249660b144268ae62 14-Aug-2014 Tyler Gunn <tgunn@google.com> am c6ca30d9: am 792b1da6: am a3d76d10: Merge "Preventing telecomm intent handling from executing on tablets." into lmp-dev

* commit 'c6ca30d97d596518e198840a6e31b4b958fc4c75':
Preventing telecomm intent handling from executing on tablets.
d14f8f6f052c0ffd583119e88cc47b1ba6227ddd 14-Aug-2014 Yorke Lee <yorkelee@google.com> am 0f38f9d4: am b701f6d3: Fix MMI code handling

* commit '0f38f9d408d655044d87263b5f21201ff902e8d8':
Fix MMI code handling
c6ca30d97d596518e198840a6e31b4b958fc4c75 14-Aug-2014 Tyler Gunn <tgunn@google.com> am 792b1da6: am a3d76d10: Merge "Preventing telecomm intent handling from executing on tablets." into lmp-dev

* commit '792b1da67117daf551b29075ded4305493f97f81':
Preventing telecomm intent handling from executing on tablets.
0f38f9d408d655044d87263b5f21201ff902e8d8 14-Aug-2014 Yorke Lee <yorkelee@google.com> am b701f6d3: Fix MMI code handling

* commit 'b701f6d39bae7caec1ef9b1e57457001f703986d':
Fix MMI code handling
b701f6d39bae7caec1ef9b1e57457001f703986d 12-Aug-2014 Yorke Lee <yorkelee@google.com> Fix MMI code handling

If the handle to be dialed is potentially an MMI code, postpone
the addition of the call so that the InCallUI doesn't show up
immediately. Instead, add it in onSuccessfulOutgoingCall instead once
it is determined that the handle is not actually an MMI code.

Bug: 16305480

Change-Id: I0c5c67543650b74398d358f5723b621fb16f9e1e
rc/com/android/telecomm/CallsManager.java
792b1da67117daf551b29075ded4305493f97f81 14-Aug-2014 Tyler Gunn <tgunn@google.com> am a3d76d10: Merge "Preventing telecomm intent handling from executing on tablets." into lmp-dev

* commit 'a3d76d1000bd32b1b0b5bc93cfe3611455b03467':
Preventing telecomm intent handling from executing on tablets.
45e22199ffb221f13023fa1e9527978c4e59167b 13-Aug-2014 Tyler Gunn <tgunn@google.com> am 5b9814d2: am 43cc331d: am 827f3d30: Merge "Un-registering phone accounts for packages which are uninstalled." into lmp-dev

* commit '5b9814d2dc2870abc8d465516be771e9f9ad36ee':
Un-registering phone accounts for packages which are uninstalled.
5b9814d2dc2870abc8d465516be771e9f9ad36ee 13-Aug-2014 Tyler Gunn <tgunn@google.com> am 43cc331d: am 827f3d30: Merge "Un-registering phone accounts for packages which are uninstalled." into lmp-dev

* commit '43cc331d6b4b992715095bdb2709aa8a6669322b':
Un-registering phone accounts for packages which are uninstalled.
43cc331d6b4b992715095bdb2709aa8a6669322b 13-Aug-2014 Tyler Gunn <tgunn@google.com> am 827f3d30: Merge "Un-registering phone accounts for packages which are uninstalled." into lmp-dev

* commit '827f3d30712de523929bb13eb31223afa65a9981':
Un-registering phone accounts for packages which are uninstalled.
c4e74b891621016b7c9725492ba78c14f6757e64 13-Aug-2014 Jay Shrauner <shrauner@google.com> am 5b8eaefb: am 0deb2b0b: am acb91eb8: Remove precondition checks

* commit '5b8eaefbf853b1d5f752f952788537556060a3bd':
Remove precondition checks
5b8eaefbf853b1d5f752f952788537556060a3bd 13-Aug-2014 Jay Shrauner <shrauner@google.com> am 0deb2b0b: am acb91eb8: Remove precondition checks

* commit '0deb2b0b99a266f435b1a77026367dba8469b804':
Remove precondition checks
0deb2b0b99a266f435b1a77026367dba8469b804 13-Aug-2014 Jay Shrauner <shrauner@google.com> am acb91eb8: Remove precondition checks

* commit 'acb91eb8e9d0f08a7ccce72062a7eb2cf958aa51':
Remove precondition checks
acb91eb8e9d0f08a7ccce72062a7eb2cf958aa51 09-Aug-2014 Jay Shrauner <shrauner@google.com> Remove precondition checks

Remove precondition checks when we can work around them.

Bug:16620302
Change-Id: Ideb70a35c08f2275361eebec2850f454cf0bec55
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/DtmfLocalTonePlayer.java
367454e6ff3083e4e49d387a50a0879871f6ca33 13-Aug-2014 Ihab Awad <ihab@google.com> am 102468ce: am 61fa1aee: am 6fb37c87: Final structural tweaks to Telecomm API (4/8)

* commit '102468ceb02f01595675f36b4df3aba57f498ad6':
Final structural tweaks to Telecomm API (4/8)
102468ceb02f01595675f36b4df3aba57f498ad6 13-Aug-2014 Ihab Awad <ihab@google.com> am 61fa1aee: am 6fb37c87: Final structural tweaks to Telecomm API (4/8)

* commit '61fa1aee138ce66fbd802afce8a9276c95e2d4ff':
Final structural tweaks to Telecomm API (4/8)
61fa1aee138ce66fbd802afce8a9276c95e2d4ff 13-Aug-2014 Ihab Awad <ihab@google.com> am 6fb37c87: Final structural tweaks to Telecomm API (4/8)

* commit '6fb37c87836b5245046bd3b14320823ab839a10c':
Final structural tweaks to Telecomm API (4/8)
6fb37c87836b5245046bd3b14320823ab839a10c 08-Aug-2014 Ihab Awad <ihab@google.com> Final structural tweaks to Telecomm API (4/8)

Bug: 16416927
Bug: 16494880
Change-Id: Ic3def04d1cd14ec3c7c5e4eeb3bbd6ac62147421
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/InCallToneMonitor.java
rc/com/android/telecomm/MissedCallNotifier.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/PhoneStateBroadcaster.java
rc/com/android/telecomm/Ringer.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestConnectionManager.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
ests/src/com/android/telecomm/testapps/TestVideoCallProvider.java
ests/src/com/android/telecomm/testapps/TestVideoProvider.java
ests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
9a93a026e06200620e6d713ec1b8f705dd55c43a 15-Aug-2014 Sailesh Nepal <sail@google.com> Merge "Telecomm Impl: Include more state in ParcelableConnection" into lmp-dev
604a4fe52c7de1347f40aadfba1964e9dcfb223c 15-Aug-2014 Sailesh Nepal <sail@google.com> Telecomm Impl: Include more state in ParcelableConnection

This CL uses the new states added to ParcelableConnection.

Change-Id: I2388a095cbeedb83e7ec03bd075b1507a0dda07f
Bug: 17044602
rc/com/android/telecomm/Call.java
a3d76d1000bd32b1b0b5bc93cfe3611455b03467 14-Aug-2014 Tyler Gunn <tgunn@google.com> Merge "Preventing telecomm intent handling from executing on tablets." into lmp-dev
8ad2d8d82922bcb14c1a12a6055342b2fd414bcb 13-Aug-2014 Tyler Gunn <tgunn@google.com> Preventing telecomm intent handling from executing on tablets.

Bug: 17000484
Change-Id: Iaea456f65670068515076d4c64bc1c65d0341d55
rc/com/android/telecomm/CallActivity.java
827f3d30712de523929bb13eb31223afa65a9981 13-Aug-2014 Tyler Gunn <tgunn@google.com> Merge "Un-registering phone accounts for packages which are uninstalled." into lmp-dev
d900ce6021fe457c97f1e8d82374bf30b08f2ee5 13-Aug-2014 Tyler Gunn <tgunn@google.com> Un-registering phone accounts for packages which are uninstalled.

Added BroadcastReceiver in telecomm to listen to package removal intents,
and to remove any phone accounts from the PhoneAccountRegistrar for the
removed package.

Bug: 16934114

Change-Id: I49540264b5da6d00ad542d020cdf140cd54557f1
ndroidManifest.xml
rc/com/android/telecomm/PhoneAccountBroadcastReceiver.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
d7f8b0529f76d829bceb9bf9ee6cd934c4df711b 14-Aug-2014 Nancy Chen <nancychen@google.com> Merge "Pass extras between call intents and Telecomm for outgoing calls" into lmp-dev
632407ab968f22bde7f76961c02b9d1e5fd0c480 13-Aug-2014 Tyler Gunn <tgunn@google.com> am 7b98a01a: am f347147b: am 9646ed98: Merge "Changing the point where the call state is set." into lmp-dev

* commit '7b98a01a7ac29a66e84e0315e6c58f76da51e24d':
Changing the point where the call state is set.
7b98a01a7ac29a66e84e0315e6c58f76da51e24d 13-Aug-2014 Tyler Gunn <tgunn@google.com> am f347147b: am 9646ed98: Merge "Changing the point where the call state is set." into lmp-dev

* commit 'f347147b73542e83c69397a980a10afbc9b1d01b':
Changing the point where the call state is set.
f347147b73542e83c69397a980a10afbc9b1d01b 13-Aug-2014 Tyler Gunn <tgunn@google.com> am 9646ed98: Merge "Changing the point where the call state is set." into lmp-dev

* commit '9646ed98b4283a475862fca3df880524bedc9c1e':
Changing the point where the call state is set.
a9d91da9fcf2d8223ec6e0ffb9bd2d506c5a25fe 12-Aug-2014 Nancy Chen <nancychen@google.com> Pass extras between call intents and Telecomm for outgoing calls

Enable bundled extras for outgoing calls in order to pass
information from dialer or contacts to the incallui.

Bug: 15284651
Change-Id: Ic34c8a49bf599ebc2924c342eddde051216d3266
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
9646ed98b4283a475862fca3df880524bedc9c1e 13-Aug-2014 Tyler Gunn <tgunn@google.com> Merge "Changing the point where the call state is set." into lmp-dev
cde2e5062b1b1689cd8962e28763fa0a35e2476a 12-Aug-2014 Tyler Gunn <tgunn@google.com> Changing the point where the call state is set.

The reason speakerphone was not working while the call was dialing was
because the call went from state DIALING -> DIALING, which was not seen
as a state change, which meant that the call was not updated in the audio
manager, resulting there being no audio focus.

Note this is related to changes made in CL/518284.

Bug: 16978516
Change-Id: I7b2be0ec21c484f6fbd767055e5e9afefbb526e2
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
c57ea85e9ac2339bd245ccb354d97c43402a357e 12-Aug-2014 Santos Cordon <santoscordon@google.com> am 11378b1a: am 33dbe0f5: am b3ed36db: Merge "Set Telecomm package on incoming call intent" into lmp-dev

* commit '11378b1a2c86a7ed1c3b2d211340ce6716f59fd2':
Set Telecomm package on incoming call intent
11378b1a2c86a7ed1c3b2d211340ce6716f59fd2 12-Aug-2014 Santos Cordon <santoscordon@google.com> am 33dbe0f5: am b3ed36db: Merge "Set Telecomm package on incoming call intent" into lmp-dev

* commit '33dbe0f56fe1e959c88596bd70bc260c0565a9e4':
Set Telecomm package on incoming call intent
33dbe0f56fe1e959c88596bd70bc260c0565a9e4 12-Aug-2014 Santos Cordon <santoscordon@google.com> am b3ed36db: Merge "Set Telecomm package on incoming call intent" into lmp-dev

* commit 'b3ed36dbc6647e3b73c97e1846d6361c00784da0':
Set Telecomm package on incoming call intent
b3ed36dbc6647e3b73c97e1846d6361c00784da0 12-Aug-2014 Santos Cordon <santoscordon@google.com> Merge "Set Telecomm package on incoming call intent" into lmp-dev
75bbae110e7a816a387f2552c70de0ce01de6441 12-Aug-2014 Jay Shrauner <shrauner@google.com> am f43bc468: am b3709fba: am ca8a7701: Merge "Remove checkValidCallId" into lmp-dev

* commit 'f43bc468ade3900dc3348ae4b40e89d7708770e6':
Remove checkValidCallId
f43bc468ade3900dc3348ae4b40e89d7708770e6 12-Aug-2014 Jay Shrauner <shrauner@google.com> am b3709fba: am ca8a7701: Merge "Remove checkValidCallId" into lmp-dev

* commit 'b3709fbade31d39b9f4489d98817f5f0d3f62866':
Remove checkValidCallId
dfd1e8c642e275a7746392e6064c171275cd1a72 12-Aug-2014 Evan Charlton <evanc@google.com> Set Telecomm package on incoming call intent

Prevent other apps from intercepting the incoming call intent by
explicitly the Telecomm package name on the intent.

Bug: 16978437
Change-Id: Ie6dae654a5c9f02593d8c33d41e324d7845614aa
rc/com/android/telecomm/TelecommServiceImpl.java
b3709fbade31d39b9f4489d98817f5f0d3f62866 12-Aug-2014 Jay Shrauner <shrauner@google.com> am ca8a7701: Merge "Remove checkValidCallId" into lmp-dev

* commit 'ca8a77015c653cd9da66cec8f17821eef34de108':
Remove checkValidCallId
0e4fa4a08513309159694dab8d837517cb0a39e5 12-Aug-2014 Baligh Uddin <baligh@google.com> am a956386d: (-s ours) am f623d1a0: (-s ours) am 7148d43e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'a956386d97debf66b4913c38b19bade3e4e74365':
Import translations. DO NOT MERGE
a956386d97debf66b4913c38b19bade3e4e74365 12-Aug-2014 Baligh Uddin <baligh@google.com> am f623d1a0: (-s ours) am 7148d43e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'f623d1a023606289a5185b557a91f56112e7768e':
Import translations. DO NOT MERGE
f623d1a023606289a5185b557a91f56112e7768e 12-Aug-2014 Baligh Uddin <baligh@google.com> am 7148d43e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '7148d43e9914efe79e019d52eb2cb186c3a421b5':
Import translations. DO NOT MERGE
ca8a77015c653cd9da66cec8f17821eef34de108 12-Aug-2014 Jay Shrauner <shrauner@google.com> Merge "Remove checkValidCallId" into lmp-dev
969755a2a7ff9416f677dd87d520fce27e629dff 12-Aug-2014 Jay Shrauner <shrauner@google.com> Remove checkValidCallId

Don't throw exception when callid is invalid; instead, ignore request.

Bug:16908043
Change-Id: I1d0f076d997301ca6f878e7f2eeb9c03d7cc280c
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallAdapter.java
544db0faf41eecd0732640edcfb5f4c10fa55354 12-Aug-2014 Nancy Chen <nancychen@google.com> am 16ad519a: am 0dba3eb9: Merge "Reduce latency for InCallUI by adding an intermediate state" into lmp-dev

* commit '16ad519a19dff25beccf9fab059ce2662bf9c490':
Reduce latency for InCallUI by adding an intermediate state
16ad519a19dff25beccf9fab059ce2662bf9c490 12-Aug-2014 Nancy Chen <nancychen@google.com> am 0dba3eb9: Merge "Reduce latency for InCallUI by adding an intermediate state" into lmp-dev

* commit '0dba3eb9ac6d0c1889a185b6d306ff5d47cefba8':
Reduce latency for InCallUI by adding an intermediate state
bc9160d1477bf707e383a0ebb63940f6a69b9a21 12-Aug-2014 Ihab Awad <ihab@google.com> am 1abbf23b: am 39b6a984: Fix testing issue with DTMF tones

* commit '1abbf23b2bcbdd229b262297f3076f2479d62330':
Fix testing issue with DTMF tones
1abbf23b2bcbdd229b262297f3076f2479d62330 12-Aug-2014 Ihab Awad <ihab@google.com> am 39b6a984: Fix testing issue with DTMF tones

* commit '39b6a9847b8b39b85145d7abdad6485c8f6f0bea':
Fix testing issue with DTMF tones
39b6a9847b8b39b85145d7abdad6485c8f6f0bea 09-Aug-2014 Ihab Awad <ihab@google.com> Fix testing issue with DTMF tones

Change-Id: I7832bd23dd5f0ef76833569ee211a9e9804d19b9
ests/src/com/android/telecomm/testapps/TestConnectionManager.java
7148d43e9914efe79e019d52eb2cb186c3a421b5 12-Aug-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-dev
f79f0d9ddfd3238c2a2b6177c5028f0b234d0502 11-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I8b0ea2223715dfd34775e95bea8095c76ff950f5
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
0dba3eb9ac6d0c1889a185b6d306ff5d47cefba8 12-Aug-2014 Nancy Chen <nancychen@google.com> Merge "Reduce latency for InCallUI by adding an intermediate state" into lmp-dev
416aa0a88779a66a9cfce807f8324c09cc73c72a 12-Aug-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
d30f101fa34e92f670852f72eea7d15c10d7a2cf 12-Aug-2014 Nancy Chen <nancychen@google.com> am 544db0fa: am 16ad519a: am 0dba3eb9: Merge "Reduce latency for InCallUI by adding an intermediate state" into lmp-dev

* commit '544db0faf41eecd0732640edcfb5f4c10fa55354':
Reduce latency for InCallUI by adding an intermediate state
4e211b8aaeecc1e52855b86044294e7a46ff45e9 12-Aug-2014 Ihab Awad <ihab@google.com> am bc9160d1: am 1abbf23b: am 39b6a984: Fix testing issue with DTMF tones

* commit 'bc9160d1477bf707e383a0ebb63940f6a69b9a21':
Fix testing issue with DTMF tones
459d50f55e83d95cd9b500b6211224d0b99e0408 11-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: If73bfc36e76385957c6e84bd52256ca4426f1d5a
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
a82939578e3bf7a2d61f51f926860e2c989cf8af 11-Aug-2014 Sailesh Nepal <sail@google.com> am 30e41fce: am e63b53ac: am e9225d14: Merge "Don\'t set connection manager for call providers" into lmp-dev

* commit '30e41fcec6a3a83a7b822729d72bdead9f98dbe3':
Don't set connection manager for call providers
30e41fcec6a3a83a7b822729d72bdead9f98dbe3 11-Aug-2014 Sailesh Nepal <sail@google.com> am e63b53ac: am e9225d14: Merge "Don\'t set connection manager for call providers" into lmp-dev

* commit 'e63b53ac9cb910fe4e27bb617f87f6cb6239ad4f':
Don't set connection manager for call providers
e63b53ac9cb910fe4e27bb617f87f6cb6239ad4f 11-Aug-2014 Sailesh Nepal <sail@google.com> am e9225d14: Merge "Don\'t set connection manager for call providers" into lmp-dev

* commit 'e9225d142c743dce42cca87cd0876e299a14287c':
Don't set connection manager for call providers
e9225d142c743dce42cca87cd0876e299a14287c 11-Aug-2014 Sailesh Nepal <sail@google.com> Merge "Don't set connection manager for call providers" into lmp-dev
7cdb68351289a5cd5c3017616fefab0bb9142711 10-Aug-2014 Sailesh Nepal <sail@google.com> am 34bc451a: am 2ec1c236: am 49db2803: Merge "Have telecomm test app register a SIM Subscription account" into lmp-dev

* commit '34bc451a5c75066d9661c158d649cd39ea2e1c2a':
Have telecomm test app register a SIM Subscription account
7b683a87633ea138586cda6ecadcad4903226858 10-Aug-2014 Tyler Gunn <tgunn@google.com> am 9d64a52c: am 30c72cb1: am b19d23fd: VT preview camera setup. (1/2)

* commit '9d64a52ce7c0185cb45c6aa4c47bfc61012496dd':
VT preview camera setup. (1/2)
34bc451a5c75066d9661c158d649cd39ea2e1c2a 10-Aug-2014 Sailesh Nepal <sail@google.com> am 2ec1c236: am 49db2803: Merge "Have telecomm test app register a SIM Subscription account" into lmp-dev

* commit '2ec1c2362bf6107c1e3228e8090f935b7e06d060':
Have telecomm test app register a SIM Subscription account
9d64a52ce7c0185cb45c6aa4c47bfc61012496dd 10-Aug-2014 Tyler Gunn <tgunn@google.com> am 30c72cb1: am b19d23fd: VT preview camera setup. (1/2)

* commit '30c72cb163ebf1ed76279840d74d2ab4476fa87b':
VT preview camera setup. (1/2)
2ec1c2362bf6107c1e3228e8090f935b7e06d060 10-Aug-2014 Sailesh Nepal <sail@google.com> am 49db2803: Merge "Have telecomm test app register a SIM Subscription account" into lmp-dev

* commit '49db2803fd058fa8cac00571389f610e4ed01f7f':
Have telecomm test app register a SIM Subscription account
30c72cb163ebf1ed76279840d74d2ab4476fa87b 10-Aug-2014 Tyler Gunn <tgunn@google.com> am b19d23fd: VT preview camera setup. (1/2)

* commit 'b19d23fd57cf17b7d0c66760131319a5fec930ad':
VT preview camera setup. (1/2)
7957f9ca486703ba1c2d5f63a8537d65ac3f1f94 10-Aug-2014 Sailesh Nepal <sail@google.com> Don't set connection manager for call providers

Bug: 16902986
Change-Id: I747dca2e74bfa1beb15bb8acb0e0229fa7dcfa6e
rc/com/android/telecomm/CreateConnectionProcessor.java
49db2803fd058fa8cac00571389f610e4ed01f7f 10-Aug-2014 Sailesh Nepal <sail@google.com> Merge "Have telecomm test app register a SIM Subscription account" into lmp-dev
e4ef521dfb608034c984b061cceaa290bcbb8800 10-Aug-2014 Sailesh Nepal <sail@google.com> Have telecomm test app register a SIM Subscription account

This account can be used to test mutli-sim code path in Hangouts.

Bug: 16902986
Change-Id: I5f8616c485e0c495fba817bc349fcccbe2799259
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
0d3076c3dfa54f1102a843735ca774759e52d8b8 30-Jul-2014 Nancy Chen <nancychen@google.com> Reduce latency for InCallUI by adding an intermediate state

Immediately add a call to Telecomm before the outgoing call broadcast
intent returns, this will reduce the latency for the InCallUI by
allowing the InCallActivity to start before Telecomm has responded.

Bug: 16396523

Change-Id: I4edd533083d3d7edb7a14d179c174223374a4282
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
b19d23fd57cf17b7d0c66760131319a5fec930ad 08-Aug-2014 Tyler Gunn <tgunn@google.com> VT preview camera setup. (1/2)

Changing the means by which the preview camera is set for video calls.
Previously, an assumption was made that as soon as the camera is set
on the provider, the camera capabilities would be returned.
Changed so that instead the InCall-UI will explicitly request the
camera capabilities after the camera is set to match the original
intended camera setup flow.

Change-Id: I539e6bd72404e06f89f2e684cbb40c51637ead19
ests/src/com/android/telecomm/testapps/TestVideoCallProvider.java
ca06f480b16a9c12bd65906a32abff7ab35d0de8 08-Aug-2014 RoboErik <epastern@google.com> am 3c20e852: am f6d6b25c: am a6e9d758: Update MediaSession callback

* commit '3c20e852d53e24fb17e63e06dcd2479e005744b7':
Update MediaSession callback
3c20e852d53e24fb17e63e06dcd2479e005744b7 08-Aug-2014 RoboErik <epastern@google.com> am f6d6b25c: am a6e9d758: Update MediaSession callback

* commit 'f6d6b25c6b025419b7bcebd6b6afb8024b686fa8':
Update MediaSession callback
f6d6b25c6b025419b7bcebd6b6afb8024b686fa8 08-Aug-2014 RoboErik <epastern@google.com> am a6e9d758: Update MediaSession callback

* commit 'a6e9d758f02ec0654f489725e9b9442796d0b03f':
Update MediaSession callback
ee1ff5faf668fdf36adf17ed7e8bf2e349808902 08-Aug-2014 Santos Cordon <santoscordon@google.com> am 8b947ff0: am d8c0a34a: am 14ff8384: Clean up audio mode setting in telecomm.

* commit '8b947ff0419c427e3842caee44a1950b5bed71cd':
Clean up audio mode setting in telecomm.
8b947ff0419c427e3842caee44a1950b5bed71cd 08-Aug-2014 Santos Cordon <santoscordon@google.com> am d8c0a34a: am 14ff8384: Clean up audio mode setting in telecomm.

* commit 'd8c0a34a821b9e7e654da00af8332923c1ccf462':
Clean up audio mode setting in telecomm.
a6e9d758f02ec0654f489725e9b9442796d0b03f 08-Aug-2014 RoboErik <epastern@google.com> Update MediaSession callback

Callback and TransportControlsCallback were merged.

Change-Id: I5b918316a192af70d7ff661f447ee24857be2eca
rc/com/android/telecomm/HeadsetMediaButton.java
d8c0a34a821b9e7e654da00af8332923c1ccf462 07-Aug-2014 Santos Cordon <santoscordon@google.com> am 14ff8384: Clean up audio mode setting in telecomm.

* commit '14ff8384ea44488ed6b203ceaac56a6c5294130a':
Clean up audio mode setting in telecomm.
14ff8384ea44488ed6b203ceaac56a6c5294130a 06-Aug-2014 Santos Cordon <santoscordon@google.com> Clean up audio mode setting in telecomm.

Audio mode was being set too often by triggers which could come in
outside of a call: headset plugged in, bluetooth plugged in.
Do a check for focus before allowing these triggers to take effect.

Additionally, audio settings were updated for any added call, even
those which may not need audio yet (NEW calls which have not
transitioned to DIALING or RINGING...or anything else). Don't do that.

Bug: 15589644
Bug: 16132361
Change-Id: Id8425a15cd89233159323387b1e86f432c09016a
rc/com/android/telecomm/CallAudioManager.java
25e3efc8df1d9646054b6b8ef9d646056498a397 07-Aug-2014 Santos Cordon <santoscordon@google.com> am e8b437dc: am 5606a1c0: am 68f55b41: Merge "Add null checks to MissedCallNotifier." into lmp-dev

* commit 'e8b437dc1a606c2aa8842ff7a9df9d025117c3b1':
Add null checks to MissedCallNotifier.
816256c3063c9e75efa5a289cf4ec1723798798e 07-Aug-2014 Santos Cordon <santoscordon@google.com> am 8044eb11: am 9f8a67f3: am bf0dabc9: Merge "Prevent two simultaneous outgoing calls." into lmp-dev

* commit '8044eb111a22c4be68d77d8771f6eb7b44b35423':
Prevent two simultaneous outgoing calls.
376921f624cc54a2dd6050b4dcb7ca09705107c3 07-Aug-2014 Santos Cordon <santoscordon@google.com> am ca2fb011: am 8a951b97: am adef8dd2: Merge "Remove LDAPs from code." into lmp-dev

* commit 'ca2fb011a98f4c5ce49d5360b65df32e695b61a3':
Remove LDAPs from code.
f377c8f7ddaf1b2e99c4b9b2b34430042ae0a4db 07-Aug-2014 Santos Cordon <santoscordon@google.com> am a7babe01: am f740a042: am 06394a3b: Merge "Forget speakerphone state when calls disconnect." into lmp-dev

* commit 'a7babe0101908664e9f81b06bcbc0a3f798f6893':
Forget speakerphone state when calls disconnect.
e8b437dc1a606c2aa8842ff7a9df9d025117c3b1 06-Aug-2014 Santos Cordon <santoscordon@google.com> am 5606a1c0: am 68f55b41: Merge "Add null checks to MissedCallNotifier." into lmp-dev

* commit '5606a1c0a358b5c5a844618bff301a5fc02fe7ef':
Add null checks to MissedCallNotifier.
8044eb111a22c4be68d77d8771f6eb7b44b35423 06-Aug-2014 Santos Cordon <santoscordon@google.com> am 9f8a67f3: am bf0dabc9: Merge "Prevent two simultaneous outgoing calls." into lmp-dev

* commit '9f8a67f305cd51fd64804d341be973caeb90d535':
Prevent two simultaneous outgoing calls.
5606a1c0a358b5c5a844618bff301a5fc02fe7ef 06-Aug-2014 Santos Cordon <santoscordon@google.com> am 68f55b41: Merge "Add null checks to MissedCallNotifier." into lmp-dev

* commit '68f55b419fb0834c7257aa04b2b7cbcd4745f273':
Add null checks to MissedCallNotifier.
9f8a67f305cd51fd64804d341be973caeb90d535 06-Aug-2014 Santos Cordon <santoscordon@google.com> am bf0dabc9: Merge "Prevent two simultaneous outgoing calls." into lmp-dev

* commit 'bf0dabc91a81f20a2ad1ea32fce188ef9bd76127':
Prevent two simultaneous outgoing calls.
ca2fb011a98f4c5ce49d5360b65df32e695b61a3 06-Aug-2014 Santos Cordon <santoscordon@google.com> am 8a951b97: am adef8dd2: Merge "Remove LDAPs from code." into lmp-dev

* commit '8a951b974c0de102ea1da9f0fe120708592bb130':
Remove LDAPs from code.
a7babe0101908664e9f81b06bcbc0a3f798f6893 06-Aug-2014 Santos Cordon <santoscordon@google.com> am f740a042: am 06394a3b: Merge "Forget speakerphone state when calls disconnect." into lmp-dev

* commit 'f740a04229e0b486fa7795d2c206a4adbbe939cc':
Forget speakerphone state when calls disconnect.
8a951b974c0de102ea1da9f0fe120708592bb130 06-Aug-2014 Santos Cordon <santoscordon@google.com> am adef8dd2: Merge "Remove LDAPs from code." into lmp-dev

* commit 'adef8dd2b8b6c9c29c0110b7a340cbed74b3e7b8':
Remove LDAPs from code.
f740a04229e0b486fa7795d2c206a4adbbe939cc 06-Aug-2014 Santos Cordon <santoscordon@google.com> am 06394a3b: Merge "Forget speakerphone state when calls disconnect." into lmp-dev

* commit '06394a3b335ca2f47f481c1576e3e9ca8c8ea0a3':
Forget speakerphone state when calls disconnect.
c32cfa5146d031fa5b1215398626186c6aaf296d 06-Aug-2014 Geoff Mendal <mendal@google.com> am ede1e8dd: (-s ours) am ab94feff: (-s ours) am b73db52e: (-s ours) Import translations. DO NOT MERGE

* commit 'ede1e8ddbf0b2d01fbe86e796b9aa9cdd141cacb':
Import translations. DO NOT MERGE
7e5d2896a88433c5a543aec8106034d5edb89710 06-Aug-2014 Santos Cordon <santoscordon@google.com> am 70a565eb: am 8d71a8a9: am 12d61825: Add setConferenceable() API from ConnectionService to incall. (2/4)

* commit '70a565ebd37fd6cc07f084c63294a9c50e728c87':
Add setConferenceable() API from ConnectionService to incall. (2/4)
3f62cc04fb75ca38863c545d250501e989c3f708 06-Aug-2014 Ihab Awad <ihab@google.com> am 0bce191c: am 72aa48bb: am c17294cf: Finalize implementation of Remote Connection Service (2/4)

* commit '0bce191c8336584ec6df3cacc2e23398c1dfd405':
Finalize implementation of Remote Connection Service (2/4)
bf0dabc91a81f20a2ad1ea32fce188ef9bd76127 06-Aug-2014 Santos Cordon <santoscordon@google.com> Merge "Prevent two simultaneous outgoing calls." into lmp-dev
adef8dd2b8b6c9c29c0110b7a340cbed74b3e7b8 06-Aug-2014 Santos Cordon <santoscordon@google.com> Merge "Remove LDAPs from code." into lmp-dev
68f55b419fb0834c7257aa04b2b7cbcd4745f273 06-Aug-2014 Santos Cordon <santoscordon@google.com> Merge "Add null checks to MissedCallNotifier." into lmp-dev
06394a3b335ca2f47f481c1576e3e9ca8c8ea0a3 06-Aug-2014 Santos Cordon <santoscordon@google.com> Merge "Forget speakerphone state when calls disconnect." into lmp-dev
ede1e8ddbf0b2d01fbe86e796b9aa9cdd141cacb 06-Aug-2014 Geoff Mendal <mendal@google.com> am ab94feff: (-s ours) am b73db52e: (-s ours) Import translations. DO NOT MERGE

* commit 'ab94feff85ea422cce0c93cd0a8a8f0e231e8cca':
Import translations. DO NOT MERGE
ab94feff85ea422cce0c93cd0a8a8f0e231e8cca 06-Aug-2014 Geoff Mendal <mendal@google.com> am b73db52e: (-s ours) Import translations. DO NOT MERGE

* commit 'b73db52ed8c6a679526233b97e3ed07065126459':
Import translations. DO NOT MERGE
245a929517e20cf087e549d1c513f299a1a41282 06-Aug-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ie0c584edc32624bf8d8af3fb5c055826faf31c3e
Auto-generated-cl: translation import
es/values-fa/strings.xml
b73db52ed8c6a679526233b97e3ed07065126459 06-Aug-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I38aa3512cefab335607089b9b63d6ebd68f49141
Auto-generated-cl: translation import
es/values-fa/strings.xml
70a565ebd37fd6cc07f084c63294a9c50e728c87 06-Aug-2014 Santos Cordon <santoscordon@google.com> am 8d71a8a9: am 12d61825: Add setConferenceable() API from ConnectionService to incall. (2/4)

* commit '8d71a8a95f2ca0f4e029331d25345c279b46be7f':
Add setConferenceable() API from ConnectionService to incall. (2/4)
8d71a8a95f2ca0f4e029331d25345c279b46be7f 06-Aug-2014 Santos Cordon <santoscordon@google.com> am 12d61825: Add setConferenceable() API from ConnectionService to incall. (2/4)

* commit '12d61825cd0d6aa06272db3f77b5e30dce379951':
Add setConferenceable() API from ConnectionService to incall. (2/4)
a343b76e588b44b751a6363435bac19342477887 06-Aug-2014 Santos Cordon <santoscordon@google.com> Forget speakerphone state when calls disconnect.

Bug: 15433058
Change-Id: Ib0d31cebc31565b73e297635e021eda621cef760
rc/com/android/telecomm/CallAudioManager.java
df39986de36d40aaa45e61d19a21eca536765ca5 06-Aug-2014 Santos Cordon <santoscordon@google.com> Remove LDAPs from code.

Bug: 16327484
Change-Id: I72fd7b5d6aad1af46bfb6eea976a8305985058f7
ndroidManifest.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/InCallTonePlayer.java
rc/com/android/telecomm/MissedCallNotifier.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
b7af09eef1afca539c30d1b6d35012cc08e0b6ef 06-Aug-2014 Santos Cordon <santoscordon@google.com> Prevent two simultaneous outgoing calls.

Bug: 16557364
Change-Id: Ia6041459bcf12426c04166f7fc82af9a4e4fed42
rc/com/android/telecomm/CallsManager.java
61e11ade48a747b672357a318d39a7b066780e7a 06-Aug-2014 Santos Cordon <santoscordon@google.com> Add null checks to MissedCallNotifier.

Bug: 16782303
Change-Id: I1ffee114315c20db33512082f9c0d25db8010988
es/values/strings.xml
rc/com/android/telecomm/MissedCallNotifier.java
12d61825cd0d6aa06272db3f77b5e30dce379951 30-Jul-2014 Santos Cordon <santoscordon@google.com> Add setConferenceable() API from ConnectionService to incall. (2/4)

Change-Id: I64fdca08d35f893d755e3b154543a261b1418343
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
0bce191c8336584ec6df3cacc2e23398c1dfd405 06-Aug-2014 Ihab Awad <ihab@google.com> am 72aa48bb: am c17294cf: Finalize implementation of Remote Connection Service (2/4)

* commit '72aa48bb415f211d56624c9f769490dfac2d2b20':
Finalize implementation of Remote Connection Service (2/4)
72aa48bb415f211d56624c9f769490dfac2d2b20 06-Aug-2014 Ihab Awad <ihab@google.com> am c17294cf: Finalize implementation of Remote Connection Service (2/4)

* commit 'c17294cfaf9cc649a362117fba544f0b5cb18cdf':
Finalize implementation of Remote Connection Service (2/4)
c17294cfaf9cc649a362117fba544f0b5cb18cdf 05-Aug-2014 Ihab Awad <ihab@google.com> Finalize implementation of Remote Connection Service (2/4)

Change-Id: I6525ff7d7e5fbb06a45d4811ebbc319a4b32fd6b
ndroidManifest.xml
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/AndroidManifest.xml
ests/res/drawable-xhdpi/stat_sys_phone_call.png
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestConnectionManager.java
d5af673fd51143d9aff12e9eefdd8a44d3c9b7b9 04-Aug-2014 Geoff Mendal <mendal@google.com> am 816e7f45: (-s ours) am 812f2019: (-s ours) am 614376a7: (-s ours) Import translations. DO NOT MERGE

* commit '816e7f45874bbc1162a8ee43219d6a4cb7f461e7':
Import translations. DO NOT MERGE
816e7f45874bbc1162a8ee43219d6a4cb7f461e7 04-Aug-2014 Geoff Mendal <mendal@google.com> am 812f2019: (-s ours) am 614376a7: (-s ours) Import translations. DO NOT MERGE

* commit '812f2019ccd1e8584e3446a6121393d7bda6962e':
Import translations. DO NOT MERGE
812f2019ccd1e8584e3446a6121393d7bda6962e 04-Aug-2014 Geoff Mendal <mendal@google.com> am 614376a7: (-s ours) Import translations. DO NOT MERGE

* commit '614376a7f6155ccf194e589e675b35d6ca5bbf43':
Import translations. DO NOT MERGE
f5f3f81f0bfad412aef821f8468e95f8ac76bbb4 04-Aug-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I3b1585eaeec9bb0d4cc92bb586cefbb9cdd68f3c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
614376a7f6155ccf194e589e675b35d6ca5bbf43 04-Aug-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ib99a3fa67abe446a40e50d01c85162ca8970bbee
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
b79daee1553a1bb36a1957905ba33e15eba3e189 04-Aug-2014 Nitin Srivastava <nitinsr@codeaurora.org> am 15ddea2c: am 590e2824: am 4c2fefd3: Bluetooth: Multi HF support

* commit '15ddea2cf33b83fe9ff01eab3bf8fb61739b60cc':
Bluetooth: Multi HF support
15ddea2cf33b83fe9ff01eab3bf8fb61739b60cc 04-Aug-2014 Nitin Srivastava <nitinsr@codeaurora.org> am 590e2824: am 4c2fefd3: Bluetooth: Multi HF support

* commit '590e28246d306282136c1081770e2e640fe0bc06':
Bluetooth: Multi HF support
590e28246d306282136c1081770e2e640fe0bc06 04-Aug-2014 Nitin Srivastava <nitinsr@codeaurora.org> am 4c2fefd3: Bluetooth: Multi HF support

* commit '4c2fefd3291868f640a117e2b71e8eb3e732410f':
Bluetooth: Multi HF support
4c2fefd3291868f640a117e2b71e8eb3e732410f 31-Jul-2014 Nitin Srivastava <nitinsr@codeaurora.org> Bluetooth: Multi HF support

Add multi hf support in Telecomm service.
Returns AudioOn state and Connection state for
specific HS.
bug 16519158

Change-Id: Id174621b31895773a9dc655edb38fa6084586462
rc/com/android/telecomm/BluetoothManager.java
f1fb82a9cd9038d6540feabc7fe4e21b75c3a967 31-Jul-2014 Evan Charlton <evanc@google.com> am b7143a30: am 38b21daf: am af51ceb4: Read the default connection manager from resources

* commit 'b7143a300c8ddb8a72e9e9ba329dac184da70a4c':
Read the default connection manager from resources
b7143a300c8ddb8a72e9e9ba329dac184da70a4c 31-Jul-2014 Evan Charlton <evanc@google.com> am 38b21daf: am af51ceb4: Read the default connection manager from resources

* commit '38b21daf146d537d2964bf039cb9b268ac7a73b3':
Read the default connection manager from resources
38b21daf146d537d2964bf039cb9b268ac7a73b3 31-Jul-2014 Evan Charlton <evanc@google.com> am af51ceb4: Read the default connection manager from resources

* commit 'af51ceb458f94b9a179145f222ae4ea84951e8be':
Read the default connection manager from resources
af51ceb458f94b9a179145f222ae4ea84951e8be 30-Jul-2014 Evan Charlton <evanc@google.com> Read the default connection manager from resources

Allow the default connection manager to be set in config.xml so that
it can be customized with a vendor overlay.

Change-Id: I3db83d246efbbd6f9d145f45b641f85dfe3fb33f
es/values/config.xml
rc/com/android/telecomm/PhoneAccountRegistrar.java
662db22ece45f9895b36459007be090aaa3ce2c5 30-Jul-2014 Sailesh Nepal <sail@google.com> am f39e0b79: am 95696a97: am 0e1dc5a9: Remove work arounds for Hangouts

* commit 'f39e0b793fc50c19b06e6d47b8434ca1ca0b867b':
Remove work arounds for Hangouts
f39e0b793fc50c19b06e6d47b8434ca1ca0b867b 30-Jul-2014 Sailesh Nepal <sail@google.com> am 95696a97: am 0e1dc5a9: Remove work arounds for Hangouts

* commit '95696a97a61c7eeb8d2b2dd7a05ae9cef606de17':
Remove work arounds for Hangouts
95696a97a61c7eeb8d2b2dd7a05ae9cef606de17 30-Jul-2014 Sailesh Nepal <sail@google.com> am 0e1dc5a9: Remove work arounds for Hangouts

* commit '0e1dc5a99042dd05b94b16a41461a3632a3fe5ee':
Remove work arounds for Hangouts
0e1dc5a99042dd05b94b16a41461a3632a3fe5ee 30-Jul-2014 Sailesh Nepal <sail@google.com> Remove work arounds for Hangouts

Change-Id: I599a856d2c5a54a4f5c42dde43a9cfbc1c091cf8
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommApp.java
aafe795f122fa923a888cd8ef230c902b11340ff 30-Jul-2014 Ihab Awad <ihab@google.com> am cfa7550b: am 596d025e: am 483c1ab6: Merge "Make PhoneAccountRegistrar state persistence null tolerant" into lmp-dev

* commit 'cfa7550bc0682318175df9be789a498769fbf7cc':
Make PhoneAccountRegistrar state persistence null tolerant
cfa7550bc0682318175df9be789a498769fbf7cc 30-Jul-2014 Ihab Awad <ihab@google.com> am 596d025e: am 483c1ab6: Merge "Make PhoneAccountRegistrar state persistence null tolerant" into lmp-dev

* commit '596d025e15c069cbf30808b9f3fde9ce335d3218':
Make PhoneAccountRegistrar state persistence null tolerant
596d025e15c069cbf30808b9f3fde9ce335d3218 30-Jul-2014 Ihab Awad <ihab@google.com> am 483c1ab6: Merge "Make PhoneAccountRegistrar state persistence null tolerant" into lmp-dev

* commit '483c1ab6805f4c079dcd28a4fd9f21b42770d59e':
Make PhoneAccountRegistrar state persistence null tolerant
689a63a66af9aac60c830f775191c218071ecdae 30-Jul-2014 Jay Shrauner <shrauner@google.com> am d3d90dbb: am cf75062f: am 4ef6aa71: Merge "Disable backup" into lmp-dev

* commit 'd3d90dbb0d56d8fd77c392e943b1b53e39f4cbdc':
Disable backup
d3d90dbb0d56d8fd77c392e943b1b53e39f4cbdc 30-Jul-2014 Jay Shrauner <shrauner@google.com> am cf75062f: am 4ef6aa71: Merge "Disable backup" into lmp-dev

* commit 'cf75062fe3bd905b0c337dcef3b58b0db2fec41b':
Disable backup
3d611a3f733ed16e641ced93f0680eaa9b11a82d 30-Jul-2014 Geoff Mendal <mendal@google.com> am 6426eab6: (-s ours) am 990565cb: (-s ours) am b1846c81: (-s ours) Import translations. DO NOT MERGE

* commit '6426eab6ffd010a299b1256ed675ac4d05485b46':
Import translations. DO NOT MERGE
6426eab6ffd010a299b1256ed675ac4d05485b46 30-Jul-2014 Geoff Mendal <mendal@google.com> am 990565cb: (-s ours) am b1846c81: (-s ours) Import translations. DO NOT MERGE

* commit '990565cb4d5b54c7025ba4e825326b0584a35161':
Import translations. DO NOT MERGE
cf75062fe3bd905b0c337dcef3b58b0db2fec41b 30-Jul-2014 Jay Shrauner <shrauner@google.com> am 4ef6aa71: Merge "Disable backup" into lmp-dev

* commit '4ef6aa7171ba80b6715e9bc631416abbeebb1838':
Disable backup
990565cb4d5b54c7025ba4e825326b0584a35161 30-Jul-2014 Geoff Mendal <mendal@google.com> am b1846c81: (-s ours) Import translations. DO NOT MERGE

* commit 'b1846c8106c316788505620a9fc95e06ebcdf1e0':
Import translations. DO NOT MERGE
b1846c8106c316788505620a9fc95e06ebcdf1e0 30-Jul-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia94ba9ca0f39b7f3d3fb8c36027fbd7c2a7d598e
Auto-generated-cl: translation import
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-my-rMM/strings.xml
bc1be921a49c5626e1f39b5661a416b9dff0a694 30-Jul-2014 Tyler Gunn <tgunn@google.com> am 8234cbf7: am aea5b79e: Merge "Updates to TestconnectionService." into lmp-dev

* commit '8234cbf73bb94466f65c74cf3ea4391454c28d86':
Updates to TestconnectionService.
483c1ab6805f4c079dcd28a4fd9f21b42770d59e 30-Jul-2014 Ihab Awad <ihab@google.com> Merge "Make PhoneAccountRegistrar state persistence null tolerant" into lmp-dev
2692322d55952a807c4fdad7048ca4b4051bf516 30-Jul-2014 Ihab Awad <ihab@google.com> Make PhoneAccountRegistrar state persistence null tolerant

Bug: 16676577
Change-Id: I1e5c14cc4d39f1e6951581732efe894df2d15cf5
rc/com/android/telecomm/PhoneAccountRegistrar.java
ests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
389dbde4c87c5ee31553ab24fd82b0295453918f 30-Jul-2014 Ihab Awad <ihab@google.com> am 7952f744: am b78b2769: Connection creation and service wiring for WiFi call managers (2/3)

* commit '7952f744578c34f8394612485b7e2844a7f8bae2':
Connection creation and service wiring for WiFi call managers (2/3)
8234cbf73bb94466f65c74cf3ea4391454c28d86 30-Jul-2014 Tyler Gunn <tgunn@google.com> am aea5b79e: Merge "Updates to TestconnectionService." into lmp-dev

* commit 'aea5b79e5332bd31b62fc349addd4a16eadf0753':
Updates to TestconnectionService.
7952f744578c34f8394612485b7e2844a7f8bae2 30-Jul-2014 Ihab Awad <ihab@google.com> am b78b2769: Connection creation and service wiring for WiFi call managers (2/3)

* commit 'b78b27693afbe9736f0a54ec473328955251f885':
Connection creation and service wiring for WiFi call managers (2/3)
b78b27693afbe9736f0a54ec473328955251f885 26-Jul-2014 Ihab Awad <ihab@google.com> Connection creation and service wiring for WiFi call managers (2/3)

Bug: 16469413
Change-Id: Id6d495c20aa57ffc961336d49693c1a7f91d4cb3
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceRepository.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/MissedCallNotifier.java
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommApp.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
ests/src/com/android/telecomm/tests/unit/ExampleTest.java
ests/src/com/android/telecomm/tests/unit/PhoneAccountRegistrarTest.java
8f46afd01cbf173e18324414e12cb7974e774762 30-Jul-2014 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE"
60b02d9975be5978645f20e7083459e626dd9ec0 30-Jul-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I11409df4a0bd2399c755f58380f5a46c919d655b
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
4e27793d90e1f6f4718594b7df02cf167a23695b 30-Jul-2014 Tyler Gunn <tgunn@google.com> am bc1be921: am 8234cbf7: am aea5b79e: Merge "Updates to TestconnectionService." into lmp-dev

* commit 'bc1be921a49c5626e1f39b5661a416b9dff0a694':
Updates to TestconnectionService.
3b559c38e1395c3f3fad44f7dcfb382b4cd65edb 30-Jul-2014 Ihab Awad <ihab@google.com> am 389dbde4: am 7952f744: am b78b2769: Connection creation and service wiring for WiFi call managers (2/3)

* commit '389dbde4c87c5ee31553ab24fd82b0295453918f':
Connection creation and service wiring for WiFi call managers (2/3)
4ef6aa7171ba80b6715e9bc631416abbeebb1838 30-Jul-2014 Jay Shrauner <shrauner@google.com> Merge "Disable backup" into lmp-dev
d5a71dad7c94e4a16597e0f8e3584ea5f76b69f1 30-Jul-2014 Jay Shrauner <shrauner@google.com> Disable backup

Disable all backup

Bug:16676574
Change-Id: Id7dc54529be7037489928e679627cc99346fe055
ndroidManifest.xml
c376cfaf28614090af64b9ca94f010a8ec895ef5 29-Jul-2014 Andrew Lee <anwlee@google.com> am 5f062cc3: am e908226f: am 32291eeb: Merge "Update uses of VideoCallProfile.VideoState." into lmp-dev

* commit '5f062cc30537aa4d0b69b4dd0d0e7bdb5875f38d':
Update uses of VideoCallProfile.VideoState.
5f062cc30537aa4d0b69b4dd0d0e7bdb5875f38d 29-Jul-2014 Andrew Lee <anwlee@google.com> am e908226f: am 32291eeb: Merge "Update uses of VideoCallProfile.VideoState." into lmp-dev

* commit 'e908226f7437da2fe55b71d6c51eb64fc03fff2b':
Update uses of VideoCallProfile.VideoState.
e908226f7437da2fe55b71d6c51eb64fc03fff2b 29-Jul-2014 Andrew Lee <anwlee@google.com> am 32291eeb: Merge "Update uses of VideoCallProfile.VideoState." into lmp-dev

* commit '32291eeb876dd81ad8df9e6cb15c6e89249c5bd5':
Update uses of VideoCallProfile.VideoState.
693f4eef677854d185ddd8cf7a78254f86bf53b4 29-Jul-2014 Yorke Lee <yorkelee@google.com> am 6deb075c: am 9568efd2: am d134687a: Add new proximity sensors in Telecomm (2/3)

* commit '6deb075c6b6d06fd580561e9a8564ed68cb651db':
Add new proximity sensors in Telecomm (2/3)
6deb075c6b6d06fd580561e9a8564ed68cb651db 29-Jul-2014 Yorke Lee <yorkelee@google.com> am 9568efd2: am d134687a: Add new proximity sensors in Telecomm (2/3)

* commit '9568efd2bddd75bb2355bf84332fbd86a5bac0ea':
Add new proximity sensors in Telecomm (2/3)
9568efd2bddd75bb2355bf84332fbd86a5bac0ea 29-Jul-2014 Yorke Lee <yorkelee@google.com> am d134687a: Add new proximity sensors in Telecomm (2/3)

* commit 'd134687adc2594ed43e912f427f494ef258e89bc':
Add new proximity sensors in Telecomm (2/3)
d134687adc2594ed43e912f427f494ef258e89bc 28-Jul-2014 Yorke Lee <yorkelee@google.com> Add new proximity sensors in Telecomm (2/3)

Add the following two APIs in Telecomm and use them in InCallUI
setProximitySensorOn
setProximitySensorOff(boolean turnScreenOnImmediately)

Bug: 16573954
Change-Id: I8219e9c659f4ea4493f5cd5c8bcaa95a98d180e2
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/ProximitySensorManager.java
d26b747b963a74bface5938b628fffbb46c469f7 29-Jul-2014 Baligh Uddin <baligh@google.com> am 81790ea5: (-s ours) am 36270951: (-s ours) am 4746292f: (-s ours) Import translations. DO NOT MERGE

* commit '81790ea5907c1a53db0419cde491b785b5ac7090':
Import translations. DO NOT MERGE
81790ea5907c1a53db0419cde491b785b5ac7090 29-Jul-2014 Baligh Uddin <baligh@google.com> am 36270951: (-s ours) am 4746292f: (-s ours) Import translations. DO NOT MERGE

* commit '362709513da9b7822d69172ca13972f3ae9d5f7a':
Import translations. DO NOT MERGE
362709513da9b7822d69172ca13972f3ae9d5f7a 29-Jul-2014 Baligh Uddin <baligh@google.com> am 4746292f: (-s ours) Import translations. DO NOT MERGE

* commit '4746292f9158c53af35247916717592dde94c723':
Import translations. DO NOT MERGE
4746292f9158c53af35247916717592dde94c723 28-Jul-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic65fce1478072de8eb02afef371e1af16da691af
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
2b3ec3c046e992fecffe55545406c6204203bc34 28-Jul-2014 Andrew Lee <anwlee@google.com> am f82c3431: Merge "Extend test class from ConnectionService.VideoCallProvider." into lmp-dev

* commit 'f82c3431139aaab80acfa5d9189b2c0b026ca9ed':
Extend test class from ConnectionService.VideoCallProvider.
cd88835ba740c82810e8d25603948dfe60a6cbe1 28-Jul-2014 Yorke Lee <yorkelee@google.com> am cce5deb2: Allow the system dialer to make emergency calls via ACTION_CALL

* commit 'cce5deb2bc998d6385152292153a9423f5206c28':
Allow the system dialer to make emergency calls via ACTION_CALL
cce5deb2bc998d6385152292153a9423f5206c28 18-Jun-2014 Yorke Lee <yorkelee@google.com> Allow the system dialer to make emergency calls via ACTION_CALL

Bug: 6948882
Change-Id: Ic2e886f1a10620199c2e4503de603b2b80694e28
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
aea5b79e5332bd31b62fc349addd4a16eadf0753 30-Jul-2014 Tyler Gunn <tgunn@google.com> Merge "Updates to TestconnectionService." into lmp-dev
f9b7f539fa9406d104ad8d098b8503a668faa26b 29-Jul-2014 Tyler Gunn <tgunn@google.com> Updates to TestconnectionService.

1. Added test pattern video -- useful for testing animation of the
display surface.
2. Retrieve camera video dimensions.
3. Implemented camera setup flow which InCall UI expected (i.e.
set camera, communicate capabilities, set surface).

Bug: 16043064
Change-Id: Ia69fc091dcbb5fa2e207b56dce21e01e671a8a3e
ests/res/raw/test_pattern.mp4
ests/src/com/android/telecomm/testapps/TestConnectionService.java
ests/src/com/android/telecomm/testapps/TestVideoCallProvider.java
19968d7632ade4fbcf3fa980835d89bf5ba0286e 26-Jul-2014 Evan Charlton <evanc@google.com> am 64c2a241: Merge "Use the synchronous Connection creation API" into lmp-dev

* commit '64c2a241fef2ae70c19943c75b617690074216ac':
Use the synchronous Connection creation API
86e891543977d4452da7dde35bc789f79ad95d79 25-Jul-2014 Ihab Awad <ihab@google.com> am 293edf24: Improve Wi-Fi wiring

* commit '293edf245f3e37691073c8bf4a1fc271ecbc5370':
Improve Wi-Fi wiring
293edf245f3e37691073c8bf4a1fc271ecbc5370 25-Jul-2014 Ihab Awad <ihab@google.com> Improve Wi-Fi wiring

Bug: 16552606
Change-Id: Iddbde3d18e92ad1d40fb539d9177df582f317a7b
es/values/strings.xml
es/xml/phone_account_preferences.xml
rc/com/android/telecomm/AccountSelectionPreference.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommServiceImpl.java
99ca643437413c78f24f5c36295fbf5bfa9821dd 25-Jul-2014 Andrew Lee <anwlee@google.com> am 3bcf935b: Update Telecomm with VideoCall.Listener changes.

* commit '3bcf935b25470e94c8c6855862434d15b785c54a':
Update Telecomm with VideoCall.Listener changes.
3bcf935b25470e94c8c6855862434d15b785c54a 23-Jul-2014 Andrew Lee <anwlee@google.com> Update Telecomm with VideoCall.Listener changes.

Bug: 16494880
Bug: 16495203
Change-Id: I2331e8316f068ecba0dbea30647ec95da9e37f59
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallController.java
ests/src/com/android/telecomm/testapps/TestCallVideoProvider.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
ests/src/com/android/telecomm/testapps/TestVideoCallProvider.java
b14d888e0e1096e4f246f053b70fa46d57be7e14 25-Jul-2014 Santos Cordon <santoscordon@google.com> am 7cdb909a: Do not use stale PhoneAccounts when placing calls.

* commit '7cdb909a2f5436db2fa03636851c72c42539bc65':
Do not use stale PhoneAccounts when placing calls.
7cdb909a2f5436db2fa03636851c72c42539bc65 25-Jul-2014 Santos Cordon <santoscordon@google.com> Do not use stale PhoneAccounts when placing calls.

This is important in case the call log has a record of a phone account
which is no longer valid. An example would be the emergency
PhoneAccount. That will always fail for non-emergency numbers...but if
it is the only account, then it will be used and fail. When the user
pops in a valid SIM, it will continue to fail because the phone account
saved into the call log was the stale emergency phoneAccount.

Without this fix, the user can get "Call not sent" frequently.

Bug: 16526102
Change-Id: Ic08768b85d374e6f7ab54f34b5caf501b061d49b
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
4b9688f46f74702a98abda228ddf635f3f3ca89d 25-Jul-2014 Santos Cordon <santoscordon@google.com> am fd6ca447: Add more disconnect causes 2/4

* commit 'fd6ca447a45c47aeb3956964103770475c655a26':
Add more disconnect causes 2/4
fd6ca447a45c47aeb3956964103770475c655a26 25-Jul-2014 Santos Cordon <santoscordon@google.com> Add more disconnect causes 2/4

Bug: 15692074
Change-Id: Ib94c33fac8450b70e53dbe12d71f41777e9e140c
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/CreateConnectionProcessor.java
d7a6feb721b9d2fb5d4477c6534dea29ed509a21 25-Jul-2014 Nancy Chen <nancychen@google.com> am b6c4e3db: Merge "Do not log a call that is cancelled before selecting an account" into lmp-dev

* commit 'b6c4e3db4c670f291dc91c4495e3c127e7622011':
Do not log a call that is cancelled before selecting an account
32291eeb876dd81ad8df9e6cb15c6e89249c5bd5 29-Jul-2014 Andrew Lee <anwlee@google.com> Merge "Update uses of VideoCallProfile.VideoState." into lmp-dev
1d90b5584b3bb35813a7fbc2d644a3da9c7ed6d7 28-Jul-2014 Andrew Lee <anwlee@google.com> Update uses of VideoCallProfile.VideoState.

Bug: 16629892
Change-Id: Ib2818d68f53acf76a0d1a2d9514f3f9abeb08adc
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
f82c3431139aaab80acfa5d9189b2c0b026ca9ed 28-Jul-2014 Andrew Lee <anwlee@google.com> Merge "Extend test class from ConnectionService.VideoCallProvider." into lmp-dev
6d9934639fd93c774045301f6b7849943013ead4 25-Jul-2014 Andrew Lee <anwlee@google.com> Extend test class from ConnectionService.VideoCallProvider.

Bug: 16494880
Change-Id: I7c0d150065d63a3093337c013a79ee6d39022bff
ests/src/com/android/telecomm/testapps/TestVideoCallProvider.java
64c2a241fef2ae70c19943c75b617690074216ac 26-Jul-2014 Evan Charlton <evanc@google.com> Merge "Use the synchronous Connection creation API" into lmp-dev
a2397d79bf4385767c078bed244f5cb4d8f80ddf 21-Jul-2014 Evan Charlton <evanc@google.com> Use the synchronous Connection creation API

Update to make creating a Connection a synchronous operation.

Change-Id: Ibbf896e5b188b98eb386d6624d3a5d5cacf49922
rc/com/android/telecomm/ConnectionServiceWrapper.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
b6c4e3db4c670f291dc91c4495e3c127e7622011 25-Jul-2014 Nancy Chen <nancychen@google.com> Merge "Do not log a call that is cancelled before selecting an account" into lmp-dev
aa561ddba25683ea14659662164c80de8d82b7d0 24-Jul-2014 Nancy Chen <nancychen@google.com> Do not log a call that is cancelled before selecting an account

If the select account dialog is dismissed or cancelled, we should not be
logging it as a call.

Bug: 16513494
Change-Id: I395f9252a8c49db5d56ea4e825d636d015736c1c
rc/com/android/telecomm/CallLogManager.java
301d643a277bb931a490405e6969bf9f0a4188e4 24-Jul-2014 Tyler Gunn <tgunn@google.com> am 6965a807: Merge "TestCallVideoProvider enhancements, telecomm Call fix." into lmp-dev

* commit '6965a807540276869427b70f04d3d4a8ad610e0e':
TestCallVideoProvider enhancements, telecomm Call fix.
2c0f27524eb879d430d1d7e4dbf56f10ee2c9824 23-Jul-2014 Ihab Awad <ihab@google.com> am f2a8491d: Improve wiring of Phone Accounts

* commit 'f2a8491d71915c621518ac8a40bed3c2a35272a9':
Improve wiring of Phone Accounts
f2a8491d71915c621518ac8a40bed3c2a35272a9 23-Jul-2014 Ihab Awad <ihab@google.com> Improve wiring of Phone Accounts

Change-Id: I891224e09a1d2bf81ffa887e1d077f6f64f73022
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommServiceImpl.java
6965a807540276869427b70f04d3d4a8ad610e0e 23-Jul-2014 Tyler Gunn <tgunn@google.com> Merge "TestCallVideoProvider enhancements, telecomm Call fix." into lmp-dev
b1a95a77522b2a1c98b378a2e538d819918b7f2c 23-Jul-2014 Tyler Gunn <tgunn@google.com> TestCallVideoProvider enhancements, telecomm Call fix.

1. Displaying actual camera preview on preview surface for Test
Call Video Provider.
2. In telecomm Call, setting the video state during connection creation
so that the incoming call video state is properly populated.

Bug: 16043064
Change-Id: I77d0d673ad79376202f09310f9202bd9a7363e03
rc/com/android/telecomm/Call.java
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/telecomm/testapps/CameraThread.java
ests/src/com/android/telecomm/testapps/TestCallVideoProvider.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
5e941b480a4235ad5a711df34b48d315f3547983 23-Jul-2014 RoboErik <epastern@google.com> am 9d53f139: Merge "Switch to using AudioAttributes with sessions" into lmp-dev

* commit '9d53f1392b051929915fcc2ea40ea7469a8f8da4':
Switch to using AudioAttributes with sessions
790f28db9c6412782e4e9d6aa8e3af7fc3ddd04b 23-Jul-2014 Santos Cordon <santoscordon@google.com> am 294cf3f9: Change display Strings to CharSequence (2/3)

* commit '294cf3f949705241c472263b5a13fe804b937464':
Change display Strings to CharSequence (2/3)
294cf3f949705241c472263b5a13fe804b937464 21-Jul-2014 Santos Cordon <santoscordon@google.com> Change display Strings to CharSequence (2/3)

Bug: 16416927
Change-Id: Id8b6e5029a8a1f61bbbf71661abe4d487c01002a
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
c9b2fa757c70c2c0948f5c5318e7b5234a17f7ab 23-Jul-2014 Andrew Lee <anwlee@google.com> am 3b45f1cc: Remove RemoteException catches from TestCallVideoProvider.

* commit '3b45f1cc3f70101374cf79e047c6d2eb31cbe159':
Remove RemoteException catches from TestCallVideoProvider.
3b45f1cc3f70101374cf79e047c6d2eb31cbe159 23-Jul-2014 Andrew Lee <anwlee@google.com> Remove RemoteException catches from TestCallVideoProvider.

Change-Id: If04483bd19d883742e12f1932bc6f915c7afc578
ests/src/com/android/telecomm/testapps/TestCallVideoProvider.java
d94aec805ceb67f90daa0876dc053690f25350f6 22-Jul-2014 Nancy Chen <nancychen@google.com> am 323ab2c0: Merge "Fixed bug in CallsManager calling back would not complete" into lmp-dev

* commit '323ab2c06cea387c8770e664ccace4fc99cd6684':
Fixed bug in CallsManager calling back would not complete
9d53f1392b051929915fcc2ea40ea7469a8f8da4 23-Jul-2014 RoboErik <epastern@google.com> Merge "Switch to using AudioAttributes with sessions" into lmp-dev
07920f67c86e80fc78086e21fd446b2531c2defd 22-Jul-2014 RoboErik <epastern@google.com> Switch to using AudioAttributes with sessions

We switched sessions to use AudioAttributes instead of an audio stream.
This moves over to the updated API.

Change-Id: Ibc5e9a24ccf3d8cf3fe7d78f63d56aa4c70b006c
rc/com/android/telecomm/HeadsetMediaButton.java
323ab2c06cea387c8770e664ccace4fc99cd6684 22-Jul-2014 Nancy Chen <nancychen@google.com> Merge "Fixed bug in CallsManager calling back would not complete" into lmp-dev
d9de92c582e7d593ff51161fa63c34a7cc7e0e9e 22-Jul-2014 Nancy Chen <nancychen@google.com> Fixed bug in CallsManager calling back would not complete

CallsManager was not handling the case where an account handle was being
passed into it. Added and refactored.

Bug: 16460877

Change-Id: Ic9715eda24443e6bd6a1991e8badc9c56af88f30
rc/com/android/telecomm/CallsManager.java
64fe52c640cf50e9a5acd7e6ab51a2619af01baf 22-Jul-2014 Tyler Gunn <tgunn@google.com> am 7e0df31a: Adding missing "break" in MSG_SET_VIDEO_STATE case block.

* commit '7e0df31a6037c4d2d5c37a9c10e9b7a0d723382b':
Adding missing "break" in MSG_SET_VIDEO_STATE case block.
7e0df31a6037c4d2d5c37a9c10e9b7a0d723382b 21-Jul-2014 Tyler Gunn <tgunn@google.com> Adding missing "break" in MSG_SET_VIDEO_STATE case block.

Change-Id: I148bdc55cf0bfdb63d3bce5952611243d5921c76
rc/com/android/telecomm/ConnectionServiceWrapper.java
c683d0e427009784cb586bc693b98652f490a71c 21-Jul-2014 Santos Cordon <santoscordon@google.com> am 72890ce8: Sent initial data to telecomm on connection creation. (2/3)

* commit '72890ce844f92f45c56f3cccd1f2fd03ff12c3c2':
Sent initial data to telecomm on connection creation. (2/3)
72890ce844f92f45c56f3cccd1f2fd03ff12c3c2 21-Jul-2014 Santos Cordon <santoscordon@google.com> Sent initial data to telecomm on connection creation. (2/3)

Telecomm was not sending the initial state for new connections forcing
the connection services to postpone when they set data on the connection
which resulted in hacky code. This CL makes use of a
ParcelableConnection to send the intial connection data.

Change-Id: If571414aba19fa1bb282e30632431962b8366cf4
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/CreateConnectionResponse.java
7045338c21a0086d7402f4cab49cb944b280f3bf 21-Jul-2014 Santos Cordon <santoscordon@google.com> am 72429425: Revert "Change display Strings to CharSequence (2/2)"

* commit '72429425eb5985dad37d7e862007123181fc2647':
Revert "Change display Strings to CharSequence (2/2)"
da9adef6eafe58d9034beaaf7efa18e23029ce8d 21-Jul-2014 Santos Cordon <santoscordon@google.com> am bc25946f: Change display Strings to CharSequence (2/2)

* commit 'bc25946f08a90175eb270e6f7ea5cc7a86fea73a':
Change display Strings to CharSequence (2/2)
81edbfac72a457aa15cc0b81e83f1b3fb7f355b9 21-Jul-2014 Yorke Lee <yorkelee@google.com> am a38f329b: Use new addCall API in Telecomm, and add MANAGE_USERS permission

* commit 'a38f329b316b2d7d155672ce6c6e89939d179219':
Use new addCall API in Telecomm, and add MANAGE_USERS permission
86da53dce753502b36d0f63f0aa172b676f80fb4 21-Jul-2014 Santos Cordon <santoscordon@google.com> am 994bd963: Change telecomm APIs from protected to public (2/3)

* commit '994bd9631bb5c7a9f66814d1037626eaddee9856':
Change telecomm APIs from protected to public (2/3)
eaa21a88e8523165f1a903532035bd851bd9031f 21-Jul-2014 Santos Cordon <santoscordon@google.com> am f2f14efa: Move ACTION_CONNECTION_SERVICE into ConnectionService. (2/3)

* commit 'f2f14efaf1ac2cd1e78d29b9d7213696746f1f17':
Move ACTION_CONNECTION_SERVICE into ConnectionService. (2/3)
55b06871fad7825244ff73f6a7f656c1bdd3edab 21-Jul-2014 Santos Cordon <santoscordon@google.com> am 2583b67c: Rename InCallCall to ParcelableCall (2/2)

* commit '2583b67c376358538cfa11e25a241adb2dc9e34a':
Rename InCallCall to ParcelableCall (2/2)
d004d3ff3cdade817ab6f9f909703993d4a9ec06 21-Jul-2014 Evan Charlton <evanc@google.com> am 313bad76: Merge "Rename setDestroy() to destroy()" into lmp-dev

* commit '313bad76c8697ebffa94c04fd9ce5317487c9ee4':
Rename setDestroy() to destroy()
07e80602b0927d3acaeb15c0c6f36a0e3b24459a 21-Jul-2014 Santos Cordon <santoscordon@google.com> am fd86bd45: Change incoming call intent to a TelecommManager method. (2/3)

* commit 'fd86bd453c646f1e82266a9574688a7ae87cea84':
Change incoming call intent to a TelecommManager method. (2/3)
78142c06ad29b8e082b87103ec0a10642ef31d40 21-Jul-2014 Evan Charlton <evanc@google.com> am 73e5d73f: Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev

* commit '73e5d73f7e0ef640b80cde965900a35b90e61ea6':
Rename PhoneAccountMetadata to PhoneAccount
53242c365091a6e810d6ea50deb98702688a507c 21-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> am 29e52ae7: Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE

* commit '29e52ae768f4893494a10882de7171a3ff1121d2':
Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE
72429425eb5985dad37d7e862007123181fc2647 21-Jul-2014 Santos Cordon <santoscordon@google.com> Revert "Change display Strings to CharSequence (2/2)"

This reverts commit bc25946f08a90175eb270e6f7ea5cc7a86fea73a.

Change-Id: I41fadc0fa0be7cfc9420fabf4f231968bc964d57
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
8e22b4458d26615388a9bbb34bf90472c3d6d859 21-Jul-2014 Evan Charlton <evanc@google.com> am 89176375: Rename PhoneAccount to PhoneAccountHandle

* commit '89176375c8d97db25588f720952a4fadbce2f9a3':
Rename PhoneAccount to PhoneAccountHandle
625f03c4a889828b15d25e225fa9ade254d26992 21-Jul-2014 Evan Charlton <evanc@google.com> am 24179416: Fix the build

* commit '24179416af8396fb87b93d8d5105007c09b87333':
Fix the build
bd2f201d5780a2ef2e68fac8148571276b4ca679 21-Jul-2014 Evan Charlton <evanc@google.com> am b35fc31b: Migrate TelecommConstants to TelecommManager

* commit 'b35fc31be63df5d78183d6c94f53eea45c3542de':
Migrate TelecommConstants to TelecommManager
2a5792ddd69c9a07b20c7f3cb9ede1d5f26b0184 21-Jul-2014 Evan Charlton <evanc@google.com> am 484f8d65: Populate subscription number

* commit '484f8d65f66ee4ae4c5c75234e81054f23b9f96e':
Populate subscription number
2ac070b6554e4219345c46c9196d2076d34e1d55 21-Jul-2014 John Spurlock <jspurlock@google.com> am 44b1810b: Update Telecomm to follow framework vibration api change.

* commit '44b1810b608f2544c3e101af5b48aef6762d1563':
Update Telecomm to follow framework vibration api change.
c5e74506250c9a985b2bdefa66345763e9ce97a5 21-Jul-2014 Santos Cordon <santoscordon@google.com> am efe38443: Merge "Fixing ADD_CALL (2/3)" into lmp-dev

* commit 'efe3844392095c8a7cd4a856f991241661ac0187':
Fixing ADD_CALL (2/3)
bc25946f08a90175eb270e6f7ea5cc7a86fea73a 21-Jul-2014 Santos Cordon <santoscordon@google.com> Change display Strings to CharSequence (2/2)

Bug: 16416927
Change-Id: I81cd3572f3931cd97611621a1db12bea165bda56
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
a38f329b316b2d7d155672ce6c6e89939d179219 17-Jul-2014 Yorke Lee <yorkelee@google.com> Use new addCall API in Telecomm, and add MANAGE_USERS permission

Bug: 16298776
Change-Id: I8142a6f0461391970842030c6d1b45c16bed3f2e
ndroidManifest.xml
rc/com/android/telecomm/CallLogManager.java
994bd9631bb5c7a9f66814d1037626eaddee9856 21-Jul-2014 Santos Cordon <santoscordon@google.com> Change telecomm APIs from protected to public (2/3)

Bug: 16416927
Change-Id: I859c80a120fa59bba12a5c6bfca17fa57613a6aa
ests/src/com/android/telecomm/testapps/TestConnectionService.java
f2f14efaf1ac2cd1e78d29b9d7213696746f1f17 21-Jul-2014 Santos Cordon <santoscordon@google.com> Move ACTION_CONNECTION_SERVICE into ConnectionService. (2/3)

Bug: 16416927
Change-Id: If2d1c19134d2245677f7e0b3d94b118d9b50e751
rc/com/android/telecomm/ConnectionServiceRepository.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
2583b67c376358538cfa11e25a241adb2dc9e34a 19-Jul-2014 Santos Cordon <santoscordon@google.com> Rename InCallCall to ParcelableCall (2/2)

Bug: 16416927
Change-Id: Iae97d83ce74b4395d6877cc167d7e5057dac201b
rc/com/android/telecomm/InCallController.java
fd86bd453c646f1e82266a9574688a7ae87cea84 19-Jul-2014 Santos Cordon <santoscordon@google.com> Change incoming call intent to a TelecommManager method. (2/3)

Also moves a few constants from TelecommConstants to TelecommManager.
Bug:16416927

Change-Id: I8e74feb228523ed1c186b2f06784d04cb9141f86
rc/com/android/telecomm/TelecommServiceImpl.java
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
29e52ae768f4893494a10882de7171a3ff1121d2 20-Jul-2014 Jean-Michel Trivi <jmtrivi@google.com> Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE

Bug 16401631

Change-Id: I00ea2503ae646e19afed323989648a225986fba4
rc/com/android/telecomm/Ringer.java
31cb24fd97c0c00ce911d25fe15bae6976240f3f 20-Jul-2014 Ihab Awad <ihab@google.com> am 69eb0f58: Update connection service iteration for PhoneAccounts

* commit '69eb0f582babcedc1dc5e6613a27867be6e8d0e0':
Update connection service iteration for PhoneAccounts
910c45250b42115e87dc41274c663002c515835b 20-Jul-2014 Sailesh Nepal <sail@google.com> am f0ec7f38: Merge "Implement Connection.startActivityFromInCall in Telecomm" into lmp-dev

* commit 'f0ec7f38d3d0b5255733503492c87450a3c3da65':
Implement Connection.startActivityFromInCall in Telecomm
89176375c8d97db25588f720952a4fadbce2f9a3 20-Jul-2014 Evan Charlton <evanc@google.com> Rename PhoneAccount to PhoneAccountHandle

Change-Id: I2e97b348e6316a8b3ccc39fd81013e7f514a2889
es/xml/phone_account_preferences.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommApp.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
24179416af8396fb87b93d8d5105007c09b87333 20-Jul-2014 Evan Charlton <evanc@google.com> Fix the build

Resolve some newly-moved constants.

Change-Id: Ib6cea0835577158c0a53e567e1151b2ca4639898
rc/com/android/telecomm/TtyManager.java
73e5d73f7e0ef640b80cde965900a35b90e61ea6 21-Jul-2014 Evan Charlton <evanc@google.com> Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev
94d01629010a61f6112713f22330d5fd4baae851 20-Jul-2014 Evan Charlton <evanc@google.com> Rename PhoneAccountMetadata to PhoneAccount

Change-Id: I4597b14110c1cee7f637ec125b839852ef0f34c4
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommApp.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
b35fc31be63df5d78183d6c94f53eea45c3542de 20-Jul-2014 Evan Charlton <evanc@google.com> Migrate TelecommConstants to TelecommManager

Change-Id: Icdd7637ba1ae27ce7d1f13714257b4a946961037
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/ConnectionServiceRepository.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
rc/com/android/telecomm/PhoneStateBroadcaster.java
rc/com/android/telecomm/TtyManager.java
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
484f8d65f66ee4ae4c5c75234e81054f23b9f96e 18-Jul-2014 Evan Charlton <evanc@google.com> Populate subscription number

Populate the subscription number for PhoneAccountMetadata

Bug: 13333595
Change-Id: I0d3b2cfcea08aeba760c392c116303f21beb70d3
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommApp.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
44b1810b608f2544c3e101af5b48aef6762d1563 19-Jul-2014 John Spurlock <jspurlock@google.com> Update Telecomm to follow framework vibration api change.

Bug:15279516
Change-Id: Ie13f438154784481a5b6cef356e134a366a8a8d6
rc/com/android/telecomm/Ringer.java
69eb0f582babcedc1dc5e6613a27867be6e8d0e0 18-Jul-2014 Ihab Awad <ihab@google.com> Update connection service iteration for PhoneAccounts

Change-Id: I8f558439016388540af0deaf7c621cff89c9cb36
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/TelecommApp.java
rc/com/android/telecomm/TelephonyUtil.java
0d0bd47f7c3b938839a7864e3fe32c04b046789f 19-Jul-2014 Ihab Awad <ihab@google.com> am 78ac0ce5: Address pending changelist comments from earlier CL

* commit '78ac0ce54c51865b0852714608d7486b80f832fa':
Address pending changelist comments from earlier CL
78ac0ce54c51865b0852714608d7486b80f832fa 18-Jul-2014 Ihab Awad <ihab@google.com> Address pending changelist comments from earlier CL

Change-Id: Ib3485fffff26a5d5eed00617fb1bc74fd64c9f1f
ndroidManifest.xml
rc/com/android/telecomm/Log.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
1c7ea8f4fa014c00dd4638b6441217ccb9eef83b 18-Jul-2014 Tyler Gunn <tgunn@google.com> am 1dbdda1e: Merge "Adding random incoming number generation to TestConnectionService." into lmp-dev

* commit '1dbdda1e75d442e8da5fc93428adda616d5bedc5':
Adding random incoming number generation to TestConnectionService.
efe3844392095c8a7cd4a856f991241661ac0187 19-Jul-2014 Santos Cordon <santoscordon@google.com> Merge "Fixing ADD_CALL (2/3)" into lmp-dev
4b034a6b5901291fe06db397d394c484e68d7781 18-Jul-2014 Santos Cordon <santoscordon@google.com> Fixing ADD_CALL (2/3)

Bug: 16241726
Change-Id: Ie1dd72a79c2430b10b0239dbdda5508edbc8eb26
rc/com/android/telecomm/InCallController.java
106b2e0d76b88af4af9b3f5ea5c4d15542487afc 18-Jul-2014 Ihab Awad <ihab@google.com> am bf96a467: Merge "Wire up multi-SIM experience (3/4)" into lmp-dev

* commit 'bf96a467891579e4afc1d95a383d8ed7e9042f46':
Wire up multi-SIM experience (3/4)
e9bd6d85e16654efd0445786741c74cd5d07d4ea 18-Jul-2014 Tyler Gunn <tgunn@google.com> am ba4d6a45: Merge "Playback of test videos for TestCallVideoProvider." into lmp-dev

* commit 'ba4d6a45fd32ea71d06d2fb5df9c97163761dc61':
Playback of test videos for TestCallVideoProvider.
2ce3ff8a603b8540bd618e211fab6b71d930e70f 18-Jul-2014 Tyler Gunn <tgunn@google.com> am 0a388fc5: Wiring videoState through from telephony.

* commit '0a388fc566576513f54610c4427fb30feb88ab02':
Wiring videoState through from telephony.
0a388fc566576513f54610c4427fb30feb88ab02 17-Jul-2014 Tyler Gunn <tgunn@google.com> Wiring videoState through from telephony.

- Adding call video state history tracking, which is used to ensure
we log whether video was active at any point to the call log.
- Adding logging of video state to call log.


Bug: 16285417
Bug: 16013178
Change-Id: I3b47c88b13dc73941ca80463fc0c6ae7cdd86749
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/res/values/donottranslate_strings.xml
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
6c1dc115ff7b62be216fb41b630dd5b4ab760436 18-Jul-2014 Nancy Chen <nancychen@google.com> am 3b055eea: Merge "Flip flag to "false" for enabling account selection" into lmp-dev

* commit '3b055eea07008542da93c58c10950486c3181a9b':
Flip flag to "false" for enabling account selection
1aa0707631453613f8ae151c3c6a5783600aded8 17-Jul-2014 Andrew Lee <anwlee@google.com> am 38931d0a: Pass through video state when answering a call.

* commit '38931d0ad60f00a9f50c90cef446166731f0b871':
Pass through video state when answering a call.
f0ec7f38d3d0b5255733503492c87450a3c3da65 19-Jul-2014 Sailesh Nepal <sail@google.com> Merge "Implement Connection.startActivityFromInCall in Telecomm" into lmp-dev
9d58de5df05d0358fc8ae57ab7e9a0c45337c602 18-Jul-2014 Sailesh Nepal <sail@google.com> Implement Connection.startActivityFromInCall in Telecomm

This CL adds plumbing to send the startActivityFromInCall
request from Connection to InCallUI.

Change-Id: I65119a89c925a93467d1b27304ffec9b088b172f
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/TtyManager.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
1dbdda1e75d442e8da5fc93428adda616d5bedc5 18-Jul-2014 Tyler Gunn <tgunn@google.com> Merge "Adding random incoming number generation to TestConnectionService." into lmp-dev
ad333370dec62d92555da071e3e53267fdca0e9c 18-Jul-2014 Tyler Gunn <tgunn@google.com> Adding random incoming number generation to TestConnectionService.

Random phone numbers have the format: 555YXXX
Where Y will be 1 for incoming video calls and 0 for audio only calls.
And XXX is a random 3 digit number.

This helps to debug Incall UI work so that incoming calls are:
a) unique
b) identifiable as video calls by the number

Bug: 16043064
Change-Id: I855d4c09f612b1e6858bf461b480766001118752
ests/src/com/android/telecomm/testapps/TestConnectionService.java
313bad76c8697ebffa94c04fd9ce5317487c9ee4 21-Jul-2014 Evan Charlton <evanc@google.com> Merge "Rename setDestroy() to destroy()" into lmp-dev
5451882a6dcec7d2d0da6aec951fb2e022e9dc51 20-Jul-2014 Evan Charlton <evanc@google.com> Rename setDestroy() to destroy()

Change-Id: I6bb46e679f55547b902d5850ab450e5d3818fa63
ests/src/com/android/telecomm/testapps/TestConnectionService.java
bf96a467891579e4afc1d95a383d8ed7e9042f46 18-Jul-2014 Ihab Awad <ihab@google.com> Merge "Wire up multi-SIM experience (3/4)" into lmp-dev
104f80654d9a0df493f1cf4b9f07b0c2d5d4436e 17-Jul-2014 Ihab Awad <ihab@google.com> Wire up multi-SIM experience (3/4)

Change-Id: Ic8fe987951f57d362b0c2d4e342bddffa506b58f
ndroidManifest.xml
es/layout/phone_account_preferences.xml
es/values/strings.xml
es/xml/phone_account_preferences.xml
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/Log.java
rc/com/android/telecomm/PhoneAccountPreferencesActivity.java
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommApp.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ba4d6a45fd32ea71d06d2fb5df9c97163761dc61 18-Jul-2014 Tyler Gunn <tgunn@google.com> Merge "Playback of test videos for TestCallVideoProvider." into lmp-dev
dcdf5b0916d6f5cf1e172d030d7ec5c0b8b21827 18-Jul-2014 Tyler Gunn <tgunn@google.com> Playback of test videos for TestCallVideoProvider.

Bug: 16285417
Bug: 16013178
Change-Id: Icb348fb9b1a7a5073dc2696402082d73a495563a
ests/res/raw/outgoing_video.mp4
ests/res/raw/test_video.mp4
ests/src/com/android/telecomm/testapps/TestCallVideoProvider.java
f9587c09874eea86ae601f72a1397b00b9604bb8 17-Jul-2014 Nancy Chen <nancychen@google.com> am 9a4bc77f: Merge "Add additional call state PRE_DIAL_WAIT for selection of account" into lmp-dev

* commit '9a4bc77f89c4fac3c08581acee67377c2714be21':
Add additional call state PRE_DIAL_WAIT for selection of account
38931d0ad60f00a9f50c90cef446166731f0b871 16-Jul-2014 Andrew Lee <anwlee@google.com> Pass through video state when answering a call.

Bug: 16013878
Bug: 16015750
Change-Id: I26af541c30cc296bb3b3f85c06a2e097d0b58547
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
a36e689706aaffb16167a5cb8590b0c98423710d 17-Jul-2014 Sailesh Nepal <sail@google.com> am 94812796: Merge "Fix audio wired headset bug" into lmp-dev

* commit '9481279647fbeeb4bc76c426e18eb796ff7cef52':
Fix audio wired headset bug
3f19e8a6d2c40d8bc6eab93f7ec23da46c94fc4a 17-Jul-2014 Santos Cordon <santoscordon@google.com> am 176ae28e: Add PhoneAccount registration.

* commit '176ae28ea91519a0b8d513abf3885535c7420d95':
Add PhoneAccount registration.
3b055eea07008542da93c58c10950486c3181a9b 17-Jul-2014 Nancy Chen <nancychen@google.com> Merge "Flip flag to "false" for enabling account selection" into lmp-dev
b7f428cfa7cb9ddf576137680209aeb305a05aca 17-Jul-2014 Nancy Chen <nancychen@google.com> Flip flag to "false" for enabling account selection

This is a feature that is not completed yet, so it should be protected
by a flag.

Bug: 16243703
Change-Id: If0e0140bf9dbdc4fbd43840bcbb66975a8d1ff16
rc/com/android/telecomm/CallsManager.java
5b63ebba07cf7973f1ead4492b71adfccd1ead74 17-Jul-2014 Sailesh Nepal <sail@google.com> am 59878861: Merge "TTY: Telecomm" into lmp-dev

* commit '59878861a04e38ce929641813acc92829afbdf86':
TTY: Telecomm
51cfa3f63cfabd3bd73da174bb859ba850aca3ce 17-Jul-2014 RoboErik <epastern@google.com> am b771c432: Switch MediaSession to new constructor

* commit 'b771c432c5526ed54e5f07949ace2b99008bc341':
Switch MediaSession to new constructor
53ceedc1f5ae5a075c7a3186db8bb4db32cbe583 09-Jul-2014 Nancy Chen <nancychen@google.com> Add additional call state PRE_DIAL_WAIT for selection of account

If an account default is not set, the incall ui will display a dialog to
allow the user to select an account for that particular call.

Bug: 16243703

Change-Id: If1beaf60a92b4446adaaace2a72c3e0f70e61f21
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallAdapter.java
176ae28ea91519a0b8d513abf3885535c7420d95 14-Jul-2014 Santos Cordon <santoscordon@google.com> Add PhoneAccount registration.

Writes/Reads PhoneAccount registration as they are added and
removed through the TelecommManager APIs.
Ultimately, we may want to use a proper Telecomm-provider DB instead of
string-based serialized setting.

Bug: 16292368
Change-Id: I1214fcdd8728cddc949945a590b20e328de5ee7f
rc/com/android/telecomm/PhoneAccountRegistrar.java
rc/com/android/telecomm/TelecommApp.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
9a4bc77f89c4fac3c08581acee67377c2714be21 17-Jul-2014 Nancy Chen <nancychen@google.com> Merge "Add additional call state PRE_DIAL_WAIT for selection of account" into lmp-dev
9481279647fbeeb4bc76c426e18eb796ff7cef52 17-Jul-2014 Sailesh Nepal <sail@google.com> Merge "Fix audio wired headset bug" into lmp-dev
d0a76aa8789effa81bc7ce640e607718e4b722fd 17-Jul-2014 Sailesh Nepal <sail@google.com> Fix audio wired headset bug

This CL fixes a bug introduced in my previous CL where
the CallAudioManager doesn't observe the weired headset
manager.

Change-Id: Iada47d57fd1e7dcbe228b2db58eeeb6fdc6d5c8d
rc/com/android/telecomm/CallAudioManager.java
b771c432c5526ed54e5f07949ace2b99008bc341 15-Jul-2014 RoboErik <epastern@google.com> Switch MediaSession to new constructor

Change-Id: I0cd653c38be4bf35b217ab1f74e600c75bfc52e0
rc/com/android/telecomm/HeadsetMediaButton.java
59878861a04e38ce929641813acc92829afbdf86 16-Jul-2014 Sailesh Nepal <sail@google.com> Merge "TTY: Telecomm" into lmp-dev
b88795aadc636d14156791c2fc93af051d7e0d49 15-Jul-2014 Sailesh Nepal <sail@google.com> TTY: Telecomm

This CL makes the following changes:
1. Added TtyManager. This class contains code that used
to live in PhoneGlobals to listen to preferred TTY
mode changes. Current TTY mode is based on the
preferred mode, wired headset state, and device TTY
support.

2. Moved ownership of WiredHeadsetManager to CallsManager
so that TtyManager can listen to headset plugged events.

3. Added plumbing to TelecommServiceImpl to impement
isTtySupported and getCurrentTtyMode.

4. Added tty_enabled to config.xml. This is moved over
from Telephony.

Change-Id: I652b095af30cc2732a06829dc23492e5355660da
es/values/config.xml
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/HeadsetMediaButton.java
rc/com/android/telecomm/TelecommServiceImpl.java
rc/com/android/telecomm/TtyManager.java
rc/com/android/telecomm/WiredHeadsetManager.java
1a1368ebc1c7a4da0fe7665b84d02c8083ae0e2f 16-Jul-2014 Santos Cordon <santoscordon@google.com> am 97a23807: Merge "Change Call Listeners to a concurrent Set." into lmp-dev

* commit '97a23807b25bee04f5a632a026a3f7b3f982fcec':
Change Call Listeners to a concurrent Set.
76dfe1be8d8c6880521ed888320b2be5ff83a46e 16-Jul-2014 Andrew Lee <anwlee@google.com> am 4a79660c: When video call state is set, propagate state to InCallCall.

* commit '4a79660c984d54679ad4d2bdc89e224d9c8c375b':
When video call state is set, propagate state to InCallCall.
4a79660c984d54679ad4d2bdc89e224d9c8c375b 12-Jul-2014 Andrew Lee <anwlee@google.com> When video call state is set, propagate state to InCallCall.

We ultimately need this information in the InCallUI...

Bug: 16015750
Change-Id: I5fc146e2a0812d2b9c48cf6297d9ce4193a10382
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallController.java
97a23807b25bee04f5a632a026a3f7b3f982fcec 15-Jul-2014 Santos Cordon <santoscordon@google.com> Merge "Change Call Listeners to a concurrent Set." into lmp-dev
dfc6601da7bfdf63cd5c7ed815c2cb5da7975f1d 15-Jul-2014 Santos Cordon <santoscordon@google.com> Change Call Listeners to a concurrent Set.

Was running into concurrency issues so switching over to a more
resolient Set type that can handle removes during iteration.

Bug: 16299107
Change-Id: I6ea47d27589b8a1a5fc96bcc32ccf34b93b0cd19
rc/com/android/telecomm/Call.java
6c79169e180ff8fb389cad6163b558961d49255c 15-Jul-2014 Sailesh Nepal <sail@google.com> am 664837f9: Add support for remote incoming calls: impl

* commit '664837f9a8a98f98876417a0bfff64834e8032fa':
Add support for remote incoming calls: impl
664837f9a8a98f98876417a0bfff64834e8032fa 15-Jul-2014 Sailesh Nepal <sail@google.com> Add support for remote incoming calls: impl

This CL changes how incoming calls are routed. We now
treat incoming calls the same as outgoing calls.
This allows a ConnectionService to attach to a incoming call
using a remote connection.

Change-Id: I5232d062ad3b559f4fe7c8224e7234b2c6bf8431
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceRepository.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/CreateConnectionProcessor.java
rc/com/android/telecomm/CreateConnectionResponse.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/MissedCallNotifier.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallResponse.java
rc/com/android/telecomm/Switchboard.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
6ae865ca12891fb5c077c4d33f9a2993a363ac10 15-Jul-2014 Sailesh Nepal <sail@google.com> am 905dfba7: (-s ours) Remove CallServiceProvider and CallServiceDescript: Impl do not merge

* commit '905dfba7883666f45a0c6958d8bc6c19d68972d9':
Remove CallServiceProvider and CallServiceDescript: Impl do not merge
46e87b6011f7a7b045ac44297f189aa41cd3287a 15-Jul-2014 Santos Cordon <santoscordon@google.com> am 490459ec: (-s ours) Merge "Implement multi-SIM capabilities (6/6) [DO NOT MERGE]" into lmp-dev

* commit '490459ecb8ac18021129ad36ca3d556e4e1c18ca':
Implement multi-SIM capabilities (6/6) [DO NOT MERGE]
1296884b22cc3f975531f55447856e8c8dfeaec1 15-Jul-2014 Ihab Awad <ihab@google.com> am 84bfe47a: Implement new In-Call Service interface

* commit '84bfe47a2447c4983bcc58468000f04683eec55b':
Implement new In-Call Service interface
905dfba7883666f45a0c6958d8bc6c19d68972d9 14-Jul-2014 Sailesh Nepal <sail@google.com> Remove CallServiceProvider and CallServiceDescript: Impl do not merge

This CL removes usage CallServiceProvider. Instead
ConnectionServiceRepository uses package manager to look up
all ConnectionService implementations.

Everywhere we used CallServiceDescriptors has now been
replaced by ComponentNames.

Change-Id: I2e40c5c64c0d242dc41b680943d7e9209142db5b
(cherry picked from commit 10e6050b2186650fbc18b0aa62b2e7d74e0aa80a)
rc/com/android/telecomm/BaseRepository.java
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallServiceProviderWrapper.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/ConnectionServiceRepository.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/RespondViaSmsManager.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/TelephonyUtil.java
rc/com/android/telecomm/Timeouts.java
ests/AndroidManifest.xml
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestCallActivity.java
ests/src/com/android/telecomm/testapps/TestCallServiceProvider.java
ests/src/com/android/telecomm/testapps/TestCallVideoProvider.java
10e6050b2186650fbc18b0aa62b2e7d74e0aa80a 14-Jul-2014 Sailesh Nepal <sail@google.com> Remove CallServiceProvider and CallServiceDescript: Impl

This CL removes usage CallServiceProvider. Instead
ConnectionServiceRepository uses package manager to look up
all ConnectionService implementations.

Everywhere we used CallServiceDescriptors has now been
replaced by ComponentNames.

Change-Id: I2e40c5c64c0d242dc41b680943d7e9209142db5b
rc/com/android/telecomm/BaseRepository.java
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallServiceProviderWrapper.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/ConnectionServiceRepository.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/RespondViaSmsManager.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/TelephonyUtil.java
rc/com/android/telecomm/Timeouts.java
ests/AndroidManifest.xml
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestCallActivity.java
ests/src/com/android/telecomm/testapps/TestCallServiceProvider.java
ests/src/com/android/telecomm/testapps/TestCallVideoProvider.java
84bfe47a2447c4983bcc58468000f04683eec55b 14-Jul-2014 Ihab Awad <ihab@google.com> Implement new In-Call Service interface

Change-Id: I200af25f175430a0cdc41009b9f3e8fd35d8c834
(cherry picked from commit b1e8965c7a0705adc4a8c85a88e8d29eeaf319db)
rc/com/android/telecomm/Call.java
1f3088919b17eb36db0cac7a15cb0140fa7d981e 14-Jul-2014 Ihab Awad <ihab@google.com> Merge "Implement new In-Call Service interface"
b1e8965c7a0705adc4a8c85a88e8d29eeaf319db 14-Jul-2014 Ihab Awad <ihab@google.com> Implement new In-Call Service interface

Change-Id: I200af25f175430a0cdc41009b9f3e8fd35d8c834
rc/com/android/telecomm/Call.java
490459ecb8ac18021129ad36ca3d556e4e1c18ca 15-Jul-2014 Santos Cordon <santoscordon@google.com> Merge "Implement multi-SIM capabilities (6/6) [DO NOT MERGE]" into lmp-dev
502e5fe2bc67d52ffd08d47558b1713dbe5d0a57 09-Jul-2014 Ihab Awad <ihab@google.com> Implement multi-SIM capabilities (6/6) [DO NOT MERGE]

Bug:16292368
Change-Id: Idede24237accb9c4d30a6f016fbfc4e2d74ebe53
(cherry picked from commit 48f132d9c0823858373da46fb270d0075d58d0b1)
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
rc/com/android/telecomm/TelecommServiceImpl.java
48f132d9c0823858373da46fb270d0075d58d0b1 09-Jul-2014 Ihab Awad <ihab@google.com> Implement multi-SIM capabilities (6/6)

Change-Id: Idede24237accb9c4d30a6f016fbfc4e2d74ebe53
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
rc/com/android/telecomm/TelecommServiceImpl.java
dcd1889ba35a9588216046ec5f63eef7f6a2cd97 12-Jul-2014 Sailesh Nepal <sail@google.com> Merge "Misc Telecomm API changes - impl"
e8ecb98d5341395e073d02c065143ae3ac76ef71 12-Jul-2014 Sailesh Nepal <sail@google.com> Misc Telecomm API changes - impl

This CL contains plumbing for Telecomm API changes made in
ag/501321.

As a cleanup I also made InCallController listen to changes
to calls directly instead of using CallsManager.

Change-Id: Iaffe0b84cea6003f2a9b9d8b30676743d2b236d4
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/MissedCallNotifier.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
6f3f7affb13e93cb70868d3114f02f1ed593194e 11-Jul-2014 Yorke Lee <yorkelee@google.com> Use CallerInfo correctly in Telecomm

Remove unused ContactInfo class
Pipe CallerInfo through to CallLogManager.addCall, and correctly
update data usage stats to fix speed dial.

Bug: 16232694
Bug: 15665694

Change-Id: Ibed9f53193b64891bffff30fd37b47062ab60048
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ContactInfo.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
a1662d0ae89d9fb514a5ac68cbc76660e34dae00 11-Jul-2014 Makoto Onuki <omakoto@google.com> Enterprise caller-id: packages/services/Telecomm

It's basically equivalent to http://ag/500455 and http://ag/499160.

Now "Send to voicemail" and the missed call notification uses the enterprise
lookup; they now work with a corp contact too.

Bug 15779911

Change-Id: I3757d76e030092ce8a9f90621459ca8f2bfae7c1
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/ContactsAsyncHelper.java
ed66ea4f2ceb9b22bfde5c7a0f699eb76abf8b17 11-Jul-2014 Santos Cordon <santoscordon@google.com> Merge "Change isRinging and isInAPhoneCall to execute from binder thread."
13e7740a9fed2ca0d998613dae45254f08e5b1c6 11-Jul-2014 Sailesh Nepal <sail@google.com> Move SIP to the top of connection service order

Bug: 14999064
Change-Id: I59750cf2119b38e5c7ef746490a3f2cdc15c615a
rc/com/android/telecomm/OutgoingCallProcessor.java
626697a1416ec5306c92b0675f812e979bbcd5b0 11-Jul-2014 Santos Cordon <santoscordon@google.com> Change isRinging and isInAPhoneCall to execute from binder thread.

We call into the audio service from telecomm main thread through
setMode, but it calls us back on isInAPhoneCall which tries to move
the code execution to the main thread (where it waiting for
audio service) causing a deadlock. Change isInAPhoneCall() to support
multi-threaded execution and do not force the invocation onto the
main thread.

Bug: 16179606
Change-Id: I2cc6f6220b34a2b35841a08897a50f2dc50839c6
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/TelecommServiceImpl.java
18315b3a1ea6c55c5f80fa110c550b0ecc187e18 11-Jul-2014 Sailesh Nepal <sail@google.com> Merge "Fix log error in setAudioModeIsVoip"
7fa33cae6397f0952271a2d08c24d836b182dd41 11-Jul-2014 Sailesh Nepal <sail@google.com> Fix log error in setAudioModeIsVoip

Change-Id: I3cdeb4d68aa2e4bfdb3da0c04536ea846caef026
rc/com/android/telecomm/ConnectionServiceWrapper.java
c6037a693934a146f72aae25934f2a26966f3b26 11-Jul-2014 Andrew Lee <anwlee@google.com> Merge "Implement part of the test call video provider."
dfe7b6d0e323b511bf4046ae4d7ff77cd1634415 02-Jul-2014 Andrew Lee <anwlee@google.com> Implement part of the test call video provider.

- Add option to "add video" to the call service notifier.
- Set TestCallVideoProvider in TestConnectionService when adding a
call.
- Implement some of the stubs in TestCallVideoProvider. For now,
they're pretty dumb in how they handle function calls and return.

Bug: 16043064
Change-Id: I9151e54dffe5dae9be61c1aefe0b3cba50fb1321
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestCallVideoProvider.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
e20bc974ffc24d852d09e153a280b51e0329299c 10-Jul-2014 Sailesh Nepal <sail@google.com> Implement Connection.setCallCapabilities

Change-Id: I90238eeefbcbfaa044881d80833b62e4474821d6
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallController.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
b2a11fc2f19a49813a28b8004bf950bfab387ef8 10-Jul-2014 Tyler Gunn <tgunn@google.com> Merge "Add features and data usage to call log manager."
765c35cee084e55614be4e3ee13f1279e6461da5 10-Jul-2014 Tyler Gunn <tgunn@google.com> Add features and data usage to call log manager.

Bug: 16013684
Bug: 16015261
Change-Id: I6ea7eb0c2fc8e6be8e1d9a750a7d73e54df088d6
rc/com/android/telecomm/CallLogManager.java
3f754cd5878a19cde3f176c8610cb56924a4a00e 09-Jul-2014 Santos Cordon <santoscordon@google.com> Merge "Update permissions around showCallScreen."
46592f0120538265fed3bf9eb821e415872e8ab9 08-Jul-2014 Santos Cordon <santoscordon@google.com> Update permissions around showCallScreen.

Change-Id: I297c49f8256df3924217cddc3a0ffbd3dff7accc
rc/com/android/telecomm/TelecommServiceImpl.java
b0ba087e1ab7b2b14032a2cb1911f3f4ede05531 09-Jul-2014 Sailesh Nepal <sail@google.com> Set PhoneAccount for incoming calls

Change-Id: I4f21b0d4616dd4025b8d598499c221c30bfff5e9
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/InCallController.java
35faf8cf29dc0f4a73935478e0fba957df9619d6 09-Jul-2014 Sailesh Nepal <sail@google.com> Implement Connection.setStatus

Change-Id: I125628b74784d2303b9a429038a9f7ee604f241e
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallController.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
7e66957928c5c23a1028c8e2a2d7cf359cbfa44e 09-Jul-2014 Sailesh Nepal <sail@google.com> Implement ConnectionService.setAudioModeIsVoip

Change-Id: I29028e614c598d1f2501c4dfdcdbfc929b09f925
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
9359ef77d023498430bf3c6fdddd529e07a48dda 05-Jul-2014 Sailesh Nepal <sail@google.com> Handle CallServiceProvider crash

Change-Id: Icd2d108a09d6094038c413cf77029f45d251ada5
rc/com/android/telecomm/CallServiceProviderWrapper.java
rc/com/android/telecomm/CallServiceRepository.java
778fd22abb8cbff36c14037f54723cb121822269 08-Jul-2014 Tyler Gunn <tgunn@google.com> Merge "Adding "start call with video" extra for ACTION_CALL intent."
c4abd91cd8a67b530ebafe146af10136db8e6605 08-Jul-2014 Tyler Gunn <tgunn@google.com> Adding "start call with video" extra for ACTION_CALL intent.

- Added extra.
- Updated Call, CallInfo, ConnectionRequest to pass extra.

Bug: 16014224
Change-Id: If213bfe8d6b8705a16bf7c3247ad3f7c5530dfe2
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
48c3a903b505f9ac4d12d0858a5ad67181eca4cc 08-Jul-2014 Tyler Gunn <tgunn@google.com> Revert "Adding "start call with video" extra for ACTION_CALL intent."

This reverts commit ba2ef678370bc8e5407a0a15f0baf50b3d6391a6.

Change-Id: I5884ca395288ba68b46e7316e2f9920d9fe81daf
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
ba2ef678370bc8e5407a0a15f0baf50b3d6391a6 08-Jul-2014 Tyler Gunn <tgunn@google.com> Adding "start call with video" extra for ACTION_CALL intent.

- Added extra.
- Updated Call, CallInfo, ConnectionRequest to pass extra.

Bug: 16014224
Change-Id: Ib1f0a1490c25633c1c1dd554eec79a0d5269a540
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
dc1a61d73cb2d1c52b52b594d338346c2b946df8 08-Jul-2014 Sailesh Nepal <sail@google.com> Merge "Fix test to set call ID for connection request"
d02f516704ad4e12713881fbbb94a3ffd8933384 08-Jul-2014 Sailesh Nepal <sail@google.com> Fix test to set call ID for connection request

Change-Id: Ideff8213aa48e5d2dd53a1325f1e4aabfae230d0
ests/src/com/android/telecomm/testapps/TestConnectionService.java
c92c436d84de46bb85100df9138378d9ffe0f2f2 05-Jul-2014 Sailesh Nepal <sail@google.com> Rename CallServiceWrapper to ConnectionServiceWrapper

Change-Id: I5a082e50dafea0104174cb97d3ae8af168944fc3
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/ConnectionServiceWrapper.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/PhoneStateBroadcaster.java
rc/com/android/telecomm/RingbackPlayer.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/TelephonyUtil.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestCallServiceProvider.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
eb42fc9fd233d56d5d9c082b86d80b91586f3c35 08-Jul-2014 Sailesh Nepal <sail@google.com> Merge "Fix typo in log"
3fe8b727b04cb677bc757f030c802cd4e6234db7 08-Jul-2014 Sailesh Nepal <sail@google.com> Fix typo in log

Change-Id: I187b18ac20190b53fa690bb359e720a64b49398b
rc/com/android/telecomm/ConnectionServiceWrapper.java
a49c6431a8859d0ea2af788d123e1b35123e9502 08-Jul-2014 Sailesh Nepal <sail@google.com> Fix cast error in ConnectionServiceWrapper

Change-Id: Iaa0cff2cf5ba7cb55b2bb9bf8a2a602112906909
rc/com/android/telecomm/ConnectionServiceWrapper.java
3c6d30e7ea0b66c9d9fc959242352f1afd32697f 03-Jul-2014 Sailesh Nepal <sail@google.com> Merge "Remove handoff implementation"
77da19ea28b8753d439660b4352c1bf914f63a92 03-Jul-2014 Sailesh Nepal <sail@google.com> Remove handoff implementation

This CL removes the old handoff implementation. It also
plumbs the phoneAccountClicked event from InCallUI to the
call's ConnectionService.

Change-Id: Iab1595faaadcdfe428d97891d314babea21e9633
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
ae4ca935dbb882cfb32f21ba75598d4543cd1401 03-Jul-2014 Sailesh Nepal <sail@google.com> Merge "Fix exception when setting audio mode"
bca199f7c3fb23cf0420f425e4c16657594fdfbe 03-Jul-2014 Sailesh Nepal <sail@google.com> Fix exception when setting audio mode

Bug: 16024792
Change-Id: I6efa23642ac38e9d2a2811abe2586cde76f4f1ee
rc/com/android/telecomm/TelecommServiceImpl.java
dd94acac827419d12d757769f9906d0477dc4001 03-Jul-2014 Santos Cordon <santoscordon@google.com> Merge "Handle cancelMissedCallsNotification."
64c7e965de50c6321415942ab4a84d22514b39a1 03-Jul-2014 Santos Cordon <santoscordon@google.com> Handle cancelMissedCallsNotification.

Change-Id: Icdbca5371c54af4da098409275092c34c3bddc8b
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/MissedCallNotifier.java
rc/com/android/telecomm/TelecommApp.java
rc/com/android/telecomm/TelecommServiceImpl.java
98a556026109f816501fa887efdddae78d0c2d65 01-Jul-2014 Ihab Awad <ihab@google.com> Rename Telecomm "Subscription" to "Account" (6/7)

Change-Id: I9458216c06e7bbb68ef27e8b084f18e6c7f2fc8b
es/drawable-xxhdpi/chat_with_others.png
es/drawable-xxhdpi/market_wireless.png
es/drawable-xxhdpi/q_mobile.png
es/drawable-xxhdpi/talk_to_your_circles.png
es/values/strings.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
rc/com/android/telecomm/TelecommServiceImpl.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
417b2376e24bd8906fd4fce40d2f06f4680e49f4 01-Jul-2014 Tyler Gunn <tgunn@google.com> Merge "API support for reporting of changes to call features. (eg VoLTE, VoWIFI, etc)"
e19cc005ddbff5313d6f7288587630b2410d005c 01-Jul-2014 Tyler Gunn <tgunn@google.com> API support for reporting of changes to call features.
(eg VoLTE, VoWIFI, etc)

Bug: 15987281
Change-Id: I5a18046ca0e2ff78ee96af610b5a3b88d93a52ad
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallController.java
628406a6d59a8d5ee3c862aab11864c92688fcc8 01-Jul-2014 Andrew Lee <anwlee@google.com> Merge "Add onSetCallVideoClient to TestCallVideoProvider."
23baed3bbccdf398f431502dd1d0fab74eb16f5d 27-Jun-2014 Santos Cordon <santoscordon@google.com> Move call-related SystemAPIs to TelecommManager. (2/3)

Bug: 15672803
Change-Id: I46e448fe93a9c5b4ae013e8b2fd6f0ce89b94e69
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/TelecommServiceImpl.java
b9e44bcf88078bcbcbf80b7df356bb0dfef229f3 01-Jul-2014 Andrew Lee <anwlee@google.com> Add onSetCallVideoClient to TestCallVideoProvider.

Bug: 15893156
Change-Id: I2a81b5308e11714fa96495c003a4d5f933095943
ests/src/com/android/telecomm/testapps/TestCallVideoProvider.java
04298cb1a980ea59f046b713a48e22e95671592c 01-Jul-2014 Sailesh Nepal <sail@google.com> Remove reference to CallService and CallServiceAdapter

Change-Id: Iae1e70d67362d206da1e67f95328e157224b1d18
ests/src/com/android/telecomm/testapps/TestConnectionService.java
005fbdae114a55b2a4a8a272c9201cc179acb811 30-Jun-2014 Andrew Lee <anwlee@google.com> Merge "Set Calls with CallVideoProviders, and update InCallCalls on change."
a65d41fb134e323ab43c3f9454313b262959b1d0 24-Jun-2014 Nancy Chen <nancychen@google.com> Set Calls with CallVideoProviders, and update InCallCalls on change.

Bug: 15893156
Change-Id: I27aa41d389673d94adcfe5da8c1ea0f4e155ae26
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallController.java
0b3f7ddea6c5bed145601977f979999a4039d66f 30-Jun-2014 Tyler Gunn <tgunn@google.com> Added stub CallVideoProvider method implementations.

Bug: 15893156
Change-Id: I575a61c5aa8beac8f89d4b324e58839766fdac93
ests/src/com/android/telecomm/testapps/TestCallVideoProvider.java
77d2d0e90bc2a67d526743b8e32f920a0d755fba 24-Jun-2014 Nancy Chen <nancychen@google.com> Passing subscription info in the calls logic to log it properly

In order to log the subscription information in call history and call
log, the calls logic layer needs to pass the information between classes
in the process.

Bug: 15473965

Change-Id: I85ca5444e5881a8ceb0eb950dfc6385cacd045cf
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
1acc6a10058029c0426b2a7c719e29d652a63925 28-Jun-2014 Andrew Lee <anwlee@google.com> Merge "Handle setCallVideoProvider by setting a video provider on a call."
c546374bfe788fd6aa2fd995ba5d01b1ee3e35ec 01-Jul-2014 Sailesh Nepal <sail@google.com> Merge "Fix Telecomm tests"
4a51550686f5d2596f8e4c3b1bb6fc361b9019b4 26-Jun-2014 Sailesh Nepal <sail@google.com> Fix Telecomm tests

Change-Id: I6aacffbd26a2e9446d1e161e39981c85505608e7
rc/com/android/telecomm/TelephonyUtil.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
e9a776560dfe6f000cfc0dc1ea36c0f37d937f53 26-Jun-2014 Andrew Lee <anwlee@google.com> Handle setCallVideoProvider by setting a video provider on a call.

Bug: 15893156
Change-Id: I3a5c339dba88939bcb9e495e623c03ff44001e29
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceWrapper.java
d6b878872affdcf7365ddb1901fbb81e2003bfd3 27-Jun-2014 Santos Cordon <santoscordon@google.com> Merge "Remove timeout for outgoing calls."
634830e25866ea6b52925c05a5a9fe2c06e4e7a4 27-Jun-2014 Santos Cordon <santoscordon@google.com> Remove timeout for outgoing calls.

We added a timeout for outgoing calls previously to protect from a
connection service attempting a call forever. However, we have since
implemented an "abort()" method which allows a user to stop an outgoing
call at any moment with the END-CALL button. This removes the need
timeout the calls since the user will always have immediate control.

It also allows apps to perform other operations that may be required as
part of the call() method that may take more than the previously
specified 60-second timeout. A selection UI to pick an account, for
example.

Bug: 15885208
Change-Id: I1450d1e29b64cc6b128c2b017e2cfa0c3a47106a
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/Timeouts.java
fa58b7c88a14ebea9404ec2c96c8a21a736d4bd7 27-Jun-2014 Santos Cordon <santoscordon@google.com> Merge "Use config.xml to define default incall ui package and class. (2/2)"
fdfcafaa7913adab35724c9fc7560fbbbb1561ae 26-Jun-2014 Santos Cordon <santoscordon@google.com> Use config.xml to define default incall ui package and class. (2/2)

Bug: 15674860
Change-Id: Id4ca1e0acbbe7c29cbac42342e24de1c4c44af93
es/values/config.xml
rc/com/android/telecomm/InCallController.java
571f0737002251f09b9ef696dc8b4c9ce02abbae 26-Jun-2014 Santos Cordon <santoscordon@google.com> Add gateway information to the ConnectionRequest.

Change-Id: I5a21151873ec15d33d8fbdff24f55f80f6a1ac3a
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
4335b66bdfdcc2602a5ba7537e64ca4ad3169006 26-Jun-2014 Sailesh Nepal <sail@google.com> Merge "Implement cancelOutgoingCall"
5a73b03be0a2a929cf9974578445b90f773937b4 26-Jun-2014 Sailesh Nepal <sail@google.com> Implement cancelOutgoingCall

Change-Id: I9e5da9c607675bc3c230f6eb6d1cc149a38bf905
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallResponse.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
a1bcbb019932d93640e9dd917868521c1e420956 26-Jun-2014 Santos Cordon <santoscordon@google.com> Merge "Implement system API to get the default phone app."
7da72effd424c483a5a2692243010e1fc1a6320d 26-Jun-2014 Santos Cordon <santoscordon@google.com> Implement system API to get the default phone app.

Change-Id: I6aded7a9ec36f6fd0dfa70d56c6e5fd1fe40707c
rc/com/android/telecomm/TelecommServiceImpl.java
082012c8f75543cc99717519fb45a1cfb46dd1fe 26-Jun-2014 Andrew Lee <anwlee@google.com> Merge "Add TestCallVideoProvider."
1ecdfa8767e8eb0f73300ecce05b0dab6eaaac90 25-Jun-2014 Santos Cordon <santoscordon@google.com> Merge "Support Remote call services."
5924beafe09bf3fb710ec1bafd59113a12b45ada 18-Jun-2014 Santos Cordon <santoscordon@google.com> Support Remote call services.

Adds daisy-chaining support for connection services.

Change-Id: Ibb382a6ed6c5042c1b71821d6b537e2f1cb3063f
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/OutgoingCallProcessor.java
ests/AndroidManifest.xml
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/TestCallService.java
ests/src/com/android/telecomm/testapps/TestCallServiceProvider.java
ests/src/com/android/telecomm/testapps/TestConnectionService.java
a1b3bcad3343bbbea4cbe2c615c28cd8dd5c9648 25-Jun-2014 Sailesh Nepal <sail@google.com> Move Hangouts to top of call services list

Change-Id: I630c8711d6988d013d0ca9e033d108d72ba5ba05
rc/com/android/telecomm/OutgoingCallProcessor.java
55a3428c6b62e5a84d21f890418cfa9a8494780e 18-Jun-2014 Ihab Awad <ihab@google.com> Replace CallServiceSelectors with Subscriptions (2/3)

Remove CallServiceSelectors and replace them with comprehensive
support for Subscriptions as the means of selecting ways of making
phone calls. After this change, a ConnectionService is not a
semantically meaningful "way of making a call" -- it's more like the
mechanism whereby the Android system communicates with a 3rd party
process to ask for phone services. We anticipate each process having
only one ConnectionService.

Change-Id: I11258709b014d2fd3eed98a521227c200027018f
ndroidManifest.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/CallServiceSelectorWrapper.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/EmergencyCallServiceSelector.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/TelephonyUtil.java
ests/AndroidManifest.xml
ests/src/com/android/telecomm/testapps/DummyCallServiceSelector.java
ests/src/com/android/telecomm/testapps/TestCallService.java
04571e905b59d20e2b289bf152f7f1c9c0ae3633 21-Jun-2014 Andrew Lee <anwlee@google.com> Add TestCallVideoProvider.

Change-Id: I3b87ddf3573c641cb7c327c4f22e49e0e51f5963
ests/src/com/android/telecomm/testapps/TestCallVideoProvider.java
2294dd12f67f2b6aedd97dbc442194d34cc4f5bc 20-Jun-2014 Yorke Lee <yorkelee@google.com> Revert "Add getSystemPhoneApplication to Telecomm"

This reverts commit ceb96c9ab6c4b2fb4548ffc3e7ca2147ef27b9d4.

Change-Id: I99f043567e0837f4b28713d27a5c30e5112913ea
rc/com/android/telecomm/TelecommServiceImpl.java
b956ac28837b0677b6d3773fbbbf1e1175df82e2 20-Jun-2014 Ihab Awad <ihab@google.com> Merge "Fix bug with null pointer exception with conference call"
654eccbb9acbbdbcc92fa09d9b741701a6804adf 20-Jun-2014 Yorke Lee <yorkelee@google.com> Merge "Revert "Exercise default phone application request in TestDialer""
50107999ae2bbae60acbccc52a5278ac80dc6db7 20-Jun-2014 Yorke Lee <yorkelee@google.com> Merge "Revert "Allow default and system dialers to make emergency calls via ACTION_CALL""
8bcf746617887cf0f25ebb89a7dcd90d359fb53a 20-Jun-2014 Yorke Lee <yorkelee@google.com> Revert "Exercise default phone application request in TestDialer"

This reverts commit 720c181dfe6fa5040d673181816f0c82e9424e2e.

Change-Id: I10b2cfb34d6f22a0b1d911e898490e325044e0be
ests/src/com/android/telecomm/testapps/TestDialerActivity.java
d362fe3e5d15301ca1d3612c7caa0c4ed05f128a 20-Jun-2014 Yorke Lee <yorkelee@google.com> Revert "Allow default and system dialers to make emergency calls via ACTION_CALL"

This reverts commit 31a94e394d4cddc873188b4138ab2c6f3324d533.

Change-Id: I29659ffbc507c415c9155fff98d57f336c46ebb0
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
12de5495028142b15c5e25508c77ff4506e29b57 19-Jun-2014 Ihab Awad <ihab@google.com> Fix bug with null pointer exception with conference call

Calls with a null getHandle() were creating a NPE.

Bug: 15618846
Change-Id: Ic33f5e71a0527c907d94baf0adcc1373bbfda99f
rc/com/android/telecomm/PhoneStateBroadcaster.java
5594694e669121f149b785da8c1a08c2df852fd7 19-Jun-2014 RoboErik <epastern@google.com> Merge "Remove old audio session code"
31a94e394d4cddc873188b4138ab2c6f3324d533 18-Jun-2014 Yorke Lee <yorkelee@google.com> Allow default and system dialers to make emergency calls via ACTION_CALL

Change-Id: I877b58e8f02f8e578e5f61456a99f24f5396714b
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
64ef40de3ce2c923ff640e65315df1ef26952506 19-Jun-2014 RoboErik <epastern@google.com> Remove old audio session code

Remove code that no longer does anything. This code was replaced by
media session apis.

Change-Id: I25c31daeaed9e012e3fb2943137474c82ff240a7
rc/com/android/telecomm/HeadsetMediaButton.java
60a0b5680cb07e1edb260dbccd6f3ce4e01ddc83 19-Jun-2014 Yorke Lee <yorkelee@google.com> Merge "Allow default and system dialers to make emergency calls via ACTION_CALL"
5ce62061e515c64468ae1658ceed84c156b170e6 18-Jun-2014 Ihab Awad <ihab@google.com> Merge "Add methods to TelephonyManager for Subscription management (2/3)"
60509464429cb26450c680186ac9f8c8be3199eb 15-Jun-2014 Ihab Awad <ihab@google.com> Add methods to TelephonyManager for Subscription management (2/3)

As part of the effort to permit third-party suppliers of telephone
connectivity, we permit clients of TelephonyManager to obtain the
currently valid Subscription objects describing these suppliers. The
Subscriptions are intended to be self-describing such that an end-user
can choose from among them based on the information they contain. One
of these objects may then be attached to an ACTION_DIAL or ACTION_CALL
Intent to represent the end-user's choice of how to make a call.

Change-Id: Ia462e4cd830a0b0d067f79b91cb2df79358e35f9

Conflicts:
src/com/android/telecomm/TelecommServiceImpl.java
es/drawable-xxhdpi/chat_with_others.png
es/drawable-xxhdpi/market_wireless.png
es/drawable-xxhdpi/q_mobile.png
es/drawable-xxhdpi/talk_to_your_circles.png
es/values/strings.xml
rc/com/android/telecomm/TelecommServiceImpl.java
18593c4d83bdb7ebf8bc7965ae4758bdefebd6bb 17-Jun-2014 Sai Cheemalapati <saicheems@google.com> Merge "Adds speakerphone extra to ACTION_DIAL (1/2)."
720c181dfe6fa5040d673181816f0c82e9424e2e 16-Jun-2014 Yorke Lee <yorkelee@google.com> Exercise default phone application request in TestDialer

Change-Id: I87689bf601c5c09c1c80def868f336ee056010a3
ests/src/com/android/telecomm/testapps/TestDialerActivity.java
736234a45b0168be9da3780312dc94bfb7f771c1 16-Jun-2014 Yorke Lee <yorkelee@google.com> Merge "Add getSystemPhoneApplication to Telecomm"
b7157e9f7dbf151c4c6ff4ebcc171632af00616e 12-Jun-2014 Sai Cheemalapati <saicheems@google.com> Adds speakerphone extra to ACTION_DIAL (1/2).

If optional extra EXTRA_SPEAKERPHONE_ON is added
to an ACTION_DIAL intent, the speakerphone will turn
on automatically once the call is connected.

Bug: 6810980
Change-Id: I37ac7737e3b85fa3c8e2d5a87a5a1de157f2da08
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
ff7493a8f620509d41dd8a5106c1d0dcd27cd274 10-Jun-2014 Ihab Awad <ihab@google.com> DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (2/4)

Bug: 15275904
Bug: 15196474
Change-Id: I3e2ee62b3e32ad5715457fee1b0e714f88ecea8e
ndroid.mk
ndroidManifest.xml
es/menu/respond_via_message_settings_menu.xml
es/values/strings.xml
es/xml/respond_via_sms_settings.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/MultiLineTitleEditTextPreference.java
rc/com/android/telecomm/RespondViaSmsManager.java
rc/com/android/telecomm/RespondViaSmsSettings.java
rc/com/android/telecomm/Ringer.java
ceb96c9ab6c4b2fb4548ffc3e7ca2147ef27b9d4 12-Jun-2014 Yorke Lee <yorkelee@google.com> Add getSystemPhoneApplication to Telecomm

Change-Id: I224f18517d38a02fed07d44bced860042633c153
rc/com/android/telecomm/TelecommServiceImpl.java
a161070ea054f91a5b2d5b4e3413381134d548b8 05-Jun-2014 Santos Cordon <santoscordon@google.com> Support conference calling. (2/4)

Bug: 15006702
Change-Id: I2764ea242f783ba478c9eae86618dd33e9fc792a
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/Timeouts.java
ests/src/com/android/telecomm/testapps/TestCallService.java
21284a2443b29ce7e4dd58b9d69fa1f6dfcc97c1 13-Jun-2014 Ihab Awad <ihab@google.com> am 2230ef3c: (-s ours) Merge "DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (2/4)" into lmp-preview-dev

* commit '2230ef3c871fb28a6c291bf8ccb9e40cca2ca3b4':
DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (2/4)
92a836130aadb99fc0624dca1e53130b5c10373b 13-Jun-2014 Santos Cordon <santoscordon@google.com> resolved conflicts for merge of 10838c23 to master

Change-Id: I2c860eece81258c868ed8429aca5a4ebe2d62ba9
10838c23aa209b364812cf1dcc23a3793234fb0d 12-Jun-2014 Santos Cordon <santoscordon@google.com> Support Add Call (1/2)

Bug: 15006702
Change-Id: I5b99af2da0841897ab87f8b9076f4fae91233b80
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
2230ef3c871fb28a6c291bf8ccb9e40cca2ca3b4 12-Jun-2014 Ihab Awad <ihab@google.com> Merge "DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (2/4)" into lmp-preview-dev
31d8b26f73e91a58d676ee201794a9cc7cc20f03 10-Jun-2014 Ihab Awad <ihab@google.com> DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (2/4)

Bug: 15275904
Bug: 15196474
Change-Id: I3e2ee62b3e32ad5715457fee1b0e714f88ecea8e
ndroid.mk
ndroidManifest.xml
es/menu/respond_via_message_settings_menu.xml
es/values/strings.xml
es/xml/respond_via_sms_settings.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/MultiLineTitleEditTextPreference.java
rc/com/android/telecomm/RespondViaSmsManager.java
rc/com/android/telecomm/RespondViaSmsSettings.java
rc/com/android/telecomm/Ringer.java
20ed035251a3fa4d7cab63a672aeaf2f3160a492 10-Jun-2014 Santos Cordon <santoscordon@google.com> am 6a405e02: (-s ours) Support conference calling. (2/4) [DO NOT MERGE]

* commit '6a405e029d78938c54391a562d44ccbc339f81fb':
Support conference calling. (2/4) [DO NOT MERGE]
7c65acd2d2201fab6ea35f331baa1ea9bc04ee96 04-Jun-2014 Yorke Lee <yorkelee@google.com> Add TestDialerActivity

Add a test dialer activity to Telecomm tests to exercise
default-dialer related APIs.

Change-Id: Ib8f9b70d683e8aff9091abb3f7766ec074712cfe
ests/AndroidManifest.xml
ests/res/layout/testdialer_main.xml
ests/res/values/donottranslate_strings.xml
ests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
ests/src/com/android/telecomm/testapps/CallServiceNotifier.java
ests/src/com/android/telecomm/testapps/DummyCallServiceSelector.java
ests/src/com/android/telecomm/testapps/TestCallActivity.java
ests/src/com/android/telecomm/testapps/TestCallService.java
ests/src/com/android/telecomm/testapps/TestCallServiceProvider.java
ests/src/com/android/telecomm/testapps/TestDialerActivity.java
ests/src/com/android/telecomm/testcallservice/CallNotificationReceiver.java
ests/src/com/android/telecomm/testcallservice/CallServiceNotifier.java
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
ests/src/com/android/telecomm/testcallservice/TestCallActivity.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
ests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
6a405e029d78938c54391a562d44ccbc339f81fb 05-Jun-2014 Santos Cordon <santoscordon@google.com> Support conference calling. (2/4) [DO NOT MERGE]

Bug: 15006702
Change-Id: I2764ea242f783ba478c9eae86618dd33e9fc792a
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/Timeouts.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
6098d2c392f8698f8f4885da6edf6c5b8d7e4cb9 06-Jun-2014 Sailesh Nepal <sail@google.com> Add call service handoff trigger

Bug: 15191653
Change-Id: Iee03a666e7ebc2fe326f32405174466299be9d04
rc/com/android/telecomm/CallServiceSelectorWrapper.java
rc/com/android/telecomm/CallServiceWrapper.java
6625545769bd9c5aa15b7e1ee9402f75ad799e81 05-Jun-2014 Yorke Lee <yorkelee@google.com> Follow API change in PhoneNumberUtils

Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/EmergencyCallServiceSelector.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
75b6fc5e4e91b2ee4c5a8897ecce5932ce0b90b8 06-Jun-2014 Evan Charlton <evanc@google.com> am f8983904: Merge "Plumb through the post-dial DTMF wait/response" into lmp-preview-dev

* commit 'f8983904dab09a33c98f3b237068f21d46c505dc':
Plumb through the post-dial DTMF wait/response
f8983904dab09a33c98f3b237068f21d46c505dc 06-Jun-2014 Evan Charlton <evanc@google.com> Merge "Plumb through the post-dial DTMF wait/response" into lmp-preview-dev
71996a918a5795d8f55b74ae4ed9496937bf9d59 06-Jun-2014 Yorke Lee <yorkelee@google.com> am 3d2be557: (-s ours) DO NOT MERGE Follow API change in PhoneNumberUtils

* commit '3d2be557ac8f1dec18e82a15d4fffd8b15c36047':
DO NOT MERGE Follow API change in PhoneNumberUtils
7b25970f84573f753b7f16c6703426037ca41781 06-Jun-2014 Ihab Awad <ihab@google.com> am 92ae7a56: (-s ours) Merge "DO NOT MERGE. Implement connection error dialogs (2/4)" into lmp-preview-dev

* commit '92ae7a56f767ba4e48ea06fa40125d2547b9f25e':
DO NOT MERGE. Implement connection error dialogs (2/4)
6beaeda1005be624f36974a1017f4a905fe841ef 05-Jun-2014 Ihab Awad <ihab@google.com> Merge "DO NOT MERGE. Implement connection error dialogs (2/4)"
3d2be557ac8f1dec18e82a15d4fffd8b15c36047 05-Jun-2014 Yorke Lee <yorkelee@google.com> DO NOT MERGE Follow API change in PhoneNumberUtils

Bug: 15432083
Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/EmergencyCallServiceSelector.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
94d827e6aaa1435762c2fa9784b1d984d0457caa 05-Jun-2014 Santos Cordon <santoscordon@google.com> am 8128998a: Set media session active when there are calls.

* commit '8128998af91646bae7ae858f60e05075776e0a5c':
Set media session active when there are calls.
0fea3f214ccdbda3b05282e99ba9d095d544e906 04-Jun-2014 Ihab Awad <ihab@google.com> DO NOT MERGE. Implement connection error dialogs (2/4)

Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.

Bug: 15195720
Bug: 15117141
Change-Id: Idbd822a4eed897676663da008071c6050cc79616
(cherry picked from commit a3cb9e34db5952f0852c1a3230870cc6e378f246)
rc/com/android/telecomm/AsyncResultCallback.java
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceSelectorWrapper.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/OutgoingCallProcessor.java
92ae7a56f767ba4e48ea06fa40125d2547b9f25e 05-Jun-2014 Ihab Awad <ihab@google.com> Merge "DO NOT MERGE. Implement connection error dialogs (2/4)" into lmp-preview-dev
a3cb9e34db5952f0852c1a3230870cc6e378f246 04-Jun-2014 Ihab Awad <ihab@google.com> DO NOT MERGE. Implement connection error dialogs (2/4)

Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.

Bug: 15195720
Bug: 15117141
Change-Id: Idbd822a4eed897676663da008071c6050cc79616
rc/com/android/telecomm/AsyncResultCallback.java
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceSelectorWrapper.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/OutgoingCallProcessor.java
352105c5d33ac94e5ad0cb5ac2e9268731423e65 03-Jun-2014 Evan Charlton <evanc@google.com> Plumb through the post-dial DTMF wait/response

Connect the CallServices with the InCallService for post-dial DTMF
call flows (and the reverse path, for the wait dialog response).

Bug: 13734588
Change-Id: I5cc06268590c3c424ea6daf216cb205b9c470dac
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
8128998af91646bae7ae858f60e05075776e0a5c 04-Jun-2014 Santos Cordon <santoscordon@google.com> Set media session active when there are calls.

Bug: 15190801
Change-Id: I357778743568cca00fcd8d8dd4b11c21772c3d0e
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/HeadsetMediaButton.java
c698c4531b640a1578f8bb97c34a80b64a4e7f77 02-Jun-2014 RoboErik <epastern@google.com> am 96729a22: Merge "Set the audio stream for phone calls" into lmp-preview-dev

* commit '96729a2290a9ba3525a3496f7e305d2c9b48a2b2':
Set the audio stream for phone calls
96729a2290a9ba3525a3496f7e305d2c9b48a2b2 02-Jun-2014 RoboErik <epastern@google.com> Merge "Set the audio stream for phone calls" into lmp-preview-dev
82612ade72bd60d4c794692cec117c89e0c32483 02-Jun-2014 RoboErik <epastern@google.com> Set the audio stream for phone calls

This tells the system which stream to adjust volume for when the
session is active.

Change-Id: Ib594b70c53bb432a4e8300434006729b483078d5
rc/com/android/telecomm/HeadsetMediaButton.java
19a71903d6ae43d1648937f4afd6014b71bc0a2a 02-Jun-2014 Santos Cordon <santoscordon@google.com> am 433351ee: Merge "Method definitions for conference APIS." into lmp-preview-dev

* commit '433351eeea1dd4907605eb018e030527321c12dd':
Method definitions for conference APIS.
433351eeea1dd4907605eb018e030527321c12dd 02-Jun-2014 Santos Cordon <santoscordon@google.com> Merge "Method definitions for conference APIS." into lmp-preview-dev
8f3282c49bd4e8e6de59be4bdaefc726d99a3273 01-Jun-2014 Santos Cordon <santoscordon@google.com> Method definitions for conference APIS.

Bug: 15326865
Change-Id: Iee5ce555696f48f57f925e4bd37209ace1355dfd
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/InCallAdapter.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
787748f92ac52b1060c2f3c392b0254fe6030c72 01-Jun-2014 Santos Cordon <santoscordon@google.com> am deb8c897: Move headset hook from Telephony to Telecomm. (1/2)

* commit 'deb8c89707c604d4f9f32e476a58bd10a68293ff':
Move headset hook from Telephony to Telecomm. (1/2)
36e0944da523928a637e321a674eec74e4d1ebc7 31-May-2014 Jay Shrauner <shrauner@google.com> Merge "Allow ConnectionService to ask Telecomm for ringback"
deb8c89707c604d4f9f32e476a58bd10a68293ff 30-May-2014 Santos Cordon <santoscordon@google.com> Move headset hook from Telephony to Telecomm. (1/2)

Also sets up the mute and speakerphone statusbar icons triggered by
their respective states (including triggering from the headset hook).

Bug: 15190069
Change-Id: I990110816ec37c168e3646290a538be3cd23be35
es/values/strings.xml
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/HeadsetMediaButton.java
rc/com/android/telecomm/StatusBarNotifier.java
cb387ac1bb278de62e352b363cb38339629a61f5 29-May-2014 Ihab Awad <ihab@google.com> Allow ConnectionService to ask Telecomm for ringback

Cherry picked from branch lmp-preview-dev because checking the changes into master required an API update, whereas the relevant APIs are @hide-ed in the source branch.

Implements the necessary wiring to respond to a ConnectionService that
asks Telecomm to play ringbacks on its behalf.

Bug: 15190301
Change-Id: Ic6a6c031aa92df1f3587daf74f24d090cd21245b
(cherry picked from commit 50a57136b3aa876c8311b58e1e11720a337fe1cc)
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/RingbackPlayer.java
84a874023f23903d5b7f44946018955dff9aeaca 30-May-2014 Ihab Awad <ihab@google.com> am d515a135: (-s ours) Merge "DO NOT MERGE. Allow ConnectionService to ask Telecomm for ringback" into lmp-preview-dev

* commit 'd515a135b7ece82c63015a91e7161a3c7bd6777a':
DO NOT MERGE. Allow ConnectionService to ask Telecomm for ringback
d515a135b7ece82c63015a91e7161a3c7bd6777a 30-May-2014 Ihab Awad <ihab@google.com> Merge "DO NOT MERGE. Allow ConnectionService to ask Telecomm for ringback" into lmp-preview-dev
9c193299573a8a17aa482a5f9eb25319f7198a73 30-May-2014 Amith Yamasani <yamasani@google.com> Merge "Incoming call support for multiuser phones"
34e9129afa6332112304b045aaec45ec196f143f 30-May-2014 Santos Cordon <santoscordon@google.com> am f3671a6f: Update showCallScreen to use Telecomm (2/6)

* commit 'f3671a6f38a4af68603daf4c2025f572129eada8':
Update showCallScreen to use Telecomm (2/6)
50a57136b3aa876c8311b58e1e11720a337fe1cc 29-May-2014 Ihab Awad <ihab@google.com> DO NOT MERGE. Allow ConnectionService to ask Telecomm for ringback

Implements the necessary wiring to respondj to a ConnecitonService that
asks Telecomm to play ringbacks on its behalf.

Bug: 15190301
Change-Id: Ic6a6c031aa92df1f3587daf74f24d090cd21245b
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/RingbackPlayer.java
f3671a6f38a4af68603daf4c2025f572129eada8 30-May-2014 Santos Cordon <santoscordon@google.com> Update showCallScreen to use Telecomm (2/6)

Implement showCallScreen in TelecommServiceImpl and route through new
InCallService#bringToForeground.

Bug: 15008165
Change-Id: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/TelecommServiceImpl.java
dcd616979bfd2f4a167fa1b0c26cee605c9ea5fa 30-May-2014 Santos Cordon <santoscordon@google.com> am 5ba7f274: Add custom ringtone support.

* commit '5ba7f27491e287f39a999ddd3d1ed6a7bad78272':
Add custom ringtone support.
a52313c18f81ba0e9161b6ba9183194d9b16d1c0 30-May-2014 Santos Cordon <santoscordon@google.com> am f2e8e6ab: Merge "Change app label name from Telecomm to Phone." into lmp-preview-dev

* commit 'f2e8e6abdc618f6557f1bbc3fa2e14f536e4fc2f':
Change app label name from Telecomm to Phone.
adfe357e237a07c81bb532dca15778a3e0552dc6 30-May-2014 Santos Cordon <santoscordon@google.com> am 2174fb56: Adds direct to voicemail support in telecomm.

* commit '2174fb56907fddf5680355e097f4425f837983e2':
Adds direct to voicemail support in telecomm.
5ba7f27491e287f39a999ddd3d1ed6a7bad78272 28-May-2014 Santos Cordon <santoscordon@google.com> Add custom ringtone support.

Bug: 15313520

Change-Id: Ib4a553139b5b9d7852bdeb57ad5e33dfa35f9be8
rc/com/android/telecomm/AsyncRingtonePlayer.java
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/Ringer.java
rc/com/android/telecomm/Timeouts.java
f2e8e6abdc618f6557f1bbc3fa2e14f536e4fc2f 30-May-2014 Santos Cordon <santoscordon@google.com> Merge "Change app label name from Telecomm to Phone." into lmp-preview-dev
cb29c032ec50455fad1bd882317719bf9cc04f18 30-May-2014 Santos Cordon <santoscordon@google.com> Change app label name from Telecomm to Phone.

Bug: 15313119
Change-Id: I1ca674f6fdfd69d50105699b82237eb3e1cd896b
es/values/strings.xml
2174fb56907fddf5680355e097f4425f837983e2 29-May-2014 Santos Cordon <santoscordon@google.com> Adds direct to voicemail support in telecomm.

Instead of handling the incoming call once the call is verified, we wait
for a maximum of 500ms for the contact info query to execute. From that
info, we determine if we reject the call immediately or allow the
incoming call UI to go through.

Bug: 15322630
Change-Id: I3d28bde9c4c0a2636e88f09b41fafed6078f4ca5
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/Timeouts.java
52286ba76d4d313a235761b6c0c6416bf9ac51e9 30-May-2014 Santos Cordon <santoscordon@google.com> am ecd24dc1: Merge "Add Caller information to missed call notifications." into lmp-preview-dev

* commit 'ecd24dc13213552327014d865f02ba0729d2593c':
Add Caller information to missed call notifications.
ecd24dc13213552327014d865f02ba0729d2593c 30-May-2014 Santos Cordon <santoscordon@google.com> Merge "Add Caller information to missed call notifications." into lmp-preview-dev
99c8a6fc0ae4c50878a748280a0ae2d8dd6b040e 29-May-2014 Santos Cordon <santoscordon@google.com> Add Caller information to missed call notifications.

Includes moving ContactsAsyncHelper from services/Telephony to here.
This was a wholesale copy with only changes to:
1) Update logging to use Telecomm's implementation
2) Removal of ImageTracker inner class (was causing linking
errors and was totally unused in both telecomm and
services/Telephony).

Bug: 15313021
Change-Id: I4e3ce52ce1c31eb7b684d8e404fdcff4bb7db7ba
es/values/dimens.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/ContactsAsyncHelper.java
rc/com/android/telecomm/MissedCallNotifier.java
8f8167c54e315f20965ee61be3457f3c77619074 29-May-2014 Santos Cordon <santoscordon@google.com> am b58f453c: Fix #911 calls.

* commit 'b58f453c46a695347a69f8c973a77796e5c1fdf7':
Fix #911 calls.
b58f453c46a695347a69f8c973a77796e5c1fdf7 29-May-2014 Santos Cordon <santoscordon@google.com> Fix #911 calls.

We were previously calling Uri.parse() on the number which caused the #
to be recognized as a uri fragment separator when it should have been
part of the scheme-specific-part. Later on when we got the scheme
specific part to actually dial the number, we got an empty string.

The fix is to use Uri.fromParts() to build the string with the number
being explicitly part of the scheme-specific part.

Bug: 15315198
Change-Id: I1231d446c6ba98df417a83843181957a4d788918
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
3b77fe4e91133a1e709eec6001bc367c27f64c08 29-May-2014 Santos Cordon <santoscordon@google.com> am fd71f4ad: Add caller information lookup to Call.java

* commit 'fd71f4adb6f04ab485563133f5ccf541de04b002':
Add caller information lookup to Call.java
fd71f4adb6f04ab485563133f5ccf541de04b002 28-May-2014 Santos Cordon <santoscordon@google.com> Add caller information lookup to Call.java

Bug: 15313021

Change-Id: I159a095965a158f59d01ce925fe08f4442a9e14b
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
76b59e5e8bbc24d311cb18a24a471764b3fc4b32 28-May-2014 Santos Cordon <santoscordon@google.com> am d791b2ab: Merge "Move BluetoothManager to telecomm." into lmp-preview-dev

* commit 'd791b2ab61b96d0948128730d2fe47054a3c2bdd':
Move BluetoothManager to telecomm.
d791b2ab61b96d0948128730d2fe47054a3c2bdd 28-May-2014 Santos Cordon <santoscordon@google.com> Merge "Move BluetoothManager to telecomm." into lmp-preview-dev
c7e85d4fa0bb3325133a79d4c89f3149e0af430e 22-May-2014 Santos Cordon <santoscordon@google.com> Move BluetoothManager to telecomm.

Copy over bluetooth manager from teleservice and add usage in
CallAudioManager (for audio routing), Ringer (ringtone routing),
InCallTonePlayer (tone routing).

Change-Id: I015961aebf42389a7f4cf3a5f89ec194d6ca64e2
Bug: 13242863
ndroidManifest.xml
rc/com/android/telecomm/BluetoothManager.java
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallTonePlayer.java
rc/com/android/telecomm/Ringer.java
f6be609abbbdb3a039a8e53562f8c67045903ec2 28-May-2014 Santos Cordon <santoscordon@google.com> am 1bc274e4: (-s ours) Merge "DO NOT MERGE Adding implementation of TelecommService" into lmp-preview-dev

* commit '1bc274e4c9e45fa357611ed02ae7ab76c67a6fa7':
DO NOT MERGE Adding implementation of TelecommService
b2977fed4b05449d3ee70023090ae5c06f317029 28-May-2014 Santos Cordon <santoscordon@google.com> am 833a6d9f: Merge "Fix log errors and hide PII statically." into lmp-preview-dev

* commit '833a6d9f594dd25dca59af2a3e83db927680f113':
Fix log errors and hide PII statically.
1bc274e4c9e45fa357611ed02ae7ab76c67a6fa7 28-May-2014 Santos Cordon <santoscordon@google.com> Merge "DO NOT MERGE Adding implementation of TelecommService" into lmp-preview-dev
833a6d9f594dd25dca59af2a3e83db927680f113 28-May-2014 Santos Cordon <santoscordon@google.com> Merge "Fix log errors and hide PII statically." into lmp-preview-dev
600c8201e31219e77d542183b87844fcbc5b18a8 28-May-2014 Santos Cordon <santoscordon@google.com> am 355083c4: (-s ours) Marking call as DIALING from CallsManager instead of Call. DO NOT MERGE

* commit '355083c47573360cc3e8aa6cdd4198a613640f74':
Marking call as DIALING from CallsManager instead of Call. DO NOT MERGE
4f1b7b8ca45e5cbcb76014c80842130d001bed83 26-May-2014 Santos Cordon <santoscordon@google.com> Fix log errors and hide PII statically.

Change-Id: I7e87cec9a609bf41e9b39b2107850a0e26faabf1
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/Log.java
b64c150bde86ae22787aec4eaa16b9e3b3420f9d 22-May-2014 Santos Cordon <santoscordon@google.com> DO NOT MERGE Adding implementation of TelecommService

First use of this service is to allow silencing of the ringer
(called from TelephonyManager)

Also updated Telecomm to run under the android.uid.phone userId.
This ID has special permission to add services and send protected
broadcast intents. We'll piggy back until telecomm moves into the
system server process.

Bug: 15125169

Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
(cherry picked from commit ae19306ddefab5988c38d882e28b9fdffce20e8a)
ndroidManifest.xml
rc/com/android/telecomm/AsyncRingtonePlayer.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/Ringer.java
rc/com/android/telecomm/TelecommApp.java
rc/com/android/telecomm/TelecommServiceImpl.java
355083c47573360cc3e8aa6cdd4198a613640f74 23-May-2014 Santos Cordon <santoscordon@google.com> Marking call as DIALING from CallsManager instead of Call. DO NOT MERGE

Bug: 15190301

Change-Id: Ibfee6ce6b559dca5d900996c386c3d8daf4508f4
(cherry picked from commit 6cb7ba934c1eedc230ae08ddcd63b76299a330de)
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
60e7584fe6a1ab878458e4e89f83b77f30416f46 23-May-2014 Amith Yamasani <yamasani@google.com> Incoming call support for multiuser phones

Change-Id: I18554f230398e17df7de3eb6fce2b38eae34c1a6
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/TelecommApp.java
dcd64263edae0a5a9a1b9c3d4543bfb7f138639a 24-May-2014 Sailesh Nepal <sail@google.com> Temp fix for handoff on CDMA

With this CL we no longer disconnect the WiFi call when doing
a handoff from WiFi to to CDMA. Since CDMA becomes active
quickly, disconnecting the WiFi call will end the call and stop
handoff.

This is a temp fix. I'll implement a proper fix when we switch
to daisy chaining.

Bug: 15019557
Change-Id: I6e5d21bafd41948c8bd429740e36f31ab81deadc
rc/com/android/telecomm/CallsManager.java
61ea3818009fea3090c582c770c23d46697e5b3c 23-May-2014 Santos Cordon <santoscordon@google.com> Merge "Marking call as DIALING from CallsManager instead of Call."
6cb7ba934c1eedc230ae08ddcd63b76299a330de 23-May-2014 Santos Cordon <santoscordon@google.com> Marking call as DIALING from CallsManager instead of Call.

Bug: 15190301

Change-Id: Ibfee6ce6b559dca5d900996c386c3d8daf4508f4
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
ae19306ddefab5988c38d882e28b9fdffce20e8a 22-May-2014 Santos Cordon <santoscordon@google.com> Adding implementation of TelecommService

First use of this service is to allow silencing of the ringer
(called from TelephonyManager)

Also updated Telecomm to run under the android.uid.phone userId.
This ID has special permission to add services and send protected
broadcast intents. We'll piggy back until telecomm moves into the
system server process.

Bug: 15125169

Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
ndroidManifest.xml
rc/com/android/telecomm/AsyncRingtonePlayer.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/Ringer.java
rc/com/android/telecomm/TelecommApp.java
rc/com/android/telecomm/TelecommServiceImpl.java
682fe6ba2fe99e209d72a051539697a755b994c0 20-May-2014 Santos Cordon <santoscordon@google.com> Updating the outgoing call sequence.

- Removes OutgoingCallsManager
- Call now invokes it's own OutgoingCallProcessor (OCP) directly.
- Results for select(), call(), and OCP.process() now happen through
new AsyncResultCallback closure objects specified at the time
the methods are invoked.
- Move remaining outgoing call responsibilities in Switchboard to
OCP including expiration and CS/selector discovery.
- Remove isCompatibleWith sequence

Change-Id: Ie63c7900dc7a324d0c56e0767ed19b2ef0868528
rc/com/android/telecomm/AsyncResultCallback.java
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/CallServiceSelectorWrapper.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/Switchboard.java
74d420be72fa30735fe9b7a25715f6db046c0398 07-May-2014 Santos Cordon <santoscordon@google.com> Simplify Respositories, Switchboard and Switchboard-indirection.

This is a step into separating Call into Call + Connection.

Changes:
1. Update Repositories to:
A. Share code via the new BaseRepository
B. Perform a lookup per call instead of attempting to have 1 lookup
work for concurrent calls. This allowed removal of extra state
out of the repositories (mIsLookupInProgress) and out of
Switchboard (mNewOutgoingCalls, mPendingOutgoingCalls, etc).
2. Add a OutgoingCallEntry class to Switchboard to support 1 service
lookup per outgoing call. The new class maintains the necessary
state (CS collection & selector collection).
3. Outgoing/IncomingCallsManager now reports success/failure directly
to the Call class instead of indirecting through the switchboard.
4. Switchboard, for the time being, kept the outgoing call timeout and
triggers it through OutgoingCallEntry.

Change-Id: I01196dd5384ad256cf09035018a76abaadb2c04d
rc/com/android/telecomm/BaseRepository.java
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/Switchboard.java
b2c8d51252d311416b82c68864a83419e612476b 14-May-2014 Ihab Awad <ihab@google.com> Track changed class names in Telephony

This is a minor change to track new Service class names introduced
in Telephony during a refactoring, http://ag/460922

Change-Id: Iaad06714c858680f7bc20e53f933c299a7fa9111
rc/com/android/telecomm/TelephonyUtil.java
766d04f7cad00b0b09e39db6835676354acd2cda 06-May-2014 Santos Cordon <santoscordon@google.com> Making CallsManager interact with only Calls.

Eventually, I would like CallsManager to interact only with Call
objects. This is one move in that direction.

OLD:
CallsManager->Switchboard-+->Call-+->CallService
+-------+

NEW:
CallsManager->Call-+->Switchboard-+->CallService
+--------------+

This change also includes new direct listening to Call events by
CallsManager. At the moment includes only success/failure of incoming
and outgoing calls but should eventually be more generic as we implement
more of the Telecomm design.

Change-Id: I7a764706acd0872960642a7b16c71a2bc514f3b3
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/IncomingCallValidator.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallValidator.java
rc/com/android/telecomm/Switchboard.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
abde16e1daf6889dae3e8ffc7f8b6dc9857f3214 06-May-2014 Santos Cordon <santoscordon@google.com> Merge "Combining Wrappers and adapters." into master-nova
3d3b4059d7b1fc5a03c4b049b1d436f28ecf84ec 05-May-2014 Santos Cordon <santoscordon@google.com> Combining Wrappers and adapters.

Cleaner code this way with fewer indirections. Also maps better to new
Telecomm design.

Change-Id: I88cf8f6382f307a7a2ce86e8acdd614283d1d0a5
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceSelectorAdapter.java
rc/com/android/telecomm/CallServiceSelectorWrapper.java
rc/com/android/telecomm/CallServiceWrapper.java
92a2d811b6206eec84b3c21100dd64f660dae3a2 01-May-2014 Santos Cordon <santoscordon@google.com> Play DTMF tones locally when user uses dialpad during a call.

Bug: 13880857
Change-Id: I94e8eeb94cd77c829eeea07e1444615daa8c4723
es/values/config.xml
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/DtmfLocalTonePlayer.java
c499c1c0758dcb4b02048df96e7405994660ab3f 15-Apr-2014 Santos Cordon <santoscordon@google.com> Simplify deallocation/unbinding of services.

Call counts of call services and selectors are kept current during call
and during the outgoing call process. This allows us to unbind simply
when the call-count goes down to 0.

A second optimization that can be made is to remove associated-call
counts from ServiceBinder and use the callIdMapper to maintain counts of
the associated calls. This binds the call count to the mapper items,
however there are two small roadblocks:
1. It isn't as easy to deal with the replace() scenario, but doable
2. The caller-ID mapper implementations between CS and selectors are
separate and it's nice to keep a single associated count implementation
for all ServiceBinders...this is also addressable, just not that
important at the moment.

Change-Id: Ibbf894ed5b7dd9ede1b088e530dd9cc2e0e649c2
rc/com/android/telecomm/BinderDeallocator.java
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/Timeouts.java
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
748105732f968d5a0d36b44967bc44d9e65df7ad 15-Apr-2014 Sailesh Nepal <sail@google.com> Merge "Use ComponentName.flattenToShortString" into master-nova
4538f01647fa207b41fb7e481cc180e67fd391de 15-Apr-2014 Sailesh Nepal <sail@google.com> Use ComponentName.flattenToShortString

Change-Id: I39ab41db896148b31d0c78ef8875c315c80f99af
rc/com/android/telecomm/Call.java
ad6f6e28e0cd38c0f8db870511fb8bbaf4bc710f 15-Apr-2014 Ihab Awad <ihab@google.com> Merge "Handle Call disconnect before connection" into master-nova
4e0f19238e262eb98437fd9a43bdfa6a708b62ec 15-Apr-2014 Ihab Awad <ihab@google.com> Handle Call disconnect before connection

Make Call behave cleanly if it receives a request to disconnect
before a connection has been established.

Bug: 13936734

Change-Id: Id5e6bc289d36cba028f1ff101beef5ac33d3138f
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/Switchboard.java
d4deb2a7fe90619a7e669f058e085069e902fe32 12-Apr-2014 Evan Charlton <evanc@google.com> Allow selectors to abort calls

Allow CallServiceSelectors to abort an outgoing call.

Bug: 13980764
Change-Id: Id0c608729cb5de3e2a37b2538f1f61ed94bcb31b
rc/com/android/telecomm/CallServiceSelectorAdapter.java
9b616c5c707c618aa84e83bff0d8c7d5f2545164 11-Apr-2014 Sailesh Nepal <sail@google.com> Fix crash due to logging

Change-Id: Ib48371195ef35de0e7daaeff7d7b60fc16e8bab9
rc/com/android/telecomm/MissedCallNotifier.java
2186f7f21a2c4db089d84911150489dac476f989 10-Apr-2014 Evan Charlton <evanc@google.com> Don't bundle the vibration with the volume

Setting the volume to zero should not affect the vibration.

Bug: 13937034
Change-Id: I03bc2323d4bf5900416ac079fdd1f3572de99494
rc/com/android/telecomm/Ringer.java
e519d995fc739fee871a4a88ceb0d30bf62f2087 10-Apr-2014 Evan Charlton <evanc@google.com> Don't filter ringback requests by CallService

When checking whether we should start ringing, checking the status
of the CallService is not strictly correct because it can lead to
weird situations during handoff.

Bug: 13902624

Change-Id: Id5ee0d4d050deb2f3038f3de8fdd265caa75f7b2
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/RingbackPlayer.java
893f9e3fa066cdd6194b9aa60dbeb49462c2e921 09-Apr-2014 Evan Charlton <evanc@google.com> Don't start ringback until CallService ACK

Only start playing the ringback tone once a CallService has
acknowledged that it can be handling the call.

Bug: 13902624

Change-Id: I702dff71e4042ae87dd9aa2c46d53e9bdd66f321
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/RingbackPlayer.java
40f78c210512570f14cdfde9613dd85c510a1c0c 07-Apr-2014 Santos Cordon <santoscordon@google.com> Add call waiting to Ringer.java.

When an incoming call is in the background, play call waiting instead of
ringer.

Bug: 13674415

Change-Id: I9d450202774c6890794fa318fdab01290b4a7eb2
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallTonePlayer.java
rc/com/android/telecomm/Ringer.java
6b12fe34d66c8b7693ec37a9e64882bae6f92790 08-Apr-2014 Evan Charlton <evanc@google.com> Merge "Add CALL_PRIVILEGED" into master-nova
4857f476eded24a3e86eaaae6934f3f270bb4b31 08-Apr-2014 Sailesh Nepal <sail@google.com> Handle disconnect during handoff

Currently the handoff code expects that the original call will stay
alive during the handoff. If the original call disconnects then
handoff is cancelled and both calls are removed.

With this CL, if the original call disconnects during handoff it's
kept alive. If the handoff fails then the both calls are removed.
If handoff succeeds then the original call is updated with the
handoff call's state.

Change-Id: Ie4a6d38d990812cc1e83c81502c008bcf9a35053
rc/com/android/telecomm/CallsManager.java
3985c19a71f14a842f73ce2d21dd10648bac512f 08-Apr-2014 Sailesh Nepal <sail@google.com> Merge "Test Call Service: Add handoff support" into master-nova
be5844729c03a3fa368117f6e25a550a9524dd89 08-Apr-2014 Sailesh Nepal <sail@google.com> Test Call Service: Add handoff support

This CL adds support for switching from TestCallService to
PSTN and back. Pressing one one the keypad enables handoff
and pressing 2 disables handoff.

Change-Id: Ide576c4ed3c45efd8605da5dafc8253f2658893c
ests/src/com/android/telecomm/testcallservice/CallServiceNotifier.java
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
ests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
8c85dee84fbbd8c36cf1c7b061001c6129623f92 08-Apr-2014 Sailesh Nepal <sail@google.com> Telecomm: Use new InCallCall object

Change-Id: I3916e33e184f57bb6e58ed93a26b866d3ce0e7df
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/InCallTonePlayer.java
rc/com/android/telecomm/MissedCallNotifier.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/TelephonyUtil.java
rc/com/android/telecomm/Timeouts.java
a0ac2f860b83a4852d7dec1091c20ad61e16762c 08-Apr-2014 Sailesh Nepal <sail@google.com> Merge "Update CallId for handoff call" into master-nova
0e5410a58043ce059884fdc8811a280655e5a920 04-Apr-2014 Sailesh Nepal <sail@google.com> Update CallId for handoff call

After handoff we were updating the call's CallService but not the callId.
This lead to the call being unable to communicate with the call service.

For example:
Call1(id_A) - CallService1, place Call1 using CallService1
start handoff
Call2(id_B) - CallService2, place Call2 using CallService2
complete handoff
Call1(id_C) - CallService2, update Call1's CallService
Call2(null) - null, clear Call2's call service

At this point CallService2 only knows about an ongoing Call with ID id_B.
When Call1 attempts to communicate with CallService2 nothing happens.

To fix this we need to use id_B as the ID for Call1. So:
Call1(id_B) - CallService2, update Call1's CallService

Bug: 13800552
Change-Id: I5dfadc21cb11668395bea50a1123523d4150d401
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
51bd35bf381e79abf76c5c03e9ec588a0ffecfc5 08-Apr-2014 Evan Charlton <evanc@google.com> Add CALL_PRIVILEGED

In order to support certain numbers (e.g. Voicemail), Telecomm needs
elevated permissions.

Bug: 13674852
Change-Id: I575e642a9078c8c162ca26a0046c95b393ac54cf
ndroidManifest.xml
8ac15c0c7b4e63fa8678e2ef4d354bd0a54d9a2d 07-Apr-2014 Sailesh Nepal <sail@google.com> Merge "Fix logging in NewOutgoingCallIntentBroadcaster" into master-nova
b33087514fb354c9d10c29f9cb071ed2ae2a6124 07-Apr-2014 Sailesh Nepal <sail@google.com> Fix logging in NewOutgoingCallIntentBroadcaster

Change-Id: I4ce45401caa886af5382e51f4ef83669be84bc00
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
344fbd85135b77908b94c4087e79daaa41f92c92 07-Apr-2014 Evan Charlton <evanc@google.com> Merge "Add vibration code to Ringer" into master-nova
198fde811f7587e1e9c09ab71285eb7390c9e4a1 07-Apr-2014 Evan Charlton <evanc@google.com> Add vibration code to Ringer

When there's a new incoming call, vibrate (according to preferences
and volume settings) the device as well as ringing it.

Bug: 13365911
Change-Id: Id67999a173d36aa4d8472a52ac4ab95eaaea0fb0
ndroidManifest.xml
rc/com/android/telecomm/Ringer.java
a0e5f1aa917decf6921e372a3fd5a43da51adecb 01-Apr-2014 Santos Cordon <santoscordon@google.com> Adding missed call notification.

Adds a MissedCallNotifier class and a TelecommBroadcastReceiver to
receive the pending intents issued by the new notification.

Bug: 13625335
Change-Id: I51b273f3bd4ecb55e2f0e61b789f609d72086deb
ndroidManifest.xml
es/drawable-hdpi/ic_text_holo_dark.png
es/drawable-hdpi/stat_sys_phone_call.png
es/drawable-ldrtl-hdpi/ic_text_holo_dark.png
es/drawable-ldrtl-hdpi/stat_sys_phone_call.png
es/drawable-ldrtl-mdpi/ic_text_holo_dark.png
es/drawable-ldrtl-mdpi/stat_sys_phone_call.png
es/drawable-ldrtl-xhdpi/ic_text_holo_dark.png
es/drawable-ldrtl-xhdpi/stat_sys_phone_call.png
es/drawable-mdpi/ic_text_holo_dark.png
es/drawable-mdpi/stat_sys_phone_call.png
es/drawable-xhdpi/ic_text_holo_dark.png
es/drawable-xhdpi/stat_sys_phone_call.png
es/values/strings.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/Log.java
rc/com/android/telecomm/MissedCallNotifier.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/TelecommApp.java
rc/com/android/telecomm/TelecommBroadcastReceiver.java
ac35c8cbc832e2bffe1f2d655d5aa13e2cc32248 04-Apr-2014 Santos Cordon <santoscordon@google.com> Merge "Add tones for call disconnection." into master-nova
83a47e740b1f1b86b16c639bd17be49c6e9baddf 03-Apr-2014 Evan Charlton <evanc@google.com> Use the new adapter APIs

Change-Id: I58ca5c6970328861327699ec497fa21288bce7df
rc/com/android/telecomm/EmergencyCallServiceSelector.java
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
84fa5f8c59a1cd3c5716c239fb19c58244fc81fe 02-Apr-2014 Sailesh Nepal <sail@google.com> Handoff: Implement handoff in Telecomm

See the following CLs for more info on how handoff is enabled and
triggered: changeid - I94c28b10c0e0a253450f14d31ecdc416d5b44ca4

Once a Call is handoff enabled it will have a non-null mHandoffHandle.

When handoff is triggered we create a new Call object and set
mOriginalCall.

At this point we have two call objects.
1st call: Call1
- mHandoffHandle: non-null
- mOriginalCall: null
2nd (invisible) call: Call2
- mHandoffHandle: null
- mOriginalCall: non-null

Once the new call's state changes to active we do the following:
call1.disconnect() // hangup on the old call
removeCall(call2) // stop tracking the new call
// merge into call1
call1.setCallService(call2.getCallService());
call1.setState(call2.State());

At this point call2 is deleted and call1 has been fully handed off.

Bug: 13643568
Change-Id: I94c28b10c0e0a253450f14d31ecdc416d5b44ca4
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceSelectorWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/Switchboard.java
3ded76f284cec9d1028a30f8af5814a8159ba798 03-Apr-2014 Santos Cordon <santoscordon@google.com> Merge "Fix build." into master-nova
c27e4016cce7c576a950fc886c9da6d89aa95a60 03-Apr-2014 Santos Cordon <santoscordon@google.com> Fix build.

Change-Id: I7e806b2e5bfef1b1af9c52db841353f98cc45caf
rc/com/android/telecomm/CallServiceSelectorWrapper.java
c7b8ebabf904aa70a7a2a2a0ad01883088c56180 02-Apr-2014 Santos Cordon <santoscordon@google.com> Add tones for call disconnection.

Change-Id: I12f93ff400f0f4e1f2e2480832e8a61be1c33aa9
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallToneMonitor.java
rc/com/android/telecomm/InCallTonePlayer.java
85f6ba2ae3fa7ec327a76ef47db6e77fad7cf7ca 03-Apr-2014 Santos Cordon <santoscordon@google.com> Merge "Add emergency call service selector." into master-nova
5b7b9b3564dcdc0e098ac8e879456fd0cb86e00e 26-Mar-2014 Santos Cordon <santoscordon@google.com> Add emergency call service selector.

Change-Id: I85b8c0a6c6d2db668caaf27abe6b022e8e06cc8c
ndroidManifest.xml
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/CallServiceSelectorWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/EmergencyCallServiceSelector.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/TelephonyUtil.java
3c67a52696575d2b2c331834c2d4239fc6e92724 03-Apr-2014 Evan Charlton <evanc@google.com> Merge "Fix a bad log format string" into master-nova
0ebf84099d2a8f68dd6848f58560b5a33658d290 03-Apr-2014 Evan Charlton <evanc@google.com> Fix a bad log format string

When callId was switched from int -> String, this was missed.

Change-Id: I30cd7f59875079ac7aa2aaa5619df6b691f31f68
rc/com/android/telecomm/CallServiceAdapter.java
62f2a63f61afe2bdd0da88d87a60e2b1a52b79cb 03-Apr-2014 Ihab Awad <ihab@google.com> Merge "Remove extra symlink that confuses IDE tools." into master-nova
4079b99ba669e23b0e60a2660db89c4d1789b5cf 02-Apr-2014 Ihab Awad <ihab@google.com> Remove extra symlink that confuses IDE tools.

Change-Id: I5184aa6835fd1cefb3f8e8fb59e3daa66cb1d458
rameworks-base-telecomm
53fb8c103ab542608e0225eae1edfdf43bfa2273 02-Apr-2014 Sailesh Nepal <sail@google.com> Add disconnect cause and message to PhoneStateBroadcaster

Change-Id: Ibb857e16b578e8acc7fc20bd3ab6693afcab318e
rc/com/android/telecomm/PhoneStateBroadcaster.java
6ab6fb74a5e687fef828e52b9a547aeeed034cfd 02-Apr-2014 Sailesh Nepal <sail@google.com> Telecomm implementation of CallServiceSelectorAdapter

Bug: 13643568
Change-Id: Ida5859a3b5b15c9fa1c533f27a3e14fd0d7c36af
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceSelectorAdapter.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/CallServiceSelectorWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/Switchboard.java
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
e2ea653f2d5fb2b84b8f08263d5989ad5876f45e 02-Apr-2014 Sailesh Nepal <sail@google.com> Don't use UUID for call Ids

Change-Id: Id537824269fdd567480c3082e9fa869cd200979d
rc/com/android/telecomm/CallIdMapper.java
e59bb195972d65a71618af4fe13f1ad982253e16 02-Apr-2014 Sailesh Nepal <sail@google.com> Use mapped IDs for calls

With this CL each client gets a unique ID to represent calls.
This has a couple of benefits:
- avoids one client from modifying another clients call
- allows for stricter validation of input
- allows a call to handed off to a different call service
(with a different call ID)

Bug: 13643568
Change-Id: I6e2039aead5723d01f9442a4e54f5e616711a3b3
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallIdMapper.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceSelectorWrapper.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/PhoneStateBroadcaster.java
rc/com/android/telecomm/RingbackPlayer.java
rc/com/android/telecomm/Ringer.java
rc/com/android/telecomm/Switchboard.java
10ea4609f60940145489ebffcdd53d40948f56f4 02-Apr-2014 Sailesh Nepal <sail@google.com> Use messages instead of runnables

Change-Id: If76cf2abbea7c07621ff0c181cd30e68043a681d
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/InCallAdapter.java
639d3ce246d5862bd86caaa1fb0ab4ddd8a61e6e 01-Apr-2014 Ihab Awad <ihab@google.com> Fix build breakage due to missing methods on TestCallService.

Change-Id: Idc862eeef713d553c37e6d0b7c3bd69c1a8aa7f9
ests/src/com/android/telecomm/testcallservice/TestCallService.java
74549ec95acf0d2ddbe4feca91c6febdf8008074 10-Mar-2014 Ihab Awad <ihab@google.com> DTMF dialing support in packages/services/Telecomm

Change-Id: I86522cedea9617dd420a568aad44c220fc3ef49b
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallAdapter.java
acee9559b78687ac6bc7a5e937d8c64758620740 01-Apr-2014 Santos Cordon <santoscordon@google.com> Merge "Add disconnect cause to the disconnect path." into master-nova
79ff2bcdbdf1c28f229f4acec9433beb1cd7a57e 27-Mar-2014 Santos Cordon <santoscordon@google.com> Add disconnect cause to the disconnect path.

Change-Id: I4488f58eaf656b46410b2ed85999d0598bc11a5d
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
44a14671c1b61a9968cdce4b695ceb808671a7e6 29-Mar-2014 Sailesh Nepal <sail@google.com> Delete unused classes

Change-Id: Ic086d1e760ad66ca4ee9163f61e3d4baf80c0a14
rc/com/android/telecomm/exceptions/NoCompatibleCallServiceException.java
rc/com/android/telecomm/exceptions/OutgoingCallException.java
a56f276cafcad80ab3a28996b6a0d72cffa4b2bc 24-Mar-2014 Santos Cordon <santoscordon@google.com> Adding ringback tone.

Adds InCallTonePlayer for playing generic tone. Copied mostly from
CallNotifier.InCallTonePlayer.

Adds RingbackPlayer for starting and stopping the ringback tone as
appropriate while switching between forground calls.

Change-Id: I02b82e3bb23ee64d80b9c0b3b7b5d00edd0361e8
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallTonePlayer.java
rc/com/android/telecomm/RingbackPlayer.java
15a43728f24ed7c9a8519fc5c7e283a2312620bb 25-Mar-2014 Yorke Lee <yorkelee@google.com> Merge "Add scheme to resultdata in NewOutgoingCallIntentReceiver" into master-nova
b9d4b3612c4ba389a66ab95644d64a444c158aaa 25-Mar-2014 Yorke Lee <yorkelee@google.com> Add scheme to resultdata in NewOutgoingCallIntentReceiver

Bug: 13628407
Change-Id: Ic567ebf6d78c045bb673b60bf0430056ff82efea
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
6aca10a0efa2771ccdef5920f4276f0db4a7ee1f 25-Mar-2014 Sailesh Nepal <sail@google.com> Add audio mode and audio focus support to Telecomm

This CL adds support for:
- audio focus
- switching to speaker phone
- mute
- wired headset

Bluetooth support is coming in a different CL.

Change-Id: Iaf4013ea747548451cff45b48bcbb5b1dd1b8498
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/Ringer.java
rc/com/android/telecomm/WiredHeadsetManager.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
33501635c2cd21f40793041eff3b8ce3a5710d49 18-Mar-2014 Yorke Lee <yorkelee@google.com> Add gateway support to Telecomm

Add OutgoingCallIntentBroadcaster into the outgoing call flow.
This class allows third party apps to intercept and modify
outgoing phone calls, and also allows for the ability to extract
gateway information from outgoing call intents to allow for calls
to be made via gateway providers.

Bug: 13477768

Change-Id: Iee6a466b3ae7380136c3d7feba48602a14bc8507
es/values/config.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
9e45c73acab65460bfff2d8322a7d1766363cc7b 21-Mar-2014 Sailesh Nepal <sail@google.com> Merge "Delete DialerAdapter" into master-nova
eff79b72c606226c8602d0d93c1e9a5ad0b3b6c9 21-Mar-2014 Sailesh Nepal <sail@google.com> Delete DialerAdapter

Change-Id: I5747c08b197344b2f41eff1110e6ac4fe4cea217
rc/com/android/telecomm/DialerAdapter.java
7ea255703d34a38d8a486c110f72096dbb80c89c 20-Mar-2014 Santos Cordon <santoscordon@google.com> Merge "Perform clean up when a call-service dies." into master-nova
4b2c119562bf29b05c7dc139c77f5893d3d70d2c 20-Mar-2014 Santos Cordon <santoscordon@google.com> Perform clean up when a call-service dies.

Also add some test call service logic to make this logic
easily testable.

Bug: 13546896

Change-Id: I7e1518488b4cd2d7752c3fee32816cecf734e388
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/IncomingCallsManager.java
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
25d4e4b666b239560df98bec7a221daa996244ed 20-Mar-2014 Evan Charlton <evanc@google.com> Broadcast phone number as a String

Need to maintain API compatibility; even though we're passing around
a Uri, we need to convert it to a String before sending it out.

Bug: 13551037
Change-Id: Id1d5435ebdb3a6d07990ef228840a5797dd70e0b
rc/com/android/telecomm/PhoneStateBroadcaster.java
091dc54adc3067a57f73582ae54041baca92c87a 20-Mar-2014 Santos Cordon <santoscordon@google.com> Fixing setting audio mode when we do not have focus.

bug: 13550808
Change-Id: I845cf09c37a37e63f8d61d11c253243a2c031ed3
rc/com/android/telecomm/CallAudioManager.java
09e1fcec0db6b1b69e4bd163274e90ad17fb2477 20-Mar-2014 Sailesh Nepal <sail@google.com> Delete unused classes

Change-Id: I3976a7c742816637b1cc03ce3a85c5419a5e59f7
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/VoicemailManager.java
858c4c7dc53999e6702846581e354d46ba128431 20-Mar-2014 Sailesh Nepal <sail@google.com> Merge "Use TelephonyCallServiceSelector as fallback" into master-nova
18386a8a98dee5cf6bb55eff7eab4109ba2b3c56 19-Mar-2014 Sailesh Nepal <sail@google.com> Use TelephonyCallServiceSelector as fallback

Also added a CallServiceSelectorWrapper.

Change-Id: I49ff7a372dbee270735f7cc13f3bf7a9766c04f0
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/CallServiceSelectorWrapper.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/TelephonyUtil.java
rc/com/android/telecomm/Timeouts.java
8873e0a38d90be593e81db042ce51c6d08ac8784 19-Mar-2014 Evan Charlton <evanc@google.com> Include an exception with Log.wtf

Including an exception will get us an automatic stacktrace, making
WTF calls easier to debug.

Change-Id: I245113c6eeb9baba5e268639161552eb9a45baa3
rc/com/android/telecomm/Log.java
7923beee5d206f121eccaf6e3fcf1f5f37480913 19-Mar-2014 Yorke Lee <yorkelee@google.com> Merge "Decode call handle before inserting into call log" into master-nova
060d1d60f308bb903f7cd699747d014fab1ce70c 19-Mar-2014 Yorke Lee <yorkelee@google.com> Decode call handle before inserting into call log

Bug: 13546425

Change-Id: Id4851befc5946d3252e09122be5d599487aa166a
rc/com/android/telecomm/CallLogManager.java
1ae2b855daecb6829cf50690b1dfa2d55f62cf6d 19-Mar-2014 Santos Cordon <santoscordon@google.com> Audio focus and ring changes (again).

- Went back to using ringtone. Ringtone class has fallback logic that is
necessary to keep (without duplicating).
- Moved the ringtone player code into AsyncRingtonePlayer and kept the
CallsManager listener code inside ringer into CallAudioManager.java
- Consolidated AudioFocus acquisition into CallAudioManager.

bug: 13365906

Change-Id: I8d7b6a999f594b8f81497aa3f5b7ac5916fdd18e
rc/com/android/telecomm/AsyncRingtonePlayer.java
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/Ringer.java
810735e3f0a4fe924a805981d32b6916ec834b38 19-Mar-2014 Sailesh Nepal <sail@google.com> Add CallsManagerListener

Also contains some minor bug fixes:
- add an incoming field to Call
- correcty log failed outgoing calls (previously these were mostly dropped)
- log missed incoming calls

Change-Id: I72dc39efd519302c1f765f4f9c9d04c5095e45a6
ndroid.mk
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallAudioManager.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/CallsManagerListenerBase.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/PhoneStateBroadcaster.java
rc/com/android/telecomm/Ringer.java
rc/com/android/telecomm/Switchboard.java
8440cd2e5402bfb679da24358034171c3fb20197 19-Mar-2014 Santos Cordon <santoscordon@google.com> Merge "Clean up ringer code." into master-nova
be322e9c088244ef0f70fc41d0e66a526833a008 18-Mar-2014 Santos Cordon <santoscordon@google.com> Clean up ringer code.

- Ringer now uses a reentrant lock to protect mHandler.
- mRingtone is only set from the handler thread.
- The handler thread is kept alive forever until the ringer is stopped and
there exist no pending messages on the ringer handler thread.
- Added ringer audio mode (until it is moved to AudioManager when that is
added).

Change-Id: Iaa93f92a9d9556815a4a46580d40cb45f473dbb5
rc/com/android/telecomm/Ringer.java
428f9f7ef8498e296b7d1b61a9f8d510bf3ce498 18-Mar-2014 Sailesh Nepal <sail@google.com> Merge "Make comments easier to read" into master-nova
d2dbf12deb9f955685818852588529efd60f5bf1 18-Mar-2014 Sailesh Nepal <sail@google.com> Make comments easier to read

Change-Id: Ie6399e0bd18f81fd0b3b9df7bbf91764f4315ee9
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/ThreadUtil.java
d3a351404d25cdee086bcac4f762cf17129f1791 18-Mar-2014 Sailesh Nepal <sail@google.com> Merge "Telecomm: Use Uri for handle" into master-nova
ce704b9a5d9cf7db30a8c865975c70e5cbc0dc5c 18-Mar-2014 Sailesh Nepal <sail@google.com> Telecomm: Use Uri for handle

Change-Id: I7f3163da47159d68903ce45268429f5949203589
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/IncomingCallValidator.java
rc/com/android/telecomm/OutgoingCallValidator.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
6d2dbe5a2d5c2cb75474e5b931970ad78f4bf34b 18-Mar-2014 Sailesh Nepal <sail@google.com> Merge "Update copy right notice" into master-nova
129f1e63c578e8beb98b87d8cd3a77cb2273dc88 18-Mar-2014 Sailesh Nepal <sail@google.com> Update copy right notice

Change-Id: I42d69a2908e7e175185f8bdcfb60cf49222c38c7
rc/com/android/telecomm/Timeouts.java
cdf3ebd3ea6505668304b7e0a39df354ebbb52fb 13-Mar-2014 Yorke Lee <yorkelee@google.com> Add hold support to Telecomm service

Bug: 13169202

Change-Id: Ic2c1989de41c91d237841581e6fa531cb71d4eed
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
adee12dd6b3e85ce3ae419329226c9aa72c184fc 13-Mar-2014 Yorke Lee <yorkelee@google.com> Fix crash when making an outgoing call

Fix the Log.wtf exception that occurs because mPendingOutgoingCallIds
does not contain the expected callId

Change-Id: I5cf6b08a2bffd883b89791d3cca9d5fc6b2175f6
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/OutgoingCallProcessor.java
3c6f27e2b61d7f5d074e525f78120591e18d6fb0 13-Mar-2014 Sailesh Nepal <sail@google.com> Fix build, missing TelecommConstants import

Change-Id: Ib0313c8020812c2c5fcbe46b6ac18557ef784b53
rc/com/android/telecomm/CallsManager.java
44e6cbba24ade4f8258186c220a8bec59d326674 13-Mar-2014 Sailesh Nepal <sail@google.com> Merge "Add Call Id to state change broadcast" into master-nova
85680bfdebe1100813510553bb28a38c5c7f7592 13-Mar-2014 Sailesh Nepal <sail@google.com> Add Call Id to state change broadcast

Change-Id: Iffcf16c79761e83ccf4b08103f56fc34e8f98d4b
rc/com/android/telecomm/CallsManager.java
b02364ea63966a1f43c5178cd13b52d259afa67d 13-Mar-2014 Evan Charlton <evanc@google.com> Update TestCallService to use new APIs

The CallServiceAdapter API changed; update the calls here, too.

Change-Id: I83de860d72069845a879c46df309fca78156eea7
ests/src/com/android/telecomm/testcallservice/TestCallService.java
771ac97fac164f93f45a7c800b7de13063aabd6f 13-Mar-2014 Evan Charlton <evanc@google.com> Fix the build

setCompatibleWith was renamed to setIsCompatibleWith, and an in-
flight CL was not rebased.

Change-Id: I2c831df5f054e0c6f95eaf570318c9e358e0f4cb
rc/com/android/telecomm/OutgoingCallsManager.java
6192561b1f56d7c4e6c650e178e07ba61ad02667 12-Mar-2014 Ben Gilad <gilad@google.com> Work in preparation for wiring up the remaining de-allocation and
abort bits.
1) limit to one attempt per call service upon multiple selectors
returning the same call service
2) record the failing/incompatible ones such that these are avoided
when switching
3) addressing some related todos etc.

Change-Id: I62204e9947bb8557888df33ca70f4352d3e6decf
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceProviderWrapper.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/ServiceBinder.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
ests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
99ff53502cd0a9461e3d335ce907d6719519866b 12-Mar-2014 Yorke Lee <yorkelee@google.com> Merge "Initial commit of basic call logging code in Telecomm" into master-nova
83cfe7cb54c12db39e88db176e12992c1641946c 12-Mar-2014 Sailesh Nepal <sail@google.com> Fix build due to missing import in Telecomm

Change-Id: Iede4656caae18620466dc2f6c1c7622db084a806
rc/com/android/telecomm/CallServiceWrapper.java
f98fb5790ed62a3d4893362554f8d251c74d0ecd 05-Mar-2014 Yorke Lee <yorkelee@google.com> Initial commit of basic call logging code in Telecomm

Add CallLogAsync and CallLogger helper classes, and populate
CallLogManager with initial skeleton code that will add call log
entries for failed outgoing calls and disconnected calls.

Change-Id: Iead39702c6b271a6449f7840162efde655dd1965
ndroidManifest.xml
es/values/config.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/Switchboard.java
a439e1b6d6201dedecfc40b67c9347a8c563b9c1 12-Mar-2014 Sailesh Nepal <sail@google.com> Update Telecomm to use new wrappers and aidl paths

Change-Id: If9e5cf619defd5347b145591a416004cf0072c95
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceProviderWrapper.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/Switchboard.java
ests/AndroidManifest.xml
ests/src/com/android/telecomm/testcallservice/TestCallService.java
ests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
9ddfdde1f1e3d972f24703e81a2ab889d0902d22 11-Mar-2014 Sailesh Nepal <sail@google.com> Merge "Temp work around for audio bugs" into master-nova
28e8ad601cbef0abab1cd6aec8c5a3bc881839c2 07-Mar-2014 Ben Gilad <gilad@google.com> Wiring up the Telecomm abort flow.

Change-Id: Ie9de03507fabe09c09347b37355c8fe5ce4492b0
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/OutgoingCallProcessor.java
1cecc7cc03c28c70652729e01338c3adc1be7f31 11-Mar-2014 Sailesh Nepal <sail@google.com> Temp work around for audio bugs

As a temporary work around for audio bugs this CL does the following:
- request audio focus
- set audio mode
- disable speaker phone
- unmute microphone

Bug: 13375268
Change-Id: Ibf3cda9e99463669d15804708f080b6c7efc5d5c
ndroidManifest.xml
rc/com/android/telecomm/CallsManager.java
9199078322aea6df26f0d304a28a9a6d040f0717 09-Mar-2014 Sailesh Nepal <sail@google.com> Redact personally identifiable information

This CL adds a utility function to redact personally identifiable
information from logs.

Change-Id: I5185dc436a22397dce55487a7531406097591720
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/Log.java
f1c191d3974fed3f57680c63571ae0212c4622e7 08-Mar-2014 Sailesh Nepal <sail@google.com> Upate logging to use LogUtil

This CL replaces all calls to Log.* with calls to LogUtil.*.

Bug: 13172967
Change-Id: I649e2c4f74f9d74d046eddc777e192a066882520
rc/com/android/telecomm/BinderDeallocator.java
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceProviderWrapper.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/Log.java
rc/com/android/telecomm/LogUtil.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/ThreadUtil.java
2f83a0c1aa78ff6638078f3c887583d3a898e451 08-Mar-2014 Santos Cordon <santoscordon@google.com> Merge "Add ringer code to actually play a ringtone." into master-nova
57a680f2aa0797307451a142a8912cfd7b10d5e6 07-Mar-2014 Santos Cordon <santoscordon@google.com> Add ringer code to actually play a ringtone.

Change-Id: I575ea90a9af44358a68ff3e83ff9850fd9a59ba3
rc/com/android/telecomm/Ringer.java
41d5e1e92db01673420ea2cecf1ce71df8b3da35 07-Mar-2014 Evan Charlton <evanc@google.com> Merge "First pass at Telephony broadcasts" into master-nova
ee64276f699beef907e3f272b2e97ef9b6e4c4e7 07-Mar-2014 Sailesh Nepal <sail@google.com> Increase look up timeouts

Increase the timeouts for provider and selector lookups from 100ms to 1000ms.

Change-Id: Ib92d900eddfbc86633d7cd008ff6f3a69255ee8b
rc/com/android/telecomm/Timeouts.java
d1cac3d34a33eb22b2d16eca5e9ea8021b5cd8a6 07-Mar-2014 Sailesh Nepal <sail@google.com> Merge "Add a utility class for logging" into master-nova
0f996eb1f63d2dd74348c85b0091abc5b8a132ce 07-Mar-2014 Sailesh Nepal <sail@google.com> Add a utility class for logging

This class is copied from InCallUI.

The main advantage of using the utility class is that it uses string
formatters. This means that we can add verbose logging without the
overhead of string building. Verbose logging is needed for b/13172967

Bug: 13172967
Change-Id: I6955cafff0a61ddac842fa6b040d841b58ff9230
rc/com/android/telecomm/LogUtil.java
26d6727b4948f9811d3840a29238c85c23292e79 07-Mar-2014 Evan Charlton <evanc@google.com> Add logging when timeouts occur

When timeouts occur, add log event messages for debugging.

Change-Id: I140ffd9310651ade3b2735b88a19262d8f85bca5
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/Switchboard.java
5c670a985e80fc8980b6c6046dce8eb92112a898 06-Mar-2014 Evan Charlton <evanc@google.com> First pass at Telephony broadcasts

This is a first pass at restoring the old Telephony API. Certain
Intents need to be broadcast, such as NEW_OUTGOING_CALL, in order to
keep third-party apps compatible.

Change-Id: Id612d421fd055ae238f99275d656c4650e496ee5
ndroidManifest.xml
rc/com/android/telecomm/CallsManager.java
57ad6edd886ac42d0d12858ea18c7967533d0648 07-Mar-2014 Evan Charlton <evanc@google.com> Merge "Allow timeouts to be configurable" into master-nova
1063e2854a5904e8628894e0b5f32d46087c4639 06-Mar-2014 Evan Charlton <evanc@google.com> Allow timeouts to be configurable

Read the various timeouts from Settings so that they can be configured
and tuned at runtime (instead of baking them into the source code).

Bug: 13329970

Change-Id: I0113d171b5f5098305dff89e86eee8ad11939c27
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/Timeouts.java
b6d118af9884895e2c8437100a3b6cad935c428c 06-Mar-2014 Ben Gilad <gilad@google.com> Check for a null set of binders.

(implicitly fixed by
I738fa4b2fe5cbb3a741ee85884eb02e13d3e85c5 though
it seems we'd rather be explicit/defensive).

Bug: 13331451
Change-Id: Id92382a5524ea33dc272d14820c4650941c8f7b3
rc/com/android/telecomm/BinderDeallocator.java
4074c2ab256054f75a58995d7b8a3edf3c123fef 06-Mar-2014 Ben Gilad <gilad@google.com> Remove unused Telecomm imports.

Change-Id: I7a28a617e493487e369f3a8049fb2dbbe6bdfeb9
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/Switchboard.java
b4f06329bf214720ef8c70a101ef7bd720e44a8d 06-Mar-2014 Ben Gilad <gilad@google.com> Merge "Followup re post-submit comments on ag/428313." into master-nova
f02e98861a8496df1467fa0b12ac05796f213f9f 06-Mar-2014 Evan Charlton <evanc@google.com> Never use null collections

Don't null out collections; clear() them instead.

Change-Id: I738fa4b2fe5cbb3a741ee85884eb02e13d3e85c5
rc/com/android/telecomm/BinderDeallocator.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/Switchboard.java
46f93e79f0e1a10a17a9ec913aa68dc2f6719edc 05-Mar-2014 Ben Gilad <gilad@google.com> Followup re post-submit comments on ag/428313.

Also adding abort() to the test call service.

Change-Id: I3ca3c62ef74a9a4d6e729735bcbec01753cd52b7
rc/com/android/telecomm/OutgoingCallProcessor.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
d29830104fc33b2c82f462353f97d3595afae887 06-Mar-2014 Evan Charlton <evanc@google.com> Fixing the build, again

Add a missing import statement.

Change-Id: I5ddd4794c0080cc66ea43e683df1af828b980c42
ests/src/com/android/telecomm/testcallservice/TestCallService.java
617edd9f5d54f4629d604b97ad4d674ee6089cea 06-Mar-2014 Evan Charlton <evanc@google.com> Fix the build

Forgot to update TestCallService to use the new API.

Change-Id: Ifec8ef8ce3d2a1d50a923bee65093dd1ca391752
ests/src/com/android/telecomm/testcallservice/TestCallService.java
ebe42ee3b6961c21cadbc6f597771356c645a758 06-Mar-2014 Evan Charlton <evanc@google.com> Merge "Plumb the extras data through to the CallService" into master-nova
a05805b839edea9b9fe3bd4a0fbaf310c2a32838 05-Mar-2014 Evan Charlton <evanc@google.com> Plumb the extras data through to the CallService

Add support for the new extras API which allows a Bundle to be passed
with the incoming call intent, and plumb this Bundle all the way
through to the setIncomingCallId call.

Change-Id: I52e7e1d0788ecd01aa427e76de7ccf4d9b75f1f0
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/Switchboard.java
13cd4bcfc1f1fed6ba0062a3e3965920b71a1994 06-Mar-2014 Santos Cordon <santoscordon@google.com> Merge "Add Ringer skeleton to CallsManager." into master-nova
4e9fffe6927dab4ba547d95b11dd354cc1f27a79 05-Mar-2014 Santos Cordon <santoscordon@google.com> Add Ringer skeleton to CallsManager.

Change-Id: Ica6f5236eb63896b1e656876879d039907c42e9e
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/Ringer.java
9c2341172e2f7610f909aeb8411118627c67fe75 05-Mar-2014 Ben Gilad <gilad@google.com> Using the new aborted call state (see ag/428312).

Change-Id: I3bba757836edc82653c3b736f2e4102d68af12db
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/OutgoingCallProcessor.java
8e55d1d7ea86f768acb90f88dc9e5b5368d3398a 27-Feb-2014 Ben Gilad <gilad@google.com> Adding the resource-deallocation utility.

Change-Id: I73ee3b648d7b224017bb2445597f199f979be5de
rc/com/android/telecomm/BinderDeallocator.java
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/Switchboard.java
493e8f2ac0c611b43265c72715b71f6ec59bba0e 19-Feb-2014 Santos Cordon <santoscordon@google.com> Make incoming calls work.

This is a CL of random changes. Ties of loose ends which were previously
commented and adds new wiring to connect all the pieces together.

After this CL, incoming calls are functional for call services.

Change-Id: I6fa1e70b816094587849329790236f9289ec260b
ndroidManifest.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/Switchboard.java
ests/src/com/android/telecomm/testcallservice/CallServiceNotifier.java
a0d9f7532dd2898d06230609e6224cbd80ccd93d 26-Feb-2014 Ben Gilad <gilad@google.com> Adding some missing incoming CallManager logic.

Change-Id: I0ce0218561a40de02313771e1f36b31914ad6eac
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/IncomingCallValidator.java
rc/com/android/telecomm/OutgoingCallValidator.java
rc/com/android/telecomm/exceptions/RestrictedCallException.java
bb167cdd0dffa8103ba051b0e115dcaecf2b649d 26-Feb-2014 Ben Gilad <gilad@google.com> Fix for a CallServiceRepository bug.

Specifically where stale call services are passed back
to the switchboard for processing, including upon no
call-service-provider implementations.

Change-Id: I1a5c26f22031e31f9a94b239f06d34619769a56f
rc/com/android/telecomm/CallServiceProviderWrapper.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/Switchboard.java
c80a98c13050fd52064f16511167c7bb8bd748ca 19-Feb-2014 Santos Cordon <santoscordon@google.com> Update test app to simulate incoming calls.

Change-Id: Ie6c4a371b5d264152dd0da048ad594205e5a33d3
ests/src/com/android/telecomm/testcallservice/CallNotificationReceiver.java
ests/src/com/android/telecomm/testcallservice/CallServiceNotifier.java
83a4aa7d71734a794ed833501c605e1aa4a40b5a 25-Feb-2014 Santos Cordon <santoscordon@google.com> Merge "Adding answer/reject API support to Telecomm." into master-nova
61d0f70cf45036f9cdeb41b96538f792b7c9764b 19-Feb-2014 Santos Cordon <santoscordon@google.com> Adding answer/reject API support to Telecomm.

Adds answer/reject overridden methods to CallServiceWrapper.
Adds direct answer/reject to Call.java
Fills in existing answer/reject in CallsManager.java.

Change-Id: Ifd3a65230661b94f9dd99aabb2d2083684e2fc7c
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallAdapter.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
d239a03452ddc8f62083a3bb26eae19bdf379fa2 25-Feb-2014 Ben Gilad <gilad@google.com> Remove dangling CallsManager code.

Change-Id: I964e817cb1be2769c7206138250c16df7ecd357e
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallsManager.java
487436bccff65a8f3a1e31c3658041b5325f432b 25-Feb-2014 Ben Gilad <gilad@google.com> Remove dangling code in CallServiceProviderWrapper.

Change-Id: I5b4da5806074201b4b3a6522f8fba2e46b374220
rc/com/android/telecomm/CallServiceProviderWrapper.java
5de168c920788912884de99fcd374544231839ee 24-Feb-2014 Santos Cordon <santoscordon@google.com> Merge "Updating comments around provider cache." into master-nova
963c2344ca450551e17073505d677a0e4a50d513 24-Feb-2014 Sailesh Nepal <sail@google.com> Merge "Fix making 2nd call" into master-nova
b07a9d535ce921033a2e1ec188678c48a0d50f57 24-Feb-2014 Ben Gilad <gilad@google.com> Fix an OutgoingCallProcessor bug.

Replacement for ag/422078 (now that master-nova is gone).

Change-Id: I45534c5fd13252218d2e151c318467db5e152717
rc/com/android/telecomm/OutgoingCallProcessor.java
a12bc098b1aee6d9abb84d602b05cf3503779f2f 24-Feb-2014 Santos Cordon <santoscordon@google.com> Updating comments around provider cache.

Change-Id: Iadfad5e107aa9f57a3b86981fcc07d8b3d06fc8c
rc/com/android/telecomm/CallServiceRepository.java
c31937507470bf91f1ab5b705209e1d24ffd4131 22-Feb-2014 Sailesh Nepal <sail@google.com> Fix making 2nd call

Making more than one call didn't work. Problem was that
ServiceBinder.bind() wasn't correcly invoking the callback
if the service was already bound.

Bug: 13120050
Change-Id: I91179a436792221540b842f94a3d5564c517e02e
rc/com/android/telecomm/ServiceBinder.java
87bc6e62103dac7bed5b6835aaeb6db096de64da 22-Feb-2014 Santos Cordon <santoscordon@google.com> Merge "Change incoming call intent to be an activity intent." into master-nova
523f6058d49238c46b740cb65535710831215a45 21-Feb-2014 Santos Cordon <santoscordon@google.com> Change incoming call intent to be an activity intent.

Change-Id: Ib8ed478a306e6efa474ad4c05a651cf651f76f8a
ndroidManifest.xml
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/TelecommReceiver.java
a1c1708a8ba67e9f8d14e11e5546595b2553ff76 20-Feb-2014 Evan Charlton <evanc@google.com> Use the async CallServiceSelector API

Switch DummyCallServiceSelector to use the new CallServiceSelector API.

Change-Id: Ifc062cf49421079686d925406c823000232fa728
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
fc511caf40616914a576901a0ac992cdd124f0a0 21-Feb-2014 Sailesh Nepal <sail@google.com> Mark call as active for InCallUI

Problem was that we weren't forwarding the state to the InCallController.

Bug: 13118741
Change-Id: I2a930da160e8171fb4d9c70cffe1660e77a71742
rc/com/android/telecomm/CallsManager.java
155ab5168aafcf4cddf641e7e3d52e779eb328b5 21-Feb-2014 Sailesh Nepal <sail@google.com> Fix disconnect button

Pressing disconnect wasn't working because Call.mCallService was being set to null.

Bug: 13119666
Change-Id: Ie79d52ad970e39879dc6e695172e2a28e28864d2
(cherry picked from commit be21aba2e97d783f44734d42c27e2506ec5217ac)
rc/com/android/telecomm/OutgoingCallProcessor.java
ebd9b665a39b105dcc4605b7f5b08b5ea720c3fb 20-Feb-2014 Ben Gilad <gilad@google.com> Remove dangling code and add a TODO to unify the incoming/outgoing approach to use startActivity.

Change-Id: I0c7fcd6a598dd858d57d37b77bb8c21202aa1249
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/TelecommReceiver.java
37587237fc6da2c1ad340673fe5a0b353e69f202 20-Feb-2014 Ben Gilad <gilad@google.com> Update dangling references to #placeCall.

Change-Id: I68711ae4c50ac27f2d90da357e3106ca2d585f95
rc/com/android/telecomm/Switchboard.java
c5b2269fe4d926f040f10da5f0faf0a4f1ab5cfd 19-Feb-2014 Ben Gilad <gilad@google.com> The packages/services/Telecomm counterpart of ag/420591.

Change-Id: I42ec26518d9391704fe5d0443867b00e635fc845
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/TelecommReceiver.java
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
ests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
e596c2bf809ca57c52a0bba6414f3a339b2566f8 19-Feb-2014 Santos Cordon <santoscordon@google.com> Fix break.

Change-Id: I35830c0c3d7f1289871343e8f376a954922f4744
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
cfcc2f7d8266ceb38992a2558c454b31ebe08a6f 19-Feb-2014 Santos Cordon <santoscordon@google.com> Merge "Use the new incoming call confirmation APIs." into master-nova-dev
8d90ea69b2075326a6ae6b336b21379adc518ac4 19-Feb-2014 Santos Cordon <santoscordon@google.com> Merge "Add IncomingCallsMangager to perform the incoming call sequence." into master-nova-dev
80d9bdcdd89b75c8e4aff43a355a492ae8ecee64 14-Feb-2014 Santos Cordon <santoscordon@google.com> Add IncomingCallsMangager to perform the incoming call sequence.

IncomingCallsManager binds to the call service and asks it to confirm
the call. If the call service cannot be bound or it failed to confirm
within the timeout, we handle the incoming call as if it failed. The
code to do the actual confirmation is NYI.

Also add handleSuccess/Failed methods to Switchboard.
This still needs some changes to ICallService, ICallServiceAdapter, and
CallServiceWrapper before it will be fully functional.

Change-Id: Ibfd92ce17fb2054e2e0cb209738ad5375bf01492
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/IncomingCallsManager.java
rc/com/android/telecomm/Switchboard.java
7917d38176b6cc432314433d36d7bb46a09f5afc 14-Feb-2014 Santos Cordon <santoscordon@google.com> Use the new incoming call confirmation APIs.

Update Telecomm and Telecomm test package to use the new
confirm-incoming-call APIs including confirmIncomingCall and
handleConfirmedIncomingCall. Test call service always confirms all
incoming calls.

Also adds a list of unconfirmed incoming calls to the adapter. The
purpose of this is for the adapter to know which incoming call
confirmations to accept and which to ignore.

Change-Id: I914f25c45e5c887ca84d181d3dc173f25577e520
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceWrapper.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
abee48b001848c8d840ffd3d061dd387a181eb86 19-Feb-2014 Evan Charlton <evanc@google.com> Merge "Add a CallServiceSelector used for tests" into master-nova-dev
4039aaf9167f697d5007e1bcbc1c12df66bcb4ba 19-Feb-2014 Sailesh Nepal <sail@google.com> Merge "Fix making outgoing calls" into master-nova-dev
b6141aec99bcf399faea1bfc9f48503492c4fb2d 18-Feb-2014 Sailesh Nepal <sail@google.com> Fix making outgoing calls

This CL fixes the following issues with outgoing calls:
- Switchboard.placeOutgoingCall doesn't keep track of calls
- ServiceBinder.bind calls setServiceInterface() multiple times if service is already bound
- OutgoingCallProcessor.mCallServicesByInfo uses a custom object as a key which makes it impossible to look up call services
- OutgoingCallProcessor.attemptNextCallService invokes CallServiceWrapper.call without binding first

Change-Id: Ia7983f52c8c03ed9aa44e2c52c20ce9c1c9c75de
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/Switchboard.java
23a0885e2976cad0ab245d3ddd9dfba78f8abe93 09-Feb-2014 Evan Charlton <evanc@google.com> Add a CallServiceSelector used for tests

Change-Id: I292d962f1b73d0966af0c484ebddc724f8e6c925
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
4fa7ed1d5a0fbe11e80f9946e8dedfeaa3272aea 18-Feb-2014 Santos Cordon <santoscordon@google.com> Merge "Update the incoming call intent." into master-nova-dev
de14ddb770013aa25ca2a85b2269455cf592273e 14-Feb-2014 Santos Cordon <santoscordon@google.com> Add CallService to the manifest file.

Change-Id: I7f011d99775709be765f64eb0e54341d1a3fb31e
ests/AndroidManifest.xml
ests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
657cdd811bb6786eca7b4e1ff8d8c6f50c1d012f 14-Feb-2014 Santos Cordon <santoscordon@google.com> Update the incoming call intent.

Change the action name, extras, and comments around the intent.

Change-Id: I89e8dcf6e675f9b98d95656ea842c69954420041
rc/com/android/telecomm/TelecommReceiver.java
29d295e35fd77d5ad1fc27ae98592ae088ce78a8 14-Feb-2014 Santos Cordon <santoscordon@google.com> Fix test code to use CallServiceInfo.

Change-Id: I085cfb4531571e2a712f9e7e66c782f4339bab74
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
ests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
5c12c6e00101d16d2db776839a027c62c109dea8 13-Feb-2014 Santos Cordon <santoscordon@google.com> Use BindCallback with ServiceBinder.bind().

Incoming calls sequence will need to know when the bind() succeeds so it
no longer makes sense for the wrapper objects to have direct references
to the finder.

Changes included:
- Making the handle* methods of ServiceBinder private implementations
instead of astract.
- Add overriden setServiceInterface() to the wrapper.
- Add simple BindCallback interface used to get notified of bind()
results.
- Update CallServiceRepository to use BindCallback.

Change-Id: I59300e16463e88626df6d055b7fd4be1d850c5f2
rc/com/android/telecomm/CallServiceProviderWrapper.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/ServiceBinder.java
c195e3613af47a49e76821d3f24c05adb71cf920 12-Feb-2014 Santos Cordon <santoscordon@google.com> Use CallServiceWrappers in place of ICallService.

Change-Id: Icd8a6ae2401f68d04b359fb7539b6d4f5aafecd5
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceFinder.java
rc/com/android/telecomm/CallServiceProviderWrapper.java
rc/com/android/telecomm/CallServiceRepository.java
rc/com/android/telecomm/CallServiceSelectorFinder.java
rc/com/android/telecomm/CallServiceSelectorRepository.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/Switchboard.java
76866be38d7b5f59e18af02027536e5656401b9a 12-Feb-2014 Ben Gilad <gilad@google.com> Merge "Following up on some TODOs etc." into master-nova-dev
13329fd8585179592602ed9b8b9d1ac70e469a83 12-Feb-2014 Ben Gilad <gilad@google.com> Following up on some TODOs etc.

Change-Id: Ie5b11e85dd6415b89bb80791e0d3e834e77e35ca
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/Switchboard.java
63aeb16a14a94dd44345f6200c7c002e780a15ff 10-Feb-2014 Santos Cordon <santoscordon@google.com> Adding a CallService & CallServiceProvider concrete classes.

First step in no longer using ICallService and ICallServiceProviders
directly.
Adds a generic ServiceBinder class to manage binding/unbinding.

Change-Id: I7d26958dd85a99316dbd5e70caba3fd91d35911b
rc/com/android/telecomm/CallService.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceFinder.java
rc/com/android/telecomm/CallServiceProviderWrapper.java
rc/com/android/telecomm/CallServiceWrapper.java
rc/com/android/telecomm/ServiceBinder.java
rc/com/android/telecomm/Switchboard.java
6242b132458640835f80db03442b41ed6818a634 08-Feb-2014 Santos Cordon <santoscordon@google.com> Dangling fixes for outgoing calls.

CallsManager.INSTANCE = new CallsManager() -> new Switchboard()

Except that Switchboard tries to use INSTANCE in it's own
constructor...which is yet not initialized. Same problem with
InCallController.

Change-Id: Id0b6487e0e65ea3a90195392cbf1f3acc8c540ac
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/Switchboard.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
289d5938965c8db4fd0a5078acfb85ac57053a21 08-Feb-2014 Santos Cordon <santoscordon@google.com> Merge "Fully connect CallsManager with InCallController for outgoing calls." into master-nova-dev
049b7b6a8d0cf44d687d827cb57a18fa23358206 30-Jan-2014 Santos Cordon <santoscordon@google.com> Fully connect CallsManager with InCallController for outgoing calls.

Change-Id: Ic28fc5ea1e4a76be32fc7bd2d29f9690da959c96
ndroidManifest.xml
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/TelecommApp.java
bd4d3b1062d33d27563d4df5517a69caa136a754 30-Jan-2014 Santos Cordon <santoscordon@google.com> Update TestCallService app to include a dummy selector.

Also some sprinkled fixes to get outgoing calls working.

Change-Id: I0fe34dfd42cbf75cc05f2a4ca4582a2052682143
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
ests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
681663d17b6d92b604526a54b196fa88f25b6957 30-Jan-2014 Santos Cordon <santoscordon@google.com> OutgoingCalls(1/6) - Filling in lifecycle of outgoing call.

This CL adds the following:
1. CallServiceAdapter implementation
2. Setting call-service adapters when the finder receives call services.
3. CallServiceAdapter notifies OutgoingCallManager/OCP about a successful
outgoing call
4. Switchboard notifies CallsManager of the successful outgoing call
5. CallsManager adds the call to it's call repository.

What remains after this CL:
CallsManager sending the call to the InCall app and listening to
commands from in-call.

depends on: I086443e3f17ae0233b7b0fd5629119e989d06a40

Change-Id: I86f3e7ab02a47485eb2a5fb3557819418f3c4adf
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallServiceFinder.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallController.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/OutgoingCallsManager.java
rc/com/android/telecomm/Switchboard.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
2313e6235684b9fc1873b9c70f687b085eb910e7 06-Feb-2014 Ben Gilad <gilad@google.com> Adding the switchboard ticker.

Change-Id: Ie4e144759b1e7f287104f002206de53a00c70216
rc/com/android/telecomm/Switchboard.java
8bdaa4625517fe118ccbb7e4a003b9905b9d06cd 05-Feb-2014 Ben Gilad <gilad@google.com> Removing CallServiceUnavailableException that is no longer applicable.

Also including some cleanup in preparation for the next round of switchboard changes.

Change-Id: Ia8b293c971ff3866e4317eca4c9d053779917956
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/IncomingCallFilter.java
rc/com/android/telecomm/IncomingCallValidator.java
rc/com/android/telecomm/OutgoingCallFilter.java
rc/com/android/telecomm/OutgoingCallValidator.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/exceptions/CallServiceUnavailableException.java
0120241e30d3b9437eff41017be939c75e328900 13-Jan-2014 Evan Charlton <evanc@google.com> Enable proguard

Enable proguard for optimization (not obfuscation) to strip all of
the unnecessary methods, such as the majority of Guava.

Change-Id: Ic632ff6ae3b1a4c058090d843937867b3cde4447
ndroid.mk
0b03b4b143234302f098ea18de3c32658b455eca 30-Jan-2014 Santos Cordon <santoscordon@google.com> Adding call state to the Call object.

Change-Id: I2369a040a41cc37488a23dda8a72d4456248ac62
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/OutgoingCallProcessor.java
d983800e8f4108a76c73af6f8edb098cc423802e 31-Jan-2014 Ben Gilad <gilad@google.com> Merge "Wiring up the call from OutgoingCallProcessor to selectors." into master-nova-dev
d88323b4e8068dde0e78ff5eecac82a7cfa36ad8 30-Jan-2014 Ben Gilad <gilad@google.com> Wiring up the call from OutgoingCallProcessor to selectors.

Change-Id: Id8f4a88fd70d6c3801f7bcc6ed9f6f9f099950b6
rc/com/android/telecomm/OutgoingCallProcessor.java
e3d76abbb6c7c726980abed522f6c3efcbb6019e 29-Jan-2014 Santos Cordon <santoscordon@google.com> Adding in-call service code.

Adding the in-call service binding code and the in-call adapter.

Change-Id: I034652001022ac26674096f2a91b09fe12e8fe1a
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/InCallController.java
cacf0d96f843d5b1c1194363e811c63e4c8a594c 29-Jan-2014 Ben Gilad <gilad@google.com> Merge "Adding the OutgoingCallProcessor and the initial wiring between it and the switchboard." into master-nova-dev
0bf5b912285e328a8f5eeec158d6caf17845b9f8 29-Jan-2014 Ben Gilad <gilad@google.com> Adding the OutgoingCallProcessor and the initial wiring between it and the switchboard.

Change-Id: Ic331cdf5c8c84ae2a93a42f84aa19e5885bc0768
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/OutgoingCallProcessor.java
rc/com/android/telecomm/Switchboard.java
18cc42f16b9a7a5e84eff804c01ce4c767c25152 28-Jan-2014 Evan Charlton <evanc@google.com> Clean up some TODOs

Remove synchronized by migrating work to the main thread. Also make
callServices a Set because there's no reason it shouldn't be.

Change-Id: Ief49f8d85ec3d82b78695d889a1d3784f7f7e952
rc/com/android/telecomm/CallServiceFinder.java
89a12c5f5729e380499671095d6ad4ea31041200 28-Jan-2014 Santos Cordon <santoscordon@google.com> Fix build break.

Change-Id: I370885ad176c78782aedb5cf4f8ee0d821d17028
ests/src/com/android/telecomm/testcallservice/TestCallService.java
caf7f2b218639784ef62ac86db3ab90012d775e2 28-Jan-2014 Santos Cordon <santoscordon@google.com> Merge "Adding an audio beep for the test call service." into master-nova-dev
1fee14185187b93bb625ab09a922a8a2cae9cf61 28-Jan-2014 Santos Cordon <santoscordon@google.com> Merge "Update test call service to use new CallInfo parameters." into master-nova-dev
ee99d321182ca64878061f5b7646a08cdfd8c931 27-Jan-2014 Santos Cordon <santoscordon@google.com> Adding an audio beep for the test call service.

Change-Id: I5faf4b27a818dfec57e41c2ffad19e8ac2d15d53
ests/res/raw/beep_boop.ogg
ests/src/com/android/telecomm/testcallservice/TestCallService.java
e4a8e703446df8c469c22b37003313ffd29d9ffe 17-Jan-2014 Santos Cordon <santoscordon@google.com> Update test call service to use new CallInfo parameters.

Change-Id: Iba2a7b2ed4e99b7c21c8d0ab2c685b2211bd2bdb
ests/src/com/android/telecomm/testcallservice/TestCallService.java
ee784fbd6bb0b146b0e800ebefdd26746bb4047b 17-Jan-2014 Ben Gilad <gilad@google.com> Merge "Add a TODO for handling the returned set of call-service selectors from the finder." into master-nova-dev
134cf09661f4c8dfce69e88fb2ed354e46e5257e 17-Jan-2014 Ben Gilad <gilad@google.com> Add a TODO for handling the returned set of call-service selectors from the finder.

Change-Id: I588c4c4c4324cbee8b20ed5a10428e1a8f475649
rc/com/android/telecomm/Switchboard.java
88cde800697069c0ebae306199f2daa561e7fa73 17-Jan-2014 Ben Gilad <gilad@google.com> Merge "Convert the lists of call-services/selectors in switchboard to sets and pass the set of selectors from the finder." into master-nova-dev
03292d40a7ceb6da06d48fbff0608456b3c3b736 17-Jan-2014 Ben Gilad <gilad@google.com> Convert the lists of call-services/selectors in switchboard to sets and pass the set of selectors from the finder.

Change-Id: I649cc20fd4fb25745ae1069db342ae6ee50b2ae2
rc/com/android/telecomm/CallServiceFinder.java
rc/com/android/telecomm/CallServiceSelectorFinder.java
rc/com/android/telecomm/Switchboard.java
7bbcfe633498337f69e577727af9db7bf330983b 16-Jan-2014 Santos Cordon <santoscordon@google.com> Merge "Adding simple implementation of CallService for testing." into master-nova-dev
9d97146743c81cbd2c2da9f15e21e41050dacc0f 15-Jan-2014 Santos Cordon <santoscordon@google.com> Adding simple implementation of CallService for testing.

Updates some methods of the CallService API and adds very simple
implementations for isCompatibleWith(), call(), and disconnect().

TestCallServiceProvider now returns a single-item list including the single
ICallService implementation

depends on change: I27a8d14c5c63d3f6a70a290ffb39d9f623d40a60

Change-Id: I9b86c2a09c6c8e6d0ee306e5e26b2404fa60376d
rc/com/android/telecomm/CallServiceFinder.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
ests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
b59769eac719ad7833175e6e65ef0a7f817287dd 16-Jan-2014 Ben Gilad <gilad@google.com> Adding the lookup logic for call-service selectors.

Change-Id: If18628f9b4854b8055ec43d8e33c0c6f822454cd
rc/com/android/telecomm/CallServiceFinder.java
rc/com/android/telecomm/CallServiceSelectorFinder.java
rc/com/android/telecomm/Switchboard.java
80ddb5def36062ee9427f69f935fa0d19b4c2d21 15-Jan-2014 Ben Gilad <gilad@google.com> Follow up on the CallServiceFinder TODO to join/remove the inner classes.

Change-Id: I0b01b344657190d9504508c490c14d39eb85d63f
rc/com/android/telecomm/CallServiceFinder.java
0958f53ac4644a2723f2e0c713186dd6de0612b6 11-Jan-2014 Evan Charlton <evanc@google.com> Remove the synchronization

All of the callbacks happen on the same thread; no need to
synchronize. Also move away from TimerTask and use Handler to post
the termination callback.

Change-Id: If684e29686f2c7557cc56057c7f1ec6a1dfd3bcb
ndroidManifest.xml
rc/com/android/telecomm/CallServiceFinder.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/ThreadUtil.java
1803a839c9a0eeb5a92bb7c8edce2f78f0ce6861 14-Jan-2014 Ben Gilad <gilad@google.com> Remove JavaDoc comments for TAG constants per team preference.

Change-Id: I620679bab6dd461735029f619502cd1e25de6e4e
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallServiceFinder.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/TelecommReceiver.java
c861dadba53a6b7c12be58bd5acebd42227884a2 14-Jan-2014 Santos Cordon <santoscordon@google.com> Merge "Collect CallService implementations via CallServiceProviderAdapter." into master-nova-dev
cb83fb6358a10a4403a03b7ba0f3efb0b90ba97f 06-Jan-2014 Santos Cordon <santoscordon@google.com> Collect CallService implementations via CallServiceProviderAdapter.

Add an implementation of ICallServiceProviderAdapter which can receive
ICallService instances from CallServiceProviders.

Change-Id: Ie3667a82de5c8b6d47b4e436869e5213e4da09a0
rc/com/android/telecomm/CallServiceFinder.java
ests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
2def71e6fdc9c7bbf003d58acc9ce8fe7c5d469e 13-Jan-2014 Evan Charlton <evanc@google.com> Add guava to the build

This should have been in I2ab040302c10872d847f96369a99f52e1208d644 to
allow easy building in eclipse.

Change-Id: I135dc074e787e0ad89859166f3a6b77fdaa37258
ibs/guava.jar
2495d57b5b91f3a39529d8844a49d1be5f18b137 10-Jan-2014 Ben Gilad <gilad@google.com> Adding the Call class (JavaDoc) description.

Change-Id: If0091135df5cfbf6396ddc20207d039e395cbf58
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/Switchboard.java
0407fb2c5a8358cfae92bbd6f8cdc103d66c7b13 10-Jan-2014 Ben Gilad <gilad@google.com> Continuing the outgoing call flow -- passing call services from the finder back to the switchboard.

Change-Id: I613e8e77af02b645c7bffc6661c5b3c3e07278dc
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallServiceFinder.java
rc/com/android/telecomm/Switchboard.java
d17443c4ed456c84facdc3d131b3143cd70a8b9e 06-Jan-2014 Ben Gilad <gilad@google.com> Follow up on c/401744.

Change-Id: I53bdfae84532c9f382d3ebfa8ab7c993898725b7
rc/com/android/telecomm/CallServiceFinder.java
rc/com/android/telecomm/CallServiceProviderProxy.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/Switchboard.java
f57ecf76531aabacbb9de1d8036a2e5ea42c072d 04-Jan-2014 Santos Cordon <santoscordon@google.com> Merge "Adding telecom test directory." into master-nova-dev
76faae5274016bb75324beb0463b7e0a74d22510 13-Dec-2013 Santos Cordon <santoscordon@google.com> Adding telecom test directory.

Adds a notification-based test CallService + first do-nothing unit-test.

Change-Id: Ifa2725da44305024adced42154d6b458767bd5d0
ests/Android.mk
ests/AndroidManifest.xml
ests/res/values/donottranslate_strings.xml
ests/src/com/android/telecomm/testcallservice/CallNotificationReceiver.java
ests/src/com/android/telecomm/testcallservice/CallServiceNotifier.java
ests/src/com/android/telecomm/testcallservice/TestCallActivity.java
ests/src/com/android/telecomm/testcallservice/TestCallService.java
ests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
ests/src/com/android/telecomm/tests/unit/ExampleTest.java
ac1aa9e10831cedc5e8d7af97f19e4cc046b7f19 03-Jan-2014 Evan Charlton <evanc@google.com> Allow Telecomm to be imported into Eclipse

Add .project and .classpath files so that Telecomm can be imported
into Eclipse as a standalone project. Once the android.telecomm APIs
become part of the SDK, we can remove the frameworks-base-telecomm
symlink.

Change-Id: I2ab040302c10872d847f96369a99f52e1208d644
classpath
project
rameworks-base-telecomm
rc/com/android/telecomm/Switchboard.java
8e8b8d2a66dc79e9815f5c5b01c76d834d378db9 19-Dec-2013 Santos Cordon <santoscordon@google.com> Find ICallServiceProviders on the device.

Uses package manager to find all ICallServiceProviders registered on the
system. This CL does not do the work of actually binding to the
providers.

Change-Id: I63cb3f73727e49542c09edf021fe010adf8ce90f
ndroidManifest.xml
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallServiceFinder.java
rc/com/android/telecomm/CallServiceProviderProxy.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/Switchboard.java
dd8c60896b4256023d4a0758805fc83f2f4d9635 30-Dec-2013 Ben Gilad <gilad@google.com> Basic wiring to hook up the call activity logic with calls manager.

Change-Id: I3bbd1401b933b353578d66168ce1bdf914b6f762
rc/com/android/telecomm/CallActivity.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/DialerAdapter.java
rc/com/android/telecomm/TelecommReceiver.java
f5a56c903f68cf9b65da2f157d8c649b6779ee53 19-Dec-2013 Evan Charlton <evanc@google.com> Fix the build

There was an extra + in there; remove it.

Change-Id: I81b498da437bdb5dfdda972ad5a64b549a1b7afb
rc/com/android/telecomm/TelecommReceiver.java
7ff3e09b9bdc2c77cb8d19fafe524d7ebb09f0c3 17-Dec-2013 Santos Cordon <santoscordon@google.com> Adding CallServiceReceiver for Call service binding intents.

CallServiceReceiver listens to an intent intended to be used by
CallService implementation to request that CallsManager create a binding
to the CallService.

Change-Id: I8afcb0c1010409263eac3ee7504045d9d95ed53b
3e3b541d72e1ecf1ff9b6a5f92c7b2bc6aefb868 17-Dec-2013 Santos Cordon <santoscordon@google.com> Adding CallServiceReceiver for Call service binding intents.

CallServiceReceiver listens to an intent intended to be used by
CallService implementation to request that CallsManager create a binding
to the CallService.

Change-Id: I8afcb0c1010409263eac3ee7504045d9d95ed53b
ndroidManifest.xml
rc/com/android/telecomm/TelecommReceiver.java
10e68320fe1dc8270601c442cf47fdb94edc151d 13-Dec-2013 Santos Cordon <santoscordon@google.com> Add CALL* intent handling to Telecomm.

Adds a new activity to handle CALL, CALL_PRIVILEGED and CALL_EMERGENCY
withing Telecomm. Shows a toast upon receipt of intent.

Change-Id: Ia9ea7b0abd47d0f423c04ddbaa04452c31ca2318
ndroidManifest.xml
es/drawable-hdpi/ic_launcher_sip_call.png
es/drawable-mdpi/ic_launcher_sip_call.png
es/drawable-xhdpi/ic_launcher_sip_call.png
rc/com/android/telecomm/CallActivity.java
9f2bed31374a56487f370be01224baf6ce97e8ad 13-Dec-2013 Ben Gilad <gilad@google.com> Adding the basic Telecomm flow components.

Change-Id: I1044d42ba4e05e03a88e858ef0357c2cc788393f
rc/com/android/telecomm/Call.java
rc/com/android/telecomm/CallLogManager.java
rc/com/android/telecomm/CallService.java
rc/com/android/telecomm/CallServiceAdapter.java
rc/com/android/telecomm/CallsManager.java
rc/com/android/telecomm/ContactInfo.java
rc/com/android/telecomm/DialerAdapter.java
rc/com/android/telecomm/InCallAdapter.java
rc/com/android/telecomm/IncomingCallFilter.java
rc/com/android/telecomm/OutgoingCallFilter.java
rc/com/android/telecomm/Switchboard.java
rc/com/android/telecomm/VoicemailManager.java
rc/com/android/telecomm/exceptions/CallServiceUnavailableException.java
rc/com/android/telecomm/exceptions/NoCompatibleCallServiceException.java
rc/com/android/telecomm/exceptions/OutgoingCallException.java
rc/com/android/telecomm/exceptions/RestrictedCallException.java
4937ff92340ace455d8734744ba7479882d1e03b 12-Dec-2013 Ben Gilad <gilad@google.com> Adding the Telecomm manifest etc.

Change-Id: I0893805adbd9a4e74e9d224be3a9935da97bfc06
ndroid.mk
ndroidManifest.xml
es/mipmap-hdpi/ic_launcher_phone.png
es/mipmap-mdpi/ic_launcher_phone.png
es/mipmap-xhdpi/ic_launcher_phone.png
es/mipmap-xxhdpi/ic_launcher_phone.png
es/mipmap-xxxhdpi/ic_launcher_phone.png
es/values/strings.xml
a38b18a8fae7ab5f9eee69fde4ef4d2e39179a02 12-Dec-2013 Ben Gilad <gilad@google.com> Initial packages/services/Telecomm check in.

Change-Id: I6cd22c0f138417f658589bf9f01ab4ac688f2e04
rc/com/android/telecomm/README
0803e726fd7ccb556f32c78de97c67544768adc5 11-Dec-2013 Baligh Uddin <baligh@google.com> Initial empty repository