History log of /frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
5b58978562c11e704b42a745bda55d6319a9b0c8 22-May-2017 Tyler Gunn <tgunn@google.com> Add more logging for USSD codes.

Test: Manual
Bug: 37561464
Change-Id: I8bbb78865b4ca48977cb84a90d88b58920bb5643
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
feefaf43d83ee53c9f9798206a387448f233f7a9 26-Apr-2017 Tyler Gunn <tgunn@google.com> Fix issues with MMI/USSD codes.

There a few issues here:
1. The queuing of MMI codes for handUssdRequest was not working properly.
I have removed it in favor of returning an error if there is an ongoing
MMI code. The functionality was pretty broken and despite my efforts I
could not sort all of it out well enough to be confident that it could be
fixed.
2. There was no attempt to retry handleUssdRequest calls on IMS.
3. There was a missing fallback to CS for regular MMI requests.

Test: Manual
Bug: 37484804
Merged-In: I8b2ed5ed9c29cdf95532096d60487656946b4cc0
Change-Id: I8b2ed5ed9c29cdf95532096d60487656946b4cc0
(cherry picked from commit 3aa9ed7d17a6b8401d71d9e09dce873038ec6b28)
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
5b83d07ba19e20cf2811824cc2bed96953d1134d 18-Apr-2017 Jack Yu <jackyu@google.com> Fixed roaming related issues

1. the data enable check will be performed in trySetupData so
there is no need to add additional check in onRoamingOff and
onRoamingOn.

2. Do not trigger set initial attach apn and set data profile
in onRoamingOn (revert this behavior back to N-MR2).

3. Renamed getDataOnRoamingEnabled to getDataRoamingEnabled
for consistency.

bug: 30936226, 37280015
Test: Telephony sanity tests

Change-Id: I30ce763468b3068ecd80ab2a6a313b6284016909
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
468e5725d5fcc44672c074e166e8ce05e8e9a151 13-Apr-2017 Shuo Qian <shuoq@google.com> ECBM SystemProperty cleanup

- add a 'set' method in phone.java, and use it to set ECBM system property
and mIsPhoneInEcmState variable
- use isInEcm() method in the phone.java to read mIsPhoneInEcmState

Change-Id: Ie3882d1e9285904a17def68993987ae0549941a7
Test: manual
Bug: 30361624
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
2a6f16b0f3b954fa122f0b22b0d821f83b0a810f 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: If3b87f071e1e38d19008bdea3d7401802d72f5ad
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
b84f81fc061a131de05815a7b35d3e17adfc785a 09-Mar-2017 Adrian Salido <salidoa@google.com> Merge "Revert "Get rid of RIL version."" am: 6514905475 am: cd7b721ab6
am: c39906967f

Change-Id: I55dac4d7ee85fb890d8b08c22ffe6bf7c8835cb3
cd7b721ab6d4631fc899add2b64da08bcbccc080 09-Mar-2017 Adrian Salido <salidoa@google.com> Merge "Revert "Get rid of RIL version.""
am: 6514905475

Change-Id: I14f1c448e55cedfb09f7af2e73daffd8d5ca1e5d
6514905475910fe5bbabc98e237b0ee61377a0f2 09-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Revert "Get rid of RIL version.""
a56f405d3006b1d8378b5f7757a5613b75fa8fb4 09-Mar-2017 Adrian Salido <salidoa@google.com> Revert "Get rid of RIL version."

This reverts commit 81ea341d2deb767cbd1de2f356296ad92e951c52.

Bug: 36018228
Change-Id: Iee0410f197c2869e2bdefcaaae51e7ef215cdff1
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
eb2b3468f808fc5e8ebeee7bdfa12fc20be50e2c 06-Mar-2017 Umashankar Godachi <umasha@codeaurora.org> Merge "Read the voice message count properly" am: f131beed5f am: df760f5d0b
am: f2416f6134

Change-Id: I545d840ab7938f922c0c266afb75da46ac36014d
df760f5d0badb4767c3edf3cb863e50b6a5f9cd0 06-Mar-2017 Umashankar Godachi <umasha@codeaurora.org> Merge "Read the voice message count properly"
am: f131beed5f

Change-Id: Ic94440abc9b0c60885ddc0e822fb2bbc5ffc863c
f131beed5fe048131f13842e909f52fb35375615 06-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Read the voice message count properly"
091c17e62f5f0fbdfd3e564a23b237ffffe26bbb 04-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge changes I61f19621,I70faef33 am: ef4062e157 am: 26c10b1d02
am: b33edcb0e0

Change-Id: I7d8cac4e04a8546e95bb2d19521ffb63b5bd2c06
26c10b1d02ae46c0bd255ab1962100bafee21498 04-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge changes I61f19621,I70faef33
am: ef4062e157

Change-Id: Iea4856878a41d2cd2489a49c8d08251d06130aa8
81ea341d2deb767cbd1de2f356296ad92e951c52 03-Mar-2017 Amit Mahajan <amitmahajan@google.com> Get rid of RIL version.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: I61f19621dd86622faecca77c4dadf3ced81e9c21
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
6432c2f4a4f438b72fa0d4b51d5098b179935868 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

