History log of /frameworks/opt/telephony/src/java/com/android/internal/telephony/GsmCdmaPhone.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
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
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
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
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
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
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
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
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
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
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
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