GitLab

* commit '70b1f88b':
  [USSD] Consolidate USSD messages in a single dialog box

All USSD messages (interactive or non-interactive) will be displayed
in a single dialog-box with a separator in between messages.

Bug: 12892053

Change-Id: I31bc0cd4b55492e4e62adc8c925cc0371c54f5a8

* commit '08a5e780':
  Fixed actionbar call settings styles. DO NOT MERGE

Modified call settings styles to ensure actionbar coloring is consistent with the Dialer app. This required copying over some shared style information and icons from the Dialer.

Bug: 13364992
Change-Id: Ia64eb46cd9a224773a744d9a719cfcf94cc59d4c
(cherry picked from commit 70af2704)

* commit 'bf5c887f':
  Rewording comments around ACTION_NEW_OUTGOING_CALL

am 6e06e30b: Modified PhoneUtils.java to move call to setGatewayInfoForConnection inside a code block that appropriately checks for null, as required. b/12210645

* commit '6e06e30b':
  Modified PhoneUtils.java to move call to setGatewayInfoForConnection inside a code block that appropriately checks for null, as required. b/12210645

bug: 12175514

Change-Id: Icf4f6db466800bb4149e29c7c39c8e2c8852e8d1
(cherry picked from commit c65769e2)

Modified PhoneUtils.java to move call to setGatewayInfoForConnection inside a code block that appropriately checks for null, as required.
b/12210645

Change-Id: I3108872c7e5081a9e5c9e4b202577218871488a9
(cherry picked from commit 10f1c6a9)

* commit 'aca8066b':
  Call UI not showing for MO/MT call till pwr cycle

* commit 'b2bf8527':
  Don't display gateway number on bluetooth

* commit '1c09481b':
  NPE in BluetoothPhoneService.java when switch users.

Display actual contact phone number instead of the Google voice
gateway number when there is a bluetooth connection with eg a car display.

Bug:11881222
Change-Id: I1a5b9d3dee4a490905e6e4b52745972fd63d81a1
(cherry picked from commit 21a7534f)

The device is staying in an  error state - neither MO nor MT calling UI can be shown until the device is power cycled.
[Root Cause]
 CallHandlerServiceProxy is requesting to binding service of InCallUI to launch Calling sreen.
 At the same time, the InCallUI process is killed by system so that the binding request is ignored/lost.
 CallHandlerServiceProxy keeps waiting for the service to connect but it will never come. Thus the Calling UI will never be showed until the device powers cycle.
[Resolution]
 Rebind the service if CallHandlerServiceProxy does not get service connected in 2 seconds.

bug:12078305

Change-Id: I7d6ce69379ec187abccadcf823a99549097fa0f5

The null pointer is the mBluetoothHeadset is reset to NULL
when the  the headset profile is disconnected during user switch.
The fix should be  to check the null pointer before access mBluetoothHeadset
also fix all the potential NPE problems not just this one happened.

bug:11804919
Change-Id: I2acd0092179fa07293f9fcc4c9b65f1c3343a37c
(cherry picked from commit b19f55ba)

* commit '25dd9480':
  Import translations. DO NOT MERGE

Change-Id: I5d669c85e032fe36b051b7e8da2d5baa92338a37
Auto-generated-cl: translation import

* commit '79fc3b3b':
  Fix exported property on NotificationBroadcastReceiver.

"exported" property was missing "android:" prefix and as a result was
not being respected.

bug:11367588
Change-Id: I71b851c94306a2ac4b727a735de07103eb35b6e6
(cherry picked from commit 0c88ac2f)

* commit '7636a56d':
  Import translations. DO NOT MERGE

Change-Id: Ia6fe3d36d87224b4e163ca6fc276c237540825b6
Auto-generated-cl: translation import

* commit '55710b64':
  Import translations. DO NOT MERGE

Change-Id: I9b46bb2240b839786da3cfcffae1fdab87b2388b
Auto-generated-cl: translation import

* commit 'bd9a11d2':
  Import translations. DO NOT MERGE

Change-Id: Ie58983900366139de24873481ea91b8bde687942
Auto-generated-cl: translation import

* commit 'c2f96fae':
  Import translations. DO NOT MERGE

Change-Id: Ib0179c3de314a244f94cfa9ebed373e6dd308c3d
Auto-generated-cl: translation import

* commit 'bd917bd5':
  Add USSD code running dialog to TeleService

Add USSDDialogActivity, a special activity used to display
a progress dialog when running USSD codes

Bug: 11456498
Change-Id: I8318068eda9d1ca199c60592d9f16064cf4571b4

* commit 'ff05ae30':
  Remove orphaned Calls as part of doUpdate().

When a connection is no longer valid in telephony (for whatever reason),
we do not clear it from our list of Calls.  This results in the UI
becoming non-dismissable.

We do not expect this condition but have seen cases where connection
objects become orphaned (like when device switches technologies
GSM->CDMA and back).  See bug for more information.

Could not repro this case.  Did testing by simulating orphaned
connection objects and making sure the UI goes away.

bug:11580121
Change-Id: Iaa4264713bbab29545dff4b85d74d0879366b751

* commit 'a1203d38':
  Add SET_PREFERRED_APPLICATIONS permission to Telephony service

Telephony service makes calls into SmsApplication.java that now require
this permission to set the preferred SENDTO sms/mms app.

Bug:11482259 When default SMS app changes we need to update the default app for the SEND intent
Change-Id: I4d6bc4c3adf490a87bf8bd67de616c19505fd892

* commit '3a2daaba':
  Fix EmergencyCallHelper to always use the current phone object.

EmergencyCallHelper could use the wrong phone object when called
on an encrypted device while it's changing from GSM to CDMA mode.
Remove local mPhone field and call mCM.getDefaultPhone() to get
the current phone object before each call.

Bug: 11561165
Change-Id: Ie6a23d78050f2dffbf92761e3ca0ee283e4192e3

* commit '4b67a56b':
  Import translations. DO NOT MERGE