Bug: 33414487
Change-Id: I1f7a8169ca21d7bc3ecd8d996b9f496a0f044662
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
6a9915465544d6a4ccbd9fcae3c0049c1d176a02 02-Mar-2017 Jack Yu <jackyu@google.com> Merge "Added device state monitor"
am: 442a1aa29c

Change-Id: Ib89768a88380cfc4d33bbaa81acdea509e647f2a
50b941e59787a21dd2d4f3d25d700538efb9abc5 18-Feb-2017 Jack Yu <jackyu@google.com> Added device state monitor

Added DeviceStateMonitor to replace the legacy screen state RIL
API. Instead of sending the screen state to the modem, the new
device state monitor can explicitly turn on/off the unsolicited
response from the modem based on difference scenarios (e.g.
tethering, charging, screen state). It also sends more device
state to the modem including charging state, power saving state,
and low data expected state.

Note that in order to support the old vendor RIL, framework will
still invoke the legacy screen state API to ensure the best
user experience on those devices.

Test: Manual. Unit tests.
bug: 32223897, 20125037, 28294587

Merged-In: I76ce307bde1d3160af2ac44a57f101e4cafc7ae4
Change-Id: I76ce307bde1d3160af2ac44a57f101e4cafc7ae4
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
baecdb610b30a5d4b35345f8fc63fcbc2133c149 18-Feb-2017 Jack Yu <jackyu@google.com> Added device state monitor

Added DeviceStateMonitor to replace the legacy screen state RIL
API. Instead of sending the screen state to the modem, the new
device state monitor can explicitly turn on/off the unsolicited
response from the modem based on difference scenarios (e.g.
tethering, charging, screen state). It also sends more device
state to the modem including charging state, power saving state,
and low data expected state.

Note that in order to support the old vendor RIL, framework will
still invoke the legacy screen state API to ensure the best
user experience on those devices.

Test: Manual. Unit tests.
bug: 32223897, 20125037, 28294587
Change-Id: I76ce307bde1d3160af2ac44a57f101e4cafc7ae4
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
b3d35514c79ef1549b49dc7f6749b0e6672fc202 01-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Support for detection of international call while on WFC only."
am: 3320f824a7

Change-Id: If1bd8144926ee73f4f49fd5865de4d081419e094
70241c533c2afa505b13257b6b22c0abfcc44d27 27-Feb-2017 Tyler Gunn <tgunn@google.com> Support for detection of international call while on WFC only.

Adding new method to detect scenario where we are on WFC only and attempt
to make an international call.

Test: Manual, unit
Bug: 33272455
Merged-In: I5d83710a67b0ebf40df29df87456d92af9bff08b
Change-Id: I5d83710a67b0ebf40df29df87456d92af9bff08b
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
d998341fb997fb145db8c41838c2699b2bb84151 27-Feb-2017 Tyler Gunn <tgunn@google.com> Support for detection of international call while on WFC only.

Adding new method to detect scenario where we are on WFC only and attempt
to make an international call.

Test: Manual, unit
Bug: 33272455
Change-Id: I5d83710a67b0ebf40df29df87456d92af9bff08b
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
4b9edae9820978691082673e51798c793833ad25 15-Jul-2016 Umashankar Godachi <umasha@codeaurora.org> Read the voice message count properly

When Voice message count is available from
EF, do not read from preference.

Bug: 35025528
Change-Id: Id87ed25f7f912674e405e92b44a5140cd4b29cf7
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
db053b8d8756c0687530a9dcf7881ba2473b41fc 23-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Adds logic to display UI if call forwarding is not enabled on 3gpp"
0b258ef391446b24698e95a4be1b54f31863f370 16-Feb-2017 Meng Wang <mewan@google.com> Merge "Don't dial non-emergency CS voice call in airplane mode" into nyc-mr2-dev am: d837aaa36e
am: 479f68ea8e

Change-Id: I89c88af51fe388c85ab4805fb318ac896dd2750e
479f68ea8e7c0ce6feca3957bf931fd766b63e61 16-Feb-2017 Meng Wang <mewan@google.com> Merge "Don't dial non-emergency CS voice call in airplane mode" into nyc-mr2-dev
am: d837aaa36e

Change-Id: I65a5659f78d73531cb752c0141750f756266e627
16ebf27f93b3c8c5aaf4aa6a169a63a2dae5f436 14-Feb-2017 Meng Wang <mewan@google.com> Don't dial non-emergency CS voice call in airplane mode

Added a new CallStateException error code ERROR_POWER_OFF

Bug: 28709116
Change-Id: Ia63196d5e8c051a91da3e2a7e60ac605dccf8344
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
8731e19d9241b13b4ec081cc45483f14cbd21d56 13-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL solicited responses - 2" am: a929fd2527 am: ac8e9ddade
am: ff31314219

Change-Id: Ia39fd7a27d579bdfcdaa79284aaecdb82455176d
ff31314219045adce134fb0e3e2f57dd75661df6 13-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL solicited responses - 2" am: a929fd2527
am: ac8e9ddade

