GitLab

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

am: 09481a16

* commit '09481a16':
  Revert "Ensure sim contacts import screen supports rotation."

This reverts commit 03ff4664.

Bug: 25489006
Bug: 22753438
Change-Id: Ie14cf1332f6e9141bb679406ed0952c37c727d65

am: 831ff856  -s ours

* commit '831ff856':
  Import translations. DO NOT MERGE

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

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

am: 06f2ca39

* commit '06f2ca39':
  Ensure connection extras are propagated on start of call.

When a new call is created in Telephony, there is a potential for the
connection extras to not be passed up through to Telecom if the RIL
does not call the onExtrasChanged callback.  If the connections were set
on the original connection but never changed, then it is conceivable that
we may never see an onExtrasChanged callback and hence never propagate
the extras up.

Bug: 24585039
Change-Id: Ic1da1998a25afb6d380fda81bba591846a02dda7

am: 2388cfda  -s ours

* commit '2388cfda':
  Import translations. DO NOT MERGE

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

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

am: 0d9e7eba  -s ours

* commit '0d9e7eba':
  Import translations. DO NOT MERGE

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

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

am: 049b3bbb  -s ours

* commit '049b3bbb':
  Import translations. DO NOT MERGE

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

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

1) Add an early return to disallow disconnected unknown connections.
2) Move code in run updateState() after uses of mOriginalConnection
   since it is possible for updateState() to set it to null.
3) Add logging to the bug so that we can recognize when and how this
   situation happens in the wild.

Bug: 24469962
Change-Id: Ic7c986bff98ee65677a4a2cb06beff54d79e5ab6

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

Merge "Set network type to ro.telephony.default_network if hiding preferred network type" into mnc-dr-dev

Since pref is being hidden from user, set network mode to default
in case it is currently something else. That is possible if user
changed the setting while roaming and is now back to home network.

Bug: 25012603
Change-Id: I2bdf92a3c62a2d2e995f74285a77b33be70cd82f

When a SIP call is in dialing state, it cannot be held. Hence ignore
switching of fg/bg calls when there are multiple calls and the
foreground call is still in dialing state. This would prevent the user
from unholding the background call and hitting a crash when we try to
switch out the foreground dialing call.

BUG: 17448699
Change-Id: I816d3c3f0253811f1ae4e7aeaa138a830d0c4d25

Our code relied on the state of SipConnection to prevent us from holding
a HELD call and unholding an ACTIVE call.  However, while the action is
in progress, the SipConnection state can be slightly delayed so we
double-check the internal state of the lower connection prior to issuing
a switchHoldingAndActive command.

Bug: 24007856
Change-Id: I617ef215e66f6b9324dc17cb1b9832cc35390f17

Fixing a security vulneraibility in SIP Boradcast Receiver from an
externally provided patch.

BUG: 22538035
Change-Id: Idcb559a21abe395faa87d1f9a28175f4c0889130
(cherry picked from commit 92046786)

This is a clean cherry-pick; already submitted to master.

Bug: 22251420
Change-Id: Ia6b9c60543596e73ae887cb0b0754ef39ee87132

- Removed the portrait lock from manifest for sim contacts import.

Bug: 22753438
Change-Id: I0c755ce8c77e910450d31f665ae22353d1b83cdf

Disconnect the children of conference call before
ending the conferece call itself.

Bug: 24677801
Change-Id: Ia168360926b87a2482c607b6fe7c314faae9c184

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

If user connects CMCC roaming network with CMHK SIM,
user should be able to select TDSCDMA mode.

Bug: 24382870
Change-Id: I5d3628b4c6afea277720b31d00c6ed9d02f676bc

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

Needed for hot swap between TDSCDMA and non-TDSCDMA SIMs.

Bug: 24239947
Change-Id: Iaf39cdf52f09280cfbda349f1ed762d887d16ef4

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

Bug: 24116804
Change-Id: Ib64e3a7917e5199b8f0a095b39127666c17e6385

Bug: 23862319
Change-Id: I41b3d0bd06316102af857e21a428269bc2f8059b