• Home
  • History
  • Annotate
  • only in /frameworks/base/telephony/java/
History log of /frameworks/base/telephony/java/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
cdec393aa31771319efd9c84df2a6b5864a638a7 09-Jun-2017 Chen Xu <fionaxu@google.com> Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
4efae6f244866f5d0d7fba5c9b62843d82d44456 09-Jun-2017 fionaxu <fionaxu@google.com> add an extra for rebroadcast of SIM_STATE_CHANGED

Bug: 62459330
Test: Manaual Test
Change-Id: I0e1c676d99a38273047a84d4467cff44dae7c5af
om/android/internal/telephony/TelephonyIntents.java
980582e555ec5acdf5b0c5905b0ff57d966027a9 08-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
02212db446bfcc622f843f386fcf43b750e796e9 05-Jun-2017 Tyler Gunn <tgunn@google.com> Add carrier config for allowing USSD requests via telephony manger APIs.

Test: Manual
Bug: 62293605
Change-Id: I713df20c7faffb16df6c74d5f62a7023a3e35439
ndroid/telephony/CarrierConfigManager.java
bfc4fcde9f756337fc8d0867ff04549b08688fff 06-Jun-2017 Jeff Sharkey <jsharkey@android.com> Give Doclava our manifest; more permission docs.

We've seen some @SystemApi methods protected with non-system
permissions, so give Doclava the platform AndroidManifest.xml so it
can parse the actual permission protection levels to look for APIs
that are letting in non-system apps.

Also document more @SystemApi permissions.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api
Bug: 62263906
Change-Id: Ie0f0a5fb0033817bcc95060f2183a52ae4ae7b06
ndroid/telephony/TelephonyManager.java
d86b8fea43ebb6e5c31691b44d8ceb0d8d3c9072 03-Jun-2017 Jeff Sharkey <jsharkey@android.com> Annotate @SystemApi with required permissions.

Most @SystemApi methods should be protected with system (or higher)
permissions, so annotate common methods with @RequiresPermission to
make automatic verification easier.

Verification is really only relevant when calling into system
services (where permissions checking can happen on the other side of
a Binder call), so annotate managers with the new @SystemService
annotation, which is now automatically documented.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api && make -j32 offline-sdk-docs
Bug: 62263906
Change-Id: I2554227202d84465676aa4ab0dd336b5c45fc651
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/SmsManager.java
ndroid/telephony/SubscriptionManager.java
ndroid/telephony/TelephonyManager.java
438559e18314847a0529d6839a6a5332a2d81b17 31-May-2017 Tyler Gunn <tgunn@google.com> Ensure null/empty phone number does not crash international number check.

Add empty/null check for isInternationalNumber.

Test: Added unit tests.
Bug: 62162029
Change-Id: I779a1f78cbbe11adeefeca7fc83cfc1cfa431c61
ndroid/telephony/PhoneNumberUtils.java
666a12f4231163e45aee53d6457eda818b17cb62 11-May-2017 Jayachandran C <jayachandranc@google.com> Add new reason code for IMS Call ended during conference merge process

Test: Following scenarios for VoLTE and CS call and
verified the cause sent in PreciseCallState.

1) Conference call merge
2) Conference call, one remote party ends the call
3) Conference call, all remote parties end the call
4) Conference call, hangup locally
5) Normal call and hangup locally
6) Normal call and remote party ends the call

Bug: 38225047
Change-Id: I36edb0cbff4b130b0942a46dc6c15a7d842789c2
om/android/ims/ImsReasonInfo.java
e1b49b76540c3c63878eb0d9bd875ac7069b22c3 06-May-2017 Brad Ebinger <breadley@google.com> Notify ImsService Status Correctly

Modifies ImsService to allow multiple status callbacks in
for one ImsFeature. This better handles one ImsFeature
for normal/emergency calling.

Bug: 38001858
Test: Unit Testing
Merged-In: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
Change-Id: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
ndroid/telephony/ims/ImsService.java
ndroid/telephony/ims/feature/ImsFeature.java
om/android/ims/internal/IImsServiceController.aidl
e44125cd3a5fc25306285bdfcacc00459e01307b 04-May-2017 Brad Ebinger <breadley@google.com> Merge "Better handle MSIM DDS changed event" into oc-dev
979bab9f5d8d1324d84da5e9de11d7109d343e59 18-Apr-2017 Brad Ebinger <breadley@google.com> Better handle MSIM DDS changed event

On DSDS MSIM devices, when Default Data Subscription event
is received, the ImsService may choose to switch which
Slot ID is active.

This change better handles that switch and removes a
crash that was happening due to
ImsServiceProxy#getFeatureStatus getting called
circularly.

Bug: 37361882
Test: Run Telephony unit tests
Merged-In: I55cac364221c728ad1c77be783c358e8d98ec2b4
Merged-In: I68cd04f288f2d7006a2c55cba3584fd74117a1b8
Change-Id: Iaa29bba25f82e699c96b951b3b110568163e12d8
ndroid/telephony/ims/ImsServiceProxy.java
ndroid/telephony/ims/feature/ImsFeature.java
598d24c55817cfbd00b6dafdf772334a7039fe3e 25-Apr-2017 Malcolm Chen <refuhoo@google.com> Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED,
ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX
from Intent class to SubscriptionManager class.

Bug: 37497166
Test: Manual
Change-Id: Ifeedf974328cd3d839d7f66bf41a91c479d66316
ndroid/telephony/SubscriptionManager.java
om/android/internal/telephony/TelephonyIntents.java
b71f3ca3f0e2d995467a861b3973c18b56933fe2 27-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "new reset carrier signals/actions" into oc-dev
982799eb08d50e9f95430ed06ca24041888cf4e9 27-Apr-2017 fionaxu <fionaxu@google.com> new reset carrier signals/actions

- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.

Bug: 34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
ndroid/telephony/CarrierConfigManager.java
om/android/internal/telephony/TelephonyIntents.java
a00c7c0a9983e30e4dcbc4f7ae847a26d9ea614f 26-Apr-2017 Jeff Sharkey <jsharkey@google.com> Merge "Fix some issues found by new doclava linter." into oc-dev
1c35554c5f8baf2af4552aab27619907b130d3b5 25-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add getVisualVoicemailSettings()" into oc-dev
0f3f60b576aedc78524d50da3dadada2201e63c2 25-Apr-2017 Jeff Sharkey <jsharkey@android.com> Fix some issues found by new doclava linter.

Add missing API annotations for permissions and SdkConstants, and
invoke doclava with new "-android" flag.

Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I970bb2655eb568fd25004636f134c794663a6c33
ndroid/telephony/TelephonyManager.java
3db7350d7d44138b6031c17241a0445ae2044c96 25-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev
1210f41f59a131b50e4d54f308e7d1acbe76cbea 18-Apr-2017 Ta-wei Yen <twyen@google.com> Add getVisualVoicemailSettings()

The voicemail client in telephony is moved to the system dialer
in O. Some user data such as the enabled status of VVM or the
voicemail PIN scrambled by the client need to be migrated to the
system dialer for it to function seamlessly.

This CL adds getVisualVoicemailSettings() to let the system dialer
retrieve a opaque bundle to migrate the user data. The system dialer
and telephony service should agreed upon the structure and content
of the bundle.

Bug: 34093562
Test: N/A - pending dialer side changes to be implemented.
Change-Id: Ib7da801ada95451e55e02eda520894aa41316f73
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
70a3e828aa6a436ed8a7cb51727959c450e0d426 20-Apr-2017 Ta-wei Yen <twyen@google.com> Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony

Bug: 35766990
Change-Id: Ife9df5baa9b511cd8e9c043cb92236b7697582c1
Fixes: 35766990
Test: CtsTelephonyTestCases VisualVoicemailServiceTest
ndroid/telephony/TelephonyManager.java
ndroid/telephony/VisualVoicemailService.java
ndroid/telephony/VisualVoicemailSmsFilterSettings.java
c2d54af521f84cba3d1651087680d885fde4e254 24-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update USSD API docs per API review comments." into oc-dev
0f332523b2edf3f1b5e935661b8b4400c76a71be 19-Apr-2017 Jordan Liu <jminjie@google.com> Use SubscriptionId instead of SubId

Rename the methods and arguments in ServiceStateTable to use
SubscriptionId instead of SubId.

Change-Id: I6f99da3bf533cab74f5ec81aac4f62e63d55378a
Fixes: 35766624
Test: Existing unit tests pass
ndroid/telephony/Telephony.java
7358ebeeddac446b100c36c6bb0ecabb6767fc6b 19-Apr-2017 Chen Xu <fionaxu@google.com> Merge "better defualt behaviour for msim" into oc-dev
efbc20fe2e4468b2f9f297b73337c6bcf4c8826e 19-Apr-2017 Pankaj Kanwar <pkanwar@google.com> Update USSD API docs per API review comments.

Expand docs on failure return codes.
@hide the success return code which is only used internally.
Expand docs on the UssdResponseCallback class to make them more clear
what the format of the USSD response is, and how it might be consumed.
Fixed broken java doc.

Test: Make docs, inspect docs.
Bug: 35766890
Change-Id: I7a3c26c436c60372116c5b43cb45c513f4276b8c
ndroid/telephony/TelephonyManager.java
0680962133f504b5ac48001a2977ac02959c7dde 18-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" into oc-dev
b9b75edb2d5042f95b008fe497db2707c18d0ece 01-Mar-2017 Jordan Liu <jminjie@google.com> Update api for ServiceStateProvider

ServiceStateProvider defines public constants in
Telephony.ServiceStateTable so update the api.

Test: flashed onto device locally
Bug: 33756364
Change-Id: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Merged-In: I62b6b8bcfdf909aa36e44441f8672f98f581f896
ndroid/telephony/Telephony.java
f5144f742af9530e6c290b581f9d95fa724cfdbc 14-Apr-2017 Nathan Harold <nharold@google.com> Update doc string for getForbiddenPlmns() to READ_PHONE_STATE

For whatever reason when I chose the permission for this API I
chose the internal READ_PRIVILEGED_PHONE_STATE. Updating this to
use the equivalent public permission (since this is a public API)
requires me to use READ_PHONE_STATE

Bug: 35261110
Test: docstring only change. Compilation
Merged-In: I3647271798b33040751905c13b20da727eacfd9b
Change-Id: I3647271798b33040751905c13b20da727eacfd9b
(cherry picked from commit 04908fcd1759b0818017cc3ebfedc7d9aa8eecc1)
ndroid/telephony/TelephonyManager.java
ad989b1711ebcc7b5c764284efe4170c6ca9d0b5 14-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev
664595f06d1c5c81ff7f1097874d128e23f5e560 06-Apr-2017 fionaxu <fionaxu@google.com> better defualt behaviour for msim

switch behaviour for the default case based on caller's context,
some API prefer defaultDataId while others prefer
defaultVoiceId/DefaultSmsId.

Bug: 36818721
Change-Id: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a
ndroid/telephony/TelephonyManager.java
cfe9e61ce4029da61b973f5b80fccafdde4c9cc3 13-Apr-2017 Shuo Qian <shuoq@google.com> ECBM SystemProperty cleanup

- Add getEmergencyCallbackMode() method in the TelephonyManager.java
to get the boolean value for ECBM callback mode from the phone through
ITelephony.aidl/java interface

- Use the added TelephonyManager Api to replace the 'get' of
PROPERTY_INECM_MODE system property in the framework/base

Change-Id: I83fbdeef5c0b43a8fc16ece044c9e191e9922bce
Test: manual
Bug: 30361624
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
682ce66309bd446cd3526ea2058334e0fb7edb46 13-Apr-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add p2 option in openLogicalChannel." into oc-dev
ebe860e5cc8c08885787a8fc1eae4c016b092685 04-Dec-2015 Ajay Nambi <anambi@codeaurora.org> Add p2 option in openLogicalChannel.

- Add support for iccOpenLogicalChannelWithP2.
- Needed to support OMAPI 3.0 defined
by SIM Alliance.
- Deprecate iccOpenLogicalChannel(String) API and
pass down an invalid p2 value to keep original behavior

Test: Basic telephony sanity
Bug: 27360148
Change-Id: I2ab6cfb7a54c451f32936df51b8298f35a6dc67f
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
509a311976e83d21eb0b69c3877c98aaaab5a88e 12-Apr-2017 Brad Ebinger <breadley@google.com> Merge "Move @SystemApi access to ImsService" into oc-dev
4e745fd4e9d22687b5acf06e6b1bcbdc44796081 11-Apr-2017 Nathan Harold <nharold@google.com> Merge "Deprecate TelephonyManager.getCellLocation()" into oc-dev
33dd867f86f0941192a7e09e994d910e874bcd0c 07-Apr-2017 Nathan Harold <nharold@google.com> Deprecate TelephonyManager.getCellLocation()

This API has been long-marked for deprecation. It has numerous problems:
-It does not support LTE
-It returns a limited subset of information
-It uses old (and poorly-chosen) sentinel values for fields that are
not provided.

Bug: 36076138
Test: compilation
Change-Id: I87004710e5d046d4534ad3a0a938540440b0e83b
(cherry picked from commit c12d6c5983a11ca989a85dd553d11c3583ff7aaf)
ndroid/telephony/TelephonyManager.java
9f63ac35364a676ac6a67e1fcd217482db13a77d 10-Apr-2017 Jack Yu <jackyu@google.com> Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED

This broadcast intent will no longer work for the apps
running in the background. Apps should use Connectivity
Manager to listen for network changes.

Test: Telephony sanity tests
bug: 37156634
Change-Id: I5297cc5a624857d3e11a6d5fdf9369ab99ce88d4
ndroid/telephony/TelephonyManager.java
98852767b32ccdd3f80385acf1855106bb83916c 07-Apr-2017 Ying Xu <yinxu@google.com> Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev
31fcda576f4302869b3140a77ee75a0a0d44bd75 07-Apr-2017 Chen Xu <fionaxu@google.com> Merge "remove deprecated API sendDialerCode" into oc-dev
7bb85871331f261f48ff5e6c91d9d84f9751c3a0 03-Apr-2017 Brad Ebinger <breadley@google.com> Move @SystemApi access to ImsService

Keeping a separate ImsServiceBase class for binding
is redundant. Moving @SystemApi access to ImsService
instead.

Test: Compile and Run
Change-Id: I95ed659efe1c74ccac321d1a9079f7c1b683c66b
ndroid/telephony/ims/ImsService.java
ndroid/telephony/ims/ImsServiceBase.java
90fee275779c0e772328b677d7dc5a4441590328 31-Mar-2017 fionaxu <fionaxu@google.com> move ACTION_SERVICE_STATE to system api

As per CDD: The "android.*" namespace for intent constants is reserved
for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_SERVICE_STATE intent is generally useful for system/oem
apps thus move to system api

Bug: 33679956
Test: Manual
Change-Id: Ie38b53f077e8a013351d35387f9133e0ebb26cc9
om/android/internal/telephony/TelephonyIntents.java
d6099178f121544581579408c6d3bca38d726ae6 04-Apr-2017 Ta-wei Yen <twyen@google.com> Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled

The visual voicemail client is removed from telephony service. There
are no longer code to handle these methods. These methods are only
used by dialer during NMR1.

Bug: 36173451
Fixes: 36173451

Test: smoke test dialer visual voicemail operations.
Change-Id: I82a35026821b4c4d98420e5bfcecff78b2163822
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
37bbb789af3dee5ae26e0dea1c43c6af41e9397f 04-Apr-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev
2c7ea1bbe5e5285a95cee14d5c22aae6d5df5e24 14-Mar-2017 yinxu <yinxu@google.com> Add a carrier option to hide the option of "Enhanced 4G LTE Mode"

The option "Enhanced 4G LTE Mode" currently may be hidden according to
the VoLTE state of the plateform and device. With this new option we can
choose to hide the "Enhanced 4G LTE Mode" irrespective of VoLTE state.

Bug: 36220377
Test: manual
Change-Id: I516ad050e623a368f2c2ef3d81650eb20c20fd5b
(cherry picked from commit 0bf350c9c9199b78c611cfca62ffef3ad1ea0564)
ndroid/telephony/CarrierConfigManager.java
9077faab1fa6d8ecfc6da8e283388d7a3468ddfa 04-Apr-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Make some intents public in SubscriptionManager." into oc-dev
95941f7c977148207bddf01f319080036d81fdc8 29-Mar-2017 pkanwar <pkanwar@google.com> Address API concerns for isConcurrentVoiceAndDataAllowed and
OnReceiveUssdResponseCallback.

Bug: 35766890
Test: Existing tests.
Change-Id: I1ddbdadafa2611edb0ecfce53d5cf32434e5236c
(cherry picked from commit 89731a8389c9726172989f1677b76cc0f6a96f4f)
ndroid/telephony/TelephonyManager.java
2c1a49f933bf07b9262ea3b452ce517f2a70aee3 31-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Make some intents public in SubscriptionManager.

+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1
ndroid/telephony/SubscriptionManager.java
om/android/internal/telephony/TelephonyIntents.java
0c1651f2899ae3d13db005315ed3709f56ab3db3 31-Mar-2017 Chad Brubaker <cbrubaker@google.com> Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS

Bug: 35853790
Test: make -j128 checkbuild
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermission2TestCases
Change-Id: I11d374cbbb6c2deaf74ac784ff995bd182fe9157
ndroid/telephony/TelephonyManager.java
cf828f2e1194135f17567165fc4e04a053b6f5e3 23-Mar-2017 fionaxu <fionaxu@google.com> remove deprecated API sendDialerCode

Bug: 35767402
Test: run cts -m CtsPermissionTestCases -t
android.permission.cts.TelephonyManagerPermissionTest

Change-Id: I738cb5680e598ff84ad09f9c2d1cb18b01ad7d06
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
d1d3cdcd4fbadba72bb02552e5f94ccb379874d4 30-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Disable voice call barring notification for Verizon." into oc-dev
db688bbad7b13dd4c1438e0370694e624972c4bd 29-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Disable voice call barring notification for Verizon.

Test: Manual
Bug: 31490566
Change-Id: I2cb9f9b08f54faa276ddef9df36725aa76337746
ndroid/telephony/CarrierConfigManager.java
13dbbaf50a32b278c660720128d280d3700ae351 30-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update injectSmsPdu documentation." into oc-dev
23c5a5e9667f2d6791d2a2db14d1c60357bbc073 24-Mar-2017 Robert Greenwalt <rgreenwalt@google.com> Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS

The name is not allowed for an internal, non-public
intent. Changed to use com.android.internal.* namespace.

bug:35266833
Test: Ran cts.IntentTest.shouldNotFindUnexpectedIntents
Change-Id: Ifd7d7f0aa537bfbbc7d67aa3b73b0887acd6104a
om/android/internal/telephony/TelephonyIntents.java
bc1a6e60c8c0555d47bcf8424af63665c8db062e 29-Mar-2017 Abhijith Shastry <ashastry@google.com> Update injectSmsPdu documentation.

BUG: 35325136
Test: Comment only update.
Change-Id: I4ff38665a06de5e989e15e17aaac5f512da4303e
ndroid/telephony/SmsManager.java
0dc3b9104b0e3d9a86cc786acefa45475acfae16 16-Mar-2017 Jack Yu <jackyu@google.com> Deprecated getDeviceId and added getMeid and getImei

Added two new public APIs getMeid and getImei. Deprecated the exisintg
getDeviceId API because it can't return a constant id when phone type
changes.

Test: CTS and manual
bug: 34233620, 10831289

Change-Id: Iad4c05d2fd2efc538214f466861497c973882dfe
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
f7368e05b4705da20ed3d8f79d4fc0a3b3c07374 23-Mar-2017 Jeff Davidson <jpd@google.com> Merge "Move IccUtils to reflect Java package declaration."
388eab414779124f9b07837a2a9d5e4c6c1c068c 07-Mar-2017 fionaxu <fionaxu@google.com> sendDialerCode API review

1. address the feeback from API review:
throw exception rather than a boolean return
throw Security exception for permission denial and non-default dailer app.
throw invalidStateException if telephonyServie unavaialble.
2. sendDialerCode API will only check permission and package match without
enforcing the format of secret code(*#*# CODE #*#*) as throwing an unchecked
exception for wrong bad format seems to be an overkill regarding the API usage.
Dialer calls this API for each keyboard press to check format and send the intent
altogether which is no longer appropriate if we plan to return void and will
reduce frquent API calls.
3. allow callers with carrier privilege
4. not require MODIFY_PHONE_STATE as third party dialer apps won't be
granted
5. TODO mark android.provider.Telephony.SECRET_CODE to be protected
after calling apps move to this API.

Bug:35767402
Test: Manual
Change-Id: I8287aa93f2f79d356935a48cf808705d9b49984b
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
980231f3170b3103593445d7b27359632e4db2ee 21-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis."
7e4602519977b6bb9c41afc91a44ca782e716e40 11-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Change 'idx' to 'index' in SubscriptionManager & TelephonyManager apis.

Bug: 35767068
Test: No build failure.
Change-Id: I3b15901ff18742b5e99f03e74a6412d352461458
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/SubscriptionManager.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ISub.aidl
om/android/internal/telephony/ITelephony.aidl
e3070ede55652bb00618eadfac9daee64320569f 18-Mar-2017 Jack Yu <jackyu@google.com> Added ETWS primary message default message support

ETWS primary message does not contain messagy body. We used
to use hardcoded "ETWS" as the body, which is not easy for
end users to understand what happened. Added the built-in
default messages provided by Japanese government guideline
for earthquake, Tsunami, test, and other channels support to
enhance the user experience.

Test: manual
bug: 33595007
Change-Id: I53659298d8ce3b3ba5c751c14c1b36e76d6dc562
om/android/internal/telephony/gsm/GsmSmsCbMessage.java
b8ce44443cdf1d9647bde1b85b9fa7a76087e6f6 21-Mar-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Updated javadocs for sendUssd APIs."
46d7fbed6b6017cd727e664da711b5b4a8e03ccf 21-Mar-2017 Jeff Davidson <jpd@google.com> Move IccUtils to reflect Java package declaration.

This class was in com/android/internal/telephony but declared itself
in com.android.internal.telephony.uicc. Mismatches here make IDEs
unhappy when resolving imports, and only the latter is used in
compilation, so consolidate on the latter.

Test: N/A (will rely on TreeHugger)
Change-Id: I598341bacbd70947b6e2789b2e543879cd41a4c9
om/android/internal/telephony/IccUtils.java
om/android/internal/telephony/uicc/IccUtils.java
67819e0ae7cb4401fef4b6181be4a5666917d912 20-Mar-2017 pkanwar <pkanwar@google.com> Updated javadocs for sendUssd APIs.

Bug: 35766546
Change-Id: I40f0addc15331184b3409b3d1b5c9dc1455d8b5b
Test: manual
ndroid/telephony/TelephonyManager.java
66dc7be9e69158e44bd933d9dc6eedded67cea3d 20-Mar-2017 Narayan Kamath <narayan@google.com> Merge "TelephonyManager: Avoid unnecessary object allocation." am: 5d3f14fe02 am: 088df2bd0a
am: 20fa635f7b

Change-Id: I1008a22a437b46d4830ef89189d43db0e3d07c45
088df2bd0afe17f3f33e3c89a7bff0d114bdaf7c 20-Mar-2017 Narayan Kamath <narayan@google.com> Merge "TelephonyManager: Avoid unnecessary object allocation."
am: 5d3f14fe02

Change-Id: If425a64fe7820579045dfa40b356792f24d0de43
5d3f14fe02a3eaf668a6f9e1726e0e4c05a5b1ae 20-Mar-2017 Narayan Kamath <narayan@google.com> Merge "TelephonyManager: Avoid unnecessary object allocation."
e7cd3455377806ea77e2087cbc562a1ae3e54458 17-Mar-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Add new precise call fail causes and OEM causes" am: 9aa841d254 am: 4992b1533e
am: a7c4fdbf03

Change-Id: Iea9ee9c4a407638dfa19669b25d0c1534978d4a6
4992b1533e4a779e3ce47daa8f70a721f198113c 17-Mar-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Add new precise call fail causes and OEM causes"
am: 9aa841d254

Change-Id: I2b52c9c332fc73a37ac2c4c492ac9b85b2025897
9aa841d254d9f1750a35cb1b71cbc9394c3ace29 17-Mar-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Add new precise call fail causes and OEM causes"
eb7cb561f016a1d23b81364e0e78ace5d4192018 17-Mar-2017 Narayan Kamath <narayan@google.com> TelephonyManager: Avoid unnecessary object allocation.

No need to use a boxed type - the value is being passed to a function
that takes a boolean.

Test: make
Change-Id: Id6d5c581dd6e3a1832d3419a2fbec92e97c4240d
ndroid/telephony/TelephonyManager.java
5cbadddff2f16cb08d0843d6c927b7a77430b9b8 08-Mar-2017 Jayachandran C <jayachandranc@google.com> Add new precise call fail causes and OEM causes

Bug: 35609963
Change-Id: Ia0579721e7132950ccfafd7be38f43d1963c016c
ndroid/telephony/PreciseDisconnectCause.java
om/android/ims/ImsReasonInfo.java
0463a7d38e57a16d39fde6137d6b891382273c12 16-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Added configuration for VT downgrade/tear down when data disabled"
06caf58ac83c381d68fd99fbb69e5095cbd8a1b0 16-Nov-2016 Jack Yu <jackyu@google.com> Added configuration for VT downgrade/tear down when data disabled

Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

bug: 32880745
Merged-In: I5c71fc9336b39f114a924861a766ca5cb93d4c69
Change-Id: I5c71fc9336b39f114a924861a766ca5cb93d4c69
ndroid/telephony/CarrierConfigManager.java
a98cefc55c7971f6ca16635a3d50c6f25173e1d9 16-Mar-2017 Sooraj Sasindran <sasindran@google.com> Merge "Support Signal strength offset"
am: 98d499877f

Change-Id: I3087c3f8d6f975f399dfcf8aa8dd734f78caf69f
78ccde1c9d91c7833824970ec73c49214f072a7d 16-Mar-2017 Sooraj Sasindran <sasindran@google.com> Merge "Support Signal strength offset"
1b7bec5156c251e8131b9b2c84a90e458fed1ec1 09-Mar-2017 Sooraj Sasindran <sasindran@google.com> Support Signal strength offset

Support feature to offset LTE rsrp
for higher freaquency lte bands.

Test: Verified on device that signal bars increased
Bug=30628343
Merged-In: Id0b54901a1e8832fb48ba509e6a380c43f4c9497
Change-Id: Id0b54901a1e8832fb48ba509e6a380c43f4c9497
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/ServiceState.java
ndroid/telephony/SignalStrength.java
6f599559dd6ac596d791c5ef808dc440c9c433ca 15-Mar-2017 Jeff Davidson <jpd@google.com> Merge "Rename getDataEnabled() to isDataEnabled()."
c5659cae01f3f250d468d4b2725f7ee79df11cce 09-Mar-2017 Sooraj Sasindran <sasindran@google.com> Support Signal strength offset

Support feature to offset LTE rsrp
for higher freaquency lte bands.

Test: Verified on device that signal bars increased
Bug=30628343
Merged-In: Id0b54901a1e8832fb48ba509e6a380c43f4c9497
Change-Id: Id0b54901a1e8832fb48ba509e6a380c43f4c9497
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/ServiceState.java
ndroid/telephony/SignalStrength.java
dd0f47a9dad379473937c739ceb85d89eac95e61 15-Mar-2017 Joachim Sauer <jsauer@google.com> Merge "Change Czech Republic to Czechia" am: 027a67062e am: 14bcec27a0
am: 9b30497243

Change-Id: I78d646c5052e29662f523dc4ae6ce3ecb5d4768d
14bcec27a02b1c58e7405d47cadc0ab3875a779f 15-Mar-2017 Joachim Sauer <jsauer@google.com> Merge "Change Czech Republic to Czechia"
am: 027a67062e

Change-Id: I51fc6fde5647b1fd8ecc677da7f6ec7a248a3b38
027a67062ea918c608e82f02ee1573e0221b4866 15-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Change Czech Republic to Czechia"
11b4498aa5c98b5777b1cb9b2775d8938a4c2f2e 18-Jan-2017 Ammar Aijazi <aaijazi@google.com> Add carrier config keys to control the data cycle.

Adds the following keys: KEY_MONTHLY_DATA_CYCLE_DAY,
KEY_DATA_WARNING_THRESHOLD, and KEY_DATA_LIMIT_THRESHOLD.

This allows carrier apps to control the monthly data cycle reset date,
as well as fill in data warnings and limits based on plan details.

Bug: b/34385985
Test: No explicit tests for the API additions, but will add tests to the
follow up review which adds functionality that depends on these fields.
Change-Id: I2aee5cdbc4b707e28062830f1143c694ccae13cd
ndroid/telephony/CarrierConfigManager.java
76c27d8b04bbe4c6e4899d077d3f2ca3e46e74bf 10-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update VVM API"
6202c5e0052ae6e4c6b84e9085aee61383c7d562 10-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Disable a phone number log for user build" am: 59a40691a5 am: d31314d550
am: c906a167cb

Change-Id: I0c1bef7c7b436dcee5dfc8a06e8141f7757d7199
d31314d55054e430422ec4a7b8dca394a3b7ec1b 09-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Disable a phone number log for user build"
am: 59a40691a5

Change-Id: I9b2a14b29fe5e096b734b6e3f1d4b65806753646
59a40691a56bba7b87267fc3c9cbb07fea03e72d 09-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Disable a phone number log for user build"
5fe6fbcaadf1ac6beb838ac5f82d97ca2ca1e15b 08-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Return generic Binder on onBind" am: c6613f7206 am: 2a71bd5150
am: 2fca3afd4b

Change-Id: Ic668d9bb43f58f28c096083f89c6bec30cf9640a
2a71bd5150e406c970780a1ffa8f86c4f4fd61aa 08-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Return generic Binder on onBind"
am: c6613f7206

Change-Id: Ibc8cce3c63b93820f6bdd842e6a751233240874d
8416a4dfd10abacea58ed109a4c1c04ad38176b6 08-Mar-2017 Joachim Sauer <jsauer@google.com> Change Czech Republic to Czechia

This commit only contains changes to comments.

Bug: 34964100
Test: m buildcheck
Change-Id: I174eb8bf8ed7ac36198bd40bda925c6274933315
ndroid/telephony/PhoneNumberUtils.java
3f5858efa0b4bbed447989dca7d2c06c51dc8d13 06-Mar-2017 Ta-wei Yen <twyen@google.com> Update VVM API

+ TelephonyManager.getVisualVoicemailPackageName() uses pinned subId
from the manager.
+ TelephonyManager.getNetworkSpecifier() updated doc to explain what
a network specifier is.
+ TelephonyManager.getCarrierConfig() Annotated with @WorkerThread
specified failure behavior.
+ VisualVoicemailSms.getFields() Doc specified values are carrier
dependent.

- Hide DEFAULT_* from VisualVociemaliSmsFitelrSettings

Test: CTS TelephonyManagerTest
Bug: 35766748
Fixes: 35766370
Fixes: 35766489
Change-Id: If48d48a0cf588bcb59c7b77ce6a452d2fda7bfa5
ndroid/telephony/TelephonyManager.java
ndroid/telephony/VisualVoicemailSms.java
ndroid/telephony/VisualVoicemailSmsFilterSettings.java
om/android/internal/telephony/ITelephony.aidl
cce5466f937637ab29c7e10d8cbc321eecc3cbac 07-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Throw SecurityException in sendVisualVoicemailSms()"
9f2888d9cc65bbbd20e3aa2c30f8baa90a41a6f4 07-Mar-2017 Ta-wei Yen <twyen@google.com> Merge "Add EXTRA_PHONE_ACCOUNT_HANDLE for ACTION_SHOW_VOICEMAIL_NOTIFICATION"
b3cd7b51d330caa1f54710741b73a63043515b82 12-Dec-2016 youhei.x.miyoshi <youhei.x.miyoshi@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: Id040653dbfd236250e7eb07c9c2e9587ded3d63f
ndroid/telephony/Rlog.java
om/android/internal/telephony/CallerInfo.java
49f3756b598fc0c0e9c54f92c9c26e44389af781 04-Mar-2017 Ta-wei Yen <twyen@google.com> Throw SecurityException in sendVisualVoicemailSms()

Previously if the caller is not the active VVM service, the exception
will be consumed by the Binder because it is a oneway method.

This CL changes the method to non-oneway so the caller will receive
the exception. Docs are also updated.

Change-Id: Iedf96539be3958a92e151b926ee069d6edfc4d09
Fixes: 35854031
Test: CTS - VisualVoicemailServiceTest
ndroid/telephony/VisualVoicemailService.java
om/android/internal/telephony/ITelephony.aidl
d2369792ddd798ba472bc7254c7bb565e2501401 03-Mar-2017 Brad Ebinger <breadley@google.com> Return generic Binder on onBind

By returning a generic Binder on onBind in
ImsServiceBase, we can detect when the process
crashes and restart the service, if necessary.

Test: Telephony Unit Tests
Change-Id: I2fbe2708c3df37704f0c526210267a35c75ee1eb
ndroid/telephony/ims/ImsServiceBase.java
448c12c2f3c0055ac37bbea273b7610d4d6fb557 14-Feb-2017 Abhijith Shastry <ashastry@google.com> Permit privileged system apps to send SMS without persisting.

The system app needs to have MODIFY_PHONE_STATE permission.

Original Change-Id: Ic9242972a211c90378c183c3abf95672c2816ac7
BUG: 35325136
Test: API visibility change, Manual

Change-Id: I37b185feaa72e330a0845eff137ea310ad0dca08
ndroid/telephony/SmsManager.java
b94d28acb55cfd04b7f72c1076382e5dabb9373c 25-Jan-2017 Nathan Harold <nharold@google.com> Move newFromRil() function to a utility class

Remove a dependency on frameworks/opt from SmsMessage for CDMA

-Code move to frameworks/opt/telephony../cdma/SmsMessageConverter

Bug: 33414487
Test: Manually verified GSM and CDMA SMS: MO and MT
Change-Id: I730d292c4aad6524b03b18c0751738a73a71ecf7
ndroid/telephony/SmsMessage.java
om/android/internal/telephony/cdma/SmsMessage.java
016e9c6a785963770d0fa0063fa02f58d5b2851c 14-Dec-2016 Nathan Harold <nharold@google.com> Move OTASP_* Consts from ServiceStateTracker to TelephonyManager

-Move the OTASP_* constants from SST
-Update references to those constants in TelephonyRegistry

Bug: 33414487
Test: compilation
Change-Id: I9516a8dfa9623d69d7e051749815e91ed3d013fa
ndroid/telephony/TelephonyManager.java
5a0618ead121b258204c19b97c37cb85d4ad0856 14-Dec-2016 Nathan Harold <nharold@google.com> Port Utility Functions from DefaultPhoneNotifier

-Move static utility functions from frameworks/opt/telephony/
..DefaultPhoneNotifier to a new utility class in frameworks/base

-Update TelephonyRegistry to point to the new functions.

Bug: 33414487
Test: compilation
Change-Id: I36a113cb5122569d451ec3a2dfa71d72d590fa52
om/android/internal/telephony/PhoneConstantConversions.java
e97d1c6a8f95c240b0e990ce73d43e07c3cf413d 14-Dec-2016 Nathan Harold <nharold@google.com> Remove dependency on IccConstants from SmsManager

-Redefine the length of the SmsRecord in SmsManager

Bug: 33414487
Test: compilation
Change-Id: I941085e96f45164152528c123102a59930859546
ndroid/telephony/SmsManager.java
4980bf4aff8d49ac4e05444a6ef40ea1536f1afb 14-Feb-2017 Dan Willemsen <dwillemsen@google.com> Merge branch 'stage-telephony-refactor' into master

Bug: 33644781
Change-Id: If571e3ad9432035811714e3a92d9dfff39311c61
ndroid/telephony/SmsManager.java
ndroid/telephony/SmsMessage.java
ndroid/telephony/Telephony.java
om/android/internal/telephony/IccUtils.java
om/android/internal/telephony/Sms7BitEncodingTranslator.java
om/android/internal/telephony/SmsAddress.java
om/android/internal/telephony/SmsApplication.java
om/android/internal/telephony/SmsCbCmasInfo.java
om/android/internal/telephony/SmsCbEtwsInfo.java
om/android/internal/telephony/SmsCbLocation.java
om/android/internal/telephony/SmsCbMessage.java
om/android/internal/telephony/SmsHeader.java
om/android/internal/telephony/SmsMessageBase.java
om/android/internal/telephony/cdma/BearerData.java
om/android/internal/telephony/cdma/CdmaSmsAddress.java
om/android/internal/telephony/cdma/CdmaSmsSubaddress.java
om/android/internal/telephony/cdma/SmsEnvelope.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/UserData.java
om/android/internal/telephony/cdma/package.html
om/android/internal/telephony/gsm/GsmSmsAddress.java
om/android/internal/telephony/gsm/GsmSmsCbMessage.java
om/android/internal/telephony/gsm/SmsBroadcastConfigInfo.java
om/android/internal/telephony/gsm/SmsCbConstants.java
om/android/internal/telephony/gsm/SmsCbHeader.java
om/android/internal/telephony/gsm/SmsMessage.java
6f00e6e977eff9d4a18a1cd607faa904b78adb9c 03-Mar-2017 Elliott Hughes <enh@google.com> Merge "Remove the name length limit for system properties."
am: c657b769ab

Change-Id: I700b379c0482d7d9609183a39a5c9664746ea5aa
c657b769ab9d37daa8a6086ec0e468bcb3530a50 03-Mar-2017 Elliott Hughes <enh@google.com> Merge "Remove the name length limit for system properties."
33cc60ccc98b555bb7d9e7c75d7435917cca1458 02-Mar-2017 Elliott Hughes <enh@google.com> Remove the name length limit for system properties.

Bug: http://b/33926793
Test: builds
Change-Id: Ib89b66b7abebc9a28961a0c9032b99947e3db0d6
Merged-In: Ib89b66b7abebc9a28961a0c9032b99947e3db0d6
ndroid/telephony/TelephonyManager.java
cb0629eaa1a63684b1e6dbb366d42e80a26a5da9 02-Mar-2017 Elliott Hughes <enh@google.com> Merge "Remove the name length limit for system properties."
01cfdb4f3ae025bde7d30b2a1b48ab873187a2d4 02-Mar-2017 Jack Yu <jackyu@google.com> Merge "Added two new RIL commands support"
am: d7b60d7869

Change-Id: I28f1e0192db63a302daa69c2e6b13762fcbfb37b
c77001de5158b531b18858a84488a08d9460a429 02-Mar-2017 Elliott Hughes <enh@google.com> Remove the name length limit for system properties.

Bug: http://b/33926793
Test: builds
Change-Id: Ib89b66b7abebc9a28961a0c9032b99947e3db0d6
ndroid/telephony/TelephonyManager.java
1bab118bedfbf3b5bb61b18891c4082d4396ee48 16-Feb-2017 Jack Yu <jackyu@google.com> Added two new RIL commands support

Added RIL_REQUEST_SEND_DEVICE_STATE and
RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER RIL requests support.

Test: telephony sanity tests
bug: 32223897, 20125037, 28294587

Merged-In: I148a4322dfab2d8d84faf6505fb89dfc290411e3
Change-Id: I148a4322dfab2d8d84faf6505fb89dfc290411e3
om/android/internal/telephony/RILConstants.java
da70ca69fdb5ea80fb064e8a48cbfa5b74bcff45 16-Feb-2017 Jack Yu <jackyu@google.com> Added two new RIL commands support

Added RIL_REQUEST_SEND_DEVICE_STATE and
RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER RIL requests support.

Test: telephony sanity tests
bug: 32223897, 20125037, 28294587

Change-Id: I148a4322dfab2d8d84faf6505fb89dfc290411e3
om/android/internal/telephony/RILConstants.java
d03ccf89bf3bbce46da96fa41afd000942e828dc 02-Mar-2017 nharold <nharold@google.com> Merge changes from topic 'query-fplmn-sync' am: 0dc62c6dd3 am: 1f7f262920
am: 3243ec0614

Change-Id: I3da03980792e5fa898b7109dbb2cea7147f7ee94
1f7f262920206c5efff3fececf69f64d04435a5e 01-Mar-2017 nharold <nharold@google.com> Merge changes from topic 'query-fplmn-sync'
am: 0dc62c6dd3

Change-Id: Ibc08427e8de920f7f95a6a530b45cfcf8402d203
0dc62c6dd3dd103be6ff4055472cc20fa3596e65 01-Mar-2017 nharold <nharold@google.com> Merge changes from topic 'query-fplmn-sync'

* changes:
Provide a public API for TelephonyManager.getForbiddenPlmns()
Add support for querying Forbidden PLMNs
b455f0deed3dd38dea5c89984d1c0e47f17cbf08 01-Mar-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 81a28efd1b16 to stage-aosp-master

Change-Id: Ic4c1ca055db8e70db49d9fc91dfc705da6136a5d
81a28efd1b16cf908b308265aa75d17fece17a11 01-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Support confirmation of international calls while on WFC only."
546389580503d38fd1925cc5fa65914790696e35 01-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY" am: b987777f20 am: 59282ad8df
am: 81f7d06a5e

Change-Id: I006cb9e34093cfccbfb036c82c95adc91d8cc28e
59282ad8dfdf941098b63f80e7d62da037ffff51 28-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
am: b987777f20

Change-Id: I6c33449b917b6d0c2a3396eea40065c2b0bc6862
ef5a401b7e3a68b0411886572c1a18b948f00c3d 17-Feb-2017 Tyler Gunn <tgunn@google.com> Support confirmation of international calls while on WFC only.

Add new carrier config which enables a confirmation message when the user
dials an international number while on WFC only.

Add new @hide PhoneNumberUtils method which is used to determine if a
number dialed is an international number.

Test: Manual, unit.
Bug: 33272455
Merged-In: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
Change-Id: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/TelephonyManager.java
e0a7345c6a353411c73f7f45875478684472a91c 27-Feb-2017 Brad Ebinger <breadley@google.com> Send the IMS_SERVICE_UP intent when it is STATE_READY

The ImsService must send the IMS_SERVICE_UP intent when it
signals that it is in the STATE_READY state and
IMS_SERVICE_DOWN when it is STATE_INITIALIZING or
STATE_NOT_AVAILABLE.

Also, add READ_PRIVILEGED_PHONE_STATE check

Bug: 35736451
Test: Unit tests added in frameworks/opt/telephony
Change-Id: I03d4398cf7008cf8c51b78d99eb029aa99c63f62
ndroid/telephony/ims/ImsService.java
ndroid/telephony/ims/feature/ImsFeature.java
b70ef8d79b5b01a738f60c233c20c9d3e5861c1a 28-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Support confirmation of international calls while on WFC only."
662ae090a2fac62e1cd7d49744f345eb5967f5e9 17-Feb-2017 Tyler Gunn <tgunn@google.com> Support confirmation of international calls while on WFC only.

Add new carrier config which enables a confirmation message when the user
dials an international number while on WFC only.

Add new @hide PhoneNumberUtils method which is used to determine if a
number dialed is an international number.

Test: Manual, unit.
Bug: 33272455
Change-Id: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/TelephonyManager.java
dc9a6fb9a94ba623322e123436520a268966c9c0 27-Feb-2017 Jeff Davidson <jpd@google.com> Rename getDataEnabled() to isDataEnabled().

The old API is reverted back to @SystemApi and marked deprecated to
avoid breaking any compilation.

Also clean up the Javadoc by making the permissions requirements
clearer and noting that this API does not take per-app data
restrictions into account.

Change-Id: I5baacc1fd7e75d54e1d6521c24f792f427d9e228
Test: TreeHugger build/boot
Fixes: 35766530
ndroid/telephony/TelephonyManager.java
6a7c9333b92a1c7807a02eeffc1b10041af3d70e 24-Jan-2017 Nathan Harold <nharold@google.com> Provide a public API for TelephonyManager.getForbiddenPlmns()

Bug: 33296073
Test: none
Change-Id: I4f1bce663669c18098755c386456e6e9687a3cfb
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
f56cd7073403ebc63d97ee1f6ade1c74e7f1ccaa 15-Nov-2016 Nathan Harold <nharold@google.com> Add support for querying Forbidden PLMNs

Bug: 32277497
Test: Verified via public API for: missing SIM and working SIM
Change-Id: Ib7838a4be81853ef336e4f3d527c483b49cd2167
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
eb422ead0cd7101855db4bff50cb71321cee2377 27-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Adds read/modify permission checks to ImsService" am: 3e64003641 am: 175213e1ee
am: 055adc457a

Change-Id: I41289905222c0bc83fe1d6b075427b79afe9b0db
175213e1ee6e09fda7ad15371c33a527bda38bc8 27-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Adds read/modify permission checks to ImsService"
am: 3e64003641

Change-Id: Ia4cb2c789a13658de86c0a36648a09e7abceb621
3e64003641c376573f4809aae79febd0187be81e 27-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Adds read/modify permission checks to ImsService"
ffffb47569c8021c8b2a9ae7a3353795cafb1491 27-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Change internal intents from android.* to com.android.internal.*"
668050894656f893d82e7906e201a5dbfca92bae 27-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Format Japanese numbers using national format when in Japan." am: 050e5ddb4f am: 8ac499fbe6
am: a84292c9d7

Change-Id: I770af0bba538268797295f59c8675191a6ef41a6
8ac499fbe68c969fa929e9428cae4dc8d49d75f0 27-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Format Japanese numbers using national format when in Japan."
am: 050e5ddb4f

Change-Id: I996a79c2b3158e1fd6999330e0b0b21f8e4c8b4b
050e5ddb4feaa399cce2e2256dadcd12851e2e76 27-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Format Japanese numbers using national format when in Japan."
9cc898007a171059a22ccc7b6f567cf49bf62f6c 25-Feb-2017 Ta-wei Yen <twyen@google.com> Add EXTRA_PHONE_ACCOUNT_HANDLE for ACTION_SHOW_VOICEMAIL_NOTIFICATION

Dialer needs the PhoneAccountHandle to determine the ringtone and
whether to ignore the notification because of visual voicemail.

Bug: 32884372
Test: CTS Verifier Test - Voicemail Broadcast Test
Change-Id: Ic58ade9bc29ad284ee18437aba826b317a46dd11
ndroid/telephony/TelephonyManager.java
f4854018a20ab54358f82fc2bda7f33fdd48c14d 25-Feb-2017 Chen Xu <fionaxu@google.com> Merge "move ACTION_CARRIER_SETUP intent to public api"
am: fcb37ffc60

Change-Id: Iaa09a2c35a88d58a6c6df4122bf7f1f87bd7075e
fcb37ffc606130dd319b91e7761e4b4fa5090876 25-Feb-2017 Chen Xu <fionaxu@google.com> Merge "move ACTION_CARRIER_SETUP intent to public api"
f5ee78647553264d72c9fde1bc76470b62d2a8ea 24-Feb-2017 Amit Mahajan <amitmahajan@google.com> Change internal intents from android.* to com.android.internal.*

Test: none
Bug: 35269293
Change-Id: I74585b3d6459cee613408d80fe4a3c13327e5dab
om/android/internal/telephony/TelephonyIntents.java
0d105deef8f8bd101d9dfd83d2a6bc48f6ee5912 24-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Mark oemhook related APIs @Deprecated." am: 79faa72eee am: 4b026b656d
am: 2225e56bd3

Change-Id: I3225ab882809159ae1deb97efc0469d8b2777cbe
4b026b656d9677e2d2cd177b6d0669af311bbb6b 24-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Mark oemhook related APIs @Deprecated."
am: 79faa72eee

Change-Id: Ia31c163fdd65f305095ca1749cbc457eea4b0ca8
79faa72eee9bdd88d663623f4a44a9dde3cfa3b0 24-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Mark oemhook related APIs @Deprecated."
6a5ac3b922a3db9d5f00836f4c5323dded54e63e 18-Feb-2017 fionaxu <fionaxu@google.com> move ACTION_CARRIER_SETUP intent to public api

As per CDD: The "android.*" namespace for intent constants is reserved for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_CARRIER_SETUP intent is generally useful for carrier privileged
apps which is unbundled carrier apps, thus move to public APIs

Bug: 33679956
Test: Manual
Change-Id: I202398f868d35e7e9046e7cc41330a3c26dca0b0
Merged-in: Ie2b5d072406513f04676210d08c43d91623c3cd2
om/android/internal/telephony/TelephonyIntents.java
f73da9c7edd5f5d35d7fb8a4d33015706be4958a 24-Feb-2017 Chen Xu <fionaxu@google.com> Merge "move ACTION_CARRIER_SETUP intent to public api"
5e8af2abc713667154ef338b2777582e4e66d529 24-Feb-2017 Chen Xu <fionaxu@google.com> Merge "renaming telephony internal hidden intents" am: 6d198966fe am: 3b7643ceed
am: 894f17fdc0

Change-Id: I885615dda1831f0acc9007f81094ac14e1eb8cb6
3b7643ceed1ee80ad843678b7833393ab66c2f3a 24-Feb-2017 Chen Xu <fionaxu@google.com> Merge "renaming telephony internal hidden intents"
am: 6d198966fe

Change-Id: If1db829fe5308bcbc1d8b778aef50368581850f4
6d198966fe79f6642cfe488fc2da0e221848e317 24-Feb-2017 Chen Xu <fionaxu@google.com> Merge "renaming telephony internal hidden intents"
abeba60e8f786ae84dd09e5cebece70d303f9b35 24-Feb-2017 fionaxu <fionaxu@google.com> renaming telephony internal hidden intents

The "android.*" namespace for intent constants is reserved for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.) Implementation details of AOSP
components (subject to change by OEMs at will) should use the
"com.android.internal.*" as per CDD

Bug: 33679454
Test: manual
Change-Id: I7183493e2794a82e023bc4993aee328f24b2e7cb
ndroid/telephony/CarrierConfigManager.java
0f551d7f9ad71d349d9ae3b77615cc3a87d396f8 23-Feb-2017 Amit Mahajan <amitmahajan@google.com> Mark oemhook related APIs @Deprecated.

Test: none
Bug: 34344851
Change-Id: I5358d94b3f4cce015effdb3a7517980f369a1224
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/TelephonyManager.java
adfe7009f2fe666237cfbcb5d32b2d353d9183e2 18-Feb-2017 fionaxu <fionaxu@google.com> move ACTION_CARRIER_SETUP intent to public api

As per CDD: The "android.*" namespace for intent constants is reserved for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_CARRIER_SETUP intent is generally useful for carrier privileged
apps which is unbundled carrier apps, thus move to public APIs

Bug: 33679956
Test: Manual
Change-Id: Ie2b5d072406513f04676210d08c43d91623c3cd2
om/android/internal/telephony/TelephonyIntents.java
423b3bd84f4d928365a392d75e35f4cde09ef1a5 23-Feb-2017 Abhishek Adappa <aadappa@codeaurora.org> Merge "Add a new ImsReasonInfo code" am: b4234e6af8 am: bb59947d90
am: 44f4430953

Change-Id: Iaaa2f91f36f0f57a81a5f0e7781564296654a33a
cd3c59c6400678adcd175f8a8d1a0d32388ca44e 23-Feb-2017 Brad Ebinger <breadley@google.com> Adds read/modify permission checks to ImsService

This change adds READ/MODIFY_PHONE_STATE permission checks
to the ImsService to ensure that processes without those
permissions do not access this service illegally.

Test: Manual
Change-Id: I7740a9a6b6a12d3f9162aa5d055e7770b05fdff1
ndroid/telephony/ims/ImsService.java
bb59947d902fd1bb56017687f3ac24933eb53159 23-Feb-2017 Abhishek Adappa <aadappa@codeaurora.org> Merge "Add a new ImsReasonInfo code"
am: b4234e6af8

Change-Id: Ia5174fafbc08acf559e35a28538d2b112b5cdb19
b4234e6af84501f5c23090a3205122b44effea12 23-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add a new ImsReasonInfo code"
46681288bc52e120b4302c091418d1ab1967beca 23-Feb-2017 Brad Ebinger <breadley@google.com> Merge "reates base implementation of ImsService AIDLs" am: b60869db12 am: fe8d588dad
am: fe2a74bfee

Change-Id: I9b7885ead16666b57e3b77b2bb868f81fb68de3b
fe8d588dadff3bbe4debf9d8ca7df25ec9e3c5b0 23-Feb-2017 Brad Ebinger <breadley@google.com> Merge "reates base implementation of ImsService AIDLs"
am: b60869db12

Change-Id: I6edf280213bee0756aad65148daafe3300849baa
b60869db1286555b2f78bb4054efc192df8f0fa9 23-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "reates base implementation of ImsService AIDLs"
44fa5c3346eeaf084f88fc9b8e6cade979955390 23-Feb-2017 Chen Xu <fionaxu@google.com> Merge "renaming telephony internal hidden intents" am: 09c663a84c am: 979e4690ec
am: 201320492c

Change-Id: I4e37359a98fb8ecdff63b45a54f08b61e7be25ad
2134e14bda0ca8961364ed87ca04d45137f2bc13 11-Jan-2017 Abhishek Adappa <aadappa@codeaurora.org> Add a new ImsReasonInfo code

For IKEv2 authentication failure during ePDG tunnel establishment.

Test: make
Change-Id: I1d10efac806abfaa80d9875b908385f7732f293a
om/android/ims/ImsReasonInfo.java
979e4690ec5270d8d3e8a44b0d2519f768f7fabd 23-Feb-2017 Chen Xu <fionaxu@google.com> Merge "renaming telephony internal hidden intents"
am: 09c663a84c

Change-Id: Ic20ae9e6816d629c979859a7d18f1827bafcc034
09c663a84c00eb7722a85d20918e734ba6383f79 23-Feb-2017 Chen Xu <fionaxu@google.com> Merge "renaming telephony internal hidden intents"
21013dcf1b1c0c740efba863b6b4962fe3da9095 03-Feb-2017 Brad Ebinger <breadley@google.com> reates base implementation of ImsService AIDLs

This change introduces "base classes" of the AIDL interfaces that are
implemented in vendor provided ImsServices. This allows for new APIs
to be added to the AIDL files, along with stub implementation of those
AIDLs in the base classes. By extending from the base class, older
implementations of the AIDL interfaces will not need to be updated
when the interface changes.

This change also moves some of the com.android.ims classes from
frameworks/opt/net/ims to frameworks/base. Any class that will be
used in the new unbundled ImsService system will need to be in
the framework, as opposed to the optional library that they are
in now.

Bug: 30290416
Test: Manual
Change-Id: I4a186d8e910d6d4f711e983ec8d717fc5cbdefab
ndroid/telephony/ims/stub/ImsCallSessionImplBase.java
ndroid/telephony/ims/stub/ImsCallSessionListenerImplBase.java
ndroid/telephony/ims/stub/ImsConfigImplBase.java
ndroid/telephony/ims/stub/ImsEcbmImplBase.java
ndroid/telephony/ims/stub/ImsMultiEndpointImplBase.java
ndroid/telephony/ims/stub/ImsStreamMediaSessionImplBase.java
ndroid/telephony/ims/stub/ImsUtImplBase.java
ndroid/telephony/ims/stub/ImsUtListenerImplBase.java
om/android/ims/ImsConfig.java
om/android/ims/ImsException.java
om/android/ims/ImsUtInterface.java
om/android/ims/internal/IImsServiceFeatureListener.aidl
om/android/ims/internal/ImsCallSession.java
om/android/ims/internal/ImsVideoCallProvider.java
4fb8988854d4a3bc8b8e442aee4a698b57283c5c 23-Feb-2017 Brad Ebinger <breadley@google.com> resolve merge conflicts of ac9b2c4fab42 to stage-aosp-master

Change-Id: I4a6094c41ab267f89a15c5e8caa25e6b683419d0
fc5cbc90cf9708fd7ab7a34e8c2925db2028854e 23-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "TelephonyManager#setAllowedCarriers: comment update"
ac9b2c4fab42f731901960f72a796cbee0712a2a 23-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Add UI prompt for MMI code failure on 3gpp"
24dfce2fbe90967b00f6fa20b544537265982eba 22-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Mark some system intents as SystemApi"
d1f5b4245fee14826502aa4ed00de4c69221afda 22-Feb-2017 Jack Yu <jackyu@google.com> Merge "Added telephony manager set sim power state API"
am: cbffe38631

Change-Id: I9fbe161505905c3d3c1c431d1589248324fb3e4f
cbffe38631079381431c0207dad6ec0da92ebf70 22-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Added telephony manager set sim power state API"
e25a4dfb6a047bd2c937f033482a551842a7870d 17-Feb-2017 Jack Yu <jackyu@google.com> Added telephony manager set sim power state API

The new API can be used to power up/down the SIM. This is equivalent
to inserting and removing the card.

Test: Telephony sanity tests
bug: 32224755

Change-Id: Ib82ab1eff613946e7c31c9b2131183a40d09af80
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
cbabb8dddc90f814a900ff40bef71a25501c86c5 18-Feb-2017 Amith Yamasani <yamasani@google.com> Mark some system intents as SystemApi

These intents are handled by some system apps and use the
android.* namespace. So mark them as SystemApi for CTS verification
purposes.

Fixes some of the CTS signature tests.

Change-Id: I18664b3e92bb24a5cf96d89cf47d6abb88b13220
Fixes: 35253923
Test: cts-tradefed run cts-dev -m CtsSignatureTestCases
om/android/internal/telephony/TelephonyIntents.java
90065e6e8c9fde29b5cb040af70dc6068f6ebdb9 22-Feb-2017 Jack Yu <jackyu@google.com> Merge "Added telephony manager set sim power state API"
caa5a35371a6afcce248c51692371895e750fff2 21-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Remove Session ID from ImsService APIs that do not need it." am: 975be6c065 am: 50bc658e20
am: 8e8c26e25a

Change-Id: I7c7e02c23da5ef12bb0645be39eada1d11b8725c
50bc658e2085da79637f1dbb6570b8afe2f75766 21-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Remove Session ID from ImsService APIs that do not need it."
am: 975be6c065

Change-Id: I09469d99bc68133a4de594507854c269e905c40e
6078cfebb074bbd0db504182d12e2774f1000bff 17-Feb-2017 Jack Yu <jackyu@google.com> Added telephony manager set sim power state API

The new API can be used to power up/down the SIM. This is equivalent
to inserting and removing the card.

Test: Telephony sanity tests
bug: 32224755

Change-Id: Ib82ab1eff613946e7c31c9b2131183a40d09af80
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
e63b35d0b22db8769ffd3378fc305d5f3d27fd50 17-Feb-2017 Brad Ebinger <breadley@google.com> Remove Session ID from ImsService APIs that do not need it.

Traditionally, to initiate a new call with the ImsService APIs,
you have to "open()" the interface, which returns a session ID.
This is not needed for querying other information, such as the
provisioning status of the ImsService slot.

Test: Manual
Change-Id: I155b291a49b9aa5ed9599f5a78b1e8d7ff9f8e1c
ndroid/telephony/ims/ImsService.java
ndroid/telephony/ims/ImsServiceProxy.java
ndroid/telephony/ims/ImsServiceProxyCompat.java
ndroid/telephony/ims/feature/IMMTelFeature.java
ndroid/telephony/ims/feature/MMTelFeature.java
om/android/ims/internal/IImsServiceController.aidl
ac495240b1dc63dc94ce77053d00ce62333004a7 17-Feb-2017 Meng Wang <mewan@google.com> TelephonyManager#setAllowedCarriers: comment update

Will return -1 on null input

Bug: 35374455
Test: make
Change-Id: I6c4943298383e765ad7da17d3ff167b384360ba6
ndroid/telephony/TelephonyManager.java
c9c8b590c5d51b54a84824270be49ddc16fd2a71 17-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Adds @hide ImsService APIs" am: 2b879016d3
am: f46aa6f9ee

Change-Id: I12e10d796a7b2d56cacf8e9b53bb5e228b79ecc3
2b879016d3bfc91e30519638c94226c8ed31faeb 17-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Adds @hide ImsService APIs"
1ad4f0e60b3915ae04c4d11751bee627928349ad 17-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Adds @hide ImsService APIs"
3edeec530f8e075e5845fd180ff1c5da51764772 17-Feb-2017 Jack Yu <jackyu@google.com> Merge "Added the new RIL request to set SIM power state" am: 2f21f71da4 am: bf21df3306
am: 8c89daceaf

Change-Id: I7dd15375a56a9243bf0c24c87def9949596093e0
8c89daceafc7d638f6cc015fa144806acc83ad84 17-Feb-2017 Jack Yu <jackyu@google.com> Merge "Added the new RIL request to set SIM power state" am: 2f21f71da4
am: bf21df3306

Change-Id: I7d11f132ca483272963f12363496d70651076f0b
bb67b4474fc087ce9d152ae89ada32cd179fb7d2 16-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Added the new RIL request to set SIM power state"
d5486f92d0a6be6ac92c6f29e9e4962edc253774 16-Feb-2017 Meng Wang <mewan@google.com> Merge "Add carrierconfig KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL" into nyc-mr2-dev am: cd923a6910
am: 6b2a20cdc3

Change-Id: Idbc42f28de59cd90bdf501a984a988c79ea36849
6b2a20cdc3060ef3d8d2a8daedff9a96b3cfd65c 16-Feb-2017 Meng Wang <mewan@google.com> Merge "Add carrierconfig KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL" into nyc-mr2-dev
am: cd923a6910

Change-Id: I7c0432d62803b299de1777dd27c83fdca440d306
1639c21be6e7cd7699db4080fcf2ccc5cb2006e6 25-Jan-2017 Brad Ebinger <breadley@google.com> Adds @hide ImsService APIs

Adds @hide ImsService API implementations to be used for the new
dynamic ImsResolver.

1) ImsService - The main class that all vendor ImsServices will implement.
ImsServices that implement this method must return their implementations
of MMTelFeature when onCreateMMTelFeature is called. The base ImsService
class also relays all method calls through itself as a proxy. So, when
Telephony calls a method, the ImsService figures out which MMTelFeature
should be called (by slot) and then calls that feature's method
implementation.

2) MMTelFeature/RcsFeature - Implements the I*Feature interfaces, which
are used on both sides of the interface. The vendor implemented ImsService
must implement all methods provided in the I*Feature interface in their
implementation of *Feature that they return to the ImsService.

3) ImsServiceProxy[Compat] - The Proxy interface in telephony that will be
called in ImsManager. When a method in this class is called, it will call
the respective AIDL function: Telephony -> IImsServiceController AIDL ->
vendor ImsService -> vendor ImsFeature implementation.
ImsServiceProxyCompat is there to provide backwards compatibility with
older ImsServices that do not use the new ImsService implementations.
It implements all of the methods that are defined in the new I*Feature
interfaces and translates them to the old ImsService AIDL calls.

Test: Adds Unit Tests (see frameworks/opt/telephony)
Merged-In: Id3466c178384158c788ab1d708ab108bb95866fc
Change-Id: Id3466c178384158c788ab1d708ab108bb95866fc
ndroid/telephony/ims/ImsService.java
ndroid/telephony/ims/ImsServiceBase.java
ndroid/telephony/ims/ImsServiceProxy.java
ndroid/telephony/ims/ImsServiceProxyCompat.java
ndroid/telephony/ims/feature/IMMTelFeature.java
ndroid/telephony/ims/feature/IRcsFeature.java
ndroid/telephony/ims/feature/ImsFeature.java
ndroid/telephony/ims/feature/MMTelFeature.java
ndroid/telephony/ims/feature/RcsFeature.java
om/android/ims/internal/IImsFeatureStatusCallback.aidl
om/android/ims/internal/IImsServiceController.aidl
om/android/ims/internal/IImsServiceFeatureListener.aidl
15708a316bcfafc93aa1795fae65e83035270d88 25-Jan-2017 Brad Ebinger <breadley@google.com> Adds @hide ImsService APIs

Adds @hide ImsService API implementations to be used for the new
dynamic ImsResolver.

1) ImsService - The main class that all vendor ImsServices will implement.
ImsServices that implement this method must return their implementations
of MMTelFeature when onCreateMMTelFeature is called. The base ImsService
class also relays all method calls through itself as a proxy. So, when
Telephony calls a method, the ImsService figures out which MMTelFeature
should be called (by slot) and then calls that feature's method
implementation.

2) MMTelFeature/RcsFeature - Implements the I*Feature interfaces, which
are used on both sides of the interface. The vendor implemented ImsService
must implement all methods provided in the I*Feature interface in their
implementation of *Feature that they return to the ImsService.

3) ImsServiceProxy[Compat] - The Proxy interface in telephony that will be
called in ImsManager. When a method in this class is called, it will call
the respective AIDL function: Telephony -> IImsServiceController AIDL ->
vendor ImsService -> vendor ImsFeature implementation.
ImsServiceProxyCompat is there to provide backwards compatibility with
older ImsServices that do not use the new ImsService implementations.
It implements all of the methods that are defined in the new I*Feature
interfaces and translates them to the old ImsService AIDL calls.

Test: Adds Unit Tests (see frameworks/opt/telephony)
Change-Id: Id3466c178384158c788ab1d708ab108bb95866fc
ndroid/telephony/ims/ImsService.java
ndroid/telephony/ims/ImsServiceBase.java
ndroid/telephony/ims/ImsServiceProxy.java
ndroid/telephony/ims/ImsServiceProxyCompat.java
ndroid/telephony/ims/feature/IMMTelFeature.java
ndroid/telephony/ims/feature/IRcsFeature.java
ndroid/telephony/ims/feature/ImsFeature.java
ndroid/telephony/ims/feature/MMTelFeature.java
ndroid/telephony/ims/feature/RcsFeature.java
om/android/ims/internal/IImsFeatureStatusCallback.aidl
om/android/ims/internal/IImsServiceController.aidl
om/android/ims/internal/IImsServiceFeatureListener.aidl
866e9e394743c3b176feca3012dda1fafd8dcccb 16-Feb-2017 Jack Yu <jackyu@google.com> Added the new RIL request to set SIM power state

The new RIL request for powering up/down the SIM card.

Test: Telephony sanity tests
bug: 32224755
Merged-In: Ia20f824eb9a0bf6d5f63f782a8d42a22a0355938
Change-Id: Ia20f824eb9a0bf6d5f63f782a8d42a22a0355938
om/android/internal/telephony/RILConstants.java
233cb9efdf73b16b0724332425d60b9f53f230ee 16-Feb-2017 Jack Yu <jackyu@google.com> Added the new RIL request to set SIM power state

The new RIL request for powering up/down the SIM card.

Test: Telephony sanity tests
bug: 32224755
Change-Id: Ia20f824eb9a0bf6d5f63f782a8d42a22a0355938
om/android/internal/telephony/RILConstants.java
0506299343e463598b819526cb6db6f46c2275f6 15-Feb-2017 Meng Wang <mewan@google.com> Add carrierconfig KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL

Bug: 28709116
Change-Id: I19673ef092ebbd655e3d687fc8d92bd9f67c5645
ndroid/telephony/CarrierConfigManager.java
b80c879c910ef43b39831bc40056baaec2dca2f4 11-Feb-2017 fionaxu <fionaxu@google.com> renaming telephony internal hidden intents

The "android.*" namespace for intent constants is reserved for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.) Implementation details of AOSP
components (subject to change by OEMs at will) should use the
"com.android.internal.*" as per CDD

Bug: 33679454
Test: manual
Change-Id: I72ed2760a6ddb0bba61cc8041cea57d5f28b7c15
om/android/internal/telephony/TelephonyIntents.java
2d7212d82220765bf998712ef110c5ddef99e3b8 24-Jan-2017 Ta-wei Yen <twyen@google.com> Add setVoicemailRingtoneUri() and setVoicemailVibrationEnabled()

This CL allows the default dialer to modify the voicemail ringtone.
All settings except the voicemail provider and voicemail nubmer can
be moved to the dialer after this CL.

Bug: 34626472
Fixes: 34626472
Test: CtsTelephonyTestCases TelephonyManagerTest
testVoicemailRingtoneSettings and testVoicemailVibrationSettings

Change-Id: I5dd1e5ac8c358b09ff9a98051c429dba758c04a4
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
b4f9ceb912c40445f8fe3fa27cbd4742246296db 14-Feb-2017 Chen Xu <fionaxu@google.com> Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 am: b206f5b382
am: 60ca278b7f

Change-Id: I13a38eb6094899e396d079e13e07e15d1cb5ca98
60ca278b7f6e1fe00748c333d03348aa9ca506ba 14-Feb-2017 Chen Xu <fionaxu@google.com> Merge "Add simActivationState to PhoneStateListener" am: 132842efc9
am: b206f5b382

Change-Id: I3feca80a72ee4a7ef3fe1583aa563451b91a68f4
132842efc9289505ab5c2a7e52d00967712b1b33 14-Feb-2017 Chen Xu <fionaxu@google.com> Merge "Add simActivationState to PhoneStateListener"
64eebba6bccff8e60f6a194eeed97d31441644b0 14-Nov-2016 fionaxu <fionaxu@google.com> Add simActivationState to PhoneStateListener

- new public SimActivationState
- hook with PhoneStateListener, notifying registrants when voice&data
activation state changed

Bug: 31061369
Test: existing TC runtest --path frameworks/opt/telephony/tests/telephonytests
Test: new TC runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/SimActivationTrackerTest.java

Merged-in: CHANGE-ID Ieefe2698fe6055a980d225f5ce74f52aef0daab4
Change-Id: Iac6418f66c9dad44dc7272ab19aa87f3eef232f8
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IPhoneStateListener.aidl
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/PhoneConstants.java
3b8f62b6027200932676fed5246cf3ee2afe863a 13-Feb-2017 Tyler Gunn <tgunn@google.com> Format Japanese numbers using national format when in Japan.

Similar to the like change for Korean phone numbers, ensure that when the
user is in Japan, Japanese phone numbers are formatted using the national
format rather than the international format.

Test: Unit
Bug: 27090466
Change-Id: I3487eea9fddbe7ee15c03da3f03d53f9dcea0834
ndroid/telephony/PhoneNumberUtils.java
12312f6d758ab0fcd1b5a1c7c885cf4997098402 14-Nov-2016 fionaxu <fionaxu@google.com> Add simActivationState to PhoneStateListener

- new public SimActivationState
- hook with PhoneStateListener, notifying registrants when voice&data
activation state changed

Bug: 31061369
Test: existing TC runtest --path frameworks/opt/telephony/tests/telephonytests
Test: new TC runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/SimActivationTrackerTest.java

Change-Id: Ieefe2698fe6055a980d225f5ce74f52aef0daab4
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IPhoneStateListener.aidl
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/PhoneConstants.java
8fbf6a29d088067bc8426a546854f9868efa2d6f 10-Feb-2017 Sooraj Sasindran <sasindran@google.com> Merge "Expose api to retrieve wakelock information per client"
4c8fc962dc06fcb2a60560229f1b5a2ffe7e5ad5 10-Feb-2017 Sooraj Sasindran <sasindran@google.com> Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp
am: cbbf530125

Change-Id: Id5ea5536246343a530f7579a31039421b3859de3
0fc0a7edf78dc0d1c655b40b34efa57e1c03a886 18-Jul-2016 Sooraj Sasindran <sasindran@google.com> Expose api to retrieve wakelock information per client

Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis

BUG=31041780
Merged-In: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Change-Id: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
ndroid/telephony/ClientRequestStats.aidl
ndroid/telephony/ClientRequestStats.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
ade9937437d6439ddd4c638975f2777f5ff541a9 09-Dec-2016 Brad Ebinger <breadley@google.com> Add UI prompt for MMI code failure on 3gpp

Some carriers do not support call forwarding MMI codes while roaming
on 3gpp networks. A new message has been added that clarifies this
to the user.

Test: Manual
Bug: 30106345
Merged-In: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
Change-Id: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
ndroid/telephony/CarrierConfigManager.java
335c89c22e11c9876b2cbb698e4c803ac60f7790 18-Jul-2016 Sooraj Sasindran <sasindran@google.com> Expose api to retrieve wakelock information per client

Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis

BUG=31041780
Merged-In: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Change-Id: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
ndroid/telephony/ClientRequestStats.aidl
ndroid/telephony/ClientRequestStats.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
58d8c5eb07a603ef2435c23228a0641fe03438ad 08-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 am: e55b11573e
am: 998655f80e

Change-Id: I01c5d8c15ce9377f126fc7268bd1a8ecee602dc8
998655f80edab71fbe5748c60ce1b791ed92cef1 08-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8
am: e55b11573e

Change-Id: Iffef42c4050bbda451e9cd99cb90589060b105bd
ca5cdb2d10cada9cf8c6eaaaaf3b1c2a2d0d11d1 01-Dec-2016 Tyler Gunn <tgunn@google.com> Change prototype for "setCamera" in IMS VideoProvider.

Changing "setCamera" prototype to include the uid.

Test: Unit test, manual test.
Bug: 32747443
Merged-In: I7e6eb617d724972b0fcbd2f9a27f5c3ee91efd2d
Change-Id: I7e6eb617d724972b0fcbd2f9a27f5c3ee91efd2d
om/android/ims/internal/IImsVideoCallProvider.aidl
46c9c133e02b3fa7b38de5648028250fa3984bd6 07-Feb-2017 Jack Yu <jackyu@google.com> Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2 am: 7eac8ec7c1
am: 84e84a73b7

Change-Id: I9aab25b14a5774ff5c7d64c5bc6a8aa5490d9ec0
84e84a73b71aae0c2cd322dead8b46b5214eec18 07-Feb-2017 Jack Yu <jackyu@google.com> Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2
am: 7eac8ec7c1

Change-Id: I8fdb5f13a50a0965cb2fbfd15212bc26e076054c
4dfa6d36304afe8c986fc3d925863b1c58feb423 26-Jan-2017 Jack Yu <jackyu@google.com> Renamed voiceNetworkStateChanged and dataNetworkStateChanged

The misleading voiceNetworkStateChanged should be renamed
to networkStateChanged to reflect either voice or data
network changes will trigger this indication.
And dataNetworkStateChanged should be renamed to
dataCallListChanged as well.

Test: Build
Merged-In: Icf20ceb3718794f7aa62650816714ac8679d101a
Change-Id: Icf20ceb3718794f7aa62650816714ac8679d101a
om/android/internal/telephony/RILConstants.java
fe485569e5631d7baeab12c09048c737d6bf4073 04-Feb-2017 Jack Yu <jackyu@google.com> Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
5819755163a53eda52b0c69faaa0aac3e7026386 03-Feb-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of d04c51ea372a to nyc-mr2-dev-plus-aosp

Test: Fix build.
Change-Id: I5808fc02502ced2195728ad146ef5523a8eb19ae
d04c51ea372ab9011999053cdab532b09284e531 03-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Add "wifi lost" disconnect cause." am: 802b0c8fd1
am: 4e26b8e75e

Change-Id: I783d8693258d31341d946fa1f20e4c744ee410b3
86b2fc248a4e879be40ce8a8bd0f70d03daf9068 03-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Add "wifi lost" disconnect cause."
87f208b3b3bc873c46800d77c42e285cfb586e95 30-Jan-2017 Tyler Gunn <tgunn@google.com> Add "wifi lost" disconnect cause.

New disconnect cause used when wifi call is dropped due to loss of wifi
connection.

Test: Manual, unit.
Merged-In: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
Bug: 32571209
Change-Id: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/DisconnectCause.java
om/android/ims/ImsReasonInfo.java
e07146920644fb10cf44d3eae06dbddf315cecb3 30-Jan-2017 Tyler Gunn <tgunn@google.com> Add "wifi lost" disconnect cause.

New disconnect cause used when wifi call is dropped due to loss of wifi
connection.

Test: Manual, unit.
Bug: 32571209
Change-Id: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/DisconnectCause.java
om/android/ims/ImsReasonInfo.java
015a2ede7256ef080c1f3548e2444de7a18523a5 01-Feb-2017 fionaxu <fionaxu@google.com> remove SIM_ACTIVATION_RESPONSE_CODE from sysapi

those response codes was introduced from N.
But only parts of the implementation was checked-in and has been
disabled since then. in O, we introduce the SimActivationTracker
inside telephonyFramework with a new set of activation status
which will replace those deprecated activation response code.

Bug: 31061369
Test: Manual
Change-Id: Idae5d7f6e76f36a60e602bf2ec48116b5748ca0f
ndroid/telephony/TelephonyManager.java
de56b1f00a8f8ded8bde7001cc59a2c277651ea8 25-Jan-2017 fionaxu <fionaxu@google.com> add an API for sending secret dialer code

Telephony provides an pulic API for sending secret
dialer code with the format of *#*#code*#*#.
This API only sent out broadcast for the default dialer app
and is backgound-check compliant.

Bug:33753947
Test: Manual
Change-Id: I10665828e88be07d96c7f2568a0c6878abe2e21b
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
cc778dae0db95249f7919f38eefc2da63002f6b4 28-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549 am: b5f2519abc
am: 18140a6784

Change-Id: I1c29dcbdd4f1f1f97bf2e3eb3a1f0bdc83613676
18140a67842641bbef469665d1a540f7836f031f 28-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549
am: b5f2519abc

Change-Id: I54c577f6c4bd68f6328572651315e056270ee807
e6ec7d8b8f0bd9875cbaff5aa1c3bc2b69e6cc51 24-Jan-2017 Brad Ebinger <breadley@google.com> Adds @hide ImsResolver API and device overlays (2/3)

- Adds config_ims_package device overlay, which specifies the default
package name to bind to.
- Adds config_dynamic_bind_ims device overlay, which determines
whether or not the new dynamic binding system is used.
- Adds @hide TelephonyManager API to interface with the ImsResolver

Test: Manual
Merged-In: I82a41da00e6da34629a40db431f13b968dfafe2e
Change-Id: I82a41da00e6da34629a40db431f13b968dfafe2e
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
e37ebbffb01042b667633362459c3a069575ad46 24-Jan-2017 Brad Ebinger <breadley@google.com> Adds @hide ImsResolver API and device overlays (2/3)

- Adds config_ims_package device overlay, which specifies the default
package name to bind to.
- Adds config_dynamic_bind_ims device overlay, which determines
whether or not the new dynamic binding system is used.
- Adds @hide TelephonyManager API to interface with the ImsResolver

Test: Manual
Change-Id: I82a41da00e6da34629a40db431f13b968dfafe2e
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
fff5f48dce4c8dc956e027f3ef3c5ecfd3ec3a10 26-Jan-2017 Jack Yu <jackyu@google.com> Renamed voiceNetworkStateChanged and dataNetworkStateChanged

The misleading voiceNetworkStateChanged should be renamed
to networkStateChanged to reflect either voice or data
network changes will trigger this indication.
And dataNetworkStateChanged should be renamed to
dataCallListChanged as well.

Test: Build
Change-Id: Icf20ceb3718794f7aa62650816714ac8679d101a
om/android/internal/telephony/RILConstants.java
0ce4b0e4c31a65864e0cda3c9d3fb6fe8a40f2ed 26-Jan-2017 Elliot Waite <elliotwaite@google.com> Fix @links in reference docs. am: 54de77470d am: ab978c035e am: 28ba4722a9
am: 9b21265b2c

Change-Id: If246ebdb36cf2832d5a6c42cbe752e290b6fb6e8
9b21265b2ce0f57796bffb241c008fff459d4b05 26-Jan-2017 Elliot Waite <elliotwaite@google.com> Fix @links in reference docs. am: 54de77470d am: ab978c035e
am: 28ba4722a9

Change-Id: I98177a8cf0a20677e140406bb7371474ca259e5b
28ba4722a9e77ce98de454ed2ac862e44f496632 26-Jan-2017 Elliot Waite <elliotwaite@google.com> Fix @links in reference docs. am: 54de77470d
am: ab978c035e

Change-Id: If0d0613362e0ea95cf48eaf9a16d3eea48b589ea
de2557f3696439f09ac7b3dfbd90c7b2ff2fe30d 26-Jan-2017 Elliot Waite <elliotwaite@google.com> Fix @links in reference docs. am: 54de77470d
am: ab978c035e

Change-Id: Ibec2b85708f9ff923156f4d867c9c2f71c75d41c
51a403525f5305d02029d86568c17d58f19ca870 26-Jan-2017 Ta-wei Yen <twyen@google.com> Merge "Add getVisualVoicemailPackageName() Make NMR2 voicemail columns public"
0f4a8ba209175bc61b9925508b4980cee3601f96 26-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Adding Dynamic ImsService Binding (1/3)" am: 8e6b13a1c0 am: 64057ab972 am: 2741442324
am: ded1df24e0

Change-Id: Ifd95efa076b7f5c8c8b02be7688aab1008bbc63c
ded1df24e01b7317593bbec84724b10f5444d5d9 26-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Adding Dynamic ImsService Binding (1/3)" am: 8e6b13a1c0 am: 64057ab972
am: 2741442324

Change-Id: Ibd5c988226e7994c332a7e7f8b40a9338cf84e0f
2741442324618804cca953e30251864142e6302d 26-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Adding Dynamic ImsService Binding (1/3)" am: 8e6b13a1c0
am: 64057ab972

Change-Id: I901c72a38b522c190e849de55078036adc80d8b6
54de77470de4f605eef7f4b4e01718b301fe275e 12-Jan-2017 Elliot Waite <elliotwaite@google.com> Fix @links in reference docs.

Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/TelephonyManager.java
024aaf23881c142ba92194a001ac038253ae708e 24-Jan-2017 Brad Ebinger <breadley@google.com> Adding Dynamic ImsService Binding (1/3)

Adds support for dynamic ImsService Binding (change 1/3). Included
in this change:
- AIDLs for ImsServiceController
- ImsFeature/ImsServiceBase definitions
- KEY_CONFIG_IMS_PACKAGE_OVERRIDE CarrierConfig option

Test: Unit Tests in opt/telephony
Bug: 30290416
Change-Id: Ic4cb1d85a29681b08a6a525c588a72209862dcc3
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/ims/ImsServiceBase.java
ndroid/telephony/ims/feature/ImsFeature.java
om/android/ims/internal/IImsServiceController.aidl
om/android/ims/internal/IImsServiceFeatureListener.aidl
ebd3aa0bb80d6d0af6f76e3487d0c3f1d7d00cd7 25-Jan-2017 Ta-wei Yen <twyen@google.com> Add APIs to hide voicemail settings.

With unbundle visual voicemail and dialer voicemail notification, the
dialer should be able to control the voicemail settings, and refer
telephony settings as "Advance settings" only showing the options
not in the public API.

This CL gives the default dialer the ability to hide duplicated
settings in telephony.

Bug: 34691905
Fixes 34691905
Test: CTS verifier test "hide public settings in voicemail"
"hide voicemail in call settings"
Change-Id: I6589c3d77b5075265cf013ee56524a342904ecd1
ndroid/telephony/TelephonyManager.java
a28dcbcd871ba3bb1fce4e2e4336712272d640e7 19-Jan-2017 pkanwar <pkanwar@google.com> Create Public API which exposes if the device is in a state where simultaneous
voice and data are possible.

BUG: 32912296
Test: Not required.
Change-Id: If603aa37c774157f0a3af12ca4ac6bafad94340d
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
a132bbd5a8651746d6fe3a4cd23e413785ed15d7 24-Jan-2017 Ta-wei Yen <twyen@google.com> Merge "Extend carrier configs for visual voicemail"
308bcec713f1dc246388adadf3159c7d877eb426 23-Jan-2017 Polina Bondarenko <pbond@google.com> Merge "Make TelephonyManager#get/setAllowedCarriers system api" am: 6d064d8780 am: cf176500e6
am: b46a93ff04

Change-Id: I8f17bef7ccde5953f5b810bd806fc51a4c69e194
b46a93ff041f902a194eef36701cdd8772a0be4f 23-Jan-2017 Polina Bondarenko <pbond@google.com> Merge "Make TelephonyManager#get/setAllowedCarriers system api" am: 6d064d8780
am: cf176500e6

Change-Id: Ic278e3a9bd7c9c99345150228c6e87343737079e
6d064d8780c4626d033c26fd87242080a2f1c768 23-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Make TelephonyManager#get/setAllowedCarriers system api"
812188ad06660ec1b3b2b027ccfa291335021664 20-Jan-2017 Ta-wei Yen <twyen@google.com> Add getVisualVoicemailPackageName()
Make NMR2 voicemail columns public

getVisualVoicemailPackageName() and the IS_OMTP_VOICEMAIL is used by
the voicemail UI to filter out voicemails not from the current visual
voicemail app, for example legacy telephony voicemails or previous
default dialer. These voicmails all represent the same source and are
likely duplicates.

BACKED_UP and RESTORED are used by the system dialer voicemail back
up and restore feature in NMR2. Since there are no API bump, it was
hidden and made public in this CL instead. See ag/1803794

ARCHIVED is used to prevent locally saved voicemails from being
deleted during a sync because it does not exist on the server.

Bug: 34463609
Fixes: 34463609
Bug: 32414216
Test: cts test android.provider.cts.VoicemailContractTest
android.telephony.cts.VisualVoicemailServiceTest

Change-Id: Iec1e499e763ad92f4a822715b6022e9cbe557c11
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
22e1cbad24cdc7f207124221a8d169e8c7d680f7 20-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Make TelephonyManager#get/setAllowedCarriers system api"
038bea5dd1370ec0e2c76d69fd80ff275059224a 20-Jan-2017 Chen Xu <fionaxu@google.com> Merge "Initial change on carrier signal filtering" am: bfdce89f36 am: 1507930691
am: 923046251b

Change-Id: I0762a7787c4136de027f8ee5def592bc85be25b6
923046251b9b3014ca5ba39f9273454a4f2b3c28 20-Jan-2017 Chen Xu <fionaxu@google.com> Merge "Initial change on carrier signal filtering" am: bfdce89f36
am: 1507930691

Change-Id: I2edbdbd65fd90215b39e1b5f4a888c9df119b841
86663d3c26f77eb815979ca7d4f2b19bfc1eab04 20-Jan-2017 Chen Xu <fionaxu@google.com> Merge "Initial change on carrier signal filtering"
80909ce33301499352e6274028f7389d67e904f6 12-Jan-2017 Polina Bondarenko <pbond@google.com> Make TelephonyManager#get/setAllowedCarriers system api

Make TelephonyManager#get/setAllowedCarriers system api under
PackageManager#FEATURE_TELEPHONY_CARRIERLOCK feature flag.

Bug: 33480084
Test: cts

Change-Id: I1ce77a9e3801bd4003b52887d0a36866e5a5b81a
ndroid/telephony/TelephonyManager.java
d5cfe6cdf1290976158e55f39b95d082c56da56e 12-Jan-2017 Polina Bondarenko <pbond@google.com> Make TelephonyManager#get/setAllowedCarriers system api

Make TelephonyManager#get/setAllowedCarriers system api under
PackageManager#FEATURE_TELEPHONY_CARRIERLOCK feature flag.

Bug: 33480084
Test: cts

Merged-In: I1ce77a9e3801bd4003b52887d0a36866e5a5b81a

Change-Id: I1ce77a9e3801bd4003b52887d0a36866e5a5b81a
ndroid/telephony/TelephonyManager.java
3e713e090cfb3245d6369af4abc4443e894358c3 18-Nov-2016 fionaxu <fionaxu@google.com> Initial change on carrier signal filtering

- add new carrier config
- configure defaultcarrierapp as the default receiver for redirection
signal

Bug: 30958215
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony

Change-Id: I094c39fe21e6883d2acef8f7479b948fc77ce14e
Merged-In: CHANGE-ID I14bb1a885d1eaca9a144eb1e1caca72339d67d2e
ndroid/telephony/CarrierConfigManager.java
41ca937397e3cd6b302d5b481b3316fabeda69f4 18-Nov-2016 fionaxu <fionaxu@google.com> Initial change on carrier signal filtering

- add new carrier config
- configure defaultcarrierapp as the default receiver for redirection
signal

Bug: 30958215
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony

Change-Id: I14bb1a885d1eaca9a144eb1e1caca72339d67d2e
ndroid/telephony/CarrierConfigManager.java
b618d0f94ccb454531aa5922cd61adaa899561ca 17-Jan-2017 Ta-wei Yen <twyen@google.com> Extend carrier configs for visual voicemail

This CL make the hidden config values in N MR1 public.

Test: constant changes
Bug: 34132192
Change-Id: Iff3f98a01ccd59edd809e5c7de0cdb445dee4d35
ndroid/telephony/CarrierConfigManager.java
9e3a4957fc75f9bb80e633e71d9512d401ec609b 17-Jan-2017 Ta-wei Yen <twyen@google.com> Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23bb am: ea0e111468
am: 89a85b0683

Change-Id: I24966bccbea07ac42d4199d71c59c76ae19c967a
89a85b06832ed7dc8b49c8a1f4eb063a964c12af 17-Jan-2017 Ta-wei Yen <twyen@google.com> Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23bb
am: ea0e111468

Change-Id: Ie40ccdc2ad2a30e8bbf3d6a6c4013ff5faf10cdd
68d03b23bb6e177ee988fa81099bd87fb12580e7 17-Jan-2017 Ta-wei Yen <twyen@google.com> Merge "Add getNetworkSpecifier() and getCarrierConfig()"
55b6e279ae18e2551a701ca1d369a267d33e8903 17-Jan-2017 Polina Bondarenko <pbond@google.com> Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8 am: e2b306e30e am: d4c48e911e
am: 55745eca73

Change-Id: I273a1a3ae6d59e52bae6c529a6c0ef43c904b78a
55745eca73eea3362bc8d1d737cee1ffb382326f 16-Jan-2017 Polina Bondarenko <pbond@google.com> Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8 am: e2b306e30e
am: d4c48e911e

Change-Id: Iac1e5f257d6a8263c78af8d9199848244fe6d93c
d4c48e911ecd99b8bbb0e8790b0339ae69bb9cbc 16-Jan-2017 Polina Bondarenko <pbond@google.com> Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8
am: e2b306e30e

Change-Id: Ida4807876ce741a211189e41e92383404b6a3a3c
dc61ad0ad8455d87883768eb9146cf2dbf9ba128 16-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Make TelephonyManager.getImei a system APIs."
eca691efcb41324e0e62901293889b32cd11cd7e 30-Dec-2016 Ta-wei Yen <twyen@google.com> Add getNetworkSpecifier() and getCarrierConfig()

This allows making network request and getting carrier config on a
specfic SIM.

Bug: 32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Merged-In: Id52688d73b74bc55ee2da71a22454957fdd7b57b
Change-Id: Iebe2d883e193afdde13303d76014dfd7f4fb06dd
ndroid/telephony/TelephonyManager.java
66d2aa05d5db1c00057559983bf3bc21413e3698 13-Jan-2017 Chen Xu <fionaxu@google.com> Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd am: 1d0877f59e am: c90dc2072c
am: 10839091d9

Change-Id: I2a09577e0912c1d6ff324f0471b4a2012656749a
10839091d9b8c968bac4cb5c7a17c166a5ebeb1c 13-Jan-2017 Chen Xu <fionaxu@google.com> Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd am: 1d0877f59e
am: c90dc2072c

Change-Id: Ie694f05799bfeb123c7d12477855237444dff415
c90dc2072ccfd690666c0683f791c2d8be4de86a 13-Jan-2017 Chen Xu <fionaxu@google.com> Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd
am: 1d0877f59e

Change-Id: I1df7d283d8339065d4418af562775c3aea56a707
4533b1ccdd207f232b1311961cac6680682a56e8 13-Jan-2017 Chen Xu <fionaxu@google.com> Merge "Default Carrier app for traffic mitigation"
a21a87b7a4153839cebb3152d0003ee86d7a5252 14-Dec-2016 fionaxu <fionaxu@google.com> Default Carrier app for traffic mitigation

- have the basic function working, support traffic mitigation and
captive portal login
- support carrier customization, OEM could configure a list of carrier
actions to act upon certain signals
- unit test

Test: Manual test with live sim card & runtest --path
frameworks/base/packages/CarrierDefaultApp
Bug: 30958215

Change-Id: Ie99be3b95e8a1dd60fc51bef703836478fbde09d
ndroid/telephony/CarrierConfigManager.java
a5a2e6d1b1caca62e73a5cc0cb24dd3549ba1905 13-Jan-2017 Ta-wei Yen <twyen@google.com> Merge "Add getNetworkSpecifier() and getCarrierConfig()"
f2991534876bdc7bc8de456760732017d2bbfdf0 13-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 am: 503d8fbb26
am: 907585c004

Change-Id: I05a4da02d0253eec03174277be22fc2daabad774
907585c0043e6940838c4bb502d26d3d419e5592 13-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375
am: 503d8fbb26

Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
503d8fbb26e27fd5943011fe6431bbf634a36ade 13-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Add support for FDN contact dial" am: 082b118641
am: 24dea10375

Change-Id: I5091d35ff79eff952c57109ce120369c95309598
082b1186415e0d2b6d9109938b5494b4d69aba99 13-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Add support for FDN contact dial"
cc68f0409ad3cd26f4998101f8382dbd900c655a 12-Jan-2017 Ta-wei Yen <twyen@google.com> Add getNetworkSpecifier() and getCarrierConfig()

cherry-pick of https://android-review.googlesource.com/#/c/318111/

This allows making network request and getting carrier config on a
specfic SIM.

Bug: 32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Change-Id: Iebe2d883e193afdde13303d76014dfd7f4fb06dd
Merged-In: Iebe2d883e193afdde13303d76014dfd7f4fb06dd

# Conflicts:
# telephony/java/android/telephony/TelephonyManager.java
ndroid/telephony/TelephonyManager.java
11765b3fcc776ca93eb9cf7b024a7c09b7d7555c 11-Jan-2017 Jordan Liu <jminjie@google.com> Merge "Fix naming of key" am: 0b74a1dabb am: c68c2f6885
am: 1d67d022fb

Change-Id: I6165395ac186baac90c2d08d7c7114c7b5bc72d3
1d67d022fb5f49ce88bae26d1175c1f391b025d6 11-Jan-2017 Jordan Liu <jminjie@google.com> Merge "Fix naming of key" am: 0b74a1dabb
am: c68c2f6885

Change-Id: Ibdd5177ea43ee9c2ea5603363429a7207a59d5ba
7c4bfb28d113022acb8afea8f7f77736871b979c 04-Jan-2017 Jordan Liu <jminjie@google.com> Fix naming of key

CarrierConfig Keys should start with "KEY_".

Test: runtest carrierconfig-unit
Change-Id: I317cdb53a09851a5e1a3832140c7dc28a5cde4a4
Merged-In: Iebb11739ae16e56fe1a0b2fdc9a3e005a71858dc
ndroid/telephony/CarrierConfigManager.java
7751269d37c571716573081da425937ea1fdbdec 03-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> resolve merge conflicts of e6b6653da899 to nyc-mr2-dev-plus-aosp
am: 5f0dad0e64

Change-Id: Icbd5899dd0c8a35be4c290b3aeab29d46c64e1c0
5f0dad0e647be543d30904aae38dacc0cf0799f8 03-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> resolve merge conflicts of e6b6653da899 to nyc-mr2-dev-plus-aosp

Change-Id: Ifbbe0d2758ab25aee7001412f71b0445c62cbdac
e6b6653da899890f2e44071915d1fa0f851290e9 03-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Add IMEI_NOT_ACCEPTED disconnect cause" am: 43ced5941e
am: 14a5b810b6

Change-Id: Ib7a87a5028975e8f55dd6ba311cde78a3c1c2460
43ced5941e1e9317cec43cccbd1319cefdf33d11 03-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Add IMEI_NOT_ACCEPTED disconnect cause"
ca9eed431525a98e781e3ba99abce6612ae972db 28-Dec-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add VisualVoicemailService"
dfee8e5f2d7b4bce4d2d3cd85e8a4505b321747f 22-Dec-2016 Joe LaPenna <jlapenna@google.com> Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902
am: 715acea102

Change-Id: I44bc0113697be113ef79ac9a904485b49bed2f87
715acea102b6122b675151caa0741f6919f4d075 22-Dec-2016 Joe LaPenna <jlapenna@google.com> Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f
am: 6f87331902

Change-Id: I3681893e43949060922f72c65f8f106090005d14
3070dbfae67ab5a1fe9597bac1a196c413f8e310 22-Dec-2016 Meng Wang <mewan@google.com> Merge "Add API for reporting IMS registration failures"
5e0164e16c0b7fd5bf104bb6648f954910a9ef7d 22-Dec-2016 Joe LaPenna <jlapenna@google.com> Add simplified_network_settings_bool to CarrierConfig.

Some carriers want to further simplify network settings based on a
variety of wifi or cellular related bundles. Expose a config a
carrier might set to allow SysUi, Settings and platform to adjust.

BUG: 33111931
Test: runtest carrierconfig-unit
Change-Id: I35a7ef15bbba23cf9e0380432fc001804c7e1804
Merged-In: I35a7ef15bbba23cf9e0380432fc001804c7e1804
ndroid/telephony/CarrierConfigManager.java
6e4d2890de20b3ea13f0e48fffa5f926f7e5553f 22-Dec-2016 Joe LaPenna <jlapenna@google.com> Add simplified_network_settings_bool to CarrierConfig.

Some carriers want to further simplify network settings based on a
variety of wifi or cellular related bundles. Expose a config a
carrier might set to allow SysUi, Settings and platform to adjust.

BUG: 33111931
Test: runtest carrierconfig-unit
Change-Id: I35a7ef15bbba23cf9e0380432fc001804c7e1804
ndroid/telephony/CarrierConfigManager.java
f979b94815835015a7667f8461c04ee30b800e6c 21-Dec-2016 Brad Ebinger <breadley@google.com> Adds custom call forwarding block while roaming carrier config key
am: eab25ae197

Change-Id: Ic638971c4bae7b496e94431ae2c0f35a22261896
eab25ae1970351f2937db81ef360d9981c9c7060 12-Dec-2016 Brad Ebinger <breadley@google.com> Adds custom call forwarding block while roaming carrier config key

Adds support for supplying custom call forwarding prefixes in the carrier
config. When a prefix supplied in the carrier config is matched to the number
being dialed, we do not complete the call and instead show an error message
on the dialer UI.

Test: Manual
Bug: 30458052
Merged-In: I3149a565b0fd631d69ab0c0f27be509237b80177
Change-Id: I3149a565b0fd631d69ab0c0f27be509237b80177
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/DisconnectCause.java
57c781417fe1b94bd57c29112324325d88548c78 20-Dec-2016 Hall Liu <hallliu@google.com> Merge "Adds carrier config to determine if high definition audio is displayed" am: 26e5096364
am: fc125a319e

Change-Id: I305223c2a5499b9fdf2f1f59ddfda40712cd6172
26e50963641189733f32362b8db39a3a6f1e19fd 20-Dec-2016 Hall Liu <hallliu@google.com> Merge "Adds carrier config to determine if high definition audio is displayed"
9ab43212ca836f8d90e8c84c15563320aef6a624 12-Dec-2016 Brad Ebinger <breadley@google.com> Adds custom call forwarding block while roaming carrier config key

Adds support for supplying custom call forwarding prefixes in the carrier
config. When a prefix supplied in the carrier config is matched to the number
being dialed, we do not complete the call and instead show an error message
on the dialer UI.

Test: Manual
Bug: 30458052
Change-Id: I3149a565b0fd631d69ab0c0f27be509237b80177
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/DisconnectCause.java
721847320b48645cec26247c55cbcc0c6b6215d8 19-Dec-2016 Brad Ebinger <breadley@google.com> Add UI prompt for MMI code failure on 3gpp
am: ac8d8e7358

Change-Id: Id83a2fa2dd958a0fbfcb2d5eb90528bcf96737b8
f1adc1db84084054637701dc8e759f07873d61d4 17-Dec-2016 Junda Liu <junda@google.com> resolve merge conflicts of 0c62aa5 to master

Change-Id: Ie032d5ab4ec0f1c038adfc5a0d506efe7a9248f0
ac8d8e7358cf3544af95bc566032eee2d317f7ee 09-Dec-2016 Brad Ebinger <breadley@google.com> Add UI prompt for MMI code failure on 3gpp

Some carriers do not support call forwarding MMI codes while roaming
on 3gpp networks. A new message has been added that clarifies this
to the user.

Test: Manual
Bug: 30106345
Merged-In: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
Change-Id: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
ndroid/telephony/CarrierConfigManager.java
0c62aa5f108bd59ba6d5706abef1ddf9604ee04d 16-Dec-2016 Junda Liu <junda@google.com> Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL.
am: 6bb22e3de2

Change-Id: I8228c805c69189966b0b4f12d11ab7c5564766c4
565fcb4b95d9916655bc333c9a2e4931f571580b 16-Dec-2016 Junda Liu <junda@google.com> Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev
485d6dec93579d2186a3ecd57c2b5af4ce8e622b 16-Dec-2016 Ta-wei Yen <twyen@google.com> Add VisualVoicemailService

VisualVoicemailService can be implemennted by the default dialer to
provide a visual voicemail client similar to the OMTP visual voicemail
spec.

Other APIs such as the SMS filter and hidden text SMS sending are made
public and consolidated into the service interface.

Test: make. CTS tests in a follow up CL
Change-Id: Ib5e9aa15fc098f4c13b15e5dbecf9ab646e0e400
ndroid/telephony/TelephonyManager.java
ndroid/telephony/VisualVoicemailService.java
ndroid/telephony/VisualVoicemailSms.java
ndroid/telephony/VisualVoicemailSmsFilterSettings.java
om/android/internal/telephony/ITelephony.aidl
bcdc5d748ed029ba14bd1be51f4a7983db9f6214 16-Dec-2016 Polina Bondarenko <pbond@google.com> Merge "Make TelephonyManager APIs public:" am: 441bfc6718 am: 104a5c7a34 am: bab9a7e66e
am: f5088c0d77

Change-Id: Ic6db847259207210f000a3463928e97dbae1b4f8
f5088c0d77b3c79ed06f77ec453810d112f0321a 16-Dec-2016 Polina Bondarenko <pbond@google.com> Merge "Make TelephonyManager APIs public:" am: 441bfc6718 am: 104a5c7a34
am: bab9a7e66e

Change-Id: Ie57e56db0d87968524bc7dc39b2d1061c4ec88b3
bab9a7e66e9e39cb84e42f76c3a4b95b17eef091 16-Dec-2016 Polina Bondarenko <pbond@google.com> Merge "Make TelephonyManager APIs public:" am: 441bfc6718
am: 104a5c7a34

Change-Id: I0d234fd2539a3a9ec58c820a7a7428430aa2255a
441bfc6718a5f8afdc26f5f13666e0b297c54d7b 16-Dec-2016 Treehugger Robot <treehugger-gerrit@google.com> Merge "Make TelephonyManager APIs public:"
f294be149aaee259a3246e45d88724073da6bc7c 01-Mar-2016 Wei Huang <wei.x.huang@sonymobile.com> Adds carrier config to determine if high definition audio is displayed

Adds a carrier config option to remove HD audio property from a
connection so that HD audio related UI is not displayed
even if connection has High Definition audio support.

Bug: 28654645
Bug: 33062999
Change-Id: Ie2acb3be556b750849c25b856cf9382cf4ebb8d9
Merged-In: I71f35854d35ae73741a36c0e2106695b04471b2e
ndroid/telephony/CarrierConfigManager.java
0a26ddc7a33322876a304a330596a257661f905e 16-Dec-2016 Wei Huang <wei.x.huang@sonymobile.com> Adds carrier config to determine if high definition audio is displayed
am: f84a966106

Change-Id: I030077b8f9a8fa9f05d1a71f051cd19059c54bab
933a594c9f04401343e63554a82886dcf8495a79 13-Dec-2016 Polina Bondarenko <pbond@google.com> Make TelephonyManager.getImei a system APIs.

It is needed for OobConfig app unbundling.

Bug: 33480907
Test: cts
Change-Id: I523416d23ec504ce44051df384d7df4f99e93002
ndroid/telephony/TelephonyManager.java
f84a966106dbfaa9bba81dbd2e6ef02f6085a89b 01-Mar-2016 Wei Huang <wei.x.huang@sonymobile.com> Adds carrier config to determine if high definition audio is displayed

Adds a carrier config option to remove HD audio property from a
connection so that HD audio related UI is not displayed
even if connection has High Definition audio support.

Bug: 28654645
Bug: 33062999
Change-Id: I71f35854d35ae73741a36c0e2106695b04471b2e
ndroid/telephony/CarrierConfigManager.java
17acc15ca4cbe9fa064bb3a665ec006805538e3d 09-Dec-2016 Brad Ebinger <breadley@google.com> Add UI prompt for MMI code failure on 3gpp

Some carriers do not support call forwarding MMI codes while roaming
on 3gpp networks. A new message has been added that clarifies this
to the user.

Test: Manual
Bug: 30106345
Change-Id: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
ndroid/telephony/CarrierConfigManager.java
6bb22e3de25b4a4825727305950d3c2c28b0c9e1 13-Dec-2016 Junda Liu <junda@google.com> Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL.

Default false. If true, will allow use edited tether APN to take effect.

Bug: b/30622475
Change-Id: I526e41e816582e1c5219600d74980fd7754361e6
ndroid/telephony/CarrierConfigManager.java
a6dba0ab3546e07e2de9070a402faf4e01bf8d7a 13-Dec-2016 Polina Bondarenko <pbond@google.com> Make TelephonyManager APIs public:

TelephonyManager.getSimState(slotIdx) and
TelephonyManager.SIM_STATE_CARD_RESTRICTED.

It is needed for OobConfig app unbundling.

Bug: 33479833
Test: run cts -m CtsTelephonyTestCases
Change-Id: I375f436bc4e1dcedc0656866a0838c7bf5948422
ndroid/telephony/TelephonyManager.java
fdff93052e8e3cf168e7b7f40d52abe78c6f7540 12-Dec-2016 Joe LaPenna <jlapenna@google.com> Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395 am: 2bc66bf601 am: b52989c736
am: b0977f52a6

Change-Id: I3c1db8b94e35bc4bb3df17fa2e6e1a3af6683e4a
b0977f52a60d3adc30848f91c6cac4a353e98c95 12-Dec-2016 Joe LaPenna <jlapenna@google.com> Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395 am: 2bc66bf601
am: b52989c736

Change-Id: I06dcc86f7e11e0db205f712b41dd3e7d0194bb36
b52989c736b3278f1ab5f6a9db8e555f40b99585 12-Dec-2016 Joe LaPenna <jlapenna@google.com> Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e0395
am: 2bc66bf601

Change-Id: Idaa23641c8e95890271c554dee0244702601a109
2b22ae3b8723e951ee2ba4031d5753c7bed10eb0 08-Dec-2016 Joe LaPenna <jlapenna@google.com> Add simplified_network_settings_bool to CarrierConfigManager.

BUG: 33111931
Test: runtest carrierconfig-unit
Change-Id: I3da3048afcf1547c46db5c76ff68165246faa77a
ndroid/telephony/CarrierConfigManager.java
07b64b8a40a3c53aa4a01992ef25efe7c875d302 07-Dec-2016 Dheeraj Shetty <dshetty@codeaurora.org> Add API for reporting IMS registration failures

Add ImsRegistrationListener API to report registration failures in
the following scenarios:
1. Idle mode failures - new IMS registration.
2. Ims registration handover failures - Handover of IMS registration
from one radio technology to another.

Bug: 33430556
Test: m
Change-Id: Ie3bafec41c0198a66aa3ebca660a2a060e511c39
om/android/ims/internal/IImsRegistrationListener.aidl
ffd4583e175f16a8d2bc6abeb676bbeb4dd8b03d 12-Dec-2016 pkanwar <pkanwar@google.com> Add notification delay for when the user needs cannot
register to a network and needs to be notified. Merged from NYC.

BUG: 28572539
Test: n/a
Change-Id: I4eae9bacda9c159446f75f5bee73659af960e1a7
ndroid/telephony/CarrierConfigManager.java
5a34b7489ebafd67189d058e04071de6fcd2e6c3 10-Dec-2016 Dheeraj Shetty <dshetty@codeaurora.org> DO NOT MERGE API for reporting IMS registration failures
am: a62a1302ee

Change-Id: Iad3a0ab889618cc329517b102067f5b26ed96ee0
8f1a57f94357efc19bf87fbf3321cd7cd460afd6 10-Dec-2016 Meng Wang <mewan@google.com> Merge "DO NOT MERGE API for reporting IMS registration failures" into nyc-mr2-dev
87b29367a2611210647c865bd1c643211641780e 11-Nov-2016 Johan Redestig <johan.redestig@sonymobile.com> Add IMEI_NOT_ACCEPTED disconnect cause

Bug: 33263903
Test: manual (simulated error code from the network)
Change-Id: I3c01b0ad5d55f30b4a52845f09c801358e977a01
ndroid/telephony/DisconnectCause.java
a62a1302eecf6b7c7ca4908db6810bd8be1185cb 07-Dec-2016 Dheeraj Shetty <dshetty@codeaurora.org> DO NOT MERGE API for reporting IMS registration failures

Draft API to report registration failures in the following
scenarios:
1. Idle mode failures - new IMS registration.
2. Ims registration handover failures - Handover of IMS registration
from one access technology to another.

Bug: 33430556
Change-Id: Ie3bafec41c0198a66aa3ebca660a2a060e511c39
om/android/ims/internal/IImsRegistrationListener.aidl
ec5b6e32327890222302c509c1ef58480cf7bab7 02-Dec-2016 Tyler Gunn <tgunn@google.com> Add carrier configuration options to allow enforcing max conference size.

Adding carrier config options to to allow enforcing a maxmimum size for
IMS conferences.
Also adding small performance enhancement to setConferenceables so that
if the list of conferenceable connections does not change it does not
send an update to listeners.

Test: Manual
Bug: 29548224
Change-Id: I109c91c4147814547bb75003d312d81d41a52c13
ndroid/telephony/CarrierConfigManager.java
88c68423afc52dfa4c560604c3fd08bfba761ee0 06-Dec-2016 Jordan Liu <jminjie@google.com> Treat the mdn as an additional voicemail number
am: 360d5674bd

Change-Id: Idbfdf0086d101e6c246ecee7572c6dbf2702574e
7ba6d21aac5d268e70b49a9d767e0144e15d57e4 06-Dec-2016 Jordan Liu <jminjie@google.com> Merge "Treat the mdn as an additional voicemail number" into nyc-mr2-dev
b65452c18fa3b933c6dc8c8c4a414cacd418f92f 06-Dec-2016 pkanwar <pkanwar@google.com> DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified.
am: 34be302f2a

Change-Id: I18f1ed3a4e8b6a923e5733fe38566d4484d1c310
34be302f2ab5159a89f6c11bc313a2740d9fa962 06-Dec-2016 pkanwar <pkanwar@google.com> DO NOT MERGE: Add notification delay for when the user needs cannot register to a
network and needs to be notified.

BUG: 28572539
Change-Id: Iabf5e4476a1c5b02d1de38695f7125ee888dadd9
ndroid/telephony/CarrierConfigManager.java
48829f90d6b60bb08a14d3b2aa12d8422f3aafce 06-Dec-2016 Chad Brubaker <cbrubaker@google.com> Merge "Add single use App specific incoming SMSes"
360d5674bd68cab21ee4a6959ea7ef2d9aced085 09-Nov-2016 Jordan Liu <jminjie@google.com> Treat the mdn as an additional voicemail number

Use carrier config to specify whether the carrier treats the mdn as an
additonal voicemail number.

Change-Id: I7192a3505da87d6b50a100e041d2b502cf37e113
Merged-In: I7192a3505da87d6b50a100e041d2b502cf37e113
Fix: 29145323
Test: build and flash on device
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
408f695c9809f6731cafabf20b653fa8b699c49f 05-Dec-2016 Jordan Liu <jminjie@google.com> Merge "Treat the mdn as an additional voicemail number"
d69f90e0f9a3bccfe9b999a385372c2108124f6b 02-Dec-2016 Tyler Gunn <tgunn@google.com> Merge "Change prototype for "setCamera" in IMS VideoProvider."
35366bec53eec4246956f3fa19bbc2a9eecff96f 02-Dec-2016 Jordan Liu <jminjie@google.com> Merge "Rename key declaration to start with "KEY""
2232ac8c592a3ef5b9329dbc09ebc45170e87132 02-Dec-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Get the correct operator name"
am: 297e9f9a32

Change-Id: Ic4c433e9b7e70427275fbbba785bb365e0ced8d5
297e9f9a32bdd7c546e4eb5b1c2f90d1c20ae076 02-Dec-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Get the correct operator name"
2900d4d155cadc374ef51807681a4c21a0e86af6 21-Nov-2016 Chad Brubaker <cbrubaker@google.com> Add single use App specific incoming SMSes

This allows applications to request that an upcoming incoming SMS be
routed directly to the calling application and to do so without
needing the RECEIVE_SMS permission.

This is especially important for ephemeral applications which we do not
want to have the ability to get the RECEIVE_SMS permission but do want
to support SMS based phone number verification. Ephemeral apps can use
this API to receive and SMS from their backend but will not be able to
access other SMSes on the device.

This is done by providing the app a token which when included in a
subsequent SMS message causes the application provided PendingIntent to
be sent with the SMS message data attached.

Test: Verified that an SMS containing the code is routed to the app.
Test: runtest --path GsmInboundHandlerTest.java
Test: cts-tradefed run cts -m CtsPermission2TestCases

Bug: 33047670
Change-Id: Iea60bfd1d3f9b8f013b34a82a480c65006416c4c
om/android/internal/telephony/ISms.aidl
fc36f2f2603f1e21991a687c65f08a53e295d8e4 01-Dec-2016 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Get the correct operator name
am: 67f579be19

Change-Id: Ia822adfdcfa47f7ec0b95cc44b48ab3a1bd75961
47495ebad04c6f93af299d3f2713d14421eda73d 02-Nov-2016 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Get the correct operator name

If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Merged-In: I4983ad708c57a650ce4a806e1f53837825bad2db
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
ndroid/telephony/ServiceState.java
6f8577e31930308689d120b6cd3dfd708e9202c8 01-Dec-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Get the correct operator name"
1ca2e31d82d9ab386b5d668acd963bf6dd420bd7 01-Dec-2016 Jordan Liu <jminjie@google.com> Rename key declaration to start with "KEY"

CarrierConfigTeset validates carrier_config xmls by comparing them to
static fields starting with "KEY_" declared in CarrierConfigManager.
This commit renmaes the key so the test passes.

Change-Id: Iebb11739ae16e56fe1a0b2fdc9a3e005a71858dc
Test: runtest carrierconfig-unit
ndroid/telephony/CarrierConfigManager.java
6b6d5dadfa2fce42df9c7f6445e1b1c9c970d426 02-Nov-2016 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Get the correct operator name

If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Test: ServiceStateTrackerTest extended on partner CL.
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
ndroid/telephony/ServiceState.java
67f579be19e548932137480ae0311b6d627b27e4 02-Nov-2016 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Get the correct operator name

If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Test: ServiceStateTrackerTest.java exteneded in partner cl
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
ndroid/telephony/ServiceState.java
7075269195a7fca25624fb1158b994a512f6a97f 01-Dec-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add READ_PHONE_NUMBER permission"
eb909ee096183c2d9ffce75134d562867430550c 01-Dec-2016 nharold <nharold@google.com> Merge "Expose GSM Timing Advance, Update LTE TA docstring" am: 4134ccb214 am: 8fabfd639e am: 64a8a387a4
am: 729a5ae511

Change-Id: Id046a2fbf946f7b42dd56763a8b403cbde802d7e
729a5ae51190ce1ddb6d76d1cd0c5dfaead89f3c 01-Dec-2016 nharold <nharold@google.com> Merge "Expose GSM Timing Advance, Update LTE TA docstring" am: 4134ccb214 am: 8fabfd639e
am: 64a8a387a4

Change-Id: Iafad7ea7bd6a3bcc3aac28409f34b4f00008d828
64a8a387a4b564e97da624890da247b03037a782 01-Dec-2016 nharold <nharold@google.com> Merge "Expose GSM Timing Advance, Update LTE TA docstring" am: 4134ccb214
am: 8fabfd639e

Change-Id: I6d69cc6ce34ed1acf1f19e760631850b2cf2446c
a4b4e731d18d92ff0f267cf8c17632679b007e11 01-Dec-2016 Jordan Liu <jminjie@google.com> resolve merge conflicts of a578ae2 to stage-aosp-master am: cee0c941ed
am: 0672ea446d

Change-Id: I441ab7f8fd1fb71cc1bf38fe7450a0f9ecdccee0
0672ea446d2de2e862aee1f2cd957a907efd194e 01-Dec-2016 Jordan Liu <jminjie@google.com> resolve merge conflicts of a578ae2 to stage-aosp-master
am: cee0c941ed

Change-Id: I39f3256a13117c2afe6872f58f57c18c308eab30
8fabfd639e1a32965662502157fd4d914b01be96 01-Dec-2016 nharold <nharold@google.com> Merge "Expose GSM Timing Advance, Update LTE TA docstring"
am: 4134ccb214

Change-Id: Ic60953cebd3209b1320ed4b6723809d0421ebc27
a6a0070ca7d2dd2882151ecf20569e715d21c722 01-Dec-2016 Tyler Gunn <tgunn@google.com> Change prototype for "setCamera" in IMS VideoProvider.

Changing "setCamera" prototype to include the uid.

Test: Unit test, manual test.
Bug: 32747443
Change-Id: I7e6eb617d724972b0fcbd2f9a27f5c3ee91efd2d
om/android/ims/internal/IImsVideoCallProvider.aidl
cee0c941ed9c8fdb1379dcc92c3d75ef5f39750d 30-Nov-2016 Jordan Liu <jminjie@google.com> resolve merge conflicts of a578ae2 to stage-aosp-master

Change-Id: I344ce44711edee385c64de4e6c52c64e6901820d
73ec8f963d46ea96a5a4d63d3086a362bf345320 10-Nov-2016 Chad Brubaker <cbrubaker@google.com> Add READ_PHONE_NUMBER permission

READ_PHONE_NUMBER allows only access to the phone number and not all the
other things that READ_PHONE_STATE allows access to. READ_PHONE_NUMBER
will be accessible to ephemeral apps while READ_PHONE_STATE will no
longer be.

Test: Verified that getLine1Number works with READ_PHONE_NUMBER from an
epemheral app
Test: cts-tradefed run cts -m CtsPermission2TestCases
Change-Id: I599c19227f886adbe8efe346a78d51e88ab46379
ndroid/telephony/TelephonyManager.java
4134ccb2145b3a4eb6b1027a487e01795d855d31 30-Nov-2016 nharold <nharold@google.com> Merge "Expose GSM Timing Advance, Update LTE TA docstring"
a578ae2aa178883acf34537eb838bc54d75f065a 30-Nov-2016 Jordan Liu <jminjie@google.com> Merge "Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY"
f6414d42e42268c2229aab540b4a1ec695780686 30-Nov-2016 pkanwar <pkanwar@google.com> Allow Carriers to specify Wifi Networks.
am: 1ec8fe940f

Change-Id: I8bd0366bbbfd391af8328cf7bd1a2f81efb9a0d7
d0063aeb1bfbc5d9a0bc8188251e0523ee690d17 23-Nov-2016 pkanwar <pkanwar@google.com> Allow Carriers to specify Wifi Networks.

Bug: 31003437
Test: No test required.
Change-Id: I661f8fc9924e677b9ac08c70500bd175d30834fa
ndroid/telephony/CarrierConfigManager.java
1ec8fe940f866c3baa1dfab3d86bc5cfa40861a2 23-Nov-2016 pkanwar <pkanwar@google.com> Allow Carriers to specify Wifi Networks.

Bug: 31003437
Change-Id: I661f8fc9924e677b9ac08c70500bd175d30834fa
ndroid/telephony/CarrierConfigManager.java
1cea0c249d4180a5883d121ebbf6857379e5294f 23-Nov-2016 Jeff Davidson <jpd@google.com> Merge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d6227782 am: fa8e6c0f5a
am: b369ad4b19

Change-Id: I0ed5ac68a7974ade21b1d6aa2279fde179070c0c
b369ad4b19c083e0a0884810a31c3f36316199db 23-Nov-2016 Jeff Davidson <jpd@google.com> Merge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d6227782
am: fa8e6c0f5a

Change-Id: I55d2e8ffcf70aad48acdf1fa97da5b2874d26925
fa8e6c0f5a3273f5cd1e2ddb1b41ae6a8e03467d 23-Nov-2016 Jeff Davidson <jpd@google.com> Merge "Expose TelephonyManager#{set,get}DataEnabled."
am: 99d6227782

Change-Id: Iacdd6d802725ab1b45c273ad7c8de7c85c8cb801
40db40878e9f7a25f63076d95d7c7859488290cb 19-Nov-2016 Jeff Davidson <jpd@google.com> Expose TelephonyManager#{set,get}DataEnabled.

setDataEnabled requires MODIFY_PHONE_STATE or carrier privileges.
getDataEnabled will work with any of the above or
ACCESS_NETWORK_STATE.

Merged-In: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Test: Exercised APIs from test app, updated and executed CTS tests
Change-Id: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Fixes: 32644451
ndroid/telephony/TelephonyManager.java
64ed1646e6c6604c5af4f3527e6788106aacfaf9 23-Nov-2016 Jeff Davidson <jpd@google.com> Merge "Expose TelephonyManager#{set,get}DataEnabled."
e40beac31415a936f2204b5eab00651b33669156 22-Nov-2016 Ta-wei Yen <twyen@google.com> Merge "Make voicemail notification broadcast public" am: 6a56326109 am: 9b614baeab am: f05c651c99
am: dcb9f3c8ed

Change-Id: I0d5e582d5e145c59ee1f24258c74549ec0acf7aa
dcb9f3c8ed190f0fa791df7d7d335d9d3e36abda 22-Nov-2016 Ta-wei Yen <twyen@google.com> Merge "Make voicemail notification broadcast public" am: 6a56326109 am: 9b614baeab
am: f05c651c99

Change-Id: I8b8edb79ff63eeae8ace939ad278157032b8ded7
f05c651c99e96ef06f3f423007d47f4e63b7d7ae 22-Nov-2016 Ta-wei Yen <twyen@google.com> Merge "Make voicemail notification broadcast public" am: 6a56326109
am: 9b614baeab

Change-Id: Icb636f5155c3b25a3db2978fad830fb94b959a2f
9b614baeab1b5272fbeb0b8001214b236715e0a1 22-Nov-2016 Ta-wei Yen <twyen@google.com> Merge "Make voicemail notification broadcast public"
am: 6a56326109

Change-Id: Ic094db50e40a0cd46251e27f84b2a98b9040a192
6a56326109af5961e2e193103f2e5a17cc18ea36 21-Nov-2016 Treehugger Robot <treehugger-gerrit@google.com> Merge "Make voicemail notification broadcast public"
9ce70cfd027b2e506b3bda2514ed5bd05619d534 19-Nov-2016 Jeff Davidson <jpd@google.com> Expose TelephonyManager#{set,get}DataEnabled.

setDataEnabled requires MODIFY_PHONE_STATE or carrier privileges.
getDataEnabled will work with any of the above or
ACCESS_NETWORK_STATE.

Test: Exercised APIs from test app, updated and executed CTS tests
Change-Id: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Fixes: 32644451
ndroid/telephony/TelephonyManager.java
be45b8c5a53a8f11a09cbe457d929a102fcf6891 09-Nov-2016 Jordan Liu <jminjie@google.com> Treat the mdn as an additional voicemail number

Use carrier config to specify whether the carrier treats the mdn as an
additonal voicemail number.

Change-Id: I7192a3505da87d6b50a100e041d2b502cf37e113
Fix: 29145323
Test: build and flash on device
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
e1c967ab8f5dcfc9eaf6a883e23761dea9bbe40c 18-Nov-2016 Mats 2, Åkesson <mats2.akesson@sonymobile.com> Merge "Customization of LTE Signal Bars" am: 3cbf2c2657 am: 5ee2b9384b am: a16a77781e
am: 6daed59698

Change-Id: Id99e2d155ca8267fd9b5bff5941e5112d27232e6
6daed596989356607d5517791bbfa1ee96d817a6 18-Nov-2016 Mats 2, Åkesson <mats2.akesson@sonymobile.com> Merge "Customization of LTE Signal Bars" am: 3cbf2c2657 am: 5ee2b9384b
am: a16a77781e

Change-Id: Ia9853ec8459355ad3b00e7505dc6af491bf6828d
a16a77781e8459bca6f6c7edfb73ac7638d8ad70 18-Nov-2016 Mats 2, Åkesson <mats2.akesson@sonymobile.com> Merge "Customization of LTE Signal Bars" am: 3cbf2c2657
am: 5ee2b9384b

Change-Id: I82d61b23560e4bdf84caca7e49ddcd367662cb47
5ee2b9384bbbe75e8dc6f2fb0b6d016b7dc944de 18-Nov-2016 Mats 2, Åkesson <mats2.akesson@sonymobile.com> Merge "Customization of LTE Signal Bars"
am: 3cbf2c2657

Change-Id: I33c625ec49547fde582462687e6229ddf0269b15
3cbf2c265735dc482c0afafc80f88fe2c68b6e60 18-Nov-2016 Treehugger Robot <treehugger-gerrit@google.com> Merge "Customization of LTE Signal Bars"
cba59432ba25f1a2efccc1e878eae59a35ddc074 18-Nov-2016 Jack Yu <jackyu@google.com> resolve merge conflicts of 80a0e6d to nyc-mr2-dev-plus-aosp

Test: telephony unit tests
Change-Id: Id4454c97eca5f0261001369d0ec5030775bf9887
2030cd9f5fa0601273df44625d924a0930d833a3 17-Nov-2016 Jack Yu <jackyu@google.com> Added configuration for VT downgrade/tear down when data disabled

Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

Test: telephony unit tests
bug: 32880745
Change-Id: Idd33a022b5a31cbc58592587bcb496bd78923ae7
ndroid/telephony/CarrierConfigManager.java
80a0e6d56ee773778e14cbcdbfaf2ab8ed4eda73 16-Nov-2016 Jack Yu <jackyu@google.com> Added configuration for VT downgrade/tear down when data disabled

Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

bug: 32880745
Merged-In: Idd33a022b5a31cbc58592587bcb496bd78923ae7
Change-Id: I5c71fc9336b39f114a924861a766ca5cb93d4c69
ndroid/telephony/CarrierConfigManager.java
00bd0531cc37d7f0ca4635a9193cc1887ca5f611 15-Nov-2016 Brad Ebinger <breadley@google.com> Merge "ims:rcs: New API change to notify EAB about UnPublish"
73cdcf57877f94cefb76d2b1d160f59a2ce82df6 15-Nov-2016 Ta-wei Yen <twyen@google.com> Make voicemail notification broadcast public

Fixes: 32884372
Bug: 32414216
Test: CTS Verifier -> Telephony -> Voicemail Broadcast Test

Change-Id: Id11d68bc154517a0965c8368a85013128e6b0b58
ndroid/telephony/TelephonyManager.java
cb48c48599e1c6c733a4c5abee163f371710a3c4 11-Nov-2016 Jack Yu <jackyu@google.com> Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API" am: 4469e48d5c am: 3cfa510779 am: d517ea753f
am: 9b968a1644

Change-Id: Iaba6209cd6ac5914fb798cbf7003fa1037e2f91f
9b968a1644785986b1982d1021fa3f262d32affa 11-Nov-2016 Jack Yu <jackyu@google.com> Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API" am: 4469e48d5c am: 3cfa510779
am: d517ea753f

Change-Id: Iaa642d19d006133a8d378a43253aaa35053db564
d517ea753f6bc1e5cb067b0662b6339ff3354463 11-Nov-2016 Jack Yu <jackyu@google.com> Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API" am: 4469e48d5c
am: 3cfa510779

Change-Id: I65746e4959851eb4662881db4fd8d9665070da71
3cfa51077957c59f23bfbb9e55871dac0a5a276f 11-Nov-2016 Jack Yu <jackyu@google.com> Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API"
am: 4469e48d5c

Change-Id: Id92b8eaeec12885af3748d1e839da1a5560e2619
4469e48d5cfddf7712aba3ac93fd08f4e0b97f38 11-Nov-2016 Jack Yu <jackyu@google.com> Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API"
fc0f68ca518dd3bdfc9c5225a55c2e9178c7b160 10-Nov-2016 Ta-wei Yen <twyen@google.com> Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am: 0a3b6b70dd am: 969a6eb2b8 am: c9698a5cff
am: e1ae654041

Change-Id: Ic28680327d916e3650b3c11fb253353955373922
e1ae654041f39c5c4294babcc6999c21b5a24c0b 10-Nov-2016 Ta-wei Yen <twyen@google.com> Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am: 0a3b6b70dd am: 969a6eb2b8
am: c9698a5cff

Change-Id: I35bbcf29868c1ecddcdbb0e536c6d2a92e4d90ca
c9698a5cff583710352d5f870ada0bb21967b74a 10-Nov-2016 Ta-wei Yen <twyen@google.com> Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am: 0a3b6b70dd
am: 969a6eb2b8

Change-Id: I2a5d31c342efc7e3ca4f29448b24d406253c7b0f
969a6eb2b8ae2b6f77c16f7c0a106b8eff260467 10-Nov-2016 Ta-wei Yen <twyen@google.com> Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state"
am: 0a3b6b70dd

Change-Id: I512e68bccda115ad7c58ec1f1fbfbb2c69c86578
90bc8e30ad3b0c211ef6e4a2e54cfadd28df1b2d 10-Nov-2016 Nathan Harold <nharold@google.com> Expose GSM Timing Advance, Update LTE TA docstring

-Expose the GSM timing advance
-Add a spec reference to the LTE Timing Advance

Bug: 28910982
Test: None
Change-Id: I7573dbb1316a2ab52051072ebad2532601f4299c
ndroid/telephony/CellSignalStrengthGsm.java
ndroid/telephony/CellSignalStrengthLte.java
05f9112d15f506ab8960ee4ae586565d9a023e09 10-Nov-2016 Ta-wei Yen <twyen@google.com> Add createForPhoneAccountHandle() and getServicetate()
Respect TelephonyManager's subId when listening to phone state

TelecomManager perfers to use a PhoneAccountHandle to represent a
account but TelephonyManager prefers subscription IDs.

This CL added createForPhoneAccountHandle() in TelephonyManager so
telephony values can be queried from it.

Currently the ServiceState can be retrieved through registering a
PhoneStatelistener, but it is a callback which the handler cannot be
specified.

getServiceState() is added to allow the ServiceState to be polled.

While TelphonyManager has createForSubscriptionId(), listen() does not
respect the subId on the manager created from it, and will always use
the hidden subId on the listener, which is always the default subId
through public API.

After this CL, the default subId on the listener will null.
TelephonyManager use its' own subId if the listener does not set the
subId to something else.

Bug: 32637799
Bug: 32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Change-Id: I9995e4da1573cf1f6b6e4acf2daf7a538fb60d5f
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/TelephonyManager.java
211c1c2ca815b101ed9bc65a9ab0407c3ce97836 09-Nov-2016 Kevin Su <kevinsoup@google.com> Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte.
Regenerate api accordingly.
BUG: 32609966
Test: CTS Testing new API

Change-Id: I2603fc0001f31ff23f02f4fdf2a72b33f2750a4c
ndroid/telephony/CellSignalStrengthLte.java
24495644557d9b0b3f8ab94a6d207c721e2b18b9 28-Oct-2016 Abhishek Adappa <aadappa@codeaurora.org> ims:rcs: New API change to notify EAB about UnPublish

Desc: New API change to notify EAB about UnPublish Message
sent to network

Change-Id: Ic5d8bef04f390e850cedef2cab55e8214e6d1f4e
om/android/ims/internal/uce/presence/IPresenceListener.aidl
d109a6b2cd42a892caeacd2ea686a5f8fd75c779 04-Oct-2016 Jordan Liu <jminjie@google.com> Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY

Add the key to CarrierConfigManager and remove the old configs which are
no longer needed.

Bug: 29873049
Change-Id: I2197cabca2addbbbe15f0f13985a6f5d8794d64a
Merged-In: I2197cabca2addbbbe15f0f13985a6f5d8794d64a
ndroid/telephony/CarrierConfigManager.java
f57b084f3bbb4a287e0d8acf92538259c83e64f2 08-Nov-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Provide an API to make USSD calls and read the responses."
d570f63b72507a4c2a6d53d941f6d67dd72711e5 07-Nov-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: Ibf622e154f3f987be547f4f85e15891d4e382118
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
4461e96abbb5059f869b0418be3f0a2ab9ad0674 04-Nov-2016 Jack Yu <jackyu@google.com> Added CMAS/ETWS duplicate expiration support
am: f8247928a2

Change-Id: Ic8ac9c15748ae2a5f22ab08df81ed501a8365bc0
c0456520265269ec9c01dd38f67e177c7f6cb47c 03-Nov-2016 Jack Yu <jackyu@google.com> Added CMAS/ETWS duplicate expiration support

Now message duplication detection will only look back messages
for 24 hours by default for all countries, except 1 hour in
Japan.

Test: runtest -x packages/apps/CellBroadcastReceiver/tests/unit

bug: 31171149
Change-Id: I6765c9cebdb3bd9ab6d065f10acbd66047a34d8c
ndroid/telephony/CarrierConfigManager.java
f8247928a206e7bf31d885eeef533fc7b7c8b359 03-Nov-2016 Jack Yu <jackyu@google.com> Added CMAS/ETWS duplicate expiration support

Now message duplication detection will only look back messages
for 24 hours by default for all countries, except 1 hour in
Japan.

Test: runtest -x packages/apps/CellBroadcastReceiver/tests/unit

bug: 31171149
Change-Id: I6765c9cebdb3bd9ab6d065f10acbd66047a34d8c
ndroid/telephony/CarrierConfigManager.java
d0bc76db7f0f1f9f98dbb0f9719dd8fa404af84d 02-Nov-2016 pengzhicai <pengzhicai@xiaomi.com> Merge "Fix String is empty issue" am: 80af1ba47b am: 38c585cb8d am: d7df704d98
am: f85e7930d8

Change-Id: I9e85d16bd3edc529a97e4df3b8f90e9fdb2ee486
d7df704d98a5ba5fd31b08c508e03d1d2ecba1b5 02-Nov-2016 pengzhicai <pengzhicai@xiaomi.com> Merge "Fix String is empty issue" am: 80af1ba47b
am: 38c585cb8d

Change-Id: I091572280b0b2a33a2a5e2339a08df0759bb2bd7
38c585cb8d4dc2d074e55108add478dd9eebe0ac 02-Nov-2016 pengzhicai <pengzhicai@xiaomi.com> Merge "Fix String is empty issue"
am: 80af1ba47b

Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b
7c30bb8e0f80c86e6c282d3d6d5671c61d6e4f99 02-Nov-2016 pengzhicai <pengzhicai@xiaomi.com> Fix String is empty issue

Maybe the string is empty
https://code.google.com/p/android/issues/detail?id=226739

Change-Id: I645ae05a8cbe316e29d9710de0bbba64c0c2275d
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
ndroid/telephony/TelephonyManager.java
44b2ac9d3ddbbad20e65758169aec0ddc6447d3e 01-Nov-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Provide an API to make USSD calls and read the responses."
19ba736c22869ec678ce0a79858ab3624fedee1b 15-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: Ic1214330ddf6846973d8bd28ee6ff1d28ae8c852
ndroid/telephony/TelephonyManager.java
ndroid/telephony/UssdResponse.aidl
ndroid/telephony/UssdResponse.java
om/android/internal/telephony/ITelephony.aidl
9633c7092ab8c3806f45f96455ad18376b90e45e 27-Oct-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "CarrierConfig: add persist_lpp_mode_bool"
ff13cc20fedec05ef969da676b6687cd5ff437e6 26-Oct-2016 Jordan Liu <jminjie@google.com> resolve merge conflicts of ab00546 to stage-aosp-master
am: bc2af49c21

Change-Id: I95cfcd3907105ef1969f02bf1229ba0c5eb9b8c7
bc2af49c21358454c18418ef194a26d15a0d41d5 26-Oct-2016 Jordan Liu <jminjie@google.com> resolve merge conflicts of ab00546 to stage-aosp-master

Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49
4fa1ab7029001b2c2bc833c59c2962a99817d74c 24-Oct-2016 Ecco Park <eccopark@google.com> CarrierConfig: add persist_lpp_mode_bool

Removing carrier specific function from
GnssLocationProvider.java

This property is used for persisting the current
lpp_mode of carrier even after sim is removed

Instead, we will use the property of carrier config

Bug: 32250938

Change-Id: Ibc69883723392cb0fbfcd8dbf3e866860db9dd5d
Signed-off-by: Ecco Park <eccopark@google.com>
ndroid/telephony/CarrierConfigManager.java
ab005465b6e1ce252c0573ee1ae5917971707df4 26-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Add key to CarrierConfigManager"
c2a78d4e85e42b96d1771cd0f3f5c29df58fab42 25-Oct-2016 nharold <nharold@google.com> Merge "Update the docstring on getAllCellInfo() for unreported values" am: 88d0a95c74 am: b7e5c6fa32 am: c8fceb9834
am: 415a50e103

Change-Id: Id00cd16efdbfd49d09e61d25b082df897a8e76e2
c8fceb983461115f1dd154a897d41f6000947548 25-Oct-2016 nharold <nharold@google.com> Merge "Update the docstring on getAllCellInfo() for unreported values" am: 88d0a95c74
am: b7e5c6fa32

Change-Id: Ie5f6460962fac98bd63aa7b7d4e77e5bc84347e7
b7e5c6fa3285fd247ae0477029b15da366c47bd8 25-Oct-2016 nharold <nharold@google.com> Merge "Update the docstring on getAllCellInfo() for unreported values"
am: 88d0a95c74

Change-Id: Ib482a5398776473ccb97c4df96115fc3763c782f
e327160103293c94221f0e3e734d0f59d1aa8738 24-Oct-2016 Nathan Harold <nharold@google.com> Update the docstring on getAllCellInfo() for unreported values

In the event that not all fields are available for a particular
cell information report, those values are set to
Integer.MAX_VALUE. In addition, this docstring clarifies the
minimum expectation for what will be reported in all cases.

Bug: 32364031
Test: none
Change-Id: Ic5df72f69e5917eb495d349a380ced53a80408fa
ndroid/telephony/TelephonyManager.java
b53000dd8cc189d8c7f039856565fc555491e2f2 19-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Add key for sms_convert_destination_number"
5ac6f5c95d4a1a382059c7e8dda7a14ead09e46b 03-Oct-2016 Jordan Liu <jminjie@google.com> Add key for sms_convert_destination_number

Add the CarrierConfig key
KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL
and remove the old configs. Note that this value no longer needs to be a
string-array, as CarrierConfigManager handles gid.

Bug: 29873049
Change-Id: I3edbcf5329177f6b370d08a09318c35c55e5e052
ndroid/telephony/CarrierConfigManager.java
a9469e64e4d43c25d4d39000d6506028533648bf 17-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY"
12575e41b8cd47c2d32d89d64083d3201e7c4b5d 13-Oct-2016 Sooraj Sasindran <sasindran@google.com> Introduce the config to disable LAUNCH_BROWSER

LAUNCH BROWSER STK command may need to be disabled
if carrier would not want the default behavior.
So introduce a carrierconfig key for the same

Test: Swapped the sprint sim cards and verified
that browser launch do not happen.

Merged-in: Iaff062547f5286b2c0b2c2c4c6182a287f07284b
BUG=31257758
Change-Id: Iaff062547f5286b2c0b2c2c4c6182a287f07284b
ndroid/telephony/CarrierConfigManager.java
c80aaa94c664856ba08f23180c804c90c59c4697 13-Oct-2016 Sooraj Sasindran <sasindran@google.com> Introduce the config to disable LAUNCH_BROWSER

LAUNCH BROWSER STK command may need to be disabled
if carrier would not want the default behavior.
So introduce a carrierconfig key for the same

Test: Swapped the sprint sim cards and verified
that browser launch do not happen.

Merged-in: Iaff062547f5286b2c0b2c2c4c6182a287f07284b
BUG=31257758
Change-Id: Iaff062547f5286b2c0b2c2c4c6182a287f07284b
ndroid/telephony/CarrierConfigManager.java
6a3d36fdc042cac42e98630a9e0f48aebab4629a 13-Oct-2016 Sooraj Sasindran <sasindran@google.com> Introduce the config to disable LAUNCH_BROWSER

LAUNCH BROWSER STK command may need to be disabled
if carrier would not want the default behavior.
So introduce a carrierconfig key for the same

Test: Swapped the sprint sim cards and verified
that browser launch do not happen.

Merged-in: Iaff062547f5286b2c0b2c2c4c6182a287f07284b
BUG=31257758
Change-Id: Iaff062547f5286b2c0b2c2c4c6182a287f07284b
ndroid/telephony/CarrierConfigManager.java
5a18072fed95ae41f2367e6d1c24975d303cf73a 26-Feb-2016 Mats 2, Åkesson <mats2.akesson@sonymobile.com> Customization of LTE Signal Bars

Make LTE signal bar thresholds customizable to any values.
Some operators require values which are not supported by current 2 level
configurations.

Test: manual
Bug: 28122517
Change-Id: Ib7f492d8b4fc5ba8a71bc2e978ae6572f2485e8f
ndroid/telephony/SignalStrength.java
2420a0a7d75fea729c69749d47bd87e51299f992 04-Oct-2016 Jordan Liu <jminjie@google.com> Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY

Add the key to CarrierConfigManager and remove the old configs which are
no longer needed.

Test: ran "make checkbuild" locally
Bug: 29873049
Change-Id: I2197cabca2addbbbe15f0f13985a6f5d8794d64a
ndroid/telephony/CarrierConfigManager.java
9011f8f92649a792bdc52578e81ef37cdc0eccf1 11-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Add key for carrier_volte_provisioned"
9d48e7cc2f58e99b84da889dcb48da963835aae1 14-Sep-2016 Naveen Kalla <mrnaveen@google.com> Add RIL_UNSOL_MODEM_RESTART message

RIL_UNSOL_MODEM_RESTART will be sent by vendor RILs when it detects
a modem restart along with the reason for restart which could be a
crash signature if the modem restarted due to a crash or a some
other string such as a user-initiated restart or AT command
initiated restart.

Change-Id: Idf08e20a49e82d40f6aa0854d23384c35c2efc3a
om/android/internal/telephony/RILConstants.java
f503480cd1d9298f0355bb7d651ecfb2bb4f00e9 08-Oct-2016 Hall Liu <hallliu@google.com> Add logging to CallerInfoAsyncQuery am: 4c01910cb0 am: d4f18dd117
am: ecc5e42284

Change-Id: Ia899d8c9301e65c25efbbbd4b6febfbd025677ae
ecc5e42284dba4205b2e5f6d0e2942c71da61809 07-Oct-2016 Hall Liu <hallliu@google.com> Add logging to CallerInfoAsyncQuery am: 4c01910cb0
am: d4f18dd117

Change-Id: I5cdba233e5cc9f47527a9ef6fb69c40b70ae90a9
4c01910cb0dfc6a5980a903eabfd767cad7f2e50 06-Oct-2016 Hall Liu <hallliu@google.com> Add logging to CallerInfoAsyncQuery

Add logging to CallerInfoAsyncQuery to help diagnose timeout errors

Bug: 31755827
Change-Id: If7cf34baf084ca8916952842585a32b3e93eba73
om/android/internal/telephony/CallerInfoAsyncQuery.java
f2456cb127628f4684442e932f8ed582ffec4910 01-Sep-2016 Jordan Liu <jminjie@google.com> Add key to CarrierConfigManager

Add KEY_DEFAULT_VM_NUMBER_STRING and default value. Note that default
vm number no longer needs to be a string array, as gid is handled
within the new carrier_configs. Also remove references to old config.
Merged-In: I56e4e3713c27f449fd892db501b6097c8c89c3c6

Bug: 29873049
Change-Id: I56e4e3713c27f449fd892db501b6097c8c89c3c6
ndroid/telephony/CarrierConfigManager.java
c82d113279fb3a5b359074a835f5152decd21f78 03-Oct-2016 Jordan Liu <jminjie@google.com> Add key for carrier_volte_provisioned

Add the key to CarrierConfigManager and remove old configs.

Bug: 29873049
Change-Id: Icf3075fe39d3466732ea81738cb29c512f840401
ndroid/telephony/CarrierConfigManager.java
5ffaae6efef2b5c1198e505634f054bf3b8c92b3 04-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Add editable_voicemail_number key to CarrierConfig" am: 25b64aad01 am: 2b7118fcbf
am: c44e7f3f76

Change-Id: I208e7871029efc1ca331fac3b240d337d00d3189
3643dd1a7a501c171d0cc127f880d6e2c6e11cfa 08-Sep-2016 Jordan Liu <jminjie@google.com> Add editable_voicemail_number key to CarrierConfig

Add KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]

This value exists to fix http://b/14093735. If a SIM card has no
voicemail number available, since the default number is empty, we allow
users to edit the voicemail number when this flag is true.
Merged-In: I68a494e2176306e4e9181a8ccb0aa818f3e08154

Bug: 29873049
Change-Id: I68a494e2176306e4e9181a8ccb0aa818f3e08154
ndroid/telephony/CarrierConfigManager.java
a7768e2b15451db4bb29d85af64ae83fbbe8a1fb 30-Sep-2016 Jordan Liu <jminjie@google.com> fix branch break by adding carrierconfig key am: e787323e03
am: 1e1c060378

Change-Id: I0d76442494289c6b920c84a7c07bd635f515da88
e787323e030600f3556fba0950ed5de680cc4e77 07-Sep-2016 Jordan Liu <jminjie@google.com> fix branch break by adding carrierconfig key

Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager

Bug: 29873049
Change-Id: I53dc93defbfa7d1366e6ee066638d73df03f88d0
ndroid/telephony/CarrierConfigManager.java
180aadfb86f79b9f6c3501cd12bec7b6ecb634dd 29-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Add dial_string_replace key to CarrierConfig" am: 715903f3c6 am: 9fba74dd3a
am: d34ae93d8b

Change-Id: I6753d00b4d9fed455cb153294f956cf3ad9f826f
14f4fd7d0b599e2bce893ce61ec102c0ebfa1a5c 29-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Add cdma_3waycall_flash_delay key to CarrierConfig"
9e4c3655619ae46871d67eab5193054fa9bdfcbd 29-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Add editable_voicemail_number key to CarrierConfig"
587a5f9c7f4f16d671d032f3f08abed2af9d0e18 29-Sep-2016 Meng Wang <mewan@google.com> resolve merge conflicts of 68b84f73 to master

Change-Id: If4d5647d199050846aaf250c4341657440dafb78
68b84f7301f394e50bf9dfdbf154eb111fb3a90c 29-Sep-2016 Meng Wang <mewan@google.com> Support WFC roaming preference am: 2c25e4a96b
am: 6db4fbecf8

Change-Id: Idff74a470e26b6c14ba1203290f533813740e192
6db4fbecf8872cf82d54208b06972645be41a46f 29-Sep-2016 Meng Wang <mewan@google.com> Support WFC roaming preference
am: 2c25e4a96b

Change-Id: I8a1af9756ddf5a4359cfd94aa6eebfdcb87b9e13
cfe950f6bedee35f20e38c6374a873fc3ba0166c 29-Sep-2016 Meng Wang <mewan@google.com> Merge "Support WFC roaming preference" into nyc-mr1-dev
4a54638a6829c535f18003618abe729c38d7dbc1 08-Sep-2016 Jordan Liu <jminjie@google.com> Add editable_voicemail_number key to CarrierConfig

Add KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]

This value exists to fix http://b/14093735. If a SIM card has no
voicemail number available, since the default number is empty, we allow
users to edit the voicemail number when this flag is true.

Bug: 29873049
Change-Id: I68a494e2176306e4e9181a8ccb0aa818f3e08154
ndroid/telephony/CarrierConfigManager.java
705cbc763f909683846d19a9eb40230b28243c06 09-Sep-2016 Jordan Liu <jminjie@google.com> Add dial_string_replace key to CarrierConfig

Add KEY_DIAL_STRING_REPLACE_STRING_ARRAY and default value (null) to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]

This value exists to fix http://b/17202092. We specify a map from
dialstrings to replacements for roaming network service numbers which
cannot be replaced on the carrier side.

Merged-In: I852261596d3931f38d5f1c6b3d24ffe27f950458

Bug: 29873049
Change-Id: I99d97bb25ef57c178d004ae17d97a6c7672734e2
ndroid/telephony/CarrierConfigManager.java
761ffab151fe7d09e4e3cfbe5693c58f61beeb3d 28-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Add key to CarrierConfig" am: 154c22d2d4 am: fda7370ddd
am: cf99a8e2e9

Change-Id: I2eb06df15a6605e8e688de470a0cd926e9989979
b0d2ffa8a4d3d643304325a4c719239ca248ae2a 27-Sep-2016 Brad Ebinger <breadley@google.com> Adds a Disconnect Cause for Emergency Redial am: bd13f22f83 am: 7c8ad05c56
am: 3b3e0510c7

Change-Id: I1f901ef32130e92d7a25d5c69a7c0639d8567a15
3b3e0510c78831a11a7c1b76569cd03ac004dc1b 27-Sep-2016 Brad Ebinger <breadley@google.com> Adds a Disconnect Cause for Emergency Redial am: bd13f22f83
am: 7c8ad05c56

Change-Id: I60ffb85ab5dc258d9e6aebc30e7f83dcf01bddaa
7c8ad05c56e026ffba316d16c584665b48df7203 27-Sep-2016 Brad Ebinger <breadley@google.com> Adds a Disconnect Cause for Emergency Redial
am: bd13f22f83

Change-Id: Icffef087dbfbc902ca3347a325a0acfe05326a25
0a2d3dcb03cc8fc8880e79c05ed5b9db8780587b 27-Sep-2016 Ariel Yin <ayin@google.com> Merge "Adds a Disconnect Cause for Emergency Redial" into nyc-mr1-dev
a906c502e53519b916667781bb3ed636d4944753 24-Sep-2016 Brad Ebinger <breadley@google.com> Add RadioAccessFamily rank am: de780c84b5 am: 86739bd8d6
am: d68c80d093

Change-Id: I90c706d4a1caf7b62b4b853b5ec96a16b4ca6ca4
2c25e4a96bf5fd4439f11ab1c4319c8fc2240247 19-Sep-2016 Meng Wang <mewan@google.com> Support WFC roaming preference

Added keys in CarrierConfig and Settings.Global

Bug: 31492826
Change-Id: Ice33f6ee5c42b92ed2f7258ff8b28c50510cde31
ndroid/telephony/CarrierConfigManager.java
d68c80d093b54b834f4b172377d655a8f9f86fac 23-Sep-2016 Brad Ebinger <breadley@google.com> Add RadioAccessFamily rank am: de780c84b5
am: 86739bd8d6

Change-Id: I05c4d9d3269ca893b51529df96760bda5b31db8b
86739bd8d6500bef8b1a6285db2d63b98dea4166 23-Sep-2016 Brad Ebinger <breadley@google.com> Add RadioAccessFamily rank
am: de780c84b5

Change-Id: I60352df2052169c722045669069fef8002561574
6f0cbd929718035621dad2b0431eae6025189202 23-Sep-2016 Brad Ebinger <breadley@google.com> Merge "Add RadioAccessFamily rank" into nyc-mr1-dev
bd13f22f83fc536b2f6e06795f97aa469916a829 21-Sep-2016 Brad Ebinger <breadley@google.com> Adds a Disconnect Cause for Emergency Redial

The radio has the ability to send back a "redial on the other slot"
DisconnectCause. This adds that DisconnectCause definition.

Bug: 31498841
Change-Id: I9a59cc81ba03562531b0445e3acb5eeec99b1aba
ndroid/telephony/DisconnectCause.java
de780c84b5bf986f9b1b905c2480bf77ec49cc23 15-Sep-2016 Brad Ebinger <breadley@google.com> Add RadioAccessFamily rank

Modifies RadioAccessFamily to rank call technology and changes affected
comments.

Change-Id: I7ae8516e7dd167fc02d2ff931f6adc6f14e40296
Fixes: 31091840
Fixes: 31621719
ndroid/telephony/RadioAccessFamily.java
ndroid/telephony/TelephonyManager.java
64cb32e06e1df6ab09d1d7b855752cf2eea75b46 21-Sep-2016 Amit Mahajan <amitmahajan@google.com> Added new config to indicate uneditable APN fields. am: 71e9ea6770 am: 49985fb986
am: 6a6bfb8236

Change-Id: Ieffcc3fc3c503df36656c7aef9a4c99d0b29f485
6a6bfb8236c17f749071f4c50d0a7cb1385c0d38 21-Sep-2016 Amit Mahajan <amitmahajan@google.com> Added new config to indicate uneditable APN fields. am: 71e9ea6770
am: 49985fb986

Change-Id: I7bf6c7c5c3b107639217f0a81b4d1a9f5f638a02
bd3f2a7eb01b88d8e26deea4e4ef3e5ce423955c 07-Sep-2016 Jordan Liu <jminjie@google.com> Add cdma_3waycall_flash_delay key to CarrierConfig

Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]
Merged-In: I53dc93defbfa7d1366e6ee066638d73df03f88d0

Bug: 29873049
Change-Id: I53dc93defbfa7d1366e6ee066638d73df03f88d0
ndroid/telephony/CarrierConfigManager.java
71e9ea677046f27c667ac54a3034f40aac4b8b6c 20-Sep-2016 Amit Mahajan <amitmahajan@google.com> Added new config to indicate uneditable APN fields.

Bug: 30457714
Change-Id: I2e089f16a7f4e77b8f0bdd10e0c63bbc4a3a11a1
ndroid/telephony/CarrierConfigManager.java
d7bb907e2afaef3087a28571a71cddf3efe649a0 15-Sep-2016 Amit Mahajan <amitmahajan@google.com> Added new config to indicate read-only apn types.

Bug: 31074581
Change-Id: Ib0b19ef038d8c99380364eb81c4f7dd24bcc27fa
(cherry picked from commit 923963ff31fb0c5c495a7a8f09aafa4b90e69f26)
ndroid/telephony/CarrierConfigManager.java
om/android/internal/telephony/PhoneConstants.java
6d3a6f21e65bce9b6ae5efcb9280174124f3fa79 19-Sep-2016 Amit Mahajan <amitmahajan@google.com> Added new config to indicate read-only apn types. am: 923963ff31
am: 25b3ce28b6

Change-Id: I9db93d56b6ea81841d23f6799980bea55ed48b78
25b3ce28b6660bc010342eb0d14240e69686d3b7 19-Sep-2016 Amit Mahajan <amitmahajan@google.com> Added new config to indicate read-only apn types.
am: 923963ff31

Change-Id: I49a9e1ae11944af6cf0a433c40119ca97381c5cd
3dfd09e86046365094badde99e20aefbadc837f7 19-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Added new config to indicate read-only apn types." into nyc-mr1-dev
923963ff31fb0c5c495a7a8f09aafa4b90e69f26 15-Sep-2016 Amit Mahajan <amitmahajan@google.com> Added new config to indicate read-only apn types.

Bug: 31074581
Change-Id: Ib0b19ef038d8c99380364eb81c4f7dd24bcc27fa
ndroid/telephony/CarrierConfigManager.java
om/android/internal/telephony/PhoneConstants.java
8a5ca10fd694b5af8b8bbc99003ddd7d32e66b7e 16-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Add dial_string_replace key to CarrierConfig"
02ec2a0c2ae933e90e6622dc3b35582b673c8932 09-Sep-2016 Jordan Liu <jminjie@google.com> Add dial_string_replace key to CarrierConfig

Add KEY_DIAL_STRING_REPLACE_STRING_ARRAY and default value (null) to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]

This value exists to fix http://b/17202092. We specify a map from
dialstrings to replacements for roaming network service numbers which
cannot be replaced on the carrier side.

Bug: 29873049
Change-Id: I852261596d3931f38d5f1c6b3d24ffe27f950458
ndroid/telephony/CarrierConfigManager.java
e166356fe2663d0bafe5c98c51a044710b3188a1 07-Sep-2016 Jordan Liu <jminjie@google.com> Add cdma_3waycall_flash_delay key to CarrierConfig

Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]

Bug: 29873049
Change-Id: I53dc93defbfa7d1366e6ee066638d73df03f88d0
ndroid/telephony/CarrierConfigManager.java
12bc4ea71e6fc21fa61a3e94d155f2c3b1f9d92d 12-Sep-2016 Jordan Liu <jminjie@google.com> Add key to CarrierConfig

Add RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION and default value
(false) to CarrierConfigManager, and remove the old configs.

This value exists because:
http://b/10131736, requires radio restart.
http://b/16308209, http://b/17567651 require that we do not restart.

Merged-In: I4e199d7fe73b82fa39475f31825e5b8ae58d180f

Bug: 29873049
Change-Id: Ie9f8665ff40e2082cf92aa8b4dc337c5ea2ea974
ndroid/telephony/CarrierConfigManager.java
c0b0e761d530d3c6c2b4b64d137faeebeffa190c 14-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Add key to CarrierConfig"
6d3bdda778283a3db55b54a3fabbc301445aadf2 14-Sep-2016 Jack Yu <jackyu@google.com> Extend apn retry configurability to more apn types am: c1f0e87051 am: 5e45c9c673
am: 1bbe6da5fc

Change-Id: Ic95fcbc840752f4e9d14c2d8349b7828c00d84a4
2be612f8060f81712eecfdcc2f5a076b6782649d 14-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Add key to CarrierConfigManager"
b26312c974e243695d5719e8ccd11e2ae0f1ca9c 14-Sep-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of ca0844d to master

Change-Id: I0271bd52c26b106787e39b1ed099639cc928f29f
1bbe6da5fcc72d1bfa1d1e16517f093c61dc8795 13-Sep-2016 Jack Yu <jackyu@google.com> Extend apn retry configurability to more apn types am: c1f0e87051
am: 5e45c9c673

Change-Id: I69a8a679618f1ef99fced019569b55a4810fcc44
5e45c9c673a4fd9af18fcbd82a4d5a0457a9ffd4 13-Sep-2016 Jack Yu <jackyu@google.com> Extend apn retry configurability to more apn types
am: c1f0e87051

Change-Id: Id44b57c992efb8d649a2fa409b798714364c5dcc
c4cea1e0d64db74ff7d53909758ded67dd228a3d 13-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Extend apn retry configurability to more apn types" into nyc-mr1-dev
c1f0e870514d1fcf09d4d1b3dd1b50ce714f8e6b 10-Sep-2016 Jack Yu <jackyu@google.com> Extend apn retry configurability to more apn types

Extend apn retry configurability to more apn types so
we can control each APN retry behavior. Made mms apn retry
pattern same as default apn.

bug: 31381899
Change-Id: I070d0da97fb1844a1b4e9a6f1eff8d37995cec50
ndroid/telephony/CarrierConfigManager.java
a5a8b59333cfb749195a9cdfeb23828497443526 12-Sep-2016 Jordan Liu <jminjie@google.com> Add key to CarrierConfig

Add RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION and default value
(false) to CarrierConfigManager, and remove the old configs.

This value exists because:
http://b/10131736, requires radio restart.
http://b/16308209, http://b/17567651 require that we do not restart.

Bug: 29873049
Change-Id: I4e199d7fe73b82fa39475f31825e5b8ae58d180f
ndroid/telephony/CarrierConfigManager.java
ca0844d104f386d4a9d76a8ad1ac78572f433c3e 09-Sep-2016 Hall Liu <hallliu@google.com> resolve merge conflicts of 6369889 to nyc-mr1-dev-plus-aosp

Change-Id: Ied1a005f663517e69c3992c3ce49255af63c3e75
5e8e3085f4ba7c425337959e3c803fe89a68da10 15-Jul-2016 Wileen Chiu <wileenc@codeaurora.org> Add support for FDN contact dial

- add support in carrier config to provide the user with an option
for dialing FDN contact via a pop-up. The default value is set to false.

Change-Id: I533203a12c3abe1acdee53ddcb600ae45ad4b32a
ndroid/telephony/CarrierConfigManager.java
237d775359909383456b2a4983fac18d747f60aa 01-Mar-2016 Wei Huang <wei.x.huang@sonymobile.com> Adds carrier config to determine if high definition audio is displayed

Adds a carrier config option to remove HD audio property from a
connection so that HD audio related UI is not displayed
even if connection has High Definition audio support.

Bug: 28654645
Change-Id: I71f35854d35ae73741a36c0e2106695b04471b2e
ndroid/telephony/CarrierConfigManager.java
3ff30d224bb762cfac4bd091131a75c11ff27589 01-Sep-2016 Jordan Liu <jminjie@google.com> Add key to CarrierConfigManager

Add KEY_DEFAULT_VM_NUMBER_STRING and default value. Note that default
vm number no longer needs to be a string array, as gid is handled
within the new carrier_configs. Remove references to old config.

Bug: 29873049
Change-Id: I56e4e3713c27f449fd892db501b6097c8c89c3c6
ndroid/telephony/CarrierConfigManager.java
20c747c038f191f020cc3aacec870ff17370e968 03-Feb-2016 Wei Huang <wei.x.huang@sonymobile.com> Add configurable emergency call number support

In some region, when user dials emergency numbers, the call will go to
IVR system first and then to emergency center. This behavior causes
delay to let consumer to get help from center. Due to region/operator
requirements, some emergency numbers are required to be set-up as non
emeregency numbers on device. On such device, coverting original number
to emergency number is required under the conditions where only
emergency call is allowed - e.g. no SIM. This patch implements this auto
converting logic and its configurations.
E.g. For Taiwan, 110 and 119 need to be converted to 112 under not
in-service state.

Bug: 28123861
Change-Id: I01b3072ae272c1af8d4a19b2fb6ae451b7268821
ndroid/telephony/PhoneNumberUtils.java
8347c3898dfca9db048aa0feb0e52a6b55a205ef 18-Jul-2016 Sooraj Sasindran <sasindran@google.com> Expose api to retrieve wakelock information per client

Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis

BUG=31041780
Change-Id: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
ndroid/telephony/ClientRequestStats.aidl
ndroid/telephony/ClientRequestStats.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
48a69096afb7138f19a744101758bcbeb28a2ca6 31-Aug-2016 Tyler Gunn <tgunn@google.com> Add device config to determine when "allow hold" carrier config is used. am: d81c426e1d am: 6c619a2abb
am: 5b9f1f8b74

Change-Id: I4b156928fb3495c1d898bb492f4b3bf797771899
b6ca34a3439715019c7a56a9eea97c68d004e90b 29-Aug-2016 Abhijith Shastry <ashastry@google.com> Merge "Add a carrier config for RCS config server URL."
5b9f1f8b7427b068ac9239242c6af4d45d3e2725 26-Aug-2016 Tyler Gunn <tgunn@google.com> Add device config to determine when "allow hold" carrier config is used. am: d81c426e1d
am: 6c619a2abb

Change-Id: I313263a906ec503899710f0d672dbfa76550cb51
d81c426e1d8c03d3a72197af9761fcec72fd3013 03-Aug-2016 Tyler Gunn <tgunn@google.com> Add device config to determine when "allow hold" carrier config is used.

The "allow hold" carrier config option was added to meet new carrier
requirements. However we do not wish to enforce this option on older
devices.

Bug: 30449352
Change-Id: I4bf6dab0a200bdd2511c67b8134c6c0dc4b7e5a8
ndroid/telephony/CarrierConfigManager.java
1a48056ecd99a99c48d297f4f1c0ad3c3ce03747 26-Aug-2016 fionaxu <fionaxu@google.com> redact PII only for non-null value and apply SHA-1 am: d0a7649f53 am: 00396c01f6
am: 7ae64354f9

Change-Id: Idfe56dbfb17c9453335074873f1b036c23e21a58
2215c9b5d0f8dd268c3c98c29b24e6a4f9abf46e 25-Aug-2016 Abhijith Shastry <ashastry@google.com> Add a carrier config for RCS config server URL.

BUG: 31066641
Change-Id: Iad9aa60e6c8083aaeb7ce1461ff15012a6df0a29
ndroid/telephony/CarrierConfigManager.java
7ae64354f90735379fbc52c998713bef44f23ef6 24-Aug-2016 fionaxu <fionaxu@google.com> redact PII only for non-null value and apply SHA-1 am: d0a7649f53
am: 00396c01f6

Change-Id: Ibbf6e47c2241f03998a8321aed78f819c87c40e7
d0a7649f5307842278eebf0c4606344e2ff43a6a 05-Aug-2016 fionaxu <fionaxu@google.com> redact PII only for non-null value and apply SHA-1

Bug: 30073833
Change-Id: Iec311ba27dfd07c52df4a05cf89a566994f66ba9
ndroid/telephony/Rlog.java
ndroid/telephony/SubscriptionInfo.java
c4035754faa5596632b67b5fdaa86ed32dcd4a6e 18-Aug-2016 Tyler Gunn <tgunn@google.com> Add Telephony Connection event for handover from WIFI to LTE. am: 481255dc1c am: 984a1efd2a
am: b92776a71e

Change-Id: I92ce06bab2beb2a3bc1b84441088f12a758be455
9b63ad1a67d2a9239eb866471ad9ba85d843fd96 15-Aug-2016 Brad Ebinger <breadley@google.com> Adds a CNAP filtering field to the CarrierConfig

Adds the ability for the CarrierConfig to provide a list of CNAP names
that will be filtered out to the user. These names are usually generic
names that do not provide any useful caller ID information, such as
"WIRELESS CALLER".

Bug: 30142293
Change-Id: I8a99975380f99d160c2af6f6fa4b5ca3ebca1d3c
(cherry picked from commit 5ea6b1ece966aacc038d01e004666be81ca3ee8c)
ndroid/telephony/CarrierConfigManager.java
b92776a71efc18dbffa13c5984c7ae6480b88949 17-Aug-2016 Tyler Gunn <tgunn@google.com> Add Telephony Connection event for handover from WIFI to LTE. am: 481255dc1c
am: 984a1efd2a

Change-Id: Ic2da4b4fefd06fa24913ce234f0a10393714fc47
984a1efd2a0d103b9071e4c20d6ea96d1ee3dfad 17-Aug-2016 Tyler Gunn <tgunn@google.com> Add Telephony Connection event for handover from WIFI to LTE.
am: 481255dc1c

Change-Id: I52676d0814db22cf9d6673e31aa7a71cdf155e81
36863797cd5d4e6dc84ed9926ec7cf55b2876af6 17-Aug-2016 Tyler Gunn <tgunn@google.com> Merge "Add Telephony Connection event for handover from WIFI to LTE." into nyc-mr1-dev
23c2522788e3cee96ed571e3b0616f27253dbb1a 17-Aug-2016 Tyler Gunn <tgunn@google.com> Support auto-downgrade to audio when data disabled. am: 86d5c3fcde am: 6c678716e4
am: f37124b2f5

Change-Id: Ia58c68ad7d25abe3104609ae30e02fd0f6b1fc7a
6314a0e9c74326376b85155d8fc6db1dbf3fb638 17-Aug-2016 Brad Ebinger <breadley@google.com> Adds a CNAP filtering field to the CarrierConfig am: 5ea6b1ece9
am: 8dc27c8f40

Change-Id: Ia35252ae72c26b29db792a870c4537b2cd6ddddb
f37124b2f583f279259b74e428fcfd6f62f3d362 17-Aug-2016 Tyler Gunn <tgunn@google.com> Support auto-downgrade to audio when data disabled. am: 86d5c3fcde
am: 6c678716e4

Change-Id: I0a488516d7e9f1a90b91bd46d6f9a8a27f7f8a61
8dc27c8f406b1392b8898dd5b98dee1ea6c998dc 17-Aug-2016 Brad Ebinger <breadley@google.com> Adds a CNAP filtering field to the CarrierConfig
am: 5ea6b1ece9

Change-Id: If76215daaf2b2c2a200459a63302249be07b2f1b
fb599587a11423cb1fd358191df8289fecbd8e14 17-Aug-2016 Brad Ebinger <breadley@google.com> Merge "Adds a CNAP filtering field to the CarrierConfig" into nyc-mr1-dev
481255dc1c5ae03020237fa8fedce7ae1c1e75cb 17-Aug-2016 Tyler Gunn <tgunn@google.com> Add Telephony Connection event for handover from WIFI to LTE.

This connection event is used to inform an InCallService of the fact that
a handover from WIFI to LTE has occurred.

Bug: 30837560
Change-Id: Iaf7e301ca20ffbe5b3cb1b3596f898fcda8a7785
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/TelephonyManager.java
5ea6b1ece966aacc038d01e004666be81ca3ee8c 15-Aug-2016 Brad Ebinger <breadley@google.com> Adds a CNAP filtering field to the CarrierConfig

Adds the ability for the CarrierConfig to provide a list of CNAP names
that will be filtered out to the user. These names are usually generic
names that do not provide any useful caller ID information, such as
"WIRELESS CALLER".

Bug: 30142293
Change-Id: I8a99975380f99d160c2af6f6fa4b5ca3ebca1d3c
ndroid/telephony/CarrierConfigManager.java
86d5c3fcde9231e02c10f1e88fd78639d1ca717d 12-Aug-2016 Tyler Gunn <tgunn@google.com> Support auto-downgrade to audio when data disabled.

Add carrier config option to determine if carrier supports downgrade to
audio.
Add new telephony Connection events to signal Dialer that there was a
downgrade to audio, and why.

Bug: 30702393
Change-Id: Idd5272aafd71601e92291644640f52afe200208e
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/TelephonyManager.java
ef622ac558e47125088db917cf0a338661c3b7f6 12-Aug-2016 Tyler Gunn <tgunn@google.com> Add ImsReason codes and DisconnectCauses for data disconnects. am: ed21e8fc0c am: 61d1830a49
am: 00101e9438

Change-Id: Iea985a305fb6ba8a6516cd036dc6734c823e5ba4
00101e943805ad9117f8d6bda33a702ff63311c1 12-Aug-2016 Tyler Gunn <tgunn@google.com> Add ImsReason codes and DisconnectCauses for data disconnects. am: ed21e8fc0c
am: 61d1830a49

Change-Id: I3f35db127ef21adbcb086879f4b92eacac72974c
61d1830a493b7509a8a3735c6a3008bc7bd8b883 12-Aug-2016 Tyler Gunn <tgunn@google.com> Add ImsReason codes and DisconnectCauses for data disconnects.
am: ed21e8fc0c

Change-Id: I468ab4a5e16bd08aa80c50c1cfc583e0004ea1ab
34910458c474defc2646e48666d9478ef3fc10f5 12-Aug-2016 Tyler Gunn <tgunn@google.com> Merge "Add ImsReason codes and DisconnectCauses for data disconnects." into nyc-mr1-dev
ed21e8fc0c51c121db762ac9e59af57e05f3d7e2 11-Aug-2016 Tyler Gunn <tgunn@google.com> Add ImsReason codes and DisconnectCauses for data disconnects.

Adding reason code and disconnect causes for:
1. disconnects due to user disabling data.
2. disconnects due to data limit being reached.

Bug: 30702393
Change-Id: Id6ea5ee4f5aac1a8602094315f893e2f7b3cc8d6
ndroid/telephony/DisconnectCause.java
om/android/ims/ImsReasonInfo.java
3588482acc325ae902cee3b653c030b7b5c5fad4 11-Aug-2016 Ta-wei Yen <twyen@google.com> Add API to enable/disable the visual voicemail client am: 20f2ebbf4d am: 6dc3efcc16
am: b71cea3ade

Change-Id: I8a8000e783fad884d8d8afdf32b8d240ae233cd8
b71cea3ade7b1498ec0ad47cde9bbbb6dfa78e3e 11-Aug-2016 Ta-wei Yen <twyen@google.com> Add API to enable/disable the visual voicemail client am: 20f2ebbf4d
am: 6dc3efcc16

Change-Id: I13bc9bd9b12732fa3a7aa5de47cba5eacc5ba092
6dc3efcc16f877ef92ff4978d6a6e1ce19bba3a9 11-Aug-2016 Ta-wei Yen <twyen@google.com> Add API to enable/disable the visual voicemail client
am: 20f2ebbf4d

Change-Id: I4051b810ab020208001f726e4911df1905ef81bf
fb6e1bf2395fec73397d7f3bd90390a449d29211 11-Aug-2016 Ta-wei Yen <twyen@google.com> Merge "Add API to enable/disable the visual voicemail client" into nyc-mr1-dev
96323c5ea70a75eb349d132ea644894dc884e615 11-Aug-2016 Tyler Gunn <tgunn@google.com> Add carrier config to indicate whether to notify of vt handover failure. am: 0f20d9343c am: 5c88ba0d7c
am: ff50fc1374

Change-Id: I7f797768283c489a67ac1ad3cb38b2c79557bcda
ff50fc13741c8ed093e7e903a2d483c79c92b49d 10-Aug-2016 Tyler Gunn <tgunn@google.com> Add carrier config to indicate whether to notify of vt handover failure. am: 0f20d9343c
am: 5c88ba0d7c

Change-Id: Ib56d6233292bb6b3e35a226e50a8ff7104eef6a6
20f2ebbf4d16e0654efe73ac92afc89c29cfaede 10-Aug-2016 Ta-wei Yen <twyen@google.com> Add API to enable/disable the visual voicemail client

This CL gives the default dialer, apps with carrier privilege, and
apps with MODIFY_PHONE_STATE the ability to enable/disable the visual
voicemail client.

This is a system API for NMR1. It will be revised in O.

Bug: 30709089
Change-Id: Ic24af14a5e3433c13ba8d253ad8504c94bf71c8f
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
0f20d9343c9f030a52eb224c2d7f43227b56a480 10-Aug-2016 Tyler Gunn <tgunn@google.com> Add carrier config to indicate whether to notify of vt handover failure.

Controls whether to notify Connections of the fact that a handover of a VT
call from LTE to WIFI failed.

Bug: 30697460
Change-Id: I0cbff2dfb67c7c1f995f1ddf38e9525796501c09
ndroid/telephony/CarrierConfigManager.java
bc0368ba2ca9510fe5da59e378970b6d3f90abdb 08-Aug-2016 Tyler Gunn <tgunn@google.com> Add Connection Event for wifi handover failures. am: 920f79411c am: 977aeb9e17
am: c8ea34d2d1

Change-Id: I8f8d195197976b18fc67a4c1886c1ac0e2368c11
c8ea34d2d1f284f68017b966edaa79617ed6b798 08-Aug-2016 Tyler Gunn <tgunn@google.com> Add Connection Event for wifi handover failures. am: 920f79411c
am: 977aeb9e17

Change-Id: Ibbc4eb40f38b9937c6a8a8c3c7c2d16eae3a9422
977aeb9e170d539e3a91d7005f4b71f140501326 08-Aug-2016 Tyler Gunn <tgunn@google.com> Add Connection Event for wifi handover failures.
am: 920f79411c

Change-Id: I583bbbcc1bfd32ca19eecf69a88973451d7599ec
aa1e49c168321b6ca5eff7fa2c45c5751bea4724 08-Aug-2016 Tyler Gunn <tgunn@google.com> Merge "Add Connection Event for wifi handover failures." into nyc-mr1-dev
920f79411cbaef8cc461068dda97586c9e80f1a5 05-Aug-2016 Tyler Gunn <tgunn@google.com> Add Connection Event for wifi handover failures.

Adding a new connection event which Telephony can use to inform upper
layers of a failure to handover to WIFI.

Bug: 30697460
Change-Id: I75da2f956a6b70a9bf4cf7128f29968e08172dc3
ndroid/telephony/TelephonyManager.java
034379afd4ecff06bb77321ea0a73e50b26a0300 04-Aug-2016 Meng Wang <mewan@google.com> Add carrierconfig enhanced_4g_lte_title_variant_bool am: 542e262605 am: 2133770ea9
am: 9a39f2de34

Change-Id: I2b79fbc629a098879704a3a0bbfa8cc897035cfb
9a39f2de34c488cd9b2359a01e91c30c695d7413 04-Aug-2016 Meng Wang <mewan@google.com> Add carrierconfig enhanced_4g_lte_title_variant_bool am: 542e262605
am: 2133770ea9

Change-Id: I992ed8265fc9f6d028e1f765b3e98dd33cb2add4
542e262605bbc50e9d6b6fb57f7ef13cdf1c8dc7 03-Aug-2016 Meng Wang <mewan@google.com> Add carrierconfig enhanced_4g_lte_title_variant_bool

Bug: 30629746
Change-Id: I412d2d228797777e9d3db5fa4a9a630eb457e24c
ndroid/telephony/CarrierConfigManager.java
7ac7214b78dbd329c867c36f7aa5eb27abf7e35b 31-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> resolve merge conflicts of 20a35b6 to nyc-mr1-dev-plus-aosp
am: 1398e8e5aa

Change-Id: I187acf0aa781dcb88248e52361bcd097ced92312
1398e8e5aa9766722d9842feb7254c1117e60162 30-Jul-2016 Dan Willemsen <dwillemsen@google.com> resolve merge conflicts of 20a35b6 to nyc-mr1-dev-plus-aosp

Change-Id: Idd5fb6b64120af303a2987c7449e59face7d77be
ea0d71390ab528ffea7161674333b0bbab8356df 29-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Stop exposing LTE_CA as a rat type.

Instead add a new hidden function to ServiceState for use
by SystemUI until we get a real API in O.

bug:30480638
Change-Id: Ifd9b1fbdb74d3a408c419467b7390675fc13ea3d
ndroid/telephony/ServiceState.java
2862ed2541411ea864505b8234da3e789dd104db 27-Jul-2016 Jeff Davidson <jpd@google.com> Add support for carrier \\"associated\\" apps. am: 24b9d96007
am: 19af77d2cb

Change-Id: I089db772e37b7d07a5423793aced78f2b3a9a1ae
19af77d2cb3d96cd5ef1c3c157522e9f05fe979d 27-Jul-2016 Jeff Davidson <jpd@google.com> Add support for carrier \"associated\" apps.
am: 24b9d96007

Change-Id: I1de92977f3a0635d88e6517210f6bbb06ab3d0f0
94ae1e739fd84a308609fff3b913d0963900ed6e 27-Jul-2016 Jeff Davidson <jpd@google.com> Merge "Add support for carrier "associated" apps." into nyc-mr1-dev
24b9d960071ecf24f1b7edf799f6a4edf20f2b95 21-Jul-2016 Jeff Davidson <jpd@google.com> Add support for carrier "associated" apps.

The platform currently supports the notion of default carrier apps.
These apps are set to DISABLED_UNTIL_USED until a SIM is inserted
which grants them carrier privileges, at which point they are enabled.
Apps are not touched if they have been updated from the version on
/system or if their state has been modified externally (e.g. by the
user).

This CL extends this notion to associated apps, which may not have
carrier privileges themselves, but should be enabled/disabled
alongside a particular carrier app. This should include helper apps
that should not be visible to users who don't use the given carrier
unless the user explicitly enables the app.

As additional protection, we add a check to ensure that we never
disable apps after the first time we've run. Since we need to store
this information in secure settings, we also move the call site from
PackageManagerService#main() to PackageManagerService#systemReady(),
which enables use of secure settings but still occurs before
third-party apps can be started.

Bug: 30141427
Change-Id: Iee72ba4e70e5ca97999c9147a65af82c670a23e8
om/android/internal/telephony/CarrierAppUtils.java
a5b14a89dbd9eb1a6c8d19c380a7d1f3f30fe627 26-Jul-2016 fionaxu <fionaxu@google.com> add pii support for Rlog am: a7ab821aa1
am: d42fa0d7ec

Change-Id: I6d337cd7edecfdf24634ccb8d556de9f738935d7
d42fa0d7ec59aff8c5030a49eefbe781f0776b43 26-Jul-2016 fionaxu <fionaxu@google.com> add pii support for Rlog
am: a7ab821aa1

Change-Id: I47153d683efd3256d6ee8d5b9417069b097f65c9
a7ab821aa12c9a291ad5086d7eb816932b349ea1 26-Jul-2016 fionaxu <fionaxu@google.com> add pii support for Rlog

bug: 30368127
Change-Id: I18b7be483ce3f86f47dfcafa9d84fcb9b8724c08
ndroid/telephony/Rlog.java
ad517f9b4222569c3823c791d42f977a3f996478 22-Jul-2016 Brad Ebinger <breadley@google.com> Add CarrierConfig to remove hold during Ims Calls am: c8601013d5
am: f962fc424e

Change-Id: If6095d0e7809d22291423bd082af0ad9bd6fdc68
f962fc424e09c8586655acfd5b1648e9115aba01 22-Jul-2016 Brad Ebinger <breadley@google.com> Add CarrierConfig to remove hold during Ims Calls
am: c8601013d5

Change-Id: I61fe4dc7360fa5627185eabd96e76aa4c336b308
dee7dffb5df66d5a2f3c6a73d747697937a70f42 21-Jul-2016 Brad Ebinger <breadley@google.com> Merge "Add CarrierConfig to remove hold during Ims Calls" into nyc-mr1-dev
b8f22589db866ff256875f87626b7dcd0249b498 20-Jul-2016 Ye Wen <ywen@google.com> Merge \\"Add carrier config for close connection after MMS request\\" into nyc-mr1-dev am: f2598319c0
am: 2395da5e82

Change-Id: Ia6a5877bf5ca52cf65b2ee7a85642a00b208428f
2395da5e82dbef3f82d1c884ef5a759bb6a84df5 20-Jul-2016 Ye Wen <ywen@google.com> Merge \"Add carrier config for close connection after MMS request\" into nyc-mr1-dev
am: f2598319c0

Change-Id: Ia16874474f755b601a02032e34b8dbff81971af8
406a41bed81e25d6d61948118e0b8ebb069552bd 18-Jul-2016 Ye Wen <ywen@google.com> Add carrier config for close connection after MMS request

b/29558615

Change-Id: I24d922f33626b4a65c267dc2d132b5510e357c0f
ndroid/telephony/CarrierConfigManager.java
aa5df000ee2b36fe80c534f9adf3fa6529b0fb2a 20-Jul-2016 Jack Yu <jackyu@google.com> Merge \\"Made severe and extreme alert configuration dependency configurable\\" into nyc-mr1-dev am: 338566df68
am: c26d7f3624

Change-Id: I286adf2ff6f989055b191065a1e737b494989bde
c26d7f362416325c278443d187f32d723f1b3f33 20-Jul-2016 Jack Yu <jackyu@google.com> Merge \"Made severe and extreme alert configuration dependency configurable\" into nyc-mr1-dev
am: 338566df68

Change-Id: I90c0669c74e15d92d00a639ad444866142a62c2e
338566df68c17488486589a0ca75d72f4ae5d418 20-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Made severe and extreme alert configuration dependency configurable" into nyc-mr1-dev
009b877c5c322213265393f4e7c039180d441811 20-Jul-2016 Youhan Wang <youhanw@google.com> Merge \\"Add getCdmaPrlVersion().\\" into nyc-mr1-dev am: d71c64f715
am: 393ccd2a02

Change-Id: I62949a772e5355ca345f94d7dcedc8112de97863
393ccd2a023fdc3cfcabf980402cefc83957a176 20-Jul-2016 Youhan Wang <youhanw@google.com> Merge \"Add getCdmaPrlVersion().\" into nyc-mr1-dev
am: d71c64f715

Change-Id: I4c558086089b69c529019c9712e1fa2424a63e35
d71c64f7151ee53139c4b7e27b4051aa64691f1b 20-Jul-2016 Youhan Wang <youhanw@google.com> Merge "Add getCdmaPrlVersion()." into nyc-mr1-dev
635e6761d118cec37d404e8bd6ae84212ece87e2 20-Jul-2016 Hall Liu <hallliu@google.com> Merge \\"Add carrier config keys for disabling HD icon\\" into nyc-mr1-dev am: 9adea2e246
am: c05194428c

Change-Id: Ib54f7156d2f65ab65c64766a2249a5dc69b49562
c05194428c7a92aacb1a58db2c24f0809203c413 20-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Add carrier config keys for disabling HD icon\" into nyc-mr1-dev
am: 9adea2e246

Change-Id: I1a43d0e6738a41860078ee710d5b57f9a9e66cd5
e79419847ca52c1be4205912fb2dd88314128f30 20-Jul-2016 Jack Yu <jackyu@google.com> Made severe and extreme alert configuration dependency configurable

Before when extreme alert is disabled, severe alert will be disabled
by default because we assume users won't be interested in severe
alert if he is even not interested in extreme (higher level) alert.

Now carriers are allowed to turn this feature off by carrier config.

bug: 29369591
Change-Id: I3eb8a0c3e2df420ea75a77ec01cc447013434219
ndroid/telephony/CarrierConfigManager.java
c8601013d598444eec496bc6c75f5e1959d4ccae 19-Jul-2016 Brad Ebinger <breadley@google.com> Add CarrierConfig to remove hold during Ims Calls

Adds a Carrier Config key to specify whether an IMS call supports
holding. If not, the CAPABILITY_HOLD and CAPABILITY_SUPPORT_HOLD are
not added to the Connection.

Bug: 30195356
Change-Id: I9b16b385a2b90118453d484be5af4f173b199ab1
ndroid/telephony/CarrierConfigManager.java
7c3c28b6d94fcc1df9678507f2d59aa63ff54213 19-Jul-2016 Hall Liu <hallliu@google.com> Add carrier config keys for disabling HD icon

Add keys for whether a wifi call can be HD and whether a video call can
be HD.

Bug: 30013801
Change-Id: I36ab3647a96e5dbd217cff29030d3ac7a2e86f56
ndroid/telephony/CarrierConfigManager.java
4eb5678ed8a0704fe1e4f5e7a3a3156f69b6884f 19-Jul-2016 Youhan Wang <youhanw@google.com> Add getCdmaPrlVersion().

Bug:27612001
Change-Id: Icce9e99d360e30268d41bc063eeefc7484627df6
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
bacc532874d7f107c17e9b5698e9dab5f538da65 16-Jul-2016 Vineeta Srivastava <vsrivastava@google.com> Merge \\"Add carrier config to report IMEI on CDMA phone.\\" into nyc-mr1-dev am: a5b923bdd7
am: 199290cdab

Change-Id: Ia4f53257e352b3f71810582867258ec318cf47d6
199290cdabc9bbaba2973d8c63942e7fef7d9e70 15-Jul-2016 Junda Liu <junda@google.com> Merge \"Add carrier config to report IMEI on CDMA phone.\" into nyc-mr1-dev
am: a5b923bdd7

Change-Id: I383718bd1e756f560485b12259f6a5c98dc8a8f6
a5b923bdd727ccb5f51103b87850b599d802ff7a 15-Jul-2016 Vineeta Srivastava <vsrivastava@google.com> Merge "Add carrier config to report IMEI on CDMA phone." into nyc-mr1-dev
276f4d648b351f523f08c10312bf03ee8499b3f7 14-Jul-2016 Junda Liu <junda@google.com> Add carrier config to report IMEI on CDMA phone.

Bug: b/29340579
Change-Id: I3cac49af4b173f971b8153c00227141378f32b43
ndroid/telephony/CarrierConfigManager.java
074aec74d47e9a46ecca6a4c2cc1505769bc3c29 15-Jul-2016 Pankaj Kanwar <pkanwar@google.com> Merge \\"Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.\\" into nyc-mr1-dev am: 9e73d82336
am: 933e5f9f87

Change-Id: I42509be5aaf59525014f09b4dad81dc4811d5b69
933e5f9f8706827b7621c673f39e440527fcf410 15-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.\" into nyc-mr1-dev
am: 9e73d82336

Change-Id: Idd57c35f04193ab1157e455f4c4242e30c9ea7a2
9e73d82336145982c3fc315b6f6bebd76d6caf87 15-Jul-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems." into nyc-mr1-dev
83ca6571a1d80fa6b9ff687ba1777f457c165e70 14-Jul-2016 Jack Yu <jackyu@google.com> Merge \\"Disable VT when users turn off data or hit data limit\\" into nyc-mr1-dev am: 92a07ae79d
am: 37506e246d

Change-Id: I8c3575407a785d7af9a3a9a73bd362275e55a75e
37506e246dfc78b9e7bb9263249a28ddc0af26ab 14-Jul-2016 Jack Yu <jackyu@google.com> Merge \"Disable VT when users turn off data or hit data limit\" into nyc-mr1-dev
am: 92a07ae79d

Change-Id: Ia53f350beda8d9671cb67c2a01ed0071b65c4b76
853d8f68f93077d453dca006d9a70ed990d228f6 14-Jul-2016 Tyler Gunn <tgunn@google.com> Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.

Some modems use a lowercase version of this extra, which is not correct.
Adding an alternate definition so ImsCall can still determine the radio
type.

Bug: 28933314
Change-Id: I61d13a2aa447877e1c89c3ae474a8614c29492a1
om/android/ims/ImsCallProfile.java
8781b68e2bd6c0080e9c91544557b64783e7dffa 08-Jul-2016 Jack Yu <jackyu@google.com> Disable VT when users turn off data or hit data limit

Disable VT when users turn off data or hit data limit. If
there are ongoing VT calls, we'll need to downgrade them
to VoLTE calls.

bug: 27316521
Change-Id: I89fe42f6cf6c419c21c4f2006e9cb43cf7e13503
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/DctConstants.java
om/android/internal/telephony/ITelephony.aidl
58cca577c4733302220538e720bdb6ba9d650014 12-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"Finalize MEP functionality.\\" into nyc-mr1-dev am: 768cf076da
am: f92d4fcb2c

Change-Id: I0421ed193af425984a4624f73c774750eb34ab5f
f476f1a91bafebd4db2255fb80e3a532157dc63a 12-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"Add carrier config for WFC promo mode.\\" into nyc-mr1-dev am: 3cc6935719
am: 80e8e8911e

Change-Id: Ia3abba983e00262bd3b71defb215e5d2f1fcadd4
41027008523e14bcd8d6caf89e46d0550f8fb62b 07-Jul-2016 Hall Liu <hallliu@google.com> Rename disable add call extra

Used to be DISABLE_ADD_CALL_DURING_VIDEO_CALL, now just
DISABLE_ADD_CALL. The meaning has also changed -- having the extra set
means that adding calls should be disabled no matter what.

Bug: 29047863
Change-Id: Icd8966492b264a9c64dc4880080a706032f0759c
(cherry picked from commit ee6e86b2bc9ab811500c30e26d8e07b3781acfaf)
ndroid/telephony/CarrierConfigManager.java
f92d4fcb2cf9f227b4cce4c7c87a4db0217e65c4 12-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Finalize MEP functionality.\" into nyc-mr1-dev
am: 768cf076da

Change-Id: Idb9702f44f93ecf46ecf86cda2adbc596bdfc52f
c96b5e087382a2a530e9c8cf8f2e1f8dbfc439c5 08-Jul-2016 Tyler Gunn <tgunn@google.com> Finalize MEP functionality.

1) Finish plumbing of PULLING_CALL state.
2) Add new disconnect cause used when maximum number of calls across
all devices has been reached.
3) Add PII mask for toString of ImsExternalCallState.

Bug: 29522023
Change-Id: I78a0a9f3c3d846cfc58a1c5bcc6f105027602cbc
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/DisconnectCause.java
om/android/ims/ImsExternalCallState.java
om/android/ims/ImsReasonInfo.java
80e8e8911e68dccfa8bb5d9941bfbf67102bc91d 11-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Add carrier config for WFC promo mode.\" into nyc-mr1-dev
am: 3cc6935719

Change-Id: Ib135da9b8869da3396a98262f5e18f09ffbbad3e
3cc6935719323a3d8dc31fcfba59f5e3a8abfa32 11-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Add carrier config for WFC promo mode." into nyc-mr1-dev
b60e0bf477821a77c30bc41fd7495b04fb38b6f3 09-Jul-2016 Hall Liu <hallliu@google.com> Merge \"Rename disable add call extra\" into nyc-mr1-dev
am: 7e10bcffc5

Change-Id: Ide932c20b167bdfb9623cebd70d7732b53a80b34
7e10bcffc5fb34ea2051961ed07838c93018fd94 09-Jul-2016 Hall Liu <hallliu@google.com> Merge "Rename disable add call extra" into nyc-mr1-dev
ee6e86b2bc9ab811500c30e26d8e07b3781acfaf 07-Jul-2016 Hall Liu <hallliu@google.com> Rename disable add call extra

Used to be DISABLE_ADD_CALL_DURING_VIDEO_CALL, now just
DISABLE_ADD_CALL. The meaning has also changed -- having the extra set
means that adding calls should be disabled no matter what.

Bug: 29047863
Change-Id: Icd8966492b264a9c64dc4880080a706032f0759c
ndroid/telephony/CarrierConfigManager.java
c3e6c93431b64594b3a7042893c48602a9c53436 07-Jul-2016 Tyler Gunn <tgunn@google.com> Add carrier config for WFC promo mode.

Adding new carrier config, defaulted to false, which allows a carrier to
promote the use of WFC when the device is connected to WIFI and WIFI
calling is disabled.

Bug: 27970317
Change-Id: I4904b7f006bae9f834816c1964025acf36b4ba84
ndroid/telephony/CarrierConfigManager.java
bba727d8ee399673a2900ac5e9463aa31cfae98e 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"Telephony multi-endpoint disconnect causes.\\" into nyc-mr1-dev am: 0babe967be
am: d3b6092a05

Change-Id: I8b756b5dd9c8bc1f98ebde57187cee16a50e6565
d3b6092a05606a2e3a9b553d86ac90511de8a8dd 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Telephony multi-endpoint disconnect causes.\" into nyc-mr1-dev
am: 0babe967be

Change-Id: Ic25889f342d388368f2f9122c706ebc3bce764bd
0babe967be05980831fde54f331c674ebf4e0d98 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Telephony multi-endpoint disconnect causes." into nyc-mr1-dev
fae0fe07450809bc0e6616dc29984e07633217d8 30-Jun-2016 Jack Yu <jackyu@google.com> Merge \"Merge \\"Added a virtual interface for Video Telephony call usage counting\\" into nyc-mr1-dev am: 83e96c1957\" into nyc-mr1-dev-plus-aosp
am: 3249cf25bd

Change-Id: I57546ac79c77543384fc5e0b327deda019ecc2b8
92944f3e0a12a69ec6e5738c71565588feff43ef 30-Jun-2016 Jack Yu <jackyu@google.com> Merge \"Added a virtual interface for Video Telephony call usage counting\" into nyc-mr1-dev
am: 83e96c1957

Change-Id: Ia70a43a4df982cf09bb89b00650ce25aff7a43f4
b6587eac06c00c964b6f541e18d307df8c4a9a50 22-Jun-2016 Jack Yu <jackyu@google.com> Added a virtual interface for Video Telephony call usage counting

1. Added a virtual VT interface.
2. Qeury VT usage from telephony service.

bug: 20888836
Change-Id: I3df0c22922f8394554230b53f8ae091e17c95595
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
674b42845606caa15520c7a7df5672a1782f97f6 28-Jun-2016 Hall Liu <hallliu@google.com> Merge \\"Add disable add call during video call extra and carrier config key\\" into nyc-mr1-dev am: 2cd8281a23
am: 2258e483f1

Change-Id: I7283e51cda559e4ea976bbd20d149697f7e54e46
2258e483f17175ffc4d442d2a9cfe0eb9fbd9a97 28-Jun-2016 Hall Liu <hallliu@google.com> Merge \"Add disable add call during video call extra and carrier config key\" into nyc-mr1-dev
am: 2cd8281a23

Change-Id: I98ed6adcc49525db82c09a98e2c632894a4a0bc9
10208661cda0c6372d78f7a5bfa063658b62f2be 16-Jun-2016 Hall Liu <hallliu@google.com> Add disable add call during video call extra and carrier config key

Bug: 29047863

Change-Id: I977041ec72968bdccc69a706e27dd4b5ec336ba7
ndroid/telephony/CarrierConfigManager.java
bd6dfcc20526a9b0f606e806f2db80d76acc44af 28-Jun-2016 Tyler Gunn <tgunn@google.com> Merge \\"Add onConferenceSupportedChanged callback, carrier config.\\" into nyc-mr1-dev am: 780648be53
am: da457b206e

Change-Id: I8d2c147c2455dcf6dfcedfde43890b4962f7b4cd
da457b206ef0f76cd44e4633d5b8b5da55f68698 27-Jun-2016 Tyler Gunn <tgunn@google.com> Merge \"Add onConferenceSupportedChanged callback, carrier config.\" into nyc-mr1-dev
am: 780648be53

Change-Id: I71c24e971bf8d36fd5448497b85660be43417632
780648be53e96628105b256012c3aa68413a6a13 27-Jun-2016 Tyler Gunn <tgunn@google.com> Merge "Add onConferenceSupportedChanged callback, carrier config." into nyc-mr1-dev
2031d69810ae571f850cef3a37e166e558b44ce8 27-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge \\"Fix documentation of getTelephonyHistogram() api.\\" into nyc-mr1-dev am: afcc40f818
am: fe84c788e0

Change-Id: I7d666c23212797b824ea0387112636fb0861a2d5
fe84c788e0a2a2b6b6ef90b19fd9c6c29c24325f 27-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge \"Fix documentation of getTelephonyHistogram() api.\" into nyc-mr1-dev
am: afcc40f818

Change-Id: I82a3f890479ce0358b28d1ec6a42c9f154e0d3f0
7f89016579567b40705f3821c3b57518ea4a421d 27-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Fix documentation of getTelephonyHistogram() api.

Bug: 29760459
Change-Id: Ib7c4df81026331f88f6a8776c0042abf4f32c620
ndroid/telephony/TelephonyManager.java
7d633d3337773551b02f9018beb4c7aaddde6bed 24-Jun-2016 Tyler Gunn <tgunn@google.com> Add onConferenceSupportedChanged callback, carrier config.

Used to inform listeners when a connection can or cannot be part of a
conference. Used to inform the conference controller so that it can
recalculate the conferencable connections.

Adding carrier config for carrier requirement.

Bug: 29059073
Change-Id: Iab028fd44d87c8dc2bbbe8bba7ba9ccdc223fe51
ndroid/telephony/CarrierConfigManager.java
d6d8745bb2b872defafa824ddebcf1e35ea4c320 23-Jun-2016 Tyler Gunn <tgunn@google.com> Add support for dropping fg video call on answer of audio call. am: 4b6614e576
am: b90e2dc722

Change-Id: I09a322e50a6989375f2ba1ec4a81b2fb0ee8876b
b90e2dc72229b387fefe57249004bacbff44b2fc 23-Jun-2016 Tyler Gunn <tgunn@google.com> Add support for dropping fg video call on answer of audio call.
am: 4b6614e576

Change-Id: Id51de6ca0d6f885a22374e2a2c0a38477a5e2df7
4b6614e5762852e4495a991b5fc833a342f2cb36 22-Jun-2016 Tyler Gunn <tgunn@google.com> Add support for dropping fg video call on answer of audio call.

Adding two new carrier config options:
1. treat_downgraded_video_calls_as_video_calls_bool - when there is an ongoing
call which was previously a video call (or is currently video call), some
carriers require that this is treated as if it is a video call for
telephony logic such as in (2).
2. drop_video_call_when_answering_audio_call_bool - if the user is in an
active video call (see (1)) over wifi, and an incoming audio call comes in,
when this carrier config option is "TRUE", the video call will be dropped
when the audio call is answered.

Adding new connection extra to indicate to the dialer app that answering
a ringing call will cause the current active video call to drop.

Bug: 29275420
Change-Id: Ied5dbabc8ff09045ba41c5eba2136adad10db80e
ndroid/telephony/CarrierConfigManager.java
om/android/ims/ImsCallProfile.java
5f7605d7b0889f6d8b8e54edbc77c29839d873c3 23-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\"Add support for LTE CarrierAgregation\\" into nyc-mr1-dev am: 37a56b2891
am: bf9a513888

Change-Id: Ifab708f597af7a7ef782d8a8a754987094464f26
bf9a513888c67c376769854ea86ec78fe9ab7365 23-Jun-2016 Ajay Nambi <anambi@codeaurora.org> Merge \"Add support for LTE CarrierAgregation\" into nyc-mr1-dev
am: 37a56b2891

Change-Id: I802ea83a3e1e1328c48ba56142848033c3dc848b
7965fa41c32493f723a883ca71e7c246b940331c 15-May-2015 Ajay Nambi <anambi@codeaurora.org> Add support for LTE CarrierAgregation

Note this may be redesigned in O to better handle the
various bitrate/channel combinations in a sane way.

bug:27360321
Change-Id: If6ffbd02e3a7f170cc041747e32bb624234c3e09
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/RadioAccessFamily.java
ndroid/telephony/ServiceState.java
ndroid/telephony/TelephonyManager.java
e18f55e2ac03ea6c808bd605b52b8847ce0f6631 23-Jun-2016 Chris Manton <cmanton@google.com> Merge \\"Add global settings for cell radio state\\" into nyc-mr1-dev am: d4ac4c7786
am: 8bfefbbb53

Change-Id: I44d2ab2580ebbb395ebc511a1be61fc46a2c1d4f
8bfefbbb53914fc5667c0ca5f73179edc7c2da83 23-Jun-2016 Chris Manton <cmanton@google.com> Merge \"Add global settings for cell radio state\" into nyc-mr1-dev
am: d4ac4c7786

Change-Id: I5698d08dcc6854ceffb08debecf3fa443750fab0
95a6c899d6625ec2b1a0cdca4934debff88da86d 15-Mar-2016 Chris Manton <cmanton@google.com> Add global settings for cell radio state

Provide persistable state for cell radio
to handle airplane mode similar to any
other radio in the system.

Change-Id: I87398fe84de3f6a10b0e1002e9e5bf7e61f9441f
om/android/internal/telephony/PhoneConstants.java
ba83347bc6ab3464fb86cb24f39e0f43fab65ebc 22-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\"Add a Carrier-config specific ratcheter of RATs.\\" into nyc-mr1-dev am: 23cac795b0
am: eafd6a2c2d

Change-Id: I4adc4c549ce01d233ab1c47da4f5b6bd3ccf1e6e
eafd6a2c2d4335e61410b0d39511a91cb4bbf430 22-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \"Add a Carrier-config specific ratcheter of RATs.\" into nyc-mr1-dev
am: 23cac795b0

Change-Id: Ifa8987968a04e4df3eb3b85610c23a1b241de247
60551b68378c294c9d126b24b3b4fea1970ec83e 10-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Add a Carrier-config specific ratcheter of RATs.

Only reports transitions to higher RATs within a given family.
Reset when we move to a new cell.
Avoids costly propogation of RAT flapping within the family,
for example every outgoing data pops us into a higher RAT and
idle time pops us back down.

bug:27360321
Change-Id: I549d79c1c74325981bee284cef452bd096184d86
ndroid/telephony/CarrierConfigManager.java
a073a5261e20404ee4b759a70d39c504f781b050 21-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge \\"Unhide Network types in TelephonyManager\\" into nyc-mr1-dev am: 0df9721a08
am: ac9cfbf548

Change-Id: I68771c36a436f6ccaaacc959604c6e416af8ee96
ac9cfbf548295a7739c8429be4aa49c5ea91cc77 21-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge \"Unhide Network types in TelephonyManager\" into nyc-mr1-dev
am: 0df9721a08

Change-Id: I967f047882ef07aa8d5deb88a5ad379a3b37257d
4652826d7100df88ce0117b703cd6cc8a030f777 20-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Unhide Network types in TelephonyManager

Bug: 29493935
Change-Id: Ib1bef4a68a962b0f473e07415d46ecff6080ea71
ndroid/telephony/TelephonyManager.java
f9529b5a48f72c147c4cbe691ded79c404eca2d1 18-Jun-2016 Jack Yu <jackyu@google.com> Merge "Added a new configuration for data call setup permanent failure"
8a81a21777a0e5b395cc6f4dcddb737db643b95e 15-Jun-2016 Jack Yu <jackyu@google.com> Added a new configuration for data call setup permanent failure

bug: 28728821
Change-Id: I441df1483dfa3d4bc1ea566a98b17bd3deddc193
ndroid/telephony/CarrierConfigManager.java
1e31588227850eaafe2c0da6e15a42988e6c3a6c 17-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge \"Modify TelephonyHistogram.java functions.\" into nyc-mr1-dev
am: ffaec89277

Change-Id: I1a5343468822da6531cb769f0526262e5fb34889
ffaec89277c1b276e2cdd8832aea660b4fc5dc7e 17-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Modify TelephonyHistogram.java functions." into nyc-mr1-dev
e5ffc4ac237dc2789ce8fbd0fcc84dd89518a6bc 17-Jun-2016 Ta-wei Yen <twyen@google.com> Merge \"Allow the phone process to hide outbound text SMS\" into nyc-mr1-dev
am: 3f258857b5

Change-Id: Id54d7ac48c857234e43b828368ff0cd53facc0b0
3f258857b5f3cee671a6b37b1fce6682102b018e 17-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Allow the phone process to hide outbound text SMS" into nyc-mr1-dev
0680f73f3d61c6fb31dc82ca81c58f7f6f1c39f8 16-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Modify TelephonyHistogram.java functions.

+ Update getBucketEndPoints & getBucketCounters to return values even when
sampleCount < 10.

Bug: 28717269
Change-Id: Ie3d16d472d04f051442d22bbe0f9f63dece8cc46
ndroid/telephony/TelephonyHistogram.java
1ecda97bdd56684fd1d7ddfa53297e9fab2d5d57 15-Jun-2016 Ta-wei Yen <twyen@google.com> Allow the phone process to hide outbound text SMS

Bug: 29095322
Change-Id: Ic6ce8aa18450815e91e8d819439b10ccc186fec7
om/android/internal/telephony/ISms.aidl
96c1a81c5662435c0a3aa8f50217cd75974d4336 14-Jun-2016 Qingxi Li <qingxi@google.com> Merge \\"Add a key for setting carrier\\'s CDMA roaming mode\\" into nyc-dev am: 130db7715a
am: bd012f68ac

Change-Id: I8eaac539138c7a6936afa9ef64d43690e0f533f5
de9fe3597d09a38d84f1d742417edd3dbf1d000a 14-Jun-2016 qingxi <qingxi@google.com> Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
am: 130db7715a

Change-Id: I3385fe2660bf9da3f13ef90f4b4b17a8ad0b64ad
bd012f68acf215eaab7f8685e4085941fdf3f478 14-Jun-2016 qingxi <qingxi@google.com> Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
am: 130db7715a

Change-Id: I130ba1362d755e1859d5c22311867008d0626890
247e7f4dca29bcfdae4cc46b014c178cbe138c61 04-Jun-2016 qingxi <qingxi@google.com> Add a key for setting carrier's CDMA roaming mode

Change-Id: If092f0b23dc7e320c27e4231605756e990949d15
bug: 28836467
ndroid/telephony/CarrierConfigManager.java
248a1c2d7b7f15e7917f409c1af3af5d97db8a62 10-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \"Clean up PCO plumbing.\" into nyc-mr1-dev
am: 4b6298b019

Change-Id: I3f0b125aeaa6c2016cef52c58771204e252b177b
2a3f997b020ccd11718203044a96d42da1eea3ba 09-Jun-2016 Tyler Gunn <tgunn@google.com> Telephony multi-endpoint disconnect causes.

A few disconnect cause mappings were missing for the multi-endpoint
disconnect causes. Adding them here.

Bug: 29236416
Change-Id: I669bd72290c0e823c54eb6062ebd658743882852
ndroid/telephony/DisconnectCause.java
eb17ccb60832f0ab31417291d6eca52451efde94 08-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Clean up PCO plumbing.

There's more data that needs to make it out to the carrier app.
Add the extras and correct some (it's a byte array, not an int, etc).

bug:28567303
Change-Id: I97ed41d9329ccc14851b8e171e8fa07919c8e38b
om/android/internal/telephony/DctConstants.java
om/android/internal/telephony/TelephonyIntents.java
3f8c335ec893eddcb49f892e1b2d8eeb06aae940 07-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev
am: 2e9b43efd5

* commit '2e9b43efd53fbbce733b6e5c328f37c635c699a3':
Fix bug while writing data to parcel in TelephonyHistogram.java

Change-Id: I47cce50a4fdcc0bf4c747a410dd07658424dd9f3
2e9b43efd53fbbce733b6e5c328f37c635c699a3 07-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev
b9f0053b0c55af05cae8556e2e6ff54a38cf73ab 07-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Fix bug while writing data to parcel in TelephonyHistogram.java

Bug: 29117186
Change-Id: Ic694adc3323062e90c0e6586ea31e7691036ffcd
ndroid/telephony/TelephonyHistogram.java
027e2d204ed56288eb3e2b00fec4fef28bbee1c6 06-Jun-2016 Stuart Scott <stuartscott@google.com> Merge "Add carrier config key for carrier setup app." into nyc-mr1-dev
am: 56760c65df

* commit '56760c65df6ca55d4570847b9f9777a23e2dfaf5':
Add carrier config key for carrier setup app.

Change-Id: Ie6ab4cd355c061a7c6f04228fefde2ebf690eb59
9abc2735fa7cfee54e8fe498eadaacc4d70e935a 12-May-2016 Stuart Scott <stuartscott@google.com> Add carrier config key for carrier setup app.

bug:28374700
bug:28374253
Change-Id: Icf56d4d2a89e32a062f3b8cc624f17e06c994599
ndroid/telephony/CarrierConfigManager.java
2581d13f25878caf6011a2498b869d1dc84115ca 04-Jun-2016 fionaxu <fionaxu@google.com> Merge "cold sim clean up" into nyc-mr1-dev
am: ba3428f01b

* commit 'ba3428f01b8cc112cd85d1c4ffcc1407a3b8b7c6':
cold sim clean up

Change-Id: I5a2e24d997408badd6db7576b2fa206eb9e5c4ca
ba3428f01b8cc112cd85d1c4ffcc1407a3b8b7c6 04-Jun-2016 Chen Xu <fionaxu@google.com> Merge "cold sim clean up" into nyc-mr1-dev
1bf6ec2f868041ba4c3d4c88d3ac482bfd4c52b9 24-May-2016 fionaxu <fionaxu@google.com> cold sim clean up

- add a new field: provisioningNotificationEnabled from NetworkMisc. set
to false if we want to hide "sign in" notification and placed
carrier-specific notification instead. it is set on connect, once set,
it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support

Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/SubscriptionInfo.java
ndroid/telephony/SubscriptionManager.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ISub.aidl
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/TelephonyIntents.java
c4e25b26defa019041d2e596381be69b7a68210c 03-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
am: 6a5c9560a3

* commit '6a5c9560a33337fc82362d77bc4bae633953428d':
Add support for UNSOL PCO Data.

Change-Id: Idcf20b421f1174b3ddacaa6fde33b221a5ecbccf
6a5c9560a33337fc82362d77bc4bae633953428d 03-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
a255d5de80f460559e760a73f6f28fca85594eab 03-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Merge commit \'b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev
am: 1a6b6fc266

* commit '1a6b6fc2664305de6e7102fa96506910fb7705dd':
Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I2d9db536538179a4fdca78613408dfd492b822b4
a7f74b1d43f6790b07222eb10ffe81ed13ce352a 03-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d

Change-Id: I38ab50f3cf7a0fa4ca71a647021975fb9b3eb968
701cd3fe15148f561c27b9a2b65da79b6f36c1c8 03-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev
am: b68601d247

* commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532':
Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I3a83554dd14fe424706ec14853480f52569ff431
37409c574782d7cc0b877c386c1d45ba83a14925 02-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Add support for UNSOL PCO Data.

PCO is a container in data-call responses with a range
of optional fields devoted to carrier-proprietary signalling.
This change includes a class to contain this opaque info on
its way to carrier apps.

bug:28961371
bug:28567303
Change-Id: Ibfc304800bb3d5b8706d56c08400c1d0b4453a55
ndroid/telephony/PcoData.aidl
ndroid/telephony/PcoData.java
om/android/internal/telephony/RILConstants.java
49b204264ed20988b1424e6c9a99e7f082e51039 01-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Add carrier config variables for overriding carrier name from carrierconf.

Bug: 27718118
Change-Id: Ie62dd3dc52f0977a2b05ae8f0ba4898c80174658
ndroid/telephony/CarrierConfigManager.java
9a19e8948d7a716bf9ad6743ad85cbc4e2a5942d 27-May-2016 Jonathan Basseri <misterikkit@google.com> resolve merge conflicts of 4c04097 to nyc-mr1-dev
am: 04c35e78db

* commit '04c35e78dbd5bc6670b5bf4e72686f696745af13':
Change how TelephonyManager handles subscriptions.

Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d
04c35e78dbd5bc6670b5bf4e72686f696745af13 26-May-2016 Jonathan Basseri <misterikkit@google.com> resolve merge conflicts of 4c04097 to nyc-mr1-dev

Change-Id: I256514588af20985108f72a5e204811904f87c9c
531cd8724cad56e2a141dbe5acbe283372c21de4 26-May-2016 Jonathan Basseri <misterikkit@google.com> Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
am: 4c04097fdb

* commit '4c04097fdbe0fe414a6fcb2d6174e295986a3f66':
Change how TelephonyManager handles subscriptions.

Change-Id: I5d63caf41cb55d3077f9a3c00f4f1cce6bbe5ddd
4c04097fdbe0fe414a6fcb2d6174e295986a3f66 26-May-2016 Jonathan Basseri <misterikkit@google.com> Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
8a6561d177aad392dddb5e24bc44688334474fd0 25-May-2016 Jonathan Basseri <misterikkit@google.com> Change how TelephonyManager handles subscriptions.

Addressing API council feedback, remove* all subscription ID arguments
from API calls, and provide a factory method to create a new
TelephonyManager which uses a given subId.

* The subId methods will be @hidden instead of deleted.

Bug: 28845064
Change-Id: I2de8ae9e45bc14962c7c20d7d076ec83bce92cd3
ndroid/telephony/TelephonyManager.java
9b8b72748c555329564577d53e96a600bf1ea99b 26-May-2016 Derek Tan <derektan@google.com> Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb
am: 869f32d810

* commit '869f32d8101862b8c96ecb6cd7317acf0c655c38':
Per API review, revert the API renaming CL.

Change-Id: I8017702c808b84c8f05dd51ba8c8c0afda8a6b9f
869f32d8101862b8c96ecb6cd7317acf0c655c38 26-May-2016 Derek Tan <derektan@google.com> Merge "Per API review, revert the API renaming CL." into nyc-dev
am: 03d3f4a6cb

* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
Per API review, revert the API renaming CL.

Change-Id: Ic5fb3154e837742622e27fbc2d68eb19930a2faf
e214ff00eada0035ed0cae33856846be1c1158ec 26-May-2016 Derek Tan <derektan@google.com> Merge "Per API review, revert the API renaming CL." into nyc-dev
am: 03d3f4a6cb

* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
Per API review, revert the API renaming CL.

Change-Id: I536acb34c3d4b531db777a0635ccdb173db1183d
03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9 26-May-2016 Derek Tan <derektan@google.com> Merge "Per API review, revert the API renaming CL." into nyc-dev
ec319efbd55286979a9e17cbb1b69486abb8adb8 25-May-2016 Junda Liu <junda@google.com> Merge "Add restricted card state to telephony manager." into nyc-mr1-dev
am: ea97857a78

* commit 'ea97857a7868467a5cbe986807d04854cc4c3442':
Add restricted card state to telephony manager.

Change-Id: I800619a54e75424d6dbb723216ae250ec6276e41
ea97857a7868467a5cbe986807d04854cc4c3442 25-May-2016 Junda Liu <junda@google.com> Merge "Add restricted card state to telephony manager." into nyc-mr1-dev
818822ad5d68ae083053f8430cfc48a6a99af182 25-May-2016 Derek Tan <derektan@google.com> Per API review, revert the API renaming CL.

Revert "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager."

This reverts commit 3bf26b56056ea8071e4092bf9a66171c96f43909.

Bug: 28295813
Change-Id: I44e7925c86c68a79b8d962670baadea7a7227ca2
ndroid/telephony/CarrierConfigManager.java
4567add4196dfd148051961e11ac40e0f8e8d0a9 25-May-2016 Ta-wei Yen <twyen@google.com> Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev
am: 85663d7edf

* commit '85663d7edfddd275e6e433bfe2c8b99bab019a49':
Switch VVM SMS filter to Builder pattern

Change-Id: I85aaa4fc34a7f0b240f05bba98104879438c6331
85663d7edfddd275e6e433bfe2c8b99bab019a49 25-May-2016 Ta-wei Yen <twyen@google.com> Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev
a2f6a675112fa7029dbdd51eb6379bc9ce2bbf53 24-May-2016 Junda Liu <junda@google.com> Add restricted card state to telephony manager.

Bug: b/28564314
Change-Id: If19b12036b09a8cd015dce4faf5de26606ee2b97
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IccCardConstants.java
67ab168b78782c4de5de3f44817961468533757c 25-May-2016 Ta-wei Yen <twyen@google.com> Switch VVM SMS filter to Builder pattern

Bug:27816386
Change-Id: I74c73f0a43530dc563df29f0df7ae1a40845e8f0
ndroid/telephony/TelephonyManager.java
ndroid/telephony/VisualVoicemailSmsFilterSettings.aidl
ndroid/telephony/VisualVoicemailSmsFilterSettings.java
om/android/internal/telephony/ITelephony.aidl
fe9ed66227cf989b566c444ba925d4c71def5875 21-May-2016 Meng Wang <mewan@google.com> Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev
am: ac517216c5

* commit 'ac517216c50075baf3f93ae06ebec3dcb68ad9a9':
Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager

Change-Id: Ice91655cf111964ec20f961b2555da3cc4b9325c
64997623bfa04e80064b6056fab0fb23144acb44 05-May-2016 Meng Wang <mewan@google.com> Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager

Also:
Add RIL constants RIL_REQUEST_SET_ALLOWED_CARRIERS, RIL_REQUEST_GET_ALLOWED_CARRIERS

Bug: 28564314
Change-Id: Iaf6c40de633e767309c4088249a5c13cb0988c5c
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/RILConstants.java
c4a4de836e405a11a35d5ad40bc04d139349ba85 20-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev
am: 096e99e25c

* commit '096e99e25ce30dbd7a86d6cd543e27a087fbb243':
Add new TelephonyManager api to query Telephony metrics.

Change-Id: I5ba87e5c4e8c1b901f6ec98c94fed283aab24a36
096e99e25ce30dbd7a86d6cd543e27a087fbb243 20-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev
f652b1ec426b0d8141cd5860a8ddd0985cb1c08b 20-May-2016 Ta-wei Yen <twyen@google.com> Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f
am: 621b68a213

* commit '621b68a2136b644734292655228503c42a541576':
Rename visual voicemail sync intent value

Change-Id: Ia517f7c596e8d1d1dc055ea081950328faf4f34f
7220c75f65b615999d2d555024aab6a324b0f376 20-May-2016 Ta-wei Yen <twyen@google.com> Merge "Rename visual voicemail sync intent value" into nyc-dev
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
Rename visual voicemail sync intent value

Change-Id: I677dcd6e8261dfdbf4ab203ef1232f9f599a0687
621b68a2136b644734292655228503c42a541576 20-May-2016 Ta-wei Yen <twyen@google.com> Merge "Rename visual voicemail sync intent value" into nyc-dev
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
Rename visual voicemail sync intent value

Change-Id: I3c842deef20bcc0258affa2ca7d2241502ec49f6
06e1ae1a51b9fb8c65e610c22f86380c60a803a0 19-May-2016 Sanket Padawe <sanketpadawe@google.com> Add new TelephonyManager api to query Telephony metrics.

Bug: 28717269
Change-Id: I6f5e88509feda879162049955776cb61dda8c840
ndroid/telephony/TelephonyHistogram.aidl
ndroid/telephony/TelephonyHistogram.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
7a63216d83f90e4a392fc2a500245a50d3de34f0 18-May-2016 Tyler Gunn <tgunn@google.com> Merge "Continued multi-endpoint work." into nyc-mr1-dev
am: beb8c4954d

* commit 'beb8c4954db199412a8e59b45198b0c2ac449bfd':
Continued multi-endpoint work.

Change-Id: I1090df296dd4f0824202f5173e88ba8d6570db5f
beb8c4954db199412a8e59b45198b0c2ac449bfd 18-May-2016 Tyler Gunn <tgunn@google.com> Merge "Continued multi-endpoint work." into nyc-mr1-dev
153fcd7ba14b2eba5cf1b1d17437540e2a68322f 18-May-2016 Ta-wei Yen <twyen@google.com> Rename visual voicemail sync intent value

Rename value of KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL KEY_VVM_PREFETCH_BOOL

Change-Id: I13718333a8ddc38e8d2131b478562b76cf9aab64
Fixes:28819765
Fixes:28822093
ndroid/telephony/CarrierConfigManager.java
14fd0ca66912377cd764ba487539cf1cd0190da5 17-May-2016 Vineeta Srivastava <vsrivastava@google.com> Merge "wifi calling emergency address carrier config" into nyc-mr1-dev
am: db41be8ef4

* commit 'db41be8ef4c1c3364eaf3b552f0037f80cd0fe0f':
wifi calling emergency address carrier config

Change-Id: I5d1ff70da4e92637e77d144eba70009a12ced185
db41be8ef4c1c3364eaf3b552f0037f80cd0fe0f 17-May-2016 Vineeta Srivastava <vsrivastava@google.com> Merge "wifi calling emergency address carrier config" into nyc-mr1-dev
1a4329a9b28cb6f6fdb7b492117a659d52bff987 17-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "OMADM intent sent by both system and apps." into nyc-dev am: 65ca16ebab
am: db4c3aff33

* commit 'db4c3aff334c0cebea1e337fadb4b535e8ccaffa':
OMADM intent sent by both system and apps.

Change-Id: I7bbe6a5deee8bd2eeb0e7b59763ddfb6d615bc1f
4e36794b49943d01eefa39443d7225f7b8c7a448 17-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "OMADM intent sent by both system and apps." into nyc-dev
am: 65ca16ebab

* commit '65ca16ebab701c82895a0f1bf5ba0344aff44e50':
OMADM intent sent by both system and apps.

Change-Id: Icd3a9e9b35a2f4c44269fef2bbbe8d6835d93990
db4c3aff334c0cebea1e337fadb4b535e8ccaffa 17-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "OMADM intent sent by both system and apps." into nyc-dev
am: 65ca16ebab

* commit '65ca16ebab701c82895a0f1bf5ba0344aff44e50':
OMADM intent sent by both system and apps.

Change-Id: Ifda48558713ea89d0d1b2de54b1abb738ca187e8
65ca16ebab701c82895a0f1bf5ba0344aff44e50 17-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "OMADM intent sent by both system and apps." into nyc-dev
8259fd31c76182ab3e759a5180caddfaa6f3edcf 16-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev am: 8c60dbe3ca
am: 2bd42d8224

* commit '2bd42d82243c90b051a449cdcb7fb3766b5d3a83':
Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.

Change-Id: I23c27cd49972b658d00fb0f5dd9d466094ce4179
fc848e9c2bcab9878cdae3f6458529f42768e873 16-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev
am: 8c60dbe3ca

* commit '8c60dbe3caae6bdfc202f17455526cb16cd46439':
Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.

Change-Id: I65ce85fd9134594c9db88252b268eaba93cdcb4d
2bd42d82243c90b051a449cdcb7fb3766b5d3a83 16-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev
am: 8c60dbe3ca

* commit '8c60dbe3caae6bdfc202f17455526cb16cd46439':
Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.

Change-Id: I737738186f863b6fdbb034c878a964f54d7b0369
655041ef5acbaf1f04ee0ca37391bafda535e2da 16-May-2016 Ta-wei Yen <twyen@google.com> Merge "Add visual voicemail SMS filter APIs" into nyc-mr1-dev
am: ca2da6dc33

* commit 'ca2da6dc3332bb657e4927b837e5bc15a6e119cb':
Add visual voicemail SMS filter APIs

Change-Id: I8b124c6a22e473f760e29be8d79843ec55122bb7
232667bddaa3f643772ee0495de0ec5656fa449d 16-May-2016 Sanket Padawe <sanketpadawe@google.com> Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.

Bug: 24450765
Change-Id: I42c9f9b2b1c34d774c28d8431bc7c21bbf5909fd
om/android/internal/telephony/TelephonyIntents.java
c7d7ab7fab9aa6d354d003c50165d91f4843e3b1 14-May-2016 Vineeta Srivastava <vsrivastava@google.com> wifi calling emergency address carrier config

Add a carrier config for providing emergency address to carriers for
WiFi Calling use case.

Bug: 28404126
Change-Id: I33ed973d5ce6c9503412d5d97aa7278aaae888b5
ndroid/telephony/CarrierConfigManager.java
349f4eddf76d1f16966a7ae7b599e984f599cf2e 14-May-2016 Ta-wei Yen <twyen@google.com> Add visual voicemail SMS filter APIs

Added the following APIs to the framework:
VoicemailContracts.ACTION_VOICEMAIL_SMS_RECEIVED
VoicemailContracts.EXTRA_VOICEMAIL_SMS_TYPE
VoicemailContracts.EXTRA_VOICEMAIL_SMS_DATA
VoicemailContracts.EXTRA_VOICEMAIL_SMS_SUBID

TelphonyManager.setVisualVoicemailSmsFilterEnabled()
TelphonyManager.isVisualVoicemailSmsFilterEnabled()
TelphonyManager.setVisualVoicemailSmsFilterPrefix()
TelphonyManager.getVisualVoicemailSmsFilterPrefix()
TelphonyManager.setVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.getVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.setVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.getVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_ANY
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_DATA_SMS

These values are required to implement the VisualVoicemailSmsFilter in
frameworks/opt/telephony

All of the APIs are hidden.

Bug:27816386
Bug:27817303
Change-Id: I07736785da5fece84d1f3d27f270ac6fa94c1c56
(cherry picked from commit ecbcce11cecc26d124adac8016f63667d01f3ab1)
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
d375a04d2ec4edacb323ec86a2f310153fa4547c 14-May-2016 Amit Mahajan <amitmahajan@google.com> OMADM intent sent by both system and apps.

Adding an exception for "com.android.omadm.service.CONFIGURATION_UPDATE"
as it is sent by both system and OEM apps.

Bug: 28757729
Change-Id: Ic89d38bbd78e436ca3c259f1aa61be450033a232
om/android/internal/telephony/TelephonyIntents.java
9d8566d361159031096b20af7539074c691ebdc9 13-May-2016 Chen Xu <fionaxu@google.com> Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev am: 8fde916de8
am: ea88c4c2fa

* commit 'ea88c4c2fa5530423e658e51f4df01ef79e4d3cc':
disable wifi only mode from wfc setting for nyc

Change-Id: I85d954b030b0576d0bb3e9fa9d4e256e51ad3570
c3b0c1f304d47b33bc672ee84b2d0b1381da431a 13-May-2016 fionaxu <fionaxu@google.com> Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
am: 8fde916de8

* commit '8fde916de89b5f0e777f687f3290976ec124faa5':
disable wifi only mode from wfc setting for nyc

Change-Id: I3083a247a81dcb22042791a7df7c54f3a3484958
ea88c4c2fa5530423e658e51f4df01ef79e4d3cc 13-May-2016 fionaxu <fionaxu@google.com> Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
am: 8fde916de8

* commit '8fde916de89b5f0e777f687f3290976ec124faa5':
disable wifi only mode from wfc setting for nyc

Change-Id: Ie74e4e0017ce4d514d5d458e05c2b226164a3bb6
8fde916de89b5f0e777f687f3290976ec124faa5 13-May-2016 Chen Xu <fionaxu@google.com> Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
58f48aa955ca8352e2f9e181677f6a8498b79600 12-May-2016 Youhan Wang <youhanw@google.com> Merge "Add getEsn()." into nyc-mr1-dev
am: 16717be173

* commit '16717be1738c29ad4f3dd992121ad4bac8b8d5c1':
Add getEsn().

Change-Id: I43db23cff359f906b7d6a5bbc50b3cf490a7371c
dcf5c2b8e2719d224de633eb9fb4d44b4af4a578 12-May-2016 fionaxu <fionaxu@google.com> disable wifi only mode from wfc setting for nyc

Bug: 28691529
Change-Id: I78a5606b213628148218cb5e9db63192a15384d7
ndroid/telephony/CarrierConfigManager.java
7717acd174795936756226a4bc367fdcb7b49c5d 11-May-2016 Youhan Wang <youhanw@google.com> Add getEsn().

Bug:27612001
Change-Id: I0cb61cd8a7604e2cc6959b181672fe63a1673447
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
825da238c5e7441425682a01fdc05297eee26ef4 11-May-2016 Tyler Gunn <tgunn@google.com> Continued multi-endpoint work.

1. Adding telephony disconnet cause for use when a call was pulled.
2. Added helped method to phone number utils which can be used to reformat
a telephony number stored as a SIP URI into a tel URI.

Bug: 27458894
Change-Id: Idef25bbc7b80258b361eb913d4c94b8bb34d7a4a
ndroid/telephony/DisconnectCause.java
ndroid/telephony/PhoneNumberUtils.java
d07c30d68f29d558dabf1fe1e945525c33956fde 11-May-2016 Tyler Gunn <tgunn@google.com> Merge "Add new carrier config option for video conference support." into nyc-mr1-dev
am: 8b38b22066

* commit '8b38b22066778b1e23583a915451c952f2221632':
Add new carrier config option for video conference support.

Change-Id: Ia8281425aa17033489b0aa2c55669f578bfd73a7
8b38b22066778b1e23583a915451c952f2221632 11-May-2016 Tyler Gunn <tgunn@google.com> Merge "Add new carrier config option for video conference support." into nyc-mr1-dev
62305f9ff6881c3731306d114451802cb1a55f22 09-May-2016 Youhan Wang <youhanw@google.com> Merge "Add getAidForApptype()." into nyc-mr1-dev
am: d4ddc7bcc1

* commit 'd4ddc7bcc14fafae55be393a240fbba82011b960':
Add getAidForApptype().

Change-Id: Ifcd2f796884e58e2e5fbea8a12343f32460f91fa
d4ddc7bcc14fafae55be393a240fbba82011b960 09-May-2016 Youhan Wang <youhanw@google.com> Merge "Add getAidForApptype()." into nyc-mr1-dev
827bd873e028ef6c603b24070995ff684821da36 06-May-2016 Nathan Harold <nharold@google.com> Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev am: 08acd3ce28
am: f7e4c04af3

* commit 'f7e4c04af38020b27647fa424db78ac2bfb14d8e':
Coerce 8-bit bsic to Integer if Invalid

Change-Id: Iabcec0a020b195af49109f9693034c4982e8127a
f4e69ad465087a72d3d357029eb74e431ffd2017 06-May-2016 Nathan Harold <nharold@google.com> Merge "CellInfo Parceling for Invalid Values" into nyc-dev am: 5b45c62a1a
am: d18da6fa93

* commit 'd18da6fa939aba229c7ec89ffa6e7ca95317c04c':
CellInfo Parceling for Invalid Values

Change-Id: I80a37f2392bb2d07af074a3b8f7693c28b75e668
f7e4c04af38020b27647fa424db78ac2bfb14d8e 06-May-2016 Nathan Harold <nharold@google.com> Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev
am: 08acd3ce28

* commit '08acd3ce28ff34f5a49d693b4c1144d967208e67':
Coerce 8-bit bsic to Integer if Invalid

Change-Id: I0fed240d0cd84e76283fb663f826b420922d1dc1
d18da6fa939aba229c7ec89ffa6e7ca95317c04c 06-May-2016 Nathan Harold <nharold@google.com> Merge "CellInfo Parceling for Invalid Values" into nyc-dev
am: 5b45c62a1a

* commit '5b45c62a1a13801ed4c5fd228976928b30f63867':
CellInfo Parceling for Invalid Values

Change-Id: I7ecbb84a507197e33771c3c1afb172bd89fbd557
43864702b6a2a431d430bdde5bcb26fd2143525b 06-May-2016 Nathan Harold <nharold@google.com> Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev
am: 08acd3ce28

* commit '08acd3ce28ff34f5a49d693b4c1144d967208e67':
Coerce 8-bit bsic to Integer if Invalid

Change-Id: Ib1cf6ecce437c8198da169fd5a4f0d1301e1547e
f0db11324afa430c910c5f436a83349625462561 06-May-2016 Nathan Harold <nharold@google.com> Merge "CellInfo Parceling for Invalid Values" into nyc-dev
am: 5b45c62a1a

* commit '5b45c62a1a13801ed4c5fd228976928b30f63867':
CellInfo Parceling for Invalid Values

Change-Id: I049eabf4ede20f591fd193e133e62444c1185fb7
2da9b2b8bfb01744d53c14a65a80035d3c8d7b2f 03-May-2016 Youhan Wang <youhanw@google.com> Add getAidForApptype().

To TelephonyManager and ITelephony.aidl.

Bug:27612001
Change-Id: Icb9dc5e29f3a635b2d807e8abcd15a5e1a85b02d
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
a326a4827e5c0f3b1d23cbe184822f9ff1175dc3 05-May-2016 Nathan Harold <nharold@google.com> Coerce 8-bit bsic to Integer if Invalid

Bug: 28299027
Change-Id: I1ff3314844991cf49cab6099a7a4c436980d52c9
ndroid/telephony/CellIdentityGsm.java
efbb8f337658f417a3af5f8e656eb5d23372596e 05-May-2016 Nathan Harold <nharold@google.com> CellInfo Parceling for Invalid Values

Within CellInfo Fields, Integer.MAX_VALUE should indicate
that a field is not present in a report. This change makes the
invalid value consistent, and also ensures that it is checked
in the calculation of power levels / asu.

-Update parcel/unparcel functions to avoid -MAX_VALUE
-Update LTE and CDMA asuLevel() and level() functions to be
consistently aware of the possibility of incomplete information

Bug: 27946114
Change-Id: Iacdc85db894e4a7809da8b5dc759488a1b6321ea
ndroid/telephony/CellSignalStrengthCdma.java
ndroid/telephony/CellSignalStrengthLte.java
0eda86c207fd0c8eca4aa4400f57301ddacbaae5 05-May-2016 Jack Yu <jackyu@google.com> Merge "Added additional cbs channels support" into nyc-mr1-dev
am: 597be61652

* commit '597be61652982bbafb91bdde7f8a913d3385e030':
Added additional cbs channels support

Change-Id: Ibacf62058f18cc471bbe3c365b980df11f6e991b
597be61652982bbafb91bdde7f8a913d3385e030 05-May-2016 Jack Yu <jackyu@google.com> Merge "Added additional cbs channels support" into nyc-mr1-dev
bf0fd7243b9b70111549dcb345db7beee64b20c4 03-May-2016 Jack Yu <jackyu@google.com> Added additional cbs channels support

Added a new carrier config that allows carriers to enable
additional cell broadcast channels for CMAS.

bug: 21107166
Change-Id: I2bdce880dfb6a2d8d8e9e252d1f331f657f63ccc
ndroid/telephony/CarrierConfigManager.java
8fba5bb7c600ec37841709c0bb3541d653d076b7 02-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev am: fc6a3ad85b
am: dbb0028be0

* commit 'dbb0028be0d9f4ad18e83ea6504a7f259aae29a8':
Change to return phone count as 0 if voice, sms, data not supported.

Change-Id: I9f77d150abb4bac5da3c93afe6c123fe86637a41
15b33c636cc28bd5acddd98d8b8e126cfd6af334 02-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev
am: fc6a3ad85b

* commit 'fc6a3ad85bcac1df6b0fc1f79ec65f1a23eb8f71':
Change to return phone count as 0 if voice, sms, data not supported.

Change-Id: Ie1a7dfe3d285669f4ba8ab1ca873842b10ca154c
dbb0028be0d9f4ad18e83ea6504a7f259aae29a8 02-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev
am: fc6a3ad85b

* commit 'fc6a3ad85bcac1df6b0fc1f79ec65f1a23eb8f71':
Change to return phone count as 0 if voice, sms, data not supported.

Change-Id: Ideaaec05272ecee36504e7207d1187a7d2cdcd5f
fc6a3ad85bcac1df6b0fc1f79ec65f1a23eb8f71 02-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev
aaa41a3a653c55c3d8aaf98ddfea2abb1c4816f1 27-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Add CarrierConfig for metered roaming" into nyc-dev am: 73efde0
am: c1df936

* commit 'c1df936c1602f91a623279d602f454d636463fde':
Add CarrierConfig for metered roaming

Change-Id: Ib1e8a78f7a5aabdaeeb04afafa9cc6c0725d2880
5880e558607b5637d7a0c693e71186487e0c225e 27-Apr-2016 fionaxu <fionaxu@google.com> Merge "Add CarrierConfig for metered roaming" into nyc-dev
am: 73efde0

* commit '73efde04efc5d8e36cf1eb2e0fa2bb52a4a326e1':
Add CarrierConfig for metered roaming

Change-Id: I9b8ea629e72fa2d0f09ce8f56d0b6f458d884153
c1df936c1602f91a623279d602f454d636463fde 27-Apr-2016 fionaxu <fionaxu@google.com> Merge "Add CarrierConfig for metered roaming" into nyc-dev
am: 73efde0

* commit '73efde04efc5d8e36cf1eb2e0fa2bb52a4a326e1':
Add CarrierConfig for metered roaming

Change-Id: Ic3955a4a208dcf206d607cda25eee03c37e96a1e
73efde04efc5d8e36cf1eb2e0fa2bb52a4a326e1 27-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Add CarrierConfig for metered roaming" into nyc-dev
2c222510f602197354f9eb1f26871a70e5892606 18-Mar-2016 Amit Mahajan <amitmahajan@google.com> Change to return phone count as 0 if voice, sms, data not supported.

If any of the 3 is supported, and multi-sim capabilities are unknown,
return 1.

Bug: 23016052
Change-Id: Id19aaf33d9a86fc24116704c668977c727c2a1f2
ndroid/telephony/TelephonyManager.java
334a936e154fd18a301f7df860322e456ec0486e 25-Apr-2016 Tobias Thierer <tobiast@google.com> Merge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev-plus-aosp
am: cc0eaf4

* commit 'cc0eaf4124011d8a370f3c354e241887a633e8f1':
Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: Ia4ea8bbd2a4fd5cb3094f3682034542b8f7d8e80
b0800dce4abdca9aeef1cf72018906c2476c4c6b 21-Apr-2016 Tobias Thierer <tobiast@google.com> Avoid instantiations of Boolean that are immediately unboxed.

Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base
(not including Am.java, which I'm leaving for a separate change).

Also fixed a couple of other valueOf()s in SyncStorageEngine.

Bug: 28289401
(cherry-picked from commit ca0182073530a237babe65b9ec7a9b41e667f8d1)
Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc
ndroid/telephony/ServiceState.java
ndroid/telephony/SignalStrength.java
ndroid/telephony/TelephonyManager.java
c63cf6970729a349f71247f392e469a3d4f0598b 23-Apr-2016 Ta-wei Yen <twyen@google.com> Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a48
am: e85b334

* commit 'e85b334c4160a60f3cc873bca32445561b0591a7':
Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: Ie313f719d49c1104c10ce4cce1e3356d6f7d7c0f
e85b334c4160a60f3cc873bca32445561b0591a7 23-Apr-2016 Ta-wei Yen <twyen@google.com> Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
am: 8431a48

* commit '8431a48f779939a9c49538d054539321f9421e6c':
Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: I20ec57dbcaad08e02a9bcea40f52f077eff0e730
da83b755a3498d0d22539d8d6057a6898effa533 23-Apr-2016 Ta-wei Yen <twyen@google.com> Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
am: 8431a48

* commit '8431a48f779939a9c49538d054539321f9421e6c':
Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: I5c176db61c64048973eae5377164eb658e8ede88
8431a48f779939a9c49538d054539321f9421e6c 23-Apr-2016 Ta-wei Yen <twyen@google.com> Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
825d4b814326fcb7464420cb862c47ff14cffd03 22-Apr-2016 Junda Liu <junda@google.com> Merge "Add comments to apptype and authtype constants." into nyc-dev am: cc69bed
am: e96849f

* commit 'e96849f564bcb31d70a7143d60e92c40bbcd6cad':
Add comments to apptype and authtype constants.

Change-Id: I329bf0e2a56ada4f03e0f8ad4a5e84dfeb32c21e
e96849f564bcb31d70a7143d60e92c40bbcd6cad 22-Apr-2016 Junda Liu <junda@google.com> Merge "Add comments to apptype and authtype constants." into nyc-dev
am: cc69bed

* commit 'cc69bed61fadd99627751b6e04e99f2c42ef3025':
Add comments to apptype and authtype constants.

Change-Id: Ie7f2d97b7ac79d31bac8b77d0a8056f4c13cc5b7
060e8f9dc5ad6f0cb137b2cd93e69b57f5d09f89 22-Apr-2016 Junda Liu <junda@google.com> Merge "Add comments to apptype and authtype constants." into nyc-dev
am: cc69bed

* commit 'cc69bed61fadd99627751b6e04e99f2c42ef3025':
Add comments to apptype and authtype constants.

Change-Id: I0e30f5907051dd0f9c4d3256588a4726620e3f17
cc69bed61fadd99627751b6e04e99f2c42ef3025 22-Apr-2016 Junda Liu <junda@google.com> Merge "Add comments to apptype and authtype constants." into nyc-dev
28ffb600db33b62b5051177c70146bab74bdf0d3 18-Apr-2016 fionaxu <fionaxu@google.com> Add CarrierConfig for metered roaming

Bug: 26317905
Change-Id: Ib243de266736598cecdb8bcf76ac4db7275a1c01
ndroid/telephony/CarrierConfigManager.java
c7004f564872e3018e515c6aab3210e2eec70ebf 21-Apr-2016 Junda Liu <junda@google.com> Add comments to apptype and authtype constants.

Bug: b/28296053
Change-Id: Ib79d9106ac4415f495fd3ec4d0bea036d0b9c9f4
ndroid/telephony/TelephonyManager.java
2eee49f082093eb219e12fed89e1f0c77a1db3ed 21-Apr-2016 Nathan Harold <nharold@google.com> Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev am: f6496db8ce
am: 2a403859b6

* commit '2a403859b6ef90c30deffd1613c55471d4d1b086':
Additional checks for ModemActivityInfo.isValid()

Change-Id: Ieaf1840c8025913f4b9691884356d8b7256194ed
2a403859b6ef90c30deffd1613c55471d4d1b086 21-Apr-2016 Nathan Harold <nharold@google.com> Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
am: f6496db8ce

* commit 'f6496db8cefe68b2d02fde22a68b84f7b5c86686':
Additional checks for ModemActivityInfo.isValid()

Change-Id: If8f3bb4e47ab526961dbb1209e69aa8dd09f5b40
795939499dbadb93508671841bc5276ee394a511 21-Apr-2016 Nathan Harold <nharold@google.com> Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
am: f6496db8ce

* commit 'f6496db8cefe68b2d02fde22a68b84f7b5c86686':
Additional checks for ModemActivityInfo.isValid()

Change-Id: Id4fb225d71e33bbfdf57dd13278fc71b4cd40370
f6496db8cefe68b2d02fde22a68b84f7b5c86686 21-Apr-2016 Nathan Harold <nharold@google.com> Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
3f9306fe8422aff1db7e4123ec876631d0651b3a 20-Apr-2016 Ta-wei Yen <twyen@google.com> Rename _BOOLEAN visual voicemail config keys to _BOOL

Bug:28294644
Change-Id: I1a512008c7e42041f87416782c023348f5dd8693
ndroid/telephony/CarrierConfigManager.java
e1b56701fd219227adae615fe81f03d5db4ae433 20-Apr-2016 Trevor Johns <trevorjohns@google.com> Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93
am: 254f1b8

* commit '254f1b8a43480749b7061129289d34bc15d345a5':
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I32a3081af9ca5533785c90b7239ffd5b5e69d5bf
c0d2c43a22c9a0feda8d651d432aa3893e0cf952 20-Apr-2016 Trevor Johns <trevorjohns@google.com> Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am: 59c9a93

* commit '59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370
98a40d3ca6645e42f2c6e25c5f07b6d987287881 20-Apr-2016 Nathan Harold <nharold@google.com> Additional checks for ModemActivityInfo.isValid()

Added checks in isValid for:
-A non-empty report
-Valid individual TxTime values
-Valid RxTime
-Valid EnergyUsed

Bug: 28278425
Bug: 28247832
Change-Id: I294fc200e81c828fbdd0e92b9ac4ae96fd7db6dc
ndroid/telephony/ModemActivityInfo.java
254f1b8a43480749b7061129289d34bc15d345a5 20-Apr-2016 Trevor Johns <trevorjohns@google.com> Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am: 59c9a93

* commit '59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I3ce213d0e7412125861d39f1726be4b5a751c828
59c9a93fc268e226495d4ee8cf7c507c2ea2c433 20-Apr-2016 Trevor Johns <trevorjohns@google.com> Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev

* changes:
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee to nyc-dev
e682152e7b5114f1df5e3b2dfad4f47176a6a6e7 20-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add addRegistrationListener function to IImsService.aidl" into nyc-mr1-dev
am: 644a007

* commit '644a00734f679cb570164e0974c0a98f2a642a59':
Add addRegistrationListener function to IImsService.aidl

Change-Id: I0beec52050efa8ca9412600657286128ec617121
644a00734f679cb570164e0974c0a98f2a642a59 20-Apr-2016 Vineeta Srivastava <vsrivastava@google.com> Merge "Add addRegistrationListener function to IImsService.aidl" into nyc-mr1-dev
23493de98311f594acf2a4d7839ed7f7b25a8af7 20-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Cold Sim issue fix" into nyc-dev am: 771fbfef27
am: 6ee7417cd7

* commit '6ee7417cd7c14b17548f34931e5c3393733c6698':
Cold Sim issue fix

Change-Id: Idc3784df620745ef7563b6e64608f0dcc7e96510
8a05d513e6ab3f2c3f7addf125422a11e08fc0b5 20-Apr-2016 fionaxu <fionaxu@google.com> Merge "Cold Sim issue fix" into nyc-dev
am: 771fbfef27

* commit '771fbfef27bcc98c57818b7c7b63a374e555b6db':
Cold Sim issue fix

Change-Id: I1af095fa0586db89f59a8fbb16be8a3066a5f2fc
771fbfef27bcc98c57818b7c7b63a374e555b6db 20-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Cold Sim issue fix" into nyc-dev
6e6950ee66c681274e1c4bf086b559802a6e12bf 15-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Add addRegistrationListener function to IImsService.aidl

This allows to register additional IMS connection listeners.
IImsService.open() is no longer supposed to be used for that purpose.

Bug: 28150730
Change-Id: I949e0c912de66e82864934a1ad9ec2ec36f57909
om/android/ims/internal/IImsService.aidl
ee61c6232e7990c7269656a722b2098315e13c84 20-Apr-2016 Tyler Gunn <tgunn@google.com> Add new carrier config option for video conference support.

- Default to off.
- @hide for now until we know whether we can bump the API rev for the DR.

Bug: 27658118
Change-Id: Ie0eda180f0a50b8f7026fce9eac8903f9a82eef5
ndroid/telephony/CarrierConfigManager.java
b5592dc9f4c2b97b00c24d801b90339d1d622ec3 08-Apr-2016 fionaxu <fionaxu@google.com> Cold Sim issue fix

Bug: 25203607
Change-Id: Ibde6a483477cb7c94f75b656d5e41748b13b23b2
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/SubscriptionInfo.java
ndroid/telephony/SubscriptionManager.java
om/android/internal/telephony/DctConstants.java
om/android/internal/telephony/ISub.aidl
om/android/internal/telephony/TelephonyIntents.java
682c24e22811d4ee17ae1cd61bf255c3f7e722b7 12-Apr-2016 Trevor Johns <trevorjohns@google.com> Resolve merge conflicts of a5060ee to nyc-dev

This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
ndroid/telephony/TelephonyManager.java
5b7c57d53b08b29f8dc2c05a4193ec9524ce8c60 19-Apr-2016 Adam Lesinski <adamlesinski@google.com> Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev am: 0d47f4b
am: 811c48d

* commit '811c48d7f5356719c3110f61a492b5af085a3828':
BatteryStats: Introduce Async external stats requests

Change-Id: I8a539d26aaea10e64ad35060c17ea6326772e211
63696c00e22b26edb239e024a5ddabda812dc9d0 19-Apr-2016 Adam Lesinski <adamlesinski@google.com> Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev
am: 0d47f4b

* commit '0d47f4b6463077074abd6bed489a5f9243615c64':
BatteryStats: Introduce Async external stats requests

Change-Id: I7319535a0210e38a6bc3731a9f0ec42a4485924f
0d47f4b6463077074abd6bed489a5f9243615c64 19-Apr-2016 Adam Lesinski <adamlesinski@google.com> Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev
54cf95f618301ed443819b73b4c292a199d95d95 18-Apr-2016 Shishir Agrawal <shishir@google.com> Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev
am: 3f6e211

* commit '3f6e211d7306bb7a4d5abc01a966e06294a48988':
Adding slotId to certain Telephony broadcasts.

Change-Id: If4b3ca0500b43137bd33d22449fb362bdf30c1d1
7299ce924f8c0cc166af74429766c204001f5d5f 18-Apr-2016 Sunil Dutt <usdutt@codeaurora.org> Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev
am: 951fe29

* commit '951fe2925ff61b7d11149c3d897763d278ba1006':
Wifi: Introduce a configuration parameter to disable WiFi in ECBM

Change-Id: I7ebe1f138d53cf683afab573588bf67597fe10bd
b6eb7fabbd3aa6c55ea191e7cd6518fe30e8106a 18-Apr-2016 Sandeep Gutta <sangutta@codeaurora.org> Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev
am: 37c26e4

* commit '37c26e4d13235b9fd297f1d52e9d874b7e488fbf':
Handle mnc 00 while retrieving the Resources based on subid

Change-Id: I5d7cbd11c5739c96b3d316ebf51e9424fbe703bf
3f6e211d7306bb7a4d5abc01a966e06294a48988 18-Apr-2016 Shishir Agrawal <shishir@google.com> Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev
951fe2925ff61b7d11149c3d897763d278ba1006 18-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev
37c26e4d13235b9fd297f1d52e9d874b7e488fbf 18-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev
3a00b6970286ec3d871da24c491171d35d55c870 18-Apr-2016 Narayan Kamath <narayan@google.com> Remove unnecessary allocation+unboxing of objects.
am: a09b4d2

* commit 'a09b4d2a611a7606e8fc8c73a24bd941b6fc173f':
Remove unnecessary allocation+unboxing of objects.

Change-Id: Idfffa8fad0f6bcffa954752910524bdc879d65b7
a09b4d2a611a7606e8fc8c73a24bd941b6fc173f 15-Apr-2016 Narayan Kamath <narayan@google.com> Remove unnecessary allocation+unboxing of objects.

Transforming String->int can be done with 0 allocations
using Integer.parseInt.

bug: 28078871
Change-Id: I8d9f322d7154728849dde61ef282046032858d60
ndroid/telephony/NeighboringCellInfo.java
e1da5a3964f9d5487011ae73082053d172cf5dec 07-Mar-2016 Sandeep Gutta <sangutta@codeaurora.org> Handle mnc 00 while retrieving the Resources based on subid

Since mnc 00 is represented as undefined it needs to be replaced
with MNC_ZERO 0xffff for retrieving proper resources.

bug:28219719
Change-Id: I7e1630c2f5c31959306d862b10e7987bb449ea9f
ndroid/telephony/SubscriptionManager.java
010bf374d8145528f8733dfa6ef101b15de23a8d 11-Apr-2016 Adam Lesinski <adamlesinski@google.com> BatteryStats: Introduce Async external stats requests

Instead of calling out to external processes with a blocking IPC,
pass along a Binder on which the external process can pass back
the response. The calling process can then wait for the reply with
a timeout.

This eliminates watchdog restarts of the system_server when an external
process like telephony or bluetooth hangs.

Bug:26842468
Change-Id: I1b242e4ed22a63f1a4a0be8c78de8ac4d7bf56c5
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
6431276d5f2663e0cd96c1eefd3689c49722d40f 15-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Adding some new multi-endpoint stuff." into nyc-dev
am: a6f12cf

* commit 'a6f12cf3d059b31db6f9119317956ec44b09a76d':
Adding some new multi-endpoint stuff.

Change-Id: Ia53b795e65a86b58d081fc0222b580fcdd6da9d8
a6f12cf3d059b31db6f9119317956ec44b09a76d 15-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Adding some new multi-endpoint stuff." into nyc-dev
7c5fda85af9f634ba5ce3f01e8f3cbd3d1c45048 05-Apr-2016 Sunil Dutt <usdutt@codeaurora.org> Wifi: Introduce a configuration parameter to disable WiFi in ECBM

This configuration parameter aims to address the following requirement.
a) If the Wifi radio on the UE is in turned on state (and the UE is not
connected to any WWAN) and the user dials 911 and the UE is not
capable of making E911-VoIP over WiFi calls, then the UE shall turn
off its WiFi radio and shall try to attach to one of the WWANs,
depending upon the air interfaces supported by the UE for setting
up the 911 call to the relevant PSAP. After the 911 call ends,and
after the callback period ends, then the UE shall turn on the WiFi radio.

b) If the Wifi radio on the UE is in turned on state and the UE is connected
to a WWAN and the user dials 911 and the UE is not capable of making
E911-VoIP over WiFi calls, then the UE shall turn off its WiFi radio and
shall set up the 911 call over the WWAN to which it is already attached,
if that WWAN is available and able to support 911 calling. If that WWAN
is not available or is not capable of supporting 911 calling, then the UE
shall select an available WWAN for setting up the 911 call. Assumption is
that while a LTE network may not have 911 calling support capability, all
1x, GSM and UMTS networks will be 911 capable. After the 911 call ends,
and after the callback period ends, then the UE shall turn on the WiFi radio.

c) If the Wifi radio on the UE is in turned on state (and the UE is not connected
to any WWAN) and the user dials 911 and the UE is capable of making E911-VoIP
over WiFi calls, then the UE shall not turn off its WiFi radio but shall first
try to attach to one of the WWANs, depending upon the air interfaces supported
by the UE , for setting up the 911 call to the relevant PSAP.

d) If the Wifi radio on the UE is in turned on state (and the UE is also connected
to a WWAN) and the user dials 911 and the UE is capable of making E911-VoIP over
WiFi calls, then the UE shall not turn off its WiFi radio but shall first try to
attach to one of the WWANs, depending upon the air interfaces supported by the
UE,for setting up the 911 call to the relevant PSAP.

Thus,the following address the requirement above.
1) Introduce a parameter (KEY_CONFIG_WIFI_DISABLED_IN_ECBM) to conifgure Wifi disable
in ECBM for the requirement c & d. This key shall be overridden in the specific
carrier overlay configuration file (defaulted to FALSE).
2) Already existing API (setWifiEnabled()) to turn ON/OFF Wi-Fi cater the requirement a & b .

Bug: 27854016
Change-Id: I5af370c143630bdd4b075f4730fd1de1bbe1fe7d
ndroid/telephony/CarrierConfigManager.java
f7e59c1f618d20b79df6e936b9daedaa7c1b4d3d 13-Apr-2016 Shishir Agrawal <shishir@google.com> Adding slotId to certain Telephony broadcasts.

These particular boradcasts need to expose phoneId since they are valid even
when there is no SIM.

ACTION_SERVICE_STATE_CHANGED
- Added phoneId to broadcast.
- Removed TelephonyRegistry non subId call.
ACTION_SIGNAL_STRENGTH_CHANGED
- Added phoneId to broadcast.
- Removed TelephonyRegistry non subId call.
ACTION_PHONE_STATE_CHANGED
- Added phoneId to broadcast.
- The non-subId version is called by Telecomm to communicate overall state.
Telephony sends its own version, so only the Telephony call needs to add
phoneId.

Bug: 27378995

Change-Id: I554f7ee18b9ae19919f4724328dcff3ef9cbd092
om/android/internal/telephony/ITelephonyRegistry.aidl
afdb3c3163d9b82d88c89e2c2658042e32bb5999 15-Apr-2016 Jack Yu <jackyu@google.com> Merge "Removed the unused RIL constant" into nyc-dev
am: 4f9b759

* commit '4f9b759d8f801a590c38b50dd0bc530ee169957f':
Removed the unused RIL constant

Change-Id: I96d66109f3f3f422dbf7c163a2874fd1bfd60e4f
4f9b759d8f801a590c38b50dd0bc530ee169957f 15-Apr-2016 Jack Yu <jackyu@google.com> Merge "Removed the unused RIL constant" into nyc-dev
f0953fca17784e00e889441258075e7880124110 14-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Consolidate WiFi Calling string resources" into nyc-dev
am: 070b73a

* commit '070b73a46d7344b8a1c771ab537c30c08d078051':
Consolidate WiFi Calling string resources

Change-Id: Iae5ab0c3f42b18e751bac38d8abc39473ec63927
070b73a46d7344b8a1c771ab537c30c08d078051 14-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Consolidate WiFi Calling string resources" into nyc-dev
5b2e5316d87227cce9e6e5054d98dfd7c60602ac 14-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev
am: 0a97f22

* commit '0a97f22e068aeffd7384f64d26ab922b6d15670f':
Delete ITelephonyDebug and ITelephonyDebugSubscriber

Change-Id: I02d01abb811fc309024fb04fb5f56207a441a478
0a97f22e068aeffd7384f64d26ab922b6d15670f 14-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev
d4844d5b6b61a01f09dee43939ac1d67f12a5805 14-Apr-2016 Junda Liu <junda@google.com> Merge "Remove deprecated API for sim authentication." into nyc-dev
am: d274486

* commit 'd2744865949afd9148dc2accfeeaea8d7f61d731':
Remove deprecated API for sim authentication.

Change-Id: I1690092452912bcf603f5865a990edb3f2478506
a3df56450b03b917e43b4ffcf5ef5764443ce8f2 14-Apr-2016 Junda Liu <junda@google.com> Remove deprecated API for sim authentication.

The new getIccAuthentication should be used. All callers have been updated
to the new API. Remove the old API in this change.

Bug: b/27360179
Change-Id: I160974d53bb6477666b3e1d457accac45cc06bfc
ndroid/telephony/TelephonyManager.java
3ee538c10d3ef5bedd9dff631cbca465315701e8 13-Apr-2016 Jack Yu <jackyu@google.com> Removed the unused RIL constant

We should use Integer.MAX_VALUE instead defining our own MAX_INT

bug: 27787361
Change-Id: I9630d66674530f9b7a8843cc454d0382b738463c
om/android/internal/telephony/RILConstants.java
dc91e0f8c643a705f050b64f06807794e8e5d8f7 13-Apr-2016 Shishir Agrawal <shishir@google.com> Merge "Fixing few TelephonyManager calls to work when there is no SIM." into nyc-dev
am: c375dd4

* commit 'c375dd43af95b8106c8384236f61b5868ec6233e':
Fixing few TelephonyManager calls to work when there is no SIM.

Change-Id: Ic3a2f315ca5b6ad20ffb1fa886142ef773bc4b43
c375dd43af95b8106c8384236f61b5868ec6233e 13-Apr-2016 Shishir Agrawal <shishir@google.com> Merge "Fixing few TelephonyManager calls to work when there is no SIM." into nyc-dev
8c5100e949c05f2e0b25511f21f5419b9215a210 13-Apr-2016 Jack Yu <jackyu@google.com> Merge "Moved ERI configuration files from resoures to Carrier Config." into nyc-dev
am: 3a2bce6

* commit '3a2bce6e51b08d276806cc60fb1a410e63b4e17e':
Moved ERI configuration files from resoures to Carrier Config.

Change-Id: Ib9289d40191c205cfa95560b5a38f8fe8dfeef80
3a2bce6e51b08d276806cc60fb1a410e63b4e17e 13-Apr-2016 Jack Yu <jackyu@google.com> Merge "Moved ERI configuration files from resoures to Carrier Config." into nyc-dev
9eb78515dc7c3b7d52170d240a66cda8a7bbeb88 13-Apr-2016 Tyler Gunn <tgunn@google.com> Adding some new multi-endpoint stuff.

Adding getVideoStateFromCallType method to ImsCallProfile, which basically
just breaks out some of the existing logic in getVideoStateFromImsCallProfile.
This is used to translate the CALL_TYPE_* from an external call to a
video state (used when pulling the call).

Added a new ImsReasonInfo code for when multi-endpoint fails to configure
because the modem does not support it.

Bug: 27458894
Change-Id: I226e79005dccf3e8cae30e4d448543adbe59f922
om/android/ims/ImsCallProfile.java
om/android/ims/ImsReasonInfo.java
7b7c4fc2fe146d32479ca9bb606da663cd76651c 12-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Consolidate WiFi Calling string resources

- move wfcOperatorErrorCodes to CarrierConfig
- corresponding error alert and notification messages are moved to the
main string.xml and are accessed by index defined in wfcOperatorErrorCodes
- make a list of supported SPN formats and use CarrierConfig to define
index of appropriate format string

Bug: 27170754
Change-Id: I698908157c1022f47a43ef70f03a571f1d0c75da
ndroid/telephony/CarrierConfigManager.java
dc50a87495c23068b4150a0fc197e51ace2ae47b 12-Apr-2016 Shishir Agrawal <shishir@google.com> Fixing few TelephonyManager calls to work when there is no SIM.

* getDeviceSoftwareVersion - Fixed to work for no SIM by not looking up subId.
* getImei - Fixed to work for no SIM by not looking up subId.
* getActivePhoneTypeForSlot - Adding a method (hidden).
* getCallState - Adding slotId version (hidden).

Bug: 27378995
Change-Id: Ib67ae3df5562d75727dc7e4ac023021fb331d3b5
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
ad1f6a7b0d3c1bad717118802b75a4d53479dbf0 11-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Add settings for SUW data control." into nyc-dev
am: 6e1e880

* commit '6e1e880f001ab3663fba3a7b6d292387efaf7b8f':
Add settings for SUW data control.

Change-Id: I9a919ae9d8a960fa1540f051221643a5af3307c4
6e1e880f001ab3663fba3a7b6d292387efaf7b8f 11-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Add settings for SUW data control." into nyc-dev
360dc21585a292b7ce83368437ee126fb1798912 09-Apr-2016 Jack Yu <jackyu@google.com> Moved ERI configuration files from resoures to Carrier Config.

Used Carrier Config to load correct ERI configuration file since
there are MCC/MNC shared by different carriers.

bug: 23887558
Change-Id: I61632045486929a5f0f1266fcf3b772a969d5836
ndroid/telephony/CarrierConfigManager.java
41bec764a458f79e7b6bfb0b0edc381955e27ae4 11-Apr-2016 Jeff Davidson <jpd@google.com> Merge changes from topic \'carrier-app-race\' into nyc-dev
am: b53874e

* commit 'b53874e71459af4461d12fa626a39d02d98cf2b3':
Disable preinstalled carrier apps earlier in boot.
Move CarrierAppUtils into frameworks/base/telephony.

Change-Id: If18687485c5467f305577c1fd401addae4fd487d
b53874e71459af4461d12fa626a39d02d98cf2b3 11-Apr-2016 Jeff Davidson <jpd@google.com> Merge changes from topic 'carrier-app-race' into nyc-dev

* changes:
Disable preinstalled carrier apps earlier in boot.
Move CarrierAppUtils into frameworks/base/telephony.
6754d237bb8c6e1fba779f90417b4a2fe07d2b3e 09-Apr-2016 Jack Yu <jackyu@google.com> Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev
am: 2e062ab

* commit '2e062ab8de3bae82b76a3f3aaeac6994f2555fe5':
Excluded certain APNs (e.g. IMS) from mobile data usage.

Change-Id: I72b09515578a1843009439b1a8fbccccaaf3ab4c
e68b127525c23e8e0cbe1e9dee75534d99e2833d 07-Apr-2016 Jeff Davidson <jpd@google.com> Disable preinstalled carrier apps earlier in boot.

Preinstalled carrier apps start in state DEFAULT (== ENABLED); the
telephony stack marks them as DISABLED_UNTIL_USED during
initialization, and eventually ENABLED once a SIM for that carrier is
inserted.

However, this can cause a race as telephony initialization may happen
after the carrier app is started, while it is still in the DEFAULT
state. In this case, the app is disabled, and though PackageManager
will subsequently kill it, this may lead to a race as the app will
briefly remain running while disabled. In this state, crashes are
likely to occur in the app.

So, make sure we perform the first disable as soon as PackageManager
is ready. This ensures the app is not started until it has been
explicitly enabled.

Bug: 27821069
Change-Id: I771d7dde7880fd98b1df3d011be44164abf402f4
om/android/internal/telephony/CarrierAppUtils.java
b7e26fb1ad1802025cc3a01eeba6acfbc8f3f444 07-Apr-2016 Jeff Davidson <jpd@google.com> Move CarrierAppUtils into frameworks/base/telephony.

This is a no-op refactoring which will allow us to access
CarrierAppUtils from PackageManagerService.

Bug: 27821069
Change-Id: Id6ac33020395f7fc03b285ffa8c3d421a02270ec
om/android/internal/telephony/CarrierAppUtils.java
66a6be3a4c955e52ea61e0d35f338983f632abf8 30-Mar-2016 Jack Yu <jackyu@google.com> Excluded certain APNs (e.g. IMS) from mobile data usage.

Added not_metered capability to a mobile network if none
of its associated APN types are metered. Also used not_metered
capability to determine if a network should be accounted for
data usage or not instead of using network type, which is
always MOBILE after refactoring. Will add VT usage support
in next phase.

bug: 20888836
Change-Id: Id692cb856be9a47d0e918371112630128965b1bb
ndroid/telephony/CarrierConfigManager.java
0fb0731358b5c16bf6a5617a25b30122ec1258e2 06-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Delete ITelephonyDebug and ITelephonyDebugSubscriber

Bug: 28026463
Change-Id: Iee9010dd7352bafcffb5718293f8d71f2fd98ea9
om/android/internal/telephony/ITelephonyDebug.aidl
om/android/internal/telephony/ITelephonyDebugSubscriber.aidl
om/android/internal/telephony/TelephonyEvent.aidl
om/android/internal/telephony/TelephonyEvent.java
e8235003c2a1a35c8711d38aefe5406bbd853167 05-Apr-2016 Junda Liu <junda@google.com> Merge "Add public API for sim authentication." into nyc-dev
am: a27cf02

* commit 'a27cf024e5a9fac9c254a533386bcb073817ecb2':
Add public API for sim authentication.

Change-Id: Iaf27927945b40007110afb2b4e5cb9f231526a0c
a27cf024e5a9fac9c254a533386bcb073817ecb2 05-Apr-2016 Junda Liu <junda@google.com> Merge "Add public API for sim authentication." into nyc-dev
19fab789264a2d2d314d212c9a5c44eeb11fa590 10-Mar-2016 Junda Liu <junda@google.com> Add public API for sim authentication.

Bug: b/27360179
Change-Id: I95bc51797a808fd754202b671113ee0a60a8b99d
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IPhoneSubInfo.aidl
om/android/internal/telephony/PhoneConstants.java
bbebbd3501725ab6c686941526bbb7261e6119ce 01-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Add carrier config option to determine if "wifi-only" is supported." into nyc-dev
am: 6c4af8c

* commit '6c4af8c9150293eb2eb73dae39451f7624f81c19':
Add carrier config option to determine if "wifi-only" is supported.

Change-Id: I645a771e75d8a853ae2b7e192f88819cec5062cd
5bbeea08831dafb0bde15422d851a7c631f4f34c 30-Mar-2016 Tyler Gunn <tgunn@google.com> Add carrier config option to determine if "wifi-only" is supported.

By default we set this to "true", however it is anticipated in the future
that some carrier may desire to not allow the wifi-only option, hence
this carrier config option.

Bug: 27858149
Change-Id: I55b09655a590a661780cd9ed89c1e1b0d87d54dc
ndroid/telephony/CarrierConfigManager.java
beb482cf890315c9f517b9224e7078e6e5f75e0b 29-Mar-2016 Robert Greenwalt <rgreenwalt@google.com> Add settings for SUW data control.

While the device is being provisioned we can default to
mobile-data-off and let the provisioning app turn mobile
data back on if the user wants it. After provisioning
control is restored.

Settings in play:
Settings.Global.DEVICE_PROVISIONED (existing)
SystemProperty ro.com.android.mobiledata (existing)
Settings.Global.MOBILE_DATA (existing)

SystemProperty ro.com.android.prov_mobiledata (new)
Settings.Global.DEVICE_PROVISIONING_MOBILE_DATA_ENABLED (new)

If the new settings aren't used, the old behvior is used.

bug:26638209
Change-Id: I92617ed6e588a5c50cf39054412a15273a9e03ff
om/android/internal/telephony/DctConstants.java
2fcf461dd501d885754f19b9896dd5641a7332fd 25-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Add connection properties to Connections." into nyc-dev
am: ad716eb

* commit 'ad716ebb730d4aad4e3c2afdaea4a698a496a6bc':
Add connection properties to Connections.
720c664401081ca00e56c7eef12641ae792da530 22-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: Icce921b03cda514a991646ed39a26559c7e91230
om/android/ims/ImsCallProfile.java
18723b96e43c1722d200e09ecf7062384cbe65dd 24-Mar-2016 Anju Mathapati <anjucm@codeaurora.org> Merge "IMS: Changes for MultiEndpoint" into nyc-dev
am: 0e3aff1

* commit '0e3aff1ab5c0cf0bb200910b10a81173d6d607a5':
IMS: Changes for MultiEndpoint
0e3aff1ab5c0cf0bb200910b10a81173d6d607a5 24-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Changes for MultiEndpoint" into nyc-dev
65314501f43a55b987852b2442061196978429e6 10-Mar-2016 Anju Mathapati <anjucm@codeaurora.org> IMS: Changes for MultiEndpoint

- Change in api names

Change-Id: I9317c391d0017f5079ab488abe0bd1e949317bce
om/android/ims/ImsExternalCallState.java
om/android/ims/internal/IImsExternalCallStateListener.aidl
om/android/ims/internal/IImsMultiEndpoint.aidl
om/android/internal/telephony/TelephonyProperties.java
2dadfbd438283f014a350c3786477e2f28f3a4aa 23-Mar-2016 fionaxu <fionaxu@google.com> Merge " fix Memory Leak caused by PhoneStateListener" into nyc-dev
am: 3c11a5b

* commit '3c11a5b3f881c433a9b6885735dfd0d8d3f311a7':
fix Memory Leak caused by PhoneStateListener
3c11a5b3f881c433a9b6885735dfd0d8d3f311a7 23-Mar-2016 Chen Xu <fionaxu@google.com> Merge " fix Memory Leak caused by PhoneStateListener" into nyc-dev
f5d7c587e86c64e657a15a12ad70e75d47c48d99 22-Mar-2016 fionaxu <fionaxu@google.com> fix Memory Leak caused by PhoneStateListener

Bug: 22962661

Change-Id: Ibece746afc19dd6b71845a257b7bfb88a0f8e13f
ndroid/telephony/PhoneStateListener.java
2e9438ad2b029feb3c4c0b1aff9ca1ec0b262ba2 21-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Correct naming issues with video calling carrier config items." into nyc-dev
am: dfc1ee0

* commit 'dfc1ee0162f6ee4b18c573f2d0d59001d0447f1a':
Correct naming issues with video calling carrier config items.
dfc1ee0162f6ee4b18c573f2d0d59001d0447f1a 21-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Correct naming issues with video calling carrier config items." into nyc-dev
d80d0a8703788e98ed6ffc1403177e9c6250c39e 21-Mar-2016 Ajay Nambi <anambi@codeaurora.org> Ril Error codes: Voice related messages am: 499a8da
am: 1981e60

* commit '1981e602ad97e3a21bc987dbeb0625e87a58ff8d':
Ril Error codes: Voice related messages
1981e602ad97e3a21bc987dbeb0625e87a58ff8d 21-Mar-2016 Ajay Nambi <anambi@codeaurora.org> Ril Error codes: Voice related messages
am: 499a8da

* commit '499a8da1daa82f29eecd59f99721a1cdd52db716':
Ril Error codes: Voice related messages
499a8da1daa82f29eecd59f99721a1cdd52db716 19-Mar-2016 Ajay Nambi <anambi@codeaurora.org> Ril Error codes: Voice related messages

This change adds new error codes for messages
related to voice

Bug: 27038563
Change-Id: Id3a212c0b12e1feb26b0836fad3f9399d6dec19c
om/android/internal/telephony/RILConstants.java
b4877263b14f34e96bcf3b4e08e52f46fbba9228 19-Mar-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "ims:rcs: Add UCE interface files for RCS." into nyc-dev
am: eac4de2

* commit 'eac4de230d90497c96493d2b36909e8022a744f3':
ims:rcs: Add UCE interface files for RCS.
2fca9ebc3335d076117f138ae9ca4ddb4e410e30 19-Mar-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "ims:rcs: Add UCE interface files for RCS. [DO NOT MERGE]" into mm-wireless-dev
7ed3044ed1c4777650d38775a5f26cb3396fab09 17-Mar-2016 Dheeraj Shetty <dshetty@codeaurora.org> ims:rcs: Add UCE interface files for RCS. [DO NOT MERGE]

Change-Id: I2ce9e60240740acfe70c4a239163fbdbedbd96e0
om/android/ims/internal/uce/common/CapInfo.aidl
om/android/ims/internal/uce/common/CapInfo.java
om/android/ims/internal/uce/common/StatusCode.aidl
om/android/ims/internal/uce/common/StatusCode.java
om/android/ims/internal/uce/common/UceLong.aidl
om/android/ims/internal/uce/common/UceLong.java
om/android/ims/internal/uce/options/IOptionsListener.aidl
om/android/ims/internal/uce/options/IOptionsService.aidl
om/android/ims/internal/uce/options/OptionsCapInfo.aidl
om/android/ims/internal/uce/options/OptionsCapInfo.java
om/android/ims/internal/uce/options/OptionsCmdId.aidl
om/android/ims/internal/uce/options/OptionsCmdId.java
om/android/ims/internal/uce/options/OptionsCmdStatus.aidl
om/android/ims/internal/uce/options/OptionsCmdStatus.java
om/android/ims/internal/uce/options/OptionsSipResponse.aidl
om/android/ims/internal/uce/options/OptionsSipResponse.java
om/android/ims/internal/uce/presence/IPresenceListener.aidl
om/android/ims/internal/uce/presence/IPresenceService.aidl
om/android/ims/internal/uce/presence/PresCapInfo.aidl
om/android/ims/internal/uce/presence/PresCapInfo.java
om/android/ims/internal/uce/presence/PresCmdId.aidl
om/android/ims/internal/uce/presence/PresCmdId.java
om/android/ims/internal/uce/presence/PresCmdStatus.aidl
om/android/ims/internal/uce/presence/PresCmdStatus.java
om/android/ims/internal/uce/presence/PresPublishTriggerType.aidl
om/android/ims/internal/uce/presence/PresPublishTriggerType.java
om/android/ims/internal/uce/presence/PresResInfo.aidl
om/android/ims/internal/uce/presence/PresResInfo.java
om/android/ims/internal/uce/presence/PresResInstanceInfo.aidl
om/android/ims/internal/uce/presence/PresResInstanceInfo.java
om/android/ims/internal/uce/presence/PresRlmiInfo.aidl
om/android/ims/internal/uce/presence/PresRlmiInfo.java
om/android/ims/internal/uce/presence/PresServiceInfo.aidl
om/android/ims/internal/uce/presence/PresServiceInfo.java
om/android/ims/internal/uce/presence/PresSipResponse.aidl
om/android/ims/internal/uce/presence/PresSipResponse.java
om/android/ims/internal/uce/presence/PresSubscriptionState.aidl
om/android/ims/internal/uce/presence/PresSubscriptionState.java
om/android/ims/internal/uce/presence/PresTupleInfo.aidl
om/android/ims/internal/uce/presence/PresTupleInfo.java
om/android/ims/internal/uce/uceservice/IUceListener.aidl
om/android/ims/internal/uce/uceservice/IUceService.aidl
om/android/ims/internal/uce/uceservice/ImsUceManager.java
om/android/ims/internal/uce/uceservice/UceServiceBase.java
cfedd20d54687449bb6a6982085003cbf9a22bcb 19-Mar-2016 Pavel Zhamaitsiak <pavelz@google.com> ims:rcs: Add UCE interface files for RCS.

Bug: 23222011
Change-Id: I2ce9e60240740acfe70c4a239163fbdbedbd96e0
om/android/ims/internal/uce/common/CapInfo.aidl
om/android/ims/internal/uce/common/CapInfo.java
om/android/ims/internal/uce/common/StatusCode.aidl
om/android/ims/internal/uce/common/StatusCode.java
om/android/ims/internal/uce/common/UceLong.aidl
om/android/ims/internal/uce/common/UceLong.java
om/android/ims/internal/uce/options/IOptionsListener.aidl
om/android/ims/internal/uce/options/IOptionsService.aidl
om/android/ims/internal/uce/options/OptionsCapInfo.aidl
om/android/ims/internal/uce/options/OptionsCapInfo.java
om/android/ims/internal/uce/options/OptionsCmdId.aidl
om/android/ims/internal/uce/options/OptionsCmdId.java
om/android/ims/internal/uce/options/OptionsCmdStatus.aidl
om/android/ims/internal/uce/options/OptionsCmdStatus.java
om/android/ims/internal/uce/options/OptionsSipResponse.aidl
om/android/ims/internal/uce/options/OptionsSipResponse.java
om/android/ims/internal/uce/presence/IPresenceListener.aidl
om/android/ims/internal/uce/presence/IPresenceService.aidl
om/android/ims/internal/uce/presence/PresCapInfo.aidl
om/android/ims/internal/uce/presence/PresCapInfo.java
om/android/ims/internal/uce/presence/PresCmdId.aidl
om/android/ims/internal/uce/presence/PresCmdId.java
om/android/ims/internal/uce/presence/PresCmdStatus.aidl
om/android/ims/internal/uce/presence/PresCmdStatus.java
om/android/ims/internal/uce/presence/PresPublishTriggerType.aidl
om/android/ims/internal/uce/presence/PresPublishTriggerType.java
om/android/ims/internal/uce/presence/PresResInfo.aidl
om/android/ims/internal/uce/presence/PresResInfo.java
om/android/ims/internal/uce/presence/PresResInstanceInfo.aidl
om/android/ims/internal/uce/presence/PresResInstanceInfo.java
om/android/ims/internal/uce/presence/PresRlmiInfo.aidl
om/android/ims/internal/uce/presence/PresRlmiInfo.java
om/android/ims/internal/uce/presence/PresServiceInfo.aidl
om/android/ims/internal/uce/presence/PresServiceInfo.java
om/android/ims/internal/uce/presence/PresSipResponse.aidl
om/android/ims/internal/uce/presence/PresSipResponse.java
om/android/ims/internal/uce/presence/PresSubscriptionState.aidl
om/android/ims/internal/uce/presence/PresSubscriptionState.java
om/android/ims/internal/uce/presence/PresTupleInfo.aidl
om/android/ims/internal/uce/presence/PresTupleInfo.java
om/android/ims/internal/uce/uceservice/IUceListener.aidl
om/android/ims/internal/uce/uceservice/IUceService.aidl
om/android/ims/internal/uce/uceservice/ImsUceManager.java
om/android/ims/internal/uce/uceservice/UceServiceBase.java
cca7e458f7c4793b1c362d4430d90bf993a442d5 17-Mar-2016 Meng Wang <mewan@google.com> Merge "Add new key in CarrierConfigManager for ICCID display." into nyc-dev
am: 34b90a8

* commit '34b90a8ce3b3721a3bfcee15c780cdf45f712585':
Add new key in CarrierConfigManager for ICCID display.
6b2995ae140ddbd9115f644c36fb145cc8764782 14-Mar-2016 Meng Wang <mewan@google.com> Add new key in CarrierConfigManager for ICCID display.

Bug: 27574058
Change-Id: I74445c68f58e64a5baa87cd05fea9e91e59b0201
ndroid/telephony/CarrierConfigManager.java
f08361989d3deca76173f82006a00d73d8c6679b 16-Mar-2016 Tyler Gunn <tgunn@google.com> Correct naming issues with video calling carrier config items.

- Removed BOOL_ALLOW_VIDEO_PAUSE as it appears it was already added
as KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL.
- Renamed BOOL_ALLOW_EMERGENCY_VIDEO_CALLS to KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL.

Bug: 27346047
Change-Id: I9f772e68ad9e78ce5a0419387c85a7f9630ecd5f
ndroid/telephony/CarrierConfigManager.java
3d09db6f7a181b26e2541b90b379d68ab0f8ed32 15-Mar-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE Add KEY_USE_RCS_PRESENCE_BOOL carrier config option.

- New carrier config option is used to determine if presence is used
to determine whether a contact is capable of video calling.
- Also, improve logging for PhoneAccount capabilities.

Bug: 20257833
Change-Id: Ifcc7df95677eb4399f08eb8849c4004892957e90
ndroid/telephony/CarrierConfigManager.java
21006d573c68dcfb5beec7c2baa096ba95f99d09 14-Mar-2016 Ajay Nambi <anambi@codeaurora.org> New error codes for SMS/other messages am: b3e1083ff0
am: 8fc9cc4419

* commit '8fc9cc441984e934d4ac1f12b80487320c5a76c2':
New error codes for SMS/other messages
8fc9cc441984e934d4ac1f12b80487320c5a76c2 14-Mar-2016 Ajay Nambi <anambi@codeaurora.org> New error codes for SMS/other messages
am: b3e1083ff0

* commit 'b3e1083ff06155530c5ba91aa762c58e53d1fcc1':
New error codes for SMS/other messages
b3e1083ff06155530c5ba91aa762c58e53d1fcc1 11-Mar-2016 Ajay Nambi <anambi@codeaurora.org> New error codes for SMS/other messages

This change adds error codes for messages related
to SMS and set_mute, get_mute requests

Bug: 27038563
Change-Id: I9b989ae8b99da5e24f4f698f34f2c35b2a48ecbd
om/android/internal/telephony/RILConstants.java
8391d839bb508be6c21a154f67a9423169e376b0 14-Mar-2016 Anju Mathapati <anjucm@codeaurora.org> Merge "IMS: Changes for MultiEndpoint" into nyc-dev
am: f8de70c7b7

* commit 'f8de70c7b7855cad84fd3565eb29bd9c49bb0bc3':
IMS: Changes for MultiEndpoint
f8de70c7b7855cad84fd3565eb29bd9c49bb0bc3 14-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Changes for MultiEndpoint" into nyc-dev
f604fc33c699b9f91315588ea4d6c6cd3b09a372 10-Mar-2016 Anju Mathapati <anjucm@codeaurora.org> IMS: Changes for MultiEndpoint

- Interface changes for MultiEndpoint

- Extra for CallPull in -
- TelephonyProperties
- ImsProfile
- Error codes in ImsReasonInfo

Change-Id: I9a497cf04a412dc9d2f80b489e3455d289c3dfb7
om/android/ims/ImsExternalCallState.aidl
om/android/ims/ImsExternalCallState.java
om/android/ims/ImsReasonInfo.java
om/android/ims/internal/IImsExternalCallStateListener.aidl
om/android/ims/internal/IImsMultiEndpoint.aidl
om/android/ims/internal/IImsService.aidl
om/android/internal/telephony/TelephonyProperties.java
0bc008557fef6b2193fb4950236f03c86862879b 11-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Fix build failure. am: 44729c613f
am: 69e24384a7

* commit '69e24384a7bf4051ca30fdd1e1338fdfd0416cf4':
Fix build failure.
69e24384a7bf4051ca30fdd1e1338fdfd0416cf4 11-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Fix build failure.
am: 44729c613f

* commit '44729c613fe65fd9b2f14b1844c1f02ba94ad498':
Fix build failure.
44729c613fe65fd9b2f14b1844c1f02ba94ad498 11-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Fix build failure.

+ Fix build failure caused by
https://partner-android-review.googlesource.com/#/c/538910/

Change-Id: I83b579f3db4c5a167b206318edcc627c6d2f4b0a
om/android/internal/telephony/RILConstants.java
ba2d9c4261705a100592d389a153a9f5628a458c 11-Mar-2016 twen.chang <twen.chang@mediatek.com> Merge "Add RIL Error code list" into mm-wireless-dev am: 49916d39e9
am: 839b547cdc

* commit '839b547cdc2cb4b228aef7ccf3e9dedc74832a25':
Add RIL Error code list
839b547cdc2cb4b228aef7ccf3e9dedc74832a25 11-Mar-2016 twen.chang <twen.chang@mediatek.com> Merge "Add RIL Error code list" into mm-wireless-dev
am: 49916d39e9

* commit '49916d39e9d27acbc6fb28b38abc78ad5dada5a4':
Add RIL Error code list
49916d39e9d27acbc6fb28b38abc78ad5dada5a4 11-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add RIL Error code list" into mm-wireless-dev
a1ce0480c22eeaad4e00a5cb3b5c118e695c7a10 04-Mar-2016 twen.chang <twen.chang@mediatek.com> Add RIL Error code list

BUG: 27589497

Change-Id: Ib8d7e0ff13f72106b79210ea786020c17b0ba842
om/android/internal/telephony/RILConstants.java
ad083e2d9a9e684e552d49f2c339f046c0269791 09-Mar-2016 fionaxu <fionaxu@google.com> Merge "Add default Carrier cfg for IMS_WFC" into nyc-dev
am: 5a994060a7

* commit '5a994060a74b23862ba1724188e7267ef668fc4d':
Add default Carrier cfg for IMS_WFC
5a994060a74b23862ba1724188e7267ef668fc4d 09-Mar-2016 Chen Xu <fionaxu@google.com> Merge "Add default Carrier cfg for IMS_WFC" into nyc-dev
c71e824c0d419f5226a2e3d88af678a2e6515660 08-Mar-2016 fionaxu <fionaxu@google.com> Add default Carrier cfg for IMS_WFC

Bug: 26954117
Change-Id: I2a8fda969d73e30425729019a4428a02f551bbb2
ndroid/telephony/CarrierConfigManager.java
15e93f3715742d0ffad6089cf804842f2e5f393b 04-Mar-2016 Joe Onorato <joeo@google.com> Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev
am: 5d4ab988bd

* commit '5d4ab988bd18bb1fc339f39d6f0cf225b6561903':
Turn down the logging a little bit.
Turn down the logging a little bit and don't do a log wrapper function.
Turn down the logging a little bit.
Turn down the logging a little bit.
Turn down the logging a little bit.
Turn down the logging a little bit.
Turn down the logging a little bit.
a102dd01e9723c41b06a5af6ec88c94a4a62effb 02-Feb-2016 Joe Onorato <joeo@google.com> Turn down the logging a little bit.

Change-Id: Idc716000ba5d28f52aee3e1cb84832e1c6eaf440
ndroid/telephony/ServiceState.java
ndroid/telephony/TelephonyManager.java
d608fb83a4b56ecb963c0f458ff2f9f062f306ad 04-Mar-2016 Omkar Kolangade <omkark@codeaurora.org> Merge "IMS-VT: Disable multi tasking by default" into mm-wireless-dev am: cf2f48e26b
am: d4f9ca844e

* commit 'd4f9ca844eaba99e6a2ba4e264b8b9b8aad9307a':
IMS-VT: Disable multi tasking by default
d4f9ca844eaba99e6a2ba4e264b8b9b8aad9307a 04-Mar-2016 Omkar Kolangade <omkark@codeaurora.org> Merge "IMS-VT: Disable multi tasking by default" into mm-wireless-dev
am: cf2f48e26b

* commit 'cf2f48e26bf50a6549d8c0c562cce0734565d978':
IMS-VT: Disable multi tasking by default
cf2f48e26bf50a6549d8c0c562cce0734565d978 04-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "IMS-VT: Disable multi tasking by default" into mm-wireless-dev
2e8f8fe20140c49f8e63f9246970cbaeff78aec3 22-Dec-2015 Omkar Kolangade <omkark@codeaurora.org> IMS-VT: Disable multi tasking by default

Disable multi tasking support by default for all operators.
Enable based on MCC/MNC for required oeprators.

Bug: 27484483
Change-Id: Ib321747885435c110360370eb243eee35762dfe3
ndroid/telephony/CarrierConfigManager.java
3d8ba22560ca433c9cc300b3637bcc204f360d56 27-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: ImsCallProfile Extra For Call Pull am: 99eb21d172
am: 81d7417059

* commit '81d741705930e116de4471f15ba0ed6da4282b84':
IMS: ImsCallProfile Extra For Call Pull
81d741705930e116de4471f15ba0ed6da4282b84 27-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: ImsCallProfile Extra For Call Pull
am: 99eb21d172

* commit '99eb21d172348936cb42202f295ae6478272a39f':
IMS: ImsCallProfile Extra For Call Pull
99eb21d172348936cb42202f295ae6478272a39f 26-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: ImsCallProfile Extra For Call Pull

Adding an extra that will be used by IMS
Service to specify whether a call has been
pulled from another device.

BUG=27340495
Change-Id: Ic3b5a07404d63bfadcaa8bf88d6f077165251b92
om/android/ims/ImsCallProfile.java
f8a7086376bf7473dfd5e4bb7a48f0900a917ab5 26-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: Reason Codes For Call Pull Scenarios am: f38780b483
am: a486f4566a

* commit 'a486f4566ac6ce6c836ed072a89193990c4e70c2':
IMS: Reason Codes For Call Pull Scenarios
a486f4566ac6ce6c836ed072a89193990c4e70c2 26-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: Reason Codes For Call Pull Scenarios
am: f38780b483

* commit 'f38780b483de489635749f523258003506c8bbbc':
IMS: Reason Codes For Call Pull Scenarios
f38780b483de489635749f523258003506c8bbbc 24-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: Reason Codes For Call Pull Scenarios

Adding reason codes for call pull success
and failure scenarios.

BUG=27340495
Change-Id: I775316f52ed13862981500ebe035ee626adc934f
om/android/ims/ImsReasonInfo.java
4a86ead66c9059c993f5e9fbb1dca1334b61af12 25-Feb-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add registrationAssociatedUriChanged to ImsRegistrationListener" into mm-wireless-dev am: d76b7ee263
am: fbb584dfa0

* commit 'fbb584dfa0f6404d151825bb131144777e515a9f':
Add registrationAssociatedUriChanged to ImsRegistrationListener
fbb584dfa0f6404d151825bb131144777e515a9f 25-Feb-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add registrationAssociatedUriChanged to ImsRegistrationListener" into mm-wireless-dev
am: d76b7ee263

* commit 'd76b7ee2636a9bc92d8e1e5fb5cb649e5bd67be9':
Add registrationAssociatedUriChanged to ImsRegistrationListener
674f4d7ceed6df75c482749256cb9262a85c0669 25-Feb-2016 Shishir Agrawal <shishir@google.com> Merge "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into nyc-dev
am: 70d5c8d246

* commit '70d5c8d246e63f279f8893954ac650b6a0b7f0ca':
Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.
3bf26b56056ea8071e4092bf9a66171c96f43909 18-Feb-2016 Shishir Agrawal <shishir@google.com> Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.

All MSIM specific calls should not use a suffix/prefix.

Bug: 26772894
Change-Id: I49488dfc41bb7996a1a44447968ec11132e4dac7
ndroid/telephony/CarrierConfigManager.java
ae4cc1519db844f2f5e8c3a56adefeba13b217cb 12-Feb-2016 Pavel Zhamaitsiak <pavelz@google.com> Add registrationAssociatedUriChanged to ImsRegistrationListener

This callback will be used to pass list of associated URIs.
It is needed in case SIM doesn't have line1Number populated.

Bug: 24613146
Change-Id: I698ce58dbedb858dc59836069e6f10fec6d02ae6
om/android/ims/internal/IImsRegistrationListener.aidl
0978a60b9c8f5047f630855dea3fad9dbcd42de1 24-Feb-2016 Nathan Harold <nharold@google.com> Merge "Adding Error Codes for IWLAN/EPDG Connection" into mm-wireless-dev am: 17469433e3
am: f1070ad633

* commit 'f1070ad6331012b678e82c7b942e119090478117':
Adding Error Codes for IWLAN/EPDG Connection
f1070ad6331012b678e82c7b942e119090478117 24-Feb-2016 Nathan Harold <nharold@google.com> Merge "Adding Error Codes for IWLAN/EPDG Connection" into mm-wireless-dev
am: 17469433e3

* commit '17469433e35e5a137ff37cb3a5fdead76574c146':
Adding Error Codes for IWLAN/EPDG Connection
17469433e35e5a137ff37cb3a5fdead76574c146 24-Feb-2016 Nathan Harold <nharold@google.com> Merge "Adding Error Codes for IWLAN/EPDG Connection" into mm-wireless-dev
056454791e370b83a98ffd9c7d88b2693644cb6a 24-Feb-2016 Amith Yamasani <yamasani@google.com> Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev
am: 66f0c6f3b8

* commit '66f0c6f3b8bde3ba224a1333a4acbf1b86c959ec':
Optimize calls to TelephonyManager to check for privileged apps
66f0c6f3b8bde3ba224a1333a4acbf1b86c959ec 24-Feb-2016 Amith Yamasani <yamasani@google.com> Merge "Optimize calls to TelephonyManager to check for privileged apps" into nyc-dev
4ec6368f13a53906757283d50a17ed3ed43eccc4 19-Feb-2016 Amith Yamasani <yamasani@google.com> Optimize calls to TelephonyManager to check for privileged apps

Calling into TelephonyManager each of hundreds of apps to check
if the app is carrier privileged was very expensive, especially
when there aren't even any carrier access rules specified. This
change fetches all the carrier privileged apps in one call,
reducing the number of IPC calls to the radio process and checks
the package names locally.

If the carrier rules change or packages are modified, the list
will be computed and fetched again.

Other optimizations in Telephony help speed up the individual calls
to check if a package is privileged, as well.

Bug: 27271861
Change-Id: I5a77b6da4f2cdc603d2a73bd8569c5c38f06b42d
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
cc9231d32f436d0d3765f24ee4069bbd682c5101 24-Feb-2016 Shishir Agrawal <shishir@google.com> Merge "Add subscription specific TelephonyManager calls." into nyc-dev
am: 7aa999143f

* commit '7aa999143f2a87d908cd1348dcee6c9ab06334c9':
Add subscription specific TelephonyManager calls.
52103938915205cfd1febe09e2cae58060a8ef74 17-Feb-2016 Shishir Agrawal <shishir@google.com> Add subscription specific TelephonyManager calls.

SubId specific version of the following functions are being added.
- hasCarrierPrivileges
- iccCloseLogicalChannel
- iccExchangeSimIO
- iccOpenLogicalChannel
- iccTransmitApduBasicChannel
- iccTransmitApduLogicalChannel
- sendEnvelopeWithStatus
- setOperatorBrandOverride
- setPreferredNetworkTypeToGlobal

Bug: 26772894

Change-Id: I8c9e6d9bfe73f530e6f91c86211103fdfb1520bf
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
658d3c8b3ad1c10f243012531f05127de4874fa3 18-Feb-2016 Shishir Agrawal <shishir@google.com> DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.

All MSIM specific calls should not use a suffix/prefix.

Bug: 26772894
Change-Id: I49488dfc41bb7996a1a44447968ec11132e4dac7
ndroid/telephony/CarrierConfigManager.java
4b6d38938e1c6756c61456503099af714d1908e3 23-Feb-2016 Nathan Harold <nharold@google.com> Adding Error Codes for IWLAN/EPDG Connection

-Error codes related to tunnel maintenance
-Error code for DPD

Bug: 26014044
Bug: 26014458
Change-Id: Ic00a14e0502fa47e20e79a3c6ce91b3170f53a50
om/android/ims/ImsReasonInfo.java
6eef1df3807f5ab108d74ff3d1404ae2820b3adb 17-Feb-2016 Shishir Agrawal <shishir@google.com> DO NOT MERGE: Add subscription specific TelephonyManager calls.

SubId specific version of the following functions are being added.
- hasCarrierPrivileges
- iccCloseLogicalChannel
- iccExchangeSimIO
- iccOpenLogicalChannel
- iccTransmitApduBasicChannel
- iccTransmitApduLogicalChannel
- sendEnvelopeWithStatus
- setOperatorBrandOverride
- setPreferredNetworkTypeToGlobal

Bug: 26772894

Change-Id: I8c9e6d9bfe73f530e6f91c86211103fdfb1520bf
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
3dfe8841fef20b9c5e398a3af4e423d76d0061a9 17-Feb-2016 Nathan Harold <nharold@google.com> Merge "Create BandMode Constants" into mm-wireless-dev am: e629c06730
am: 56ea73f26e

* commit '56ea73f26ebf1f3e25267544d94a475c5fae3e14':
Create BandMode Constants
56ea73f26ebf1f3e25267544d94a475c5fae3e14 17-Feb-2016 Nathan Harold <nharold@google.com> Merge "Create BandMode Constants" into mm-wireless-dev
am: e629c06730

* commit 'e629c067308964659a5886921642920cd2e1f2f4':
Create BandMode Constants
e629c067308964659a5886921642920cd2e1f2f4 17-Feb-2016 Nathan Harold <nharold@google.com> Merge "Create BandMode Constants" into mm-wireless-dev
aa0f5873a74afc4dc40f8f016b0f1b0205a4f194 12-Feb-2016 Nathan Harold <nharold@google.com> Create BandMode Constants

Bug: 27145805
Change-Id: I733026268600f504325bc92061ee830d1448bbf5
om/android/internal/telephony/RILConstants.java
22f2d70d6aea48c88a1a4313d8bb8095571c382d 12-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev am: 989594638a
am: 99d5635929

* commit '99d563592974004571acbefa375f4d3d03675b05':
IMS RAT Reporting in Registration Unsol
99d563592974004571acbefa375f4d3d03675b05 12-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev
am: 989594638a

* commit '989594638ad2aa7360cf39b5ea67c137a9078c86':
IMS RAT Reporting in Registration Unsol
d4e44bbdbf2d1bd7307501658b694b3c92fd668b 05-May-2015 Omkar Kolangade <omkark@codeaurora.org> IMS RAT Reporting in Registration Unsol

Adding a parameter to the IMS registration complete
and progressing callbacks, allowing frameworks to be
notified of the radio access technology over which
IMS is registered.

Bug: 21902225
Change-Id: I271f2fca299585302a67d0f5476f6fac3e7099dd
om/android/ims/internal/IImsRegistrationListener.aidl
b8e4d7ff95fd97560e15c06afa3e8f529b52cba2 11-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add OEM specific error code space which can by used to replace Generic errors." into mm-wireless-dev am: de0cc7f4d3
am: 72494f69b5

* commit '72494f69b52a281957ac034e9e3654fd7202b1f3':
Add OEM specific error code space which can by used to replace Generic errors.
72494f69b52a281957ac034e9e3654fd7202b1f3 11-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add OEM specific error code space which can by used to replace Generic errors." into mm-wireless-dev
am: de0cc7f4d3

* commit 'de0cc7f4d3b3c8abbb73f2a65a52fbd77001afeb':
Add OEM specific error code space which can by used to replace Generic errors.
ce4f22e84ef2b215c0a7408a3b077fb5f36826cb 09-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Add OEM specific error code space which can by used to replace Generic errors.

BUG=27038563

Change-Id: I125e083e0a3145ac09806a84ea8b53864c04dc22
om/android/internal/telephony/RILConstants.java
f1adce018dcaa2819d51128f681643028f3341fc 09-Feb-2016 Paul Duffin <paulduffin@google.com> Merge "Replace usages of ShortNumberUtil with ShortNumberInfo"
am: 8405e5cd3b

* commit '8405e5cd3b3b2491b5f487cbe26d9e1550e55370':
Replace usages of ShortNumberUtil with ShortNumberInfo
c2884fe2597e4db2879c62f101da9c40d3cb2435 09-Feb-2016 Paul Duffin <paulduffin@google.com> Replace usages of ShortNumberUtil with ShortNumberInfo

The ShortNumberInfo class appears to support the exact same
methods as the ShortNumberUtil class (at least in terms of the
methods used by this project) but is a singleton and so
instances cannot be created directly but instead must be
retrieved using the static getInstance() method.

The ShortNumberUtil class was deprecated in version 5.8 and
removed in 7.2.3 of libphonenumber. This change is required in
order to allow libphonenumber to be upgraded to 7.2.4.

Bug: 26975810
Change-Id: Ide40c65d12cb44453f84600fc4b5ad1ee1088470
ndroid/telephony/PhoneNumberUtils.java
d48935879acf8718bc257a160d64370289ffb9f4 05-Feb-2016 Abhijith Shastry <ashastry@google.com> Carrier config to support overriding block suppress duration after emergency contact.

BUG: 26989170
Change-Id: I6d8f13dd4f2b69730826cc8440a22c7154255ac8
ndroid/telephony/CarrierConfigManager.java
65b266d956f946b26f5d51f83448bd3bb727cb29 05-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev
am: 6c4aac0bde

* commit '6c4aac0bdee2678818f577490c4acfdeeba81c59':
IMS: Constants For Audio Quality, Supp. Services
6c4aac0bdee2678818f577490c4acfdeeba81c59 05-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev
37e80e3167a3e79828e4e08575474b81b7ad3a2e 04-Feb-2016 Brian Jones <bjones@google.com> Merge "Allow Full ICCID Print in dumpsys on Debuggable Builds"
b09fdff0ff3089e908b7c815ca88ace617f93acc 04-Feb-2016 Nathan Harold <nharold@google.com> Allow Full ICCID Print in dumpsys on Debuggable Builds

Bug: 26981705
Change-Id: I83b1cb7e4e382123daf506b1621e8e100b874611
ndroid/telephony/SubscriptionInfo.java
66742f217e17c24ccf06601a16f6002b65c117f7 29-Jan-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: Constants For Audio Quality, Supp. Services

Adding:
1. Constants for audio quality (EVS standard).
2. Service class memeber to CallForwardInfo.
3. Call Fail Cause for emergency call and handover
scenarios, and supplementary services.

Change-Id: I7cc23acd01144def0bb725c4f6312318421027c8
om/android/ims/ImsCallForwardInfo.java
om/android/ims/ImsReasonInfo.java
om/android/ims/ImsStreamMediaProfile.java
fe585a6baeca91269beb8f00730e549239185e22 03-Feb-2016 Nathan Harold <nharold@google.com> Update RILConstants errors to match ril.h
am: c0e87a55f2

* commit 'c0e87a55f2e07613e45ee8681498528f9fa7c752':
Update RILConstants errors to match ril.h
c0e87a55f2e07613e45ee8681498528f9fa7c752 02-Feb-2016 Nathan Harold <nharold@google.com> Update RILConstants errors to match ril.h

-Mirror changes from I997da9a15225716786c53b7457b498d4628e76be
-Add an error code for rate-limited requests

Bug: 26767732
Change-Id: Ic094fdf39d33a702e1799e099c86af5238deb226
om/android/internal/telephony/RILConstants.java
5f651eef1e12c7fa9483123631562d77bf6da434 02-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Add new telephony disconnect cause for video calls when tty enabled." into mm-wireless-dev
am: 8562fb281c

* commit '8562fb281c37656d9198e6890f5c10e3541f6167':
Add new telephony disconnect cause for video calls when tty enabled.
8562fb281c37656d9198e6890f5c10e3541f6167 02-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Add new telephony disconnect cause for video calls when tty enabled." into mm-wireless-dev
0384c53c4ec45111c88a6124f6b7233f19f2710d 29-Jan-2016 Tyler Gunn <tgunn@google.com> Add new telephony disconnect cause for video calls when tty enabled.

Due to the way the radio works, it isn't possible to make a video call
when tty is enabled. Adding a new telephony disconnect cause to handle
this case.
Note: This was previously handled directly in Telecom which is not
correct.

Bug: 20090652
Change-Id: I90b7d6486fe00c84efe7bb1c0f30edf33a1502bc
ndroid/telephony/DisconnectCause.java
dbb7d13ad5b65baa886408057107c576313db946 29-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Add a null check before accessing int[] parameter in ModemActivityInfo" into mm-wireless-dev
am: ff62707130

* commit 'ff62707130e08785bbef1f13819d875d179df787':
Add a null check before accessing int[] parameter in ModemActivityInfo
ff62707130e08785bbef1f13819d875d179df787 29-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Add a null check before accessing int[] parameter in ModemActivityInfo" into mm-wireless-dev
ad2a71f722ec736e73a4a4df3b0da820a097c396 29-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add ITelephonyDebugSubscriber.aidl" into mm-wireless-dev
am: 8a688b2f36

* commit '8a688b2f36437ae4305130e2920e42ce546bdbbc':
Add ITelephonyDebugSubscriber.aidl
8a688b2f36437ae4305130e2920e42ce546bdbbc 29-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add ITelephonyDebugSubscriber.aidl" into mm-wireless-dev
938dcc88fd19425db4fc604c69a022760738028b 29-Jan-2016 Amit Mahajan <amitmahajan@google.com> Add a null check before accessing int[] parameter in ModemActivityInfo

Bug: 26842468
Change-Id: I3a5f7c8e454e7b9ace20f8082ee3fd1d0a24eb64
ndroid/telephony/ModemActivityInfo.java
ed0eecf7a2426321db816ece1daf8d1dbfbcd6b1 28-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Add ITelephonyDebugSubscriber.aidl

It can be used to subscribe for telephony debug events.

Change-Id: I6f17b0409f1117abd2d4caac99d3301c43134c75
om/android/internal/telephony/ITelephonyDebug.aidl
om/android/internal/telephony/ITelephonyDebugSubscriber.aidl
om/android/internal/telephony/TelephonyEvent.aidl
om/android/internal/telephony/TelephonyEvent.java
b98fac6f1f683b2fd06136d2cfe1537c3fce79d1 28-Jan-2016 Jack Yu <jackyu@google.com> Merge "Reduced more radio log spam" into mm-wireless-dev
am: 24c5e7c4ce

* commit '24c5e7c4ceb31c85868fe2c03e8a507e2cb0520f':
Reduced more radio log spam
72c3927f864ddd8cc2fb02c868a576e4171606d3 28-Jan-2016 Adam Lesinski <adamlesinski@google.com> Merge "Record ModemActivityInfo and distribute power blame to apps"
24c5e7c4ceb31c85868fe2c03e8a507e2cb0520f 28-Jan-2016 Jack Yu <jackyu@google.com> Merge "Reduced more radio log spam" into mm-wireless-dev
21f76aa77075be5e057c36040d7d6e695c669b72 25-Jan-2016 Adam Lesinski <adamlesinski@google.com> Record ModemActivityInfo and distribute power blame to apps

Telephony expsoses a getModemActivity() method, which BatteryStats
will poll when a change in network activity occurs (on the modem).

The time spent in various states (tx, idle, rx) are distributed amongst
the apps that did rx/tx traffic during that window.

Bug:23147562
Change-Id: I480a85df95786f87c382b96816fe2ed4bb2d5a42
ndroid/telephony/ModemActivityInfo.java
d11c15d418d776d1db33f7664fad2671de0e6669 28-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add new RIL command for sending ack to solicited async and unsolicited msg." into mm-wireless-dev
am: 2ed3add734

* commit '2ed3add734df1b9b35d91b69f2722b9554d2cf2b':
Add new RIL command for sending ack to solicited async and unsolicited msg.
2ed3add734df1b9b35d91b69f2722b9554d2cf2b 28-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add new RIL command for sending ack to solicited async and unsolicited msg." into mm-wireless-dev
6c8cc662a6dc3249041df3d6fe3e21f939f0e0ed 27-Jan-2016 Ta-wei Yen <twyen@google.com> Merge "Add KEY_VVM_PREFETCH_BOOLEAN to CarrierConfigManager"
0491c46227d94ad51a70c549d1529616cea9170b 27-Jan-2016 Sanket Padawe <sanketpadawe@google.com> [DO NOT MERGE] Cellinfo: Update to version 12

Add support for:
GSM: arfcn, bsic, ta
WCDMA: uarfcn
LTE: earfcn
Updated public APIs for getting above fields.

Bug: 23528586
Change-Id: I1e741ec73f2f683a796d430898b62921fe6e75e9
ndroid/telephony/CellIdentityGsm.java
ndroid/telephony/CellIdentityLte.java
ndroid/telephony/CellIdentityWcdma.java
ndroid/telephony/CellSignalStrengthGsm.java
2f805530f4c4a6d1827ef8c96be6a7f33266ee7a 27-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Add new RIL command for sending ack to solicited async and unsolicited msg.

Bug: 22127517
Change-Id: I371aae330f96e5767850b8c7fabbb36984334a98
om/android/internal/telephony/RILConstants.java
0c86efdbd93beba03f29bf4a771bd0917d3af46a 27-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Cellinfo: Update to version 12

Add support for:
GSM: arfcn, bsic, ta
WCDMA: uarfcn
LTE: earfcn
Updated public APIs for getting above fields.

Bug: 23528586
Change-Id: I97e18856bb41c5592f89641eac7d4a3dbef43d5d
ndroid/telephony/CellIdentityGsm.java
ndroid/telephony/CellIdentityLte.java
ndroid/telephony/CellIdentityWcdma.java
ndroid/telephony/CellSignalStrengthGsm.java
05a7dfc48d4f0e874e5ae2540a4712f8b8ba5c7f 27-Jan-2016 Shishir Agrawal <shishir@google.com> Merge "Unhiding MSIM APIs."
67269fe0e54022dfa5c23192df34f7a6abb0234d 27-Jan-2016 Nathan Harold <nharold@google.com> Merge "Make DcRtInfo Power State Constants Final" into mm-wireless-dev
am: 4269239f86

* commit '4269239f865c55266e8ef7ef01b569c7fbfc1444':
Make DcRtInfo Power State Constants Final
4269239f865c55266e8ef7ef01b569c7fbfc1444 27-Jan-2016 Nathan Harold <nharold@google.com> Merge "Make DcRtInfo Power State Constants Final" into mm-wireless-dev
7ea3e8bf8954343d7b243b6a23bcb8339921f3c8 25-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: Ibebab7379ea79c8e4812bbd190342827048e30e2
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/SubscriptionManager.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
86d4372c41c7f37d66677d486f93df2029115f0b 26-Jan-2016 Nathan Harold <nharold@google.com> Merge "Remove Data RealTime Info Listener Support"
87f47e9991c7c9e291eadc4e0d14426416a1c61e 06-Jan-2016 Jack Yu <jackyu@google.com> Reduced more radio log spam

Reduced more radio log spam

bug: 25956251
Change-Id: Ib870bb508c55ab009197fd7fcfa48e62fe3f7b6b
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/ServiceState.java
3a86d3d5349bc463d5c99fc4c3a4a47092617c6b 25-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: Ibebab7379ea79c8e4812bbd190342827048e30e2
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/SubscriptionManager.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
ac044909f59846a1f7884a1858d459cff8f4bebd 26-Jan-2016 Narayan Kamath <narayan@google.com> Merge "Revert "Cellinfo: Update to version 12"" into mm-wireless-dev
am: c980eca638

* commit 'c980eca638e549be342f99ba2bd6f27ada184736':
Revert "Cellinfo: Update to version 12"
d44d16f7003a57eb4ac99d4730fa4d5a0f0474c8 26-Jan-2016 Narayan Kamath <narayan@google.com> Revert "Cellinfo: Update to version 12"

This reverts commit aa2be45a560b37c5249600667ee36a9f156515c2.

Change-Id: I5cc76b15b311e47bc5a892704930d218c9f72b0d
ndroid/telephony/CellIdentityGsm.java
ndroid/telephony/CellIdentityLte.java
ndroid/telephony/CellIdentityWcdma.java
ndroid/telephony/CellSignalStrengthGsm.java
76193dc2d0a1856368ec40995a8d39822506cc2b 26-Jan-2016 Ta-wei Yen <twyen@google.com> Add KEY_VVM_PREFETCH_BOOLEAN to CarrierConfigManager

This key will allow the carrier to specify to prefetch audio data on
new voicemail arrival. The default value it true.

This setting is not available to the user because it add too much
complexity.

Bug:23945351
Change-Id: I5ca6b4f64c3818c5f37ba608f4ab450c8b0ed9dc
ndroid/telephony/CarrierConfigManager.java
ec1d60015386f12f70aaadaac2030bd7f40dd749 26-Jan-2016 Nathan Harold <nharold@google.com> Make DcRtInfo Power State Constants Final

Bug: 26779884
Change-Id: Ia035b67fd682adb6542d6569d7634678f68a1e30
ndroid/telephony/DataConnectionRealTimeInfo.java
3ea9b72a8eb7689d01b4bb0cc98728eb5f702fb6 26-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Cellinfo: Update to version 12" into mm-wireless-dev
am: 480bd2b97a

* commit '480bd2b97a46628f36fee606a2b63248aa75dd8a':
Cellinfo: Update to version 12
aa2be45a560b37c5249600667ee36a9f156515c2 25-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Cellinfo: Update to version 12

Add support for:
GSM: arfcn, bsic, ta
WCDMA: uarfcn
LTE: earfcn
Updated public APIs for getting above fields.

Bug: 23528586

Change-Id: I538a9f392550716d8a9a90e01fc88bc082ef7b81
ndroid/telephony/CellIdentityGsm.java
ndroid/telephony/CellIdentityLte.java
ndroid/telephony/CellIdentityWcdma.java
ndroid/telephony/CellSignalStrengthGsm.java
8216236175c74c4d93e28eb06314b7b22b12df15 21-Jan-2016 Nathan Harold <nharold@google.com> Remove Data RealTime Info Listener Support

-Remove Listener from the NetworkManagementService
-Remove the callback capability from TelephonyRegistry
-Remove the callback capbility from PhoneStateListener

Because of intractable problems with power consumption and
consistency, this signal is removed and should not be used.

Bug: 23319188

Change-Id: I99383075bbd5604cc801deab6de94ac97fc17bfd
ndroid/telephony/PhoneStateListener.java
om/android/internal/telephony/ITelephonyRegistry.aidl
e0a6d6ab8dd6fed45e5e78e35b1bf0f1f8b403b1 21-Jan-2016 Jack Yu <jackyu@google.com> Merge "Data call retry refactoring" into mm-wireless-dev
am: 599f62562b

* commit '599f62562b6102f9e3830d5b32a282d23c59e2fd':
Data call retry refactoring
599f62562b6102f9e3830d5b32a282d23c59e2fd 21-Jan-2016 Jack Yu <jackyu@google.com> Merge "Data call retry refactoring" into mm-wireless-dev
42051806eaac8b1eaca2e1385599db2ef5811fb1 20-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Added constructor with looper param for OnSubscriptionsChangedListener"" into mm-wireless-dev
am: e2b73804f3

* commit 'e2b73804f375a2d98ca21d4d1821a44dd3c52289':
Revert "Added constructor with looper param for OnSubscriptionsChangedListener"
e2b73804f375a2d98ca21d4d1821a44dd3c52289 20-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Added constructor with looper param for OnSubscriptionsChangedListener"" into mm-wireless-dev
3f4c8d21e239a318549079f92cd1124701273d57 20-Jan-2016 Junda Liu <junda@google.com> Merge "Make getIccSimChallengeResponse a carrier API."
ca1bdcfd70e4e415aa89256c9af283f545a4654c 19-Jan-2016 Amit Mahajan <amitmahajan@google.com> Revert "Added constructor with looper param for OnSubscriptionsChangedListener"

This reverts commit 831e401c055391745691a58d0c87c48b49139f50.

Not needed now since tests create HandlerThread

BUG=25691379
Change-Id: Ic0ac3e3ef3c717fd31acb5fc8d6d81cc9995a2f7
ndroid/telephony/SubscriptionManager.java
663d09ab4273f3e2c68bfaa72d4973f58e5cc023 19-Jan-2016 Jonathan Basseri <misterikkit@google.com> Merge "Un-hide carrier config keys."
e1bb8f5b511155c0e25a64cb775eac16ec0d374e 19-Jan-2016 Akshay Kannan <akshayk@google.com> Merge "Flip EMERGENCY_ASSISTANCE_ENABLED to true Bug: 23591361"
2e98cfd70b86d9d50763f5094ac4d277808ea640 16-Jan-2016 Brad Ebinger <breadley@google.com> Merge "Refactoring and cleanup"
ab5acff9c796074d2ae400a04e0fc675049ab60a 15-Jan-2016 Jonathan Basseri <misterikkit@google.com> Un-hide carrier config keys.

CarrierConfigManager is not meant to have hidden keys, but some were
needed after API 23 freeze. So add them to API 24.

Change-Id: Ibf25cd3c779bf90ccf1b113445b823707bfb918e
ndroid/telephony/CarrierConfigManager.java
5b63b416fcfb4027115306075fd1a7ef666ca17d 15-Jan-2016 Akshay Kannan <akshayk@google.com> Flip EMERGENCY_ASSISTANCE_ENABLED to true
Bug: 23591361

Change-Id: I4f463a709137b6f37a1abc6c420834fee200551e
ndroid/telephony/TelephonyManager.java
090dd7299999a473f315b58817d3bc72ef294144 19-Dec-2015 Jack Yu <jackyu@google.com> Data call retry refactoring

Moved retry manager from DataConnection to ApnContext. Moved the
configuration from system properties to carrier config.

bug: 22208242
Change-Id: I224d4b0fd0115b964e85a07e2c1b5061726ca91b
ndroid/telephony/CarrierConfigManager.java
om/android/internal/telephony/DctConstants.java
aa17797fda494efd4d8f82240acb9d3e0cf7cfcd 15-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mm-wireless-dev
am: 49442a1dd7

* commit '49442a1dd7bbf15e6014e88d8143f198a43bad05':
Adding new intent for EMERGENCY_CALL_STATE_CHANGE
49442a1dd7bbf15e6014e88d8143f198a43bad05 15-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mm-wireless-dev
0c0814839fc442618313276dd0e46711d81c5773 13-Jan-2016 Amit Mahajan <amitmahajan@google.com> Adding new intent for EMERGENCY_CALL_STATE_CHANGE

Bug: 24147407
Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5
ndroid/telephony/CarrierConfigManager.java
om/android/internal/telephony/PhoneConstants.java
om/android/internal/telephony/TelephonyIntents.java
f577d79e43d53dc90486e1860d0f636256e9532e 14-Jan-2016 Victor Chang <vichang@google.com> Merge "Show work missed call notification for sim call from work contacts"
14ef09514b9e82922b442f6ab6c8300bced8432f 05-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Add ITelephonyDebug.aidl

(cherry picked from commit f91818ca3458f9c1f1d6b6d278f8d6cc2fc14511)

Change-Id: Ie3c846a90632e3afa793e6e60f5a3390a260c5a5
om/android/internal/telephony/ITelephonyDebug.aidl
9359ee18a5831eef35a53fb0171b7982df941425 04-Jan-2016 Victor Chang <vichang@google.com> Show work missed call notification for sim call from work contacts

BUG=26082618

Change-Id: I82bf3d9835589a309101b23536748ae2b27b1d2d
om/android/internal/telephony/CallerInfo.java
4a4345b681f430bc76bed964eb3d4d569539130e 13-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add ITelephonyDebug.aidl" into mm-wireless-dev
88ca5398ebe4335ff3b14ad7e93712b2c7ae6c07 13-Jan-2016 Amit Mahajan <amitmahajan@google.com> Added constructor with looper param for OnSubscriptionsChangedListener
am: 831e401c05

* commit '831e401c055391745691a58d0c87c48b49139f50':
Added constructor with looper param for OnSubscriptionsChangedListener
831e401c055391745691a58d0c87c48b49139f50 13-Jan-2016 Amit Mahajan <amitmahajan@google.com> Added constructor with looper param for OnSubscriptionsChangedListener

This is needed for tests as subclasses may need to specify which
looper to use.

Bug: 25691379
Change-Id: Ia6eb2d34c439b420ef81622e3c8ff50a0290da22
ndroid/telephony/SubscriptionManager.java
cef504f9142db0b92b34578e22c689ef53135210 13-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> resolve merge conflicts of 68514d5325 to master.

Change-Id: Ifbd3766e8a799a72e49adcdc6c5d509f2b8b53a6
ndroid/telephony/CarrierConfigManager.java
95a0c7c8e63ab0a53ba1b225effe593c71b9ddb7 13-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> resolve merge conflicts of 68514d5325 to master.

Change-Id: I989230fe4a307070f7d13b53b9eea9f23a4b5e34
c614d7c2d5e37576770e33237612f70b8849bee4 08-Jan-2016 Brad Ebinger <breadley@google.com> Refactoring and cleanup

Cleans up obsolete parts of services/Telephony and absorbs others
into Telecomm.


Bug: 26204262
Change-Id: I2028ae0177d83241f861cd59fa78b5f5a869f572
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
f5afe6ab8d0572fc407d0af8c154ba1a4a30dd20 12-Jan-2016 Tyler Gunn <tgunn@google.com> Merge "Add KEY_USE_RCS_PRESENCE_BOOL carrier config option."
3e122f76f1648a1ad87f7492c6c491d5dfaf54ea 12-Jan-2016 Tyler Gunn <tgunn@google.com> Add KEY_USE_RCS_PRESENCE_BOOL carrier config option.

- New carrier config option is used to determine if presence is used
to determine whether a contact is capable of video calling.
- Also, improve logging for PhoneAccount capabilities.

Bug: 20257833
Change-Id: Ifcc7df95677eb4399f08eb8849c4004892957e90
ndroid/telephony/CarrierConfigManager.java
d3b2826a1a3ff128db1e89a081124192ac70c509 23-Dec-2015 Sungmin Choi <sungmin.choi@lge.com> Add carrier config variable to support editable wfc mode

Some operators support Wi-Fi Calling only, not VoLTE.
They don't need "Cellular preferred" option.
In this case, set uneditalbe attribute for preferred preference.

Bug: 26299288
Change-Id: I58b44bbd85bb5ef436d32a5e34d7372532695b91
ndroid/telephony/CarrierConfigManager.java
740fb3bcca1366e20783dd7656d3ffe6ea3a744e 06-Jan-2016 Nancy Chen <nancychen@google.com> Add methods to the API to retrieve voicemail notification settings.

Since Dialer and other apps may want to retrieve the voicemail
notification settings set by Telephony, provide API methods to retrieve
these settings.

Bug:24164917
Change-Id: I9b074fa92db3acdbe85d173453731458909455b2
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
1845a3bf5691f9d674f943d3ca36603e4ca2cb0a 05-Jan-2016 Junda Liu <junda@google.com> Make getIccSimChallengeResponse a carrier API.

Bug: b/22863855
Change-Id: Ife4093da3a7a5849a02efcf00ded9a4a7761a1f6
ndroid/telephony/TelephonyManager.java
f91818ca3458f9c1f1d6b6d278f8d6cc2fc14511 05-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Add ITelephonyDebug.aidl

Change-Id: I0f111a56b471bd8c8092d30e7157bc06b5da3769
om/android/internal/telephony/ITelephonyDebug.aidl
6978228ccf617146b13b8449279076717c2c1a45 04-Jan-2016 Jack Yu <jackyu@google.com> Fixed the incorrect cdma RAT detection logic.
am: fa530b4a10

* commit 'fa530b4a10e8553afd58b827dfd7dcd8726126b4':
Fixed the incorrect cdma RAT detection logic.
fa530b4a10e8553afd58b827dfd7dcd8726126b4 04-Jan-2016 Jack Yu <jackyu@google.com> Fixed the incorrect cdma RAT detection logic.

Used the correct CDMA bitmask to determine if the bearer services
are based on 3GPP2 radio technologies.

bug: 26318528
Change-Id: Ic30c25aa7b67372898a041dd1f3a08a3abede394
ndroid/telephony/ServiceState.java
b42701047ab86a0539bdd3970f71858573fe10ec 30-Dec-2015 Jack Yu <jackyu@google.com> Reduced the radio log
am: d2cf0ce9c1

* commit 'd2cf0ce9c17cd37a12827882b3a10512d2904103':
Reduced the radio log
d2cf0ce9c17cd37a12827882b3a10512d2904103 30-Dec-2015 Jack Yu <jackyu@google.com> Reduced the radio log

Reduced the radio log by moving some to VDBG or merging few lines
into one.

bug: 25956251
Change-Id: I290d894e95c9fdd664db35fd0cee3536c37dbd20
ndroid/telephony/SubscriptionManager.java
a2590b5e7fb8a4a26ea530e59b2b630acc112bd9 04-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId. DO NOT MERGE

This needs the package name passed in, so the aidl changes.

bug:25778215
Change-Id: I69ee88f1d2db614bad51e6de908d3f16881a0231
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IPhoneSubInfo.aidl
064eb2a7cc8b811671682018b82c2b63064971ef 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Check permissions on getDeviceId." into mnc-dr-dev
am: ef58df63d6

* commit 'ef58df63d6ba9d56620b6a440f15d0e07c842a44':
Check permissions on getDeviceId.
39d7334b0979da835b13d9810adf218740efd8af 17-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Check permissions on getDeviceId."
56f3d9098cc8c134cf2d45025bc53a69eb648435 11-Dec-2015 Tyler Gunn <tgunn@google.com> Merge commit '9aadad47a0085c4298307781a423064207933f0b' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
fb21fb73e909450232263a148e25eeb674b2c158 11-Dec-2015 Tyler Gunn <tgunn@google.com> Merge commit '024557b2afdbe2e946d2cc557cb71492d87b0f62' into mncvtdev-to-mmwirelessdev-merge-2015-12-10

Change-Id: I44853f0e2f56d33c8126de0799bd5129799592bd
6714030083b1d8ec5b2df6dfef08034d0d30c2fe 10-Dec-2015 Jack Yu <jackyu@google.com> merge from master

Change-Id: Ic03669db3f4595336a7dbc13ffc77d055d11acf9
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/CellLocation.java
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/ServiceState.java
ndroid/telephony/SubscriptionManager.java
ndroid/telephony/TelephonyManager.java
ndroid/telephony/cdma/CdmaCellLocation.java
ndroid/telephony/gsm/GsmCellLocation.java
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/PhoneConstants.java
om/android/internal/telephony/RILConstants.java
6b733f61e982c6099a77382771dc4811efe0e7a4 09-Dec-2015 Ta-wei Yen <twyen@google.com> Merge "Add KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN to CarrierConfigManager"
1daf35db0fa05bf579e41aa62ee8a4478af182ff 08-Dec-2015 Chenjie Luo <cjluo@google.com> Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am: e56f7b0d1d am: bef0525c38 am: e4db3f0757
am: d7b61ca662

* commit 'd7b61ca6620565cad00de91284ecdfb93ddfbd50':
Check NPE beforehand instead of catching it at runtime
d8231b9f37b8a4b9eb160c7e8aae0105c978fc11 04-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId.

This needs the package name passed in, so the aidl changes.

bug:25778215
Change-Id: I72f3456a2774a7ad5104424daea9e046ee9c6360
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IPhoneSubInfo.aidl
fbdb8fb3d03eb1905793223423c0f05658c48eb7 05-Dec-2015 Tyler Gunn <tgunn@google.com> Merge commit '9aadad47a0085c4298307781a423064207933f0b' into tgunn-mncvtdev-to-master-2015-12-04
1cee477bc53172da17510e821f7b5a95fe37f98d 05-Dec-2015 Tyler Gunn <tgunn@google.com> Merge commit '024557b2afdbe2e946d2cc557cb71492d87b0f62' into tgunn-mncvtdev-to-master-2015-12-04

Change-Id: I156930f72a3267b59123469231331e9da5ac6aab
afa16001a8b97c298c89a3c9e24cce6608660f83 04-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId.

This needs the package name passed in, so the aidl changes.

bug:25778215
Change-Id: I9e5ff24c630e11a047f884e52b0b39f870c18e1d
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IPhoneSubInfo.aidl
28be2bdbe40e39b22d4acc882506081afa3dcf5d 04-Dec-2015 Amit Mahajan <amitmahajan@google.com> Merge "Cleanup related to files removed in Phone refactor."
90bc39d7e3fbf546b363d2358f6bb347620d6421 03-Dec-2015 Chenjie Luo <cjluo@google.com> Check NPE beforehand instead of catching it at runtime

This will fix the page fault when watch rings during incoming call

Bug: 25904666
Change-Id: Ia7e6db0628108dbf298e3811a846534ba69c0b46
ndroid/telephony/CarrierConfigManager.java
091683305f29d452c435b4febf54967300313018 03-Dec-2015 Amit Mahajan <amitmahajan@google.com> Cleanup related to files removed in Phone refactor.

Mostly just updating comments to remove names of old classes.

Bug: 25793157
Change-Id: I900b0ec0d137b2eb869a7ab40c264875366def26
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/ServiceState.java
14388588268596c72cff1dbabfb97b1bd4c58ea1 24-Nov-2015 Nathan Harold <nharold@google.com> Add hidden APIs for retrieving LTE RSRQ and RSSNR

Change-Id: Iff3c4869830321b979cf0c2c6a9076efda943389
ndroid/telephony/CellSignalStrengthLte.java
685f53c2c86c00b1f172885b2eb742f7b6e3d0fd 01-Dec-2015 Ta-wei Yen <twyen@google.com> Add KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN to CarrierConfigManager

Allow determining of whether the carrier require cellular data to
operate visual voicemail

Bug:21609252
Change-Id: Ib80ed83c3b2c0454cbac566e0b82e713d0565908
ndroid/telephony/CarrierConfigManager.java
37c2839f70293d72b504cb0b84ad81d9419ad8bc 26-Nov-2015 Amit Mahajan <amitmahajan@google.com> Promoting a function from Gsm/Cdma CellLocation classes to parent class

Bug: 25793157
Change-Id: Iee247ceb45df90aeba26c0b68471ef857284b245
ndroid/telephony/CellLocation.java
ndroid/telephony/cdma/CdmaCellLocation.java
ndroid/telephony/gsm/GsmCellLocation.java
b6350870f007bed02fd3641fd2daa18467a71a2f 25-Nov-2015 Amit Mahajan <amitmahajan@google.com> Rename PhoneBase to Phone.

Bug: 25793157
Change-Id: I4380c3ff08d1a2b5725da075bae5f208f1b09569
ndroid/telephony/SubscriptionManager.java
d13fb587b9878c0ab1f192590d4ebc6d2677fb02 25-Nov-2015 Amit Mahajan <amitmahajan@google.com> Merge "Make some static functions public so telephony tests can access them"
44297f3eefec1dff7b2cfce8cf243f66fe89ace5 09-Nov-2015 Amit Mahajan <amitmahajan@google.com> Added PHONE_TYPE_CDMA_LTE

Bug: 25793157
Change-Id: I06b1033fc6775edb679ac6f5de4556a3b1fea977
om/android/internal/telephony/PhoneConstants.java
om/android/internal/telephony/RILConstants.java
39daf8d6f14a01d2854352fe08d14195f7a2056b 09-Nov-2015 Jack Yu <jackyu@google.com> Added getServiceState API to TelephonyManager.

Added the new API getServiceState to TelephonyManager so
the client can directly retrieve the service state without
being a phone state listener or broadcast receiver.

bug: 21207640
Change-Id: Icef46877bbc844d382cd910b15abd8f6b1d57b23
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
9370f14af911cb9cc769012c0c4da5edb4e7bc74 03-Nov-2015 Tyler Gunn <tgunn@google.com> Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am: 8b86c76296 am: 48a0c3ae8d am: e0eaa03307
am: 6ebf6a27a7

* commit '6ebf6a27a772f3a21b575aaa88df46f773934214':
Improve comment on EXTRA_CALL_RAT_TYPE.
48a0c3ae8dd0d3944a3cffa2bafec47f9bc346d6 03-Nov-2015 Tyler Gunn <tgunn@google.com> Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
am: 8b86c76296

* commit '8b86c7629676eeea490531b2a412873e0196eb6f':
Improve comment on EXTRA_CALL_RAT_TYPE.
8b86c7629676eeea490531b2a412873e0196eb6f 03-Nov-2015 Tyler Gunn <tgunn@google.com> Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
a382620ea8f135afa7f1d6005216fdbbb8518b3b 03-Nov-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am: b57c65b00e am: 71f018a411 am: 391c87dea8
am: 535c6fbaa5

* commit '535c6fbaa51ece3ecdbf9e5ff1147623a36cedaf':
Fix a crash while printing ICCID because of alphabets in UICC.
71f018a411c55383f395adc52d8363d6103529d3 03-Nov-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
am: b57c65b00e

* commit 'b57c65b00efbcc6c8ed5a64b2c314dbca72d5554':
Fix a crash while printing ICCID because of alphabets in UICC.
f149dcb36edc4cf75f7c6fb55c54b51fc815f283 03-Nov-2015 Sanket Padawe <sanketpadawe@google.com> Fix a crash while printing ICCID because of alphabets in UICC.

Bug: 25401769
Change-Id: Ieda058817b8d3cb4b1696fd9932bd0f10da55573
ndroid/telephony/SubscriptionInfo.java
3ffb08aa5cc0589044f991dd2f01ae9f6bed1b89 02-Nov-2015 Tyler Gunn <tgunn@google.com> Improve comment on EXTRA_CALL_RAT_TYPE.

Adding comments to EXTRA_CALL_RAT_TYPE to make it clear what it is used
for, and what values are expected.

Bug: 20144385
Change-Id: I248aca61abc8a57d7aeef650e48cc498e41c859b
om/android/ims/ImsCallProfile.java
6ccc46ad8368a7843d5199af644fe62a5a051d20 30-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev am: 4ec415800f am: b5ab0ec3c0 am: 22baf9b3c1
am: 6df638a380

* commit '6df638a380c176a4283409edd0a50c458b445618':
IMS: Support For Per-Call RAT Info
b5ab0ec3c05f88c1305d962fffcd185ab5c6a8e9 30-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev
am: 4ec415800f

* commit '4ec415800fd55d2bb128d7635f8b984145dbe983':
IMS: Support For Per-Call RAT Info
3b0437eda3fd3a3abdfaae471cbd9481b42122cb 29-Oct-2015 Omkar Kolangade <omkark@codeaurora.org> IMS: Support For Per-Call RAT Info

Adding the extra key that will be used to
propagate RAT information for each call via
call extras. The key is used in IMS Service.

Bug: 20144385
Change-Id: Ia7ca81d661afb579fd25315036c43489b1dca50d
om/android/ims/ImsCallProfile.java
8bc92f3458ea7b0c1e0979e541ee9b5d7e5b8d31 29-Oct-2015 Amit Mahajan <amitmahajan@google.com> Make some static functions public so telephony tests can access them

Change-Id: I69ab45853db8a7f70644201751452605b07d19c1
om/android/internal/telephony/GsmAlphabet.java
b6d8f81b10ba85651d2309afc665b9e9fc1ab955 26-Oct-2015 Paul Jensen <pauljensen@google.com> Merge "Remove dead ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN"
d470bb7dfcec2d8a0ec83847dc75e3d97f6c5f10 22-Oct-2015 Nathan Harold <nharold@google.com> Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am: 0dccd12800 am: 64e8bdc476 am: 51692ac260
am: 6f39642389

* commit '6f39642389d2702125898c401ca9e8881a322fe0':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec 22-Oct-2015 Nathan Harold <nharold@google.com> Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
am: 0dccd12800

* commit '0dccd128001ceff9437f736bd70dfd1986e315d5':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
0dccd128001ceff9437f736bd70dfd1986e315d5 22-Oct-2015 Nathan Harold <nharold@google.com> Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()

-Fixed doc string

Bug: 23979591

This reverts commit f7b6474de87fd2eee377dc612c757102cdacc003.

Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702
ndroid/telephony/TelephonyManager.java
869a4e4cacd6f2c59ab5833592d0e06b1e48d47a 22-Oct-2015 Nathan Harold <nharold@google.com> Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am: 42015c4081 am: 5be7dbc88d am: b129c106bd
am: ce73642a58

* commit 'ce73642a5804a50468fa9bc928333653948c5549':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
5be7dbc88d0460dfede5373f1204f4645ce99726 22-Oct-2015 Nathan Harold <nharold@google.com> Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
am: 42015c4081

* commit '42015c4081f9d37d579f0be15e11725cf6cc5fba':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
f7b6474de87fd2eee377dc612c757102cdacc003 22-Oct-2015 Nathan Harold <nharold@google.com> Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"

This reverts commit 5d1429e0dd1a13f76dbb354f9e4e415f71956299.

Doc string isn't resolving. Temporarily reverting.

Change-Id: I128b13abcf938c96b24225e373ac0885c24e083e
ndroid/telephony/TelephonyManager.java
d66bb15f1a48b4407bd02652940c399c3c65b31b 22-Oct-2015 Nathan Harold <nharold@google.com> Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a6f am: dc9f8fab0f am: 1a3c88a5bf
am: c3a94cb6c2

* commit 'c3a94cb6c2097ae2b30500a32ecf95b5714bd8c2':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
dc9f8fab0fd9485b22651fe5c7f70961d67d697a 22-Oct-2015 Nathan Harold <nharold@google.com> Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev
am: f8a4dc4a6f

* commit 'f8a4dc4a6f8383fc2999ce1292d900912a0da842':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
5d1429e0dd1a13f76dbb354f9e4e415f71956299 21-Oct-2015 Nathan Harold <nharold@google.com> Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()

Bug: 23979591
Change-Id: I16ffa7666fdf0eb081bb1bafa57ebd384d7c3fdf
ndroid/telephony/TelephonyManager.java
d3c1c231b60b4db9ddb3fa0f84d45dd02c77069a 21-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev am: d99aade6e2 am: d91b1f6bb8 am: 2c26344cee
am: 8db6e95afc

* commit '8db6e95afcd70ac389750ab76f4b9f9181fadebb':
Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
d91b1f6bb84c22b9b20df2537500bf23f6b65ad2 21-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev
am: d99aade6e2

* commit 'd99aade6e2c001cbb8e32c9342f20404bd614443':
Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
b4faf348f1ebe257f448d5c34d01ad7aedf62abb 17-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag

Bug: 23731243
Change-Id: I3e08469ef293f0b619f95dd9fb48e8c582926270
ndroid/telephony/CarrierConfigManager.java
95b84f52517548adbd0dff7a22c41c5c4d249c44 16-Oct-2015 Tyler Gunn <tgunn@google.com> am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev

* commit 'a5917b71b0e2f98fa6906b795b28cab059cc092b':
DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
a5917b71b0e2f98fa6906b795b28cab059cc092b 16-Oct-2015 Tyler Gunn <tgunn@google.com> Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev
482e9d9984540f2b7443392e421fff78fb0d2471 14-Aug-2015 Roshan Pius <rpius@google.com> DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.

Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network. Setting it to 100ms by default.
This is based on a similar set of changes for IMS calls: ag/747865.

BUG: 19118840
Change-Id: Ifb64fe406509fe7c401ad1c4b4e906d6643e327b
ndroid/telephony/CarrierConfigManager.java
4ae088957fc772f0dbbf66d88aaec2f4df49bea5 16-Oct-2015 Sanket Padawe <sanketpadawe@google.com> am 902cb106: am cf471efd: am 001a651e: am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev

* commit '902cb106fe8d06274462e4cea4afb29c1ffa0c03':
Mask IccId which gets printed in bug reports & radio logs.
001a651e4b0919239f09b25ae99d132585b5d382 16-Oct-2015 Sanket Padawe <sanketpadawe@google.com> am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev

* commit '8d6d735fa8cea74f53ba29063b72b856fef69d8e':
Mask IccId which gets printed in bug reports & radio logs.
fb34a123ed17b2ab732815608be47d832e5ada89 16-Oct-2015 Sanket Padawe <sanketpadawe@google.com> Mask IccId which gets printed in bug reports & radio logs.

Bug: 24941148
Change-Id: Ibe397f5d9b0da245e3e64f626937db4792c7f3c2
ndroid/telephony/SubscriptionInfo.java
627bc36eb7827c5a72f5a8ecb085028fb485f72f 15-Oct-2015 Paul Jensen <pauljensen@google.com> Remove dead ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN

I centralized all the provisioning APN logic in Telephony back in
89e0f09 so this intent is now unused.

Bug:24451710
Change-Id: I401ac3e46442c8921545c88fee228873261ebd2b
om/android/internal/telephony/TelephonyIntents.java
0a328c835da6729aa5bdeec112f37d657b56bc5d 15-Oct-2015 Amit Mahajan <amitmahajan@google.com> am 21fd4754: am a41ea5e9: am 8fb8c37c: am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev

* commit '21fd47548be421750cdcaf8e0c357747e927198d':
Adding config to allow/disallow user to add APNs.
8fb8c37ca7c2c57466b07548effa24044e5b3ef6 15-Oct-2015 Amit Mahajan <amitmahajan@google.com> am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev

* commit '7b28e6ec96dfcb20cef1f321ac7539bac439d726':
Adding config to allow/disallow user to add APNs.
7b28e6ec96dfcb20cef1f321ac7539bac439d726 15-Oct-2015 Amit Mahajan <amitmahajan@google.com> Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev
49879ef1100bab0a665d24a4ac176da1844a4c08 15-Oct-2015 Vineeta Srivastava <vsrivastava@google.com> am 3bac5a40: am ec3513e9: am ecf89edf: am 8a586c55: Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev

* commit '3bac5a4043e616f53ce36f8010d3b84b8f716697':
TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar
ecf89edf3616800cdacec000e112e487134adb64 14-Oct-2015 Vineeta Srivastava <vsrivastava@google.com> am 8a586c55: Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev

* commit '8a586c55022ee272bdcf712c7aa4e1652a261c5a':
TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar
b053b3cc603c4284afacc3b19134feed773228ac 13-Oct-2015 Sungmin Choi <sungmin.choi@lge.com> TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar

Bug: 24850563
Change-Id: I36e54e9bde9610f908b1092e11c476dcae76526d
Signed-off-by: haesun.kim <haesun.kim@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
ndroid/telephony/SignalStrength.java
412e7c8b521aeb4463adabc764bb7fbfdebd39c6 05-Oct-2015 Amit Mahajan <amitmahajan@google.com> Adding config to allow/disallow user to add APNs.

Bug: 24519879
Bug: 24681288
Change-Id: I7f9b54e56a5e7f20b156609c560480440241ede8
ndroid/telephony/CarrierConfigManager.java
db3da5c7ece18da82fbfbf7649ae95d24ab973a3 22-Sep-2015 Tyler Gunn <tgunn@google.com> Add instant lettering encoding and length limit carrier config options.

Bug: 22779583
Change-Id: I628f327fa636a590a6053195e59016c821f4f001
ndroid/telephony/CarrierConfigManager.java
47edf95b9d97c446ad98abf5a22d13bf81e4975c 18-Sep-2015 Shishir Agrawal <shishir@google.com> am 3649c699: am 773afa28: am 04feedd4: am 896f738c: Merge "Allow non-persistent manual network selection." into mnc-dr-dev

* commit '3649c699adf7e58411012a7fe6efa26f11de32b3':
Allow non-persistent manual network selection.
04feedd439989363b629a7d596637d55cf92bbc9 18-Sep-2015 Shishir Agrawal <shishir@google.com> am 896f738c: Merge "Allow non-persistent manual network selection." into mnc-dr-dev

* commit '896f738cdddec8cfda82b177e3a60c5a85004229':
Allow non-persistent manual network selection.
896f738cdddec8cfda82b177e3a60c5a85004229 18-Sep-2015 Shishir Agrawal <shishir@google.com> Merge "Allow non-persistent manual network selection." into mnc-dr-dev
99d463879454fe37b9b00858124ed3332684a6de 17-Sep-2015 Wenyi Wang <wenyiw@google.com> Merge "Modified getCallerInfo to handle silent ringtone (comment added)"
750bb8549cf521d3dc602603a3c2ff47857ba300 16-Sep-2015 Wenyi Wang <wenyiw@google.com> Modified getCallerInfo to handle silent ringtone (comment added)

Bug: 12800232
Change-Id: Ib382acdffe39ec063825ae79f80352a5e5636bc4
om/android/internal/telephony/CallerInfo.java
a65c307a4fc32ef061d79a0917d8f9f055e22cbf 16-Sep-2015 Jack Yu <jackyu@google.com> am d51b6bc2: am 08607194: am 717e39df: am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev

* commit 'd51b6bc260c3ff8210c483b34d03df0e451ebdf0':
Added a carrier config key for emergency messages on/off option always showing.
717e39df1c43806f3aa373f52c14f8b282f325b4 16-Sep-2015 Jack Yu <jackyu@google.com> am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev

* commit '870a9e6a783c7755b059d8533ae0232873bff9ba':
Added a carrier config key for emergency messages on/off option always showing.
6af6c346ee0572ec78bf4e44487b28ad92560f9f 15-Sep-2015 Jack Yu <jackyu@google.com> Added a carrier config key for emergency messages on/off option always showing.

Adding a carrier config key that allows carriers to show "Turn on Notifications"
checkbox in Settings->More->Emergency broadcasts setting menu. If this key
exists and is set to true, this checkbox will always show up regardless of
developer options turned on or not.

bug:23886750
Change-Id: I54dec5830653a0e27d7ee652effe572231f1e3bb
ndroid/telephony/CarrierConfigManager.java
85f7f790df5b7887064a010704d9b5d5c2ccd0dc 14-Sep-2015 Chris Manton <cmanton@google.com> am e8c98b77: am f40365f1: am ae0b7ca9: am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev

* commit 'e8c98b77854d39606960b0b6f5b5332c61e9a3d9':
Add capability to ignore carrier entitlement checks
ae0b7ca9ad2e21853af06a68c02da068f748f8bd 14-Sep-2015 Chris Manton <cmanton@google.com> am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev

* commit 'c9180528452d67359618eda4aa2edd39112c83ca':
Add capability to ignore carrier entitlement checks
1ba0fa04ded1df73363a1c25064a3d6f5686478d 01-Sep-2015 Chris Manton <cmanton@google.com> Add capability to ignore carrier entitlement checks

Boolean to check to ignore carrier entitlement check.
API to follow later.

Carrier configuration manager has an option
to override tethering entitlement checks.
Ignore entitlement checks if overridden by
the carrier configuration flag.

bug:23712807

Change-Id: I6c9b3b9994279e592db304debef54809338fe9cf
ndroid/telephony/CarrierConfigManager.java
9c5327a355427ad63c9b8afefaf0fbbd6ccd64e1 11-Sep-2015 Tyler Gunn <tgunn@google.com> am 5a18649b: am 9b5f75f7: am ca7240a0: am 8ed28188: Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev

* commit '5a18649bb14daaf8013e260c293031a8611fb66d':
Add carrier config for characters to escape with backslash.
ca7240a0726a110b9fd302a62ea9baaf3c5d14ac 11-Sep-2015 Tyler Gunn <tgunn@google.com> am 8ed28188: Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev

* commit '8ed28188b95be4f377909ac2abacaef76e004a61':
Add carrier config for characters to escape with backslash.
8ed28188b95be4f377909ac2abacaef76e004a61 11-Sep-2015 Tyler Gunn <tgunn@google.com> Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev
5ef65ea1639749b67c99057e6e69fcf529e24269 11-Sep-2015 Roshan Pius <rpius@google.com> am f4f225ff: am 471d5488: am e3d006b1: am 0a067dc7: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev

* commit 'f4f225ffa890b3fbd8674791d1bbecfcdf55da16':
Add a new carrier config for DTMF tone gap.
e3d006b1abce25b9c0163e0471830ad5d01c3670 11-Sep-2015 Roshan Pius <rpius@google.com> am 0a067dc7: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev

* commit '0a067dc711b19a70ad5980fa360b2df2337a55b1':
Add a new carrier config for DTMF tone gap.
0a067dc711b19a70ad5980fa360b2df2337a55b1 11-Sep-2015 Roshan Pius <rpius@google.com> Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
e25bd01ad662d1a5b19592c98fac0a3035081375 10-Sep-2015 Shishir Agrawal <shishir@google.com> Allow non-persistent manual network selection.

Allow the API to specify if the selection should be persisted across reboots.
This also has the side affect of not notifying the user when signal is lost.

Necessary becasue the API might be used transparent to the user and the
notifications will be bizarre.

Bug: 23971948
Change-Id: Ibb15144fb8a61f63a9c967d875d9ce8c70520ff0
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
14be4cfc8b979367935462b56c2d0312c394c050 10-Sep-2015 Tyler Gunn <tgunn@google.com> Add carrier config for characters to escape with backslash.

Bug: 22779583
Change-Id: I21ab2c9a4f15bcf96c5b978e7cac4638db259087
ndroid/telephony/CarrierConfigManager.java
dc364fe1e846e7f10b8df1d5183d0e7d3bb5d091 10-Sep-2015 Roshan Pius <rpius@google.com> Add a new carrier config for DTMF tone gap.

Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network.
This is the same fix as ag/747865 ported for GSM connections.

BUG: 23064351
Change-Id: I4163323378e380ac187493fa91694721269124b9
ndroid/telephony/CarrierConfigManager.java
bbec1e16f2dcc3376859c5528adeef08b8d62fc5 10-Sep-2015 Amit Mahajan <amitmahajan@google.com> am b4c8e919: am f327fd34: am 5a45dc96: am 0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev

* commit 'b4c8e9191f4dd3ea641986513cfeefa2348133da':
Add carrier config variable to hide preferred network type
5a45dc960b42eae66661665ff9a6bcb7e4a02c16 10-Sep-2015 Amit Mahajan <amitmahajan@google.com> am 0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev

* commit '0018323c07d119fde7260d66f60dd9987c7b74ea':
Add carrier config variable to hide preferred network type
c03a1da5a5a55ecbbe5c894e2debb053d6047aee 09-Sep-2015 Sungmin Choi <sungmin.choi@lge.com> Add carrier config variable to hide preferred network type

Bug: 23862319
Change-Id: I99403f358f0b53f366083edafc3762f5679b0b45
ndroid/telephony/CarrierConfigManager.java
f83e94d5205e614cddb354676413773b265cef17 09-Sep-2015 Vineeta Srivastava <vsrivastava@google.com> am 71474c66: am 63d94e4c: am 95198ee9: am ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev

* commit '71474c66bf2b14c1421699937011ef38501dad76':
Add carrier config variable to hide ims apn
95198ee9ce374582e71b5a29e740e97b7b7b198b 09-Sep-2015 Vineeta Srivastava <vsrivastava@google.com> am ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev

* commit 'ebd1465885af2a1de5a885dac791ee6184f85d7f':
Add carrier config variable to hide ims apn
ebd1465885af2a1de5a885dac791ee6184f85d7f 09-Sep-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
a17ae4d9392f9914ab0c523363f3005f90305b4e 09-Sep-2015 Tyler Gunn <tgunn@google.com> resolved conflicts for ce88b828 to master

Change-Id: Ibf9f4bc876f32c8f5de86ee8338dcff3a5276cfb
6544d5a2a7089b6e76c0548cd9f63f9400ce1082 09-Sep-2015 Tyler Gunn <tgunn@google.com> am dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev

* commit 'dee1c5c948a5e1b98577a3301882aac04154b5be':
Add carrier config for specifying invalid characters.
dee1c5c948a5e1b98577a3301882aac04154b5be 09-Sep-2015 Tyler Gunn <tgunn@google.com> Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
e9d3c11ccd3b47d8da93f135c500b2bed30728e9 01-Sep-2015 Sungmin Choi <sungmin.choi@lge.com> Add carrier config variable to hide ims apn

Bug: 23770219
Change-Id: I691d2594384196852d7128a9b4969ba9a861205c
ndroid/telephony/CarrierConfigManager.java
eb5fcb900c2d9552e62de610c905709b344a31d3 04-Sep-2015 Tyler Gunn <tgunn@google.com> Add carrier config for specifying invalid characters.

Some carriers have the need to strip out certain invalid characters in
instant lettering (e.g. call subject) messages.
This carrier config is added for that purpose.

Bug: 22779583
Change-Id: I165dc125e6d40a0a85442ff138a77d286eb83a4c
ndroid/telephony/CarrierConfigManager.java
77d1b6f2fa321c0f02adc48a16daeb6f7412bcf0 04-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am a80d3621: am 578151c6: am fb611846: am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev

* commit 'a80d36218a5cb3ef876d73a2e5294a1279e456e4':
IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
fb611846f6ca62ea248eac0b35a8d6d1fe5f5116 04-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev

* commit '566886f7973b86196174e925f16d26975c16a09b':
IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL
566886f7973b86196174e925f16d26975c16a09b 04-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev
da03796dbb4213d1412c3bfab6d628ce0e8a1efd 04-Sep-2015 Amit Mahajan <amitmahajan@google.com> am 453ed7dd: am ff751bed: am 2f142ab0: am 8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev

* commit '453ed7ddae6fda8ebb5931011f821ce1982a6a4b':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
2f142ab0779c9e36c6f733d7e2e0be083f7172ac 03-Sep-2015 Amit Mahajan <amitmahajan@google.com> am 8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev

* commit '8a670f1da434c4720b08dbb62c635316e593b9b3':
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
8a670f1da434c4720b08dbb62c635316e593b9b3 03-Sep-2015 Amit Mahajan <amitmahajan@google.com> Merge changes from topic 'TDSCDMA support' into mnc-dr-dev

* changes:
Add TDSCDMA family
Telephony: Add TD-SCDMA SignalStrength
a06092db5bee3ac7691a41a7edd8bd955a18498d 03-Sep-2015 Roshan Pius <rpius@google.com> am 4b261660: am c4809bcf: am 8750f04a: am a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev

* commit '4b26166065afa0d4a1ace45a7c374bc84cece3e9':
Reformat only KR numbers with leading "+82".
0f1ddb586b6a1ee46596ed75be901c986d5cc2c7 02-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL

Two arrays are passed from caller (in this case IMS service
implementation) to listener (in this case client of ImsManager).
Listener is not modifying arrays and caller is not expecting
data to be returned back.

Bug: 23749309
Change-Id: I6231cfd16852acfca88ee43e8538b2440058d774
om/android/ims/internal/IImsRegistrationListener.aidl
8750f04a73568b2002cdd50d550822ffb53d5362 02-Sep-2015 Roshan Pius <rpius@google.com> am a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev

* commit 'a14e900181aa03daa760e3ba6eb1e7e00d438305':
Reformat only KR numbers with leading "+82".
a14e900181aa03daa760e3ba6eb1e7e00d438305 02-Sep-2015 Roshan Pius <rpius@google.com> Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev
a9acb4c2b55fe1bf4f5eeb96971e46697eaeffe9 31-Aug-2015 Roshan Pius <rpius@google.com> Reformat only KR numbers with leading "+82".

Looks like the phonenumber util can figure out the country code of a
phone number to format from the localization data even if it is not
explicitly present in the phone number string. So, adding an explicit
check to make sure that the country code(+82) was fetched from the
original number string which was the intention of the fix for
b/22862845.

BUG: 23661668
Change-Id: I26ba03d759e0ec35a195ba51bf60d09eff8de090
ndroid/telephony/PhoneNumberUtils.java
b0cf4a6517c5cbef8ac5a9b96e254905cfa32183 01-Sep-2015 Tyler Gunn <tgunn@google.com> am fa6f549a: am 603cfdce: am 6a9baca0: am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev

* commit 'fa6f549adca29b7452b7dd3cd9eb1c429ad2d7dc':
Rename carrier config constant.
61f08c9b37961e2363a8e84c7135417bfbc0d891 01-Sep-2015 Tyler Gunn <tgunn@google.com> am 15d5283c: am b63db9fd: am 3bd58233: am d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev

* commit '15d5283ce8dfbac5c74c5039aab8c6fddc38df5f':
Add carrier config for allowing non-emerg calls in ECM mode.
6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2 31-Aug-2015 Tyler Gunn <tgunn@google.com> am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev

* commit '7878eee8a9c20752e038f563b98b6b42c372cd0f':
Rename carrier config constant.
6ef57c3366a3b85e92cf796828aa9832202c8e39 31-Aug-2015 Tyler Gunn <tgunn@google.com> Rename carrier config constant.

Bug: 23063217
Change-Id: I0050f0009a7681df1b04edbbd9331bc2918464a2
ndroid/telephony/CarrierConfigManager.java
3bd58233ab3ec8509a3f8922344ae30a330f5159 31-Aug-2015 Tyler Gunn <tgunn@google.com> am d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev

* commit 'd833cb54537b81d49b6563afb7583d4b36e19c51':
Add carrier config for allowing non-emerg calls in ECM mode.
387ce2fb811ca8c7afa7c1cb6e8bf791cb2fe85e 28-Aug-2015 Tyler Gunn <tgunn@google.com> Add carrier config for allowing non-emerg calls in ECM mode.

Default value is TRUE for all carriers, meaning that non-emergency calls
are allowed even when the phone is in emergency callback mode.

Bug: 23063217
Change-Id: I4a227ce64a1e594a055560f42c7611c8eccdae0f
ndroid/telephony/CarrierConfigManager.java
dd8efa820b4ca75279d1c31afdd1aab0bbfbb3af 15-Jul-2015 Sungmin Choi <sungmin.choi@lge.com> Add TDSCDMA family

Bug: 22639018
Change-Id: I7a65337838ef3dfa24ce8b59564ec831c5cb5094
ndroid/telephony/RadioAccessFamily.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/RILConstants.java
369808638bcdf90a2e4723cbd728aa29e2f4a051 26-Aug-2015 Sungmin Choi <sungmin.choi@lge.com> Telephony: Add TD-SCDMA SignalStrength

Bug: 22639018
Change-Id: I0381e18fb65807c88290df1f2333b2636f0b0c18
ndroid/telephony/ServiceState.java
ndroid/telephony/SignalStrength.java
e9acfd59b818a138f189336181ff721aceadbfb1 30-Aug-2015 Pavel Zhamaitsiak <pavelz@google.com> am 07d04774: am 59f3c342: am 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev

* commit '07d04774dac30bf11523de1f4bea710ce276c207':
Support uneditable enhanced 4g lte mode config
6611cff402f0edeff85e7a9e6fedc6eeb8f8b1f1 30-Aug-2015 Pavel Zhamaitsiak <pavelz@google.com> am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev

* commit 'd9efca994f99523288986f29128d696440ee4150':
Support uneditable enhanced 4g lte mode config
8d2826bee2355fcfd4231f15ec9ab72daa1e398a 26-Aug-2015 Sungmin Choi <sungmin.choi@lge.com> Support uneditable enhanced 4g lte mode config

Bug: 23539759
Change-Id: I069d994eaef2f57c3d01ff2f36abcd274da431a5
ndroid/telephony/CarrierConfigManager.java
65c9c0480328d80731b598a8466362fb3e385cc3 27-Aug-2015 Roshan Pius <rpius@google.com> am c72811bb: am e0f69aab: am 9df996ed: am 6ad12315: Merge "Reformat local Korean numbers in national format." into mnc-dr-dev

* commit 'c72811bbb2c658535c20555380e2408a6f35ccf4':
Reformat local Korean numbers in national format.
9df996ed4151354da07c6057c621b54117190dee 26-Aug-2015 Roshan Pius <rpius@google.com> am 6ad12315: Merge "Reformat local Korean numbers in national format." into mnc-dr-dev

* commit '6ad123156e762a62616de63617ee11afb3cde334':
Reformat local Korean numbers in national format.
6ad123156e762a62616de63617ee11afb3cde334 26-Aug-2015 Roshan Pius <rpius@google.com> Merge "Reformat local Korean numbers in national format." into mnc-dr-dev
672b2cc05c26aa2a8fdb3def896367684b1b9920 25-Aug-2015 Roshan Pius <rpius@google.com> Reformat local Korean numbers in national format.

Korean carriers don't want the country codes displayed for local calls.
However the network returns the entire phone number including the
country code for Volte calls. According to the Koean phone numbering
scheme (https://en.wikipedia.org/wiki/Telephone_numbers_in_South_Korea),
we need to replace the country code +82 with a 0 prepended to the
carrier code to format it as a national number.

BUG: 22862845
Change-Id: Ifbb9eb8d5379608b4ea9d95ae7744779340b188e
ndroid/telephony/PhoneNumberUtils.java
2772d3c08a05db2214901a12976c3cb2c2ccc806 26-Aug-2015 Etan Cohen <etancohen@google.com> Fix build: wrong API made public

Change-Id: I03a9151ef648bb999060bd94900691fde356058e
ndroid/telephony/CarrierConfigManager.java
831e9f982d46617ac0ce24d2b171b90bff725ca3 25-Aug-2015 Etan Cohen <etancohen@google.com> Merge "Convert useImsAlwaysForEmergencyCall to carrier configuration."
6fe9d51f7abc5387b23617a93c4c069ca8759e99 20-Aug-2015 Tyler Gunn <tgunn@google.com> resolved conflicts for merge of bbd854e2 to master

Change-Id: I87a83d304c3d01aa8fafc581d114bb7801f594c3
51e8df2ee64ba605e6695279a8aab987b2a56903 20-Aug-2015 Tyler Gunn <tgunn@google.com> am a001f7ae: Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev

* commit 'a001f7ae7fde0418a6f8e455f88a2d7dc3c392ce':
Add carrier config variable to hide merge call button
a52c5e219374f9f52abccc3bb10d65bd26996209 14-Aug-2015 Roshan Pius <rpius@google.com> Add a new carrier config for DTMF tone gap in CDMA.

Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network. Setting it to 100ms by default.
This is based on a similar set of changes for IMS calls: ag/747865.

BUG: 19118840
Change-Id: Ifb64fe406509fe7c401ad1c4b4e906d6643e327b
ndroid/telephony/CarrierConfigManager.java
cd811f0cf012e1e75cae00a487bfd4e1b08deeef 18-Aug-2015 Etan Cohen <etancohen@google.com> Convert useImsAlwaysForEmergencyCall to carrier configuration.

Change-Id: Id29ab106f01722ecd1f48590c32f899becd06d5f
ndroid/telephony/CarrierConfigManager.java
8c651ae21ddc5b06c0ca18c2e7071e73d4e8ae65 15-Aug-2015 Sungmin Choi <sungmin.choi@lge.com> Add carrier config variable to hide merge call button

Bug: 22864941
Change-Id: Ief5f8078e53a46cc9bf7627729dba7e28270a231
ndroid/telephony/CarrierConfigManager.java
289ecbbfafbb73ccf00e14ea8e2f6584406b50fe 13-Aug-2015 Roshan Pius <rpius@google.com> am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev

* commit '737aed41ca9d8bad425ed8223fa4e4c84c7b102c':
Add a new carrier config for DTMF tone gap.
9f81ce727c0e8f650f451cfe217c8dc1a7a45132 12-Aug-2015 Roshan Pius <rpius@google.com> Add a new carrier config for DTMF tone gap.

Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network.

BUG: 23064351
Change-Id: I3a0e20efecd62f533e796a40097f181d4c20d614
ndroid/telephony/CarrierConfigManager.java
ebd0b26bf32910ee6285bdf09e4252127480941a 12-Aug-2015 Chris Manton <cmanton@google.com> am 5ace41f5: am 19aa341a: Merge "Save data registration roaming state" into mnc-dev

* commit '5ace41f50ba202e34012863012d7cfc910acc7b7':
Save data registration roaming state
5ace41f50ba202e34012863012d7cfc910acc7b7 12-Aug-2015 Chris Manton <cmanton@google.com> am 19aa341a: Merge "Save data registration roaming state" into mnc-dev

* commit '19aa341a3548c454c12378d7c4d92cc5074685a8':
Save data registration roaming state
1428f43fa742f59835ffabf8abe912e9d8bf8f19 10-Aug-2015 Chris Manton <cmanton@google.com> Save data registration roaming state

Carrier configuration may override the roaming state
but the roaming state may be required for specifying
proper APNs upon data call setup. This change stores
the unmodified roaming state.

bug: 22990977
Change-Id: I5ebe04f60709bc691e9c79be193f1790a7148818
ndroid/telephony/ServiceState.java
2a532f2f729a935b651d171ee05800d1c909fe68 11-Aug-2015 Bryce Lee <brycelee@google.com> Add actions and extras for custom voicemail notification handling.

Change-Id: I83c51a79cc9ac2e1772351ad078fc0af1cd0ae65
ndroid/telephony/TelephonyManager.java
ffb72473c67c13c75421f5df979404407ff01bb4 05-Aug-2015 Tyler Gunn <tgunn@google.com> Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev
a29e05012db02c4ed87eb8c31c2138e966f742b5 05-Aug-2015 Makoto Onuki <omakoto@google.com> am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev

* commit '86ee3a57e428b14023bc0bdbd6cb8f8bc206be74':
READ_SMS allows getLine1Number() [1/3]
ad4c63b53d1e2b9b632833fb989a1aa444588de3 04-Aug-2015 Makoto Onuki <omakoto@google.com> READ_SMS allows getLine1Number() [1/3]

Bug 22862050

Change-Id: I45dba41423dd3313984c93a6e674f37410fb3050
ndroid/telephony/TelephonyManager.java
ac2aefc37b6b7dcc2c90d0b0fa25c24728006f79 01-Aug-2015 Tyler Gunn <tgunn@google.com> Remove EXTRA_CALL_HISTORY_INFO.

- Remove EXTRA_CALL_HISTORY_INFO (replaced by EXTRA_LAST FORWARDED_NUMBER).
- Added carrier config key for instant lettering.

Bug: 22684864
Change-Id: Ic46fdccf5b665417f15e612a2cc4d7f1fb67ccca
ndroid/telephony/CarrierConfigManager.java
f520f022db3e78eaefade13352e01c7f398a81fe 30-Jul-2015 Ji Yang <yangji@google.com> am 499f084d: Merge "Add API to let carrier app send SMS without auto perisisting." into mnc-dev

* commit '499f084d9e7bb3323ed447b16f548bad9b886aa7':
Add API to let carrier app send SMS without auto perisisting.
499f084d9e7bb3323ed447b16f548bad9b886aa7 30-Jul-2015 Ji Yang <yangji@google.com> Merge "Add API to let carrier app send SMS without auto perisisting." into mnc-dev
216813c9e1edda0bc70a97cd6ec7e26a28d640b0 23-Jul-2015 Ji Yang <yangji@google.com> Add API to let carrier app send SMS without auto perisisting.

Bug: 22773702
Change-Id: I976a8268ce95fe9fc5bb046ce744a1cddefc8eeb
om/android/internal/telephony/ISms.aidl
8ac962a778f64bdd07e938d4e993f48615d3bc9e 23-Jul-2015 Jack Yu <jackyu@google.com> am e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev

* commit 'e21722a3daf0562bb7711d3dd38657b5a348ce4e':
Allow carriers to force disable ETWS/CMAS test messages.
a4f2da398837c5eaec5dec13c29e13af3f7185e3 22-Jul-2015 Jack Yu <jackyu@google.com> Allow carriers to force disable ETWS/CMAS test messages.

This feature can be enabled in carrier config XML. When enabled, the user will not see
ETWS/CMAS enable/disable option in emergency broadcast preference menu.

bug: 22396039
Change-Id: I6ad6fa39852d3b13faeef968a1963b3e0a4a6e61
ndroid/telephony/CarrierConfigManager.java
c83e0571e5c25c402b9fdb8c2ecc3172ee4f09ba 16-Jul-2015 Sanket Padawe <sanketpadawe@google.com> am ea975b12: Merge "Add new API for handling DB query per subId." into mnc-dev

* commit 'ea975b122fee3ac0fe766d2b58bb420b82e5dd95':
Add new API for handling DB query per subId.
ea975b122fee3ac0fe766d2b58bb420b82e5dd95 16-Jul-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Add new API for handling DB query per subId." into mnc-dev
06179c75c84476e96b99004fb677ef9d50dbcdfc 16-Jul-2015 Roshan Pius <rpius@google.com> am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev

* commit '4e9c63cbe1712f750d5eaaa044e957c7f7696bf8':
Handle exceptions when accessing Content providers.
dc49309cefed9519611b183ae2c616e6f0110738 14-Jul-2015 Sanket Padawe <sanketpadawe@google.com> Add new API for handling DB query per subId.

+ Add new API for handling DB query and Resources object per subscription.
+ Add constants for column name of DB storing subscription info.
+ Add a common settings file for multi-tab

Bug: 22360525
Change-Id: Icf6d35bdbe31618e2a95df450aee12b99d3aea7a
ndroid/telephony/SubscriptionManager.java
om/android/internal/telephony/ISub.aidl
93018a4d983f0c7063fd0b243436364cd191e0a9 13-Jul-2015 Roshan Pius <rpius@google.com> Handle exceptions when accessing Content providers.

BUG: 21638129
Change-Id: I88f7dcf67e395f49136a1f434fbd9c75e15cddad
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/CallerInfo.java
2ce65bddb50ecd376cc4eafdc9853b6bf50ac970 14-Jul-2015 Roshan Pius <rpius@google.com> am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev

* commit 'cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093':
Catch & log security exception in telephonymanager
7e9cb0d094043bd8bdb7544c2356abd5479b7aee 09-Jul-2015 Roshan Pius <rpius@google.com> Catch & log security exception in telephonymanager

BUG: 22225068
Change-Id: I9b0053cf1041c81f409ace556b810ef79de88599
ndroid/telephony/TelephonyManager.java
66f59dc1bde15be207d49fafb97db372cb01d977 10-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev

* commit '1570b6b3c7d1d41a52555312d161d0afe4b81df3':
Enable EMERGENCY mobile connections.
d30a3d6693da16cf2daef05847ddaa4ae7453e83 10-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 1ebcb6f8: Merge "Fix permissions." into mnc-dev

* commit '1ebcb6f8b2f989c84311555f4961506dba959d37':
Fix permissions.
1570b6b3c7d1d41a52555312d161d0afe4b81df3 10-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Enable EMERGENCY mobile connections." into mnc-dev
9bc8299ca0b2e8396b9f2f027c440cda164ba75e 10-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Fix permissions.

Legacy API should not need new permissions.
Also found some more hidden/system that should have permissions.

bug:22379438
bug:19257083
Change-Id: I24be0a90dffcffe03d25982a9b02eedcf03fbd59
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
4bd4389616fae01439a44920286a70806526d8c0 09-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Enable EMERGENCY mobile connections.

Hooks the ConnectivityManager.TYPE_MOBILE_EMERGENCY,
PhoneConstants.APN_TYPE_EMERGENCY, and NetworkCapabilities.NET_CAPABILITY_EIMS
together so carrier apps can request connections to this APN.

bug:21785357
Change-Id: Id92a5e28d19407cc7a8f8b5478b23457f2f7f89d
om/android/internal/telephony/PhoneConstants.java
031b9477663e0974fbc765795ccd7694a0430b5a 09-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev

* commit '348988c5704a5a6eb6aec093e295c2d9f00ee33c':
Fix permissions on TelephonyManager
348988c5704a5a6eb6aec093e295c2d9f00ee33c 09-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix permissions on TelephonyManager" into mnc-dev
8e7b195474788c4624de7565b7c6514f8119467f 08-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 8b0f3873: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev

* commit '8b0f3873a04103f6886fdc2fb79b9a3963567720':
Add/Fix Permission check on SubscriptionManager.
8b0f3873a04103f6886fdc2fb79b9a3963567720 08-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev
6e4a98f8707f759fa9f47a458683a3627e42b0b6 07-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Fix permissions on TelephonyManager

bug:19257083
Change-Id: I063d36bbe7ece9d83aac7c490d1b44e55da2c286
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
766f3108e090d94b1a20a21529ac72a8a3e93845 07-Jul-2015 Casey Ho <caseyho@google.com> am becddea6: Merge "Unhide signal strength constants used by getLevel." into mnc-dev

* commit 'becddea63e2c4b414e5eac2841d3516c4e89bb24':
Unhide signal strength constants used by getLevel.
278b8f950948435fb08db0a12313e2ea704fa637 01-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Add/Fix Permission check on SubscriptionManager.

Things that are modifing should check the modify permission.

bug: 19259681
Change-Id: I27c7501d6777deec902b9cd47e194eadef391869
ndroid/telephony/SubscriptionManager.java
om/android/internal/telephony/ISub.aidl
becddea63e2c4b414e5eac2841d3516c4e89bb24 06-Jul-2015 Casey Ho <caseyho@google.com> Merge "Unhide signal strength constants used by getLevel." into mnc-dev
ddf570e8226bd21448b44b3327d4bcb2608f4d00 31-May-2015 Shriram Ganesh <sganesh@codeaurora.org> MWI,phantom call,Suppl services, error codes

1. IMS MWI Feature
- Add new API to update waiting
voice message count, for UI
propagation based on RFC 3842

2. phantom call support

Supplementary services

3. IMS : Incoming Call Barring
- Modified existing API to support
request like registration,activation,
deactivation,erasure,interogation.

4.Unsol supplementary service notification
- send unsol supplementary notification to UI
- add call history info

Miscellaneous
5. Ims: Originate conference call in DIALING state

6. IMS: Addition of Extras to ImsCallProfile
- Add EXTRA string definitions to ImsCallProfile

7. IMS: Definition of error code
- answered elsewhere
- FDN call failure

8.
- Propagate IMS supplementary services to telephony framework
- Introduce call forwarding history info.

Bug: 21725750
Squash of 2 earlier CLs:
Change-Id: I52a64e9a5df3479189f62921a01655a50fb386fc
Change-Id: Idc3a433785e84a3d683cbcfc7fb90f0b89dced12

Change-Id: I428ce3c6a043e43b86dea41622e0a828d8b45e53
om/android/ims/ImsCallProfile.java
om/android/ims/ImsReasonInfo.java
om/android/ims/ImsSsInfo.java
om/android/ims/ImsSuppServiceNotification.aidl
om/android/ims/ImsSuppServiceNotification.java
om/android/ims/internal/IImsCallSessionListener.aidl
om/android/ims/internal/IImsRegistrationListener.aidl
om/android/ims/internal/IImsUt.aidl
b304fc0aafe067e422ce219ba5edb4bc7a68924c 29-May-2015 Etan Cohen <etancohen@google.com> Rename VoLTE/WFC enable API to available - add VT available API.

Renamed API to use consistent semantics: available refers to the current
state of the service rather then whether feature is enabled by device/carrier/
user.

Added VT API to match VoLTE/WFC.

Change-Id: Ifb31f123db77e731e75a982b8594168f59a289e7
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
4b2698ba5ea9bb0f3806abecf65899b166912509 02-Jul-2015 Svet Ganov <svetoslavganov@google.com> Merge "Workaround legacy TelephonyManager.getDefault() with no context" into mnc-dev
4e792cbe7530b78b9f83907b19e45bfefc363423 01-Jul-2015 Svet Ganov <svetoslavganov@google.com> Workaround legacy TelephonyManager.getDefault() with no context

bug:22201450

Change-Id: If591bd90f3e4081c411dfa6415853c110a62a7fb
ndroid/telephony/TelephonyManager.java
a10277e3e4c01e08f53b98eac3c98bf94482b106 01-Jul-2015 Makoto Onuki <omakoto@google.com> Merge "Allow default SMS app to get self phone number" into mnc-dev
6ce5d68a58f10a3eb0caa64a1c37b09ba012e6b6 01-Jul-2015 Jay Shrauner <shrauner@google.com> Catch SecurityExceptions

Bug:22208649
Change-Id: I608be28095a2d7ee0e3dd739ed899eaae55e700e
ndroid/telephony/TelephonyManager.java
40dff5b47f52ffb648f51c395ae67193e3121a2c 30-Jun-2015 Yorke Lee <yorkelee@google.com> Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev
1249bdbe90102172f6e678993516203bb3a493bf 30-Jun-2015 Yorke Lee <yorkelee@google.com> Fix TelecomManager.isVoicemailNumber

Provide an overload of PhoneNumberUtil.isVoiceMailNumber that
takes a context to prevent an NPE.

This does not fix PhoneNumberUtil.isVoicemailNumber(String number),
that will require a follow up CL.

Bug: 22184528
Change-Id: I300b70948e5ff7230989bb887ad17e222c61685d
ndroid/telephony/PhoneNumberUtils.java
ef0cde848bc73fbbe7328863e4e3df352a952dfc 05-Mar-2015 Shriram Ganesh <sganesh@codeaurora.org> IMS: Map pay phone and unknown presentation with OIR.

Current code does not map pay phone and unknown
presentation with OIR.
Add code to map pay phone and unknown presentation
with OIR correctly.

Bug: 22123243
Change-Id: I7610db8547a0f0f5529c2627879047dd9a45cf9f
om/android/ims/ImsCallProfile.java
a26a019c6c8d7d39b1d3beefb3f2f55845175ea5 29-Jun-2015 Makoto Onuki <omakoto@google.com> Allow default SMS app to get self phone number

Apps with WRITE_SMS app op can now call TelephonyManager.getLine1Number().
(Note we no longer have the WRITE_SMS permission.)

Bug 22031904

Change-Id: Ic843b6d7674879951a64e3b3a92bca09c3b5c65b
ndroid/telephony/TelephonyManager.java
8d8c51f19e7fe50ebd0ead0ce0d1412aefa1cd2e 12-Mar-2015 Shriram Ganesh <sganesh@codeaurora.org> IMS: Initialize audio quality with NONE instead of AMR_WB.

Initial value of audio quality needs to be set to NONE to avoid
wrong quality value during MO call setup.

Bug: 22122298
Change-Id: I06173abe38c9be1e9499c8c0958f985c45709f1c
om/android/ims/ImsStreamMediaProfile.java
7a5cc8b3de3f29ce4537f278d833230bde4380c1 27-Jun-2015 Anil Muthineni <anilmuthineni@google.com> am 627bd99e: Merge "Write size of operators in writeToParcel()" into mnc-dev

* commit '627bd99ef617cfee67d44d186fa5d72380a6a4cf':
Write size of operators in writeToParcel()
627bd99ef617cfee67d44d186fa5d72380a6a4cf 27-Jun-2015 Anil Muthineni <anilmuthineni@google.com> Merge "Write size of operators in writeToParcel()" into mnc-dev
554beb58dbfb0eccf4304fd5c58b0e2a9331bf27 27-Jun-2015 Anil Muthineni <anilmuthineni@google.com> Write size of operators in writeToParcel()

- So that the operators are read correctly while reading
from parcel.

Bug: 21563489
Change-Id: Icb5571a261144810f075855372791d4291255eec
om/android/internal/telephony/CellNetworkScanResult.java
1bab7bb35d548e092fcec31351c34a08131ab7d7 27-Jun-2015 Nathan Harold <nharold@google.com> am aaf280b6: Merge "Deprecate TelephonyManager.getNeighboringCellInfo()" into mnc-dev

* commit 'aaf280b6b17ceaabc0b54fbc8479c14dfb4f6e64':
Deprecate TelephonyManager.getNeighboringCellInfo()
748e9d59792184e6a2122c78d51ab7ea8fa8d559 25-Jun-2015 Nathan Harold <nharold@google.com> Deprecate TelephonyManager.getNeighboringCellInfo()

bug: 22121990
Change-Id: Id8f9d080fdd1e2993b414a5304424238396b6fd4
ndroid/telephony/TelephonyManager.java
5b426a04ee5dee7f397f647f66d73975a6ebc308 25-Jun-2015 Chris Manton <cmanton@google.com> am 60061c26: Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-dev

* commit '60061c26a24f654f5a6ac599d85c3bea14ee9aff':
Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL
63f25b6e3f8b3973efeb2151f7dd71c94dc1f461 25-Jun-2015 Chris Manton <cmanton@google.com> Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL

Bug: 20828356

Change-Id: I30a286e7af884a11c51363916dd6a4dc965d399a
ndroid/telephony/CarrierConfigManager.java
a36a1ba58b8bf3ce1e9ab6d76a83a7210fea77e4 25-Jun-2015 Junda Liu <junda@google.com> am e5c7ca7d: Rename and add carrier config keys for volte and ims.

* commit 'e5c7ca7d792f0ecb8219c217d756080d1d4c3933':
Rename and add carrier config keys for volte and ims.
e5c7ca7d792f0ecb8219c217d756080d1d4c3933 24-Jun-2015 Junda Liu <junda@google.com> Rename and add carrier config keys for volte and ims.

Bug: b/21878236
Change-Id: I2bc36664969fce9e773ce8a53d56b92936d96971
ndroid/telephony/CarrierConfigManager.java
86d105ee09ad1f8e68d4d694bbd5c48184a7086f 24-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "IMS: Supplementary services" into mnc-vt-dev
6901c3b6d710c44379e3249e49432a7a542f3aab 24-Jun-2015 Tyler Gunn <tgunn@google.com> IMS: Supplementary services

- Propagate IMS supplementary services to telephony framework
- Introduce call forwarding history info.

Bug: 21725750
Change-Id: Idc3a433785e84a3d683cbcfc7fb90f0b89dced12
om/android/ims/ImsSuppServiceNotification.aidl
om/android/ims/ImsSuppServiceNotification.java
e9d1d5afe565d6628e96897a632e83803ebe2533 24-Jun-2015 Nancy Chen <nancychen@google.com> am 8e0aab7d: Merge "Add public action to open voicemail settings." into mnc-dev

* commit '8e0aab7dd50b408ced8fdfda05f361be716ce128':
Add public action to open voicemail settings.
a51765ed6d495dec81009371a7c13e2c9efd5609 23-Jun-2015 Nancy Chen <nancychen@google.com> Add public action to open voicemail settings.

Need public api constant to create an intent to open voicemail settings.
This is used for visual voicemail.

Bug: 21086059
Change-Id: I1a11712ead2941d5322cde6be6c3f41652bc36d8
ndroid/telephony/TelephonyManager.java
e92393ab9ae1098fb9627c217cceb5b38c847a49 23-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> am 0c5c8570: Merge "Return reasonable phone type if no sim inserted." into mnc-dev

* commit '0c5c8570dc8fe823f2faf69d653e1b441b0fcddc':
Return reasonable phone type if no sim inserted.
d314de0aa495e7a5e5d8a8754f2bdb1d09d45a21 23-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Return reasonable phone type if no sim inserted.

With no sim, there's no subscription, no default phone, etc.
If we're asked for phone type for an invalid sub, just use the
first phone.

bug: 20760370
Change-Id: Ide7b0679e7253e1f1ce563a68fbbec1ff8c24daf
ndroid/telephony/TelephonyManager.java
8e27050f0ebb27b920dfc918635130865dba0eac 21-Apr-2015 Casey Ho <caseyho@google.com> Unhide signal strength constants used by getLevel.

Bug: 22008966
Change-Id: I0c1dc993cbf33a7109d8a4e329b05a897df6ea1b
ndroid/telephony/CellSignalStrength.java
87318900a76c72972784fe851477172df031b946 22-Jun-2015 Shishir Agrawal <shishir@google.com> am c242d9d2: Merge "Adding hidden TM calls to scan/select cell networks." into mnc-dev

* commit 'c242d9d2aeececeda4c980dfa119b3414d818424':
Adding hidden TM calls to scan/select cell networks.
c242d9d2aeececeda4c980dfa119b3414d818424 22-Jun-2015 Shishir Agrawal <shishir@google.com> Merge "Adding hidden TM calls to scan/select cell networks." into mnc-dev
477d1d89c04a100dbb500d887d855673b49a7199 20-Jun-2015 Junda Liu <junda@google.com> am 8f87c824: Merge "Fix spelling of a config variable." into mnc-dev

* commit '8f87c8249b33feff0ac414576b90e5c70b5661be':
Fix spelling of a config variable.
8f87c8249b33feff0ac414576b90e5c70b5661be 20-Jun-2015 Junda Liu <junda@google.com> Merge "Fix spelling of a config variable." into mnc-dev
1826c234bcdc115c821da2991443e54f95e52888 20-Jun-2015 Jonathan Basseri <misterikkit@google.com> Fix spelling of a config variable.

This is to be consistent with the style/format in CarrierConfigManager.

Fortunately, nothing in packages/apps/CarrierConfig needs to be updated,
since this variable doesn't have any overrides.

Change-Id: I8910abd28d9c0aae68a04dcfcfb2f3d0c0466ca9
ndroid/telephony/CarrierConfigManager.java
d4f2bcdab5a43e6439babfd5eefeaff908b73870 19-Jun-2015 Shishir Agrawal <shishir@google.com> Adding hidden TM calls to scan/select cell networks.

TM.getCellNetworkScanResults: Performs a radio scan for networks and returns
a list of OperatorInfo.

Tm.setNetworkSelectionModeManual: Manually selects a network and returns the
status of the selection.

Bug: 21563489
Change-Id: If64f30d6f1ed373c1d90433688389307f3dfee8c
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/CellNetworkScanResult.aidl
om/android/internal/telephony/CellNetworkScanResult.java
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/OperatorInfo.java
60f04b28b519fb7905c831916dfbf7169db51bb0 19-Jun-2015 Junda Liu <junda@google.com> am 5385f5a0: Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev

* commit '5385f5a0b8b22a06a3befd5b660676dc04336a5f':
Add comments to carrierconfigmanager for required permission.
c74b2cea5b666db373b85e3dc7f80ea01e106aad 19-Jun-2015 Jonathan Basseri <misterikkit@google.com> am 48fb9d15: Merge "Migrate \'csp_enabled\' to CarrierConfigManager." into mnc-dev

* commit '48fb9d15ecaceedd5477b7b780f22b7663ca103f':
Migrate 'csp_enabled' to CarrierConfigManager.
5385f5a0b8b22a06a3befd5b660676dc04336a5f 19-Jun-2015 Junda Liu <junda@google.com> Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev
fbd740c3ca5a55bc18a2a73e4b4255fdb47c506f 19-Jun-2015 Junda Liu <junda@google.com> Add comments to carrierconfigmanager for required permission.

Bug: b/20826627
Change-Id: Ia8a42f4792429e56108a423f27c3f843f6b0f958
ndroid/telephony/CarrierConfigManager.java
019523a8a44dcab0bac7cb4fa3c22ada7cca6804 19-Jun-2015 Jonathan Basseri <misterikkit@google.com> Migrate 'csp_enabled' to CarrierConfigManager.

This variable controls whether SIM cards are allowed to disable manual
carrier selection, so it makes more sense for it to be managed as
carrier config.

Currently the variable is only used in device overlays
for specific networks, but we are dropping the device-overlay so that
this simply applies to those networks.

Change-Id: Ia6ba6a89c94c0916c19bdf792e48a4feac87eded
ndroid/telephony/CarrierConfigManager.java
b88adc815e199802b0d6d1825eeb305da49010a2 19-Jun-2015 Jonathan Basseri <misterikkit@google.com> am cb8bb390: Merge "Add VVM carrier config to public API." into mnc-dev

* commit 'cb8bb3900178c126b9f101e84edd07bb6b489637':
Add VVM carrier config to public API.
cb8bb3900178c126b9f101e84edd07bb6b489637 19-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Add VVM carrier config to public API." into mnc-dev
af4e05a2eee41eedb41cae80acff869fcec074ab 19-Jun-2015 Fyodor Kupolov <fkupolov@google.com> am 7e603d69: Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev

* commit '7e603d69947566bd17ac76820fde59ac9fd11c0c':
OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds
7e603d69947566bd17ac76820fde59ac9fd11c0c 19-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev
6c1dc315aaf68676c56cc00b13f6937ef5592f8d 19-Jun-2015 Jonathan Basseri <misterikkit@google.com> Add VVM carrier config to public API.

These bits of carrier config were @hidden, but in order for carrier apps
to set them, they need to be public.

Bug: 21930513
Change-Id: Ifa49cf7441a8c6b6cf7e1aadb46abeb41054fcc3
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/TelephonyManager.java
60205322c4562f9a650b2635fa168cd1e51f9c19 18-Jun-2015 Sanket Padawe <sanketpadawe@google.com> am 3fa285f9: Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-dev

* commit '3fa285f93e2810cbd31a71490b364be2b6636d9d':
SubscriptionManager: Fix NPE in getSimStateForSlotIdx
1cce1ec352b2a969d0132c38a1043eab3a18d2cc 05-May-2015 Omkar Kolangade <omkark@codeaurora.org> IMS RAT Reporting in Registration Unsol

Adding a parameter to the IMS registration complete
and progressing callbacks allowing frameworks to be
notified of the radio access technology over which
IMS is registered.

Bug: 21902225
Change-Id: I3b340da3776b617fd9d944585672bce51c5d9c1e
om/android/ims/internal/IImsRegistrationListener.aidl
330dcac0cb9412b7a856a99ce3ea94d2ebba330a 18-Jun-2015 Sanket Padawe <sanketpadawe@google.com> SubscriptionManager: Fix NPE in getSimStateForSlotIdx

bug: 21915589
Change-Id: If703baff6408a0d7ba7c8b02bfd2427b64cda963
ndroid/telephony/SubscriptionManager.java
d24e4eafdb3e42de5a8fd080fcd50ebf4c7bcb71 18-Jun-2015 Fyodor Kupolov <fkupolov@google.com> OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds

Bug: 21726452
Bug: 21878243
Change-Id: I390386e28d8f948b8672a212ac413dfa61e54a15
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
b538bd46750f34f83ed6d928a9fa9b9b8164ab0b 17-Jun-2015 Chris Manton <cmanton@google.com> am 69dd4bba: Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into mnc-dev

* commit '69dd4bba65f0b50bbee101d371425ad7fd13ed22':
Add keys to handle GSM and CDMA roaming/non roaming overrides
69dd4bba65f0b50bbee101d371425ad7fd13ed22 17-Jun-2015 Chris Manton <cmanton@google.com> Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into mnc-dev
736ebf2f92f4564a8255ae33ac21421a25bf14f9 17-Jun-2015 Andrew Lee <anwlee@google.com> am 94f30824: Merge "Add DisconnectCause for CDMA activated case." into mnc-dev

* commit '94f30824959acf2d7c7e6555ecb642ba07b2187a':
Add DisconnectCause for CDMA activated case.
94f30824959acf2d7c7e6555ecb642ba07b2187a 17-Jun-2015 Andrew Lee <anwlee@google.com> Merge "Add DisconnectCause for CDMA activated case." into mnc-dev
02d4ea2d286cee45c72700996440fd71edeacd85 17-Jun-2015 Junda Liu <junda@google.com> am a5aabfeb: Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev

* commit 'a5aabfebcaad34b9fdea222d858fc54d18e462c0':
Add carrier config variable to hide sim lock setting ui.
a5aabfebcaad34b9fdea222d858fc54d18e462c0 17-Jun-2015 Junda Liu <junda@google.com> Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev
e15cca771cd641d611ecf00b20621a688a383036 17-Jun-2015 Junda Liu <junda@google.com> Add carrier config variable to hide sim lock setting ui.

Bug: b/19623656
Change-Id: Iee9efcdefe5cdda2adae03f0852ff2b53e75698f
ndroid/telephony/CarrierConfigManager.java
ca16a79b1875921b0204dd952f0d6a28ea5e1022 16-Jun-2015 Chris Manton <cmanton@google.com> Add keys to handle GSM and CDMA roaming/non roaming overrides

bug: 20828356

Change-Id: Icb5ad25e213771554915bd9479a4a66b4f4a6906
ndroid/telephony/CarrierConfigManager.java
0c4d2e84cf9028e2de75e54f742df4fa7c4574a6 17-Jun-2015 Andrew Lee <anwlee@google.com> Add DisconnectCause for CDMA activated case.

Bug: 19296388
Change-Id: Ic754534e6d0273ae73ed80e3bb25a681d410a03b
ndroid/telephony/DisconnectCause.java
edd358cfe0df413878552032d0ce695928da75ed 16-Jun-2015 Fyodor Kupolov <fkupolov@google.com> am 27a88a3e: Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev

* commit '27a88a3eb6a6a456ea3ec1b81a8fb26333f904a5':
Additional OP_READ_PHONE_STATE AppOps checks for telephony
27a88a3eb6a6a456ea3ec1b81a8fb26333f904a5 16-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev
84077de8e5e23ddc1d5078448d16ed30c628dedc 16-Jun-2015 Junda Liu <junda@google.com> am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev

* commit '73d043232434f3ad37af26615919eac3117536b7':
Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
73d043232434f3ad37af26615919eac3117536b7 16-Jun-2015 Junda Liu <junda@google.com> Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev
e478649373a494347e744fcdaeac6960e4b5ae65 15-Jun-2015 Junda Liu <junda@google.com> Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.

Bug: b/21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
ndroid/telephony/CarrierConfigManager.java
d7a1242241be30dce02485aac0e6f2aa0244c12d 16-Jun-2015 Amit Mahajan <amitmahajan@google.com> resolved conflicts for merge of 28a8cf68 to mnc-vt-dev

Change-Id: I094220b4d61914d0774bc62f1065e2a1c85f4000
28a8cf6883478d568f9c85065e94ba39c5c439d4 16-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Adding config variables for triggering CI action on System update." into mnc-dev
b401f4fd481bc0a70ce2c3effad55198fad50467 12-Jun-2015 Jonathan Basseri <misterikkit@google.com> am ecadb92e: Merge "Read MMS config from CarrierConfigManager." into mnc-dev

* commit 'ecadb92e8dcea2d7d39333169600be76b8f3fb4e':
Read MMS config from CarrierConfigManager.
ecadb92e8dcea2d7d39333169600be76b8f3fb4e 12-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Read MMS config from CarrierConfigManager." into mnc-dev
02008b78d095206a9b72bd3a5242c54cb6da0bdd 11-Jun-2015 Amit Mahajan <amitmahajan@google.com> Adding config variables for triggering CI action on System update.

Bug: 21603815
Change-Id: I401099a9aeced578ee914ddbebf1f5982f276780
ndroid/telephony/CarrierConfigManager.java
ee8ebd69d428a1a5279b3bebbf967d163d6a1a7c 11-Jun-2015 Jonathan Basseri <misterikkit@google.com> am b2af4220: Merge "Delete TODO and file a bug." into mnc-dev

* commit 'b2af4220adccb68c67bc91022db6239a9b9e280b':
Delete TODO and file a bug.
293837e9b24da02a32c50d6e522fa7c7666addf3 11-Jun-2015 Jonathan Basseri <misterikkit@google.com> am 57b7ec04: Merge "Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL" into mnc-dev

* commit '57b7ec0495377c961b7c74daa6f6fa0d7c37139f':
Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL
cab77d0af6d3807e52fbfdf3295b91aaeb7f4d20 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> am 1f86c1ae: Merge "Update docs on SignalStrength.getLevel" into mnc-dev

* commit '1f86c1ae83557d7e03c7bd3e5222137b03216bd4':
Update docs on SignalStrength.getLevel
d2c4d9a894539198dff24d4625c799bc891b62d9 11-Jun-2015 Jeff Davidson <jpd@google.com> am a66a067a: Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev

* commit 'a66a067a9c9b706035f48f445561100f29c960bf':
Mark CARRIER_PRIVILEGE_* constants as @SystemApi.
28c65e6d6409415792bbd40b5e6661549cc9c812 11-Jun-2015 Santos Cordon <santoscordon@google.com> am cefc16df: Merge "TelephonyManager should use TelecomManager\'s getCallState()." into mnc-dev

* commit 'cefc16df98a985b8a7c40bca5d5ff3fde6b42dbf':
TelephonyManager should use TelecomManager's getCallState().
b2af4220adccb68c67bc91022db6239a9b9e280b 11-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Delete TODO and file a bug." into mnc-dev
64af0511cafc483d78f3192fbc2070496e4262fd 11-Jun-2015 Andrew Flynn <flynn@google.com> am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev

* commit 'da9bbf725592c6482d6fbce18ef8c258b18e4fc8':
notifyCarrierNetworkChange:TelephonyManager->CarrierService
3360c2657908e6cb8565c85bdb33e0e2a3fd92b4 10-Jun-2015 Jonathan Basseri <misterikkit@google.com> Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL

Disabling voice privacy sounds scary. Update this config variable name
to what it actually does, which is to hide some settings UI.

Bug: 21571894
Change-Id: Ib981b5e442b56d0167a19326fe34935b7a1cfbf1
ndroid/telephony/CarrierConfigManager.java
5bf0ca1b3a304faf265a6c3e63410b32f4fdb118 11-Jun-2015 Jonathan Basseri <misterikkit@google.com> Delete TODO and file a bug.

This TODO looks more like a feature request, so I filed b/21766386 to
evaluate the feature. We should remove the TODO especially because this
text is in the public API.

Note: I'm not deleting the exact same comment from
packages/services/Telephony/res/values/config.xml
because the data migrated to CarrierConfigManager is slated to be
deleted from config.xml files.

Bug: 21571894
Change-Id: Iaba042fb47ade24f5825a48b21960193d322363f
ndroid/telephony/CarrierConfigManager.java
6694f2a067d1472cb74f8db4ddbcc5d4f77eda83 10-Jun-2015 Jonathan Basseri <misterikkit@google.com> Read MMS config from CarrierConfigManager.

Updating javadoc to point at the correct class.

Bug: 21085630
Change-Id: I02415191c8d331e431812ddba75f18af10805b98
om/android/internal/telephony/IMms.aidl
735e61b30f3099dff9dd6f4f9b65b6b1e5e38413 11-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Additional OP_READ_PHONE_STATE AppOps checks for telephony

Bug: 21726452
Change-Id: Iab61372d0fc8cecc826564a218ff542ec4afde5c
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IPhoneSubInfo.aidl
1f86c1ae83557d7e03c7bd3e5222137b03216bd4 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Update docs on SignalStrength.getLevel" into mnc-dev
46982c53641603f42cf32a7ac9a7fc3e4e2befce 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Update docs on SignalStrength.getLevel

bug:21572049
Change-Id: I10b830859a253170184a2d874d0ed39fc6ee0503
ndroid/telephony/SignalStrength.java
a66a067a9c9b706035f48f445561100f29c960bf 11-Jun-2015 Jeff Davidson <jpd@google.com> Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev
8c332b727523ce0dbb9256f0f43a9c655d71a3ea 09-Jun-2015 Santos Cordon <santoscordon@google.com> TelephonyManager should use TelecomManager's getCallState().

Telecom's version includes non-cellular calls in its result. Many apps
compile against TelephonyManager's existing API so we should update it
to use telecom instead.

We kept the implementation as cellular-only for
getCallState[ForSubscription](...) version of the API (which is hidden
anyway).

Bug: 21732997
Change-Id: Ifd27e6b49d76fe96ccc969e5262b1a876670aeef
ndroid/telephony/TelephonyManager.java
da9bbf725592c6482d6fbce18ef8c258b18e4fc8 10-Jun-2015 Andrew Flynn <flynn@google.com> Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev
64b7f1df2dea5802fda249c5e57c84efa035507b 10-Jun-2015 Tyler Gunn <tgunn@google.com> am 69c4e2c5: Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev

* commit '69c4e2c57eb587709452d3319136da19db5e465b':
Remove use of STATE_AUDIO_ONLY in a comparison.
69c4e2c57eb587709452d3319136da19db5e465b 10-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev
0cf20cdf81c1d8b553f7b3f8179048fe1d5b4d59 09-Jun-2015 Jeff Davidson <jpd@google.com> Mark CARRIER_PRIVILEGE_* constants as @SystemApi.

These constants are returned by checkCarrierPrivilegesForPackage which
is marked as @SystemApi, so this seems like an oversight.

Bug: 21613234
Change-Id: I5efc2c305cb1870e42fb103578fe33ec3e6000d4
ndroid/telephony/TelephonyManager.java
bc6f12ee42f810a68ef4d1e9185d42cd10124d9a 09-Jun-2015 Tyler Gunn <tgunn@google.com> Remove use of STATE_AUDIO_ONLY in a comparison.

- Cleanup javadoc to make it more explicit how to use STATE_AUDIO_ONLY.
- Use VideoProfile.isAudioOnly() instead of doing == comparison.

Bug: 21645094
Change-Id: I5a67290a996f8f338aebab72a4d3cb57f1b1993b
om/android/ims/ImsCallProfile.java
ceaed68b074bd341ed9b5f13ff9cc69e3f533999 09-Jun-2015 Andrew Flynn <flynn@google.com> notifyCarrierNetworkChange:TelephonyManager->CarrierService

Re-checkin of 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f.

ORIGINAL CHANGES:

Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
new internal callers that want to bind to it.

ADDITIONAL CHANGES:

- Fixes stack so that a SecurityException is thrown when caller
does not have MODIFY_PHONE_STATE or carrier privileges.

Bug: 21572049
Bug: 21630803
Bug: 21721768

Change-Id: Ie952651d2f15c370de713ed8abb6d9f6f07dd2b4
ndroid/telephony/TelephonyManager.java
c69efef11f3d7988a90a3beb701b99b36b38721d 09-Jun-2015 Fyodor Kupolov <fkupolov@google.com> am 4056b814: Merge "Do not enforce PHONE_STATE_PERMISSION to register listener" into mnc-dev

* commit '4056b814023cf168d125d63e1bf0abb231f2434f':
Do not enforce PHONE_STATE_PERMISSION to register listener
309b2f63f3265c341f6a43cbca2fb25f9c38109a 04-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Do not enforce PHONE_STATE_PERMISSION to register listener

PHONE_STATE_PERMISSION should not be required to register to the following
event types:
- PhoneStateListener.LISTEN_CALL_STATE
- PhoneStateListener.LISTEN_DATA_ACTIVITY
- PhoneStateListener.LISTEN_DATA_CONNECTION_STATE

In case of LISTEN_CALL_STATE, an empty string should be passed instead of
incomingNumber, when caller has no PHONE_STATE_PERMISSION.

Bug: 21588537
Change-Id: I5b6d0308924f7e4cd13a983b8e0c9b3a5bbb119b
ndroid/telephony/PhoneStateListener.java
4aef69ab52d2cf209790aaf0b1a217d3caaf3ba4 31-May-2015 Shriram Ganesh <sganesh@codeaurora.org> MWI,phantom call,Suppl services, error codes

1. IMS MWI Feature
- Add new API to update waiting
voice message count, for UI
propagation based on RFC 3842

2. phantom call support

Supplementary services

3. IMS : Incoming Call Barring
- Modified existing API to support
request like registration,activation,
deactivation,erasure,interogation.

4.Unsol supplementary service notification
- send unsol supplementary notification to UI
- add call history info

Miscellaneous
5. Ims: Originate conference call in DIALING state

6. IMS: Addition of Extras to ImsCallProfile
- Add EXTRA string definitions to ImsCallProfile

7. IMS: Definition of error code
- answered elsewhere
- FDN call failure

Change-Id: I52a64e9a5df3479189f62921a01655a50fb386fc
om/android/ims/ImsCallProfile.java
om/android/ims/ImsReasonInfo.java
om/android/ims/ImsSsInfo.java
om/android/ims/ImsSuppServiceNotification.aidl
om/android/ims/ImsSuppServiceNotification.java
om/android/ims/internal/IImsCallSessionListener.aidl
om/android/ims/internal/IImsRegistrationListener.aidl
om/android/ims/internal/IImsUt.aidl
bbc2568ee19aed1f58407510d1f9dc46db7e33f0 09-Jun-2015 Zach Johnson <zachoverflow@google.com> am d56958c4: Merge "Ignore carrier apps when checking for idleness" into mnc-dev

* commit 'd56958c440dffd85349adee5ca0bf4d0893215c6':
Ignore carrier apps when checking for idleness
d56958c440dffd85349adee5ca0bf4d0893215c6 09-Jun-2015 Zach Johnson <zachoverflow@google.com> Merge "Ignore carrier apps when checking for idleness" into mnc-dev
c0979958fd8c3111d1c68190477040cbd4a63a5c 09-Jun-2015 Prerepa Viswanadham <dham@google.com> am 8711ed64: Merge changes from topic \'modemActivityInfo\' into mnc-dev

* commit '8711ed644bab42c03ab9a22c14e1cb2825a107a6':
API for get modem activity info
Activity info and stats from modem
8711ed644bab42c03ab9a22c14e1cb2825a107a6 09-Jun-2015 Prerepa Viswanadham <dham@google.com> Merge changes from topic 'modemActivityInfo' into mnc-dev

* changes:
API for get modem activity info
Activity info and stats from modem
9da4d7d5fcf1e271e5c1d8fd3b86570bff803430 09-Jun-2015 Jonathan Basseri <misterikkit@google.com> am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev

* commit '623bf636de8f6f53ffa46127ed3fa5477be0a094':
Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
5ea0c8f1c660630edcdd5abdac076f7df69a7f8a 08-Jun-2015 Jonathan Basseri <misterikkit@google.com> Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId

Per discussion with API council, "notify" makes more sense than "reload"
here.

Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
ndroid/telephony/CarrierConfigManager.java
om/android/internal/telephony/ICarrierConfigLoader.aidl
b4b9ca7580c75f07330e5222cbd9ccc93b12935e 19-May-2015 Zach Johnson <zachoverflow@google.com> Ignore carrier apps when checking for idleness

Also introduce a way to check if a package has
carrier privileges for any active phone.

Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
9c9f6c0e6a51e23e70e8228bdf6adbf0087fb90a 08-Jun-2015 Nathan Harold <nharold@google.com> am 71feb72b: Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev

* commit '71feb72b76777afa10dca555287f954d63deeb9d':
Fix a typo in the docstring of getAllCellInfo()
0c13fa8466e3c7702fffc781f54851df45bab590 08-Jun-2015 Andrew Flynn <flynn@google.com> am 21a4f17c: Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev

* commit '21a4f17c942165684bc590de594984912459396d':
Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
71feb72b76777afa10dca555287f954d63deeb9d 08-Jun-2015 Nathan Harold <nharold@google.com> Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev
21a4f17c942165684bc590de594984912459396d 08-Jun-2015 Andrew Flynn <flynn@google.com> Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev
2b5348b41329b42f5b0929455a9b616a5e1f685e 08-Jun-2015 Andrew Flynn <flynn@google.com> Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"

This reverts commit 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f.

Change-Id: Ib99d2b8f83c2775cf5df4330a4f20bc791a83e5e
ndroid/telephony/TelephonyManager.java
fde06fd323fbc7102a824e1b8a2b9ddc4a89c38a 08-Jun-2015 Nathan Harold <nharold@google.com> Fix a typo in the docstring of getAllCellInfo()

Change-Id: I5ac23e708926a1ca649ace3890af417c9607e0e9
ndroid/telephony/TelephonyManager.java
158988c971f1a90591f363ff5c9e412b14cfd27b 08-Jun-2015 Amit Mahajan <amitmahajan@google.com> am 829c0977: Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev

* commit '829c097761e39b608b8b965a2c03f11ce5a95d2b':
Adding temporary logging to debug CTS failure (for CellLocationTest).
08ffeb63c9eb67abcb7709388d7da8ce46457cea 08-Jun-2015 Amit Mahajan <amitmahajan@google.com> am 9b5e2124: Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev

* commit '9b5e2124d0bc80370e80e0525e34a46eda61ded7':
Changing getSimState to use slot idx instead of sub id.
410bceba5b270877735688d593be70a6e32d12d6 08-Jun-2015 Andrew Flynn <flynn@google.com> am 2429e6a8: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev

* commit '2429e6a8d96a4eba83e22c35595fa05e0f5e51f2':
notifyCarrierNetworkChange:TelephonyManager->CarrierService
829c097761e39b608b8b965a2c03f11ce5a95d2b 08-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev
9b5e2124d0bc80370e80e0525e34a46eda61ded7 08-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev
2429e6a8d96a4eba83e22c35595fa05e0f5e51f2 08-Jun-2015 Andrew Flynn <flynn@google.com> Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev
9387f1dfe3788661e883672b36edabf11a96de51 27-May-2015 Amit Mahajan <amitmahajan@google.com> Changing getSimState to use slot idx instead of sub id.

Bug: 20736251
Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
ndroid/telephony/SubscriptionManager.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ISub.aidl
024557b2afdbe2e946d2cc557cb71492d87b0f62 06-Jun-2015 Etan Cohen <etancohen@google.com> Merge changes Ie0dd7a44,I5b3c0a48 into mnc-vt-dev

* changes:
Merge commit 'e79fed5' into merge
Merge commit 'abfdaea' into merge
89a2c471bc8a6d5d4636b4f5e91b26457ef7a5a6 06-Jun-2015 Etan Cohen <etancohen@google.com> Merge commit 'abfdaea' into merge

Change-Id: I5b3c0a48c9d47bcb02d49132077f9e258481de2d
6bf85052a9df98794409f9253a6fe89edb771525 06-Jun-2015 Sanket Padawe <sanketpadawe@google.com> am 912f705f: Merge "Suppress default logging in SubscriptionManager." into mnc-dev

* commit '912f705f1f98ba2fc744601994dfbe12f391b0ae':
Suppress default logging in SubscriptionManager.
912f705f1f98ba2fc744601994dfbe12f391b0ae 06-Jun-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Suppress default logging in SubscriptionManager." into mnc-dev
28964eb236cee7e593cf46ff6bcd61cd0d4c54f6 06-Jun-2015 Sanket Padawe <sanketpadawe@google.com> Suppress default logging in SubscriptionManager.

Bug: 20465753
Change-Id: Ieeb493be7b32382c6adf1cf0664cf3e96cedace7
ndroid/telephony/SubscriptionManager.java
ef0e89b33fb5482c7f4d8d7aabae1fdac6ae0604 06-Jun-2015 Jonathan Basseri <misterikkit@google.com> am 64128563: Merge "Renaming carrier config variable keys." into mnc-dev

* commit '6412856358493455692955147991d858cfe16f80':
Renaming carrier config variable keys.
69822f0d63e80a068bb2ee4c80a617492f1d8141 04-Jun-2015 Jonathan Basseri <misterikkit@google.com> Renaming carrier config variable keys.

API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: Ibe55ad5a31ef618455e763b5c5265fc817c934ab
ndroid/telephony/CarrierConfigManager.java
7f8be9d89b7f294bf5e5d377908a5c74d2f4968f 04-Jun-2015 Andrew Flynn <flynn@google.com> notifyCarrierNetworkChange:TelephonyManager->CarrierService

Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
new internal callers that want to bind to it.

Bug: 21572049
Bug: 21630803
Change-Id: Idcbcd107966fe92d7edc23c261e11db61160f615
ndroid/telephony/TelephonyManager.java
3d0f09433a6a26e5d47bd567cac2ce69d1e7eb0c 04-Jun-2015 Prerepa Viswanadham <dham@google.com> API for get modem activity info

Change-Id: I4785e1dfce14468de8ba5a376c7c3aa57178ce7b
ndroid/telephony/TelephonyManager.java
5c728994311c40821604c6711171e860776659a6 28-May-2015 Prerepa Viswanadham <dham@google.com> Activity info and stats from modem

Change-Id: Ifa8e520673c7e5549b0066a16a744810f1f0730c
ndroid/telephony/ModemActivityInfo.aidl
ndroid/telephony/ModemActivityInfo.java
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/RILConstants.java
461b45070f204625a7e9171c16413424780fc0f4 04-Jun-2015 Nancy Chen <nancychen@google.com> am 65561b5c: Merge "Add carrier package name field to check for carrier vvm app." into mnc-dev

* commit '65561b5c5100d4d4b18d5086cba52d796122e78d':
Add carrier package name field to check for carrier vvm app.
65561b5c5100d4d4b18d5086cba52d796122e78d 04-Jun-2015 Nancy Chen <nancychen@google.com> Merge "Add carrier package name field to check for carrier vvm app." into mnc-dev
f657d0b8b9031d6ac43172cd4331ab915e3bc8f4 04-Jun-2015 Amit Mahajan <amitmahajan@google.com> am b2556363: Fixed punctuation in comment.

* commit 'b2556363e7c142d7e0ab8f62e1a82662600a0821':
Fixed punctuation in comment.
1fcaf41221554ed43d09b2002b018a7d0f292d68 04-Jun-2015 Amit Mahajan <amitmahajan@google.com> am b8a4ba86: Merge "Update getVoiceMessageCount() comments." into mnc-dev

* commit 'b8a4ba86d87b7bdfe8b88300de8b29f1578b26c6':
Update getVoiceMessageCount() comments.
b2556363e7c142d7e0ab8f62e1a82662600a0821 04-Jun-2015 Amit Mahajan <amitmahajan@google.com> Fixed punctuation in comment.

Bug: 21559800
Change-Id: I47dc8e7be809cc586c307e72c7e9e11d5268cd5f
ndroid/telephony/TelephonyManager.java
b8a4ba86d87b7bdfe8b88300de8b29f1578b26c6 04-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Update getVoiceMessageCount() comments." into mnc-dev
53477531889214c2ef983501b0698beb0495e10e 04-Jun-2015 Amit Mahajan <amitmahajan@google.com> Update getVoiceMessageCount() comments.

Bug: 21559800
Change-Id: I7a737ae8a93c59391f232b5da6e3b36874126f3a
ndroid/telephony/TelephonyManager.java
97f5ccd1cc9f06c27c5e38bfb4a8a05238e1df2f 04-Jun-2015 Nancy Chen <nancychen@google.com> Add carrier package name field to check for carrier vvm app.

The carrier's vvm app's package name will be checked so that if it is
already installed, the dialer vvm will be disabled.

Bug: 2112648e#
Change-Id: I0433037f3bc5c5a380c76a03090d61c430e47e4b
ndroid/telephony/CarrierConfigManager.java
40678290471ee667ed20f9d8d8ab4bed70111ce3 04-Jun-2015 Etan Cohen <etancohen@google.com> Merge "Rename VoLTE/WFC enable API to available - add VT available API." into mnc-vt-dev
2e7ca76a8a1b87c2ea6102ba14fe324cfe20f8ca 30-May-2015 Amit Mahajan <amitmahajan@google.com> Adding temporary logging to debug CTS failure (for CellLocationTest).

Bug: 21209629
Change-Id: Ic99cf02f26d3cca7260a3a0141ce13eff9a885bc
ndroid/telephony/TelephonyManager.java
b06411a90fcaaa6d2bb295174c97d4b7a124eea9 03-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Document procedure for adding carrier config variables." into mnc-dev
bb6d06058534d91cfaf98492799de83aee92a851 03-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "API Cleanup: Remove VideoState class." into mnc-dev
87b73f370e2b8a76b0540580f43edba6ec21c6cf 03-Jun-2015 Tyler Gunn <tgunn@google.com> API Cleanup: Remove VideoState class.

- Remove VideoState class.
- Replace references to VideoState constants with VideoProfile equivalent.
- Push VideoState static methods into VideoProfile.

Bug: 21573551
Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
om/android/ims/ImsCallProfile.java
97769b0c437a1a09aa925f07bbc8c0ae14d5c31b 03-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev
115c04410ec276f9fe7e364f9ac082cad5bce8d0 02-Jun-2015 Brian Attwell <brianattwell@google.com> Rename PhoneNumberUtils APIs

In response to more API review.

Bug: 21571895
Change-Id: Ia1fa69da07a3427997919ba61c77fcbad7e79f2a
ndroid/telephony/PhoneNumberUtils.java
f31ac338af8f5b32ce08799b8ad9c7f9a1d4d091 27-May-2015 Jonathan Basseri <misterikkit@google.com> Migrating MmsConfig to CarrierConfigManager.

Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

This was originally Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a

Bug: 21085630
Change-Id: I5a55873465c36ea8a7e3915b8b98a65b47c60dfa
ndroid/telephony/CarrierConfigManager.java
abdf79aba01c6dbf4792907b4875fed023089f82 02-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Revert "Migrating MmsConfig to CarrierConfigManager."" into mnc-dev
27a7b78e40d23e6f87343ee9a75dc54b9b34894d 02-Jun-2015 Jonathan Basseri <misterikkit@google.com> Revert "Migrating MmsConfig to CarrierConfigManager."

Forgot to update-API

This reverts commit 9444f4be82d2bbc6b8668e73e91cfa70aee2d4dc.

Change-Id: I8e1bb7ff5b86d478ae7a79497d28ee9310209de6
ndroid/telephony/CarrierConfigManager.java
56dbe3ee4bea8fce11a2698a44778e264e9ec2db 02-Jun-2015 Adrian Roos <roosa@google.com> Merge "Hide and disable emergency assist API" into mnc-dev
9444f4be82d2bbc6b8668e73e91cfa70aee2d4dc 27-May-2015 Jonathan Basseri <misterikkit@google.com> Migrating MmsConfig to CarrierConfigManager.

Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

Bug: 21085630
Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a
ndroid/telephony/CarrierConfigManager.java
08e318e5868b4f21a95fd1b5e8b9659e2d830257 29-May-2015 Jonathan Basseri <misterikkit@google.com> Document procedure for adding carrier config variables.

Readers of CarrierConfigManager.java should find enough info in the
comments to add new variables and override them in either their own
carrier app or the default carrier app.

Change-Id: Ib1d87c24543491ad8b4ef0b1d08148a07fb1ace3
ndroid/telephony/CarrierConfigManager.java
19d9d0ca2e95eca34e8f7b28023aa10f15d82f88 29-May-2015 Brian Attwell <brianattwell@google.com> Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
1a15ab91bcdf780f0d109f4a4d18701195ffdb49 29-May-2015 Brian Attwell <brianattwell@google.com> Rename "end" to "endExclusive" in addPhoneTtsSpan

Bug: 21209482
Change-Id: If505acecf5ca398560a9a23ea23ff8dd741e4025
ndroid/telephony/PhoneNumberUtils.java
ff0c25ce3174bd4f76256e413beb81f6eb501da9 29-May-2015 Amit Mahajan <amitmahajan@google.com> Merge "Cleaning up logging in TelephonyManager." into mnc-dev
a107edd21bb53320897fddaeeb998872cc67e4e4 29-May-2015 Etan Cohen <etancohen@google.com> Rename VoLTE/WFC enable API to available - add VT available API.

Renamed API to use consistent semantics: available refers to the current
state of the service rather then whether feature is enabled by device/carrier/
user.

Added VT API to match VoLTE/WFC.

Change-Id: Ifb31f123db77e731e75a982b8594168f59a289e7
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
abfdaead4c3a11b2a9997bf3ebe252ed975d2b28 29-May-2015 Tyler Gunn <tgunn@google.com> Add new carrier config settings.

1. Add new carrier config setting for "bool_allow_emergency_video_calls".
This allows us to control on a per-carrier basis whether emergency
video calls are allowed.
2. Add carrier config setting "bool_allow_video_pause", which
was previously in overlay files in packages/services/Telephony (Figured I
would clean this up while I'm here).

Bug: 20089489
Change-Id: I97e0983b4a7c8e8086ab58e7e839011e62fabcaf
ndroid/telephony/CarrierConfigManager.java
56548d578c05100d87ee7480fe61bc4815a0dacb 28-May-2015 Amit Mahajan <amitmahajan@google.com> Cleaning up logging in TelephonyManager.

Bug: 21474174
Change-Id: I4555ada69c233ee9e9d9e45c1d619e8b779d9016
ndroid/telephony/TelephonyManager.java
ec7100d0114d50f12c4ad95eaeac61e93a6d5a96 28-May-2015 Nancy Chen <nancychen@google.com> Merge "Update docstring for STRING_VVM_TYPE to point to possible values." into mnc-dev
7ff76d637f5ad49838e9d4a1570c762a187ed4d1 16-Apr-2015 Narayan Kamath <narayan@google.com> Add a hidden telephony API for querying SIM derived locales.

bug: 19818550
Change-Id: Ide6c05ad8fe7b0cff6f20ddfe755e83e9b3a21aa
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
42ecc9eb902ef90876cd345a906c24e0d58720a3 23-May-2015 Zach Johnson <zachoverflow@google.com> Drop the "Config". Just "CarrierService". It's cleaner.

b/21308727

Change-Id: I6515888c7804349ecd07c4dd74575ef89a4bea59
ndroid/telephony/CarrierConfigManager.java
cb43f420fc17eed8152c3509093813d4a0ecd031 28-May-2015 Nancy Chen <nancychen@google.com> Update docstring for STRING_VVM_TYPE to point to possible values.

The possible values for CarrierConfgiManager.STRING_VVM_TYPE now live in
TelephonyManager. Update the reference.

Bug: 21446369
Change-Id: I85e3ab4f64d54f0cb8bf16b2ada67cae36cefdd2
ndroid/telephony/CarrierConfigManager.java
46fa08d66483bf041fdc0a4eace63f9addf8e629 27-May-2015 Adrian Roos <roosa@google.com> Hide and disable emergency assist API

Bug: 21471480
Change-Id: If53926ebd6451b05ccacf06342cc648185dc5eaf
ndroid/telephony/TelephonyManager.java
9e4cd8332ac89bc409445eff3b81d739edaccb0f 23-May-2015 Nancy Chen <nancychen@google.com> Add vvm type for t-mobile.

T-Mobile has slightly different configuration details so add a vvm type
to correspond to what they use: comverse vvm.

Bug: 21126480
Change-Id: I83fd0c5651bf94eb912dd44f4b52924d8bcdd4e7
ndroid/telephony/CarrierConfigManager.java
ndroid/telephony/TelephonyManager.java
56acbc410093b9854060c3a32c68a60d95cdca85 12-May-2015 Yorke Lee <yorkelee@google.com> DO NOT MERGE Fixes for APi review

Move CameraCapabilities into VideoProfile
Make PhoneAccount and PhoneAccountHandle final

Bug: 21040387
Bug: 21066505
Change-Id: I72453c89ae3765f9b9cf263938fce96d5978d2e0
om/android/ims/internal/IImsVideoCallCallback.aidl
6d3a7575e102e44514c1f834bd497f6b26e96769 13-May-2015 Yorke Lee <yorkelee@google.com> DO NOT MERGE 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
om/android/ims/internal/IImsVideoCallProvider.aidl
8c621ef54630e411d50e9ba1d8d8ed19ef93f9e1 12-May-2015 Robert Greenwalt <rgreenwalt@google.com> Add support for static RadioCapabilities.

Some RILs don't support RIL_REQUEST_GET_RADIO_CAPABILITY. Add
code to RIL.java to notice a REQUEST_NOT_SUPPORTED response and
check config.xml (config_radio_access_family) for a static answer.

Also catching GENERIC_FAILURE responses because Hammerhead modem
returns that. B 21079604 created for this.

If neither Modem nor config.xml provide data, uses RAF_UNKNOWN
so we don't lie about capabilities and also so we fail fast
(setPreferredNetwork won't work).

bug:20561357
Change-Id: I49e4527fe94919a7094bc7c1e100d20e8f833865
ndroid/telephony/RadioAccessFamily.java
07e02b6d25f5a731a36ad49b482e35c14c97cbdc 14-May-2015 Junda Liu <junda@google.com> Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev
b731c3d944ccf46b7d0115f63b63eee5ab8abf1a 05-May-2015 Jonathan Basseri <misterikkit@google.com> Add null annotations for getting carrier config.

CarrierConfigManager can return null Bundles for carrier config, but
never returns null when getting default values. Add the appropriate
annotations.

Change-Id: Iffbed3b54ca7cc28cf8b04f133aacdf9e6e4fd20
ndroid/telephony/CarrierConfigManager.java
cd115b738c3ead973425b64c19e3f78052979261 13-May-2015 Junda Liu <junda@google.com> Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.

Bug: b/21028396
Change-Id: I029671b6bcd03a07956ccf35f4e5fe03d16a2218
ndroid/telephony/CarrierConfigManager.java
4f9ad1678eca240afb5a2174dc35e4f0559312c3 12-May-2015 Jonathan Basseri <misterikkit@google.com> Switching to PersistableBundle in carrier config API.

Part of this API involves persisting config bundles to avoid binding to
apps at critical moments (like boot). Regular bundles should not be
written to disk because they support object types that can lose their
meaning while the data is at rest.

In order to use PersistableBundle, we must either start with one or
filter unwanted types out of Bundle objects. Since the carrier config
API has no use for unsupported types, we chose to use PersistableBundle
everywhere.

Bug: 20268926
Change-Id: I17989ce840014c2a0ed3679c1bca5a8498082c7f
ndroid/telephony/CarrierConfigManager.java
om/android/internal/telephony/ICarrierConfigLoader.aidl
32f24731604fd81289a39619bbc925b65184b505 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
om/android/ims/internal/IImsVideoCallProvider.aidl
a8fc387e20818e902b1140d4e17fb3b40ae4e5a6 12-May-2015 Robert Greenwalt <rgreenwalt@google.com> Add support for static RadioCapabilities.

Some RILs don't support RIL_REQUEST_GET_RADIO_CAPABILITY. Add
code to RIL.java to notice a REQUEST_NOT_SUPPORTED response and
check config.xml (config_radio_access_family) for a static answer.

Also catching GENERIC_FAILURE responses because Hammerhead modem
returns that. B 21079604 created for this.

If neither Modem nor config.xml provide data, uses RAF_UNKNOWN
so we don't lie about capabilities and also so we fail fast
(setPreferredNetwork won't work).

bug:20561357
Change-Id: I9607e8e99242c6f7a6e330741d4afe8bbd08b1e7
ndroid/telephony/RadioAccessFamily.java
400470fab932fe3374149ab89386e460ea161002 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: I72453c89ae3765f9b9cf263938fce96d5978d2e0
om/android/ims/internal/IImsVideoCallCallback.aidl
ed7cbf111f5970ab56e557cd785063068405b563 06-May-2015 Tyler Gunn <tgunn@google.com> Merge "Change sendSessionModifyRequest VideoProvider API signature." into mnc-dev
4538216a31d15b01e18c7b504e51031da0ce6e40 06-May-2015 Tyler Gunn <tgunn@google.com> Change sendSessionModifyRequest VideoProvider API signature.

Including a fromProfile in addition to the requestedProfile.

- Changed VideoCallImpl to generate the fromVideoProfile based on the
call's current videoState. This ensures the InCall UI only needs to
pass in the new video profile; the VideoCall Impl already has enough
knowledge to generate the fromProfile.
- Changed VideoCallImpl to track the current videoQuality, which forms
a part of the fromVideoProfile.

Bug: 20704229
Change-Id: I89f293f03a2b13fc8c1dcfd8a07ab8640d3950e0
om/android/ims/internal/IImsVideoCallProvider.aidl
b2e3b74418f7fc09f2610bc5620e748d420b5f87 05-May-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "WiFi Calling: Show different operator name string in Data usage dialog." into mnc-dev
5504d39b7f880fa8b8660e5d4b014ec559124cf9 27-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> WiFi Calling: Show different operator name string in Data usage dialog.

Bug: 19950657
Change-Id: I9999d58e78154ed2d6d824973c40011875de15ef
(cherry picked from lmp-mr1-wfc-dev)
om/android/internal/telephony/TelephonyIntents.java
d1808401ca3bfd6b6b9a975c1e739b194d18f849 05-May-2015 Prerepa Viswanadham <dham@google.com> Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
Merge commit 'b6f59f4' into master_merge
Merge commit 'f6db0ce' into master_merge
Merge commit '17455a3' into master_merge
Merge commit 'b4d5b32' into master_merge
Merge commit 'a1a2fa7' into master_merge
Merge commit '8dfdb98' into master_merge
Merge commit 'eba66c3' into master_merge
b6f9da0b7f26b50163461a767cafcd8014328742 01-May-2015 Prerepa Viswanadham <dham@google.com> Merge commit '17455a3' into master_merge
f18217248d647a29f64bc8f360667887e145d6d8 01-May-2015 Tyler Gunn <tgunn@google.com> Change sendSessionModifyRequest VideoProvider API signature.

Including a fromProfile in addition to the requestedProfile.

- Changed VideoCallImpl to generate the fromVideoProfile based on the
call's current videoState. This ensures the InCall UI only needs to
pass in the new video profile; the VideoCall Impl already has enough
knowledge to generate the fromProfile.
- Changed VideoCallImpl to track the current videoQuality, which forms
a part of the fromVideoProfile.

Bug: 20704229
Change-Id: I89f293f03a2b13fc8c1dcfd8a07ab8640d3950e0
om/android/ims/internal/IImsVideoCallProvider.aidl
13a98b6c6ed28bfa0cb373e49c183167699e30f0 26-Feb-2015 Amit Mahajan <amitmahajan@google.com> Support for bearer_bitmask.

Change-Id: I7cae3d229445607c66b6472124264588f7571097
ndroid/telephony/ServiceState.java
5c868a2cd27b499928dfbadc0bf9a59169c6a35e 26-Feb-2015 Amit Mahajan <amitmahajan@google.com> Support for bearer_bitmask.

Change-Id: I7cae3d229445607c66b6472124264588f7571097
ndroid/telephony/ServiceState.java
1fec80405945f763545dd0def8863a4776cc7118 30-Apr-2015 Yorke Lee <yorkelee@google.com> am 89319a95: am e6a8bf80: am 08b51bfe: Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev

* commit '89319a9562d2b205a6b004a04e132b0219f92f9c':
Add default dialer checks to Telecom/Telephony
08b51bfe8532ab7eff38ad69ad46c251be5c2792 30-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev
f1a349bda3b6cb400692159d72a41ea89b0e6128 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
ndroid/telephony/TelephonyManager.java
a7a67085107ea44a3febbd4ee85f9eb233b41f71 29-Apr-2015 Junda Liu <junda@google.com> am 01da3124: am df3a6f3e: am bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev

* commit '01da31247b8b2999bcfefe1f55ca396ee177ad69':
Moving all Telephony overlays to CarrierConfigManager.
9b56ad8f1a7e2c97423171bf15b0dc303f12d4c1 27-Apr-2015 Jonathan Basseri <misterikkit@google.com> Moving all Telephony overlays to CarrierConfigManager.

This adds every variable and its default value from
packages/services/Telephony/res/values/config.xml to the new
CarrierConfigManager API. Variable docstrings are also taken from
config.xml, with minimal edits.

These variables were not included because either they are not carrier
specific, or they are device specific:

OtaPlaySuccessFailureTone
OtaShowActivateFailTimes
OtaShowActivationScreen
OtaShowListeningScreen
carrier_settings
carrier_settings_menu
config_allow_hfa_outside_of_setup_wizard
config_enabled_lte
csp_enabled
dialer_default_class
dtmf_type_enabled
hac_enabled
send_mic_mute_to_AudioManager
ui_default_package

This also adds BOOL_HIDE_CARRIER_NETWORK_SETTINGS which is a replacement
for android.provider.Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS.

Bug: 20270007
Change-Id: I985a55cf88d3bd1863e28af7790b59eef01d6504
ndroid/telephony/CarrierConfigManager.java
f6db0ce6c473cc1c7459e4ce698df2b59d390bc1 06-Apr-2015 Sooraj Sasindran <ssasin@codeaurora.org> DO NOT MERGE - Make sure to return network type after conversion

After converting raf to type, make sure to return
network type

Change-Id: Ifb8bf33b852323b1a9b6febf3a87d1c1bc1082f7
ndroid/telephony/RadioAccessFamily.java
8407f289e12814e3726712ec52a0df764340901d 03-Apr-2015 Abhishek Adappa <aadappa@codeaurora.org> DO NOT MERGE - Radio Access Family related fixes

1. Include EHRPD in the EVDO group
2. Fix mapping of CDMA network type to include EVDO
3. Add utility to get the network type from the Raf

Change-Id: I4d3658a3d0063cbc8cd51cfb38666c6bb17f80dd
ndroid/telephony/RadioAccessFamily.java
61a3ab090f4b1edf0cb2c4ceae585a54ab613337 23-Apr-2015 Sharvil Nanavati <sharvil@google.com> Use a separate intent action for subscription phone state changes.

Global phone state changes and subscription phone state changes
are aliased to the same intent. As a result, apps can't distinguish
between the two types of updates.

This change teases the two apart by using a different intent action
for each type of phone state change. This will break carrier apps
that depend on subscription phone state changes, but will fix state
inconsistencies in non-carrier apps.

Bug: 20309009
Change-Id: Ie81c37247917573a3ef5d957fda1087c16736e85
om/android/internal/telephony/PhoneConstants.java
cd895cdf4dd98b4271e24742a6a46be70cda6382 25-Apr-2015 Etan Cohen <etancohen@google.com> Merge changes from topic 'mwd-merge-042415'

* changes:
Rename removeVideoCallListener to unregisterCallback
Bluetooth document fix: remove reference from open API to hidden entities
Fix build due to merge of 7595842 and renaming due to 8eb87f0
Merge commit '052a0da' into merge2
Merge commit 'db1dbb8' into merge2
Merge commit '7e5e791' into merge2
Merge commit '170102d' into merge2
Merge commit '4cb5d80' into merge2
Merge commit '83cda00' into merge2
Merge commit 'c91bc62' into merge2
Merge commit 'cffc360' into merge2
Merge commit '7f61051' into merge2
Merge commit '167c3a7' into merge2
Merge commit '4467b98' into merge2
Merge commit '25a217c' into merge2
Merge commit '04b18ec' into merge2
Merge commit '7595842' into merge2
Merge commit '2bbd2b6' into merge2
Merge commit '4890351' into merge2
Merge commit 'cd405fe' into merge2
Merge commit '6ddbb5e' into merge2
Merge commit 'de93575' into merge2
Merge commit '9561e74' into merge2
890eb710f9e06fa88ed1f0a006ddd0c36d75b9a7 25-Apr-2015 Cheuksan Wang <edwang@google.com> Merge "add injectSmsPdu with subId to ISms.aidl" into m-wireless-dev
712cdaf48e83f71033fd097a5d2cc6238fdad6db 24-Apr-2015 Cheuksan Wang <edwang@google.com> Merge "Fail SmsManager requests if SubId is not active." into m-wireless-dev
fa96c94c3046a726d558462e09ba04801d105a02 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit '9561e74' into merge2
9892718663be17e00cc20e82d75a532161bcd613 24-Apr-2015 Jonathan Basseri <misterikkit@google.com> Never return a reference to sDefaults.

Final static fields in Java are still mutable, so CarrierConfigManager
should not give callers the opportunity to mutate them.

Change-Id: I413597fc5f59c249997967bb0aad2d09b54fa613
ndroid/telephony/CarrierConfigManager.java
48f8fe53ee6624ed64ccd5f47bbc28beb223ce6b 24-Apr-2015 Jonathan Basseri <misterikkit@google.com> Merge "Adding carrier variables to control certain network settings."
ad5baab57e2b7c154f4bb5a1c7bab3ff3c952ede 23-Apr-2015 Jonathan Basseri <misterikkit@google.com> Adding carrier variables to control certain network settings.

Bug: 20270007
Change-Id: I4075c159e4fceb2e8a5bdda1261f8b2470455595
ndroid/telephony/CarrierConfigManager.java
4f18c60f48bf1b2b614f9a10b7ef3b7967713ceb 06-Apr-2015 Sooraj Sasindran <ssasin@codeaurora.org> Make sure to return network type after conversion

After converting raf to type, make sure to return
network type

Change-Id: I7fd338717be98a055cbaed66d1b15417da27a3d8
ndroid/telephony/RadioAccessFamily.java
c180f9adf7010395d32799536d4d7db675936642 03-Apr-2015 Abhishek Adappa <aadappa@codeaurora.org> Radio Access Family related fixes

1. Include EHRPD in the EVDO group
2. Fix mapping of CDMA network type to include EVDO
3. Add utility to get the network type from the Raf

Change-Id: I35023083be4c681809c003c7ed6a31c698ea4647
ndroid/telephony/RadioAccessFamily.java
cf5715eb30dd866a330c9aff2db5b57da8a2f246 22-Apr-2015 Todd Kennedy <toddke@google.com> Merge "Unhide SignalStrength#getLevel()"
af86120955f3fe65c2c330e2333009b6ed12081a 21-Apr-2015 Todd Kennedy <toddke@google.com> Unhide SignalStrength#getLevel()

Bug: 20410696
Change-Id: I9f7f8c2949a9fdf5f84c4b567898c240034f5e85
ndroid/telephony/SignalStrength.java
24aadf18d5f69f33460cf266ab8952c644a12c55 21-Apr-2015 Svet Ganov <svetoslavganov@google.com> Merge "Add OP_READ_PHONE_STATE app op continued - framework"
5f24126e2ef51c5d0e9ccc7500a6226c63567200 20-Apr-2015 Jonathan Basseri <misterikkit@google.com> Merge "Add multi-sim support for getCarrierPackageNamesForIntent."
f1fb39763d87dabe254b6ed64ac8f20145035bc0 03-Apr-2015 Stuart Scott <stuartscott@google.com> Move factoryReset to service and protect.

bug:16161518
Change-Id: I02d1bbae1887c62ee426e6f03e8bc1f18c6666bf
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
f3c7bf432dc5c21fdecbb44865c037313d21b4cf 17-Apr-2015 Junda Liu <junda@google.com> Add multi-sim support for getCarrierPackageNamesForIntent.

resbmit of change Id100b7c4606287a1daa90092cd3c8a5a6519247d

Bug: 20268073
Change-Id: I852aac4da492e15f1dd7a3c88693fa14ec07b7c4
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
21301f6016ce50594f6cd9c66581ee9a08b57be9 19-Apr-2015 Svet Ganov <svetoslavganov@google.com> Add OP_READ_PHONE_STATE app op continued - framework

Change-Id: If1c2783ad9ea2aa773e5416e09a3cfd1817ef73f
ndroid/telephony/SubscriptionManager.java
om/android/internal/telephony/ISub.aidl
722743667110718acf473c92727b55581c0b9309 19-Apr-2015 Jeff Sharkey <jsharkey@google.com> Merge "Revert "Add multi-sim support for getCarrierPackageNamesForIntent.""
1b7ed7b1c2224728340251eb19433ab34ec1fac1 19-Apr-2015 Jeff Sharkey <jsharkey@google.com> Revert "Add multi-sim support for getCarrierPackageNamesForIntent."

This reverts commit 0ff9fd87d0a0d88bf46945629d0a30f6e7fb3f55.

Change-Id: I099c612ff1715c5c34c0ed9bc1bec460a1a5db01
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
f47c6488ea7de6bf2938ffb5bb1549bcf948da49 19-Apr-2015 Junda Liu <junda@google.com> Merge "Add multi-sim support for getCarrierPackageNamesForIntent."
774afb9a8e9f8f5a4d31d0573d94efeb3e5c3655 18-Apr-2015 Svet Ganov <svetoslavganov@google.com> Fix calling package for app ops

Change-Id: Ie867262e74d0b09e16193cb575b1c1cf942c83cb
ndroid/telephony/TelephonyManager.java
275b5635ad98a411d511894e98f80e8b8bc41799 14-Apr-2015 Svetoslav <svetoslavganov@google.com> Teach telephony about location app ops

Change-Id: I2bd8f0cb90d161994045d403f5d0c129ea951c3f
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
0ff9fd87d0a0d88bf46945629d0a30f6e7fb3f55 17-Apr-2015 Junda Liu <junda@google.com> Add multi-sim support for getCarrierPackageNamesForIntent.

Bug: b/20268073
Change-Id: Id100b7c4606287a1daa90092cd3c8a5a6519247d
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
d3c1ddb892f2ef8ae1b8eb0e4c50dfef302c0beb 17-Apr-2015 Svet Ganov <svetoslavganov@google.com> Merge "Add OP_READ_PHONE_STATE app op - framework"
2850d7a5996aaccc675a917cfec61f5ba55845d7 17-Apr-2015 Yorke Lee <yorkelee@google.com> Set default values for VVM constants in CarrierConfigManager

* Also hide the constants, they don't need to be @SystemApi
* Make VVM_PORT_NUMBER an Int

Bug: 20272209
Change-Id: I0d47afd7916d40f77ba5bf8e95306b46b27c15b3
ndroid/telephony/CarrierConfigManager.java
16a16899505ec0a9ede5b76650bfb8817b3227c7 16-Apr-2015 Svet Ganov <svetoslavganov@google.com> Add OP_READ_PHONE_STATE app op - framework

The READ_PHONE_STATE permission protects PII information and
is in the Phone group. This change is adding the corrseponding
app op for gating access to the API guarded by READ_POHNE state
which will be used instead as an access control for legacy apps.

Change-Id: I2ff895a5a0e529f26ec0ad706266a30d829268ba
ndroid/telephony/SubscriptionManager.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
d01242946eb7423612998b5bdbc71a6a1b3e8581 17-Apr-2015 Jay Shrauner <shrauner@google.com> Merge "Remove connection substate"
6f20a6a2b40e8ff362cf4cad977ebdae5ad999da 16-Apr-2015 Jay Shrauner <shrauner@google.com> DO NOT MERGE Remove connection substate

Bug:20300433
Change-Id: Ifefc08b5165de3e0b6ce92007e5f612879dcc4d9
om/android/ims/internal/IImsCallSession.aidl
8f988439247f90633af5fbcc6b18214f3b6f6d31 16-Apr-2015 Jay Shrauner <shrauner@google.com> Remove connection substate

Bug:20300433
Change-Id: Ifefc08b5165de3e0b6ce92007e5f612879dcc4d9
om/android/ims/internal/IImsCallSession.aidl
5c86e922dd3473c0cf235ac9288d68099c293e53 09-Apr-2015 Nancy Chen <nancychen@google.com> Add keys for visual voicemail carrier configuration values

Each carrier has its own set of visual voicemail configuration values
to be retrieved from the carrier config manager API.

Bug:19236241
Change-Id: Ic1d59a13d2203c70aba178c315c47ec2661ea56e
ndroid/telephony/CarrierConfigManager.java
9a1c9b67c4b2426884deb60c1ff84130ab47333c 25-Feb-2015 Jonathan Basseri <misterikkit@google.com> Adding Carrier Config API.

UICC privileged carrier apps will extend CarrierConfigService to provide
carrier-specific configuration. Apps/services will use
CarrierConfigManager to read the current configuration.

CarrierConfigManager also defines the set of configuration variables and
their default values.

Bug: b/19483786
Change-Id: I027211b43276afd6fe893ae50048c52f2aed5cf5
ndroid/telephony/CarrierConfigManager.java
om/android/internal/telephony/ICarrierConfigLoader.aidl
b15e72b83c56d771f0fb1453b73e2fca6b09cce8 20-Mar-2015 fenglu <fenglu@google.com> LCE service implementation - connectivity side

Change-Id: If11bd99c44c7dc8d2aa2bc05a10e04421739baa6
om/android/internal/telephony/RILConstants.java
2a5f608e7a5765db3b91165dac5b6280b26da26c 19-Mar-2015 Casper Bonde <c.bonde@samsung.com> Add support for Bluetooth Sim Access Profile (2/4)

Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
om/android/internal/telephony/RILConstants.java
2bbd2b683042ea0a20c46b6dfd78b6b65fcc86eb 20-Mar-2015 fenglu <fenglu@google.com> LCE service implementation - connectivity side

Change-Id: If11bd99c44c7dc8d2aa2bc05a10e04421739baa6
om/android/internal/telephony/RILConstants.java
dae67ef3439a91f58ccf4844a6b0e1d48be1a6f6 16-Apr-2015 Vinit Deshpande <vinitd@google.com> Merge "TelephonyManager Carrier Network Change Notification"
48903511b092feb7502f10f121bdf9b56f26395d 09-Apr-2015 Nancy Chen <nancychen@google.com> Add keys for visual voicemail carrier configuration values

Each carrier has its own set of visual voicemail configuration values
to be retrieved from the carrier config manager API.

Bug:19236241
Change-Id: Ic1d59a13d2203c70aba178c315c47ec2661ea56e
ndroid/telephony/CarrierConfigManager.java
3031bf961103ecc1caa32449a3cdb95575042278 25-Feb-2015 Jonathan Basseri <misterikkit@google.com> Adding Carrier Config API.

UICC privileged carrier apps will extend CarrierConfigService to provide
carrier-specific configuration. Apps/services will use
CarrierConfigManager to read the current configuration.

CarrierConfigManager also defines the set of configuration variables and
their default values.

Bug: b/19483786
Change-Id: I027211b43276afd6fe893ae50048c52f2aed5cf5
ndroid/telephony/CarrierConfigManager.java
om/android/internal/telephony/ICarrierConfigLoader.aidl
1cf9b6bec12c027a0d551540a6e01f3ac2d0a9d4 10-Apr-2015 Jay Shrauner <shrauner@google.com> DO NOT MERGE Make Telecom/InCallUI APIs public

Bug:20260870
Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
ndroid/telephony/TelephonyManager.java
55b97525f0f50857f1ab0acd2608053fd0f3416c 10-Apr-2015 Jay Shrauner <shrauner@google.com> Make Telecom/InCallUI APIs public

Bug:20260870
Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
ndroid/telephony/TelephonyManager.java
d05bd467ba191833522e5b78da54bc5eab7bab2c 19-Mar-2015 Casper Bonde <c.bonde@samsung.com> Add support for Bluetooth Sim Access Profile (2/4)

Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
om/android/internal/telephony/RILConstants.java
1f45264dd6b874d72ed901a2213c779d42d321c1 15-Apr-2015 Andrew Flynn <flynn@google.com> TelephonyManager Carrier Network Change Notification

Adds a way for a carrier app to notify the system that an intended network
change is starting or ending. This can be used by a system PhoneStateListener
to provide custom UI or perform other actions during this period.

- Adds new public TelephonyManager API: notifyCarrierNetworkChange(boolean)
- Adds new @hide PhoneStateListener method: onCarrierNetworkChange(boolean)
- Functionality merely serves as a pass-through of data from an app to a
PhoneStateListener (SystemUI for the intended use case)
- Protected by MODIFY_PHONE_STATE permission or hasCarrierPrivileges().

Bug: 11392659

Change-Id: I3199e21ec1ac124198f44b86c1534dd3ff1f6858
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IPhoneStateListener.aidl
om/android/internal/telephony/ITelephonyRegistry.aidl
9561e7410b39da22c45ba3e423b1361735ccec3e 14-Apr-2015 Tyler Gunn <tgunn@google.com> Prevent merging conference calls hosted on peer device.
automerge: 6b91ebf

* commit '6b91ebf58c928987ead635bb1c49a16965d4c835':
Prevent merging conference calls hosted on peer device.
d4ea01b4aca807cc914a96addefcc2c64ce1a6f5 12-Apr-2015 Prerepa Viswanadham <dham@google.com> Merge "Merge commit 'e593d0a' into merge_work"
57bf2a8a38e929f00f3323cf97a8ea7a9af900ce 11-Apr-2015 Prerepa Viswanadham <dham@google.com> Merge commit 'e593d0a' into merge_work

Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
e42c9c7ff9c927f09f101b90f6cc76765cf24b17 10-Apr-2015 Nancy Chen <nancychen@google.com> Merge "Create interface for SmsManager text sending methods."
a3117b3881b10467f332c5ab451b6ac477ecc6e0 10-Apr-2015 Nancy Chen <nancychen@google.com> Create interface for SmsManager text sending methods.

This is part of set of changes to make looser changes just internally to
send SMS from packages/services/Telephony.

Bug: 19236241
Change-Id: I207ab73b2f63f745a55cefd12c85a044f7bbf11d
om/android/internal/telephony/ISms.aidl
2aebb3fec319f5715e70dc5d3c3139f8821ec6ab 06-Apr-2015 Santos Cordon <santoscordon@google.com> Add SIM activation constants to TelephonyManager

Change-Id: I43fe5de4a1137bede4e81f4d51f272ad92dc80d5
ndroid/telephony/TelephonyManager.java
56e02703f79ec842214bee4347459b38430c981c 04-Apr-2015 Cheuksan Wang <edwang@google.com> add injectSmsPdu with subId to ISms.aidl

also clean up unused methods from ISms.aidl and UiccSmsController.java

BUG: 20015121
Change-Id: I60237e2e8964f9db5cceab7b09112a49f92f5c47
om/android/internal/telephony/ISms.aidl
73576b22bc56e047b2b6afecc74213589b33bc07 03-Apr-2015 Andrew Lee <anwlee@google.com> Merge "Protect against null ITelephony to fix crash."
896a1e650cf69f8dea1ef588c0089aaaf3d12e08 03-Apr-2015 Andrew Lee <anwlee@google.com> Protect against null ITelephony to fix crash.

Bug: 20066803
Change-Id: I4336e979dab3a4b1b3d53078af572ff3f822377a
ndroid/telephony/TelephonyManager.java
36711e0e2cee9181a328718a349454dbd834f4e2 02-Apr-2015 Etan Cohen <etancohen@google.com> Merge changes from topic 'mwd-merge-040115'

* changes:
Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile
Merge commit 'd91f193' into merge2
Merge commit '5718646' into merge2
Merge commit '7aa0345' into merge2
07366813cdf3768dcd69a1f744023747564d654a 25-Mar-2015 Rekha Kumar <rekhak@codeaurora.org> IMS-VT: Upgrade/Downgrade change
-Add isVideo API to VideoProfile.VideoState

IMS-VT: Fix propagation of device orientation.
Orientation received at VT Service is incorrect.
Fixed propagation of device orientation to VT service.

IMS-VT: Upgrade fix
-Add session modify call timed out constant

Notify listeners of video quality changed event
- Propagate the video quality changed message to the UI.

IMS: Add support for video quality
- Add Config interface to get/set video quality

IMS-VT: Multitasking feature
-Support for video multitasking

IMS-VT: Modification of data usage aidl
Change data usage aidl interface to take parameter type long
instead of int

Change-Id: I7cda2a689edb86d025dfe8efc8f573918c4bd6bc

Propagate the call substate changed message to the UI

IMS-VT: Add call modifiable capability

PhoneCapababilities call type modifiable constant added

IMS-VT: Add a bit mask CALL_SUBSTATE_ALL with all call substate bits set

IMS-VT: Enable Video conferencing.

Enable Video conferencing.

Change-Id: I4240aa6f32c75d6eea8a41da3c87bca651f0901b

IMS-VT: Add hide for setVideoProvider API
Observed compilation error for SDK generation due to setVideoProvider
API. Marking setVideoProvider as hide inorder to resolve the
compilation error.

IMS-VT: Add persist.radio.ims.audio.output for VT calls
-- Add persist.radio.ims.audio.output to set the default speaker
for VT calls.
-- Add required constants

IMS-VT: Add additional error codes for upgrade downgrade
-Add support to send additional error codes to UI during
upgrade downgrade.

Change-Id: Id452d225098fe3bccdcd37d242985c5c761144c1
om/android/ims/ImsCallProfile.java
om/android/ims/ImsConfigListener.aidl
om/android/ims/internal/IImsCallSession.aidl
om/android/ims/internal/IImsConfig.aidl
om/android/ims/internal/IImsVideoCallCallback.aidl
om/android/internal/telephony/PhoneConstants.java
om/android/internal/telephony/TelephonyProperties.java
6b91ebf58c928987ead635bb1c49a16965d4c835 01-Apr-2015 Tyler Gunn <tgunn@google.com> Prevent merging conference calls hosted on peer device.

With IMS, the "multiparty" bit on an ImsCall is set to "true" when a call
is merged into a conference. This not only occurs on the device hosting
the conference call, but also on the devices of the callers merged into
the conference.

This CL adds a listener to the ImsCallSessionListener which is used to
communicate a change in the multiparty state of an ImsCallSession to
the ImsCall. This solves a problem where the RIL knows of the change, but
since there is no callback, the change is not noticed by Telephony until
another call state change occurrs (e.g. holding the call).

Bug: 19478784
Change-Id: I4847ab3b63f6a00a91d1324196f181467d1753a4
om/android/ims/internal/IImsCallSessionListener.aidl
eb864d4000dacad94d5135a10ed7bdeb29f31881 01-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit 'd91f193' into merge2
984dc850b4caeb4470e52bce773935be5305cf8e 30-Mar-2015 Stuart Scott <stuartscott@google.com> Move reset network settings into framework.

bug: 16161518
Change-Id: Ic3b537ebd09d1b9723feff9dcc96e20fda05a94f
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
0ced792cd69ff4e78b3ea84e6b38c1f1fddce82e 10-Dec-2014 Shishir Agrawal <shishir@google.com> Fail SmsManager requests if SubId is not active.

If subId is not active, expected subIds can be assigned to the messages being
processed due to SmsManager calls. The change will fail any SmsManager calls
if SubId is not active.

Bug: 18629526
Change-Id: I8da1b1e2c477f32dcbaff417fc4e14ba2a225414
ndroid/telephony/SubscriptionManager.java
om/android/internal/telephony/ISub.aidl
271c9edc3039cbcabd2b7cadeead8c96bb785d8f 30-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "WiFi Calling: Show different operator name string in Data usage dialog." into lmp-mr1-wfc-dev
automerge: 5fd843b

* commit '5fd843b33383266cfe5f79f7ba4c5134c104cda0':
WiFi Calling: Show different operator name string in Data usage dialog.
943eb8654ff64ad854adada782ab911421a649a0 26-Mar-2015 Adrian Roos <roosa@google.com> Add emergency assistance API and setting

Bug: 19841649
Change-Id: I5bc99df6d85eb84b253456e32ce52afd7592a95e
ndroid/telephony/TelephonyManager.java
31697500a7013d306b17d6c09179e2499e96b5e1 27-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> WiFi Calling: Show different operator name string in Data usage dialog.

Bug: 19950657
Change-Id: I9999d58e78154ed2d6d824973c40011875de15ef
om/android/internal/telephony/TelephonyIntents.java
8a3c6ffcf64ca8964bd3fc4b8f473ec6590ab9f7 26-Mar-2015 Etan Cohen <etancohen@google.com> Merge "Stop output of call number to logs" into lmp-mr1-wfc-dev
automerge: 817d718

* commit '817d718d33256c15422d889bd93fb5453ad836a1':
Stop output of call number to logs
817d718d33256c15422d889bd93fb5453ad836a1 26-Mar-2015 Etan Cohen <etancohen@google.com> Merge "Stop output of call number to logs" into lmp-mr1-wfc-dev
ee763b356227d2ef26f20bbe2c0ad858ce25a9ff 26-Mar-2015 Shriram Ganesh <sganesh@codeaurora.org> Stop output of call number to logs

Bug: 19602904
Change-Id: Ieb6ae8d5ab27571d1f6cf91c530713f22b21b513
om/android/ims/ImsCallProfile.java
cf9f5a16fb9daae3a18546d601da008df1cc63c6 26-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: UT ServiceClass" into lmp-mr1-wfc-dev
automerge: d3b6cbe

* commit 'd3b6cbe172f429038894b1fae09fb72e8a646519':
IMS: UT ServiceClass
faf7ce03c2bb21b5f541f9e3e0e5b76de14ac7d3 31-Jan-2015 Omkar Kolangade <omkark@codeaurora.org> IMS: UT ServiceClass

When CF and CW MMI request will be triggered,
user preferred serviceclass will be sent to
the lower layers.

Change-Id: I230c59ec1ab0832e24755d5ba497b2b5e0749ec1
om/android/ims/internal/IImsUt.aidl
4209a28270a70016ee5ee6cae3dc96d6df0ade26 24-Mar-2015 Prerepa Viswanadham <dham@google.com> Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge

Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e
9504a9d90b81b9b9befd0008f8b862bef6bbc803 19-Mar-2015 Nick Vaccaro <nvaccaro@google.com> am 23c7cef2: am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev

* commit '23c7cef2ca28bf3116611507457be953f45ca80b':
Avoid unhandled page fault cases on Android Wear
23c7cef2ca28bf3116611507457be953f45ca80b 19-Mar-2015 Nick Vaccaro <nvaccaro@google.com> am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev

* commit '74a0eb360da012c5a13577a8af33f6b28b0fadf7':
Avoid unhandled page fault cases on Android Wear
5fc29ed61aa7d0b736de58af265a6ed380086b8d 18-Mar-2015 Nathan Harold <nharold@google.com> Merge "Adding hidden isWifiCallingEnabled() and isVolteEnabled()" into lmp-mr1-wfc-dev
automerge: 8ee14a2

* commit '8ee14a244851ac80af0193541a5d521462d75e1e':
Adding hidden isWifiCallingEnabled() and isVolteEnabled()
5540908059e3d746d915cc5d7e00618dc43df585 17-Mar-2015 Andrew Lee <anwlee@google.com> Merge "Add methods to indicate accessibility support."
a7d8aa7729741aa4391a040ee94ee90e625c8203 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Update documentation of IImsConfig interface."

merged from goog/mirror-m-wireless-internal-release
796d60b Update documentation of IImsConfig interface.
7dab6b29ebd592d3b594e9509867d36c697d4afc 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "IMS: Support for IMS Registration error codes"

merged from goog/mirror-m-wireless-internal-release
b54d218 IMS: Support for IMS Registration error codes
67b3ef27f0e6d1eac458ceead9bb65d0b717fe31 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Telephony: Implementation for IWLAN."

merged from goog/mirror-m-wireless-internal-release
bece926 Telephony: Implementation for IWLAN.

Change-Id: I4d55b3452428ebf9fbcfc3ba3a75cefcb2aeb0cf
42eadcdf3432e9fd6662ee07316db7726c1eabbf 12-Mar-2015 Nathan Harold <nharold@google.com> Adding hidden isWifiCallingEnabled() and isVolteEnabled()

Change-Id: Ic33f8c50dfb2d81b2bdc149629724e3972aad09e
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
f3c10020e2b76f20adb90d250ab4ed4e20e348d2 10-Mar-2015 Andrew Lee <anwlee@google.com> Add methods to indicate accessibility support.

Namely, indicates whether Telephony supports TTY mode or hearing
aid compatibility.

Bug: 19372734
Change-Id: I08d8cc64169b170c1dc6fb0c713e888eeba30099
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
b565b79d7387e649c3471089075632d3900e2ea4 09-Mar-2015 Etan Cohen <etancohen@google.com> Update documentation of IImsConfig interface.
automerge: 796d60b

* commit '796d60b12e0756db4689632d0985f7a5ed7a47d3':
Update documentation of IImsConfig interface.
796d60b12e0756db4689632d0985f7a5ed7a47d3 09-Mar-2015 Etan Cohen <etancohen@google.com> Update documentation of IImsConfig interface.

Change-Id: Id176c131e0192a2ebb4dd73e902c2a893feebcdc
om/android/ims/internal/IImsConfig.aidl
6c70b49715d97d0bb345d3d9af59f3f0ffb7f134 07-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev
automerge: 2f23212

* commit '2f23212ce5e049e46e70ace1a997ca85746d6065':
IMS: Support for IMS Registration error codes
b54d218d8b1c765865d0efb4a40e631f8bfa02de 24-Feb-2015 Rekha Kumar <rekhak@codeaurora.org> IMS: Support for IMS Registration error codes

- Add support for propagation of IMS Registration errors
- Add reason type - operator specific
- Add call drop reason type and error code CD-04 that specifies there was no
qualified LTE network to handover to from a wifi call

Change-Id: Ib9c93dfafe8d8fbdece3a5daf6fd13ef0c16f158
om/android/ims/ImsReasonInfo.java
om/android/ims/internal/IImsRegistrationListener.aidl
2b84e98e69ec915586963a1f2f3e55bacf210061 06-Mar-2015 Andrew Lee <anwlee@google.com> Merge "Add methods for device telephony configs."
67fc92bd444e4d8eee0aa7703980aff9185ea1bd 03-Mar-2015 Andrew Lee <anwlee@google.com> Add methods for device telephony configs.

+ Expose method for whether DTMF length can be changed.
+ Expose method for whether the device is a world phone.

Bug: 19372734
Change-Id: I542e87cab1924eb600fdce929f5227e36112964b
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
7b91c55b3ff4857e904a11a0a67fcc86a32868b4 02-Mar-2015 John Spurlock <jspurlock@google.com> Merge "Remove unused imports in frameworks/base."
9b09c15c35879838458d690e18fc67b0167485a2 03-Feb-2015 Santos Cordon <santoscordon@google.com> Add Sub-ID-from-phone-account converter method.

There are several places in the code that currently attempt to parse the
sub ID directly from the phone account which is undesireable. Before we
can change from using the subID to using an ICC ID with the phone
accounts, we need to create a conversion method so that no other
components are parsing the sub ID out of the phone account directly.

Change-Id: I74547fe0807da2fe13f3ff4422cd1d0a7a20d04c
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
5e02fa95f7296d87e9493e60b481118a2f06c584 02-Mar-2015 leozwang <leozwang@google.com> Remove PROPERTY_SIM_COUNT and "ro.telephony.sim.count"

These two defines are not being used anywhere.

Change-Id: Ie08468b8be18bf1860627e644bbd984bd1c899f4
om/android/internal/telephony/TelephonyProperties.java
57f8f0d7f9ff9e7a916ada7efaf2f59931de89b1 04-Feb-2015 Brian Attwell <brianattwell@google.com> Unhide and rename PhoneNumberUtils tts methods

Renamed ttsSpanAsPhoneNumber #1 -> getPhoneTtsSpan
Renamed ttsSpanAsPhoneNumber #2 -> addPhoneTtsSpan

Instead of removing the original hidden methods, I deprecated them.
Since Telephony changes initially get checked into wireless-dev
branch and dialer/contacts changes get checked into master branch,
immediately deleting the ttsSpanAsPhoneNumber methods would break
builds.

In ContactsCommon, I plan on removing
ContactDisplayUtils#getTelephoneTtsSpannable and instead using
these Telephony APIs. Numbers I tested worked in ToT master talkback:
911, (650) 215 3111, 22222222222, 333-3333, 013334612234, +1 905 471 8484,
001 39 02 444 4444. The changes in this diff cause the numbers
to be talked-back at least as well as before.

Some context: go/question-about-telephonys-ttsspan

Bug: 18777272
Change-Id: I3a6ead3ee9c030761bde903cf88f4aa4fc7a3460
ndroid/telephony/PhoneNumberUtils.java
08c7116ab9cd04ad6dd3c04aa1017237e7f409ac 28-Feb-2015 John Spurlock <jspurlock@google.com> Remove unused imports in frameworks/base.

Change-Id: I031443de83f93eb57a98863001826671b18f3b17
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/PreciseCallState.java
ndroid/telephony/PreciseDataConnectionState.java
ndroid/telephony/SubscriptionManager.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
om/android/internal/telephony/TelephonyIntents.java
f257469c08f06e40f47f0b884cb0737d1316cc2c 20-Feb-2015 Nick Vaccaro <nvaccaro@google.com> Avoid unhandled page fault cases on Android Wear

Telephony routines were dereferencing the null result of
getITelephony() and getSubscriberInfo(), causing unhandled page
faults at the hardware level.

Bug: 18264818
Change-Id: I7d058aa881c7dac20051d6faea2a6d52be4bd74e
ndroid/telephony/TelephonyManager.java
5414d155e5ce3147f9db1b2ec6fb2dcd6473e089 27-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 40aa30b3: am 654a473b: am 249f2c3a: am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

* commit '40aa30b3747fc62b14832682d2cc3117edd93b80':
Changing usage of carrier name field of SubInfoRecord
40aa30b3747fc62b14832682d2cc3117edd93b80 27-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 654a473b: am 249f2c3a: am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

* commit '654a473bfea9a4197868ae81091812505da8ca87':
Changing usage of carrier name field of SubInfoRecord
8b76495751432e0ab3770f3660e235e5f5e1a024 26-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

* commit '025f0938544bae3262acc24e9c6031b6de88901d':
Changing usage of carrier name field of SubInfoRecord
bece926b51854f196e015b025c4177be17c8f5ab 23-Feb-2015 Yashdev Singh <yashdevs@codeaurora.org> Telephony: Implementation for IWLAN.

Introduce new RAT as IWLAN.
- Allow registration polling in airplane mode.
- Allow non-default PDP activation for iwlan RAT.

Implementation of iwlan and wwan coexistence.
- A new callback event for unsol oem hook response to indicate
if cellular and iwlan RAT co-exists.
- If co-existence is possible then allow default PDP activation
along with other PDPs.

Change-Id: Icc6f8111ec3c86ec06e8facd5a5b60b4d5e08e78
ndroid/telephony/ServiceState.java
ndroid/telephony/TelephonyManager.java
ea4713d6e50a34c9e699ba09dd3c73000aff3b46 24-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Changing usage of carrier name field of SubInfoRecord

Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
ndroid/telephony/SubscriptionInfo.java
ed4ca5ca2c40ed2c838aaf483fcd58abdfa0ff08 03-Feb-2015 Santos Cordon <santoscordon@google.com> Add Sub-ID-from-phone-account converter method.

There are several places in the code that currently attempt to parse the
sub ID directly from the phone account which is undesireable. Before we
can change from using the subID to using an ICC ID with the phone
accounts, we need to create a conversion method so that no other
components are parsing the sub ID out of the phone account directly.

Change-Id: I74547fe0807da2fe13f3ff4422cd1d0a7a20d04c
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
bad6337b0862ba166ed26b5cabde8ed1fc3a419c 11-Feb-2015 Shishir Agrawal <shishir@google.com> GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8 automerge: 6b27472
automerge: b7e04f3

* commit 'b7e04f3294d2ce60450fcc6881249b6b0c6c30b0':
GpsLocationProvider: Read data enabled status from TelephonyManager.
b7e04f3294d2ce60450fcc6881249b6b0c6c30b0 11-Feb-2015 Shishir Agrawal <shishir@google.com> GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8
automerge: 6b27472

* commit '6b274720c5a210c07256e5b9fc11a1e9aca59017':
GpsLocationProvider: Read data enabled status from TelephonyManager.
64ce5f8fab077e4792737f86502d0e77ad6cbb0b 11-Feb-2015 Shishir Agrawal <shishir@google.com> GpsLocationProvider: Read data enabled status from TelephonyManager.

Bug: 18814559
Change-Id: I0333050d2a5b8d484466e1b1914dcfb9965398c9
ndroid/telephony/TelephonyManager.java
b15c00a551cc5b4d1688ed6b73c6c0f5c0ff7a9f 06-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 0a4c2646: am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev automerge: 4eed340

* commit '0a4c2646f4b72fdc78299dbb3dd86a7aecefff08':
Suppress phone number from logcat.
0a4c2646f4b72fdc78299dbb3dd86a7aecefff08 06-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev
automerge: 4eed340

* commit '4eed340437d23a9b4fabf2881557325b863af23c':
Suppress phone number from logcat.
c6dbe3be2cc6d9e1755d43dc56739b71ce7469f3 04-Feb-2015 Brian Attwell <brianattwell@google.com> Unhide and rename PhoneNumberUtils tts methods

Renamed ttsSpanAsPhoneNumber #1 -> getPhoneTtsSpannable
Renamed ttsSpanAsPhoneNumber #2 -> addPhoneTtsSpan
Added getPhoneTtsSpan

Instead of removing the original hidden methods, I deprecated them.
Since Telephony changes initially get checked into wireless-dev
branch and dialer/contacts changes get checked into master branch,
immediately deleting the ttsSpanAsPhoneNumber methods would break
builds.

In ContactsCommon, I plan on removing
ContactDisplayUtils#getTelephoneTtsSpannable and instead using
these Telephony APIs. Numbers I tested worked in ToT master talkback:
911, (650) 215 3111, 22222222222, 333-3333, 013334612234, +1 905 471 8484,
001 39 02 444 4444. The changes in this diff cause the numbers
to be talked-back at least as well as before.

Some context: go/question-about-telephonys-ttsspan

Bug: 18777272
Change-Id: I3a6ead3ee9c030761bde903cf88f4aa4fc7a3460
ndroid/telephony/PhoneNumberUtils.java
1acdd4b1f4e4111f347afe7ebfd45c2eba045e75 05-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Suppress phone number from logcat.

Bug: 19251204
Change-Id: I042bc3c0a89967eeae547b059f06cf05de005b25
ndroid/telephony/PhoneNumberUtils.java
af7454bafb99248caa9f02cf96195118d59afeab 02-Feb-2015 Robert Greenwalt <rgreenwalt@google.com> am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is already merged"
automerge: 21475c6

* commit '21475c6a92b893f5d078ba23f06f0be6edaaacbd':
21475c6a92b893f5d078ba23f06f0be6edaaacbd 02-Feb-2015 Robert Greenwalt <rgreenwalt@google.com> am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is already merged"

* commit '0cdd4560dac5784dda169863eb844d489bdc79d5':
3c6e38d3b5c7c5c209dca4f99526109e352a5392 21-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> Fixing up the formatting code which is already merged

I just apply google coding guide like space.

Uploading the same code about + handling just apply the Google Coding Guide.
The previous code is "https://android-review.googlesource.com/#/c/122770/"

This code is about + plus number converting logic for international NANP.

Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666
3165abfd3471a83e0544337f0ccbaee92fa57136 30-Jan-2015 Stuart Scott <stuartscott@google.com> am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
automerge: 2e233d3

* commit '2e233d30662d26846a42c298967842d2e8537653':
[DS] Correct the access method for telephony system property
2e233d30662d26846a42c298967842d2e8537653 30-Jan-2015 Stuart Scott <stuartscott@google.com> am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev

* commit '712d5b3d582dfe8f7fb855ba98704c98e9441836':
[DS] Correct the access method for telephony system property
147b6a3522b7032ede24101f5ac32ec7d7afa9e9 30-Jan-2015 Stuart Scott <stuartscott@google.com> Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
85973dcf8cd7d7a964ba746875a0c572685d1807 29-Jan-2015 Legler Wu <legler.wu@mediatek.com> [DS] Correct the access method for telephony system property

Revise the method to access telephony system property.
Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If
caller use the old one, it will be dispatched to new one and get by
default phone id.
Ex. PROPERTY_ICC_OPERATOR_NUMERIC

Bug: 18675498
Change-Id: I008a7390fefbbcd9f6569f059d48eedf1da28de0
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/SubscriptionManager.java
ndroid/telephony/TelephonyManager.java
f58ab0ae43f1b096d042803bddd90b0ddaa374df 30-Jan-2015 Amit Mahajan <amitmahajan@google.com> am d492aa08: am 45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
automerge: ed1a463

* commit 'ed1a46393e50cb2954876ef19ca539829fdf4a19':
Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
ed1a46393e50cb2954876ef19ca539829fdf4a19 30-Jan-2015 Amit Mahajan <amitmahajan@google.com> am d492aa08: am 45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev

* commit 'd492aa08206d21ba2e5ba533532630e5abe0bffe':
Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
45446c632162eb61a213815363149175732de78d 30-Jan-2015 Amit Mahajan <amitmahajan@google.com> Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
81f63a60f3db45fcadc5c223dbafe9349c1b57f9 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev
automerge: f19485b

* commit 'f19485b644b7ba7bda1f5c7a2279ca56c37923f0':
Suppress logging to avoid showing phone no.
f19485b644b7ba7bda1f5c7a2279ca56c37923f0 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev

* commit '60e4edfb94fd744001b4c7013a89ef4abb311f97':
Suppress logging to avoid showing phone no.
5df10e1842606f9a9a829a4779bf8f610b2d7bd9 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev
14d21344d21e379f6aeaa923cae7dc519efa16e3 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Suppress logging to avoid showing phone no.

Bug: 19193581
Change-Id: I6ee17a2eab9d0ed84c931d6395a5aeb148177f95
ndroid/telephony/SubscriptionInfo.java
1e62748b94b9f4808553b14a14d4a8f98a0ca7f3 29-Jan-2015 Amit Mahajan <amitmahajan@google.com> Adding new API to ISms to check if default SMS SIM needs to be chosen by
user.

Bug: 19112332
Change-Id: I7da30ebcebaf57f713acc6938626930dbc51d1f2
om/android/internal/telephony/ISms.aidl
d31cafb369c48a41bc149833659fad894e7bf59f 29-Jan-2015 Stuart Scott <stuartscott@google.com> am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236
automerge: cf8ae79

* commit 'cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b':
Change getDeviceId to take phoneId.
cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b 29-Jan-2015 Stuart Scott <stuartscott@google.com> am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236

* commit '8d702000a7291068e639a9954e03c36d66144449':
Change getDeviceId to take phoneId.
f4e52360613d20dc8176ce8a37cb05ad904fad0d 29-Jan-2015 Stuart Scott <stuartscott@google.com> Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev
7cfb00fb9453346fa708158bcfeffd36783e31d9 28-Jan-2015 xinhe <xinhe@google.com> am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1
automerge: 5e51c21

* commit '5e51c21943a4e9c0096acbaee5f923e9e0297f25':
Sprint: MMS cannot be sent in the UK
5e51c21943a4e9c0096acbaee5f923e9e0297f25 28-Jan-2015 xinhe <xinhe@google.com> am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1

* commit '93487e286e6bfa434fb092c6276d96b40e5d62c4':
Sprint: MMS cannot be sent in the UK
d456ec4be1d2310c498dda2c7319562754ad643e 28-Jan-2015 Stuart Scott <stuartscott@google.com> Change getDeviceId to take phoneId.

bug:18827144
Change-Id: I32196f842504e63f4ddd45401e83e73afae81ad5
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IPhoneSubInfo.aidl
6620b4273ef6a1489e091a6b6cc766c0eff30f8d 28-Jan-2015 xinhe <xinhe@google.com> Sprint: MMS cannot be sent in the UK

This is due to Sprint network at UK is actually GSM/UMTS. Thus we need GSM phone with CSIM to provide Nai too.

Bug:18241756
Change-Id: Icec10c88834151f5e35e38db93af36d7f40890fd
ndroid/telephony/TelephonyManager.java
fe0e33495c63542ea04be3879b97c03119c2f88b 21-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f
automerge: 52f25f7

* commit '52f25f7b30b684a46814cff60538e6a7636ed618':
Add + code handling logic for SMS Global Roaming
52f25f7b30b684a46814cff60538e6a7636ed618 21-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f

* commit 'b73f431dddc0ba9260a342f2322e818460cf6f34':
Add + code handling logic for SMS Global Roaming
63e77bf8a5be6844bd8fd9d07cd303f6dc72c64e 21-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am f0f5eee8: Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 automerge: 76e9d18

* commit 'f0f5eee8238284aad08fd573959392542e57a8ab':
Fixed a crash in TelephonyManager while calling getDeviceID()
f0f5eee8238284aad08fd573959392542e57a8ab 21-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760
automerge: 76e9d18

* commit '76e9d18055d131bede49886c9c86c9f59db3fac4':
Fixed a crash in TelephonyManager while calling getDeviceID()
201cc00947bceb71166d0800fb770eedb4ccb3f1 20-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Fixed a crash in TelephonyManager while calling getDeviceID()

Bug: 19056848
Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f
ndroid/telephony/TelephonyManager.java
c0fa70ee195e25eb470223d2a1de855e455d21c5 17-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am 60b41e6a: am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev

* commit '60b41e6aa7a93bf90cb1b7715a2429dbe7c975fe':
Modify getDeviceId() to get device id independent of Subscription.
60b41e6aa7a93bf90cb1b7715a2429dbe7c975fe 17-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev

* commit '543348eb94624907102c1baffe5bdaf1087fede8':
Modify getDeviceId() to get device id independent of Subscription.
d2dd69ae8d81defc5f2286690b3dd246d4118fcc 17-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev
2a3e8c729d2e5c166775d6810346406b4fcc2eb0 15-Jan-2015 Stuart Scott <stuartscott@google.com> am e2b9d5b5: am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev

* commit 'e2b9d5b56c6b06418e85cd49afd87e0d08f57c71':
Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
568e54be71731bdbcd5338385eb6cc6a082c9456 15-Jan-2015 Jorim Jaggi <jjaggi@google.com> resolve merge conflicts of 87f5369 to master.

Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
e2b9d5b56c6b06418e85cd49afd87e0d08f57c71 14-Jan-2015 Stuart Scott <stuartscott@google.com> am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev

* commit '542f4ee61986e2a2883211f229a1b3ad23ceca81':
Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
98b8cf2c8029836d19cfa7c19fbf66e6d0b62efb 14-Jan-2015 Stuart Scott <stuartscott@google.com> am 2d68b428: am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev automerge: dfb99e8

* commit '2d68b428b06df4f91ffd12c01ccbac61ce9cb163':
Update javadoc and hide getNameSource and getDataRoaming.
400a3f6df20b92e639f20956301a36beb67b511b 14-Jan-2015 Stuart Scott <stuartscott@google.com> Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.

bug:19015551
Change-Id: Ibcad6424695a97bd9ae123010bdf740449d09327
ndroid/telephony/SubscriptionInfo.java
ndroid/telephony/SubscriptionManager.java
0b7f5e81ba06f694df8c8cccaea9e009e3200b4c 14-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Modify getDeviceId() to get device id independent of Subscription.

+ Add getDeviceId() in ITelephony to find device id independent of
subscription.

Bug: 18780202
Change-Id: I21cc38418eb7f4f1b300c6372e1dc7548385c112
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
427e7162ca02473069b48affeadb1216184c1724 14-Jan-2015 Junda Liu <junda@google.com> am ead01845: am 6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev

* commit 'ead0184548fdd341f5903d9ce35604c926dcddde':
Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
6e41019633975358cf2f84c5d1e09e6e3a049875 14-Jan-2015 Junda Liu <junda@google.com> Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev
2d68b428b06df4f91ffd12c01ccbac61ce9cb163 14-Jan-2015 Stuart Scott <stuartscott@google.com> am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev
automerge: dfb99e8

* commit 'dfb99e82740fe21006bb6972af6af610ed12edbe':
Update javadoc and hide getNameSource and getDataRoaming.
e3b0449b0f2fe9f4ed59bd0d209d6b992bfe4372 13-Jan-2015 Stuart Scott <stuartscott@google.com> Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev
3fb3abd10a5980a0a5afe7f0e54f736eff84b5a5 13-Jan-2015 Junda Liu <junda@google.com> Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.

Bug: b/18983535
Change-Id: I937b7ce38615e07f653d3ee02d734edfcfea3897
ndroid/telephony/TelephonyManager.java
494601e39aa242d122406277a96fd71a5f8b46c0 13-Jan-2015 Wink Saville <wink@google.com> am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
automerge: 9482799

* commit '948279954ac88ecfd0678713158175702d981c73':
Rename reg/unreg OnSubscriptionsChangedListener.
4abdd079498801edf6d144ba6d6965d4cb00e91e 13-Jan-2015 Stuart Scott <stuartscott@google.com> Update javadoc and hide getNameSource and getDataRoaming.

Note SubscriptionInfo was not public in 21 and 22 hasn't been released yet.

bug:18983672
Change-Id: I9e8684eea2462fb655846d0719158d54007fabc5
ndroid/telephony/SubscriptionInfo.java
948279954ac88ecfd0678713158175702d981c73 13-Jan-2015 Wink Saville <wink@google.com> am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev

* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
Rename reg/unreg OnSubscriptionsChangedListener.
071743f0cbbfab36150db6ec945452579d02e8dd 13-Jan-2015 Wink Saville <wink@google.com> Rename reg/unreg OnSubscriptionsChangedListener.

To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
ndroid/telephony/SubscriptionManager.java
om/android/internal/telephony/ITelephonyRegistry.aidl
a423a279f6297bb9422fc8841651348c2fcc7b7a 12-Jan-2015 sohryun.shin <sohryun.shin@lge.com> Add + code handling logic for SMS Global Roaming

When sending SMS from international CDMA NANP country, outgoing SMS is failed due to + code converting.
(Send a SMS text message: to an international phone number using the plus code (+)).

In kitkat, when user send a sms with plus code, the "+" converted to 011(NANP_IDP_STRING). And it works well.
However, in lollipop, the "+" converted to current IDP, not NANP_IDP_STRING. And it failed to send the SMS.

I think, we need to seperate SMS and Call logic like cdmaCheckAndProcessPlusCodeForSms and cdmaCheckAndProcessPlusCode.
sohryun.shin@lge.com

Change-Id: Ie9d402cbeb4de4ac30299d5820b33909d0e40320
ndroid/telephony/PhoneNumberUtils.java
95cde2dc211f51deed6da2836d1bc7b23988782d 09-Jan-2015 Ben Gilad <gilad@google.com> API to satisfy the dependency in https://go/contacthandler1135

Bug: 17586396
Change-Id: I10bad15b4db3ec8928316507119c529c5d1f304b
ndroid/telephony/PhoneNumberUtils.java
0d2f2fb0be4261f00e45c8ebb7999ddea8d1f9e3 06-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> am 0994d12b: am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly"

* commit '0994d12b0d37f81b4b5b619b82db6bc20b3b6384':
Telephony: Initialize GsmCellLocation class members properly
0994d12b0d37f81b4b5b619b82db6bc20b3b6384 06-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly"

* commit 'd38218d880f02951015733a3d3e00deb546465bf':
Telephony: Initialize GsmCellLocation class members properly
e4ec09da0b4a31e23f1a19bdd1ea99e0f87cadac 21-Oct-2012 Srikanth Chintala <srikchin@codeaurora.org> Telephony: Initialize GsmCellLocation class members properly

Default values for class members mLac, mCid, mPsc would be 0.
Initialize these variables with -1 as 0 is considered as valid value.

CRs-Fixed: 406479
Change-Id: Idb3d1737c7101b97a90eab3dc7436ee1806d0bc4
ndroid/telephony/gsm/GsmCellLocation.java
6162c699ad04b5dc8878ea4c77c28be8fbbd7931 28-Dec-2014 Amit Mahajan <amitmahajan@google.com> am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev automerge: 4f68c0c
automerge: 4b2cbae

* commit '4b2cbae9cfd941633eadf9b667b3e3e0372c1ad2':
IMS: add the api to get IMS registration information.
4b2cbae9cfd941633eadf9b667b3e3e0372c1ad2 28-Dec-2014 Amit Mahajan <amitmahajan@google.com> am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev
automerge: 4f68c0c

* commit '4f68c0c1d8811d610021d97839af303c2752eff2':
IMS: add the api to get IMS registration information.
0303be4a8ac109e52b2581b7c6a94b27c581f84f 18-Dec-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: add the api to get IMS registration information.

Bug: 18668325
Change-Id: Ie694c7f1cc12a573cbef2815199ae6c91cf8088e
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
15c446b5e5a27fc7657942156776d460cdcbadb2 19-Dec-2014 Wink Saville <wink@google.com> am 7c580cab: am b5f1e878: Fix build breakage.
automerge: 7478d51

* commit '7478d51f7042f6b78741058668060e87ce80a703':
Fix build breakage.
7478d51f7042f6b78741058668060e87ce80a703 19-Dec-2014 Wink Saville <wink@google.com> am 7c580cab: am b5f1e878: Fix build breakage.

* commit '7c580caba94ca3b917c887b9e8353809c7f320c7':
Fix build breakage.
b5f1e878d1bc245b676a1a2504c30d21a311bf6c 19-Dec-2014 Wink Saville <wink@google.com> Fix build breakage.

I rebased a change and didn't compile, my mistake.

Change-Id: Iad7fc609b08d53aa7b8b96af609e3ff9a4f0e889
ndroid/telephony/RadioAccessFamily.java
97b6ab4862839da56b4df6437b14314f74d328b6 19-Dec-2014 Wink Saville <wink@google.com> am 57859d70: am f73c2d1f: Update mapping between RAF and Network Type.
automerge: 700b8f0

* commit '700b8f080ae39345b7174deea3c8acf6e1b51972':
Update mapping between RAF and Network Type.
700b8f080ae39345b7174deea3c8acf6e1b51972 19-Dec-2014 Wink Saville <wink@google.com> am 57859d70: am f73c2d1f: Update mapping between RAF and Network Type.

* commit '57859d704ef2bc61798c172c4524596393f0beef':
Update mapping between RAF and Network Type.
1bb25d4d7b77ba8fe91beeed76e4f15e91b6bcc8 19-Dec-2014 Wink Saville <wink@google.com> am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev
automerge: 7b727e2

* commit '7b727e2e0aedef50aba8e3d4081a643b79329497':
Update mapping between RAF and Network Type.
7b727e2e0aedef50aba8e3d4081a643b79329497 19-Dec-2014 Wink Saville <wink@google.com> am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev

* commit 'aa40537ca56ce386edcdaed2d21a9e2f07975812':
Update mapping between RAF and Network Type.
f73c2d1f0b6d55668c19493fba0088a69e6b128f 17-Dec-2014 Wink Saville <wink@google.com> Update mapping between RAF and Network Type.

bug:18754476
Change-Id: I5bdb8df192610b831a418ae810fe4f3b96c30f77
ndroid/telephony/RadioAccessFamily.java
63c79ce4bfef7e8de7939be3de8a539938d9fc4e 19-Dec-2014 Wink Saville <wink@google.com> Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev
dba700ef43ba81e8905ca883301613d6154f0b9a 18-Dec-2014 Amit Mahajan <amitmahajan@google.com> am e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev automerge: eac6db5
automerge: ea1656f

* commit 'ea1656f408376d71b124d1ea62116862731aa4ab':
Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
ea1656f408376d71b124d1ea62116862731aa4ab 18-Dec-2014 Amit Mahajan <amitmahajan@google.com> am e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev
automerge: eac6db5

* commit 'eac6db511b02ebf398a5e70eb70a7a5f05133945':
Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
e69b5d68c2a52d867a614ff0ca378de4ec7d0f54 18-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev
2a65688d40dd4f82b217b53eabc63ca41b7ad73c 18-Dec-2014 Amit Mahajan <amitmahajan@google.com> Change to write (create) setting+subid if it does not already exist
when it is queried for the first time.

Bug: 18791109
Change-Id: Ib9dae9401a18f1ec0eb0477486c7c7e4cb0364b0
ndroid/telephony/TelephonyManager.java
2e0af53de91a0ba90ea97e515ad05407f911000a 18-Dec-2014 Raph Levien <raph@google.com> am 51004268: am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev
automerge: 28e6910

* commit '28e691010f2990825c2e30ea244ba3bbac935725':
Preserve leading "+" in phone numbers
28e691010f2990825c2e30ea244ba3bbac935725 18-Dec-2014 Raph Levien <raph@google.com> am 51004268: am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev

* commit '510042688ad8ffee499974b45551cfdf528f86da':
Preserve leading "+" in phone numbers
0b6e78d9971c61877ca312801fd8258aec352231 18-Dec-2014 Raph Levien <raph@google.com> Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev
3c78e6a35e881f9ac25c14920d32f5e036f86cc2 16-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev
automerge: 4abd09f

* commit '4abd09f773a938fe006e4cc0839f0dc6023cb2f3':
IMS OMA-DM Intent and ImsReasonInfo Additions
4abd09f773a938fe006e4cc0839f0dc6023cb2f3 16-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev

* commit 'ab4f9976e0cade0009223681ecc5ff49df160dd7':
IMS OMA-DM Intent and ImsReasonInfo Additions
827fcb7f8dfbf694e1838e1e3e4432ef4f45949f 04-Dec-2014 Omkar Kolangade <omkark@codeaurora.org> IMS OMA-DM Intent and ImsReasonInfo Additions

Adding an intent for OMA-DM use case where
the network sends a string error indicating
the device is not provisioned to make calls.
The string the network is expected to send
is added to ImsReasonInfo.

Bug: 18242739
Change-Id: If7f654f834f543523af40b422ea9659c5f0b4de4
om/android/ims/ImsReasonInfo.java
om/android/internal/telephony/TelephonyIntents.java
50e922849399f12d2411a29b2199d8202087492d 16-Dec-2014 Raph Levien <raph@google.com> Preserve leading "+" in phone numbers

The normalizeNumber method in PhoneNumberUtils preserves a leading "+"
but only if it's the first character in the string. Thus it gets
dropped if there is leading punctuation such as "(". This patch
preserves the leading "+" as long as it would be the first character
in the normalized phone number.

Bug: 18418335
Change-Id: Ifcb1d3dd6c2943c729f570e7f3c90d1da9ee8b4b
ndroid/telephony/PhoneNumberUtils.java
482b4246c25164f8a55c473acec1d2ca9a9e08d2 13-Dec-2014 Stuart Scott <stuartscott@google.com> Update mapping between RAF and Network Type.

bug:18754476
Change-Id: Ibca856fe10bc4a7dc620ab7936a70d1f0427fe56
ndroid/telephony/RadioAccessFamily.java
33dba3d4d381350a4ee1ce72162155c3d78093bc 15-Dec-2014 Amit Mahajan <amitmahajan@google.com> am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev
automerge: 98cc133

* commit '98cc133f077ba393d6c9a6e302c3e89ade64247f':
Change to treat slotId 0 emergency numbers as default.
98cc133f077ba393d6c9a6e302c3e89ade64247f 15-Dec-2014 Amit Mahajan <amitmahajan@google.com> am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev

* commit '2fab5307d1983b0415b7eeb79779ecaee7b67ea1':
Change to treat slotId 0 emergency numbers as default.
d060b50b331f540d42c91501d820e3c2601dec18 15-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev
d9835f0c16b01847b7b3f6a1d4620912fb4206c2 12-Dec-2014 Amit Mahajan <amitmahajan@google.com> Change to treat slotId 0 emergency numbers as default.

Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
ndroid/telephony/PhoneNumberUtils.java
6cc211669c64878942ee93f592d9c2780f9607a0 12-Dec-2014 Wink Saville <wink@google.com> am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge: 6cc44cc
automerge: 05e2ada

* commit '05e2ada58a79994170e8e98ff9a619715cdddc28':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
05e2ada58a79994170e8e98ff9a619715cdddc28 12-Dec-2014 Wink Saville <wink@google.com> am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
automerge: 6cc44cc

* commit '6cc44cce0e375b165580a8061359b2ff163a4556':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
a54bf6583380cf328b9858d942b4c387c6163f0f 11-Dec-2014 Wink Saville <wink@google.com> Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
ndroid/telephony/SubscriptionManager.java
072c7638afe9de3fe073cd0e824d41405e6401ff 11-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev automerge: b07de8d
automerge: de67144

* commit 'de6714474d9d54c5ba0d6a83eafe5ecb96bf337e':
Add missing member to string conversion - helps in debugging.
de6714474d9d54c5ba0d6a83eafe5ecb96bf337e 11-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev
automerge: b07de8d

* commit 'b07de8d172e7c7b663dec0dd14f7d6dba168aa4c':
Add missing member to string conversion - helps in debugging.
fda0ff020d2ce63e4010e24d5f4bebf7fbe026c5 11-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev
f864e449010d18edd9a8e4594d8df27003f38fc5 11-Dec-2014 Shishir Agrawal <shishir@google.com> am 23172c70: am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd

* commit '23172c706b0422ec2cc5bb9e1988a3bd2944a257':
Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
23172c706b0422ec2cc5bb9e1988a3bd2944a257 11-Dec-2014 Shishir Agrawal <shishir@google.com> am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd

* commit '960dccebf576d53059fd7d026cdd1b81fb0b5974':
Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
951dcdd9404054f6b7e794b18aad6f50e44732f9 11-Dec-2014 Shishir Agrawal <shishir@google.com> Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev
51090417312e46d5d8d7f7b463fa3ae40ba9dd33 10-Dec-2014 Wink Saville <wink@google.com> am 3a426694: am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev automerge: afd6f5a

* commit '3a426694ffa268b331c5b1fc5bb40460d6d883c5':
Update API and documentation for invalid subscriptions id's
3a426694ffa268b331c5b1fc5bb40460d6d883c5 10-Dec-2014 Wink Saville <wink@google.com> am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev
automerge: afd6f5a

* commit 'afd6f5a37ec4c39fffdb5f29fff7450284a3c562':
Update API and documentation for invalid subscriptions id's
db45a01e229f8af7fa36874230e47deb636727d4 10-Dec-2014 Etan Cohen <etancohen@google.com> Add missing member to string conversion - helps in debugging.

Change-Id: I0c8b58f69adcd89038a2c320c9d75172b7a10d5c
om/android/ims/ImsCallProfile.java
eb4de87683a0d1959d64af08f3685e1b3701a314 10-Dec-2014 Wink Saville <wink@google.com> Merge "Update API and documentation for invalid subscriptions id's" into lmp-mr1-dev
1263d0cd39f3bd8f0a922656a92597bc9f04d363 10-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> am 6549e9be: am 1e989df5: am 49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev

* commit '6549e9be44d2370b624079c0a8ead95c9588afb7':
IMS: change getMasterValue to getProvisionedValue.
4ef46266d3c588ee51079dd872df95b83466a08c 10-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> am 863fb4dd: am d2762ca9: am 14370741: Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev

* commit '863fb4ddcac01849b66025e202302b8e1431d7e9':
IMS: add ImsConfig api to get volte provisioned value.
189c1808574b11b44b0d08b39426313778e27404 10-Dec-2014 Wink Saville <wink@google.com> am 7a4df2b7: am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev

* commit '7a4df2b7d8fc162881dd482fb13fe85c780d0351':
Add subId as parameter for get/setDataEnabled.
b328d72057234c2ea0bebd07f3eec5858d59469f 10-Dec-2014 Narayan Kamath <narayan@google.com> am 8ff1a5ee: am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."

* commit '8ff1a5ee0df9abba4fc63bcfc93efbda4a176255':
Fix PhoneStateListener constructor javadoc.
22595d9c4398a3e977156f821760f62366d2386a 10-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> am 963db3fa: am c67da06d: am 0f78ad87: Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev

* commit '963db3fa697016051a570ccb2d6b566db4f2d594':
IMS: start and stop dtmf tones.
a9f6048a94a4a7edb36955693ecba5e5c858e303 09-Dec-2014 Jeff Sharkey <jsharkey@android.com> am d5b5576d: am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev

* commit 'd5b5576dd6565a61030d7769a44bd5189242a7e2':
Offer to "merge" subscribers for data usage.
6549e9be44d2370b624079c0a8ead95c9588afb7 09-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> am 1e989df5: am 49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev

* commit '1e989df50d3435c47c8685caabb463ec34f59840':
IMS: change getMasterValue to getProvisionedValue.
863fb4ddcac01849b66025e202302b8e1431d7e9 09-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> am d2762ca9: am 14370741: Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev

* commit 'd2762ca9bcb902cc9c66d26ac4268d14a164c46e':
IMS: add ImsConfig api to get volte provisioned value.
5fb1118d8c8a19bbbf4abc679b55f08cdfb79ba8 26-Nov-2014 Shishir Agrawal <shishir@google.com> Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.

The calls allow us to specify MCC/MNCs (for GSM) and SIDs for CDMA that should
not be considered as roaming for the current ICCID.

Bug: 13288143

Change-Id: Iae97b02f3eb9954fedf1b005c9ecd2aa09138505
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
7a4df2b7d8fc162881dd482fb13fe85c780d0351 09-Dec-2014 Wink Saville <wink@google.com> am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev

* commit '2f5cb843553a596d314596c2bb776541db864d63':
Add subId as parameter for get/setDataEnabled.
2cdac3bd53a1e8e8342a3cff9d53bb7c5b27b1c9 31-Oct-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: change getMasterValue to getProvisionedValue.

Bug: 18576107
Change-Id: I21293d42b87911a98af8169b697d0e40eafb8760
om/android/ims/internal/IImsConfig.aidl
bec2c3e25124552c6c86a1c1723ce3562edcaaff 07-Dec-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: add ImsConfig api to get volte provisioned value.

Bug: 18576107
Change-Id: I22d9f675ec607c30906b36cdab72e4d25463ecf5
om/android/ims/internal/IImsConfig.aidl
15b29ac7faf3b8b7845e6623f68ae7a7391dab78 09-Dec-2014