Change-Id: Icf692878d50fbc9d109e003d8be8e0b10d0301d6
b9eb17185ff4a547c23628423cb43cef1fdcd453 13-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL solicited responses." am: b3fa27360b am: 18da34f372
am: 76bbecef7a

Change-Id: Idca01fcbd85c687fc44cd8b323cbc11de1f74c70
76bbecef7a8f0bef43e82f8622be1f2f92dfee3b 13-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL solicited responses." am: b3fa27360b
am: 18da34f372

Change-Id: Ifb33baba58b1bdd378495417e7ebf6186320179b
9be7c26f29b4ba23409a197220063595cc80664d 01-Feb-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL solicited responses - 2

Test: Basic telephony sanity
Bug: 32020264
Change-Id: Ib2e70b94b401b8ab3e8968134e4dd20ec29ab989
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
d8fe3ba2e6fbc96e80609f694cb0031ef40371e4 10-Feb-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL solicited responses.

Bug: 32020264
Merged-in: Ib72f2443fb0580092e0f8560a40d3fb9b182887e
Change-Id: Ib72f2443fb0580092e0f8560a40d3fb9b182887e
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
522fc0602d60895881b33243030dd40d5778e4a9 01-Feb-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL solicited responses - 2

Test: Basic telephony sanity
Bug: 32020264
Change-Id: Ib2e70b94b401b8ab3e8968134e4dd20ec29ab989
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
0b0cc77567c31c3bc3691d001b18f79300e1a4f3 10-Feb-2017 Sooraj Sasindran <sasindran@google.com> Expose api to retrieve wakelock information per client
am: 4a39e21efe

Change-Id: I9dbf0b2355887edee8e48c713a25c1c3eed96a5a
a46dc426a10a9d3c95cca80a80d9c0759459cb4f 10-Feb-2017 Amit Mahajan <amitmahajan@google.com> Revert "Revert "Client (framework) side HAL changes for RIL solicited responses.""

This reverts commit 71173a876ff48d65e013f0a92e920d90fa7a26c7.

Bug: 32020264
Change-Id: Ib72f2443fb0580092e0f8560a40d3fb9b182887e
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
4a39e21efe21028b97aa0545702f5c405cc44cf4 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

Test: Through logs confirmed that the wakelock decrement is happening
correctly
BUG=31041780
Merged-In: Id8ca0006478212c006a103b83fb720532e9c0fab
Change-Id: Id8ca0006478212c006a103b83fb720532e9c0fab
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
3ca46e47a43504ea95d4daf18705468f91f23f70 10-Dec-2016 Brad Ebinger <breadley@google.com> Adds logic to display UI if call forwarding is not enabled on 3gpp

If call forwarding is configured to not be allowed while roaming
on a 3gpp network by a carrier, we will now display descriptive
UI to the user indicating the problem if an MMI code fails.

Test: Manual
Bug: 30106345
Merged-In: I9626dea3546518bb81ea0ef9af647e37f6f2165d
Change-Id: I9626dea3546518bb81ea0ef9af647e37f6f2165d
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
8b38cd985149b459969dd2ac9e8013d852dc6760 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

Test: Through logs confirmed that the wakelock decrement is happening
correctly
BUG=31041780
Merged-In: Id8ca0006478212c006a103b83fb720532e9c0fab
Change-Id: Id8ca0006478212c006a103b83fb720532e9c0fab
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
71173a876ff48d65e013f0a92e920d90fa7a26c7 08-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Revert "Client (framework) side HAL changes for RIL solicited responses."

This reverts commit 58ebf98e4f31ee719973bbd1b8797b2a78fa1438.

Bug: 35104859
Change-Id: I69957985048e2dd45ffa6d413f579cb06405baa9
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
58ebf98e4f31ee719973bbd1b8797b2a78fa1438 31-Jan-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL solicited responses.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: I6c830fb5dcf43676d00a6a8e52aa7b4b8562eebe
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
94344fb8d5689abe429dca3c3d44d252ae952391 19-Dec-2016 Brad Ebinger <breadley@google.com> Adds logic to display UI if call forwarding is not enabled on 3gpp
am: 60109aa769

Change-Id: Id8b282bd6228a982881ea67d6c1a669b019702b9
60109aa7699e540f1ce8a9bb5a65055a0312603a 10-Dec-2016 Brad Ebinger <breadley@google.com> Adds logic to display UI if call forwarding is not enabled on 3gpp

If call forwarding is configured to not be allowed while roaming
on a 3gpp network by a carrier, we will now display descriptive
UI to the user indicating the problem if an MMI code fails.

Test: Manual
Bug: 30106345
Merged-In: I9626dea3546518bb81ea0ef9af647e37f6f2165d
Change-Id: I9626dea3546518bb81ea0ef9af647e37f6f2165d
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
e48f325a296ce0e74415dd737c7d461b021b0fcc 10-Dec-2016 Brad Ebinger <breadley@google.com> Adds logic to display UI if call forwarding is not enabled on 3gpp

If call forwarding is configured to not be allowed while roaming
on a 3gpp network by a carrier, we will now display descriptive
UI to the user indicating the problem if an MMI code fails.

