GitLab

am e2840825: am 1904f9d4: am aa1b0618: am b7710d07: resolved conflicts for 70dd1f77 to lmp-sprout-dev

* commit 'e2840825':
  Fix NOT_RESTRICTED network capability and enforce it.

* commit '1904f9d4':
  Fix NOT_RESTRICTED network capability and enforce it.

* commit 'aa1b0618':
  Fix NOT_RESTRICTED network capability and enforce it.

* commit 'b7710d07':
  Fix NOT_RESTRICTED network capability and enforce it.

Change-Id: I6998f13b2c3b76315c285e85f3ae485f83e418d0

Call updateMediaCapabilities() from ImsPhoneConnection.update().
This code was accidentally deleted in d9c3a08d.

Bug: 24256715
Change-Id: I65e8c39b00e3cfd9cc3bde3d7dddaba7953eb562

Some pings and infrastructure events were getting defered in
emergency mode.  This led to hung processes.

bug:24097705
Change-Id: I5415ae69bcf17a293d5af9ae093d7346b1dc076f

WRITE_SMS app op is explicitly granted to some system components
like bluetooh, phone, mms service. It is however no granted to the
telephony provider. The latter is the one storing the SMS data and
should always have the app op enabled. Content providers perform
proxy app op updates (taking a note they perform an operation on
behalf of another app) which requires the proxy package, the provider,
to have the app op allowed.

bug:23017449

Change-Id: Ic0c6865a616b6f3997a64d390699e9fd86c4ae2e

This RIL command requires the radio restart network selection.
It's poorly named in that regard.  Check if we're already in
automatic mode before pushing automatic down again.

bug:23678158
Change-Id: I47301218279ef20c8db5e9c41c62d011b6a60820

If the SIM is removed, phoneId returned by subscription controller
based on subId is MAX_INT leading to a crash.

Bug: 23315629
Change-Id: I8809cfaaeb6ff78b1e24915e350329b8133d99e9

Fixes a handful of issues.  PendingRequests were getting touched on
random threads, so moved to handler thread.  Release could get
confused by state changes, so made it depend only on state set
during the request (if it's in the pending list, remove it, if it's
on the request list, release it).

bug:23080486
Change-Id: I62d3e279a34f3f3eac122842faa2abc8cb52b54c

With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit af171aa4)

Bug: 23531109
Change-Id: I3918eec522516d6c51fe344dbfa57c107ac5b74e

The SPN information came too early before the subscription
id is valid hence the SPN info was ignored by MobileSignalController.
We need to send the SPN update intent again after subscription info
is valid.

bug: 23366812
Change-Id: I11ab185d2ffbd34a8d0f3d4096179aee13138f3f

Bug: 22907228
Change-Id: I8a9926f5374ad4dc15c993dcfcc039852acdfb0f

We had code in DcTracker to deal with this but the MR1-originating
DcSwitchStateMachine interceeds.  Exposing the switch so
DSSM can access it and behave appropriately.

bug:23069223
Change-Id: I7a674d3b662aa0a7eec5a54889a784a2b64d662c

ServiceStateTracker.getAllCellInfo may return null, but
PhoneBase.privatizeCellInfoList may dereference that.  Check
for null rather than crash the phone.

bug:23201508
Change-Id: I26fcfc015fa1a8d1ec13e34f3369d1848954c44e

TelephonyManager.listen() registrants will
no longer receive any events via PhoneStateListener
from LISTEN_DATA_CONNECTION_REAL_TIME_INFO.

bug: 22414044
bug: 23182647

Change-Id: If0ad88125a1e1334a3ebc86c9b03d89af6c3943c

resolveService() is allowed to return null, so check the return value
before using it.

Bug: 23041089
Change-Id: I75af183d551770048fa925676b9adfbd078e22ba

Bug: b/22982966
Change-Id: I4ea1fe67f8554ed9ba9d76faab8883d147f9b4f3

Bug: b/23187758
Change-Id: Ie60893290665f0dc670571c6eccc07040cee1e37

Root cause: App(telephony service) would check voice and data reg state to make MO call.
if both voice and data is out of service, Telephony service will block the call and pop
up a dialogfor user. FW only check voice reg state without data. When user make a MO
call while data in service, there is no failed notification at Telephony service layer
while the call is rejected by FW layer.

Bug: 23037591
Change-Id: I9762843326d71b801fa1a40b9832bcaea7fb7009

The operator name was incorrectly overwritten when roaming
on partner's LTE network. In that case, ERI roaming indicator
is off, NID/SID is zero (because LTE does not support ERI/NID/SID).

The original requirement for using the name from CSIM EF_SPN
is for CDMA only (b/5008969), therefore we need to make sure the
logic is not applied in the LTE case.

bug: 22951507
Change-Id: I3595228e1a637f4bfd05e34cf9a702bb0e1bba59

Some carriers require different APNs based upon
the roaming state returned in a previous registration
call.  The carrier config has the option to override
roaming state.  This change saves the proper roaming
state before the carrier config may override in order
to select the proper APN when setting up a data connection.

bug: 22990977
Change-Id: Id22a60efcbea9637018cc47e6d97f68eb053deb0

If APM is turned on while service state is OUT_OF_SERVICE and right when
polling for VOICE_REGISTRATION_STATE is being handled, the service state
change to APM is not notified to the registrants. Fix this by setting
service state before flags for change in state are evaluated

Bug: 22960426
Change-Id: I781344afe13120bc0fb8e6889c46b80f8a672db1

State will be entered on making emergency call, and ended either on
emergency call end or emergency callback mode end if that is supported.
This is only for CDMA.

Bug: 22777920
Change-Id: I9cac544966b1b6be5410a40273d20e52cab8b396