aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-08Merge "Fixed CME for SubscriptionController"temp_b_131756210_stage-aosp-masterPengquan Meng
am: 215bd24a73 Change-Id: I448888e710a516e4dc8bbff1d7668774f00d93d8
2019-05-08Merge "Fixed CME for SubscriptionController"Pengquan Meng
2019-05-07Merge "Fixed race condition in handling available networks list"Jack Yu
am: 4767dcbb45 Change-Id: I8f8443e377ff9a255efeea7908b3f24fc7059e1f
2019-05-07Merge "Update README"Jordan Liu
am: d84c9c4dc6 Change-Id: I176ab2a6540212d50a353635f7a5a7cec633b3c4
2019-05-08Merge "Fixed race condition in handling available networks list"Jack Yu
2019-05-08Merge "Update README"Treehugger Robot
2019-05-07Update READMEJordan Liu
The old one's really old. We move the old readme to the dataconnection directory, since that's what it's about. Change-Id: Ic46d14d181efbb5476d58a25608bd8620c14f641 Fixes: 114302387 Test: no behavior change
2019-05-07Merge "Make absent and inactive SIM still update subs"Jordan Liu
am: d8394456b9 Change-Id: I74bb46b6c27d556db3dc24b33ac64a9a4bc51360
2019-05-07Merge "Make absent and inactive SIM still update subs"Jordan Liu
2019-05-07Fixed CME for SubscriptionControllerPengquan Meng
SubscriptionController should pass a copy of mCacheSubscriptionInfoList instead of unmodifiable list to the TelephonyMetrics because unmodifiable list is not thread safe. Bug: 129315608 Test: build & current test Merged-In: I35d8d3832aad8645ca2161464feaf094ffe4a8cc Change-Id: I35d8d3832aad8645ca2161464feaf094ffe4a8cc (cherry picked from commit 85d9b6d8c962d4e12cf786ee788114016c20a0cc)
2019-05-07Merge "Sorting and merge Emergency number better"Shuo Qian
am: 79ac5cb640 Change-Id: If5147407392534af607b9d3f1330ac2d561fec03
2019-05-07Merge "Sorting and merge Emergency number better"android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseShuo Qian
2019-05-07Fixed race condition in handling available networks listJack Yu
When modem reports back to back available networks list, we should batch process them. Test: Unit tests + manual Bug: 132113909 Merged-In: I0071ae6812bbc698a41ba1a303971032a84f2034 Change-Id: I0071ae6812bbc698a41ba1a303971032a84f2034 (cherry picked from commit eecee44c89729e294101c036fcdaddbcd130964f)
2019-05-07Merge "Do not always trigger CarrierConfig change in GsmCdmaPhone"Brad Ebinger
am: 653524969d Change-Id: Ic5013642ef2bee6bfacca1063450f732841e3bba
2019-05-07Merge "Do not always trigger CarrierConfig change in GsmCdmaPhone"Brad Ebinger
2019-05-06Sorting and merge Emergency number bettersqian
Apply more parameters to sort Emergency number list, it is important to keep two lists Collection-equal to each other if they have the same contents. Otherwise, it will introduce more unnecessary updates in EmergencyNumberTracker and it may confuse users. Test: atest EmergencyNumberTest Bug: 131922424 Change-Id: I50fec4e7d004be5c9dabbda0084d3c2754f140c7 Merged-In: I50fec4e7d004be5c9dabbda0084d3c2754f140c7 (cherry picked from commit f66eefafd53562aa8f92f34e7ee89cf1d48c4933)
2019-05-06Do not always trigger CarrierConfig change in GsmCdmaPhoneBrad Ebinger
We were not looking at the EXTRA_SLOT_INDEX key when listening for CARRIER_CONFIG_CHANGED broadcasts, which was causing the framework to push carrierconfig updates to the modem that did not change or were in a transient state. Only trigger carrier config push to ImsService for subscription that changed. Bug: 124388676 Bug: 71608223 Test: Manual Merged-In: I4edd2afd2f719dcdbb4186da0083ed3c5c9cb985 Change-Id: I181acdc12139e239d54a6b398bf5bf0585830a34
2019-05-04Merge "Fixed corner case when handover fails"Jack Yu
am: c49627019d Change-Id: Ib343b1ff081fa6fb4c6e51481e89eb43967143b8
2019-05-04Merge "Fixed MMS data connection not re-established after airplane mode"Jack Yu
am: 1db513dafa Change-Id: I73f96fc959d01fee36c2364a4a5f3ca4d99c75c5
2019-05-04Merge "Fixed corner case when handover fails"Jack Yu
2019-05-04Merge "Fixed MMS data connection not re-established after airplane mode"Jack Yu
2019-05-04Merge "update PhoneCfgMgr and PhoneIfcMgr to handle enableModem more accurately"Nazanin Bakhshi
am: 53fc9ef99e Change-Id: I15a485772c869f2577366c431a44e546d18ce4f7
2019-05-04Merge "update PhoneCfgMgr and PhoneIfcMgr to handle enableModem more accurately"Nazanin Bakhshi
2019-05-03Fixed MMS data connection not re-established after airplane modeJack Yu
In some corner cases, data attached event is not sent from service state tracker after APM on with IWLAN available. Fixed by sending data attached event for the first time airplane mode is on and data is in service. Test: Manual Bug: 130785238 Merged-In: I25b69542f70cdab9a415606abcebd9c96578972f Change-Id: I25b69542f70cdab9a415606abcebd9c96578972f (cherry picked from commit b7814369f1042897af123942b1b4cdd949783941)
2019-05-03Fixed corner case when handover failsJack Yu
If handover fails, we need to tear down the existing connection, so the new data connection can be re-established on the new transport. If we leave the existing data connection in current transport, then DCT and qualified network service will be out of sync. Bug: 131404118 Test: Manual Merged-In: I074d4b20ab76365f587fb752e63a3b7390ba8e0b Change-Id: I074d4b20ab76365f587fb752e63a3b7390ba8e0b (cherry picked from commit 86b608ddd07488b75896bfd5b34de815963e85d1)
2019-05-03update PhoneCfgMgr and PhoneIfcMgr to handle enableModem more accuratelyNazanin Bakhshi
Bug: 130913083 Test: manual Change-Id: I8e8e8745a71a7cf670de4df5e94cfcfb1483876c (cherry picked from commit 50e9071147a18f50f0c67212620c14428fe3c25c)
2019-05-02Merge "Check permissions in RcsMessageStoreController"Leland Miller
am: 7e3ab35728 Change-Id: I8ae827080e591686be3891f0070cf481304a8313
2019-05-02Merge "Check permissions in RcsMessageStoreController"Treehugger Robot
2019-05-02Merge "Get the SST correctly"Jordan Liu
am: ec3706278b Change-Id: Idf7fcb822783bce5b4900d5129fd96ef52399e5d
2019-05-02Merge "Get the SST correctly"Jordan Liu
2019-05-02Get the SST correctlyJordan Liu
ImsPhone does not have a SST, so we have to call ImsPhone.getDefaultPhone().getServiceStateTracker(). Bug: 131774718 Test: manual Change-Id: I92a128f9aa12c950e4477a0565c8e0c1dadfd451 Merged-In: I92a128f9aa12c950e4477a0565c8e0c1dadfd451
2019-05-02Merge "Have setSubscriptionEnabled work for inactive pSIM."Xiangyu/Malcolm Chen
am: 60397c9fcc Change-Id: I9ab3b6c5735ce5b7e6e1635fb23fd47c9d1afd43
2019-05-02Merge "Have setSubscriptionEnabled work for inactive pSIM."Xiangyu/Malcolm Chen
2019-05-02Have setSubscriptionEnabled work for inactive pSIM.Malcolm Chen
If setSubscriptionEnabled is trying to enable an inactive pSIM (physical slot is inactive but card is inserted), we send an intent to Euicc to handle that. Bug: 131169418 Test: manual Change-Id: I26db99a798aeb85e8d6d0e464ee8044ac018992e Merged-In: I26db99a798aeb85e8d6d0e464ee8044ac018992e
2019-05-01Merge "Update IccIoResult#getErrorString."Hunter Knepshield
am: de40346f66 Change-Id: I95986db27d90a84a7fa39074fe5f059f6fb27c2c
2019-05-01Merge "Update IccIoResult#getErrorString."Treehugger Robot
2019-05-01Merge "Make getAllUiccCardInfos return info from inactive slots"Jordan Liu
am: 5666628fb9 Change-Id: I9005a80b00e11b6ebfbcb63e55e5dec4ce0292c3
2019-05-01Merge "Apply CDNR in SST"Pengquan Meng
am: c20f88a077 Change-Id: I43826cc81810bfdf4ff54bbc10280a01cfca0fe0
2019-05-01Update IccIoResult#getErrorString.Hunter Knepshield
Adds more reasonable messages for sw1=0x61 and 0x6C. Make all strings uniform. Make sure switch cases are in numerical order. Change-Id: I163d17ccf5ae60e6b962921164d2779e5e0101a3 Fix: 131717041 Test: compilation (trivial change)
2019-05-01Merge "Make getAllUiccCardInfos return info from inactive slots"Jordan Liu
2019-05-01Merge "Apply CDNR in SST"Pengquan Meng
2019-05-01Merge "Fixed incorrect IWLAN service state in legacy mode"Jack Yu
am: ee97539098 Change-Id: Icdbdbd8362da36fd3ae5dd3ea89474df1e2db055
2019-05-01Merge "Improved subscription controller logging"Jack Yu
am: 6bfede40cc Change-Id: I8af06a9ef651217e77e0f491292a8c309c6b2731
2019-05-01Merge "Fixed incorrect IWLAN service state in legacy mode"Jack Yu
2019-05-01Merge "Improved subscription controller logging"Jack Yu
2019-05-01Merge "Do not post timeout message if no SMS filter packages found."Amit Mahajan
am: f78b792297 Change-Id: I543694d565ab9c87f4c624b1faa5543d57ea895e
2019-05-01Merge "Do not post timeout message if no SMS filter packages found."Amit Mahajan
2019-05-01Apply CDNR in SSTPengquan Meng
This add the CarrierDisplayNameResolver to SST. CDNR is eanbled only when CarrierConfigManager#KEY_ENABLE_CARRIER_DISPLAY_NAME_RESOLVER_BOOL is true. This CL also refactored the OOS and Wifi-Calling override for SPN and PLMN. Bug: 122921456 Test: atest ServiceStateTrackerTest Merged-In: Idbdfb56df6afd0eb9ca8711294bbb8d458ae97ba Change-Id: Idbdfb56df6afd0eb9ca8711294bbb8d458ae97ba (cherry picked from commit bbab680e9df517fc10ed73bec4977d1dda1ca50d)
2019-05-01Make absent and inactive SIM still update subsJordan Liu
When we get a slot status update with an absent SIM in an inactive slot, we still update the subscriptions, we just don't broadcast the SIM state change. Bug: 130749300 Test: manual and atest UiccSlotTest Change-Id: I83d36af27fa5eaed8f84a4f7378e69a366a48b53 Merged-In: I83d36af27fa5eaed8f84a4f7378e69a366a48b53
2019-04-30Fixed incorrect IWLAN service state in legacy modeJack Yu
Correctly set the right service state for IWLAN in devices configured as legacy mode. Bug: 131712688 Test: Manual Merged-In: I60491e79b2af7b5076660f6f69984b10e12f1cce Change-Id: I60491e79b2af7b5076660f6f69984b10e12f1cce (cherry picked from commit 74d8ea728ffcbb7ba92941ef2331483c4d7a45ec)