Test: Manual
Bug: 30106345
Change-Id: I9626dea3546518bb81ea0ef9af647e37f6f2165d
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
7dcde10d804e1c0234b6f3ce7d9fab29efc904b6 30-Nov-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix MSIM issue of broadcast intent overwritten unintentionally" am: 22cef0502e am: dd6d6cfe84 am: cf23ddf553
am: 9896f9919c

Change-Id: I60c29c8f3f1bd3546985c0a453d53f25c6e0ed0b
cf23ddf55393f87ac55add514f3ca718d4588368 30-Nov-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix MSIM issue of broadcast intent overwritten unintentionally" am: 22cef0502e
am: dd6d6cfe84

Change-Id: Ia3025f1f75269db6d46cddab09b184ea02d69a75
dd6d6cfe8433333eb836dbf80eb968ea3a5cc931 30-Nov-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"
am: 22cef0502e

Change-Id: I491020287c868be0fa31434931420a1564f2d4a0
22cef0502ea1b7f78af03f0eb9bd2bd3e62793d9 30-Nov-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"
0769aad7f3cfe0de4366df13554829376c10986b 02-Jun-2016 Ping Sun <ping.x.sun@sonymobile.com> Fix MSIM issue of broadcast intent overwritten unintentionally

Since the following broadcast intents are differentiated only by extra
for each SIM, if intents for Slot1 and Slot2 are sent in succession,
Slot1 intent can be overwritten, causing loss of information. To prevent
the issue, remove "FLAG_RECEIVER_REPLACE_PENDING" from intent.
- ACTION_RADIO_TECHNOLOGY_CHANGED
- SPN_STRINGS_UPDATED_ACTION

Bug: 30296957
Change-Id: I281f8063b2bf10efe3165ea29305265bd9d3eb30
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
e0c7ad5cbbb33333cc623ae54f218cac6b105a2f 15-Nov-2016 Sudheer Shanka <sudheersai@google.com> Merge "Update usage of ActivityManagerNative."
eb1881bf05b659283c52c0986933709a5aad0982 14-Nov-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Provide an API to make USSD calls and read the responses."
800a988b95a4b9bc2bca2562108e54cd8bd21ee1 11-Nov-2016 Sudheer Shanka <sudheersai@google.com> Update usage of ActivityManagerNative.

Bug: 30977067
Test: N/A
Change-Id: I5a3934355e0a4bc47490c16b0dac3979c55d8d16
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
31399e10cf6d07509c4fbc294e24a9323214767f 03-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: I8551323474c4d708d50a81001272812e7b651abc
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
0be7e9840ed7e465e7013c8b331b2435652ddf9e 08-Nov-2016 Jordan Liu <jminjie@google.com> Merge "Merge isInEcm for GsmCdmaPhone and ImsPhone" am: 73e1b75da7 am: 502e879579 am: 9e3f41286e
am: a195de9894

Change-Id: Ieb5a02ac6f4d73d1ee7d6db7a8480598b01c046c
9e3f41286e5681f616137b73bd5b061a114085f8 08-Nov-2016 Jordan Liu <jminjie@google.com> Merge "Merge isInEcm for GsmCdmaPhone and ImsPhone" am: 73e1b75da7
am: 502e879579

Change-Id: I5420f084406669141c7cbecb0775712043d9fdab
502e879579f0c1d576fe969d759868913cdc6911 08-Nov-2016 Jordan Liu <jminjie@google.com> Merge "Merge isInEcm for GsmCdmaPhone and ImsPhone"
am: 73e1b75da7

Change-Id: Id0bc51809723f46050c5a2d3b865b2db42f0b0fe
73e1b75da778ddb942125a29e01ae2aefccf40a1 08-Nov-2016 Jordan Liu <jminjie@google.com> Merge "Merge isInEcm for GsmCdmaPhone and ImsPhone"
16b58d13bde6487c6993831ca63385915be8956e 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: I0d826eaadd1bd5a0c23cfad651c0423f7b7cc5f6
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
b049bcce54caf273fd930516b4cd813620aa0ce2 26-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_default_vm_number" am: bd9734a4ae
am: 2a0b347e9a

Change-Id: I2e71e6f7e6618649ae4dccb872f747d4d87ebd66
2a0b347e9a5f349ac0fe1220c8549a70643b8934 26-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_default_vm_number"
am: bd9734a4ae

Change-Id: Ia412832b377581f72b1d8dc0da22f0ef8f426d42
1237b674a1a1e5faf4489e552ec3317422d11685 17-Oct-2016 Jordan Liu <jminjie@google.com> Merge isInEcm for GsmCdmaPhone and ImsPhone

Merge mIsPhoneInEcmState and remove override in ImsPhone.

Fix: 30368080
Test: runtest --path GsmCdmaPhoneTest.java
runtest --path ImsPhoneTest.java
Change-Id: Iefcc7a2774605636beeafa466ae55f7a50699423
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
782d1005d624e003d80eb53ab1f1901a6aba6615 19-Oct-2016 Amit Mahajan <amitmahajan@google.com> Remove additional logic around broadcasting emergency call state changes am: 722f9a0f02 am: 7fc988a5d5
am: 06a15cd6cf

Change-Id: I88fc1be60448865b67d03e7d6bfd78b13d46a5b2
06a15cd6cf9946c67410b2e96dece77c90268080 19-Oct-2016 Amit Mahajan <amitmahajan@google.com> Remove additional logic around broadcasting emergency call state changes am: 722f9a0f02
am: 7fc988a5d5

Change-Id: Icdc491ff5a739bab203115e9b9127673614833b8
722f9a0f024c05ddc4cc7384f924e35be666fc07 10-Oct-2016 Amit Mahajan <amitmahajan@google.com> Remove additional logic around broadcasting emergency call state changes

Should be based only on carrier config. Wifi can decide if it should
disable on receiving the broadcasts based on its own config.

Bug: 31861987
Change-Id: If31d73deaea2a1e0bb34fbb33e594a3272732921
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
f271e16613936c9f9600f20ae88cd9b865b88c6a 02-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to config_default_vm_number

For the switch to CarrierConfig, update the methods used to set and get
this value to the new ones available through CarrierConfig.
Merged-In: I7fa7305dbdc708771bd87d092fdea88552515013

Bug: 29873049
Change-Id: I7fa7305dbdc708771bd87d092fdea88552515013
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
9fd206e3074915341de3f10948e9c75d41112f6d 30-Sep-2016 Chen Xu <fionaxu@google.com> Merge "simRecordLoaded registrants not notified for CDMA" am: 039a96b144 am: 3f6b95e9b6 am: 48d10abfd2
am: 45e836ec7b

Change-Id: Id4280cfdd2eb3e5ba8f4edd7c6fce6b579186e5d
45e836ec7b79111ce13df0855aa8c9841dd13378 30-Sep-2016 Chen Xu <fionaxu@google.com> Merge "simRecordLoaded registrants not notified for CDMA" am: 039a96b144 am: 3f6b95e9b6
am: 48d10abfd2

Change-Id: I59803730a67fa5f19e8a6c25cb940bad730e98a7
fa40a10c6cb76c998239b5af9417245532028103 30-Sep-2016 fionaxu <fionaxu@google.com> simRecordLoaded registrants not notified for CDMA

Bug: 31859450
Test: existing unit test still pass
- mPhone.registerSimRecordLoaded not get notified if phone type is
lteCdma

Change-Id: Id0420978fd8596f4a3db481480cf49e628cd9423
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
5709deaa68a13b632d3ef702d0051de459bb760e 02-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to config_default_vm_number

For the switch to CarrierConfig, update the methods used to set and get
this value to the new ones available through CarrierConfig.

Bug: 29873049
Change-Id: I7fa7305dbdc708771bd87d092fdea88552515013
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
8e2a1c76f67ebaeebd8401c4ebf7d0515b522d5e 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: Id8ca0006478212c006a103b83fb720532e9c0fab
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
78b7d3d94ca7cb605bf61a80e30bbc58b82b7413 03-Aug-2016 fionaxu <fionaxu@google.com> scrub PII for voiceMail am: 30c45c4b31 am: f3d9e4fdd3
am: 82a9196e01

Change-Id: Ie49dd6c39f32a4feafbe3ee7ae910f02612c3eef
30c45c4b31efb140679e4d945199f5c4296d21cd 03-Aug-2016 fionaxu <fionaxu@google.com> scrub PII for voiceMail

Bug: 30073833
Change-Id: If56a2caac9d51861f5494874f786a4d12689a0a5
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
d02ce67489a01a3fb35f200422e1fe499b31f295 28-Jul-2016 Amit Mahajan <amitmahajan@google.com> Change to not broadcast emergency call state changes on wifi call. am: 57dd2efb73 am: 7b5e9c8c2e
am: 40c7523024

Change-Id: Idc931044e010a8c65fc5c0d25786813f899845d5
7b5e9c8c2ef3e50b255776cf773632f921221025 28-Jul-2016 Amit Mahajan <amitmahajan@google.com> Change to not broadcast emergency call state changes on wifi call.
am: 57dd2efb73

Change-Id: I9209f9dc14e7dffe497583ca6a7ca8cb0668812e
58e123d9ce8ce49d7680bf6bdca095dd938431f4 27-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to not broadcast emergency call state changes on wifi call." into nyc-mr1-dev
57dd2efb733c7806170a8938b2808c8d72703dbe 27-Jul-2016 Amit Mahajan <amitmahajan@google.com> Change to not broadcast emergency call state changes on wifi call.

Bug: 30348902
Change-Id: I27811ed2d4f26785352f97890d0b6f2a6491880d
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
0f5f59a45e648c4225d5b453a041e46535e3507c 25-Jul-2016 Amit Mahajan <amitmahajan@google.com> Update ECBM system property early to reduce race condition window. am: ec15d7bd04
am: a5340df2ff

Change-Id: I9f023dee3d9baa3cc4f1a80d1ca4a346bf5fc36f
ec15d7bd04fc3e6cba2cc6645184c5f47c55aea8 25-Jul-2016 Amit Mahajan <amitmahajan@google.com> Update ECBM system property early to reduce race condition window.

Update property before broadcasting ECBM intent.

Bug: 30237792
Change-Id: I787fd55cc9406d7f48b24797e29eb11413d6c0c0
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
5cd65c0be8d9f0df84e291269393e6bdb1440ea1 16-Jul-2016 Vineeta Srivastava <vsrivastava@google.com> Merge \\"Return IMEI as device id if carrier config requires it.\\" into nyc-mr1-dev am: f58233297e
am: 3a345e5ec5

Change-Id: Ib04200fd274dc8754b72ea96c3e93236fc684f0d
cd2d7521585d928a6497baef88bfb99d2ecaf51b 15-Jul-2016 Junda Liu <junda@google.com> Return IMEI as device id if carrier config requires it.

Previously getDeviceId returns MEID for CDMA phones, now it will return IMEI if a carrier config requires it.

Bug: b/29340579
Change-Id: I61447281d45999e10eaca696da5a7032fd7e6591
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
34623551df702917b1872de4125edf98b7ade913 01-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge \\"Change to not reset vmCount on GSM<->CDMA switching.\\" into nyc-mr1-dev am: c74572faf8
am: 5e041d49d0

Change-Id: Ie432b87c907600dd305f5534545240f9aeaf8ff4
c74572faf89afb2440666dde313f94d921243f9a 01-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Change to not reset vmCount on GSM<->CDMA switching." into nyc-mr1-dev
b4fe99dacb5da11d31de3ae00e68d808734246ba 28-Jun-2016 Amit Mahajan <amitmahajan@google.com> Change to not reset vmCount on GSM<->CDMA switching.

Bug: 29640920
Change-Id: Ida5a91554578e625e7245f18dc720d8fd2d752aa
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
b878a9b23de50c23dcd239e74f77865046683705 23-Jun-2016 Ajay Nambi <anambi@codeaurora.org> Add support for LTE CarrierAgregation am: 000f48b9c9
am: 4c545b1994

Change-Id: Ia129a2de54288217778e49173aef2f8f4c85feb8
000f48b9c960010bf41cd22b8625b4ff16c2e719 29-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: I29dc8cbbdec60b3a5c0eed8117e3b7bb27f429ed
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
e4d629b1a490b78493630d2899c558aad37aa617 14-Jun-2016 qingxi <qingxi@google.com> Merge \\\"change CDMA roaming mode when ACTION_CARRIER_CONFIG_CHANGED received.\\\" into nyc-dev am: 1cea5b7404 am: 0f0b552e4f
am: a289c2d5c8

Change-Id: Iaa45418aed7f977f9f8b8bec9889a223821bf937
9d3f7e2198479ede7009c53aea1499d73016de7c 04-Jun-2016 qingxi <qingxi@google.com> change CDMA roaming mode when ACTION_CARRIER_CONFIG_CHANGED received.

Change-Id: I672dbd7c72fa4ea140e073d52b271ea99046cd4e
bug: 28836467
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
9272d7f10382ab17db7ea3654f1aa5d426f15464 09-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone." into nyc-dev am: 3f93be265f am: 17dfe051ae
am: 76bbab7545

* commit '76bbab75453329be88b099e61da49d94eede1ffb':
Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone.

Change-Id: Ia298317d08846568a6b36f7dffbad29b162400a0
3f93be265ffc0d7e4ea289393126d207441386f7 09-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone." into nyc-dev
867e0150ea9181755c681013f18877e8eab8ffff 07-May-2016 Amit Mahajan <amitmahajan@google.com> Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone.

Also changing default CDMA subscription source from NV to RUIM.

Bug: 28639524
Change-Id: I778af7f43f1907f8fcfe5d3a1110fe2fa1fc29b3
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
d69682b8223822c5b4eca67c71b55340cd06c19f 06-May-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Base APN State on the state of the ApnContext." into nyc-dev am: af891393ac am: 79dabb89fd
am: 594fe67794

* commit '594fe677943ddf0d4c9a19e117f36817c00434c0':
Base APN State on the state of the ApnContext.

Change-Id: I13b8e82120bb37351deaf5510e34cbc00222f7ce
5452ccfc4d32fab9933bdcfe775c38f73d4e1b15 05-May-2016 Robert Greenwalt <rgreenwalt@google.com> Base APN State on the state of the ApnContext.

Stop using enablement or activeness as a proxy for state and
just ask for the state. Enablement has changed (since L)
to indicate if we should look for a connection and is not
representative of if we have a connection.

bug:26785653
Change-Id: I8c1edda733509d2539989e727809c13002abf37f
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
21a25775ff6645eb5ba2ce3d7d5ae726cc1cbe1e 19-Apr-2016 Brad Ebinger <breadley@google.com> Use correct isEmergencyNumber for multi-SIM devices

GsmCdmaPhone.dial is using the defaultVoiceSubId() to get the
ril.ecclist instead of the actual phone's subId in isEmergencyNumber().
In multi-SIM devices, the phone will then check the default ril.ecclist
instead of the phone's ril.ecclist to see if the emergency number is
correct.

Change-Id: I65a3dd7cd5812a7925c752c4683d2f9b001d6459
Fixes: 28251277
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
2dd874066ed871c8adf50f58e4b025d525db78eb 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: Ibe2ff7862bf50e31b52fb783c49bda993f8d2ca7
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
d1a856989a73b0012df31bab494a7b40fc4c68ae 11-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "For CDMA phone return MDN as line1Number instead of MSISDN." into nyc-dev
b5245ec56c5ecf8387499be08c8d3f7621a48203 25-Jan-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: Allow DTMF Pause-Dialing

Adding a check to correctly identify and
differentiate MMI codes from pause-dial
DTMF dial strings. This check is based on
3GPP TS 22.030 6.5.2.
Lack of this check was causing dial strings
to be incorrectly identified as USSD codes,
to be sent over IMS UT.

Change-Id: I7e5cae31580ebff76b84b59ca9795cae06171821
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
808e8bbbeda1f0894fafd2a91bcc095048734499 07-Apr-2016 Amit Mahajan <amitmahajan@google.com> For CDMA phone return MDN as line1Number instead of MSISDN.

Bug was introduced when GSM, CDMA and CDMALte phones were merged.

Bug: 26032015
Change-Id: I3853c4502445f2b8254868d6fd1610bd2cefccb9
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
a2df69ceec27f7f35d7e8a840218f30b01dd4f21 25-Mar-2016 Amit Mahajan <amitmahajan@google.com> Changes to decode and store hex digits in ICC ID.

Bug: 25410213
Change-Id: I521976d4fe1aa815da2c6f7eb8e6bc1e7b912eab
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
ec2ebbaecd22cfb661fb1bf70dafe953a0d595ff 16-Mar-2016 Jack Yu <jackyu@google.com> Merge "Fixed that setup wizard sometimes report en-GB as default language." into nyc-dev
1573c17cbeab5a41936d369cb05cb7c0b0299ca1 14-Mar-2016 Jack Yu <jackyu@google.com> Fixed that setup wizard sometimes report en-GB as default language.

The incorrect language was caused by the incorrect MCC/MNC reported
by CSIM application. Fixed by retrieving the correct MCC/MNC from the
telephony manager public API, which internall pulls out the correct
MCC/MNC from the USIM application.

bug: 26963170
Change-Id: I7a2f9fc7761364f52c2caa1668d4086ede9d210d
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
93c62c8a71821f46194e16ca3e84f95e101edb90 15-Mar-2016 Amit Mahajan <amitmahajan@google.com> More ImsPhone unit tests.

Bug: 25691379
Change-Id: I9d0c6c45def7cf60228ea86412cf38d55068a6ff
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
9e0a64204f5f502ed393260d32a71e8719dcb04a 11-Mar-2016 Chen Xu <fionaxu@google.com> Merge "fix the issue of ussd not working under GSM" into nyc-dev
29f2f99949b5d64559928240417331982249e2ab 11-Mar-2016 twen.chang <twen.chang@mediatek.com> Merge changes from topics \'Add RIL Error code list\', \'Fix bug of getRingingCall\' into mm-wireless-dev
am: dd72615553

* commit 'dd72615553339740e6e67e96ea277cdc74a1b8d9':
Add RIL Error code list
Fix bug of getRingingCall
6916d439438ba49e9612977c572c07711228d8a1 11-Mar-2016 fionaxu <fionaxu@google.com> fix the issue of ussd not working under GSM

bug: 27530386
Change-Id: Id2880adb3e926ae2eaea6a27926a92c76f7ca1df
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
d1d673d28b2cf14e21e50868e05d96ff73e951af 05-Mar-2016 Amit Mahajan <amitmahajan@google.com> Phone-switch cleanup: remove updateParentPhone().

This is not needed as the parent phone object never changes with
the phone-switch refactor.

Bug: 25793157
Change-Id: If1cf30bc9f35a23cf7fc1c713517e99cbaa063b1
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
a3e96a42d9f83a649c4edf7dc07b1f0977efd393 04-Mar-2016 twen.chang <twen.chang@mediatek.com> Fix bug of getRingingCall

It returns the ringing call of ImsPhone if the ringing call of GSMPhone
isn't ringing. In CallManager.registerPhone(), it always registers ringing
call of ImsPhone, because the ringing call of GSMPhone isn't ringing.
Consequently, it can't answer GSM call successfully by invoking
TelephonyManager.answerRingingCall() since the implementation in
PhoneInterfaceManager.answerRingingCallInternal() could not get the correct
ringing call from CallManager.

We check the ringing call state of imsPhone first as accpetCall() does.
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
de9c22e95d4e2797076db0c6b798e54f0638b7f0 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit test for emergency callback mode start/end.

Bug: 25691379
Bug: 27378459
Change-Id: I5c93f6bb6f5e9c9b0da8851c8461c378c18c8c58
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
683a71848d4ca2e153fb0c286793abbc436e7c99 22-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Initiate Video Lte and Wifi calls over IMS" into mm-wireless-dev
5d3ff3cf62037c91a72d9677e16a5a705f7a995d 05-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: Initiate Video Lte and Wifi calls over IMS

If video call is enabled on a device i.e. if either video
over LTE or video over Wifi is supported and we are trying
to initiate a video call, initiate the call on IMS pipe.

Bug: 27254385
Change-Id: Ifebf69fc12d0148b21133cf9970481e970f2311e
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
97b3c4e45f156d8d5ae25a32357c9b31e018da32 10-Feb-2016 Amit Mahajan <amitmahajan@google.com> Support for storing voicemail count for multi-sim.

Bug: 18108420
Change-Id: I08edb714b839b44472b3b7a4d0aba287da2969d3
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
78867803826b15ff95c8ee8c7c6f65dfb7ad258f 09-Feb-2016 Amit Mahajan <amitmahajan@google.com> New unit test for GsmCdmaPhone and fixes for some existing tests

Bug: 25691379
Change-Id: I323fdef84792459db312df7bd58917e52a1a995e
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
32b5fbb1a340fa16e2c37c276517ef10a4934500 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit tests for GsmCdmaPhone.

Also creating abstract class TelephonyTest that can be extended
by other unit tests.

Bug: 25691379
Change-Id: I9437642a0bab68c6b573954e587181ff7d04d217
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
604d70ccbf958d1abd92b128fa18a9f17b42b133 30-Jan-2016 Amit Mahajan <amitmahajan@google.com> Cleanup access modifiers.

This is useful for tests. CL also includes minor cleanup in SST.

Bug: 25793157
Change-Id: I068af6bfd9ea9e04e95244d23f830731aef38ee1
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
1e7c950418dcc4132136eee3c4834e1a758e48e9 27-Jan-2016 Amit Mahajan <amitmahajan@google.com> Initialize phone type before initializing other objects.

Bug: 25871221
Change-Id: I84f9d35c618da36d6eb60d131cd302f23f19e9ff
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
38ca51d0f643405df51e78fce6c546424e9f410d 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: I9e623100358d65f1ab853c33599cb78f100f7e3a
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
aeff825792fe1f828fb310464923a6f4eb69be78 19-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Added unit tests for GsmCdmaPhone" into mm-wireless-dev
0c3ec24396bb8c21b4d89f743b626c13dd35ba7b 15-Jan-2016 Amit Mahajan <amitmahajan@google.com> Added unit tests for GsmCdmaPhone

Bug: 25691379
Change-Id: Ide4d50b10da332334fc4717ff1e7428f8b158056
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
4b876512ae8e9253de3344c312d99e63f6fcc246 15-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Mark internally used functions private in GsmCdmaPhone." into mm-wireless-dev
e36f59c8a17246eb7924ba1d2bf70f6a2eead1e2 12-Jan-2016 Amit Mahajan <amitmahajan@google.com> Mark internally used functions private in GsmCdmaPhone.

Includes some (mostly cosmetic) code cleanup too.

Bug: 25793157
Change-Id: I8f0eb8b3ead18f29ca146637dca6ffd659a9f699
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
a579e9c631d70bb6dbd39283438212d5ff8f19c0 14-Jan-2016 Amit Mahajan <amitmahajan@google.com> Send emergency call state change intent on emergency call start/end

Bug: 24147407
Change-Id: I2517daf2bde95a95c68b2c74225fad7004bd73c5
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
30646d039eb54def9efd55fc54772e111b5ef115 17-Dec-2015 Amit Mahajan <amitmahajan@google.com> Removed unnecessary proxies.

Bug: 25793157
Change-Id: I692f140b89d23448a5261fec8cdeb60305287662
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
dd4b0f4b5a2def03bd45637be5ceed3e86781f68 16-Dec-2015 Amit Mahajan <amitmahajan@google.com> Added isPhoneTypeCdma() and isPhoneTypeCdmaLte()

Also includes:
- Removed unnecessary unreg/reg of phone with CallManager on
voice radio tech change. This is needed as otherwise Ims Phone may
get unreg but not reg again (on radio tech change).
- Allowing reg/unreg in GsmCdmaPhone regardless of phone type
- Removed unused Call.mIsGeneric

Bug: 25793157
Change-Id: Ie2093a50c1cf64918782076127decff90968fe72
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
c2b66d57e16623dffc2fe6d02ded4f24c014b6c8 14-Dec-2015 Amit Mahajan <amitmahajan@google.com> Code cleanup including removing direct references to IMS classes.

Bug: 25793157
Change-Id: I45ab1394d8585ae3d649f1bb8f67bcd16a946a85
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
0a567c9ed954f295df83c753239646c6f6a04128 24-Nov-2015 Amit Mahajan <amitmahajan@google.com> Adding initial tests for GsmCdmaCall and GsmCdmaPhone.

Also includes:
- Changes to fix/comment out failing tests
- Some cleanup in CallManager related to deletion of PhoneBase and
PhoneProxy
- ContextFixture containing mock Context for all telephony tests
- Phone test that exercises BroadcastReceiver support in the mock
Context
- Test showing how static function can be mocked

Bug: 25691379
Change-Id: Ia38423cef3cfb86389d044cac4e601983fae1192
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
1a87ab3d7170d618f048c4f5af8c7504a587aaa5 10-Dec-2015 Jack Yu <jackyu@google.com> Merge from master

Change-Id: Ifbd86600111d2c444031ff608fab62fb2ee4b236
/frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java